From c893a2d99b861afa3b51d298c70d56b03be921e9 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Mon, 9 Mar 2015 16:25:41 +0800 Subject: [PATCH 01/54] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=8C=E5=8E=9F=E6=9D=A5=E9=9C=80=E8=A6=811800=E7=A7=92?= =?UTF-8?q?=EF=BC=8C=E7=8E=B0=E5=8F=AA=E9=9C=80800=E7=A7=92?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...85333_add_data_to_project_issues_indexs_in_issue.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/db/migrate/20150227085333_add_data_to_project_issues_indexs_in_issue.rb b/db/migrate/20150227085333_add_data_to_project_issues_indexs_in_issue.rb index a5e227808..d69450625 100644 --- a/db/migrate/20150227085333_add_data_to_project_issues_indexs_in_issue.rb +++ b/db/migrate/20150227085333_add_data_to_project_issues_indexs_in_issue.rb @@ -1,9 +1,11 @@ class AddDataToProjectIssuesIndexsInIssue < ActiveRecord::Migration def change - for i in 1 ... 1000 do i - Issue.page(i).per(10).each do |e| - index = e.project.issues.index(e).to_i + 1 - execute("update issues set project_issues_index = #{index} where id = #{e.id}") + transaction do + for i in 1 ... 1000 do i + Issue.page(i).per(10).each do |e| + index = e.project.issues.index(e).to_i + 1 + execute("update issues set project_issues_index = #{index} where id = #{e.id}") + end end end end From 5d1a5a0b11c76472d857e6ab2aaccb7d5ea4fe9f Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Tue, 10 Mar 2015 11:50:27 +0800 Subject: [PATCH 02/54] =?UTF-8?q?=20#1738=20=E4=BF=AE=E5=A4=8D=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E4=B8=8B=E8=BD=BD=E6=AC=A1=E6=95=B0=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Gemfile | 10 ++++++---- app/controllers/attachments_controller.rb | 4 +--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Gemfile b/Gemfile index 299af4509..34e81cef6 100644 --- a/Gemfile +++ b/Gemfile @@ -25,8 +25,10 @@ gem 'rufus-scheduler' #gem 'dalli', path: 'lib/dalli-2.7.2' group :development do gem 'grape-swagger' - gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git' + #gem 'grape-swagger-ui', git: 'https://github.com/guange2015/grape-swagger-ui.git' #gem 'puma' + gem 'pry-rails' + gem 'pry-byebug' gem 'better_errors', path: 'lib/better_errors' gem 'rack-mini-profiler', path: 'lib/rack-mini-profiler' end @@ -50,8 +52,8 @@ group :test do #end end - gem 'rspec-rails' , '2.13.1' - gem 'guard-rspec','2.5.0' + # gem 'rspec-rails' , '2.13.1' + # gem 'guard-rspec','2.5.0' # Gems used only for assets and not required # in production environments by default. group :assets do @@ -95,7 +97,7 @@ if File.exist?(database_file) adapters.each do |adapter| case adapter when 'mysql2' - gem "mysql2", "= 0.3.11", :platforms => [:mri, :mingw] + gem "mysql2", "= 0.3.18", :platforms => [:mri, :mingw] gem "activerecord-jdbcmysql-adapter", :platforms => :jruby when 'mysql' gem "mysql", "~> 2.8.1", :platforms => [:mri, :mingw] diff --git a/app/controllers/attachments_controller.rb b/app/controllers/attachments_controller.rb index 252d823e9..ccc879c1c 100644 --- a/app/controllers/attachments_controller.rb +++ b/app/controllers/attachments_controller.rb @@ -97,12 +97,10 @@ class AttachmentsController < ApplicationController end if candown || User.current.admin? || User.current.id == @attachment.author_id @attachment.increment_download - if stale?(:etag => @attachment.digest) - # images are sent inline send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename), :type => detect_content_type(@attachment), - :disposition => (@attachment.image? ? 'inline' : 'attachment') + :disposition => 'attachment' #inline can open in browser end else From 31351bc9e8782db7b01404570952873d12b9def7 Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Tue, 10 Mar 2015 15:39:14 +0800 Subject: [PATCH 03/54] =?UTF-8?q?#1095=20=E5=9C=A8issue=E4=B8=BB=E9=A2=98?= =?UTF-8?q?=E4=B8=8B=EF=BC=8C=E8=BE=931=E4=B8=AA=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E8=BF=9B=E8=A1=8C=E6=90=9C=E7=B4=A2=EF=BC=8C?= =?UTF-8?q?500=E9=94=99=E8=AF=AF=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/project.rb | 2 +- public/javascripts/application.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/project.rb b/app/models/project.rb index 099870bc7..ec193cdfe 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -41,7 +41,7 @@ class Project < ActiveRecord::Base has_many :principals, :through => :member_principals, :source => :principal has_many :enabled_modules, :dependent => :delete_all has_and_belongs_to_many :trackers, :order => "#{Tracker.table_name}.position" - has_many :issues, :dependent => :destroy, :include => [:status, :tracker],:order => "id ASC" + has_many :issues, :dependent => :destroy, :include => [:status, :tracker],:order => "issues.id ASC" has_many :issue_changes, :through => :issues, :source => :journals has_many :versions, :dependent => :destroy, :order => "#{Version.table_name}.effective_date DESC, #{Version.table_name}.name DESC" has_many :time_entries, :dependent => :delete_all diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 4345f8c31..2ca1a048b 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -480,7 +480,7 @@ function observeAutocompleteField(fieldId, url, options) { $('#'+fieldId).autocomplete($.extend({ source: url, select: function(e,ui){self.location="/issues/"+ui.item.value;}, - minLength: 2, + minLength: 1, search: function(){$('#'+fieldId).addClass('ajax-loading');}, response: function(){$('#'+fieldId).removeClass('ajax-loading'); } From 8a7c411a469233cc01109414714c4f6cbb96a187 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 10 Mar 2015 19:00:19 +0800 Subject: [PATCH 04/54] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=BC=A0=E5=85=A5?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_projects.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 8bf84d90c..83f27442f 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -148,7 +148,7 @@ <%= 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, 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;" %> + <%= 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;" %> <% end %>
From fd676f13b59961b8a762de07790fee26ca968e8b Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Tue, 10 Mar 2015 21:50:47 +0800 Subject: [PATCH 05/54] =?UTF-8?q?#994=20=20=E4=BD=9C=E5=93=81=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=EF=BC=9A=E8=B5=84=E6=BA=90=E6=8E=92=E5=BA=8F=E4=BF=AE?= =?UTF-8?q?=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 474f199a2..7638949ba 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -143,11 +143,16 @@ class FilesController < ApplicationController end end - @containers = [ Project.includes(:attachments).reorder(sort).find(@project.id)] - @containers += @project.versions.includes(:attachments).reorder(sort).all + @containers = [ Project.includes(:attachments).find(@project.id)] + @containers += @project.versions.includes(:attachments).all - show_attachments @containers + ids = [] + @containers.each do |c| + ids += c.attachments.pluck(:id) + end + @containers = [Struct.new(:attachments).new(Attachment.where('id in (?)',ids).reorder(sort))] + show_attachments @containers respond_to do |format| format.html From e5e46819b427c4caac6501cb836335801962076c Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Tue, 10 Mar 2015 22:35:36 +0800 Subject: [PATCH 06/54] =?UTF-8?q?#867=20=E6=96=B0=E5=BB=BA=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=EF=BC=9A=E6=A0=A1=E9=AA=8C=E5=A4=B1=E8=B4=A5=E4=B9=9F?= =?UTF-8?q?=E8=A6=81=E4=BF=9D=E5=AD=98=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_form.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb index 1d637919c..0949899dd 100644 --- a/app/views/attachments/_form.html.erb +++ b/app/views/attachments/_form.html.erb @@ -1,6 +1,6 @@ <% if defined?(container) && container && container.saved_attachments %> - <% container.attachments.each_with_index do |attachment, i| %> + <% container.saved_attachments.each_with_index do |attachment, i| %> <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly=>'readonly')%> <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style=>"display: inline-block;") %> From 38c3b40ca1e6389dbc4118a5926b0e529938ac6a Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Wed, 11 Mar 2015 10:52:09 +0800 Subject: [PATCH 07/54] =?UTF-8?q?#1701=20=E4=BF=AE=E5=A4=8D=E5=9C=A8?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BD=9C=E4=B8=9A=E6=97=B6=EF=BC=8C=E5=88=A0?= =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=BC=9A=E5=AF=BC=E8=87=B4=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=86=85=E5=AE=B9=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_links.html.erb | 3 ++- public/javascripts/application.js | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb index 989ed776d..8913febd0 100644 --- a/app/views/attachments/_links.html.erb +++ b/app/views/attachments/_links.html.erb @@ -34,7 +34,8 @@ <%= link_to image_tag('delete.png'), {:controller => 'attachments', :action => 'delete_homework', :id => attachment.id}, :data => {:confirm => l(:text_are_you_sure)}, :method => :delete, - :class => 'delete', + :class => 'delete delete-homework-icon', + :remote => true, :title => l(:button_delete) %> <% else %> <%= link_to image_tag('delete.png'), attachment_path(attachment), diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 2ca1a048b..9e9bc9859 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -850,3 +850,13 @@ function HS_setDate(inputObj){ function redo() { window.location.reload() } + + +//// 作业附件删除 +$(function(){ + $('.attachments a.delete-homework-icon').bind('ajax:complete', //this will work + function(event, data, status, xhr) { //note parametes + $(this).parent('p').remove(); + console.log("delete complete."); + }); +}); From b0eba062a8fc325d972dee98de84bab82262175c Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 11 Mar 2015 11:20:43 +0800 Subject: [PATCH 08/54] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E3=80=81=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80=E4=B8=8D=E6=AD=A3?= =?UTF-8?q?=E7=A1=AE=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/forums/create_feedback.js.erb | 2 +- config/locales/zh.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/forums/create_feedback.js.erb b/app/views/forums/create_feedback.js.erb index 626840700..7d9fb6c9e 100644 --- a/app/views/forums/create_feedback.js.erb +++ b/app/views/forums/create_feedback.js.erb @@ -1,6 +1,6 @@ $(function(){ $("#button1").click(function(){ - myTips(<%= l(:label_feedback_success)%>,"success"); + myTips(<%= l(:label_forums_feedback_success)%>,"success"); }); }) \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index b8add2739..bed4f138d 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2328,7 +2328,7 @@ zh: label_technical_support: 技术支持： label_feedback: 意见反馈 - label_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！" + label_forums_feedback_success: "您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！" From eec155f0778c0588249326ba50ce72d5d3ae3ee9 Mon Sep 17 00:00:00 2001 From: z9hang Date: Wed, 11 Mar 2015 11:22:58 +0800 Subject: [PATCH 09/54] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2app=E8=87=AA=E5=8A=A8=E7=99=BB=E9=99=86?= =?UTF-8?q?=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/files_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/files_controller.rb b/app/controllers/files_controller.rb index 474f199a2..aacb32990 100644 --- a/app/controllers/files_controller.rb +++ b/app/controllers/files_controller.rb @@ -21,6 +21,7 @@ class FilesController < ApplicationController menu_item :files before_filter :auth_login1, :only => [:index] + before_filter :logged_user_by_apptoken,:only => [:index] before_filter :find_project_by_project_id#, :except => [:getattachtype] before_filter :authorize, :except => [:getattachtype,:quote_resource_show,:search] From 32a2e7ae1ffc52cc181d53a2ef3b46cb363002e6 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 11 Mar 2015 11:38:09 +0800 Subject: [PATCH 10/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=BB=98=E8=AE=A4?= =?UTF-8?q?=E6=83=85=E5=86=B5=E4=B8=8B=20=E7=94=A8=E6=88=B7=E5=8F=8D?= =?UTF-8?q?=E9=A6=88=E6=A1=86=E5=A4=84=E4=BA=8E=E5=85=B3=E9=97=AD=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_feedback.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index 2444af68c..e21500576 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -62,7 +62,7 @@ $.fn.fix = function(options){ var defaults = { float : 'right', - minStatue : false, + minStatue : true, skin : 'blue', durationTime : 1000 } From 0eafbb92d53c2711779a0dc448b15ffb3721f548 Mon Sep 17 00:00:00 2001 From: whimlex Date: Wed, 11 Mar 2015 11:53:42 +0800 Subject: [PATCH 11/54] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_feedback.html.erb | 14 ++++++------ config/locales/commons/en.yml | 12 ++++++++++ config/locales/commons/zh.yml | 12 ++++++++++ config/locales/en.yml | 6 ++--- config/locales/zh.yml | 28 ----------------------- 5 files changed, 33 insertions(+), 39 deletions(-) diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index 2444af68c..3095b05ce 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -107,7 +107,7 @@ $(function(){ $("#button1").click(function(){ - myTips("您的意见已经反馈到公共贴吧的新手讨论吧，我们会第一时间解决您的问题，谢谢支持！","success"); + myTips("<%= l(:label_feedback_success) %>","success"); }); }) @@ -153,7 +153,7 @@ function cookieget(n) -意见反馈 +<%= l(:label_feedback) %> @@ -161,15 +161,15 @@ function cookieget(n)
-
<%= l(:label_feedback) %>
+
<%= l(:label_feedback) %>
<% get_memo %> <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %> - <%= f.text_area :subject, :class => "opnionText",:placeholder => "有什么想说的，尽管来咆哮吧~~"%> - <%= f.hidden_field :content, :required => true ,:value=>'该贴来自用户反馈！'%> + <%= f.text_area :subject, :class => "opnionText", :placeholder => l(:label_feedback_tips) %> + <%= f.hidden_field :content, :required => true , :value => l(:label_feedback_value) %> <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %> - 提  交 + <%= l(:label_submit)%> <% end %>
@@ -180,7 +180,7 @@ function cookieget(n)
-
提交
+
<%= l(:label_submit)%>
<%= 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" %> @@ -179,12 +190,14 @@
+
-

<%= 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 zcmeGhTX0jyb+6u*Wn*C*3}L7cHYT*TUX~4N9AiEF=pZnX%xl_VquQuU>36DVAOxxknXF4H3(k7Xe;=zvTU5B z4b!iBXYTIVbIzVU=j_?lu1@}Z{*rbuG@KqlsJC|kG9iSFXey;e6hQc!N$E+O0QjK- zybj>`1s)B+E=q%DK`X-N2Dk>=Z^D;;Tt~(p1o#i|ZThDfRW**bos5uRZG9<07NnGr zwFRPH+sZW02tyKbJ6&F%)9rJ%*j!Fui__=wfCSL%X+^hu9wE)sihK*E6kr3uN--d9 zK}U>J?U)Tlsdmf*xYQ0xqsVIpyruvz#s)&^fe-sbZS&{z*N}x+ur?4zn*85UCFvn% z6K2i-5p6>jlgU(OvXqrstmWo%YwZ+^WlC*bb#-lZb)D5hN}*9Y<7=v-yu6~aqN=j8 zs;08CvIbX`HOdg{e(^9ciqT)=K67guu%Di&O__si#N*g>eDTYIJ&o z(NtzGr^XX0q|vIxDn#ihtwyKO8x1DC*5U!8RjZpb)ur!T9u-0gutK1%j_71G z=)FXRIj*TX&|rhTTJPSxy#{M=GIHj+r#^8>+_EDOt)-=w8x01mfN`Gp)LBsCz;q_m z-zu}0iz>>@xjG!9bS5E z@3YUp@!Z{)J+6Bvy3gd%3vd0lxBhVcLjIchiP6aSG&|8ke{Wc)BMUKQ7PSUxA8P2H z1<|M3b4Z~z5L(sLkvqS-{-Xo;e!OXji!e&yFV>sJmyvA zW5uQM3>yoriUA6<6a7Aq8K|RBjp{eGM89QOIW6!K(5GU~Kvw2ev7kdjEOsJEDO~IX zL_RRu;pNfJk_0CeDNB>`V6hX*aKT~+%p4W%r`IQ!CDzd}zv4jEGg_=tgt6HeA(vPz z{26yi=@$9>aDMK7KEKGs`gyr)ZiK@tQ7nFru}y@JNSsXYeZ$=1NRiz<$kMVP2IF!Z zTR@cTOZG|XqG1>_LrWHP2|J*O88>YV&f1BljnbTg?-S|8tCeZ->S?bLxT^wrNRJd{7v8k};6$FPPdN$#lF}AP0Mfzo=hKeGQ(um^&A+x#!NJBJupJ02CV_*O% z9MsA|PZcoxp4wByxPg~KYoJznyadxUiXk#Tgg!!9gz^&>?Nv;kkd%KA8u5h*%U1V- zW-;t?_zHfTjUhOsp%C7g7}DYuRqVlC1;#&oMzjv4Q5^9|MgqzKrVzZCsaQ&JcvPt* z!c@wjjvC#nh|h6&kK-RhLqf>$j5Kbi(6S3?L}?seoWLhlF*poM`+ix-6#7JsNHV3; ziE0v;rdeqPw*&_>HD(??p#d775=PSL4VK6@CPg8a9fL9mVmg`T3wy*8iel-@2o7Xa z#B;LH&GM`mmsti7D7G=Ho`PnD8DlV|H_9w6j{40f7_566abK`Tp)A0fwNZ0*`%NCJR~k;gVQ2Ffh%`K_K0SwIl=? z0_r||IV^E%JUiJ>^RY05Lrv3hoxsXIvl5t6&LJJX#3});C!;Vw(tHsryj4h`LR$~t zd9r)!;8HbtC!D+!KER!j#MvB(D1`dqgGhwS7V1O{9PA0iA{**MDS+`oFA)fSyioNg zaM(})MUnCoNM=yZej_=oVUGMI%juLXXMGL_FEz*Uo2;1@GLGSR*5PV)I?y8>!`V2! zo|SD07EaQ3`+Luwu-np1yM3iM>UyyP2hw-ez$fHB%(w-FY3eY>5!oNTMYeYSugvNmtCvx#=LI&H14W|ya>t*z~I zHh2&^9Zt8yLPOLJ8TK~|#0G`Wk~utd0L<>YodXsVcy$ri;<=qr_xp^JQ3IL^uB z4DDb!HpB9=1b%g4^NG-``u;5r86&z#CX1mC0@sGa6Aw_=Et4ruA<3aZFyrG^S;9xN zBf?5TPNdn;AgDPPPnPusL>7J<;nK;r+wrTs$?0x#dSb3tpL3zl?fxv(PN%{e7MS$F z#&N7IG4%mIh7}@!fs5=XGBdPqKoB!=&_A7tCt1h3ESt33if-|d-w&7>)bkKE!eL)8 zFUfJ9W_yF}cCev2oo0OAE|)v#3beXfI|HE>m&@O|DA?5&@^pD!3q#Hpw>mZ`&^f$H z>R9H#7^~bX;@qc_f%gnvR$otAf@}W9LR3fD4F!lx+sI1#;xv9OwcDlmAj{Yb$n>YO zSrIstVnJMSb?;v?g-sF$aHDq#g_bkqbfzG;(U^Yqrzc#fE5nBsT6}8 z<839hk`1V`!>-0)@i=)@-S(61qz5KFFzJCw4@`Ps(gXiT9vFR)usmEXhTyqTl74|F zQ6c?e(CKt~ok6cRlo{YFHyI43a*NqqZZ=!0lw3=pQ99#m%4jrJSSsqOs_Gs%{Q~)l z(e#T3(l7f#O=D^H1?lu!je$ai^ovHLEv3SYt-`wf2nbA-)F2<(jS*R(-PO~#Vt1)0xi)U`;XGnDQ~cG=YeCb(_@T$`s`)Xysc&C zx*6Mcg}M$NUvaK~{>+2)Q*|@uwT5OkGID?0 z%>&0y&wu#bm0R0(9Xvi(<*t&{QEBFAjLsjU^0*AoLI1nnre|*KeY0!9kylp-!(X~k zR+~EU%4cr Date: Thu, 12 Mar 2015 08:42:39 +0800 Subject: [PATCH 33/54] =?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 34/54] =?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 35/54] =?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 36/54] =?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 @@
    \ No newline at end of file diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 94e8cf31e..8858b0a38 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -2082,4 +2082,6 @@ zh: label_recently_updated_courseware: 最近更新了课件 label_no_courses: 您没有参与任何课程，请搜索课程、加入课程，或者创建课程吧！ label_end_time: 截止时间 + label_send_email: 免费发送 + label_input_email: 请输入邮箱地址 From 96b2627fda8e681c61134874b7f7d75b793f31ca Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 12 Mar 2015 17:22:52 +0800 Subject: [PATCH 52/54] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E5=B1=85=E4=B8=AD=E6=A0=B7=E5=BC=8F=E5=8F=8A=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 1 + public/stylesheets/application.css | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 4f84212b4..f1f026029 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -338,6 +338,7 @@ class ProjectsController < ApplicationController email = params[:mail] Mailer.send_invite_in_project(email, @project, User.current).deliver @is_zhuce =false + flash[:notice] = l(:notice_successful_update) else @is_zhuce = true end diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index c24091605..e0ab6f711 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -101,7 +101,7 @@ a:hover.more{ color:#64bdd9;} .box_close:hover{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} /*邮件邀请*/ .box_main{ width:345px; margin:0 auto;padding-left:40px;} -.box_h3{ color:#15bccf; text-align:center; font-size:16px;} +.box_h3{ color:#15bccf; text-align:center; font-size:16px;margin-right:40px;} .box_p{ color:#404040; margin-bottom:5px;} .fb_item{ color:#919191; border:1px solid #919191; height:28px; margin-bottom:10px; padding-left:5px; width:290px;} .icon_addm{ background:url(../images/img_floatbox.png) 0 -33px no-repeat; width:16px; height:16px; display:block; margin:5px 0 0 5px;} From 1e5fac32b43bb68401b7c50f0802d3c2ad45a211 Mon Sep 17 00:00:00 2001 From: whimlex Date: Thu, 12 Mar 2015 17:48:31 +0800 Subject: [PATCH 53/54] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/invite_members_by_mail.html.erb | 17 ++++++++++------- config/locales/projects/en.yml | 11 ++++++++++- config/locales/projects/zh.yml | 9 +++++---- 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index 2b7c23736..0119f53c2 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -1,13 +1,16 @@

    <%= l(:label_invite_join)%>

    diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index a7c88eb19..bc4395df0 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -82,7 +82,16 @@ en: # # 邀请 # - notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册! + label_invite_new_user: "发送邮件邀请新用户" + label_invite_join: 邀请加入 + label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！ + label_email: 邮箱 + notice_registed_success: 您所填写的电子邮件格式不正确或者该邮箱已被注册! + label_send_email_free: 免费发送 + label_email_format_error: 您所填写的电子邮件格式不正确 + + + label_invite_trustie_user: "邀请Trustie注册用户" # diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index be99953b9..d6e03fc14 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -58,8 +58,7 @@ zh: project_module_code_review: 代码审查 project_module_calendar: 日历 project_module_gantt: 甘特图 - project_module_documents: 文档 - project_module_files: 资源库 + project_module_documents: 文档 label_project_tool_response: 用户反馈 label_module_share: DTS测试工具 @@ -84,12 +83,14 @@ zh: # 邀请 # label_invite_new_user: "发送邮件邀请新用户" - label_invite_trustie_user: "邀请Trustie注册用户" label_invite_join: 邀请加入 label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！ notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册! + label_send_email_free: 免费发送 + label_email_format_error: 您所填写的电子邮件格式不正确 + - + label_invite_trustie_user: "邀请Trustie注册用户" # # 项目托管平台 From 28321deeb54ad199d225dff5a9fbe6aa02d39cfa Mon Sep 17 00:00:00 2001 From: whimlex Date: Thu, 12 Mar 2015 18:04:12 +0800 Subject: [PATCH 54/54] =?UTF-8?q?=E9=82=AE=E4=BB=B6=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E7=94=A8=E6=88=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/projects_controller.rb | 4 +-- .../projects/invite_members_by_mail.html.erb | 35 ++++++++++++------- 2 files changed, 25 insertions(+), 14 deletions(-) diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index f1f026029..44e5fd8a3 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -338,12 +338,12 @@ class ProjectsController < ApplicationController email = params[:mail] Mailer.send_invite_in_project(email, @project, User.current).deliver @is_zhuce =false - flash[:notice] = l(:notice_successful_update) + flash[:notice] = l(:notice_email_sent, :value => email) else @is_zhuce = true end respond_to do |format| - format.js + format.html{redirect_to invite_members_by_mail_project_url(@project)} end end #发送邮件邀请新用户 diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index 383b53288..42a27376b 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -1,16 +1,26 @@

    邀请加入

    @@ -28,8 +38,9 @@
    <%= 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", :placeholder => l(:label_input_email) %> + <%= form_tag('send_mail_to_member', :controller => 'projects',:action => 'send_mail_to_member', method: 'get') do %> + + <%= text_field_tag 'mail', '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onblur => "verifyAddress();" %>