diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index fee278c35..3f51527b2 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -42,9 +42,7 @@ forge.trustie.net/courses - <%=link_to "主页", home_path %> > - <%=link_to "实践课程", :controller => 'projects', :action => 'index' %> > - <%=link_to @project.name, project_path %>(<%= @course.time %><%= @course.term %>) + <%=link_to "主页", home_path %> > <%=link_to "实践课程", :controller => 'projects', :action => 'course' %> > <%=link_to @project.name, nil %>(<%= @course.time %><%= @course.term %>) diff --git a/app/views/layouts/base_homework.html.erb b/app/views/layouts/base_homework.html.erb index bbc811f47..aeae81f1a 100644 --- a/app/views/layouts/base_homework.html.erb +++ b/app/views/layouts/base_homework.html.erb @@ -32,7 +32,7 @@ forge.trustie.net/courses - <%=link_to "主页", home_path %> > <%=link_to "实践课程", :controller => 'projects', :action => 'index' %> > + <%=link_to "主页", home_path %> > <%=link_to "实践课程", :controller => 'projects', :action => 'course' %> > <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %> > <%=link_to(@bid.name, respond_path(@bid))%> @@ -48,7 +48,7 @@ 课程名: - <%= link_to(@bid.courses.first.name, project_path(@bid.courses.first)) %> + <%= link_to @bid.courses.first.name, project_path(@bid.courses.first) %> @@ -57,14 +57,14 @@ <%= h @bid.name %> - +
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 4028e44d8..6cb3760f5 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -41,7 +41,7 @@ forge.trustie.net/courses - <%=link_to l(:label_home),home_path %> > <%=link_to l(:label_project_deposit),:controller => 'projects', :action => 'index' %> > <%=link_to @project,project_path %> + <%=link_to l(:label_home),home_path %> > <%=link_to l(:label_project_deposit),:controller => 'projects', :action => 'index' %> > <%=link_to @project, project_path(@project) %> diff --git a/app/views/layouts/base_users.html.erb b/app/views/layouts/base_users.html.erb index 361e998e9..f1a0cb7d7 100644 --- a/app/views/layouts/base_users.html.erb +++ b/app/views/layouts/base_users.html.erb @@ -26,13 +26,13 @@
- - + + diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 2e15dfcda..5a4203f8b 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -518,6 +518,8 @@ zh: label_college_into: 进入高校 label_investor: 投资人: lable_contest_user: 竞赛发布人: #huang + label_user_home: 创客空间 + label_user_location: 当前位置 label_theme: 主题 label_logged_as_new: 当前用户 button_register: 注册 diff --git a/config/routes.rb b/config/routes.rb index cbebb4ffe..049f8ebf8 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -473,7 +473,7 @@ RedmineApp::Application.routes.draw do match 'new_join', :to => 'projects#new_join', :as => 'try_join' match 'projects/:id/respond', :to => 'projects#project_respond', :via => :post match 'calls/:id/manage',:to => 'bids#manage',:via => [:get,:post] - match 'project/course', :to => 'projects#course', :as => 'course' + match 'project/course', :to => 'projects#course', :as => 'course' #nyan #added by william # match 'calls/:id/set_results',:controller => 'bids', :action => 'set_results',:via => [:get,:post],:as => 'set_results' diff --git a/lib/redmine.rb b/lib/redmine.rb index 7843bb726..10425c2a1 100644 --- a/lib/redmine.rb +++ b/lib/redmine.rb @@ -312,7 +312,7 @@ Redmine::MenuManager.map :project_menu do |menu| # :if => Proc.new { |p| p.wiki && !p.wiki.new_record? } # menu.push :boards, { :controller => 'boards', :action => 'index', :id => nil }, :param => :project_id, # :if => Proc.new { |p| p.boards.any? }, :caption => :label_board_plural - menu.push :files, { :controller => 'files', :action => 'index' }, :caption => :label_file_new, :param => :project_id + menu.push :files, { :controller => 'files', :action => 'index' }, :param => :project_id, :caption => :label_file_new menu.push :repository, { :controller => 'repositories', :action => 'show', :repository_id => nil, :path => nil, :rev => nil }, :if => Proc.new { |p| p.repository && !p.repository.new_record? } menu.push :settings, { :controller => 'projects', :action => 'settings' }, :last => true diff --git a/public/themes/redpenny-master/stylesheets/application.css b/public/themes/redpenny-master/stylesheets/application.css index 0f1e8781e..94f928837 100644 --- a/public/themes/redpenny-master/stylesheets/application.css +++ b/public/themes/redpenny-master/stylesheets/application.css @@ -1742,8 +1742,8 @@ input.enterprise[type="submit"] { font-size: 12px; color: #fff; padding: 0px; - background: #ac344f; - border: 1px solid #ac344f; + background: #15bccf; + border: 1px solid #15bccf; } input[type="submit"] { width: auto;
创客主页当前位置 : <%= l(:label_user_home) %><%= l(:label_user_location) %> :