From c6788e2f40f0b45ff19bf48d3c3a87b2402c6274 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 7 Mar 2015 15:30:37 +0800 Subject: [PATCH 01/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 2 +- lib/redmine/activity/fetcher.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 5e2f76705..48c08e2fc 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -447,7 +447,7 @@ class UsersController < ApplicationController activity = activity.reject { |e| !User.current.admin? && (((e.act_type == "Issue") && !e.act.project.visible?(User.current)) || - (e.act_type == "Bid" && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) || + (e.act_type == "Bid" && !e.act.courses.first.nil? && e.act.courses.first.is_public == 0 && !User.current.member_of_course?(e.act.courses.first)) || (e.act_type == "Journal" && e.act.respond_to?("Project") && !e.act.project.visible?(User.current)) || (e.act_type == "News" && ((!e.act.project.nil? && !e.act.project.visible?(User.current)) || (!e.act.course.nil? && e.act.course.is_public == 0 && !User.current.member_of_course?(e.act.course)))) || (e.act_type == "Message" && !e.act.board.nil? && ((!e.act.board.project.nil? && !e.act.board.project.visible?(User.current)) || (!e.act.board.course.nil? && e.act.board.course.is_public == 0 && !User.current.member_of_course?(e.act.board.course))))) diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb index c4adc6adb..5f811f8d4 100644 --- a/lib/redmine/activity/fetcher.rb +++ b/lib/redmine/activity/fetcher.rb @@ -119,7 +119,7 @@ module Redmine #else # e += [cur_obj] #end - if cur_obj.project != nil && cur_obj.project.project_status != nil && cur_obj.project.is_public == true + if cur_obj.project.respond_to?("Project") && cur_obj.project != nil && cur_obj.project.project_status != nil && cur_obj.project.is_public == true e += [cur_obj] #else # e += [cur_obj] From 770704790d94ae5e489a02fcf44849833c4036aa Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 7 Mar 2015 16:40:07 +0800 Subject: [PATCH 02/11] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/redmine/activity/fetcher.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/redmine/activity/fetcher.rb b/lib/redmine/activity/fetcher.rb index 5f811f8d4..c4adc6adb 100644 --- a/lib/redmine/activity/fetcher.rb +++ b/lib/redmine/activity/fetcher.rb @@ -119,7 +119,7 @@ module Redmine #else # e += [cur_obj] #end - if cur_obj.project.respond_to?("Project") && cur_obj.project != nil && cur_obj.project.project_status != nil && cur_obj.project.is_public == true + if cur_obj.project != nil && cur_obj.project.project_status != nil && cur_obj.project.is_public == true e += [cur_obj] #else # e += [cur_obj] From 6a7c7a732cc8914a8a9511b23595399990ee68fb Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 7 Mar 2015 17:08:36 +0800 Subject: [PATCH 03/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E6=8A=A5500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/index.html.erb | 42 ++------------------------------ 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index b1a699afa..51139ac89 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -110,45 +110,7 @@ -
- -
- -
+
-<%= paginate @events_pages %> \ No newline at end of file +<%= paginate @events_pages, :window => 3%> \ No newline at end of file From 659a87ef606736927c9c02acc345ae0e46f89384 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 9 Mar 2015 09:11:57 +0800 Subject: [PATCH 08/11] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=8C=96=E6=A0=87=E7=AD=BE=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_my_joinedcourse.html.erb | 4 ++-- config/locales/en.yml | 2 ++ config/locales/zh.yml | 2 ++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/views/users/_my_joinedcourse.html.erb b/app/views/users/_my_joinedcourse.html.erb index 373ed9234..e616004e6 100644 --- a/app/views/users/_my_joinedcourse.html.erb +++ b/app/views/users/_my_joinedcourse.html.erb @@ -16,8 +16,8 @@
<%= link_to "#{l(:label_course_new)}", new_course_path, class: 'icon icon-add' if @user == User.current %>
diff --git a/config/locales/en.yml b/config/locales/en.yml index 857259392..bebfb5605 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1876,3 +1876,5 @@ en: label_submit_comments: Submit_comments label_course_empty_select: You have not selected course！ label_enterprise_page_made: enterprise_page + + label_add_tag: Add Tag diff --git a/config/locales/zh.yml b/config/locales/zh.yml index c6e303b00..8bcb8284b 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2580,3 +2580,5 @@ zh: label_part_enterprise_tips: 您可能对系统的其它项目感兴趣！ label_enterprise_nil: 该模块为最新上线模块，目前还没有创建企业项目！ label_enterprises: 组织 + + label_add_tag: 添加标签 From 8c44d2575070b7eba6c1e289c46652bc5cd47d99 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 9 Mar 2015 10:27:32 +0800 Subject: [PATCH 09/11] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E6=A0=87=E7=AD=BE=E6=90=9C=E7=B4=A2=E4=B8=AD=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/tags/_show_attachments.html.erb | 33 +++++++++++++++++------ config/locales/zh.yml | 7 +++++ 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/app/views/tags/_show_attachments.html.erb b/app/views/tags/_show_attachments.html.erb index 509acc0ba..a76211fc6 100644 --- a/app/views/tags/_show_attachments.html.erb +++ b/app/views/tags/_show_attachments.html.erb @@ -9,18 +9,35 @@
- <%= l(:label_attachment) %>:  <%= file.filename %> + + <%= l(:label_attachment) %>: +    + <%= file.filename %> + - <%= link_to_attachment file, {:download => true, :text => image_tag("/images/button/dl.png", width: "70px", alt: l(:button_download), :class => 'download_icon')}%> + <%= link_to_attachment file, {:download => true, :text => image_tag("/images/button/dl.png", width: "70px", alt: l(:button_download), :class => 'download_icon')}%>
- <%= l(:field_description) %>:  <%= file.description %> -
<%= l('attachment.category')%><%=result_come_from file%>
+ + <%= l(:field_description) %> + : +    + <%= file.description %> +
+ <%= l('label_attachment_category')%> + <%=result_come_from file%> +
- <%= l('attachment.download_num')%><%= file.downloads%>| - <%= l('attachment.size')%><%= number_to_human_size(file.filesize) %>| - <%= l('attachment.sharer')%><%= link_to file.author, user_path(file.author), target: "_blank" unless file.author.blank? %>| - <%= l('attachment.upload_time')%><%= format_time(file.created_on) %> + <%= l('label_attachment_download_num')%> + <%= file.downloads%>| + <%= l('label_attachment_size')%> + <%= number_to_human_size(file.filesize) %>| + <%= l('label_attachment_sharer')%> + + <%= link_to file.author, user_path(file.author), target: "_blank" unless file.author.blank? %> + | + <%= l('label_attachment_upload_time')%> + <%= format_time(file.created_on) %>
diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 8bcb8284b..2b4e41755 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2582,3 +2582,10 @@ zh: label_enterprises: 组织 label_add_tag: 添加标签 + label_tags_opensource: 开源项目 + label_attachment_category: 所属分类 + label_attachment_download_num: 下载 + label_attachment_size: 大小 + label_attachment_sharer: 共享者 + label_attachment_upload_time: 上传时间 + From d947ebff0cfbdc132c52c00070ec2f4590f0f266 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 9 Mar 2015 10:31:05 +0800 Subject: [PATCH 10/11] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 494341ab3..8bf84d90c 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -135,10 +135,10 @@ <% end %>
- <%= link_to "动态", {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> + <%= link_to l(:label_activity), {:controller => 'projects', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %>
- <%= link_to "问题跟踪", project_issues_path(@project), :style => "color:#3CA5C6" %>(<%= @project.issues.count %>) + <%= link_to l(:label_issue_tracking), project_issues_path(@project), :style => "color:#3CA5C6" %>(<%= @project.issues.count %>) <% if User.current.logged? && User.current.member_of?(@project) %> <%= link_to "+发布问题", 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;" %> @@ -148,24 +148,24 @@ <%= link_to "讨论区", project_boards_path(@project), :style => "color:#3CA5C6" %> (<%= @project.boards.first.topics.count %>) <% if User.current.logged? && User.current.member_of?(@project) %> - <%= link_to "+发贴", new_board_message_path(@project.boards.first), :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;" %> + <%= link_to "+发贴", new_board_message_path(@project.boards.first, 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 %>
- <%= link_to "资源库", project_files_path(@project), :style => "color:#3CA5C6" %>(<%= @project.attachments.count %>) + <%= link_to l(:label_course_file), project_files_path(@project), :style => "color:#3CA5C6" %>(<%= @project.attachments.count %>) <% if User.current.logged? && User.current.member_of?(@project) %> <%= link_to "+上传资源", new_project_file_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 %>
- <%= link_to "版本库", {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> + <%= link_to l(:field_user_active_changeset), {:controller => 'repositories', :action => 'show', :id => @project.id}, :style => "color:#3CA5C6" %> (<%= @project.repositories.count %>) <% if User.current.logged? && User.current.member_of?(@project) %> <%= link_to "+创建版本库", 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 %>
-
更多
+
<%= l(:label_more) %>
From 0402fee6deda19d6d5f29dda9d51f1891378e2c5 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 9 Mar 2015 11:31:42 +0800 Subject: [PATCH 11/11] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E9=82=80=E8=AF=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/_invite_members_by_mail.html.erb | 24 ------------------ app/views/projects/invite_members.html.erb | 6 +---- .../projects/invite_members_by_mail.html.erb | 25 ++++++++++++++++++- .../projects/invite_members_by_mail.js.erb | 10 -------- 4 files changed, 25 insertions(+), 40 deletions(-) delete mode 100644 app/views/projects/_invite_members_by_mail.html.erb delete mode 100644 app/views/projects/invite_members_by_mail.js.erb diff --git a/app/views/projects/_invite_members_by_mail.html.erb b/app/views/projects/_invite_members_by_mail.html.erb deleted file mode 100644 index 42a36bce0..000000000 --- a/app/views/projects/_invite_members_by_mail.html.erb +++ /dev/null @@ -1,24 +0,0 @@ -
-
-
-
-

发送邮件邀请新用户

-

输入好友邮箱地址，Trustie帮您免费发送！

-
- <%= render :partial => 'regested', locals: { :isregisted => false} %> -
- <%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get',:remote=>true) do %> -
    -
  • - <%= text_field_tag 'mail', '邮箱', :class => "fb_item fl" %> -
    • -
    - -
    -
- <%= submit_tag '免费发送', :class=> "btn_free" %> - - <% end %> -
- -
\ No newline at end of file diff --git a/app/views/projects/invite_members.html.erb b/app/views/projects/invite_members.html.erb index 8b0a5a183..d31a5bbe8 100644 --- a/app/views/projects/invite_members.html.erb +++ b/app/views/projects/invite_members.html.erb @@ -44,11 +44,7 @@ <% end %> <% end %>
- - - - - +