From 579f1d4d3115248210f70c4335f9833c4d235dcb Mon Sep 17 00:00:00 2001 From: yanxd Date: Fri, 13 Jun 2014 17:32:05 +0800 Subject: [PATCH 01/18] start align-center --- app/views/contests/show_attendingcontest.html.erb | 3 ++- app/views/softapplications/show.html.erb | 7 ++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/views/contests/show_attendingcontest.html.erb b/app/views/contests/show_attendingcontest.html.erb index 8a567bd53..d919baffe 100644 --- a/app/views/contests/show_attendingcontest.html.erb +++ b/app/views/contests/show_attendingcontest.html.erb @@ -298,8 +298,9 @@
+ <% score = c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_f %> <%= l(:label_final_scores) %> - ：<%= c_softapplication.softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %> + ：<%= format("%.2f" , score) %> 分 diff --git a/app/views/softapplications/show.html.erb b/app/views/softapplications/show.html.erb index e41ecb842..b5e3e951c 100644 --- a/app/views/softapplications/show.html.erb +++ b/app/views/softapplications/show.html.erb @@ -79,9 +79,10 @@ <% end %>
-
-
<%=l(:label_final_scores)%>
-
<%= @softapplication.average(:quality).try(:avg).try(:round, 2).to_i.to_s %>分
+
+
<%=l(:label_final_scores)%>
+ <% score = @softapplication.average(:quality).try(:avg).try(:round, 2).to_f %> +
<%= format("%.2f" , score) %>分
<%= rating_for @softapplication, :static => true, dimension: :quality, class: 'rateable div_inline' %>
From b702411a659d937e7bfdf90896d78d61fbeb267a Mon Sep 17 00:00:00 2001 From: senluo Date: Fri, 13 Jun 2014 17:46:58 +0800 Subject: [PATCH 02/18] fix contest show lichun --- app/views/welcome/contest.html.erb | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/app/views/welcome/contest.html.erb b/app/views/welcome/contest.html.erb index c87cc13e1..ef9081310 100644 --- a/app/views/welcome/contest.html.erb +++ b/app/views/welcome/contest.html.erb @@ -186,15 +186,15 @@
2014年Android程序设计大赛获奖名单
- -
一等奖: 消灭那怪兽
-
二等奖: 兄弟向前冲
-
二等奖: 鸟鸟文件管理器（银河之光版）
-
三等奖: 疯狂猜图
-
三等奖: 愉快的定向越野
-
三等奖: 体能训练助手
-
三等奖: 迷你日记本
-
三等奖: 永齐飞机大战
+ +
一等奖: <%= link_to "消灭那怪兽", softapplication_path(16) %>
+
二等奖: <%= link_to "兄弟向前冲", softapplication_path(20) %>
+
二等奖: <%= link_to "鸟鸟文件管理器（银河之光版）", softapplication_path(6) %>
+
三等奖: <%= link_to "疯狂猜图", softapplication_path(12) %>
+
三等奖: <%= link_to "愉快的定向越野", softapplication_path(14) %>
+
三等奖: <%= link_to "体能训练助手", softapplication_path(11) %>
+
三等奖: <%= link_to "迷你日记本", softapplication_path(19) %>
+
三等奖: <%= link_to "永齐飞机大战", softapplication_path(9) %>
 From c5d892a214991f565afff75f1c83910e0f6af2b5 Mon Sep 17 00:00:00 2001 From: yanxd Date: Mon, 16 Jun 2014 08:46:45 +0800 Subject: [PATCH 03/18] footer --- app/views/layouts/_base_footer.html.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb index c62a974d0..437a3fa06 100644 --- a/app/views/layouts/_base_footer.html.erb +++ b/app/views/layouts/_base_footer.html.erb @@ -31,8 +31,10 @@
<%= debug(params) if Rails.env.development? %> - - +
+ <% end %> From cc39172d877f57d015e1e667eadd8b060cb840de Mon Sep 17 00:00:00 2001 From: senluo Date: Mon, 16 Jun 2014 21:52:08 +0800 Subject: [PATCH 04/18] fix --- config/locales/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 483d5e10b..690121440 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -163,7 +163,7 @@ zh: notice_account_invalid_creditentials_new: 您还未到邮箱激活 notice_account_password_updated: 密码更新成功 notice_account_wrong_password: 密码错误 - notice_account_register_done: 帐号创建成功，请使用注册确认邮件中的链接来激活您的帐号。 + notice_account_register_done: 帐号创建成功，请使用注册确认邮件中的链接来激活您的帐号, 如果您的邮件没有在收件箱中可能在垃圾箱中，请您注意查收。 notice_account_unknown_email: 未知用户 notice_can_t_change_password: 该帐号使用了外部认证，因此无法更改密码。 notice_account_lost_email_sent: 系统已将引导您设置新密码的邮件发送给您。 From 2000f1ddf637c28ad2994ad752497561fb43074f Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 17 Jun 2014 14:42:08 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E4=BA=BA=E7=89=A9=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E5=9C=B0=E5=9D=80=E4=BF=A1=E6=81=AF=E4=BC=9A=E4=BF=9D=E5=AD=98?= =?UTF-8?q?=E4=B8=A4=E6=AC=A1=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/account_controller.rb | 16 +++++++++------- app/controllers/my_controller.rb | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index af8487868..b5f6d7d57 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -144,14 +144,16 @@ class AccountController < ApplicationController #added by bai unless @user.id.nil? - ue = UserExtensions.create(:identity => params[:identity].to_i,:technical_title => params[:technical_title], :gender => params[:gender].to_i, :user_id => @user.id, :student_id => params[:no]) - unless params[:province].nil? || params[:city].nil? - ue.location = params[:province] - ue.location_city = params[:city] - ue.save - end + ue = @user.extensions + + ue.identity = params[:identity] + ue.technical_title = params[:technical_title] + ue.gender = params[:gender] + ue.student_id = params[:no] + ue.location = params[:province] + ue.location_city = params[:city] + @user.save end - #end end end diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index a87df4fef..9b169cb81 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -61,7 +61,7 @@ class MyController < ApplicationController end end - @se = @user.user_extensions ||= UserExtensions.new + @se = @user.extensions @se.school_id = params[:occupation] if params[:occupation] @se.gender = params[:gender] @se.location = params[:province] if params[:province] From c1e780a0f84149d8a30bbf769e9a633a2fc166db Mon Sep 17 00:00:00 2001 From: linchun Date: Mon, 23 Jun 2014 18:48:57 +0800 Subject: [PATCH 06/18] yan --- app/controllers/projects_controller.rb | 16 ++-------------- app/views/bids/_bid_homework_show.html.erb | 5 +---- app/views/welcome/index.html.erb | 8 -------- 3 files changed, 3 insertions(+), 26 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 33adb3ac9..c0c3ce764 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -361,22 +361,10 @@ class ProjectsController < ApplicationController #Added by young def homework @offset, @limit = api_offset_and_limit({:limit => 10}) - @bids = @project.homeworks.order('deadline DESC') + @bids = @project.homeworks.order('deadline') @bids = @bids.like(params[:name]) if params[:name].present? - @bid_count = @bids.count - @bid_pages = Paginator.new @bid_count, @limit, params['page'] - @offset ||= @bid_pages.reverse_offset - #@bids = @bids.offset(@offset).limit(@limit).all.reverse - unless @offset == 0 - @bids = @bids.offset(@offset).limit(@limit).all.reverse - else - limit = @bid_count % @limit - if limit == 0 - limit = 10 - end - @bids = @bids.offset(@offset).limit(limit).all.reverse - end + @bids = paginateHelper @bids render :layout => 'base_courses' end diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb index c4eb875a1..e89131081 100644 --- a/app/views/bids/_bid_homework_show.html.erb +++ b/app/views/bids/_bid_homework_show.html.erb @@ -92,9 +92,6 @@ <% end %> <% end %> - \ No newline at end of file diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index 16a4cbf21..6dbfd67d5 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -54,7 +54,6 @@
    <% projects = find_miracle_project(10, 3) %> <% projects.map do |project| %> -
  • <%= image_tag(get_project_avatar(project), :class => "avatar-4") %> @@ -75,7 +74,6 @@ :id => "tooltip-#{project.id}" %>
    • - <% end; reset_cycle %>
@@ -88,7 +86,6 @@
<%activities = find_all_activities%> <% activities.each do |event| %> -
  • <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %> @@ -99,7 +96,6 @@

    <%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前     <%= show_event_reply event %>

    • - <% end %>
    @@ -107,7 +103,6 @@
      -

      贴吧动态 @@ -115,11 +110,9 @@ <%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>

      <%= link_to "更多>>", forums_path %>
      -
      <% topics = find_new_forum_topics(7) %> <% topics.includes(:forum, :last_reply, :author).each do |topic|%> -
    • <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %> @@ -139,7 +132,6 @@
      • - <% end %>
    From 10a844c67f6cbdfacd0696a5c5e629e58ff32bfb Mon Sep 17 00:00:00 2001 From: yanxd Date: Thu, 3 Jul 2014 10:06:57 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=AF=BC=E8=87=B4?= =?UTF-8?q?=E7=9A=84=EF=BC=8C=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/bids/_bid_homework_show.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/bids/_bid_homework_show.html.erb b/app/views/bids/_bid_homework_show.html.erb index 260c66516..4c5c80b87 100644 --- a/app/views/bids/_bid_homework_show.html.erb +++ b/app/views/bids/_bid_homework_show.html.erb @@ -96,5 +96,5 @@ <% end %> <% end %> \ No newline at end of file From 4c942bd55fc4d83cef0ae07f839e81043d5e452b Mon Sep 17 00:00:00 2001 From: nwb Date: Wed, 9 Jul 2014 13:35:29 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ReadMe.txt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ReadMe.txt b/ReadMe.txt index 0fcba47c0..34c06d619 100644 --- a/ReadMe.txt +++ b/ReadMe.txt @@ -1,4 +1,4 @@ -patch: +patch: 用户姓名的部分，根据issues#655。 为了修改方便 alias： @@ -49,5 +49,4 @@ app\controller\welcome_controller.rb ================================================================================ 0606：新坑 user_scores表结构有问题，需要运行 -bundle exec rake db:migrate:down VERSION=20140410021724 -bundle exec rake db:migrate:up VERSION=20140410021724 \ No newline at end of file +bundle exec rake db:migrate:down VERSION=20140410021724 bundle exec rake db:migrate:up VERSION=20140410021724 \ No newline at end of file From 0443f2085ed16a05daf19449abb697132515d060 Mon Sep 17 00:00:00 2001 From: nwb Date: Fri, 18 Jul 2014 15:00:03 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/welcome/index.html.erb | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/app/views/welcome/index.html.erb b/app/views/welcome/index.html.erb index d40923610..586817c40 100644 --- a/app/views/welcome/index.html.erb +++ b/app/views/welcome/index.html.erb @@ -60,16 +60,10 @@ <%= link_to "更多>>", { :controller => 'projects', :action => 'index', :project_type => 0, :host => Setting.project_domain}, :target => "_blank" %>
      -<<<<<<< HEAD - <% projects = find_miracle_project(10, 3) %> - <% projects.map do |project| %> -
    • -======= <% #projects = find_miracle_project(10, 3) %> <% @projects.map do |project| %>
    • ->>>>>>> remotes/origin/szzh
      <%= image_tag(get_project_avatar(project), :class => "avatar-4") %>
      @@ -115,10 +109,7 @@ :id => "tooltip-#{project.id}" %>
    -<<<<<<< HEAD -======= ->>>>>>> remotes/origin/szzh <% end; reset_cycle %>
    @@ -131,10 +122,7 @@
    <%activities = find_all_activities%> <% activities.each do |event| %> -<<<<<<< HEAD -======= ->>>>>>> remotes/origin/szzh
  • <%= image_tag url_to_avatar(event.event_author), :class => "avatar-3" %> @@ -145,10 +133,7 @@

    <%= l(:field_updated_on) %><%= time_tag_welcome event.event_datetime %>前     <%= show_event_reply event %>

    • -<<<<<<< HEAD -======= ->>>>>>> remotes/origin/szzh <% end %>
    @@ -156,6 +141,7 @@
      +

      贴吧动态 @@ -163,9 +149,11 @@ <%= link_to "我要反馈" , suggestion_send_path, {:class => 'orangeButton idea_btn', :style => "color: #EEEEEE" }%>

      <%= link_to "更多>>", forums_path %>
      +
      <% topics = find_new_forum_topics(7) %> <% topics.includes(:forum, :last_reply, :author).each do |topic|%> +
    • <%= link_to '['+topic.forum.name + ']',forum_path(topic.forum),:class => 'memo_Bar_title' %><%= link_to topic.subject.truncate(30, omission: '...'), topic.event_url,title: topic.subject %> @@ -185,6 +173,7 @@
      • + <% end %>
    From 87671e9d733dbf5201917232e9561490faf10fb4 Mon Sep 17 00:00:00 2001 From: yanxd Date: Tue, 22 Jul 2014 09:39:27 +0800 Subject: [PATCH 10/18] base footer merge bug. --- app/views/layouts/_base_footer.html.erb | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/app/views/layouts/_base_footer.html.erb b/app/views/layouts/_base_footer.html.erb index 46e85a181..990a6d3c8 100644 --- a/app/views/layouts/_base_footer.html.erb +++ b/app/views/layouts/_base_footer.html.erb @@ -1,5 +1,4 @@ -<% cache "footer" do %>
    <%= debug(params) if Rails.env.development? %> -<<<<<<< HEAD -
    - -
    -<% end %> From ab2d92315e8c5b0afd88b552df654c66c3301103 Mon Sep 17 00:00:00 2001 From: linchun Date: Fri, 1 Aug 2014 22:29:52 +0800 Subject: [PATCH 11/18] fix plugin ckeditor db migration --- .../20130418001210_add_ckeditor_to_settings.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 plugins/redmine_ckeditor/db/migrate/20130418001210_add_ckeditor_to_settings.rb diff --git a/plugins/redmine_ckeditor/db/migrate/20130418001210_add_ckeditor_to_settings.rb b/plugins/redmine_ckeditor/db/migrate/20130418001210_add_ckeditor_to_settings.rb new file mode 100644 index 000000000..8fd452093 --- /dev/null +++ b/plugins/redmine_ckeditor/db/migrate/20130418001210_add_ckeditor_to_settings.rb @@ -0,0 +1,18 @@ +# This migration comes from rich (originally 20111201095829) +class AddCkeditorToSettings < ActiveRecord::Migration + def up + str = " +insert into `settings` (`name`, `value`, `updated_on`) values('plugin_redmine_ckeditor','--- !ruby/hash:ActiveSupport::HashWithIndifferentAccess\nskin: kama\nui_color: ! \'#f4f4f4\'\nwidth: \'\'\nheight: \'400\'\nenter_mode: \'1\'\nshow_blocks: \'1\'\ntoolbar_can_collapse: \'0\'\ntoolbar_location: top\ntoolbar: Source,ShowBlocks,--,Undo,Redo,-,Find,Replace,--,Bold,Italic,Underline,Strike,-,Subscript,Superscript,-,NumberedList,BulletedList,-,Outdent,Indent,Blockquote,-,JustifyLeft,JustifyCenter,JustifyRight,JustifyBlock,-,Link,Unlink,-,richImage,Table,HorizontalRule,/,Styles,Format,Font,FontSize,-,TextColor,BGColor,Cut,Copy,Paste,BidiLtr,BidiRtl,PasteText,PasteFromWord,RemoveFormat,SelectAll\n','2014-07-24 11:24:50'); + " + ActiveRecord::Base.connection.execute( + "insert settings(name, value) values('plugin_redmine_ckeditor', '')" + ) + end + + def down + ss = Setting.where("name='plugin_redmine_ckeditor'") + ss.each do |s| + s.destroy + end + end +end From f4fd1b11335cb704e12f971bbfe0a2d70d03fe5e Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Sat, 16 Aug 2014 16:13:39 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E7=AB=9E=E8=B5=9B=E6=97=B6=E6=8F=90=E7=A4=BA=E6=8F=8F=E8=BF=B0?= =?UTF-8?q?=E4=B8=8D=E6=AD=A3=E7=A1=AE=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/contests/_new_softapplication.html.erb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/views/contests/_new_softapplication.html.erb b/app/views/contests/_new_softapplication.html.erb index 92fed47fe..9fb3fc7f1 100644 --- a/app/views/contests/_new_softapplication.html.erb +++ b/app/views/contests/_new_softapplication.html.erb @@ -12,7 +12,7 @@ $("#spane_name_notice").focus(); return false; } - else if(name.length < 25) + else if(name.length <= 25) { $("#spane_name_notice").text("填写正确"); $("#spane_name_notice").css('color','#008000'); @@ -37,7 +37,7 @@ $("#spane_workdescription_notice").css('color','#ff0000'); return false; } - if(workDescription.length < 125) + if(workDescription.length <= 125) { $("#spane_workdescription_notice").text("填写正确"); $("#spane_workdescription_notice").css('color','#008000'); @@ -61,7 +61,7 @@ $("#span_softapplication_application_developers").css('color','#ff0000'); return false; } - if(workDescription.length < 125) + if(workDescription.length <= 125) { $("#span_softapplication_application_developers").text("填写正确"); $("#span_softapplication_application_developers").css('color','#008000'); @@ -79,7 +79,6 @@ { if(regexName() && regexWorkdescription() && regexDevelopers()) { - alert("123123123123"); $("#new_softapplication").submit(); } } From 13717dc3a3aa453c4ed224d36d6d8110c2ba4917 Mon Sep 17 00:00:00 2001 From: zhanghaitao <562681745@qq.com> Date: Mon, 18 Aug 2014 09:57:10 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E7=BC=BA=E9=99=B7=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E5=8A=9F=E8=83=BD=E7=9A=84=E5=B1=8F=E8=94=BD?= =?UTF-8?q?=EF=BC=9B=E7=A7=81=E6=9C=89=E7=BC=BA=E9=99=B7=E7=9A=84=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E6=9D=A1=E4=BB=B6=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/issue.rb | 8 ++++---- app/views/issues/index.html.erb | 14 +++++++------- app/views/projects/show.html.erb | 21 ++++++++++----------- 3 files changed, 21 insertions(+), 22 deletions(-) diff --git a/app/models/issue.rb b/app/models/issue.rb index 68afe21a2..22d1da6db 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -138,10 +138,10 @@ class Issue < ActiveRecord::Base nil when 'default' user_ids = [user.id] + user.groups.map(&:id) - "(#{table_name}.is_private = #{connection.quoted_false}) OR (#{table_name}.author_id = #{user.id} OR #{table_name}.tracker_id IN (#{user_ids.join(',')}) OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))" + "(#{table_name}.is_private = #{connection.quoted_false}) OR (#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))" when 'own' user_ids = [user.id] + user.groups.map(&:id) - "(#{table_name}.author_id = #{user.id} OR #{table_name}.tracker_id IN (#{user_ids.join(',')}) OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))" + "(#{table_name}.author_id = #{user.id} OR #{table_name}.assigned_to_id IN (#{user_ids.join(',')}))" else '1=0' end @@ -159,9 +159,9 @@ class Issue < ActiveRecord::Base when 'all' true when 'default' - (!self.is_private? ||self.tracker == user) || (self.author == user || user.is_or_belongs_to?(assigned_to)) + !self.is_private? || (self.author == user || user.is_or_belongs_to?(assigned_to)) when 'own' - self.tracker == user || self.author == user || user.is_or_belongs_to?(assigned_to) + self.author == user || user.is_or_belongs_to?(assigned_to) else false end diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb index 67b3d46c4..804b52d68 100644 --- a/app/views/issues/index.html.erb +++ b/app/views/issues/index.html.erb @@ -37,21 +37,21 @@ @@ -31,14 +31,14 @@ - + - + diff --git a/app/views/layouts/_base_home_menu.html.erb b/app/views/layouts/_base_home_menu.html.erb index ca3e5c847..9327cae49 100644 --- a/app/views/layouts/_base_home_menu.html.erb +++ b/app/views/layouts/_base_home_menu.html.erb @@ -9,14 +9,14 @@ <%= content_tag('div', "#{l(:label_logged_as)} #{link_to_user(User.current, :format => :username)}".html_safe, :id => 'loggedas') if User.current.logged? %> - + - + <%= render_menu :top_home_menu if User.current.logged? || !Setting.login_required? -%>
    diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index 725e7fba9..01510865b 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -82,7 +82,7 @@ <%= join_in_course(@course, User.current) %> <% end %> <% unless User.current.member_of_course?(@course) %> - + <% end %> <% end %> diff --git a/app/views/projects/_tools_expand.html.erb b/app/views/projects/_tools_expand.html.erb index 7520bd4da..13d63fc08 100644 --- a/app/views/projects/_tools_expand.html.erb +++ b/app/views/projects/_tools_expand.html.erb @@ -7,7 +7,7 @@
  • <%= link_to l(:label_project_tool_response) ,project_feedback_path(@project)%>
  • <%= link_to l(:project_module_files) ,project_files_path(@project) %>
    • <% if @project.enabled_modules.where("name = 'wiki'").count > 0 %> -
  • <%= link_to l(:project_module_wiki), project_wiki_path(@project) %>
    • +
  • <%= link_to l(:project_module_wiki), project_wiki_path(@project) %>
    • <% end %>

      进度跟踪

      @@ -17,7 +17,7 @@

      其他工具

      <% if @project.enabled_modules.where(" name = 'dts'").count > 0 %> -
    • <%= link_to l(:label_module_share) ,share_show_path(@project) %>
      • +
    • <%= link_to l(:label_module_share) ,share_show_path(@project) %>
      • <% end %>
    • <%= link_to l(:project_module_documents), project_documents_path(@project) %>
    • From 90e65825dbbdcaf3c4d4eeb9cf45f621432d6627 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 18 Aug 2014 14:00:43 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/locales/zh.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 4c71e8990..d17f4c3bd 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -1331,7 +1331,7 @@ zh: permission_add_documents: 新建文档 permission_edit_documents: 编辑文档 permission_delete_documents: 删除文档 - label_gantt_progress_line: Progress line + label_gantt_progress_line: 进度线 setting_jsonp_enabled: Enable JSONP support field_inherit_members: Inherit members field_closed_on: 已关闭 From a7e066add801175b7f6c55af776ab85e47627869 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Mon, 18 Aug 2014 14:15:22 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E5=BE=97=E5=88=86=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA=E8=AF=A6?= =?UTF-8?q?=E7=BB=86=E4=BF=A1=E6=81=AF=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/_project_score_index.html.erb | 2 +- app/views/projects/_show_projects_score.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/_project_score_index.html.erb b/app/views/projects/_project_score_index.html.erb index 4a94867fc..3cee4413c 100644 --- a/app/views/projects/_project_score_index.html.erb +++ b/app/views/projects/_project_score_index.html.erb @@ -4,7 +4,7 @@
      = <%= l(:label_issue_score) %> + <%= l(:label_news_score) %> + <%= l(:label_file_score) %> + <%= l(:label_code_submit_score) %> + <%= l(:label_topic_score) %>
      = <%= format("%.2f" , issue_score(@project)).to_i %> + <%= format("%.2f" , news_score(@project)).to_i %> + - <%= format("%.2f" , document_score(@project)).to_i %> + <%= format("%.2f" , changesets_score(@project)).to_i %> + + <%= format("%.2f" , documents_score(@project)).to_i %> + <%= format("%.2f" , changesets_score(@project)).to_i %> + <%= format("%.2f" , board_message_score(@project)).to_i %>
      = <%= format("%.2f" , project_scores(@project)).to_i %>
      \ No newline at end of file diff --git a/app/views/projects/_show_projects_score.html.erb b/app/views/projects/_show_projects_score.html.erb index 95c93d520..156e63f7b 100644 --- a/app/views/projects/_show_projects_score.html.erb +++ b/app/views/projects/_show_projects_score.html.erb @@ -37,7 +37,7 @@
    • <%= link_to l(:label_file_score), {:controller => 'projects', :action => 'file_score_index', :remote => true}%> : - <%= format("%.2f" , document_score(@project)).to_i %> + <%= format("%.2f" , documents_score(@project)).to_i %>
    • <%= link_to l(:label_code_submit_score), {:controller => 'projects', :action => 'code_submit_score_index', :remote => true}%> : From 4ed9b13f0b5036dd6e57f793a18f6774e4fa8c47 Mon Sep 17 00:00:00 2001 From: chenmin <19763783@qq.com> Date: Mon, 18 Aug 2014 15:53:25 +0800 Subject: [PATCH 17/18] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=9F=90=E4=BA=9B=E8=B4=B4=E5=90=A7=E6=8F=90=E7=A4=BA=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E4=B8=8D=E5=AD=98=E5=9C=A8=E7=9A=84404page=20not=20fo?= =?UTF-8?q?und=20bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/tags/_tag_name.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb index adee55564..a478cbe3b 100644 --- a/app/views/tags/_tag_name.html.erb +++ b/app/views/tags/_tag_name.html.erb @@ -71,8 +71,8 @@ <% end %> <% when '5' %> - <% if Forum.find(params[:id]) %> - <% if Forum.find(params[:id]).creator_id == User.current.id %> + <% if Forum.find(obj.id) %> + <% if Forum.find(obj.id).creator_id == User.current.id %> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag, :taggable_id => obj.id, :taggable_type => object_flag %> From e181f0ed4d4206d21145174879ccc20ab2fff097 Mon Sep 17 00:00:00 2001 From: chenmin <19763783@qq.com> Date: Mon, 18 Aug 2014 16:12:22 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=E5=B8=96=E5=AD=90=E5=AD=98=E5=9C=A8=E6=80=A7=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/tags/_tag_name.html.erb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb index a478cbe3b..38b8ac85c 100644 --- a/app/views/tags/_tag_name.html.erb +++ b/app/views/tags/_tag_name.html.erb @@ -70,14 +70,13 @@ :taggable_id => obj.id, :taggable_type => object_flag %> <% end %> - <% when '5' %> - <% if Forum.find(obj.id) %> - <% if Forum.find(obj.id).creator_id == User.current.id %> + <% when '5' %> + <% test = Forum.find(obj.id) %> + <% if test && test.creator_id == User.current.id %> <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag, :taggable_id => obj.id, :taggable_type => object_flag %> - <% end %> - <% end %> + <% end %> <% when '6' %> <%# if (User.current.logged? && User.current.admin?