From 2a4539dc2ca8fd4528eca1b370c04718522ea54a Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Tue, 5 Nov 2013 12:49:57 +0800 Subject: [PATCH] =?UTF-8?q?=E5=87=A0=E4=B8=AA=E4=B8=BB=E8=A6=81=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_header.html.erb | 2 +- app/views/layouts/base_bids.html.erb | 8 ++++---- app/views/layouts/base_contest.html.erb | 8 ++++---- app/views/layouts/base_courses.html.erb | 8 ++++---- app/views/layouts/base_homework.html.erb | 4 ++-- app/views/layouts/base_projects.html.erb | 6 +++--- app/views/layouts/base_users.html.erb | 8 ++++---- public/stylesheets/application.css | 4 +++- 8 files changed, 25 insertions(+), 23 deletions(-) diff --git a/app/views/layouts/_base_header.html.erb b/app/views/layouts/_base_header.html.erb index f0a170ed3..516bdaa4e 100644 --- a/app/views/layouts/_base_header.html.erb +++ b/app/views/layouts/_base_header.html.erb @@ -19,5 +19,5 @@ -
+
diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index 2f0fa23c6..53c2834f8 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -30,18 +30,18 @@
-
+
- - + + diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index 61355ac23..46dcd5692 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -23,18 +23,18 @@
-
+
企业众包社区当前位置 : 企业众包社区当前位置 :
<%= form_tag(calls_path, :method => :get) do %> <%= text_field_tag 'name', params[:name], :size => 30 %> <%= hidden_field_tag 'reward_type', params[:reward_type] %> <%= hidden_field_tag 'project_type', params[:project_type] %> - <%= submit_tag l(:label_search), :class => "small", :name => nil %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> <% end %>
- - + + diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 3f51527b2..82d445f5f 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -23,19 +23,19 @@ <%= render :partial => 'layouts/base_header'%>
-
+
<% @project = Project.find_by_id(@project.id)%> <% @course = Course.find_by_extra(@project.identifier)%>
创新竞赛社区当前位置 : 创新竞赛社区当前位置 :
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> <%= text_field_tag 'name', params[:name], :size => 30 %> <%= hidden_field_tag 'reward_type', @bid.reward_type %> <%= hidden_field_tag 'project_type', params[:project_type] %> - <%= submit_tag l(:label_search), :class => "small", :name => nil %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> <% end %>
- - + + diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index aeae81f1a..5250e7470 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -24,8 +24,8 @@
高校课程实践社区当前单位 : 高校课程实践社区当前单位 :
<%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %> <%= text_field_tag 'name', params[:name], :size => 30 %> <%= hidden_field_tag 'project_type', @project.project_type %> - <%= submit_tag l(:label_search), :class => "small", :name => nil %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> <% end %>
- - + + diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 6cb3760f5..da2add125 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -27,14 +27,14 @@
高校课程实践社区当前单位 : 高校课程实践社区当前单位 :
- - + + diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index f1a0cb7d7..6a4059746 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -23,11 +23,11 @@ <%= render :partial => 'layouts/base_header'%>
-
+
软件项目托管社区当前位置: 软件项目托管社区当前位置:
<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %> <%= text_field_tag 'name', params[:name], :size => 30 %> <%= hidden_field_tag 'project_type', params[:project_type] %> - <%= submit_tag l(:label_search), :class => "small", :name => nil %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> <% end %>
- - + + - +
<%= l(:label_user_home) %><%= l(:label_user_location) %> : <%= l(:label_user_home) %><%= l(:label_user_location) %> :
<%= form_tag(:controller => 'users', :action => 'search', :method => :get) do %> @@ -39,7 +39,7 @@
http://forge.trustie.net <%=link_to "主页", home_path %> > <%=link_to "软件创客", :controller => 'users', :action => 'index' %> > <%=link_to @user.show_name, user_path %> <%=link_to "主页", home_path %> > <%=link_to "软件创客", :controller => 'users', :action => 'index' %> > <%=link_to @user.show_name, user_path %>
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 47fa46b5f..24edca217 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -12,11 +12,12 @@ h4 {border-bottom: 1px dotted #bbb;} /*new by huang*/ /**/ .top-content{ - background-color: rgb(214, 218, 242); + background-color: #f7f7f7; height: 45px; width: 940px; line-height: 1em; padding-top: 5px; + margin-bottom: 10px; } /*added by bai*/ @@ -57,6 +58,7 @@ h4 {border-bottom: 1px dotted #bbb;} .top-content-home{ background-color: rgb(226, 244, 255); width: 25%; + padding-bottom :50px; }