From 70357683f763afd806bd45f495583adf3efd3de8 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Sep 2015 14:51:06 +0800 Subject: [PATCH 01/24] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=A1=B9=E7=9B=AE=E9=82=AE=E4=BB=B6=E7=95=8C?= =?UTF-8?q?=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/mailer/applied_project.html.erb | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/app/views/mailer/applied_project.html.erb b/app/views/mailer/applied_project.html.erb index 4f266e6ce..eb49c35b9 100644 --- a/app/views/mailer/applied_project.html.erb +++ b/app/views/mailer/applied_project.html.erb @@ -1,5 +1,11 @@ -<%= l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name) %> -
- -

<%= link_to(h(@project.name), @applied_url) %>

+
+ +
+
From b70104cee819082d2dda69ff7b88c4e8bc3ebf5d Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Sep 2015 14:54:03 +0800 Subject: [PATCH 02/24] =?UTF-8?q?=E5=AE=8C=E6=95=B4mail.text?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/mailer/applied_project.text.erb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/views/mailer/applied_project.text.erb b/app/views/mailer/applied_project.text.erb index 7af8c2018..0dd3f308d 100644 --- a/app/views/mailer/applied_project.text.erb +++ b/app/views/mailer/applied_project.text.erb @@ -1,4 +1,7 @@ -<%= l(:text_applied_project, :id => "##{@user.show_name}", :project => @project.name) %> +<%= l(:mail_issue_content)%> +<%=link_to @user.show_name, user_url(@user) %> +<%=link_to @project.name, @applied_url %> + + -

<%= link_to(h(@project.name), @applied_url) %>

From 6e9db8b9226c7d48ff3829a0fd29ca5ce76126cb Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Sep 2015 15:08:40 +0800 Subject: [PATCH 03/24] =?UTF-8?q?=E5=B0=81=E8=A3=85=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 40 +++++++++++++++++------------ 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 0783d1805..c00f7ec17 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -101,22 +101,10 @@ class UsersController < ApplicationController elsif @user != User.current && !User.current.admin? return render_403 end - # 记录当前点击按钮的时间 - # 考虑到用户未退出刷新消息页面 - message_time = OnclickTime.where("user_id =?", User.current).first - if message_time.nil? - message_new_time = OnclickTime.new - message_new_time.user_id = User.current.id - message_new_time.onclick_time = Time.now - message_new_time.save - else - # 24小时内显示 - contrast_time = Time.now - 86400 - message_time.update_attributes(:onclick_time => Time.now) - end - @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc") - # 当前用户查看消息，则设置消息为已读 - # DO 待优化，只需查出符合条件的再更新 + # 初始化/更新 点击按钮时间 + # 24小时内显示系统消息 + update_onclick_time + # 全部设为已读 if params[:viewed] == "all" course_querys = @user.course_messages forge_querys = @user.forge_messages @@ -197,6 +185,26 @@ class UsersController < ApplicationController end end + # 初始化/更新 点击按钮时间 + def update_onclick_time + # 记录当前点击按钮的时间 + # 考虑到用户未退出刷新消息页面 + + message_time = OnclickTime.where("user_id =?", User.current).first + if message_time.nil? + message_new_time = OnclickTime.new + message_new_time.user_id = User.current.id + message_new_time.onclick_time = Time.now + message_new_time.save + else + # 24小时内显示 + contrast_time = Time.now - 86400 + message_time.update_attributes(:onclick_time => Time.now) + end + # 24小时内显示系统消息 + @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc") + end + # 系统消息 def user_system_messages @sytem_messages = SystemMessage.order("created_at desc").all From d9620e416edf0f7fb12920d2db8a31f5d7b0bb44 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Sep 2015 15:17:10 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E4=BC=98=E5=8C=96=E2=80=9C=E5=85=A8?= =?UTF-8?q?=E9=83=A8=E8=AE=BE=E4=B8=BA=E5=B7=B2=E8=AF=BB=E2=80=9D=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c00f7ec17..874f9c607 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -106,16 +106,7 @@ class UsersController < ApplicationController update_onclick_time # 全部设为已读 if params[:viewed] == "all" - course_querys = @user.course_messages - forge_querys = @user.forge_messages - user_querys = @user.user_feedback_messages - forum_querys = @user.memo_messages - if User.current.id == @user.id - course_querys.update_all(:viewed => true) - forge_querys.update_all(:viewed => true) - user_querys.update_all(:viewed => true) - forum_querys.update_all(:viewed => true) - end + update_message_viewed(@user) end # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count case params[:type] @@ -189,7 +180,6 @@ class UsersController < ApplicationController def update_onclick_time # 记录当前点击按钮的时间 # 考虑到用户未退出刷新消息页面 - message_time = OnclickTime.where("user_id =?", User.current).first if message_time.nil? message_new_time = OnclickTime.new @@ -205,6 +195,20 @@ class UsersController < ApplicationController @user_system_messages = SystemMessage.where("created_at >?", contrast_time).order("created_at desc") end + # 消息设置为已读 + def update_message_viewed(user) + course_querys = CourseMessage.where("user_id =? and viewed =?", user, 0) + forge_querys = ForgeMessage.where("user_id =? and viewed =?", user, 0) + user_querys = UserFeedbackMessage.where("user_id =? and viewed =?", user, 0) + forum_querys = MemoMessage.where("user_id =? and viewed =?", user, 0) + if User.current.id == @user.id + course_querys.update_all(:viewed => true) + forge_querys.update_all(:viewed => true) + user_querys.update_all(:viewed => true) + forum_querys.update_all(:viewed => true) + end + end + # 系统消息 def user_system_messages @sytem_messages = SystemMessage.order("created_at desc").all From b49d19cdb26220196c4b21a91a8b3fcb8bf172b5 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Sep 2015 15:32:28 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/user.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/models/user.rb b/app/models/user.rb index 48b269e6e..0ed8aeda0 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -264,6 +264,7 @@ class User < Principal if OnclickTime.where("user_id =?", User.current).first.nil? message_new_time = OnclickTime.new message_new_time.user_id = User.current.id + # 第一次初始化点击铃铛时间 message_new_time.onclick_time = User.current.last_login_on.nil? ? Time.now : User.current.last_login_on message_new_time.save end From 48b93f21133f6c18c69547b42214738faa68ee8d Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 21 Sep 2015 17:51:00 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BC=BA=E9=99=B7?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=82=B9=E5=AF=B9=E7=82=B9=E5=8F=91=E9=80=81?= =?UTF-8?q?=20=E5=9B=9E=E5=A4=8D=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?= =?UTF-8?q?=EF=BC=88=E6=9C=AA=E5=AE=8C=E6=88=90=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/issues_controller.rb | 3 --- app/models/journal.rb | 9 +++++++-- app/models/journal_reply.rb | 25 +++++++++++++++++++++++++ app/views/issues/_edit.html.erb | 6 ------ 4 files changed, 32 insertions(+), 11 deletions(-) diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb index bf854abe8..2232602aa 100644 --- a/app/controllers/issues_controller.rb +++ b/app/controllers/issues_controller.rb @@ -223,7 +223,6 @@ class IssuesController < ApplicationController end if saved - #修改界面增加跟踪者 watcherlist = @issue.watcher_users select_users = [] @@ -253,9 +252,7 @@ class IssuesController < ApplicationController JournalReply.add_reply(@issue.current_journal.id, reply_id, User.current.id) end flash[:notice] = l(:notice_successful_update) unless @issue.current_journal.new_record? - respond_to do |format| - format.html { redirect_to issue_url(@issue.id) } format.api { render_api_ok } end diff --git a/app/models/journal.rb b/app/models/journal.rb index 0d86d12ff..9ffc5d405 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -171,11 +171,16 @@ class Journal < ActiveRecord::Base # 缺陷状态更改，消息提醒 def act_as_forge_message + receivers = [] + # 直接回复 if self.user_id != self.issue.author_id - self.forge_messages << ForgeMessage.new(:user_id => self.issue.author_id, :project_id => self.issue.project_id, :viewed => false) + receivers << self.issue.author_id end if self.user_id != self.issue.assigned_to_id && self.issue.assigned_to_id != self.issue.author_id # 指派人不是自己的话，则给指派人发送 - self.forge_messages << ForgeMessage.new(:user_id => self.issue.assigned_to_id, :project_id => self.issue.project_id, :viewed => false) + receivers << self.issue.assigned_to_id + end + receivers.each do |r| + self.forge_messages << ForgeMessage.new(:user_id => r, :project_id => self.issue.project_id, :viewed => false) end end diff --git a/app/models/journal_reply.rb b/app/models/journal_reply.rb index 814231776..430d506ed 100644 --- a/app/models/journal_reply.rb +++ b/app/models/journal_reply.rb @@ -5,8 +5,33 @@ class JournalReply < ActiveRecord::Base belongs_to :user belongs_to :journal + after_create :send_journal_messages def self.add_reply(journal_id, reply_id, user_id) self.create(:journal_id => journal_id, :reply_id => reply_id, :user_id => user_id) end + + def send_journal_messages + journal = self.journal + replier = User.find(self.reply_id) + receivers = [] + # 被回复的人发送消息 + if journal.user_id != self.reply_id + receivers << self.replier + end + if journal.user_id != journal.issue.author_id && self.reply_id != journal.issue.author_id + receivers << self.journal.issue.author + end + receivers.each do |r| + journal.forge_messages << ForgeMessage.new(:user_id =>r, :project_id => journal.issue.project, :viewed => false) + end + + # if self.user_id != self.journal_reply.user_id + # receivers << self.journal_reply.user_id + # end + # # 给缺陷发布者发送 + # if self.user_id != self.issue.author_id && self.journal_reply.user_id != self.issue.author_id + # receivers << self.issue.author_id + # end + end end diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 1f3f984b4..3a3782e47 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -6,15 +6,9 @@ - <% end %> - - <% if @journals.present? %>
<%= render :partial => 'history', :locals => {:issue => @issue, :journals => @journals} %> From e295c74a918b8ee09cf9dc72c30de58de666fc32 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 22 Sep 2015 14:36:28 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E7=95=99=E8=A8=80=E4=B8=AD=EF=BC=8C=E5=BD=93=E7=95=99=E8=A8=80?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E4=B8=BA=E7=A9=BA=EF=BC=88blank=EF=BC=89?= =?UTF-8?q?=E6=97=B6=EF=BC=8C=E4=B8=8D=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/users_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 15eebc15e..b1020d938 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -463,7 +463,7 @@ module UsersHelper def get_issue_des_update(journal) no_html = "message" arr = details_to_strings(journal.details, no_html) - unless journal.notes.empty? + unless journal.notes.blank? arr << "留言内容：" + journal.notes end str = '' From 200861cfefc82291e24fb76f57d381afdcb8932b Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 22 Sep 2015 16:08:30 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E5=AE=8C=E6=88=90issue=E7=82=B9=E5=AF=B9?= =?UTF-8?q?=E7=82=B9=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journal_reply.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/journal_reply.rb b/app/models/journal_reply.rb index 430d506ed..a1ea761af 100644 --- a/app/models/journal_reply.rb +++ b/app/models/journal_reply.rb @@ -16,14 +16,15 @@ class JournalReply < ActiveRecord::Base replier = User.find(self.reply_id) receivers = [] # 被回复的人发送消息 - if journal.user_id != self.reply_id - receivers << self.replier + if journal.user_id != self.reply_id && self.reply_id != journal.issue.author_id + receivers << replier end if journal.user_id != journal.issue.author_id && self.reply_id != journal.issue.author_id receivers << self.journal.issue.author end + # journal_forge_messages = ForgeMessage.new receivers.each do |r| - journal.forge_messages << ForgeMessage.new(:user_id =>r, :project_id => journal.issue.project, :viewed => false) + journal.forge_messages << ForgeMessage.new(:user_id =>r.id, :project_id => journal.issue.project_id, :viewed => false) end # if self.user_id != self.journal_reply.user_id From 8d64114c5827f526a08e0d9a9729aa9d17f1a65a Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 22 Sep 2015 17:31:33 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E7=95=99=E8=A8=80=E5=BC=95=E7=94=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/journals_controller.rb | 9 ++++----- app/views/issues/show.html.erb | 8 ++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index 6cebfef7a..769e62209 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -36,8 +36,7 @@ class JournalsController < ApplicationController sort_update(@query.sortable_columns) if @query.valid? - @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC", - :limit => 25) + @journals = @query.journals(:order => "#{Journal.table_name}.created_on DESC", :limit => 25) end @title = (@project ? @project.name : Setting.app_title) + ": " + (@query.new_record? ? l(:label_changes_details) : @query.name) render :layout => false, :content_type => 'application/atom+xml' @@ -72,9 +71,9 @@ class JournalsController < ApplicationController end # Replaces pre blocks with [...] text = text.to_s.strip.gsub(%r{
((.|\s)*?)
}m, '[...]') - @content = "> #{ll(Setting.default_language, :text_user_wrote, user)}\n> " - @content << text.gsub(/(\r?\n|\r\n?)/, "\n> ") + "\n\n" - # @content = "
" << @content + @content = "#{ll(Setting.default_language, :text_user_wrote, user)}\n" + @content << text.gsub(/(\r?\n|\r\n?)/, "\n ") + "\n" + @content = "
" << @content << "
" @id = user.id rescue ActiveRecord::RecordNotFound render_404 diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 01cbea1c1..d57be8a91 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -20,12 +20,8 @@


-

由<%= @issue.author %> - <%# if @issue.created_on != @issue.updated_on %> - 添加于 <%= format_time(@issue.created_on).html_safe %> - <%# else %> - <%#= format_time(@issue.updated_on).html_safe %> - <%# end %> + 由<%= @issue.author %> + 添加于 <%= format_time(@issue.created_on).html_safe %>

'action_menu' %> From 9d474d65281ba0d37a5f32542a52f06a77f9dc61 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 23 Sep 2015 13:54:36 +0800 Subject: [PATCH 10/24] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E5=8C=BF=E8=AF=84?= =?UTF-8?q?=E5=B1=9E=E6=80=A7=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_set_evalutation_att.html.erb | 44 +++++++++++++++++++ app/views/users/_user_homework_list.html.erb | 3 ++ app/views/users/user_homeworks.html.erb | 9 +++- public/stylesheets/new_user.css | 11 +++-- 4 files changed, 61 insertions(+), 6 deletions(-) create mode 100644 app/views/homework_common/_set_evalutation_att.html.erb diff --git a/app/views/homework_common/_set_evalutation_att.html.erb b/app/views/homework_common/_set_evalutation_att.html.erb new file mode 100644 index 000000000..1ad8188ef --- /dev/null +++ b/app/views/homework_common/_set_evalutation_att.html.erb @@ -0,0 +1,44 @@ +
+ 匿评设置 +
+ +
+ 开启匿评 +
+ + <%= calendar_for('evaluation_start_time')%> +
+
+ +
+ +
+ 关闭匿评 +
+ + <%= calendar_for('evaluation_end_time')%> +
+
+
+ +
+ 匿评人数 + +
+
+ +
+ 禁用匿评 + + 禁用后将无法进行学生互评 +
+
+ +
+
确定
+
+ 取消 +
+
+
+
\ No newline at end of file diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index cd596e22b..61c9ff8a0 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -60,6 +60,9 @@
  • <%= link_to(l(:label_bid_respond_delete), homework_common_path(homework_common,:is_in_course => 0),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "postOptionLink") %>
    • +
  • + 匿评设置 +
  • <%= homework_anonymous_comment homework_common %>
    • diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb index a169be166..b6f4dd7e0 100644 --- a/app/views/users/user_homeworks.html.erb +++ b/app/views/users/user_homeworks.html.erb @@ -8,8 +8,13 @@ $("#homework_editor").toggle(); } - function checkAllBox(doc){ - + function set_evaluation_att(){ + $('#ajax-modal').html('<%= escape_javascript(render :partial => 'homework_common/set_evalutation_att') %>'); + showModal('ajax-modal', '350px'); + $('#ajax-modal').siblings().remove(); + $('#ajax-modal').before("" + + ""); + $('#ajax-modal').parent().css("top","25%").css("left","35%").css("position","fixed"); }
    diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 5e049e029..006947928 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -58,6 +58,12 @@ h4{ font-size:14px; color:#3b3b3b;} .clearfix{clear:both;zoom:1} .break_word{ word-break:break-all; word-wrap: break-word;} .white_space{white-space:nowrap;} +.fontGrey3 {color:#484848;} +a.linkGrey6 {color:#484848 !important;} +a.linkGrey6:hover {color:#ffffff !important;} +.markPopup {width:290px; height:auto; padding:5px 0px 15px 15px; background-color:#ffffff; z-index:1000;} +.markInput {margin-bottom:10px; outline:none; border:1px solid #e6e6e6; height:30px; width:140px; color:#3d3c3c;} +.markPercentage {margin:10px 0; border:1px solid #e6e6e6; width:70px; height:30px; outline:none; font-size:12px; color:#3d3c3c;} /* Spacing */ .ml2{ margin-left:2px;} @@ -527,7 +533,7 @@ a.homepageWhite:hover {color:#a1ebff} a.newsGrey {color:#4b4b4b;} a.newsGrey:hover {color:#000000;} a.newsRed {color:red;} -a.newsRed:hovor {color:#888888;} +a.newsRed:hover {color:#888888;} a.replyGrey {color:#888888; display:inline-block;} a.replyGrey:hover {color:#4b4b4b;} a.replyGrey1 {color:#888888;} @@ -768,9 +774,6 @@ div.modal { .ui-widget { font-family: Verdana, sans-serif; font-size: 1.1em; - width: 200px; - height: 14px; - background: #e2e2e2; } .ui-dialog .ui-dialog-content { position: relative; From 5b671c5109ef0b5dd26f17a6f2b3295084e57695 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 23 Sep 2015 14:27:47 +0800 Subject: [PATCH 11/24] =?UTF-8?q?issue=20=E5=BC=95=E7=94=A8=E6=A8=A1?= =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=20issue=E7=9B=B8=E5=85=B3=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/_attributes.html.erb | 48 ++++----- app/views/issues/_attributes_show.html.erb | 52 +++++++++ app/views/issues/_edit.html.erb | 4 +- app/views/issues/_form.html.erb | 22 ++-- app/views/issues/_form_custom_fields.html.erb | 22 ++-- app/views/issues/show.html.erb | 101 +++++------------- app/views/journals/new.js.erb | 3 +- public/javascripts/project.js | 3 + 8 files changed, 123 insertions(+), 132 deletions(-) create mode 100644 app/views/issues/_attributes_show.html.erb diff --git a/app/views/issues/_attributes.html.erb b/app/views/issues/_attributes.html.erb index 68bd9f82c..54cb85212 100644 --- a/app/views/issues/_attributes.html.erb +++ b/app/views/issues/_attributes.html.erb @@ -6,12 +6,11 @@
  • <% if @issue.safe_attribute?('status_id') && @allowed_statuses.present? %> - <%= f.select :status_id, - (@allowed_statuses.collect { |p| [p.name, p.id] }), - {:no_label => true}, - # ajax 刷新 - #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')", - :class => "w150" %> + <%= f.select :status_id, (@allowed_statuses.collect { |p| [p.name, p.id] }), + {:no_label => true}, + # ajax 刷新 + #:onchange => "updateIssueFrom('#{escape_javascript project_issue_form_path(@project, :id => @issue, :format => 'js')}')", + :class => "w150" %> <% else %> <%= h(@issue.status.name) %> <% end %> @@ -20,10 +19,9 @@
  • <% if @issue.safe_attribute? 'priority_id' %> - <%= f.select :priority_id, - (@priorities.collect { |p| [p.name, p.id] }), - {:required => true, :no_label => true}, :disabled => !@issue.leaf?, - :class => "w150" %> + <%= f.select :priority_id, (@priorities.collect { |p| [p.name, p.id] }), + {:required => true, :no_label => true}, :disabled => !@issue.leaf?, + :class => "w150" %> <% end %>
    • @@ -32,8 +30,8 @@ <% if @issue.safe_attribute? 'assigned_to_id' %> <%= f.select :assigned_to_id, principals_options_for_select(@issue.assignable_users, @issue.assigned_to), - {:required => @issue.required_attribute?('assigned_to_id'), :no_label => true}, - :class => "w150" %> + {:required => @issue.required_attribute?('assigned_to_id'), :no_label => true}, + :class => "w150" %> <% end %>
    @@ -41,8 +39,8 @@ <% if @issue.safe_attribute?('fixed_version_id') && @issue.assignable_versions.any? %> <%= f.select :fixed_version_id, version_options_for_select(@issue.assignable_versions, @issue.fixed_version), - {:include_blank => true, :required => @issue.required_attribute?('fixed_version_id'), :no_label => true}, - :class => "w150" %> + {:include_blank => true, :required => @issue.required_attribute?('fixed_version_id'), :no_label => true}, + :class => "w150" %> <%#= link_to(image_tag('add.png', :style => 'vertical-align: middle;'), new_project_version_path(@issue.project), :remote => true, @@ -60,11 +58,7 @@
  • <% if @issue.safe_attribute? 'start_date' %> - <%= f.text_field :start_date, - :size => 22, - :disabled => !@issue.leaf?, - :no_label => true, - :required => @issue.required_attribute?('start_date') %> + <%= f.text_field :start_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true, :required => @issue.required_attribute?('start_date') %> <%= calendar_for('issue_start_date', 'start_date') if @issue.leaf? %> <% end %>
    • @@ -72,10 +66,7 @@
  • <% if @issue.safe_attribute? 'due_date' %> - <%= f.text_field :due_date, :size => 22, - :disabled => !@issue.leaf?, - :no_label => true, - :required => @issue.required_attribute?('due_date') %> + <%= f.text_field :due_date, :size => 22, :disabled => !@issue.leaf?, :no_label => true, :required => @issue.required_attribute?('due_date') %> <%= calendar_for('issue_due_date', 'start_date') if @issue.leaf? %> <% end %>
    • @@ -83,10 +74,7 @@
  • <% if @issue.safe_attribute? 'estimated_hours' %> - <%= f.text_field :estimated_hours, :size => 22, - :disabled => !@issue.leaf?, - :no_label => true, - :required => @issue.required_attribute?('estimated_hours') %> + <%= f.text_field :estimated_hours, :size => 22, :disabled => !@issue.leaf?, :no_label => true, :required => @issue.required_attribute?('estimated_hours') %> <%= l(:field_hours) %> <% end %>
    • @@ -94,9 +82,9 @@
  • <% if @issue.safe_attribute?('done_ratio') && @issue.leaf? && Issue.use_field_for_done_ratio? %> <%= f.select :done_ratio, ((0..10).to_a.collect { |r| ["#{r*10} %", r*10] }), - {:required => @issue.required_attribute?('done_ratio'), :no_label => true}, - :onchange => "PrecentChange(this.value)", - :class => "w150" %> + {:required => @issue.required_attribute?('done_ratio'), :no_label => true}, + :onchange => "PrecentChange(this.value)", + :class => "w150" %> <% end %>
    • diff --git a/app/views/issues/_attributes_show.html.erb b/app/views/issues/_attributes_show.html.erb new file mode 100644 index 000000000..7b9e2bedf --- /dev/null +++ b/app/views/issues/_attributes_show.html.erb @@ -0,0 +1,52 @@ + +
    + <%= issue_fields_rows do |rows| %> +
      +

    •  状态  : 

      <%= @issue.status.name %>

      +
      • +
      + <% unless @issue.disabled_core_fields.include?('assigned_to_id') %> +

    •  指派给  : 

      <%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %> +
      • + <% end %> +
      +
    +
      +

    •  优先级  : 

      <%= @issue.priority.name %> +
      • +
      + <% unless @issue.disabled_core_fields.include?('done_ratio') %> +

    •  % 完成  : 

      <%= @issue.done_ratio %>% +
      • + <% end %> +
      +
    +
      + <% unless @issue.disabled_core_fields.include?('start_date') %> +

    •  开始  : 

      <%= format_date(@issue.start_date) %>

      +
      • + <% end %> +
      + <% unless @issue.disabled_core_fields.include?('estimated_hours') %> +

    •  周期  : 

      <%= l_hours(@issue.estimated_hours) %> +
      • + <% end %> +
      +
    +
      + <% unless @issue.disabled_core_fields.include?('due_date') %> +

    •  计划完成  : 

      <%= format_date(@issue.due_date)? format_date(@issue.due_date) : "--" %> +
      • + <% end %> +
      + <% unless @issue.disabled_core_fields.include?('fixed_version_id') %> +

    •  目标版本  : 

      <%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %> +
      • + <% end %> +
      +
    + <% end %> + <%#= render_custom_fields_rows(@issue) %> + <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %> +
    + \ No newline at end of file diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb index 3a3782e47..c6b805d0a 100644 --- a/app/views/issues/_edit.html.erb +++ b/app/views/issues/_edit.html.erb @@ -14,7 +14,9 @@ <%= render :partial => 'history', :locals => {:issue => @issue, :journals => @journals} %>
    <% end %> -
    +
    + +
    回复 <%= f.text_area :notes, :style => "width:99%;", :rows => "5", :no_label => true %> diff --git a/app/views/issues/_form.html.erb b/app/views/issues/_form.html.erb index 41fca87eb..0d5c876f1 100644 --- a/app/views/issues/_form.html.erb +++ b/app/views/issues/_form.html.erb @@ -28,11 +28,7 @@
  • <% if @issue.safe_attribute? 'subject' %> - <%= f.text_field :subject, - :class => "w576", - :maxlength => 255, - :style => "font-size:small", - :no_label => true %> + <%= f.text_field :subject, :class => "w576", :maxlength => 255, :style => "font-size:small", :no_label => true %> <%= javascript_tag do %> observeAutocompleteField('issue_subject', @@ -53,13 +49,7 @@ <%= f.label_for_field :description, :required => @issue.required_attribute?('description'), :no_label => true, :class => "label" %> <%#= link_to_function image_tag('edit.png'), '$(this).hide(); $("#issue_description_and_toolbar").show()' unless @issue.new_record? %> <%#= content_tag 'span', :id => "issue_description_and_toolbar" do %> - <%= f.kindeditor :description,:editor_id => "issue_desc_editor", - # :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min), - # :accesskey => accesskey(:edit), - # :class => "w583", - :width=>'87%', - :resizeType => 0, - :no_label => true %> + <%= f.kindeditor :description,:editor_id => "issue_desc_editor", :width=>'87%', :resizeType => 0, :no_label => true %> <%# end %> <%#= wikitoolbar_for 'issue_description' %> <% end %> @@ -68,13 +58,13 @@
  • - <% if @copy_from && @copy_from.attachments.any? %> -

    + <%# if @copy_from && @copy_from.attachments.any? %> + -

    - <% end %> + + <%# end %> <% if @copy_from && !@copy_from.leaf? %>

    diff --git a/app/views/issues/_form_custom_fields.html.erb b/app/views/issues/_form_custom_fields.html.erb index 4da98eb13..c97244902 100644 --- a/app/views/issues/_form_custom_fields.html.erb +++ b/app/views/issues/_form_custom_fields.html.erb @@ -1,13 +1,13 @@

    -
    -<% i = 0 %> -<% split_on = (@issue.custom_field_values.size / 2.0).ceil - 1 %> -<% @issue.editable_custom_field_values.each do |value| %> -

    <%= custom_field_tag_with_label :issue, value, :required => @issue.required_attribute?(value.custom_field_id) %>

    -<% if i == split_on -%> -
    -<% end -%> -<% i += 1 -%> -<% end -%> -
    +
    + <% i = 0 %> + <% split_on = (@issue.custom_field_values.size / 2.0).ceil - 1 %> + <% @issue.editable_custom_field_values.each do |value| %> +

    <%= custom_field_tag_with_label :issue, value, :required => @issue.required_attribute?(value.custom_field_id) %>

    + <% if i == split_on -%> +
    + <% end -%> + <% i += 1 -%> + <% end -%> +
    diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index d57be8a91..67867e2c6 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -12,6 +12,7 @@
    <%= link_to image_tag(url_to_avatar(@issue.author), :width => 46, :height => 46), user_path(@issue.author), :class => "ping_dispic" %>
    +

    @@ -20,100 +21,53 @@


    - 由<%= @issue.author %> - 添加于 <%= format_time(@issue.created_on).html_safe %> + 由<%= @issue.author %>添加于 <%= format_time(@issue.created_on).html_safe %>
    + 'action_menu' %>
    -
    - <% if @issue.description? || @issue.attachments.any? -%> + <% if @issue.description? || @issue.attachments.any? -%> +
    <% if @issue.description? %> <%#= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'icon icon-comment' if authorize_for('issues', 'edit') %> <%= textAreailizable @issue, :description, :attachments => @issue.attachments %> <% end %> -
    -
    - - - <%= link_to_attachment_project @issue, :thumbnails => true %>
    - <% end -%> - <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %> -
    -
    - -
    - <%= issue_fields_rows do |rows| %> -
      -

    •  状态  : 

      <%= @issue.status.name %>

      -
      • -
      - <% unless @issue.disabled_core_fields.include?('assigned_to_id') %> -

    •  指派给  : 

      <%= @issue.assigned_to ? link_to_isuue_user(@issue.assigned_to) : "--" %> -
      • - <% end %> -
      -
    -
      -

    •  优先级  : 

      <%= @issue.priority.name %> -
      • -
      - <% unless @issue.disabled_core_fields.include?('done_ratio') %> -

    •  % 完成  : 

      <%= @issue.done_ratio %>% -
      • - <% end %> -
      -
    +
    + <% end -%> + +
    + + + <%= link_to_attachment_project @issue, :thumbnails => true %>
    + <%= call_hook(:view_issues_show_description_bottom, :issue => @issue) %> +
    +
    + + + <%= render :partial => 'attributes_show' %> + + + <%# 该应用是对issue主题内容的引用，对应:to => 'journals#new %> + + +
    +
    -
      - <% unless @issue.disabled_core_fields.include?('start_date') %> -

    •  开始  : 

      <%= format_date(@issue.start_date) %>

      -
      • - <% end %> -
      - <% unless @issue.disabled_core_fields.include?('estimated_hours') %> -

    •  周期  : 

      <%= l_hours(@issue.estimated_hours) %> -
      • - <% end %> -
      -
    -
      - <% unless @issue.disabled_core_fields.include?('due_date') %> -

    •  计划完成  : 

      <%= format_date(@issue.due_date)? format_date(@issue.due_date) : "--" %> -
      • - <% end %> -
      - <% unless @issue.disabled_core_fields.include?('fixed_version_id') %> -

    •  目标版本  : 

      <%= (@issue.fixed_version ? link_to_version(@issue.fixed_version, :class => "pro_info_p") : "--") %> -
      • - <% end %> -
      -
    - <% end %> - <%#= render_custom_fields_rows(@issue) %> - <%#= call_hook(:view_issues_show_details_bottom, :issue => @issue) %> - - -
    - <%= link_to l(:button_quote), quoted_issue_path(@issue.id), :remote => true, :method => 'post', :class => 'talk_edit fr' if authorize_for('issues', 'edit') %> -
    -
    + <% if @issue.editable? %>
    <%= render :partial => 'edit' %>

    - - - + <%#--引用时不能修改，剥离出引用内容--%> <%= l(:button_submit) %> <% end %> - <%#= submit_tag l(:button_submit) %> <%#= preview_link preview_edit_issue_path(:project_id => @project, :id => @issue), 'issue-form' ,'preview',{:class => "blue_btn fr mr10"}%> @@ -124,6 +78,7 @@ <%= render :partial => 'changesets', :locals => {:changesets => @changesets} %> <% end %> +
    <% other_formats_links do |f| %> <%= f.link_to 'Atom', :url => {:key => User.current.rss_key} %> diff --git a/app/views/journals/new.js.erb b/app/views/journals/new.js.erb index ae2574595..b24b5ffb6 100644 --- a/app/views/journals/new.js.erb +++ b/app/views/journals/new.js.erb @@ -1,10 +1,11 @@ $('#issue_notes').val("<%= raw escape_javascript(@content) %>"); <% # when quoting a private journal, check the private checkbox - if @journal && @journal.private_notes? + if @journal && @journal.private_notes? %> $('#issue_private_notes').attr('checked', true); <% end %> +//quote_issue_journal() showAndScrollTo("update", "notes"); $('#notes').scrollTop = $('#notes').scrollHeight - $('#notes').clientHeight; diff --git a/public/javascripts/project.js b/public/javascripts/project.js index 7e9643bc7..d3c3377f5 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -369,6 +369,9 @@ $(document).ready(function () { $('html, body').animate({scrollTop: $('#' + id).offset().top}, 400); } + function quote_issue_journal(){ + document.getElementById("#issue_notes").focus(); + } /*缺陷完成度决定缺陷状态*/ function PrecentChange(obj) { From 841c680bb14c04d3d7b826b6793540dc80469bb4 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Wed, 23 Sep 2015 14:53:50 +0800 Subject: [PATCH 12/24] =?UTF-8?q?1.=E4=BD=9C=E4=B8=9A=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=98=BE=E7=A4=BA=E8=80=81=E5=B8=88=E3=80=81?= =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E3=80=81=E8=AF=BE=E7=A8=8B=E5=AD=A3=E5=BA=A6?= =?UTF-8?q?=E7=AD=89=E4=BF=A1=E6=81=AF=202.=E4=BD=9C=E4=B8=9A=E5=86=85?= =?UTF-8?q?=E5=AE=B9=E4=B8=BA=E7=A9=BA=E6=97=B6=EF=BC=8Ctips=E4=B8=AD?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 9 ++++++--- public/stylesheets/new_user.css | 3 +++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index ac4572b5b..97a67a717 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -118,15 +118,18 @@ <% if ma.course_message_type == "HomeworkCommon" && ma.status.nil? %>
    • <%=link_to image_tag(url_to_avatar(ma.course_message.user), :width => "30", :height => "30"), user_path(ma.course_message.user) %>
      • -
    • <%=link_to ma.course_message.user, user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %>">发布了作业：
      • -
    • +
    • <%=link_to ma.course_message.user.lastname + ma.course_message.user.firstname + "老师", user_path(ma.course_message.user), :class => "newsBlue homepageNewsPublisher" %> + ">发布了作业于课程：<%= ma.course_message.course.name %> +
      • +
    • <%= link_to ma.course_message.name, student_work_index_path(:homework => ma.course_message.id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :onmouseover =>"message_titile_show($(this),event)", :onmouseout => "message_titile_hide($(this))" %>
    保存 <% end %> diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 4f44a8b60..d8902876e 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -852,7 +852,7 @@ div.flash.warning, .conflict { /*弹出框*/ .black_overlay{display:none;position:fixed;top:0px;left:0px;width:100%;height:100%;background-color:black;z-index:1001;-moz-opacity:0.8;opacity:.80;filter:alpha(opacity=80);} .white_content{display:none;position:fixed;top:15%;left:30%;width:420px;height: auto; margin-bottom:20px;padding:16px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;} -.white_content02{display:none;position:fixed;top:15%;left:30%;width:310px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;} +.white_content02{display:none;position:fixed;top:15%;left:30%;width:450px;height: auto; margin-bottom:20px;padding:10px;border:3px solid #15bccf;background-color:white;z-index:1002;overflow:auto;} .floatbox{ width:420px; border:3px solid #15bccf; background:#fff; padding:5px;} a.box_close{ display:block; float:right; width:16px; height:16px; background:url(../images/img_floatbox.png) 0 0 no-repeat;} a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} From f9f51557ddd72d232a84a4cdb7d1188616256068 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Thu, 24 Sep 2015 11:31:07 +0800 Subject: [PATCH 23/24] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=85=B3=E9=97=AD?= =?UTF-8?q?=E5=8F=8D=E9=A6=88=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/_base_feedback.html.erb | 67 +++++++++++----------- app/views/layouts/_new_feedback.html.erb | 3 +- public/images/sidebar_bg.png | Bin 9114 -> 9913 bytes public/javascripts/feedback.js | 65 +++++++-------------- public/stylesheets/new_user.css | 17 +++--- public/stylesheets/public.css | 18 +++--- 6 files changed, 73 insertions(+), 97 deletions(-) diff --git a/app/views/layouts/_base_feedback.html.erb b/app/views/layouts/_base_feedback.html.erb index 07f852914..9fe25ce95 100644 --- a/app/views/layouts/_base_feedback.html.erb +++ b/app/views/layouts/_base_feedback.html.erb @@ -1,9 +1,9 @@ @@ -39,7 +39,7 @@ minStatue : true, skin : 'blue', durationTime : 1000 - } + }; var options = $.extend(defaults, options); this.each(function(){ @@ -56,13 +56,13 @@ if(options.minStatue == "true"){ $(".show_btn").css("float", options.float); sideContent.css('width', 0); - show_btn.css('width', 25); + show_btn.css('width', 29); } //close closeBtn.bind("click",function(){ sideContent.animate({width: '0px'},"fast"); - show_btn.stop(true, true).delay(300).animate({ width: '25px'},"fast"); + show_btn.stop(true, true).delay(300).animate({ width: '29px'},"fast"); cookiesave('minStatue','true','','',''); }); //show @@ -83,14 +83,10 @@ $(function(){ $("#button1").click(function(){ myTips("<%= l(:label_feedback_success) %>","success"); }); - }); function f_submit() { -// var subject = $("#memo_subject").val(); -// var content = $("#memo_content_1").val(); -// $("#memo_subject").val(subject+"："+ content.substr(0,18)+"..."); $("#new_memo").submit(); } @@ -169,15 +165,15 @@ function cookieget(n)
    <% get_memo %> - <% if @public_forum %> - <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %> - <%= f.text_area :subject,:id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %> - <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %> - <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %> - - <%= l(:label_submit)%> - <% end %> - <% end %> + <% if @public_forum %> + <%= form_for(@new_memo, :url => create_feedback_forum_path(@public_forum)) do |f| %> + <%= f.text_area :subject,:id=>"subject", :class => "opnionText", :placeholder => l(:label_feedback_tips) %> + <%= f.hidden_field :content,:id => 'hidden', :required => true , :value => l(:label_feedback_value) %> + <%#= f.submit :value => l(:label_memo_create), :class => "opnionButton", :id => "button1" %> + + <%= l(:label_submit)%> + <% end %> + <% end %>
    @@ -188,6 +184,9 @@ function cookieget(n)
    -
    <%= l(:label_submit)%>
    +
    + <%= l(:label_submit)%> + +
    diff --git a/app/views/layouts/_new_feedback.html.erb b/app/views/layouts/_new_feedback.html.erb index db0a3c3ee..136e49b37 100644 --- a/app/views/layouts/_new_feedback.html.erb +++ b/app/views/layouts/_new_feedback.html.erb @@ -30,6 +30,7 @@
    - 在线客服 + <%= l(:label_submit)%> +
    diff --git a/public/images/sidebar_bg.png b/public/images/sidebar_bg.png index 2704727d7d7984e6fb748b28a35ee9e14cf25d84..9ceea0f9176902560fa21d8eddd17a372d761edd 100644 GIT binary patch delta 7003 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 delta 6177 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 diff --git a/public/javascripts/feedback.js b/public/javascripts/feedback.js index 1bbab1f45..fb3b35ca7 100644 --- a/public/javascripts/feedback.js +++ b/public/javascripts/feedback.js @@ -5,7 +5,7 @@ minStatue : true, skin : 'blue', durationTime : 1000 - } + }; var options = $.extend(defaults, options); this.each(function(){ @@ -13,17 +13,13 @@ var thisBox = $(this), closeBtn = thisBox.find('.close_btn' ), show_btn = thisBox.find('.show_btn' ), - sideContent = thisBox.find('.side_content'), - sideList = thisBox.find('.side_list') - ; + sideContent = thisBox.find('.side_content'); var defaultTop = thisBox.offset().top; //????????top - thisBox.css(options.float, 0); if(options.minStatue == "true"){ - $(".show_btn").css("float", options.float); + show_btn.css("float", options.float); sideContent.css('width', 0); show_btn.css('width', 25); - } //close closeBtn.bind("click",function(){ @@ -37,26 +33,12 @@ sideContent.stop(true, true).delay(200).animate({ width: '154px'},"fast"); cookiesave('minStatue','false','','',''); }); - - - }); //end this.each }; })(jQuery); - -$(function(){ - $("#button1").click(function(){ - myTips("<%= l(:label_feedback_success) %>","success"); - }); - -}); - function f_submit() { -// var subject = $("#memo_subject").val(); -// var content = $("#memo_content").val(); -// $("#memo_subject").val(subject+"："+ content.substr(0,18)+"..."); $("#new_memo").submit(); } @@ -68,11 +50,8 @@ function cookiesave(n, v, mins, dn, path) if(!mins) mins = 365 * 24 * 60; if(!path) path = "/"; var date = new Date(); - date.setTime(date.getTime() + (mins * 60 * 1000)); - var expires = "; expires=" + date.toGMTString(); - if(dn) dn = "domain=" + dn + "; "; document.cookie = n + "=" + v + expires + "; " + dn + "path=" + path; @@ -86,34 +65,31 @@ function cookieget(n) var c = ca[i]; while (c.charAt(0)==' ') c = c.substring(1,c.length); if (c.indexOf(name) == 0){ - return c.substring(name.length,c.length);} - + return c.substring(name.length,c.length); + } } return false; } $(function(){ + $(".closeSidebar").click(function(){ + $(".show_btn").css("display","none"); + $("#scrollsidebar").css("display","none"); + return false; + }); + $("#button1").click(function(){ - myTips("<%= l(:label_feedback_success) %>","success"); + myTips("反馈成功","success"); }); -}); - - -$(document).ready(function () { - $(function () { - $("#scrollsidebar").fix({ - float: 'right', //default.left or right - minStatue: cookieget('minStatue'), - skin: 'green', //default.gray or blue - durationTime: 600 - }); + $("#scrollsidebar").fix({ + float: 'right', //default.left or right + minStatue: cookieget('minStatue'), + skin: 'green', //default.gray or blue + durationTime: 600 }); -}); - -$(document).ready(function(){ $("#subject").keydown(function(){ var curLength=$("#subject").val().length; if(curLength>50){ @@ -123,8 +99,7 @@ $(document).ready(function(){ else{ $("#textCount").text(50-$("#subject").val().length) } - }) - $("#subject").keyup(function(){ + }).keyup(function(){ var curLength=$("#subject").val().length; if(curLength>50){ var num=$("#subject").val().substr(0,50); @@ -133,5 +108,5 @@ $(document).ready(function(){ else{ $("#textCount").text(50-$("#subject").val().length) } - }) -}) \ No newline at end of file + }); +}); \ No newline at end of file diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index ed872936e..1022d5aa2 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -711,7 +711,7 @@ html{ overflow-x:hidden;} .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; } .side_content{width:154px; height:auto; overflow:hidden; float:left; } .side_content .side_list {width:154px;overflow:hidden;} -.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:190px;cursor:pointer;} +.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:200px; cursor:pointer;} .show_btn span { display:none;} .close_btn{width:24px;height:24px;cursor:pointer;} .side_title,.side_bottom,.close_btn,.show_btn {background:url(../images/sidebar_bg.png) no-repeat; } @@ -721,20 +721,21 @@ html{ overflow-x:hidden;} .close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;} .close_btn span { display:none;} .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;} -.msgserver { margin-top:5px;} -.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -112px; padding-left:22px; height:21px; display:block; } +.msgserver { margin:10px 0 0px 5px;} +.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -110px; padding-left:22px; display:block; height:24px; } .opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;} -a.opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;} -a:hover.opnionButton{background: #0fa9bb; } +a.opnionButton{ display:block; background:#269ac9; width:130px; height:26px; margin-top:5px; text-align:center; padding-top:0px; color:#fff;} +a.opnionButton:hover{background: #297fb8; } /* blue skin as the default skin */ .side_title {background-position:-195px 0;} .side_center {background:url(../images/blue_line.png) repeat-y center; } .side_bottom {background-position:-195px -50px;} -a.close_btn {background-position:-44px 0;} -a:hover.close_btn {background-position:-66px 0;} +.close_btn {background-position:-44px 0;} +.close_btn:hover {background-position:-66px 0;} .show_btn {background-position:-119px 0;} -.msgserver a {color:#15bccf; } +.msgserver a {color:#269ac9; } .msgserver a:hover { text-decoration:underline; } +.closeSidebar {background:url(../images/sidebar_bg.png) 0px -112px no-repeat; width:28px; height:18px; margin-top:65px; position:absolute;} /***** Ajax indicator ******/ diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index d8285709f..3031a964e 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -714,7 +714,7 @@ html{ overflow-x:hidden;} .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; } .side_content{width:154px; height:auto; overflow:hidden; float:left; } .side_content .side_list {width:154px;overflow:hidden;} -.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:190px;cursor:pointer;} +.show_btn{ width:0; height:112px; overflow:hidden; float:left; margin-top:200px; cursor:pointer;} .show_btn span { display:none;} .close_btn{width:24px;height:24px;cursor:pointer;} .side_title,.side_bottom,.close_btn,.show_btn {background:url(../images/sidebar_bg.png) no-repeat; } @@ -724,21 +724,21 @@ html{ overflow-x:hidden;} .close_btn { float:right; display:block; width:21px; height:16px; margin:9px 10px 0 0; _margin:16px 5px 0 0;} .close_btn span { display:none;} .side_center .custom_service p { text-align:center; padding:6px 0; margin:0; vertical-align:middle;} -.msgserver { margin-top:5px;} -/*.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -112px; padding-left:22px; height:21px; display:block; }*/ -.msgserver a { padding-left:4px; height:21px; display:block; } +.msgserver { margin:10px 0 0px 5px;} +.msgserver a { background:url(../images/sidebar_bg.png) no-repeat -119px -110px; padding-left:22px; display:block; height:24px; } .opnionText{box-shadow:none; width:122px; height:180px; border-color: #DFDFDF; background:#fff; color:#999; padding:3px; font-size:12px;overflow:auto; background-attachment:fixed;border-style:solid;} -a.opnionButton{ display:block; background:#15bccf; width:130px; height:23px; margin-top:5px; text-align:center; padding-top:3px;} -a:hover.opnionButton{background: #0fa9bb; } +a.opnionButton{ display:block; background:#269ac9; width:130px; height:26px; margin-top:5px; text-align:center; padding-top:0px; color:#fff;} +a.opnionButton:hover{background: #297fb8; } /* blue skin as the default skin */ .side_title {background-position:-195px 0;} .side_center {background:url(../images/blue_line.png) repeat-y center; } .side_bottom {background-position:-195px -50px;} -a.close_btn {background-position:-44px 0;} -a:hover.close_btn {background-position:-66px 0;} +.close_btn {background-position:-44px 0;} +.close_btn:hover {background-position:-66px 0;} .show_btn {background-position:-119px 0;} -.msgserver a {color:#15bccf; } +.msgserver a {color:#269ac9; } .msgserver a:hover { text-decoration:underline; } +.closeSidebar {background:url(../images/sidebar_bg.png) 0px -112px no-repeat; width:28px; height:18px; margin-top:65px; position:absolute;} .hiddent{ overflow:hidden; white-space: nowrap; text-overflow:ellipsis;} From 4c71e2c2562e101cd6097b7fad38c940f2716504 Mon Sep 17 00:00:00 2001 From: huang Date: Thu, 24 Sep 2015 11:44:02 +0800 Subject: [PATCH 24/24] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E6=8F=90=E7=A4=BAJS?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/projects_helper.rb | 11 ++++++++++- app/views/projects/new.html.erb | 19 +++++++++++++++---- config/locales/projects/zh.yml | 3 +++ 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index f0ce70dc2..41f25d1a3 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -95,7 +95,16 @@ module ProjectsHelper end # 项目类型描述 - + def project_newtype_descrption + case params + when 1 + value = l(:label_type_des_development) + when 2 + value = l(:label_type_des_research) + when 3 + value = l(:label_type_des_friend) + end + end # 被邀请成员的状态 def status_for_ivitied(ivite_list, project) diff --git a/app/views/projects/new.html.erb b/app/views/projects/new.html.erb index f78bbf0c5..e57afe0ad 100644 --- a/app/views/projects/new.html.erb +++ b/app/views/projects/new.html.erb @@ -17,7 +17,8 @@
  • - <%= select_tag :project_new_type, options_for_select([["开发模式", "1"], ["研讨模式", "2"], ["圈子模式", "3"]]) %>为团队提供系列在线开发工具！ + <%= select_tag :project_new_type, options_for_select([["开发模式", "1"], ["研讨模式", "2"], ["圈子模式", "3"]]) %> + 为团队提供系列在线开发工具！
  • @@ -90,12 +91,22 @@ } } - $(document).ready(function(){ + $(function(){ $('#project_new_type').change(function(){ - alert($(this).children('option:selected').val("开发模式：面向小组开发，支持问题跟踪、代码托管、论坛交流等所有功能。")); - var p1=$(this).children('option:selected').val("研讨模式：面向小组研究，支持任务分工、论坛交流、资源分享等。");//这就是selected的值 + var type = $('#project_new_type').val(); + if(type == '1'){ + $(this).next().html("<%= l(:label_type_des_development)%>"); + } + else if(type == '2'){ + $(this).next().html("<%= l(:label_type_des_research)%>"); + } + else if(type == '3'){ + $(this).next().html("<%= l(:label_type_des_friend)%>"); + } +// var p1=$(this).children('option:selected').val("研讨模式：面向小组研究，支持任务分工、论坛交流、资源分享等。");//这就是selected的值 // var p2=$('#param2').val();//获取本页面其他标签的值 }) + }) diff --git a/config/locales/projects/zh.yml b/config/locales/projects/zh.yml index b4234f358..dbce93219 100644 --- a/config/locales/projects/zh.yml +++ b/config/locales/projects/zh.yml @@ -61,6 +61,9 @@ zh: label_research_group: 研讨模式 label_development_team: 开发模式 label_type_project: 项目类型 + label_type_des_development: 开发模式：面向小组开发，支持问题跟踪、代码托管、论坛交流等所有功能。 + label_type_des_research: 研讨模式：面向小组研究，支持任务分工、论坛交流、资源分享等。 + label_type_des_friend: 圈子模式：面向好友分享，支持论坛交流、资源分享等。 label_member: 成员 project_module_attachments: 资源