diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 40104bbf6..976b0f816 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -15,13 +15,23 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. class ProjectsController < ApplicationController + # if @project.project_type == 1 layout 'base_projects'# by young menu_item :overview menu_item :roadmap, :only => :roadmap menu_item :settings, :only => :settings + menu_item l(:label_sort_by_time), :only => :index menu_item l(:label_sort_by_active), :only => :index menu_item l(:label_sort_by_influence), :only => :index + # else + # layout 'base_courses' + # menu_item :overview + # menu_item l(:label_homework), :only => :homework + # menu_item l(:label_course_file), :only => :index + # menu_item l(:label_course_news), :only => :index + # menu_item l(:label_settings), :only => :settings + # end # layout 'base_courses'# by young diff --git a/app/views/bids/show_document_homework.html.erb b/app/views/bids/show_document_homework.html.erb new file mode 100644 index 000000000..e69de29bb diff --git a/app/views/bids/show_project_homework.html.erb b/app/views/bids/show_project_homework.html.erb new file mode 100644 index 000000000..ba0b99283 --- /dev/null +++ b/app/views/bids/show_project_homework.html.erb @@ -0,0 +1,86 @@ + + + + + +<% if User.current.logged? %> + + +<% end %> + +
+ <%= render :partial => 'project_list', :locals => {:bidding_project => @bidding_project} %> +
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb index 001ae9596..8eb713696 100644 --- a/app/views/files/index.html.erb +++ b/app/views/files/index.html.erb @@ -1,6 +1,12 @@ -
-<%= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %> +<% if @project.project_type == 1 %> +
+<%= link_to(l(:label_file_upload), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %>
+<% else %> +
+<%= link_to(l(:label_attachment_new), new_project_file_path(@project), :class => 'icon icon-add') if User.current.allowed_to?(:manage_files, @project) %> +
+<% end %>

<%=l(:label_attachment_plural)%>

@@ -11,8 +17,8 @@ <%= sort_header_tag('filename', :caption => l(:field_filename)) %> <%= sort_header_tag('created_on', :caption => l(:label_date), :default_order => 'desc') %> <%= sort_header_tag('size', :caption => l(:field_filesize), :default_order => 'desc') %> - <%= sort_header_tag('downloads', :caption => l(:label_downloads_abbr), :default_order => 'desc') %> - MD5 + + 描述 @@ -30,8 +36,8 @@ <%= link_to_attachment file, :download => true, :title => file.description %> <%= format_time(file.created_on) %> <%= number_to_human_size(file.filesize) %> - <%= file.downloads %> - <%= file.digest %> + + <%= file.description %> <%= link_to(image_tag('delete.png'), attachment_path(file), :data => {:confirm => l(:text_are_you_sure)}, :method => :delete) if delete_allowed %> diff --git a/app/views/issue_categories/issue_categories_helper.rb b/app/views/issue_categories/issue_categories_helper.rb new file mode 100644 index 000000000..9189025c3 --- /dev/null +++ b/app/views/issue_categories/issue_categories_helper.rb @@ -0,0 +1,21 @@ +# encoding: utf-8 +# +# Redmine - project management software +# Copyright (C) 2006-2013 Jean-Philippe Lang +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +module IssueCategoriesHelper +end diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index c49179857..a7f5f6593 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -134,7 +134,7 @@
  • <%= link_to(l(:label_overview), project_path(@project))%>
  • <%= link_to(l(:label_homework), {:controller => 'projects', :action => 'homework'})%>
  • <%= link_to(l(:label_course_file), project_files_path(@project))%>
    • -
  • <%= link_to "课程通知", {:controller => 'news', :action => 'index', :project_id => @project}%>
    • +
  • <%= link_to(l(:label_course_news), {:controller => 'news', :action => 'index', :project_id => @project})%>
  • <%= link_to(l(:label_settings), {:controller => 'projects', :action => 'settings', :id => @project}) %>
    • diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb index 613a1a647..7e6fbd546 100644 --- a/app/views/news/index.html.erb +++ b/app/views/news/index.html.erb @@ -1,8 +1,16 @@
    -<%= link_to(l(:label_news_new), + <% if @project.project_type == 1%> +<%= link_to(l(:label_news_notice), new_project_news_path(@project), :class => 'icon icon-add', :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %> + <% else %> + <%= link_to(l(:label_news_new), + new_project_news_path(@project), + :class => 'icon icon-add', + :onclick => 'showAndScrollTo("add-news", "news_title"); return false;') if @project && User.current.allowed_to?(:manage_news, @project) %> + + <% end %>