From 1e262ec73174967d533937bf3c783f245346be44 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 11 Mar 2015 15:32:50 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B5=84=E6=BA=90=E9=93=BE=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 1 + app/views/files/_project_file.html.erb | 2 +- app/views/layouts/base_projects.html.erb | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index aacb32990..42fd40606 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -99,6 +99,7 @@ class FilesController < ApplicationController end def index + @flag = params[:flag] || false #sort_init 'filename', 'asc' sort_init 'created_on', 'desc' sort_update 'created_on' => "#{Attachment.table_name}.created_on", diff --git a/app/views/files/_project_file.html.erb b/app/views/files/_project_file.html.erb index e204030f1..aa597f3f2 100644 --- a/app/views/files/_project_file.html.erb +++ b/app/views/files/_project_file.html.erb @@ -11,7 +11,7 @@ <%= link_to(l(:label_upload_files), 'javascript:void(0);', :class => 'icon m5p5 button_submit', :onclick => "$('#relation_file_div').slideUp();$('#upload_file_div').slideToggle('slow');") if User.current.allowed_to?(:manage_files, @project) %> <%= link_to(l(:label_relation_files), 'javascript:void(0);', :onclick => "$('#upload_file_div').slideUp();$('#relation_file_div').slideToggle();", :class => 'icon m5p5 button_submit') if User.current.allowed_to?(:manage_files, @project) %>

-
+
-

<%= l(:label_project_overview)%>

<%= @project.description %> -
- <%= l(:label_expend_information)%> +
+

<%= l(:label_project_overview) %>：

<%= @project.description %>
-
+
<%= l(:label_expend_information) %>
+
+

<%= l(:label_tag)%>:

diff --git a/public/images/jiantou.jpg b/public/images/jiantou.jpg new file mode 100644 index 0000000000000000000000000000000000000000..cd28409886d0f4f3d97e76ce5e6f920a4458da3e GIT binary patch literal 7528 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 Date: Thu, 12 Mar 2015 08:42:39 +0800 Subject: [PATCH 07/11] =?UTF-8?q?JS=E5=86=B2=E7=AA=81=EF=BC=8C=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=E5=A4=9A=E4=BD=99=E6=A0=87=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 934b4c955..d336e26fc 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -63,10 +63,9 @@ }) function show_more_msg() - {$("#course_description").toggleClass("course_description_none");} - - + {$("#course_description").toggleClass("course_description_none");} + <%= form_tag(projects_search_path, :method => :get, :id => "project_search_form") do %> <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => "regexName();", :style => "float:left" %> <%= hidden_field_tag 'project_type', params[:project_type] %> @@ -193,7 +192,7 @@
-

<%= l(:label_project_overview) %>：

<%= @project.description %> +

<%= l(:label_project_overview) %>

<%= @project.description %>
<%= l(:label_expend_information) %>
From 64bbbff87921160a8cddf7d5344f76e912e0ef78 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 12 Mar 2015 09:03:25 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=87=8C=E7=A8=8B?= =?UTF-8?q?=E7=A2=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_tools_expand.html.erb | 4 ++++ app/views/versions/index.html.erb | 3 +++ app/views/versions/show.html.erb | 3 +++ 3 files changed, 10 insertions(+) diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb index 8608bdfb8..64a29dc0a 100644 --- a/app/views/projects/_tools_expand.html.erb +++ b/app/views/projects/_tools_expand.html.erb @@ -33,6 +33,10 @@ <%= link_to l(:project_module_documents), project_documents_path(@project) %> <% end %> + +
  • + <%= link_to l(:label_roadmap) ,project_roadmap_path(@project) %> +
  • <%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%>
    • diff --git a/app/views/versions/index.html.erb b/app/views/versions/index.html.erb index 184eb0f18..82a7a66e6 100644 --- a/app/views/versions/index.html.erb +++ b/app/views/versions/index.html.erb @@ -1,4 +1,7 @@ +
    +

    <%= l(:label_roadmap) %>

    +
    <%= link_to l(:label_version_new), new_project_version_path(@project), :class => 'icon icon-add' if User.current.allowed_to?(:manage_versions, @project) %>
    diff --git a/app/views/versions/show.html.erb b/app/views/versions/show.html.erb index bce5bc771..eb463300b 100644 --- a/app/views/versions/show.html.erb +++ b/app/views/versions/show.html.erb @@ -1,4 +1,7 @@ +
    +

    <%= l(:label_roadmap) %>

    +
    <%= link_to(l(:button_edit), edit_version_path(@version), :class => 'icon icon-edit') if User.current.allowed_to?(:manage_versions, @version.project) %> <%= link_to_if_authorized(l(:button_edit_associated_wikipage, From 5258b7585bb8f12f83bd359d1632eb707df0f876 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 12 Mar 2015 09:36:03 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=A4=84=E7=90=86=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 430 ++++++++++++----------- 1 file changed, 221 insertions(+), 209 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index d7f6ddeb5..cc6920635 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -1,221 +1,233 @@ <% @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 %> - <%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', 'application', 'nyan', :media => 'all' %> - <%= stylesheet_link_tag 'rtl', :media => 'all' if l(:direction) == 'rtl' %> - <%= javascript_heads %> - <%= heads_for_theme %> - <%= hubspot_head %> - <%= call_hook :view_layouts_base_html_head %> - - <%= yield :header_tags -%> - - - -
    -
    -
    - <%= render :partial => 'layouts/base_header'%> -
    -
    - - - - - - - - - -
    软件项目托管社区 <%= l(:label_user_location) %> : -
    - - <%= form_tag(projects_search_path, :method => :get, :id => "project_search_form") do %> - <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => "regexName();", :style => "float:left" %> - <%= hidden_field_tag 'project_type', params[:project_type] %> - <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %> - <%= l(:label_search)%> -
    - - <% end %> -
    -

    - <%= link_to l(:label_home),home_path %> > - <%= link_to @project, project_path(@project) %> -

    -
    - - -
    + <%= form_tag(projects_search_path, :method => :get, :id => "project_search_form") do %> + <%= text_field_tag 'name', params[:name], :size => 20, :onkeyup => "regexName();", :style => "float:left" %> + <%= hidden_field_tag 'project_type', params[:project_type] %> + <%#= submit_tag l(:label_search), :class => "enterprise", :name => nil %> + <%= l(:label_search)%> +
    + + <% end %> +
    + + + +

    + <%= link_to l(:label_home),home_path %> > + <%= link_to @project, project_path(@project) %> +

    + + +
    + + - <%= call_hook :view_layouts_base_body_bottom %> -
    - +
    + <% if User.current.member_of?(@project) %> +
    <%= l(:label_invite)%>
    +
      +
    • <%= link_to l(:label_invite_new_user), :controller=>"projects", :action=>"invite_members_by_mail", :id => @project %>
      • +
    • <%= link_to l(:label_invite_trustie_user), :controller=>"projects", :action=>"invite_members", :id => @project %>
      • +
    + <% end %> +
    + <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> +
    + <% unless @project.enabled_modules.where("name = 'issue_tracking'").empty? %> +
    + <%= link_to l(:label_issue_tracking), project_issues_path(@project), :style => "color:#3CA5C6" %>(<%= @project.issues.count %>) + + <% if User.current.member_of?(@project) %> + <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> + <% end %> +
    + <% end %> + <% unless @project.enabled_modules.where("name = 'boards'").empty? %> +
    + <%= link_to l(:project_module_boards), project_boards_path(@project), :style => "color:#3CA5C6" %> + (<%= @project.boards.first.topics.count %>) + <% if User.current.member_of?(@project) %> + <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %> + <% end %> +
    + <% end%> + <% unless @project.enabled_modules.where("name = 'files'").empty? %> +
    + <%= link_to l(:label_course_file), project_files_path(@project), :style => "color:#3CA5C6" %>(<%= @project.attachments.count %>) + <% if User.current.member_of?(@project) %> + <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> + <% end %> +
    + <% end%> + <% unless @project.enabled_modules.where("name = 'repository'").empty? %> +
    + <%= link_to l(:project_module_repository), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> + (<%= @project.repositories.count %>) + <%# if User.current.member_of?(@project) %> + <%#= link_to "+"+l(:project_module_create_repository), new_project_repository_path(@project),:style => "font-size:12px;color:#fff; padding:1px 3px 3px 3px;height:18px;margin-top:3px;background:#28be6c;float:right;line-height:20px;" %> + <%# end %> +
    + <% end %> + +
    <%= l(:label_more) %>
    +
      + <%= render 'projects/tools_expand' %> +
    +
    +
    + +
    +
    +

    <%= l(:label_project_overview) %>

    <%= @project.description %> +
    +
    <%= l(:label_expend_information) %>
    +
    + +
    +

    <%= l(:label_tag)%>:

    +
    +
    +
    + <%= render :partial => 'tags/project_tag', :locals => {:obj => @project,:object_flag => "2"}%> +
    +
    +
    +
    +
    +
    +
    +
    + + <%= render_flash_messages %> + <%= yield %> + <%= call_hook :view_layouts_base_content %> +
    +
    + <%= render :partial => 'layouts/base_footer'%> +
    + + + +
    +
    + <%= call_hook :view_layouts_base_body_bottom %> + + From 65ee3fdc742cafb83260ca43034230d297621309 Mon Sep 17 00:00:00 2001 From: whimlex Date: Thu, 12 Mar 2015 09:47:42 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=EF=BC=8C=E9=A1=B9=E7=9B=AE=E4=B8=BB?= =?UTF-8?q?=E9=A1=B5JS=E5=86=B2=E7=AA=81=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 11 ----------- app/views/projects/_tools_expand.html.erb | 4 ++-- config/locales/commons/en.yml | 2 +- config/locales/commons/zh.yml | 2 +- config/locales/projects/en.yml | 1 + config/locales/projects/zh.yml | 21 +++++++++++++++++++++ config/locales/zh.yml | 15 ++++++--------- 7 files changed, 32 insertions(+), 24 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index d336e26fc..10ff1538b 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -87,17 +87,6 @@