diff --git a/app/views/layouts/_base_development_group.html.erb b/app/views/layouts/_base_development_group.html.erb deleted file mode 100644 index 218fc186d..000000000 --- a/app/views/layouts/_base_development_group.html.erb +++ /dev/null @@ -1,52 +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 %> - <%# --版本库被设置成私有、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 %> - - - \ 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 %> - - - <%= h html_title %> - - - <%= csrf_meta_tag %> - <%= favicon %> - <%= javascript_heads %> - <%= heads_for_theme %> - <%= stylesheet_link_tag 'public', 'pleft', 'project','jquery/jquery-ui-1.9.2' %> - <%= javascript_include_tag 'cookie','project', 'header','select_list_move' %> - <%= call_hook :view_layouts_base_html_head %> - - <%= yield :header_tags -%> + + + <%= h html_title %> + + + <%= csrf_meta_tag %> + <%= favicon %> + <%= javascript_heads %> + <%= heads_for_theme %> + <%= stylesheet_link_tag 'public', 'pleft', 'project','jquery/jquery-ui-1.9.2' %> + <%= javascript_include_tag 'cookie','project', 'header','select_list_move' %> + <%= call_hook :view_layouts_base_html_head %> + + <%= yield :header_tags -%> - - - - - -
- <%= 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("服务器异常，请与管理员联系"); + } + } + ); + } + + + + +
+ <%= render :partial => 'layouts/new_header'%> +
+ + +
+
+

+ + <%= l(:label_projects_community) %> + +

+ +
+
+ <%= 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 %> +
+
+
+
+
+ +
+ <%= 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_projects_community) %> - -

- -
-
+ +
+ <%= 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' %>） +
+
+
- <%= 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)%> - -
- + +
+ <% if User.current.member_of?(@project) %> + +
    +
  • <%= link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %>
    • + <% if User.current.allowed_to?(:manage_members, @project) %> +
  • <%= link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %>
    • <% end %> -
-
-
-
-
- -
- <%= 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) %> - -
    -
  • <%= link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %>
    • - <% if User.current.allowed_to?(:manage_members, @project) %> -
  • <%= link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %>
    • - <% end %> -
- <% 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 %> -
- -
-
- - -
-
-

<%= l(:label_project_overview)%>：

-
- <%= textilizable(@project.description) if @project.description && !@project.description.blank? %> -
-
-
- - - - -
-
+ + <% end %> + + +
+ <% 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)%>:

-
-
- <%= render :partial => 'tags/project_tag', :locals => {:obj => @project,:object_flag => "2"}%> -
-
-
-
-
-
+ +
+
+

<%= 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)%>:

+
+
+ <%= render :partial => 'tags/project_tag', :locals => {:obj => @project,:object_flag => "2"}%> +
+
-
-
- - <% 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"/>
    • -
- 确定 - -
+
-
123
- <%= render :partial => 'layouts/new_feedback' %> - - - <%= call_hook :view_layouts_base_body_bottom %> - +
+ +
+ <%= 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")%> +
+
+

请选择项目类型：

+
    +
  • id="development_group"/>
    • +
  • id="research_group"/>
    • +
  • id="friend_organization"/>
    • +
+ 确定 + +
+
+
123
+<%= 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 %> +
+ <%= 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 %> + + + \ 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