- <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
- <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
- (<%= ForgeActivity.where("project_id = ?", @project.id).count %>)
- <% end %>
-
- <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
-
- <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
- <% unless @project.issues.count == 0 %>
- (<%= @project.issues.count %>)
- <% end %>
- <% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
- <% end %>
-
- <% end %>
- <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
-
- <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
- <% unless @project.boards.first.topics.count == 0 %>
- (<%= @project.boards.first.topics.count %>)
- <% end %>
- <% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
- <% end %>
-
- <% end%>
- <% unless @project.enabled_modules.where("name = 'files'").empty? %>
-
- <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
- <% unless attaments_num == 0 %>
- (<%= attaments_num %>)
- <% end %>
- <% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
- <% end %>
-
- <% end %>
- <%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
- <% if visible_repository?(@project) %>
-
- <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
- (<%= @project.repositories.count %>)
-
- <% end %>
-
- <%= l(:label_project_more) %>
-
\ No newline at end of file
diff --git a/app/views/layouts/_base_friend_group.html.erb b/app/views/layouts/_base_friend_group.html.erb
deleted file mode 100644
index d1d7c530a..000000000
--- a/app/views/layouts/_base_friend_group.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %>
-
- <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
- <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
- (<%= ForgeActivity.where("project_id = ?", @project.id).count %>)
- <% end %>
-
- <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
-
- <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
- <% unless @project.boards.first.topics.count == 0 %>
- (<%= @project.boards.first.topics.count %>)
- <% end %>
- <% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
- <% end %>
-
- <% end%>
- <% unless @project.enabled_modules.where("name = 'files'").empty? %>
-
- <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
- <% unless attaments_num == 0 %>
- (<%= attaments_num %>)
- <% end %>
- <% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
- <% end %>
-
- <% end %>
\ No newline at end of file
diff --git a/app/views/layouts/_base_research_team.html.erb b/app/views/layouts/_base_research_team.html.erb
deleted file mode 100644
index 83f6a78bb..000000000
--- a/app/views/layouts/_base_research_team.html.erb
+++ /dev/null
@@ -1,40 +0,0 @@
-<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %>
-
- <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
- <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
- (<%= ForgeActivity.where("project_id = ?", @project.id).count %>)
- <% end %>
-
- <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
-
- <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
- <% unless @project.issues.count == 0 %>
- (<%= @project.issues.count %>)
- <% end %>
- <% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
- <% end %>
-
- <% end %>
- <% unless @project.enabled_modules.where("name = 'boards'").empty? %>
-
- <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
- <% unless @project.boards.first.topics.count == 0 %>
- (<%= @project.boards.first.topics.count %>)
- <% end %>
- <% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
- <% end %>
-
- <% end%>
- <% unless @project.enabled_modules.where("name = 'files'").empty? %>
-
- <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
- <% unless attaments_num == 0 %>
- (<%= attaments_num %>)
- <% end %>
- <% if User.current.member_of?(@project) %>
- <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
- <% end %>
-
- <% end%>
\ No newline at end of file
diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb
index 83352de9d..35d8f87ef 100644
--- a/app/views/layouts/_join_exit_project.html.erb
+++ b/app/views/layouts/_join_exit_project.html.erb
@@ -20,5 +20,4 @@
!Member.where(:user_id => User.current.id, :project_id => @project.id).first.roles.to_s.include?("Manager") %>
<%= exit_project_link(@project) %>
<% end %>
-
diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb
index 71975c5c3..beade0a7a 100644
--- a/app/views/layouts/base_projects.html.erb
+++ b/app/views/layouts/base_projects.html.erb
@@ -1,247 +1,245 @@
<% @nav_dispaly_project_label = 1
-@nav_dispaly_forum_label = 1 %>
+ @nav_dispaly_forum_label = 1 %>
<%#@nav_dispaly_project_label = 1 %>
-
-
-
- <%= render :partial => 'layouts/new_header'%>
+ else if($("#friend_organization").attr("checked") == "checked"){
+ project_type = 3;
+ }
+ $.get(
+ url,
+ { project_type: project_type},
+ function (data) {
+ if(data == 1)
+ {
+ $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_development_team), 1))%>");
+ $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/development_group')) %>');
+ $("#close_light").attr("onClick","close_window('development_group');");
+ }
+ else if(data == 2)
+ {
+ $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_research_group), 2))%>");
+ $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/research_team')) %>');
+ $("#close_light").attr("onClick","close_window('research_group');");
+ }
+ else if(data == 3)
+ {
+ $("#setting_project_type").replaceWith("<%= escape_javascript(project_type_link(l(:label_friend_organization), 3))%>");
+ $("#project_memu_list").html('<%= escape_javascript(render(:partial => 'projects/friend_group')) %>');
+ $("#close_light").attr("onClick","close_window('friend_organization');");
+ }
+ else
+ {
+ alert("服务器异常，请与管理员联系");
+ }
+ }
+ );
+ }
+
+
+
+
+
Date: Tue, 19 May 2015 10:19:49 +0800
Subject: [PATCH 012/134] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E4=B8=BB=E9=A1=B5?=
=?UTF-8?q?=E7=A7=81=E6=9C=89=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/stylesheets/application.css | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index edde12527..85ef3240a 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1904,6 +1904,18 @@ input.autocomplete.ajax-loading {
background-image: url(../images/loading.gif);
}
+.private_project {
+ position: relative;
+ bottom: 2px;
+ text-transform: uppercase;
+ background: #d22;
+ color: #fff;
+ font-weight: bold;
+ padding: 0px 2px 0px 2px;
+ font-size: 60%;
+ margin-right: 2px;
+ border-radius: 2px;
+}
/***** Flash & error messages ****/
#errorExplanation, div.flash, .nodata, .warning, .conflict {
padding: 4px 4px 4px 30px;
From 5cb9cc0903b737ad2cee8a34573f18e746d0c368 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 19 May 2015 10:35:17 +0800
Subject: [PATCH 013/134] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2211:course?=
=?UTF-8?q?=E4=B8=BB=E9=A1=B5--=E8=BF=98=E6=9C=89=E7=A9=BA=E9=97=B4?=
=?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=AF=BE=E7=A8=8B=E8=80=81=E5=B8=88=E7=9A=84?=
=?UTF-8?q?=E5=A7=93=E5=90=8D=E5=B0=B1=E4=B8=8D=E8=A6=81=E4=BB=A5=E7=9C=81?=
=?UTF-8?q?=E7=95=A5=E5=8F=B7=E7=BB=93=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/welcome/_course_list.html.erb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/app/views/welcome/_course_list.html.erb b/app/views/welcome/_course_list.html.erb
index 0d979c769..111c0abb1 100644
--- a/app/views/welcome/_course_list.html.erb
+++ b/app/views/welcome/_course_list.html.erb
@@ -5,13 +5,13 @@
+ <%= render :partial => 'layouts/new_header'%>
+
+
+
+
+
+
+
+
+ <%= form_tag(projects_search_path, :method => :get, :id => "project_search_form", :class => "search_form") do %>
+ <%= text_field_tag 'name', params[:name], :placeholder => "项目名称", :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %>
+
+ <%= l(:label_search)%>
+
+
+
+ <% end %>
+
+
+
+
+
+
-
- <%= render :partial => 'layouts/new_feedback' %>
-
-
- <%= call_hook :view_layouts_base_body_bottom %>
-
+
+
+
+
+ <%= image_tag(url_to_avatar(@project), :width => "60", :height => "60") %>
+
+
+ <%= l(:label_project_id)%><%= @project.id %>
+
+
+
+ <% text = @project.project_new_type == 1 ? l(:label_development_team) : (@project.project_new_type == 2 ? l(:label_research_group) : l(:label_friend_organization))%>
+ <% typeclass = @project.project_new_type == 1 ? "pr_kafa" : (@project.project_new_type == 2 ? "pr_keyan" : "pr_friend")%>
+ <%= render 'layouts/join_exit_project',{:text => text, :typeclass => typeclass} %>
+
+
+
+
+ <%= link_to l(:label_project_name)+"#{@project.name}", project_path(@project.id), :class=>"pr_info_name fl c_dark fb break_word" %>
+ <% if @project.is_public? %>
+ <%= l(:label_public)%>
+ <% else %>
+ <%= l(:label_private)%>
+ <% end %>
+
+
+ <% if @project.project_type == 0 %>
+ <%= l(:label_project_score)%> :
+ <%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects',
+ :action => 'show_projects_score',
+ :remote => true,
+ :id => @project.id}, :class => "c_orange f14" ) %>
+ <% end %>
+
-
-
-
-
-
+
+
- <%= form_tag(projects_search_path, :method => :get, :id => "project_search_form", :class => "search_form") do %>
- <%= text_field_tag 'name', params[:name], :placeholder => "项目名称", :class => "search_text fl", :onkeyup => "regexName('#{l(:label_search_conditions_not_null)}');" %>
-
- <%= l(:label_search)%>
-
-
-
+
+
+ <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue' %>）
+ |
+ <%= l(:label_user_watcher) %>（<%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'info_foot_num c_blue' %>）
+ |
+ <%= l(:project_module_attachments) %>（
+ <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %>
+ <%= link_to "#{attaments_num}", project_files_path(@project), :class => 'info_foot_num c_blue' %>）
+
+
+
+ <% if User.current.member_of?(@project) %>
+
- <%= l(:label_invite)%>
+
-
-
-
+
-
-
-
-
-
-
- <%= image_tag(url_to_avatar(@project), :width => "60", :height => "60") %>
-
-
- <%= l(:label_project_id)%><%= @project.id %>
-
-
-
- <% text = @project.project_new_type == 1 ? l(:label_development_team) : (@project.project_new_type == 2 ? l(:label_research_group) : l(:label_friend_organization))%>
- <% typeclass = @project.project_new_type == 1 ? "pr_kafa" : (@project.project_new_type == 2 ? "pr_keyan" : "pr_friend")%>
- <%= render 'layouts/join_exit_project',{:text => text, :typeclass => typeclass} %>
-
-
-
-
- <%= link_to l(:label_project_name)+"#{@project.name}", project_path(@project.id), :class=>"pr_info_name fl c_dark fb break_word" %>
- <% if @project.is_public? %>
- <%= l(:label_public)%>
- <% else %>
- <%= l(:label_private)%>
- <% end %>
-
-
-
- <% if @project.project_type == 0 %>
- <%= l(:label_project_score)%> :
- <%= link_to(format("%.2f" ,project_scores(@project) ).to_i, {:controller => 'projects',
- :action => 'show_projects_score',
- :remote => true,
- :id => @project.id
- }, :class => "c_orange f14" ) %>
- <% end %>
-
-
-
-
- <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue' %>）
- |
- <%= l(:label_user_watcher) %>（<%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'info_foot_num c_blue' %>）
- |
- <%= l(:project_module_attachments) %>（
- <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %>
- <%= link_to "#{attaments_num}", project_files_path(@project), :class => 'info_foot_num c_blue' %>）
-
-
-
- <% if User.current.member_of?(@project) %>
-
-
-
-
- <%= l(:label_invite)%>
-
- <% end %>
-
-
-
- <% if @project.project_new_type == 1 || @project.project_new_type.nil? %>
- <%= render :partial => 'layouts/base_development_group', :locals => {:project => @project}%>
- <% elsif @project.project_new_type == 2 %>
- <%= render :partial => 'layouts/base_research_team', :locals => {:project => @project}%>
- <% else %>
- <%= render :partial => 'layouts/base_friend_group', :locals => {:project => @project}%>
- <% end %>
-
-
-
-
+
+ <% end %>
+
+
+
-
- <%= l(:label_project_overview)%>：
-
- <%= textilizable(@project.description) if @project.description && !@project.description.blank? %>
-
-
-
-
- 
-
-
-
-
-
+ <% if @project.project_new_type == 1 || @project.project_new_type.nil? %>
+ <%= render :partial => 'projects/development_group', :locals => {:project => @project}%>
+ <% elsif @project.project_new_type == 2 %>
+ <%= render :partial => 'projects/research_team', :locals => {:project => @project}%>
+ <% else %>
+ <%= render :partial => 'projects/friend_group', :locals => {:project => @project}%>
+ <% end %>
+
+
+
-
- <%= l(:label_tag)%>:
-
-
-
-
-
+
-
+
+ <%= l(:label_project_overview)%>：
+
+ <%= textilizable(@project.description) if @project.description && !@project.description.blank? %>
+
+
+
+
+
+
+
+
+
+
- <%= render_flash_messages %>
- <%= yield %>
- <%= call_hook :view_layouts_base_content %>
-
-
-
-
- <%= render :partial => 'layouts/new_footer'%>
+
+
+
- <%= l(:label_tag)%>:
+
+
+
-
-
- <% text = @project.project_new_type == 1 ? "development_group" : (@project.project_new_type == 2 ? "research_group" : "friend_organization")%>
-
-
-
+ 请选择项目类型：
--
-
- id="development_group"/> -
- id="research_group"/> -
- id="friend_organization"/> -
+ <%= render_flash_messages %>
+ <%= yield %>
+ <%= call_hook :view_layouts_base_content %>
+
+
+
+
+ <%= render :partial => 'layouts/new_footer'%>
+
+
+
+ <% text = @project.project_new_type == 1 ? "development_group" : (@project.project_new_type == 2 ? "research_group" : "friend_organization")%>
+
+
+
+<%= render :partial => 'layouts/new_feedback' %>
+
+
+<%= call_hook :view_layouts_base_body_bottom %>
+
diff --git a/app/views/projects/_development_group.html.erb b/app/views/projects/_development_group.html.erb
new file mode 100644
index 000000000..7f79fc5f1
--- /dev/null
+++ b/app/views/projects/_development_group.html.erb
@@ -0,0 +1,52 @@
+<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %>
+
+
+请选择项目类型：
+-
+
- id="development_group"/> +
- id="research_group"/> +
- id="friend_organization"/> +
+ <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
+ <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
+ (<%= ForgeActivity.where("project_id = ?", @project.id).count %>)
+ <% end %>
+
+<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
+
+ <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
+ <% unless @project.issues.count == 0 %>
+ (<%= @project.issues.count %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
+ <% end %>
+
+<% end %>
+<% unless @project.enabled_modules.where("name = 'boards'").empty? %>
+
+ <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
+ <% unless @project.boards.first.topics.count == 0 %>
+ (<%= @project.boards.first.topics.count %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+ <% end %>
+
+<% end%>
+<% unless @project.enabled_modules.where("name = 'files'").empty? %>
+
+ <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
+ <% unless attaments_num == 0 %>
+ (<%= attaments_num %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
+ <% end %>
+
+<% end %>
+<%# --版本库被设置成私有、module中设置不显示、没有创建版本库 三种情况不显示-- %>
+<% if visible_repository?(@project) %>
+
+ <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
+ (<%= @project.repositories.count %>)
+
+<% end %>
+
+<%= l(:label_project_more) %>
+
\ No newline at end of file
diff --git a/app/views/projects/_friend_group.html.erb b/app/views/projects/_friend_group.html.erb
new file mode 100644
index 000000000..dca5473f7
--- /dev/null
+++ b/app/views/projects/_friend_group.html.erb
@@ -0,0 +1,29 @@
+<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %>
+
+ <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
+ <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
+ (<%= ForgeActivity.where("project_id = ?", @project.id).count %>)
+ <% end %>
+
+<% unless @project.enabled_modules.where("name = 'boards'").empty? %>
+
+ <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
+ <% unless @project.boards.first.topics.count == 0 %>
+ (<%= @project.boards.first.topics.count %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+ <% end %>
+
+<% end%>
+<% unless @project.enabled_modules.where("name = 'files'").empty? %>
+
+ <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
+ <% unless attaments_num == 0 %>
+ (<%= attaments_num %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
+ <% end %>
+
+<% end %>
\ No newline at end of file
diff --git a/app/views/projects/_research_team.html.erb b/app/views/projects/_research_team.html.erb
new file mode 100644
index 000000000..2a0ad1ef3
--- /dev/null
+++ b/app/views/projects/_research_team.html.erb
@@ -0,0 +1,40 @@
+<% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count %>
+
+ <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :class => "f14 c_blue02" %>
+ <% unless ForgeActivity.where("project_id = ?", @project.id).count == 0 %>
+ (<%= ForgeActivity.where("project_id = ?", @project.id).count %>)
+ <% end %>
+
+<% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %>
+
+ <%= link_to l(:label_issue_tracking), project_issues_path(@project), :class => "f14 c_blue02" %>
+ <% unless @project.issues.count == 0 %>
+ (<%= @project.issues.count %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :class => "subnav_green" %>
+ <% end %>
+
+<% end %>
+<% unless @project.enabled_modules.where("name = 'boards'").empty? %>
+
+ <%= link_to l(:project_module_boards), project_boards_path(@project), :class => "f14 c_blue02" %>
+ <% unless @project.boards.first.topics.count == 0 %>
+ (<%= @project.boards.first.topics.count %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects', :class => "subnav_green ml105" %>
+ <% end %>
+
+<% end%>
+<% unless @project.enabled_modules.where("name = 'files'").empty? %>
+
+ <%= link_to l(:project_module_files), project_files_path(@project), :class => "f14 c_blue02" %>
+ <% unless attaments_num == 0 %>
+ (<%= attaments_num %>)
+ <% end %>
+ <% if User.current.member_of?(@project) %>
+ <%= link_to "+"+l(:label_upload_source), project_files_path(@project,:flag => true), :class => "subnav_green ml95" %>
+ <% end %>
+
+<% end%>
\ No newline at end of file
From 6c6ae38f7a18b149746dfc0ed05dc99267edc7ca Mon Sep 17 00:00:00 2001
From: huang
-
+
<%= link_to(course.try(:teacher).try(:realname).truncate(6, omission: '...'), user_path(course.teacher)) %>
<%#=course.try(:teacher).try(:name)%>
From 895058f38ecb81c2a0eca44b12fba663516264a0 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 19 May 2015 11:30:31 +0800
Subject: [PATCH 014/134] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2154:=E6=88=90?=
=?UTF-8?q?=E5=8A=9F=E4=B8=8A=E4=BC=A0=E8=AF=BE=E4=BB=B6=EF=BC=8C=E8=AF=BE?=
=?UTF-8?q?=E7=A8=8B=E8=B5=84=E6=BA=90=E6=95=B0=E7=BB=9F=E8=AE=A1=E6=9C=AA?=
=?UTF-8?q?=E8=87=AA=E5=8A=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/files/create.js.erb | 2 ++
app/views/layouts/base_courses.html.erb | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/app/views/files/create.js.erb b/app/views/files/create.js.erb
index b00ae3612..87bf5b864 100644
--- a/app/views/files/create.js.erb
+++ b/app/views/files/create.js.erb
@@ -27,6 +27,8 @@ $('#upload_file_div').slideToggle('slow');
<%elsif @course%>
closeModal();
$("#resource_list").html('<%= j(render partial: "course_file" ,locals: {course: @course}) %>');
+ $("#courses_files_count_info").html("<%= @all_attachments.count%>");
+ $("#courses_files_count_nav").html("(<%= @all_attachments.count%>)")
<% end %>
<% end %>
$(document).ready(img_thumbnails);
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 6820ccaf3..070a99d08 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -95,7 +95,7 @@
|
<%= l(:label_account_identity_student)%>（<%= course_student_link student_num %>）
|
- <%= l(:project_module_attachments)%>（<%= link_to course_file_num, course_files_path(@course), :class => 'info_foot_num c_blue' %>）
+ <%= l(:project_module_attachments)%>（<%= link_to course_file_num, course_files_path(@course), :class => 'info_foot_num c_blue',:id=>'courses_files_count_info' %>）
@@ -127,7 +127,7 @@
<%= link_to l(:label_course_file), course_files_path(@course), :class => "f14 c_blue02" %>
- <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange" %>
+ <%= link_to "(#{course_file_num})", course_files_path(@course), :class => "subnav_num c_orange",:id=>'courses_files_count_nav' %>
<%= link_to( "+#{l(:label_upload_files)}", course_files_path(@course), :class => 'subnav_green ml95 c_white') if is_teacher %>
From f3da7979f85389097abf2c0d84ba8bb230b88ab7 Mon Sep 17 00:00:00 2001
From: yutao <283765470@qq.com>
Date: Tue, 19 May 2015 12:22:53 +0800
Subject: [PATCH 015/134] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug#2476=20:=20?=
=?UTF-8?q?=E9=A1=B9=E7=9B=AE--=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA?=
=?UTF-8?q?=EF=BC=9A=E5=85=B3=E4=BA=8E=E4=B8=8A=E4=BC=A0=E9=99=84=E4=BB=B6?=
=?UTF-8?q?=E7=9A=84=E6=8F=8F=E8=BF=B0=E7=9A=84=E6=98=BE=E7=A4=BA=E9=97=AE?=
=?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/attachments/_project_file_links.html.erb | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/app/views/attachments/_project_file_links.html.erb b/app/views/attachments/_project_file_links.html.erb
index a18d819da..fe0e9ab97 100644
--- a/app/views/attachments/_project_file_links.html.erb
+++ b/app/views/attachments/_project_file_links.html.erb
@@ -28,7 +28,8 @@