From 534c252bcbe772e088cfd251ce32707116360ae9 Mon Sep 17 00:00:00 2001 From: huangjingquan Date: Fri, 8 Nov 2013 15:59:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F=EF=BC=8C=E9=83=A8=E5=88=86?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 2 +- app/views/bids/contest.html.erb | 2 +- app/views/bids/index.html.erb | 2 +- app/views/layouts/base_bids.html.erb | 2 +- app/views/layouts/base_contest.html.erb | 2 +- app/views/layouts/base_courses.html.erb | 2 +- app/views/layouts/base_homework.html.erb | 2 +- app/views/layouts/base_projects.html.erb | 2 +- app/views/projects/course.html.erb | 39 +++++++++++++++--------- app/views/projects/index.html.erb | 2 +- app/views/users/index.html.erb | 2 +- config/locales/en.yml | 10 ++++++ config/locales/zh.yml | 2 +- 13 files changed, 45 insertions(+), 26 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 9f4513f1b..de7cc8492 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -82,7 +82,7 @@ module ProjectsHelper end content = content_tag('ul', content) - content_tag('div', content, :class => "tabs_enterprise") + content_tag('div', content, :class => "tabs") end # end diff --git a/app/views/bids/contest.html.erb b/app/views/bids/contest.html.erb index 501cefbb5..2ba3bc7f4 100644 --- a/app/views/bids/contest.html.erb +++ b/app/views/bids/contest.html.erb @@ -5,7 +5,7 @@ - +
<%= l(:label_contest_innovate) %>当前位置 : <%= l(:label_user_location) %> : <% if User.current.logged? %> <% unless User.current.user_extensions.identity == 1 %> diff --git a/app/views/bids/index.html.erb b/app/views/bids/index.html.erb index 5b7897c3f..4c1daec49 100644 --- a/app/views/bids/index.html.erb +++ b/app/views/bids/index.html.erb @@ -5,7 +5,7 @@ - +
<%= l(:label_requirement_enterprise ) %>当前位置 : <%= l(:label_user_location) %> : <% if User.current.logged? %> <%= link_to(l(:label_new_call), {:controller => 'bids', :action => 'new_bid'}, :class => 'icon icon-add') %> diff --git a/app/views/layouts/base_bids.html.erb b/app/views/layouts/base_bids.html.erb index 2cd973009..377f44132 100644 --- a/app/views/layouts/base_bids.html.erb +++ b/app/views/layouts/base_bids.html.erb @@ -34,7 +34,7 @@ - +
企业众包社区当前位置 : <%= l(:label_user_location) %> :
<%= form_tag(calls_path, :method => :get) do %> diff --git a/app/views/layouts/base_contest.html.erb b/app/views/layouts/base_contest.html.erb index 200a47a7b..53918720f 100644 --- a/app/views/layouts/base_contest.html.erb +++ b/app/views/layouts/base_contest.html.erb @@ -27,7 +27,7 @@ - +
创新竞赛社区当前位置 : <%= l(:label_user_location) %> :
<%= form_tag(:controller => 'bids', :action => 'contest', :method => :get) do %> diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 64afdc8b2..cc76e8ea7 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -29,7 +29,7 @@ - +
高校课程实践社区当前位置 : <%= l(:label_user_location) %> :
<%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %> diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index cf381548a..3422f4d9a 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -25,7 +25,7 @@ - + diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 7916806b4..80457af33 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -28,7 +28,7 @@
高校课程实践社区当前位置 : <%= l(:label_user_location) %> :
- +
软件项目托管社区当前位置: <%= l(:label_user_location) %> :
<%= form_tag(:controller => 'projects', :action => "search", :method => :get) do %> diff --git a/app/views/projects/course.html.erb b/app/views/projects/course.html.erb index 7ba961abb..9ab5a42b5 100644 --- a/app/views/projects/course.html.erb +++ b/app/views/projects/course.html.erb @@ -2,27 +2,36 @@ <%= auto_discovery_link_tag(:atom, {:action => 'index', :format => 'atom', :key => User.current.rss_key}) %> <% end %> -<%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %> -
- + +
+ <%= form_tag(:controller => 'projects', :action => 'search', :method => :get) do %> +
- - + + <% end %> - <% end %> - + <% end %> + + + + + +
<%= l(:label_new_course)%> - <% if User.current.logged?%> + <%= l(:label_course_practice) %><%= l(:label_user_location) %> : + <% if User.current.logged?%> <% if User.current.user_extensions.identity == 0 %> <%= link_to(l(:label_course_new), {:controller => 'projects', :action => 'new', :course => 1, :project_type => @project_type}, :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %> -
- <%= text_field_tag 'name', params[:name], :size => 30 %> - <%= hidden_field_tag 'project_type', params[:project_type] %> - <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> -
+
+ <%= text_field_tag 'name', params[:name], :size => 30 %> + <%= hidden_field_tag 'project_type', params[:project_type] %> + <%= submit_tag l(:label_search), :class => "enterprise", :name => nil %> +
+
<%= link_to "forge.trustie.net/projects", :controller => 'projects', :action => 'course', :project_type => 1 %> <%=link_to l(:field_homepage), home_path %> > <%=link_to l(:label_course_practice), :controller => 'projects', :action => 'course', :project_type => 1 %>
-
-<% end %> + <% end %> +
+ <%= sort_course(@s_type, @project_type)%>