From 74d1ebed4e105b9229926a446ed330ad2f290e7f Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 20 Mar 2015 09:31:54 +0800 Subject: [PATCH 01/26] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E4=B8=AD=E6=A0=B7=E5=BC=8F=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/resource.css | 1 + 1 file changed, 1 insertion(+) diff --git a/public/stylesheets/resource.css b/public/stylesheets/resource.css index f0f969b4a..d5b887de9 100644 --- a/public/stylesheets/resource.css +++ b/public/stylesheets/resource.css @@ -57,6 +57,7 @@ a.re_select{ display: block; height: 22px; border: 1px solid #ff9900; + width: auto; color: #ff9900; margin-left: 10px; padding-left: 10px; From a4567396e457519ec9727f8e19799558349b18d3 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Fri, 20 Mar 2015 11:08:27 +0800 Subject: [PATCH 02/26] =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=B2=A1=E6=9C=89?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E5=B0=B1=E4=BC=9A=E6=8A=A5?= =?UTF-8?q?=E7=A9=BA=E6=8C=87=E9=92=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/discuss_demos_controller.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/discuss_demos_controller.rb b/app/controllers/discuss_demos_controller.rb index a0955efe2..b0c9791cb 100644 --- a/app/controllers/discuss_demos_controller.rb +++ b/app/controllers/discuss_demos_controller.rb @@ -26,10 +26,12 @@ class DiscussDemosController < ApplicationController def destroy asset = Kindeditor::Asset.find_by_owner_id(params[:id]) - filepath = File.join(Rails.root,"public","files","uploads", - asset[:created_at].to_s.gsub("+0800","").to_datetime.strftime("%Y%m").to_s, - asset[:asset].to_s) - File.delete(filepath) if File.exist?filepath + if !asset.nil? + filepath = File.join(Rails.root,"public","files","uploads", + asset[:created_at].to_s.gsub("+0800","").to_datetime.strftime("%Y%m").to_s, + asset[:asset].to_s) + File.delete(filepath) if File.exist?filepath + end DiscussDemo.destroy(params[:id]) redirect_to :controller=> 'discuss_demos',:action => 'index' end From 3837e1fcf52768a1466fade10fd58a808e8e3ebd Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 20 Mar 2015 11:34:59 +0800 Subject: [PATCH 03/26] =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=EF=BC=9A=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_form.html.erb | 4 +++- config/locales/projects/en.yml | 2 +- config/locales/projects/zh.yml | 7 +++---- public/javascripts/attachments.js | 7 ++++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb index 872797d5c..496a3394e 100644 --- a/app/views/attachments/_form.html.erb +++ b/app/views/attachments/_form.html.erb @@ -61,7 +61,9 @@ :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, :upload_path => uploads_path(:format => 'js',:project =>project), - :description_placeholder => l(:label_optional_description) + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure) } %> <%= l(:label_no_file_uploaded)%> diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 5aca81426..ce9f8bf28 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -33,7 +33,7 @@ en: # label_project_id: "Projcet ID:" - label_apply_project: Apply to Join + label_apply_project: "+Apply to Join" label_exit_project: Exit label_apply_project_waiting: "Application has been processed, please wait for administrator review." label_unapply_project: Cancel the application diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index bd547c37e..974dbb7ef 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -10,9 +10,8 @@ zh: # # 公共类 # - label_apply_project: 申请加入 - label_project_new: 新建项目 - label_join_project: 加入项目 + label_project_new: "新建项目" + label_join_project: "加入项目" # @@ -36,7 +35,7 @@ zh: # label_project_id: "项目ID:" - label_apply_project: 申请加入 + label_apply_project: "+申请加入" label_exit_project: 退出项目 label_apply_project_waiting: 已处理申请，请等待管理员审核 label_unapply_project: 取消申请 diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 8fbaa5981..190f226da 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -15,7 +15,9 @@ function postUpMsg(attachmentId) function addFile(inputEl, file, eagerUpload) { if ($('#attachments_fields').children().length < 10) { - + alert($(inputEl).data('description_placeholder')); + alert($(inputEl).data('label_public')); + alert($(inputEl).data('are_you_sure')); var attachmentId = addFile.nextAttachmentId++; var fileSpan = $('', { 'id': 'attachments_' + attachmentId, 'class':'attachment' }); @@ -23,7 +25,7 @@ function addFile(inputEl, file, eagerUpload) { fileSpan.append( $('', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name), $('', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload), - $('公开:').attr({ 'class': 'ispublic-label' }) , + $(''+$(inputEl).data('label_public')+'').attr({ 'class': 'ispublic-label' }) , $('', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload), $(' ').attr({ 'href': "#", 'class': 'remove-upload', 'data-confirm' : "您确定要删除吗？" }).click(removeFile).toggle(!eagerUpload), $('
', { 'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} ) @@ -87,7 +89,6 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { var count=$('#attachments_fields>span').length; $('#upload_file_count').html("已上传"+""+count+""+"个文件"); - if(count>=1){ var add_attachs=$('.add_attachment'); var delete_all=$('.remove_all'); From 4ca5687b3bf328fffe395521738aa1512249b08e Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 20 Mar 2015 11:37:09 +0800 Subject: [PATCH 04/26] =?UTF-8?q?#2072=E6=B5=8B=E8=AF=95=E7=89=88--?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE--=E9=97=AE=E9=A2=98=E8=B7=9F=E8=B8=AA?= =?UTF-8?q?=EF=BC=9A=E6=88=90=E5=8A=9F=E6=96=B0=E5=BB=BA=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=90=8E=E5=BB=BA=E8=AE=AE=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=B8=BA=E2=80=9C=E9=97=AE=E9=A2=98=E5=B7=B2=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E2=80=9D=E5=B0=B1=E5=A5=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 3 ++- config/locales/projects/en.yml | 1 + config/locales/projects/zh.yml | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index de9477b8a..790718e5d 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -162,7 +162,8 @@ class IssuesController < ApplicationController respond_to do |format| format.html { render_attachment_warning_if_needed(@issue) - flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("#{@issue.subject}", issue_path(@issue), :title => @issue.subject)) + flash[:notice] = l(:label_successful_create) + #flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("#{@issue.subject}", issue_path(@issue), :title => @issue.subject)) #flash[:notice] = l(:notice_issue_successful_create, :id => view_context.link_to("##{@issue.id}", issue_path(@issue), :title => @issue.subject)) if params[:continue] attrs = {:tracker_id => @issue.tracker, :parent_issue_id => @issue.parent_issue_id}.reject {|k,v| v.nil?} diff --git a/config/locales/projects/en.yml b/config/locales/projects/en.yml index 5aca81426..ccd0a46c5 100644 --- a/config/locales/projects/en.yml +++ b/config/locales/projects/en.yml @@ -136,6 +136,7 @@ en: # 项目托管平台 # # 问题跟踪 + label_successful_create: Successfully created # diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index bd547c37e..298c364c6 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -140,6 +140,7 @@ zh: # 项目托管平台 # # 问题跟踪 + label_successful_create: 创建成功 # From 5924cd6432d27d0ea83edaabee31e020b3678cab Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 20 Mar 2015 11:37:57 +0800 Subject: [PATCH 05/26] commit --- public/javascripts/attachments.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js index 190f226da..4ae3278b1 100644 --- a/public/javascripts/attachments.js +++ b/public/javascripts/attachments.js @@ -16,7 +16,7 @@ function addFile(inputEl, file, eagerUpload) { if ($('#attachments_fields').children().length < 10) { alert($(inputEl).data('description_placeholder')); - alert($(inputEl).data('label_public')); + alert($(inputEl).data('field_is_public')); alert($(inputEl).data('are_you_sure')); var attachmentId = addFile.nextAttachmentId++; @@ -25,7 +25,7 @@ function addFile(inputEl, file, eagerUpload) { fileSpan.append( $('', { 'type': 'text', 'class': 'filename readonly', 'name': 'attachments[' + attachmentId + '][filename]', 'readonly': 'readonly'} ).val(file.name), $('', { 'type': 'text', 'class': 'description', 'name': 'attachments[' + attachmentId + '][description]', 'maxlength': 254, 'placeholder': $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload), - $(''+$(inputEl).data('label_public')+'').attr({ 'class': 'ispublic-label' }) , + $(''+$(inputEl).data('field_is_public')+'').attr({ 'class': 'ispublic-label' }) , $('', { 'type': 'checkbox', 'class': 'is_public_checkbox','value':1, 'name': 'attachments[' + attachmentId + '][is_public_checkbox]', checked:'checked' } ).toggle(!eagerUpload), $(' ').attr({ 'href': "#", 'class': 'remove-upload', 'data-confirm' : "您确定要删除吗？" }).click(removeFile).toggle(!eagerUpload), $('
', { 'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} ) From 69eb7fbd77572968d776110dafd6ca6f29a33d8e Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Mar 2015 15:02:20 +0800 Subject: [PATCH 06/26] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E3=80=81=E5=8A=A0?= =?UTF-8?q?=E5=85=A5=E9=A1=B9=E7=9B=AE=E6=A0=B7=E5=BC=8F=EF=BC=8C=E5=A4=84?= =?UTF-8?q?=E7=90=86=E6=A0=B7=E5=BC=8F=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/watchers_helper.rb | 41 +++++++++++++++++-- app/views/issues/_action_menu.html.erb | 2 +- app/views/layouts/_join_exit_project.html.erb | 4 +- public/stylesheets/application.css | 4 +- 4 files changed, 43 insertions(+), 8 deletions(-) diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index 02bc3d8b3..bff7831d1 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -43,7 +43,7 @@ module WatchersHelper ) method = watched ? 'delete' : 'post' - link_to text, url, :remote => true, :method => method, :style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 22px; line-height: 21px;padding-top:1px; background: none repeat scroll 0% 0% #64BDD9; TES" + link_to text, url, :remote => true, :method => method, :class => css end ############## added by linchun @@ -278,11 +278,46 @@ module WatchersHelper ) method = applied ? 'delete' : 'post' - link_to text, url, :remote => true, :method => method ,:style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 21px; line-height: 22px;padding-top:1px; background: none repeat scroll 0% 0% #64BDD9; TES" + link_to text, url, :remote => true, :method => method , :class => css end def exit_project_link(project) link_to(l(:label_exit_project),exit_cur_project_path(project.id), - :remote => true, :confirm => l(:lable_sure_exit_project), :style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 21px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES;padding-top:1px;" ) + :remote => true, :confirm => l(:lable_sure_exit_project), + :style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 21px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES;padding-top:1px;" ) + end + + #项目关注、取消关注 + #REDO:项目样式确定后方法需要对CSS变量进行改进 + def watcher_link_for_project(objects, user, options=[]) + return '' unless user && user.logged? + objects = Array.wrap(objects) + watched = objects.any? {|object| object.watched_by?(user)} + @watch_flag = objects.first.instance_of?(Project) + text = @watch_flag ? + (watched ? l(:button_unfollow) : l(:button_follow)) : (watched ? l(:button_unwatch) : l(:button_watch)) + url = watch_path(:object_type => objects.first.class.to_s.underscore, + :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort)) + method = watched ? 'delete' : 'post' + link_to text, url, :remote => true, :method => method, + :class => "project_watch_new" + end + + #申请加入项目 + def join_in_project_link(project, user, options=[]) + return '' unless user && user.logged? + applied = project.applied_projects.find_by_user_id(user.id) + text = applied ? l(:label_unapply_project) : l(:label_apply_project) + @applied_flag = project.instance_of?(Project) + if applied + appliedid = applied.id + end + url = appliedproject_path( + :id=>appliedid, + :user_id => user.id, + :project_id => project.id) + method = applied ? 'delete' : 'post' + link_to text, url, :remote => true, :method => method , :class => "project_watch_new" end + end diff --git a/app/views/issues/_action_menu.html.erb b/app/views/issues/_action_menu.html.erb index bcd7b30c5..61cea920c 100644 --- a/app/views/issues/_action_menu.html.erb +++ b/app/views/issues/_action_menu.html.erb @@ -12,7 +12,7 @@ <% end %> - +<%= watcher_link(@issue, User.current) %> <%= link_to l(:button_copy), project_copy_issue_path(@project, @issue), :class => 'icon icon-copy' if User.current.allowed_to?(:add_issues, @project) %> <%= link_to l(:button_delete), issue_path(@issue.id), :data => {:confirm => issues_destroy_confirmation_message(@issue)}, :method => :delete, :class => 'icon icon-del' if User.current.allowed_to?(:delete_issues, @project) %>
diff --git a/app/views/layouts/_join_exit_project.html.erb b/app/views/layouts/_join_exit_project.html.erb index 0c4e54317..a5269d422 100644 --- a/app/views/layouts/_join_exit_project.html.erb +++ b/app/views/layouts/_join_exit_project.html.erb @@ -1,11 +1,11 @@
<% if ( !(User.current.member_of? @project) && User.current.login?) %> - <%= watcher_link(@project, User.current) %> + <%= watcher_link_for_project(@project, User.current) %> <% end %> <% if ( !(User.current.member_of? @project) && User.current.login?) %> - <%= applied_link(@project, User.current) %> + <%= join_in_project_link(@project, User.current) %> <% end %> <% if ((User.current.member_of? @project) && diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index ca8f0c3b6..1270f6bcf 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -31,7 +31,7 @@ a{ text-decoration:none; } .fl{ float: left;} .fr{ float:right;} .project_h4{ font-size:14px; color:#3b3b3b;} - +.project_watch_new{color: #fff !important; display:block !important; padding: 0px 5px !important; margin-right: 10px !important; height: 22px !important; line-height: 21px !important;padding-top:1px !important; background: none repeat scroll 0% 0% #64BDD9 !important;} .project_content{ width:940px; margin:10px auto;} .project_left{ float:left;} @@ -51,7 +51,6 @@ a{ text-decoration:none; } a.info_foot_num{ font-weight: bold; color:#3ca5c6; } .pr_info_foot{ color:#7f7f7f; margin-top:5px; font-size:12px } a:hover.info_foot_num{ color:#2390b2;} - /*左侧导航*/ .subNavBox{width:222px; background:#fff;margin:10px 10px 0 0;} .subNav{border-bottom:solid 1px #e5e3da;cursor:pointer;font-weight:bold;font-size:14px;color:#3ca5c6;line-height:28px;padding-left:10px;background-color:#fff;} @@ -74,6 +73,7 @@ a:hover.subnav_green{ background:#14ad5a;} .course_description_none{max-height: none;} .lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;} .lg-foot:hover{ color:#787b7e;} +. /****标签(和资源库的tag样式一致)***/ .project_Label{ width:220px; padding-left:10px; padding-right:10px; background:#fff; margin-top:10px;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} From 1cd2984c05ac2dfeef74fb03964356114a806929 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 20 Mar 2015 15:11:53 +0800 Subject: [PATCH 07/26] =?UTF-8?q?#2066=20=E7=BD=91=E7=AB=99=E4=B8=AD?= =?UTF-8?q?=E7=9A=84=E5=9B=BE=E7=89=87=E9=99=84=E4=BB=B6=E9=93=BE=E6=8E=A5?= =?UTF-8?q?=EF=BC=8C=E8=83=BD=E5=90=A6=E7=82=B9=E5=87=BB=E5=90=8E=E7=9B=B4?= =?UTF-8?q?=E6=8E=A5=E5=9C=A8=E6=B5=8F=E8=A7=88=E5=99=A8=E4=B8=AD=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E8=80=8C=E4=B8=8D=E6=98=AF=E4=B8=8B=E8=BD=BD?= =?UTF-8?q?=EF=BC=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 9e9bc9859..2b9d1586f 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -629,7 +629,7 @@ function img_thumbnails() { $('.thumbnails a').colorbox({rel:'nofollow'}); $('.attachments').find('a').each(function(index, element) { var href_value = $(element).attr('href'); - if (/\.(jpg|png|gif|bmp)$/.test(href_value)) { + if (/\.(jpg|png|gif|bmp|PNG|BMP|GIF|JPG)$/.test(href_value)) { $(element).colorbox({rel:'nofollow'}); } From eebcccd4bbc39b8f2195a08db87a6bc7ca0ec283 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 20 Mar 2015 15:20:11 +0800 Subject: [PATCH 08/26] =?UTF-8?q?=E7=BC=96=E8=BE=91=E8=B4=B4=E5=90=A7?= =?UTF-8?q?=E7=AD=89=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=99=84=E4=BB=B6=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= 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 39ef47b1b..18f641c7f 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.saved_attachments.each_with_index do |attachment, i| %> + <% container.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 83d63bf479c4ea2c85a31c2f4cb65d7bee0aa8bf Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Mar 2015 15:52:32 +0800 Subject: [PATCH 09/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=9E=E8=B5=9B?= =?UTF-8?q?=E5=85=B3=E6=B3=A8=E4=B8=AD=E5=85=B3=E6=B3=A8=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=AF=BB=E5=8F=96=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/contests/watcherlist.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/contests/watcherlist.html.erb b/app/views/contests/watcherlist.html.erb index 4987f3616..5628e5e95 100644 --- a/app/views/contests/watcherlist.html.erb +++ b/app/views/contests/watcherlist.html.erb @@ -15,7 +15,7 @@

<% unless user.memberships.empty? %> - <%= l(:label_contribute_to, :project_count => "#{user.memberships.count}") %> + <%= l(:label_contribute_to, :count => "#{user.memberships.count}") %> <% for member in user.memberships %> <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %> <% end %> From 473a8805e291de8c47150cfe45968243e5772598 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 20 Mar 2015 15:59:16 +0800 Subject: [PATCH 10/26] =?UTF-8?q?=E5=8F=91=E5=B8=83=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E9=97=AE=E5=8D=B7=E6=97=B6=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=9C=89=E4=B8=8B=E6=8B=89=E6=A1=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/poll/publish_poll.js.erb | 2 +- app/views/poll/republish_poll.js.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/poll/publish_poll.js.erb b/app/views/poll/publish_poll.js.erb index 2e8dab181..721b920e5 100644 --- a/app/views/poll/publish_poll.js.erb +++ b/app/views/poll/publish_poll.js.erb @@ -1,7 +1,7 @@ $("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>"); $('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_memo_create_succ)}) %>"); showModal('ajax-modal', '250px'); -$('#ajax-modal').css('height','111px'); +//$('#ajax-modal').css('height','111px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + ""); diff --git a/app/views/poll/republish_poll.js.erb b/app/views/poll/republish_poll.js.erb index f2fcee96a..8327c3a71 100644 --- a/app/views/poll/republish_poll.js.erb +++ b/app/views/poll/republish_poll.js.erb @@ -1,7 +1,7 @@ $("#polls_<%= @poll.id %>").html("<%= escape_javascript(render :partial => 'poll',:locals => {:poll => @poll}) %>"); $('#ajax-modal').html("<%= escape_javascript(render :partial => 'alert', locals: { :message => l(:label_poll_republish_success)}) %>"); showModal('ajax-modal', '250px'); -$('#ajax-modal').css('height','80px'); +//$('#ajax-modal').css('height','80px'); $('#ajax-modal').siblings().remove(); $('#ajax-modal').before("" + ""); From 34579e395f2a1696ae7d3da89e043f29a6829461 Mon Sep 17 00:00:00 2001 From: whimlex Date: Fri, 20 Mar 2015 15:59:30 +0800 Subject: [PATCH 11/26] =?UTF-8?q?=E9=99=84=E4=BB=B6=E4=B8=8A=E4=BC=A0bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9B=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88?= =?UTF-8?q?=E6=94=B6=E6=8B=89=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_form.html.erb | 4 +++- app/views/attachments/_form_course.html.erb | 6 +++++- app/views/files/_attachement_list.html.erb | 6 +++++- app/views/layouts/_base_feedback.html.erb | 2 +- config/locales/projects/zh.yml | 2 +- public/javascripts/attachments.js | 14 ++++++-------- 6 files changed, 21 insertions(+), 13 deletions(-) diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb index 39ef47b1b..c428522fe 100644 --- a/app/views/attachments/_form.html.erb +++ b/app/views/attachments/_form.html.erb @@ -62,7 +62,9 @@ :upload_path => uploads_path(:format => 'js',:project =>project), :description_placeholder => l(:label_optional_description), :field_is_public => l(:field_is_public), - :are_you_sure => l(:text_are_you_sure) + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :delete_all_files => l(:text_are_you_sure_all) } %> <%= l(:label_no_file_uploaded)%> diff --git a/app/views/attachments/_form_course.html.erb b/app/views/attachments/_form_course.html.erb index 43f99056b..301c49506 100644 --- a/app/views/attachments/_form_course.html.erb +++ b/app/views/attachments/_form_course.html.erb @@ -50,7 +50,11 @@ :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, :upload_path => uploads_path(:format => 'js'), - :description_placeholder => l(:label_optional_description) + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :delete_all_files => l(:text_are_you_sure_all) } %> <%= l(:label_no_file_uploaded)%> (<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>) diff --git a/app/views/files/_attachement_list.html.erb b/app/views/files/_attachement_list.html.erb index 41025e619..6b9758fd2 100644 --- a/app/views/files/_attachement_list.html.erb +++ b/app/views/files/_attachement_list.html.erb @@ -34,7 +34,11 @@ :max_file_size_message => l(:error_attachment_too_big, :max_size => number_to_human_size(Setting.attachment_max_size.to_i.kilobytes)), :max_concurrent_uploads => Redmine::Configuration['max_concurrent_ajax_uploads'].to_i, :upload_path => uploads_path(:format => 'js'), - :description_placeholder => l(:label_optional_description) + :description_placeholder => l(:label_optional_description), + :field_is_public => l(:field_is_public), + :are_you_sure => l(:text_are_you_sure), + :file_count => l(:label_file_count), + :delete_all_files => l(:text_are_you_sure_all) } %>

', { 'class': 'div_attachments', 'name': 'div_'+'attachments_' + attachmentId} ) ).appendTo('#attachments_fields'); @@ -88,7 +86,7 @@ function ajaxUpload(file, attachmentId, fileSpan, inputEl) { //gcm files count and add delete_all link var count=$('#attachments_fields>span').length; - $('#upload_file_count').html("已上传"+""+count+""+"个文件"); + $('#upload_file_count').html(""+count+""+"个文件已上传"); if(count>=1){ var add_attachs=$('.add_attachment'); var delete_all=$('.remove_all'); @@ -122,7 +120,7 @@ function removeFile() { //gcm delete all file function removeAll(){ - if(confirm("您确定要删除所有文件吗?")){ + if(confirm("您确定要删除所有文件吗")){ $(".remove-upload").removeAttr("data-confirm"); $(".remove-upload").click(); } From e171f7b249144cd948cdc90612955eba3648fc9e Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Mar 2015 16:07:52 +0800 Subject: [PATCH 12/26] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A0=87=E7=AD=BE?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=A0=E9=99=A4=E5=8A=9F=E8=83=BD?= 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, 7 insertions(+), 2 deletions(-) diff --git a/app/views/tags/_tag_name.html.erb b/app/views/tags/_tag_name.html.erb index b97012723..5b2e35812 100644 --- a/app/views/tags/_tag_name.html.erb +++ b/app/views/tags/_tag_name.html.erb @@ -34,7 +34,12 @@ <% if object_flag == '2' %> - <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %> + <%= link_to tag, :controller => "tags", :action => "index", :q => tag, :object_flag => object_flag, :obj_id => obj.id %> + <% if (ProjectInfo.find_by_project_id(obj.id)).try(:user_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 %> <% else %>
@@ -47,7 +52,7 @@ <%= link_to 'x', :controller => "tags", :action => "remove_tag", :remote => true, :tag_name => tag, :taggable_id => obj.id, :taggable_type => object_flag %> - <% end %> + <% end %> <% when '3' %> <% if (ProjectInfo.find_by_project_id(obj.project_id)).try(:user_id) == User.current.id %> From ec8b7e4128c2503565e5bb5f8efd06deea66662a Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Mar 2015 16:12:46 +0800 Subject: [PATCH 13/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AEtag?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=88=A4=E6=96=AD=E9=94=99=E8=AF=AF?= 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 5b2e35812..2ee4d3f20 100644 --- a/app/views/tags/_tag_name.html.erb +++ b/app/views/tags/_tag_name.html.erb @@ -38,8 +38,8 @@ <% if (ProjectInfo.find_by_project_id(obj.id)).try(:user_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 %> + <% else %>
From 72d41fd07ae937b613f7c01cc370bcffbe10aabf Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Mar 2015 16:17:48 +0800 Subject: [PATCH 14/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E9=82=80=E8=AF=B7=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../projects/invite_members_by_mail.html.erb | 134 +++++++++--------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index c222bece1..e6bb1be4e 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -1,68 +1,68 @@ - -
-

<%= l(:label_invite_join)%>

-
-
-
- -
-
-
-
-

<%= l(:label_invite_new_user)%>

-

- <%= l(:label_invite_email_tips)%> -

-
- <%= render :partial => 'regested', locals: { :isregisted => false} %> -
- <%= 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), :onkeyup => "verifyAddress();" %> -
-
- - <%= l(:label_send_email)%> - - <%#= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %> - <% end %> -
-
+ +
+

<%= l(:label_invite_join)%>

+
+
+
+ +
+
+
+
+

<%= l(:label_invite_new_user)%>

+

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

+
+ <%= render :partial => 'regested', locals: { :isregisted => false} %> +
+ <%= 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), :onkeyup => "verifyAddress();" %> +
+
+ + <%= l(:label_send_email)%> + + <%#= submit_tag '免费发送', :style => "display:block; width:80px; text-align:center; color:#fff; height:26px; padding-top:3px; margin-bottom:10px;" %> + <% end %> +
+
\ No newline at end of file From 27a4e462dedf189172c449dedc5ee408b9c7bba3 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 20 Mar 2015 16:49:04 +0800 Subject: [PATCH 15/26] =?UTF-8?q?jpeg=E5=9B=BE=E7=89=87=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/application.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 2b9d1586f..18afa7f67 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -629,7 +629,7 @@ function img_thumbnails() { $('.thumbnails a').colorbox({rel:'nofollow'}); $('.attachments').find('a').each(function(index, element) { var href_value = $(element).attr('href'); - if (/\.(jpg|png|gif|bmp|PNG|BMP|GIF|JPG)$/.test(href_value)) { + if (/\.(jpg|png|gif|bmp|jpeg|PNG|BMP|GIF|JPG|JPEG)$/.test(href_value)) { $(element).colorbox({rel:'nofollow'}); } From 5b050b10377f78de0c7788a7a17116845338245f Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Mar 2015 17:04:04 +0800 Subject: [PATCH 16/26] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=90=8D=E8=BF=87=E9=95=BF=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=88=E4=BD=9C=E4=B8=9A=E4=B8=AD=E9=83=A8=E5=88=86=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=90=8D=E8=B6=85=E5=87=BA=E8=BE=B9=E6=A1=86=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/attachments/_links.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/attachments/_links.html.erb b/app/views/attachments/_links.html.erb index 8913febd0..4c2ee0c8f 100644 --- a/app/views/attachments/_links.html.erb +++ b/app/views/attachments/_links.html.erb @@ -7,9 +7,9 @@ <% end%> <% if options[:length] %> - <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%> + <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true,:length => options[:length] -%> <% else %> - <%= link_to_attachment attachment, :class => 'icon icon-attachment', :download => true -%> + <%= link_to_short_attachment attachment, :class => 'icon icon-attachment', :download => true -%> <% end %> <%if is_float%> From bcfdac37a72eef6c0e3e684bb325a3623ee13804 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 20 Mar 2015 17:26:31 +0800 Subject: [PATCH 17/26] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?= =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=9B=BE=E7=89=87=E7=82=B9=E5=87=BB=E4=B8=8B?= =?UTF-8?q?=E8=BD=BD=E6=9C=89=E5=BC=B9=E6=A1=86=E6=94=B9=E4=B8=BA=E9=A2=84?= =?UTF-8?q?=E8=A7=88=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/files/_course_list.html.erb | 4 +++- public/javascripts/application.js | 7 ++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb index 8af369558..a90d47b5a 100644 --- a/app/views/files/_course_list.html.erb +++ b/app/views/files/_course_list.html.erb @@ -14,9 +14,10 @@

+
<% curse_attachments.each do |file| %>
-
+
<%= link_to_attachment file, :download => true,:text => truncate(file.filename,length: 35, omission: '...'), :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l" %> <% if User.current.logged? %> <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %> @@ -50,6 +51,7 @@
<% end %> +
    <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => @is_remote, :flag => true%>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 18afa7f67..5d2423238 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -632,7 +632,12 @@ function img_thumbnails() { if (/\.(jpg|png|gif|bmp|jpeg|PNG|BMP|GIF|JPG|JPEG)$/.test(href_value)) { $(element).colorbox({rel:'nofollow'}); } - + }); + $('.for_img_thumbnails').find('a').each(function(index, element) { + var href_value = $(element).attr('href'); + if (/\.(jpg|png|gif|bmp|jpeg|PNG|BMP|GIF|JPG|JPEG)$/.test(href_value)) { + $(element).colorbox({rel:'nofollow'}); + } }); } $(document).ready(img_thumbnails); From ef01fc3c716c5c974e10f0665adf93c937672d50 Mon Sep 17 00:00:00 2001 From: z9hang Date: Fri, 20 Mar 2015 17:42:01 +0800 Subject: [PATCH 18/26] =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/application.css | 1 - 1 file changed, 1 deletion(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1270f6bcf..7a039b23f 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -73,7 +73,6 @@ a:hover.subnav_green{ background:#14ad5a;} .course_description_none{max-height: none;} .lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;} .lg-foot:hover{ color:#787b7e;} -. /****标签(和资源库的tag样式一致)***/ .project_Label{ width:220px; padding-left:10px; padding-right:10px; background:#fff; margin-top:10px;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} From fd9eaa93d62e03b7c15290c6d6d03549bb496cb9 Mon Sep 17 00:00:00 2001 From: huang Date: Fri, 20 Mar 2015 17:43:57 +0800 Subject: [PATCH 19/26] =?UTF-8?q?=E5=85=B3=E6=B3=A8=E6=B7=BB=E5=8A=A0+?= =?UTF-8?q?=E5=8F=B7=EF=BC=9B=E5=8E=BB=E6=8E=89css=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E4=B8=AD=E5=A4=9A=E4=BD=99=E7=AC=A6=E5=8F=B7=E5=BC=95=E8=B5=B7?= =?UTF-8?q?=E7=9A=84=E6=A0=B7=E5=BC=8F=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/watchers_helper.rb | 2 +- config/locales/projects/zh.yml | 1 + public/stylesheets/application.css | 4 ++-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index bff7831d1..ed92f7cab 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -295,7 +295,7 @@ module WatchersHelper watched = objects.any? {|object| object.watched_by?(user)} @watch_flag = objects.first.instance_of?(Project) text = @watch_flag ? - (watched ? l(:button_unfollow) : l(:button_follow)) : (watched ? l(:button_unwatch) : l(:button_watch)) + (watched ? l(:button_unfollow) : l(:label_button_following)) : (watched ? l(:button_unwatch) : l(:label_button_following)) url = watch_path(:object_type => objects.first.class.to_s.underscore, :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort)) method = watched ? 'delete' : 'post' diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 5b888de09..5c46be17f 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -36,6 +36,7 @@ zh: label_project_id: "项目ID:" label_apply_project: "+申请加入" + label_button_following: "+关注" label_exit_project: 退出项目 label_apply_project_waiting: 已处理申请，请等待管理员审核 label_unapply_project: 取消申请 diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 1270f6bcf..4db4a462f 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -73,9 +73,9 @@ a:hover.subnav_green{ background:#14ad5a;} .course_description_none{max-height: none;} .lg-foot{ border:1px solid #e8eef2; color: #929598; text-align:center; width:220px; height:23px; cursor:pointer;} .lg-foot:hover{ color:#787b7e;} -. + /****标签(和资源库的tag样式一致)***/ -.project_Label{ width:220px; padding-left:10px; padding-right:10px; background:#fff; margin-top:10px;} +.project_Label{ width:220px; padding-left:10px !important; padding-right:10px; background:#fff; margin-top:10px;} a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;} .submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; } .isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;} From 65bf98016a5976b5c472374e5853e5c21fed0014 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 21 Mar 2015 10:15:35 +0800 Subject: [PATCH 20/26] =?UTF-8?q?=E6=96=B0=E5=BB=BAgit=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AF=BC=E8=88=AA=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/repositories/newrepo.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/repositories/newrepo.html.erb b/app/views/repositories/newrepo.html.erb index 0c95a0335..3facbe96b 100644 --- a/app/views/repositories/newrepo.html.erb +++ b/app/views/repositories/newrepo.html.erb @@ -1,5 +1,7 @@ -

<%= l(:label_repository_new_repos) %>

+
+

<%= l(:label_repository_new_repos) %>

+
<%= labelled_form_for :repository, @repository, :url =>project_repositories_path(@project),:html => {:id => 'repository-form'} do |f| %> <%= render :partial => 'form_create', :locals => {:f => f} %> From dc0c9417e394531b7e912369ccab1e6fb34c10f1 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 21 Mar 2015 10:19:58 +0800 Subject: [PATCH 21/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E6=8F=90?= =?UTF-8?q?=E4=BA=A4=E7=9A=84=E4=BD=9C=E4=B8=9A=E6=98=BE=E7=A4=BA=E5=9C=A8?= =?UTF-8?q?=E5=89=8D=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/courses_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/courses_controller.rb b/app/controllers/courses_controller.rb index c055d38ae..f9ad609cc 100644 --- a/app/controllers/courses_controller.rb +++ b/app/controllers/courses_controller.rb @@ -759,7 +759,7 @@ class CoursesController < ApplicationController def homework if @course.is_public != 0 || User.current.member_of_course?(@course) || User.current.admin? @offset, @limit = api_offset_and_limit({:limit => 10}) - @bids = @course.homeworks.order('deadline DESC') + @bids = @course.homeworks.order('deadline ASC') @bids = @bids.like(params[:name]) if params[:name].present? @bid_count = @bids.count @bid_pages = Paginator.new @bid_count, @limit, params['page'] From f0bc0b2e9374c9517533f0f7ed9def4345e0259e Mon Sep 17 00:00:00 2001 From: z9hang Date: Sat, 21 Mar 2015 10:20:04 +0800 Subject: [PATCH 22/26] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E3=80=81=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8=E3=80=81=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8A=A0=E5=85=A5=E3=80=81=E5=8F=96=E6=B6=88=E7=94=B3?= =?UTF-8?q?=E8=AF=B7=E5=8A=A0=E5=85=A5=E8=BF=94=E5=9B=9Ejs=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/watchers_helper.rb | 14 ++++++++------ app/views/applied_project/_set_applied.js.erb | 11 ++++++++++- app/views/watchers/_set_watcher.js.erb | 11 ++++++++++- 3 files changed, 28 insertions(+), 8 deletions(-) diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index ed92f7cab..b1ebf17f2 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -293,14 +293,15 @@ module WatchersHelper return '' unless user && user.logged? objects = Array.wrap(objects) watched = objects.any? {|object| object.watched_by?(user)} - @watch_flag = objects.first.instance_of?(Project) - text = @watch_flag ? + @watch_flag = objects.first.instance_of?(Project) + id = watcher_css(objects) + text = @watch_flag ? (watched ? l(:button_unfollow) : l(:label_button_following)) : (watched ? l(:button_unwatch) : l(:label_button_following)) url = watch_path(:object_type => objects.first.class.to_s.underscore, :object_id => (objects.size == 1 ? objects.first.id : objects.map(&:id).sort)) - method = watched ? 'delete' : 'post' - link_to text, url, :remote => true, :method => method, - :class => "project_watch_new" + method = watched ? 'delete' : 'post' + link_to text, url, :remote => true, :method => method, + :class => "project_watch_new" ,:id=>id end #申请加入项目 @@ -312,12 +313,13 @@ module WatchersHelper if applied appliedid = applied.id end + id = applied_css(project) url = appliedproject_path( :id=>appliedid, :user_id => user.id, :project_id => project.id) method = applied ? 'delete' : 'post' - link_to text, url, :remote => true, :method => method , :class => "project_watch_new" + link_to text, url, :remote => true, :method => method , :class => "project_watch_new",:id => id end end diff --git a/app/views/applied_project/_set_applied.js.erb b/app/views/applied_project/_set_applied.js.erb index 7403b963b..33d862d1c 100644 --- a/app/views/applied_project/_set_applied.js.erb +++ b/app/views/applied_project/_set_applied.js.erb @@ -1,5 +1,14 @@ <% selector = ".#{applied_css(@project)}" %> -$("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript applied_link(@project, User.current) %>")}); +<% id_selector = "#{applied_css(@project)}" %> +if($("<%= selector %>").get(0) == undefined) +{ + $("#<%= id_selector %>").each(function(){$(this).replaceWith("<%= escape_javascript join_in_project_link(@project, User.current) %>")}); +} +else +{ + $("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript applied_link(@project, User.current) %>")}); +} + if (window.Messenger) { Messenger.options = { extraClasses: 'messenger-fixed messenger-on-bottom messenger-on-right', diff --git a/app/views/watchers/_set_watcher.js.erb b/app/views/watchers/_set_watcher.js.erb index e5cdc4f3e..92fcbd489 100644 --- a/app/views/watchers/_set_watcher.js.erb +++ b/app/views/watchers/_set_watcher.js.erb @@ -1,2 +1,11 @@ <% selector = ".#{watcher_css(watched)}" %> -$("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript watcher_link(watched, user) %>")}); +<% id_selector = "#{watcher_css(watched)}" %> +if($("<%= selector %>").get(0) == undefined) +{ + $("#<%= id_selector %>").each(function(){$(this).replaceWith("<%= escape_javascript watcher_link_for_project(watched, user) %>")}); +} +else +{ + $("<%= selector %>").each(function(){$(this).replaceWith("<%= escape_javascript watcher_link(watched, user) %>")}); +} + From 27b8af61c4b47409afc4567db9c31fa01e456416 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 21 Mar 2015 10:36:19 +0800 Subject: [PATCH 23/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=B3=E6=B3=A8?= =?UTF-8?q?=E3=80=81=E5=8F=96=E6=B6=88=E5=85=B3=E6=B3=A8=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E8=BF=87=E7=A8=8B=E6=8D=A2=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/application.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 6403f57ee..8ef5e63bd 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -31,7 +31,7 @@ a{ text-decoration:none; } .fl{ float: left;} .fr{ float:right;} .project_h4{ font-size:14px; color:#3b3b3b;} -.project_watch_new{color: #fff !important; display:block !important; padding: 0px 5px !important; margin-right: 10px !important; height: 22px !important; line-height: 21px !important;padding-top:1px !important; background: none repeat scroll 0% 0% #64BDD9 !important;} +.project_watch_new{color: #fff !important; display:block !important; padding: 0px 4px !important; margin-right: 10px !important; height: 22px !important; line-height: 21px !important;padding-top:1px !important; background: none repeat scroll 0% 0% #64BDD9 !important;} .project_content{ width:940px; margin:10px auto;} .project_left{ float:left;} From 9e297609fdaefcd6e0813890f91a535d66348d78 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 21 Mar 2015 10:53:06 +0800 Subject: [PATCH 24/26] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=82=AE=E4=BB=B6?= =?UTF-8?q?=E9=82=80=E8=AF=B7=EF=BC=9A=E6=AD=A3=E5=88=99=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E4=BA=8B=E4=BB=B6=E6=94=B9=E6=88=90=E5=A4=B1?= =?UTF-8?q?=E5=8E=BB=E9=BC=A0=E6=A0=87=E7=84=A6=E7=82=B9=20=EF=BC=88?= =?UTF-8?q?=E5=90=A6=E5=88=99=E8=BE=93=E5=85=A5=E4=B8=80=E4=B8=AA=E5=AD=97?= =?UTF-8?q?=E6=AF=8D=E4=B9=9F=E4=BC=9A=E8=A7=A6=E5=8F=91=EF=BC=8C=E7=BB=99?= =?UTF-8?q?=E4=BA=BA=E6=84=9F=E8=A7=89=E9=82=AE=E7=AE=B1=E5=B7=B2=E7=BB=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/invite_members_by_mail.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index e6bb1be4e..2d79188e6 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -55,7 +55,7 @@
<%= 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), :onkeyup => "verifyAddress();" %> + <%= text_field_tag 'mail', '', :class => "fb_item fl", :placeholder => l(:label_input_email), :onblur => "verifyAddress();" %>
From 1e1ee9a248d63a997f6697d551685ae04ac7fbc2 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 21 Mar 2015 13:54:16 +0800 Subject: [PATCH 25/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1?= =?UTF-8?q?=E5=8C=B9=E9=85=8D=E9=94=99=E8=AF=AF=E5=90=8E=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E8=AF=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/projects/invite_members_by_mail.html.erb | 2 +- config/locales/projects/zh.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/projects/invite_members_by_mail.html.erb b/app/views/projects/invite_members_by_mail.html.erb index 2d79188e6..4fcc2e77d 100644 --- a/app/views/projects/invite_members_by_mail.html.erb +++ b/app/views/projects/invite_members_by_mail.html.erb @@ -12,7 +12,7 @@ } else { - $("#valid_email").html("您所填写的邮件格式不正确"); + $("#valid_email").html("您输入的邮箱格式不正确！"); } return false; } diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index 5c46be17f..7524c0415 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -195,7 +195,7 @@ zh: label_invite_join: 邀请加入 label_invite_email_tips: 输入好友邮箱地址，Trustie会自动为该邮箱注册用户！ notice_registed_success: 您输入的邮箱为空或者该邮箱已被注册! - label_email_format_error: 您所填写的电子邮件格式不正确 + label_email_format_error: 您输入的邮箱格式不正确！ label_user_role_null: 用户和角色不能留空！ label_send_email: 免费发送 label_input_email: 请输入邮箱地址 From f1b8d74a075db01560e88b4ad4163d66e9e7dbb0 Mon Sep 17 00:00:00 2001 From: huang Date: Sat, 21 Mar 2015 14:17:29 +0800 Subject: [PATCH 26/26] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=AD=97=E4=BD=93=E5=A4=A7=E5=B0=8F=E3=80=81?= =?UTF-8?q?=E5=AE=BD=E5=BA=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/watchers_helper.rb | 2 +- app/views/layouts/base_projects.html.erb | 6 +++--- public/stylesheets/application.css | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index b1ebf17f2..294d895a5 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -284,7 +284,7 @@ module WatchersHelper def exit_project_link(project) link_to(l(:label_exit_project),exit_cur_project_path(project.id), :remote => true, :confirm => l(:lable_sure_exit_project), - :style => "color: #fff; display:block; padding: 0px 5px; margin-right: 10px; height: 21px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES;padding-top:1px;" ) + :style => "color: #fff; display:block;font-size:12px; padding: 0px 5px; margin-right: 10px; height: 20px; line-height: 22px; background: none repeat scroll 0% 0% #64BDD9; TES;padding-top:1px;" ) end #项目关注、取消关注 diff --git a/app/views/layouts/base_projects.html.erb b/app/views/layouts/base_projects.html.erb index 9c999aa05..e69d92694 100644 --- a/app/views/layouts/base_projects.html.erb +++ b/app/views/layouts/base_projects.html.erb @@ -153,7 +153,7 @@ (<%= @project.issues.count %>) <% end %> <% 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:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %> + <%= link_to "+"+l(:label_release_issue), new_project_issue_path(@project) , :style => "font-size:12px !important;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %> <% end %>
<% end %> @@ -164,7 +164,7 @@ (<%= @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',:style => "font-size:12px;color:#fff; padding:0px 3px 3px 3px;height:16px;margin-top:5px;background:#28be6c;float:right;line-height:20px;" %> + <%= link_to "+"+l(:project_module_boards_post), project_boards_path(@project, :flag => true), :layout => 'base_projects',:style => "font-size:12px !important;color:#fff; padding:0px 3px 3px 3px;height:16px;margin-top:5px;background:#28be6c;float:right;line-height:20px;" %> <% end %>
<% end%> @@ -175,7 +175,7 @@ (<%= attaments_num %>) <% end %> <% 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:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %> + <%= link_to "+"+l(:label_upload_files), project_files_path(@project,:flag => true),:style => "font-size:12px !important;color:#fff; padding:1px 3px 3px 3px;height:16px;margin-top:4px;background:#28be6c;float:right;line-height:20px;" %> <% end %>
<% end%> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 8ef5e63bd..8413b3c54 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -31,7 +31,7 @@ a{ text-decoration:none; } .fl{ float: left;} .fr{ float:right;} .project_h4{ font-size:14px; color:#3b3b3b;} -.project_watch_new{color: #fff !important; display:block !important; padding: 0px 4px !important; margin-right: 10px !important; height: 22px !important; line-height: 21px !important;padding-top:1px !important; background: none repeat scroll 0% 0% #64BDD9 !important;} +.project_watch_new{color: #fff !important;font-size:12px; display:block !important; padding: 0px 4px !important; margin-right: 10px !important; height: 20px !important; line-height: 21px !important;padding-top:1px !important; background: none repeat scroll 0% 0% #64BDD9 !important;} .project_content{ width:940px; margin:10px auto;} .project_left{ float:left;}