From 5ee53b824d25d1ef6464fc379688656b642de3be Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 31 Aug 2015 16:01:31 +0800 Subject: [PATCH 01/48] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=AD=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E8=B5=84=E6=BA=90=E6=B7=BB=E5=8A=A0=E8=87=B3=E5=8A=A8?= =?UTF-8?q?=E6=80=81=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/attachment.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/attachment.rb b/app/models/attachment.rb index f7fb9b1aa..47ab30cb1 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -73,7 +73,7 @@ class Attachment < ActiveRecord::Base cattr_accessor :thumbnails_storage_path @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails") - before_save :files_to_final_location,:act_as_course_activity + before_save :files_to_final_location,:act_as_course_activity,:act_as_forge_activity after_create :office_conver, :be_user_score,:act_as_forge_activity after_update :office_conver, :be_user_score after_destroy :delete_from_disk,:down_user_score From b5c0d0359051a36032aeee644c2a5d902e87e21c Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 31 Aug 2015 16:41:52 +0800 Subject: [PATCH 02/48] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=BF=81=E7=A7=BB=20?= =?UTF-8?q?=E4=BB=A3=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/models/journals_for_message.rb | 32 ++++++++--------- app/views/users/user_messages.html.erb | 4 +-- .../20150831030041_user_feedback_message.rb | 36 +++++++++++++++++++ .../20150831070611_about_memo_message.rb | 36 +++++++++++++++++++ 4 files changed, 90 insertions(+), 18 deletions(-) create mode 100644 db/migrate/20150831030041_user_feedback_message.rb create mode 100644 db/migrate/20150831070611_about_memo_message.rb diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 6f775e7a2..c44b1aeee 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -202,24 +202,24 @@ class JournalsForMessage < ActiveRecord::Base # 用户留言消息通知 def act_as_user_feedback_message # 主留言 - receivers = [] - if self.reply_id == 0 - if self.user_id != self.jour_id # 过滤自己给自己的留言消息 - receivers << self.jour - end - else # 留言回复 - reply_to = User.find(self.reply_id) - if self.user_id != self.reply_id # 添加我回复的那个人 - receivers << reply_to - end - if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发 - receivers << self.parent.jour - end - end if self.jour_type == 'Principal' - receivers.each do |r| - self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false) + receivers = [] + if self.reply_id == 0 + if self.user_id != self.jour_id # 过滤自己给自己的留言消息 + receivers << self.jour end + else # 留言回复 + reply_to = User.find(self.reply_id) + if self.user_id != self.reply_id # 添加我回复的那个人 + receivers << reply_to + end + if self.user_id != self.parent.jour_id && self.reply_id != self.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发 + receivers << self.parent.jour + end + end + receivers.each do |r| + self.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => self.id, :journals_for_message_type => "Principal", :viewed => false) + end end end diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 207572a1c..1fde154bd 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -20,9 +20,9 @@ <%# 项目相关消息 %> - +
  • <%= link_to "贴吧帖子", user_message_path(User.current, :type => 'forum'), :class => "resourcesGrey" %>
    • <%# 系统贴吧 %> - +
  • <%= link_to "用户留言",user_message_path(User.current, :type => 'user_feedback'), :class => "resourcesGrey" %>
    • diff --git a/db/migrate/20150831030041_user_feedback_message.rb b/db/migrate/20150831030041_user_feedback_message.rb new file mode 100644 index 000000000..24723fc0a --- /dev/null +++ b/db/migrate/20150831030041_user_feedback_message.rb @@ -0,0 +1,36 @@ +# encoding: UTF-8 +class UserFeedbackMessage < ActiveRecord::Migration + def up + JournalsForMessage.all.each do |jour_for_message| + transaction do + # 主留言 + if jour_for_message.jour_type == 'Principal' + receivers = [] + if jour_for_message.reply_id == 0 + if jour_for_message.user_id != jour_for_message.jour_id # 过滤自己给自己的留言消息 + receivers << jour_for_message.jour + end + else # 留言回复 + reply_to = User.find(jour_for_message.reply_id) + if jour_for_message.user_id != jour_for_message.reply_id # 添加我回复的那个人 + receivers << reply_to + end + unless jour_for_message.parent.nil? + if jour_for_message.user_id != jour_for_message.parent.jour_id && jour_for_message.reply_id != jour_for_message.parent.jour_id # 给东家发信息，如果回复的对象是东家则不发 + receivers << jour_for_message.parent.jour + end + end + end + unless receivers.blank? + receivers.each do |r| + jour_for_message.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => jour_for_message.id, :journals_for_message_type => "Principal", :viewed => false) + end + end + end + end + end + end + + def down + end +end diff --git a/db/migrate/20150831070611_about_memo_message.rb b/db/migrate/20150831070611_about_memo_message.rb new file mode 100644 index 000000000..26551d4a1 --- /dev/null +++ b/db/migrate/20150831070611_about_memo_message.rb @@ -0,0 +1,36 @@ +class AboutMemoMessage < ActiveRecord::Migration + def up + Memo.all.each do |memo| + transaction do + # 贴吧帖子 + receivers = [] + u = User.find(6) + receivers << u + # 主贴 + if memo.parent_id.nil? + if memo.author_id != memo.forum.creator_id # 发帖人不是吧主 + receivers << memo.forum.creator + end + else # 回帖 + # 添加吧主 + if memo.author_id != memo.forum.creator_id + receivers << memo.forum.creator + end + # 添加发帖人 + unless memo.parent.nil? + if memo.author_id != memo.parent.author_id + receivers << memo.parent.author + puts memo.id + end + end + end + receivers.each do |r| + memo.memo_messages << MemoMessage.new(:user_id => r.id, :forum_id => memo.forum_id, :memo_id => memo.id, :memo_type => "Memo", :viewed => false) + end + end + end + end + + def down + end +end From 311634abf1ad98a9038787b253fbdec35eadcf52 Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 31 Aug 2015 16:53:54 +0800 Subject: [PATCH 03/48] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index f28e6442b..e6b19fb6c 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -930,7 +930,7 @@ img.ui-datepicker-trigger { margin: 7px; } /*消息*/ -.homepageNewsTypeNotRead {width:95px; font-size:12px; color:#888888; display:block;} +.homepageNewsTypeNotRead {width:100px; padding-left: 5px; font-size:12px; color:#888888; display:block;} .calendar_input{border-left:none !important;border-bottom: none!important; border-top: none!important; border-right: 1px solid #d9d9d9;} .calendar_div{border: 1px solid #d9d9d9;} /*缺陷更新动态在消息中显示样式*/ From 6dff29f93155acc4dc6994318c96f0387525f82e Mon Sep 17 00:00:00 2001 From: huang Date: Mon, 31 Aug 2015 17:45:14 +0800 Subject: [PATCH 04/48] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=BF=81=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20150831085920_update_memo_time.rb | 26 +++++++++++++++++++ ...20150831090338_update_userfeedback_time.rb | 26 +++++++++++++++++++ ...0831093918_about_user_feedback_message.rb} | 4 +-- 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 db/migrate/20150831085920_update_memo_time.rb create mode 100644 db/migrate/20150831090338_update_userfeedback_time.rb rename db/migrate/{20150831030041_user_feedback_message.rb => 20150831093918_about_user_feedback_message.rb} (93%) diff --git a/db/migrate/20150831085920_update_memo_time.rb b/db/migrate/20150831085920_update_memo_time.rb new file mode 100644 index 000000000..c2ecd0144 --- /dev/null +++ b/db/migrate/20150831085920_update_memo_time.rb @@ -0,0 +1,26 @@ +class UpdateMemoTime < ActiveRecord::Migration + def up + memo_count = Memo.all.count / 30 + 1 + transaction do + for i in 1 ... memo_count do i + MemoMessage.page(i).per(30).each do |memo_message| + if memo_message.memo + if memo_message.memo.respond_to?("created_at") + memo_message.created_at = memo_message.memo.created_at + elsif memo_message.memo.respond_to?("created_on") + memo_message.created_at = memo_message.memo.created_on + end + memo_message.save + + memo_messages = MemoMessage.where("message_type = '#{memo_message.class.to_s}' and message_id = '#{memo_message.id}'").first + memo_messages.created_at = memo_message.created_at + memo_messages.save + end + end + end + end + end + + def down + end +end diff --git a/db/migrate/20150831090338_update_userfeedback_time.rb b/db/migrate/20150831090338_update_userfeedback_time.rb new file mode 100644 index 000000000..860a4881a --- /dev/null +++ b/db/migrate/20150831090338_update_userfeedback_time.rb @@ -0,0 +1,26 @@ +class UpdateUserfeedbackTime < ActiveRecord::Migration + def up + user_feedback_count = UserFeedbackMessage.all.count / 30 + 1 + transaction do + for i in 1 ... user_feedback_count do i + UserFeedbackMessage.page(i).per(30).each do |ufm| + if ufm.course_message + if ufm.course_message.respond_to?("created_at") + ufm.created_at = ufm.course_message.created_at + elsif ufm.course_message.respond_to?("created_on") + ufm.created_at = ufm.course_message.created_on + end + ufm.save + + user_feedbach_messages = MessageAll.where("message_type = '#{ufm.class.to_s}' and message_id = '#{ufm.id}'").first + user_feedbach_messages.created_at = ufm.created_at + user_feedbach_messages.save + end + end + end + end + end + + def down + end +end diff --git a/db/migrate/20150831030041_user_feedback_message.rb b/db/migrate/20150831093918_about_user_feedback_message.rb similarity index 93% rename from db/migrate/20150831030041_user_feedback_message.rb rename to db/migrate/20150831093918_about_user_feedback_message.rb index 24723fc0a..870795966 100644 --- a/db/migrate/20150831030041_user_feedback_message.rb +++ b/db/migrate/20150831093918_about_user_feedback_message.rb @@ -1,5 +1,4 @@ -# encoding: UTF-8 -class UserFeedbackMessage < ActiveRecord::Migration +class AboutUserFeedbackMessage < ActiveRecord::Migration def up JournalsForMessage.all.each do |jour_for_message| transaction do @@ -23,6 +22,7 @@ class UserFeedbackMessage < ActiveRecord::Migration end unless receivers.blank? receivers.each do |r| + puts jour_for_message.id jour_for_message.user_feedback_messages << UserFeedbackMessage.new(:user_id => r.id, :journals_for_message_id => jour_for_message.id, :journals_for_message_type => "Principal", :viewed => false) end end From 8403d5365c39a958a674f28a489ac0d88b63bc2b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Mon, 31 Aug 2015 17:49:48 +0800 Subject: [PATCH 05/48] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E6=96=B0=E9=97=BB=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/project.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/public/javascripts/project.js b/public/javascripts/project.js index c7a615ba3..a09484fd5 100644 --- a/public/javascripts/project.js +++ b/public/javascripts/project.js @@ -248,6 +248,13 @@ function regexDescription() { $("#description_notice_span").focus(); return false; } + else if (name.length > 10000) + { + $("#description_notice_span").text("描述超过10000个字符"); + $("#description_notice_span").css('color', '#ff0000'); + $("#description_notice_span").focus(); + return false; + } else { $("#description_notice_span").text("填写正确"); $("#description_notice_span").css('color', '#008000'); From 284d33b096bdd9df069580ee349eed34cd72677b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 1 Sep 2015 09:18:30 +0800 Subject: [PATCH 06/48] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=9B=9E?= =?UTF-8?q?=E5=B8=96=E6=B6=88=E6=81=AF=E6=98=BE=E7=A4=BA=E5=9B=9E=E5=B8=96?= =?UTF-8?q?=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 1fde154bd..7c37ef9a0 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -83,7 +83,7 @@
  • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %>
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %>
  • - <%=link_to ma.course_message.subject.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, + <%=link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :title => "#{ma.course_message.subject.html_safe}" %>
  • <%= time_tag(ma.created_at).html_safe %>
    • From 86ced0e290f8c56358477b910759942b71aae904 Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 1 Sep 2015 09:40:04 +0800 Subject: [PATCH 07/48] =?UTF-8?q?=E8=AE=A8=E8=AE=BA=E5=8C=BA=E5=9B=9E?= =?UTF-8?q?=E5=B8=96=E6=B6=88=E6=81=AF=E5=BA=94=E8=AF=A5=E5=9C=A8RE:?= =?UTF-8?q?=E5=90=8E=E9=9D=A2=E6=98=BE=E7=A4=BA=E5=9B=9E=E5=B8=96=E5=86=85?= =?UTF-8?q?=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 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 7c37ef9a0..9f289e3d5 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -83,8 +83,9 @@
  • <%=link_to image_tag(url_to_avatar(ma.course_message.author), :width => "30", :height => "30"), user_path(ma.course_message.author) %>
  • <%=link_to ma.course_message.author, user_path(ma.course_message.author), :class => "newsBlue homepageNewsPublisher" %>"><%= ma.course_message.parent_id.nil? ? "发布了课程帖子：" : "评论了课程帖子：" %>
  • - <%=link_to ma.course_message.content.html_safe, course_boards_path(ma.course_message.course,:parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, - :topic_id => ma.course_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", + <%= link_to ma.course_message.parent_id.nil? ? ma.course_message.subject.html_safe : ma.course_message.content.html_safe, + course_boards_path(ma.course_message.course, :parent_id => ma.course_message.parent_id ? ma.course_message.parent_id : ma.course_message.id, :topic_id => ma.course_message.id), + :class => "#{ma.viewed==0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.course_message.subject.html_safe}" %>
  • <%= time_tag(ma.created_at).html_safe %>
    • @@ -152,7 +153,7 @@
  • <%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %> "><%= ma.forge_message.parent_id.nil? ? "发布了项目帖子：" : "评论了项目帖子：" %>
  • - <%=link_to ma.forge_message.subject.html_safe, project_boards_path(ma.forge_message.project, + <%=link_to ma.forge_message.parent_id.nil? ? ma.forge_message.subject.html_safe : ma.forge_message.content.html_safe, project_boards_path(ma.forge_message.project, :parent_id => ma.forge_message.parent_id ? ma.forge_message.parent_id : ma.forge_message.id, :topic_id => ma.forge_message.id),:class=>"#{ma.viewed==0?"newsBlack":"newsGrey"}", :title => "#{ma.forge_message.subject.html_safe}" %>
    • From fd0e4a7afd757c0e84b7a42792e3fd5a79edc41b Mon Sep 17 00:00:00 2001 From: ouyangxuhua Date: Tue, 1 Sep 2015 09:56:59 +0800 Subject: [PATCH 08/48] =?UTF-8?q?=E9=A1=B9=E7=9B=AEwiki=EF=BC=9A=E8=BE=93?= =?UTF-8?q?=E5=85=A5wiki=E4=B8=BA=E9=9D=9E=E6=B1=89=E5=AD=97=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E4=B8=94=E9=95=BF=E5=BA=A6=E5=A4=9F=E9=95=BF=EF=BC=8C?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E8=B6=85=E5=87=BA=E8=BE=B9=E6=A1=86=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/project.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css index 8d86a6873..a22831b2c 100644 --- a/public/stylesheets/project.css +++ b/public/stylesheets/project.css @@ -507,7 +507,7 @@ img.ui-datepicker-trigger { .wiki_new_ul input{ height:26px; margin-bottom:10px;} .wiki_con_tit{ font-size:14px; color:#09658c; font-weight:bold;width:630px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; float:left; margin-bottom:10px;} .wiki_con_box{ line-height:1.9; color:#2d2d2d;} -.wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px;} +.wiki_page_con{ border-bottom:1px dashed #CCC; margin-bottom:10px; padding-bottom:10px; word-wrap:break-word; word-break:break-all} .wiki_page p{word-break: break-all;word-wrap: break-word;} #wiki_new_box{ display:none;} /*wiki显示附加*/ From fede611fea4687a685707db5d75852ba1a0e4d29 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 1 Sep 2015 15:23:30 +0800 Subject: [PATCH 09/48] =?UTF-8?q?=E9=BC=A0=E6=A0=87=E7=BB=8F=E8=BF=87?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=86=85=E5=AE=B9=E6=95=88=E6=9E=9C=20?= =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B4=B4=E5=90=A7=E6=95=B0=E6=8D=AE=E8=BF=81?= =?UTF-8?q?=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/user_feedback_message.rb | 2 +- app/views/users/user_messages.html.erb | 24 +++++++++++++++-- ...20150831090338_update_userfeedback_time.rb | 26 ------------------ ...0150901004812_update_memo_message_time.rb} | 4 +-- ...1004910_update_userfeeback_message_time.rb | 27 +++++++++++++++++++ public/stylesheets/new_user.css | 2 -- 6 files changed, 52 insertions(+), 33 deletions(-) delete mode 100644 db/migrate/20150831090338_update_userfeedback_time.rb rename db/migrate/{20150831085920_update_memo_time.rb => 20150901004812_update_memo_message_time.rb} (77%) create mode 100644 db/migrate/20150901004910_update_userfeeback_message_time.rb diff --git a/app/models/user_feedback_message.rb b/app/models/user_feedback_message.rb index 1dda157d6..02335b8e2 100644 --- a/app/models/user_feedback_message.rb +++ b/app/models/user_feedback_message.rb @@ -8,7 +8,7 @@ class UserFeedbackMessage < ActiveRecord::Base validates :user_id,presence: true validates :journals_for_message_id,presence: true validates :journals_for_message_type, presence: true - after_create :add_user_message + after_save :add_user_message def add_user_message self.message_alls << MessageAll.new(:user_id => self.user_id) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 1fde154bd..f9b96d7cc 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -198,7 +198,7 @@ " ><%= ma.memo.parent_id.nil? ? "在贴吧发布帖子：" : "回复了贴吧帖子：" %>
  • - <%= link_to ma.memo.subject, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.content.html_safe}" %> + <%= link_to ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content, forum_memo_path(ma.memo.forum_id, ma.memo.parent_id ? ma.memo.parent_id: ma.memo.id),:class => "newsGrey" , :title => "#{ma.memo.parent_id.nil? ? ma.memo.subject : ma.memo.content}" %>
  • <%= time_tag(ma.memo.created_at).html_safe %>
    • @@ -215,8 +215,13 @@ <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %> "><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %> +
  • - <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", :title => "#{ma.journals_for_message.notes}" %> + + <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class => "newsGrey", + :title => "#{ma.journals_for_message.notes}", + :onmouseover =>"message_titile_show('message_title')", + :onmouseout => "message_titile_hide('message_title')" %>
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>
    • @@ -237,6 +242,21 @@ + + + + diff --git a/db/migrate/20150831090338_update_userfeedback_time.rb b/db/migrate/20150831090338_update_userfeedback_time.rb deleted file mode 100644 index 860a4881a..000000000 --- a/db/migrate/20150831090338_update_userfeedback_time.rb +++ /dev/null @@ -1,26 +0,0 @@ -class UpdateUserfeedbackTime < ActiveRecord::Migration - def up - user_feedback_count = UserFeedbackMessage.all.count / 30 + 1 - transaction do - for i in 1 ... user_feedback_count do i - UserFeedbackMessage.page(i).per(30).each do |ufm| - if ufm.course_message - if ufm.course_message.respond_to?("created_at") - ufm.created_at = ufm.course_message.created_at - elsif ufm.course_message.respond_to?("created_on") - ufm.created_at = ufm.course_message.created_on - end - ufm.save - - user_feedbach_messages = MessageAll.where("message_type = '#{ufm.class.to_s}' and message_id = '#{ufm.id}'").first - user_feedbach_messages.created_at = ufm.created_at - user_feedbach_messages.save - end - end - end - end - end - - def down - end -end diff --git a/db/migrate/20150831085920_update_memo_time.rb b/db/migrate/20150901004812_update_memo_message_time.rb similarity index 77% rename from db/migrate/20150831085920_update_memo_time.rb rename to db/migrate/20150901004812_update_memo_message_time.rb index c2ecd0144..e512282a0 100644 --- a/db/migrate/20150831085920_update_memo_time.rb +++ b/db/migrate/20150901004812_update_memo_message_time.rb @@ -1,4 +1,4 @@ -class UpdateMemoTime < ActiveRecord::Migration +class UpdateMemoMessageTime < ActiveRecord::Migration def up memo_count = Memo.all.count / 30 + 1 transaction do @@ -12,7 +12,7 @@ class UpdateMemoTime < ActiveRecord::Migration end memo_message.save - memo_messages = MemoMessage.where("message_type = '#{memo_message.class.to_s}' and message_id = '#{memo_message.id}'").first + memo_messages = MessageAll.where("message_type = '#{memo_message.class.to_s}' and message_id = '#{memo_message.id}'").first memo_messages.created_at = memo_message.created_at memo_messages.save end diff --git a/db/migrate/20150901004910_update_userfeeback_message_time.rb b/db/migrate/20150901004910_update_userfeeback_message_time.rb new file mode 100644 index 000000000..686bc496e --- /dev/null +++ b/db/migrate/20150901004910_update_userfeeback_message_time.rb @@ -0,0 +1,27 @@ +class UpdateUserfeebackMessageTime < ActiveRecord::Migration + def up + user_feedback_count = UserFeedbackMessage.all.count / 30 + 1 + transaction do + for i in 1 ... user_feedback_count do i + UserFeedbackMessage.page(i).per(30).each do |ufm| + if ufm.journals_for_message + if ufm.journals_for_message.respond_to?("created_at") + ufm.created_at = ufm.journals_for_message.created_at + elsif ufm.journals_for_message.respond_to?("created_on") + ufm.created_at = ufm.journals_for_message.created_on + end + puts ufm.id + ufm.save + + user_feedback_messages = MessageAll.where("message_type = '#{ufm.class.to_s}' and message_id = '#{ufm.id}'").first + user_feedback_messages.created_at = ufm.created_at + user_feedback_messages.save + end + end + end + end + end + + def down + end +end diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index e6b19fb6c..4229b5531 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -963,5 +963,3 @@ img.ui-datepicker-trigger { - - From 7361f40b0cac3c6eff5f8bc4252d71bebb87f1b1 Mon Sep 17 00:00:00 2001 From: huang Date: Tue, 1 Sep 2015 16:12:37 +0800 Subject: [PATCH 10/48] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A1=B9=E7=9B=AE?= =?UTF-8?q?=E8=B5=84=E6=BA=90=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E9=94=99=E8=AF=AF=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/application_helper.rb | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 7b83bb1c2..496565c23 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -756,15 +756,16 @@ module ApplicationHelper return ss end - def time_tag(time, *args) - options = args.extract_options! - text = distance_of_time_in_words(Time.now, time) - if @project - link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)},options.reverse_merge(:title => format_time(time))) - else - content_tag('acronym', text, options.reverse_merge(:title => format_time(time))) - end - end + # def time_tag(time, *args) + # options = args.extract_options! + # text = distance_of_time_in_words(Time.now, time) + # if @project + # content_tag('acronym', text, options.reverse_merge(:title => format_time(time))) + # # link_to(text, {:controller => 'activities', :action => 'index', :id => @project, :from => User.current.time_to_date(time)},options.reverse_merge(:title => format_time(time))) + # else + # content_tag('acronym', text, options.reverse_merge(:title => format_time(time))) + # end + # end def syntax_highlight_lines(name, content) lines = [] From fcd7506181fd9a05effa1f91ef932171e933456d Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Tue, 1 Sep 2015 16:33:29 +0800 Subject: [PATCH 11/48] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=B8=80=E4=B8=AA?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 9b4bfb903..380e30402 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -18,7 +18,7 @@
    - - -<%else%> -
    -
    -
    作业
    -
    -
    -
    <% end%> <%= render :partial => 'users/user_homework_list', :locals => {:homework_commons => @homework_commons,:page => 0} %> diff --git a/app/views/users/user_select_homework.js.erb b/app/views/users/user_select_homework.js.erb index 945da4c9a..a18fdacc8 100644 --- a/app/views/users/user_select_homework.js.erb +++ b/app/views/users/user_select_homework.js.erb @@ -5,3 +5,4 @@ $("#homework_end_time").val("<%= @homework.end_time%>"); $("#course_id").val("<%= @homework.course_id%>"); $("#homework_attachments").html("<%= escape_javascript(render :partial => 'users/user_homework_attachment', :locals => { :container => @homework })%>"); homework_description_editor.html("<%= escape_javascript(@homework.description.html_safe)%>"); +$("#homework_editor").show(); From ccc4d94212acd5120e2018db3701d428850c763f Mon Sep 17 00:00:00 2001 From: guange <8863824@gmail.com> Date: Wed, 2 Sep 2015 10:27:10 +0800 Subject: [PATCH 19/48] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E5=87=BA=E9=94=99=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 3 +-- public/javascripts/jquery-1.8.3-ui-1.9.2-ujs-2.0.3.js | 7 ++----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 380e30402..75b2d7d3d 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -18,7 +18,7 @@
    - +
    <% if edit_mode %> <%= f.kindeditor :description, :editor_id => 'homework_description_editor', :height => "150px", :owner_id => homework.id, :owner_type => OwnerTypeHelper::HOMEWORKCOMMON %> @@ -76,7 +76,6 @@
    - - - From c9d46f17f34a32f5e9869c37cdc006d21f9e0220 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Wed, 2 Sep 2015 11:15:38 +0800 Subject: [PATCH 25/48] =?UTF-8?q?=E5=9B=9E=E5=A4=8Dblockquote=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 2 +- public/stylesheets/new_user.css | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index 2171d9c59..bc7f62aea 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -357,7 +357,7 @@ a.link_file{ background:url(../images/pic_file.png) 0 2px no-repeat; padding-lef a:hover.link_file{ background:url(../images/pic_file.png) 0 -25px no-repeat; color:#3ca5c6;} .r_txt_tit{width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;} -blockquote {background: #eeeeee;padding: 10px;margin-bottom: 5px;word-break: break-all;word-wrap: break-word;} +blockquote {background: #e8e8e8;padding: 10px;margin-bottom: 5px;word-break: break-all;word-wrap: break-word;} .respond-form{display: none;margin: auto;clear: both;} .reply_btn{ cursor:pointer; -moz-border-radius:3px; -webkit-border-radius:3px; border:1px solid #ccc; color:#999; border-radius:3px; padding:2px 10px; margin-bottom:10px;display: block;margin-left: 470px;} diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 9d1754a6f..0da0c02fa 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -581,7 +581,7 @@ a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;} a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyPortrait {float:left; width:45px;} .homepagePostReplyDes {float:left; width:595px; margin-left:15px;} -.homepagePostReplyPublisher {font-size:12px; color:#484848; margin-bottom:5px;} +.homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;} .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;} @@ -952,6 +952,6 @@ blockquote { /*background: url('../images/requirements/reference.jpg');*/ background-size: 100% 100%; margin-bottom:5px; - background-color: #eeeeee; + background-color: #e8e8e8; } From 3b153766f69326422a5244123d1ba2d4d4f9e213 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 2 Sep 2015 11:20:21 +0800 Subject: [PATCH 26/48] =?UTF-8?q?=E8=BF=87=E6=BB=A4=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E7=9B=B8?= =?UTF-8?q?=E5=85=B3BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/comments_controller.rb | 28 +++++++++++------------ app/views/users/_user_activities.html.erb | 2 +- app/views/users/show.html.erb | 2 +- app/views/users/show.js.erb | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index 770c36a58..4088d4156 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -34,20 +34,20 @@ class CommentsController < ApplicationController ids = params[:asset_id].split(',') update_kindeditor_assets_owner ids,@comment.id,OwnerTypeHelper::COMMENT end - # ������ض�̬�ļ�¼add start - if( @comment.id && @news.course ) - if(@news.author_id != User.current.id) - notify = ActivityNotify.new() - notify.activity_container_id = @news.course.id - notify.activity_container_type = 'Course' - notify.activity_id = @comment.id - notify.activity_type = 'Comment' - notify.notify_to = @news.author_id - notify.is_read = 0 - notify.save() - end - end - # ������ض�̬�ļ�¼add end + # # ������ض�̬�ļ�¼add start + # if( @comment.id && @news.course ) + # if(@news.author_id != User.current.id) + # notify = ActivityNotify.new() + # notify.activity_container_id = @news.course.id + # notify.activity_container_type = 'Course' + # notify.activity_id = @comment.id + # notify.activity_type = 'Comment' + # notify.notify_to = @news.author_id + # notify.is_read = 0 + # notify.save() + # end + # end + # # ������ض�̬�ļ�¼add end flash[:notice] = l(:label_comment_added) end diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 661e0eade..2eba84efa 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -61,4 +61,4 @@ <% end %> <% end %> -<%= link_to "点击展开更多",user_activities_path(@user.id),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> +<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 76599739c..fe916331f 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -39,4 +39,4 @@ -<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0} %> \ No newline at end of file +<%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0,:type => @type} %> \ No newline at end of file diff --git a/app/views/users/show.js.erb b/app/views/users/show.js.erb index f870b38b9..bf7443f8c 100644 --- a/app/views/users/show.js.erb +++ b/app/views/users/show.js.erb @@ -1,4 +1,4 @@ -$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page} )%>"); +$("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type} )%>"); <% if @user_activities.count < 10%> $("#show_more_activities").hide(); <% end%> From bbf4478fc0402d22d1f59aa29ce960b052a28a71 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 2 Sep 2015 11:45:52 +0800 Subject: [PATCH 27/48] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E5=90=8E=E4=B8=8D=E8=83=BD=E5=8F=8A=E6=97=B6?= =?UTF-8?q?=E5=88=B7=E6=96=B0=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_news.html.erb | 33 ++++++++++++--------------- 1 file changed, 15 insertions(+), 18 deletions(-) diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 42475fde1..7edc19681 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -18,29 +18,26 @@
    发布时间：<%= format_date(activity.created_on) %>
    -
    通知描述：<%= activity.description.html_safe %>
    - -
    - +
    + 通知描述： + <%= activity.description.html_safe %>
    - <% count=activity.comments_count %> -
    回复（<%= count %>）
    + <% count=activity.comments.count %> +
    + 回复（<%= count %>） +
    <%#= format_date(activity.updated_on) %>
    <%if count>2 %> -
    点击展开更多回复(<%= count.to_s%>)
    +
    + + 点击展开更多回复(<%= count.to_s%>) + +
    <% end %>
    @@ -59,12 +56,12 @@
    <% replies_all_i = 0 %> - <% unless activity.comments.empty? %> + <% if count > 0 %>
    <%= link_to activity.subject.to_s, issue_path(activity), :class => "postGrey" %> - <%= get_issue_priority(activity.priority_id)[1] %> + + <%= get_issue_priority(activity.priority_id)[1] %> +
    指派给   @@ -26,7 +28,10 @@ <% end %> <% end %>
    -
    时间：<%=format_date(activity.created_on) %>
    +
    + 时间： + <%=format_date(activity.created_on) %> +
    缺陷描述： <% if activity.description? %> @@ -55,30 +60,21 @@ <% end %> <% end %>
    -
    - <% count=activity.journals.count %> + <% count = activity.journals.count %>
    回复（<%= count %>）
    <%#= format_date(activity.updated_on) %>
    - <% if count>2 %> + <% if count > 2 %>
    - 点击展开更多回复(<%= count.to_s %> - )
    + + 点击展开更多回复(<%= count.to_s %>) + +
    <% end %>
    @@ -97,11 +93,11 @@ <% replies_all_i = 0 %> - <% unless activity.journals.empty? %> + <% if count > 0 %>
      <% activity.journals.reorder("created_on desc").each do |reply| %> - <% replies_all_i=replies_all_i+1 %> + <% replies_all_i=replies_all_i + 1 %>
    • <%= link_to image_tag(url_to_avatar(reply.user), :width => "45", :height => "45"), user_path(reply.user_id), :alt => "用户头像" %> @@ -114,15 +110,17 @@ <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %> <% end %> <%= format_date(reply.created_on) %> - -
      <% if reply.details.any? %> <% details_to_strings(reply.details).each do |string| %> -
      <%= string %>
      +
      + <%= string %> +
      <% end %> <% else %> -
      <%= reply.notes.html_safe %>
      +
      + <%= reply.notes.html_safe %> +
      <% end %>
    From 8acc432f910c140e64ed32dc1327180aebf52f5b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 2 Sep 2015 13:46:33 +0800 Subject: [PATCH 32/48] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AE=A8=E8=AE=BA?= =?UTF-8?q?=E5=8C=BA=E5=9B=9E=E5=A4=8D=E5=88=B7=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_message.html.erb | 2 +- app/views/users/_project_message.html.erb | 34 +++++------------------ 2 files changed, 8 insertions(+), 28 deletions(-) diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 2248b40c3..f622ad20c 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -52,7 +52,7 @@
    回复( <% if activity.parent %> <% count=activity.parent.children.count%> - <% else %> + <% else %> <% count=activity.children.count%> <% end %> <%= count %> diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 7d563bdf7..ebf3d0ad2 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -33,30 +33,19 @@ <%= activity.parent.content.to_s.html_safe%> <% end %>
    -
    -
    <% count=0 %> +
    + <% count = 0 %>
    回复( - <% if activity.parent_id.nil? %> - <% count=activity.replies_count%> - <%=count %> + <% if activity.parent %> + <% count=activity.parent.children.count%> <% else %> - <% count=activity.parent.replies_count%> - <%=count %> + <% count=activity.children.count%> <% end %> + <%=count %> )
    <%#=format_date(activity.updated_on)%>
    <%if count>2 %> @@ -81,7 +70,7 @@ <% activity= activity.parent_id.nil? ? activity : activity.parent %> <% replies_all_i = 0 %> - <% unless activity.children.empty? %> + <% if count > 0 %>
      <% activity.children.reorder("created_on desc").each do |reply| %> @@ -98,15 +87,6 @@ <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id), :class => "newsBlue mr10 f14" %> <% end %> <%= format_date(reply.created_on) %> - <%#= link_to( - l(:button_delete), - {:controller => 'messages', :action => 'destroy', :id => reply.id, :board_id => reply.board_id, :is_board => 'false'}, - :method => :post, - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete), - :class => 'replyGrey fr ml10' - ) if reply.course_destroyable_by?(User.current) %> -
    <%= reply.content.html_safe %>
    From e55b61cb818c31b386ae0fbe9bafbe5f80bab231 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 2 Sep 2015 14:07:19 +0800 Subject: [PATCH 33/48] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/courses/_courses_jours.html.erb | 155 ++-------------------- public/stylesheets/courses.css | 3 +- 2 files changed, 16 insertions(+), 142 deletions(-) diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb index cedc05f4b..c90dbf724 100644 --- a/app/views/courses/_courses_jours.html.erb +++ b/app/views/courses/_courses_jours.html.erb @@ -11,9 +11,11 @@ div.recall_con{width:570px;} div.recall_con .reply_btn{margin-left:525px;margin-top:5px;} -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %> -
    - <%# reply_allow = JournalsForMessage.create_by_user? User.current %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor" %> + +

    <%= l(:label_leave_message) %>

    <% if !User.current.logged?%> @@ -23,21 +25,15 @@
    <% else %> - <%= form_for('new_form', :method => :post, - :url => {:controller => 'words', :action => 'leave_course_message'},:html => {:id=>'leave_message_form'}) do |f|%> - <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> - <%#= f.kindeditor 'course_message',:height => '140px;',:editor_id => 'leave_message_editor',:input_html=>{:id => "leave_meassge",:style => "resize: none;", - :placeholder => "#{l(:label_welcome_my_respond)}",:maxlength => 250}%> - -

    - <% end %> -
    -
    -
    - 取  消 - - <%= l(:button_leave_meassge)%> - +
    + <%= form_for('new_form',:url => {:controller => 'words', :action => 'leave_course_message'},:method => "post") do |f|%> + <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %> + +

    +
    + 取消 + 留言 + <% end%>
    <% end %>
    @@ -54,106 +50,6 @@ diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index bc7f62aea..88455e306 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -769,4 +769,5 @@ a.FilesName{ max-width:540px;overflow:hidden; white-space:nowrap; text-overflow: a.FilesName02{ max-width:665px;overflow:hidden; white-space:nowrap; text-overflow:ellipsis; display:block;} .ProResultUl span { display:block; float:left;} .ProResultUl li{ line-height:35px; border-bottom:1px solid #dddddd; } -.DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;} \ No newline at end of file +.DateBorder{border:1px solid #d9d9d9; border-left:none; padding:7px 6px 6px 6px;} +.mb50{margin-bottom: 50px;} \ No newline at end of file From 0bb0a97fd5a4c8e87e9c37ff30c410a88cadd8f6 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 2 Sep 2015 14:10:41 +0800 Subject: [PATCH 34/48] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=95=99=E8=A8=80=E5=9B=9E=E5=A4=8D=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=97=A0=E4=BD=9C=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/user.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/javascripts/user.js b/public/javascripts/user.js index ba40af1bd..6a5d93139 100644 --- a/public/javascripts/user.js +++ b/public/javascripts/user.js @@ -1,7 +1,7 @@ //个人动态 $(function(){ KindEditor.ready(function(K){ - $("a[nhname='reply_btn']").on('click',function(){ + $("a[nhname='reply_btn']").live('click',function(){ var params = {}; params.kindutil = K; params.container = $(this).parent().parent('div'); @@ -35,7 +35,7 @@ $(function(){ },300); }); - $("a[nhname='sub_reply_btn']").on('click',function(){ + $("a[nhname='sub_reply_btn']").live('click',function(){ var params = {}; params.kindutil = K; params.container = $(this).parent().parent('div'); From a2079dc6e3cf00f759451a0244ce50e33a9040e5 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 2 Sep 2015 14:13:32 +0800 Subject: [PATCH 35/48] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=95=99=E8=A8=80?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index af3551704..882f88e41 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -407,20 +407,14 @@ class UsersController < ApplicationController # modified by fq def user_newfeedback - # 更新用户留言列表状态 - feedback_messages = UserFeedbackMessage.where("journals_for_message_type =? and user_id =? and viewed =?", "JournalsForMessage", User.current, false) - feedback_messages.each do|feedback_message| - if User.current.id == feedback_message.user_id - feedback_message.update_attributes(:viewed => true) + # 更新用户留言消息状态 + @user.journals_for_messages.each do |jour_message| + jour_message.user_feedback_messages.each do |userfeedback_message| + if User.current.id == userfeedback_message.user_id + userfeedback_message.update_attributes(:viewed => true) + end end end - # @user.journals_for_messages.each do |jour_message| - # jour_message.user_feedback_messages.each do |userfeedback_message| - # if User.current.id == userfeedback_message.user_id - # userfeedback_message.update_attributes(:viewed => true) - # end - # end - # end # end jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC') if User.current == @user From 9b8270aed111e432d5f09188561a90e60de69792 Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Wed, 2 Sep 2015 14:15:26 +0800 Subject: [PATCH 36/48] =?UTF-8?q?Banner=20padding=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/show.html.erb | 2 -- app/views/users/user_homeworks.html.erb | 11 ++++------- app/views/users/user_messages.html.erb | 4 +--- app/views/users/user_newfeedback.html.erb | 5 ++--- app/views/users/user_resource.html.erb | 5 ++--- public/stylesheets/new_user.css | 12 ++++++------ 6 files changed, 15 insertions(+), 24 deletions(-) diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 76599739c..aa2c02ce2 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -1,5 +1,4 @@ -
    最新动态
      @@ -37,6 +36,5 @@
    -
    <%= render :partial => 'users/user_activities', :locals => {:user_activities => @user_activities,:page => 0} %> \ No newline at end of file diff --git a/app/views/users/user_homeworks.html.erb b/app/views/users/user_homeworks.html.erb index 3e2a0abe7..9d93ad0fd 100644 --- a/app/views/users/user_homeworks.html.erb +++ b/app/views/users/user_homeworks.html.erb @@ -15,11 +15,10 @@ <% if User.current.user_extensions && User.current.user_extensions.identity == 0 && User.current.allowed_to?(:add_course, nil, :global => true)%> -
    -
    +
    发布作业
    -
    +
    @@ -32,10 +31,8 @@
    <%else%> -
    -
    -
    作业
    -
    +
    +
    作业
    <% end%> diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index 207572a1c..d330857c3 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -1,5 +1,4 @@ -
    -
    +
    消息
    • @@ -28,7 +27,6 @@
    -
    <% if @message_alls.count >0 %> diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb index c8196c90f..60e630959 100644 --- a/app/views/users/user_newfeedback.html.erb +++ b/app/views/users/user_newfeedback.html.erb @@ -10,11 +10,10 @@ div.ke-toolbar .ke-outline{border:none;}
    -
    -
    +
    留言
    -
    +
    diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb index c0049db88..096d6e8f5 100644 --- a/app/views/users/user_resource.html.erb +++ b/app/views/users/user_resource.html.erb @@ -42,8 +42,7 @@ $("#upload_form").submit(); } -
    -
    +
    资源库
    • @@ -67,7 +66,7 @@
    -
    +
    diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 0da0c02fa..8f62820a5 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -499,12 +499,12 @@ a.coursesLineGrey:hover {color:#ffffff;} .homepageLeftMenuMore {height:18px;} .homepageLeftMenuMore:hover {background-color:#269ac9;} .homepageLeftMenuMoreIcon {background:url(../images/homepage_icon.png) -74px -240px no-repeat; display:block; height:18px;} -.homepageMenuSetting {display:inline-block; margin-left:155px;background:url(../images/homepage_icon.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;} +.homepageMenuSetting {display:inline-block; background:url(../images/homepage_icon.png) -190px -365px no-repeat; width:15px; height:15px; margin-top: 16px; margin-right: 15px;} .homepageMenuSetting:hover {background:url(../images/homepage_icon.png) -190px -407px no-repeat;} a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;} .homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;} .homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;} -.homepageRightBanner {width:720px; margin:0px auto;} +.homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;} .NewsBannerName {font-size:16px; color:#4b4b4b; display:block; width:150px; float:left;} .newsType {width:60px; background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:5px 10px; left:-40px; font-size:12px; color:#888888; display:none; line-height:2; z-index:9999;} .newsReadSetting {width:700px; background-color:#f6f6f6; border-bottom:1px solid #eeeeee; margin:10px auto; height:39px; line-height:39px; vertical-align:middle; font-size:14px; color:#7a7a7a; padding-left:10px;} @@ -560,7 +560,7 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:20px;} .homepagePostReplyBannerTime{width:85px; display:inline-block;} .homepagePostReplyBannerMore{width:330px; display:inline-block; text-align:right;} -.homepagePostReplyInputContainer {width:670px; margin: 10px auto 0 auto;} +.homepagePostReplyInputContainer {width:680px; margin: 10px auto 0 auto;} .homepagePostReplyInput {width:663px; height:45px; max-width:663px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:20px auto 10px auto;} .homepagePostReplyEmotion {background:url(../images/homepage_icon.png) -90px -88px no-repeat; width:50px; height:24px; float:left; padding-left:30px;} .homepagePostReplySubmit {float:right; width:45px; height:24px; text-align:center; line-height:24px; vertical-align:middle; font-size:12px; color:#ffffff; background-color:#269ac9;} @@ -572,7 +572,7 @@ a.postReplyCancel {color:#888888; display:block;} a.postReplyCancel:hover {color:#ffffff;} .homepagePostReplyInputContainer2 {width:595px; margin:0px auto;} .homepagePostReplyInput2 {width:588px; height:45px; max-width:588px; max-height:45px; border:1px solid #d9d9d9; outline:none; margin:0px auto 10px auto;} -.homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:680px; margin:0px auto; margin-top:15px; min-height:65px;} +.homepagePostReplyContainer {border-bottom:1px solid #e3e3e3; width:680px; margin:0px auto; margin-top:15px; min-height:60px;} .homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;} .homepagePostSettingIcon {background:url(../images/homepage_icon.png) -93px -5px no-repeat; width:20px; height:20px;} .homepagePostSettiongText {width:85px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-68px; top:20px; padding:5px 0px; display:none;} @@ -580,7 +580,7 @@ a.postReplyCancel:hover {color:#ffffff;} a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;} a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .homepagePostReplyPortrait {float:left; width:45px;} -.homepagePostReplyDes {float:left; width:595px; margin-left:15px;} +.homepagePostReplyDes {float:left; width:620px; margin-left:15px;} .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;} .homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;} .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;} @@ -843,7 +843,7 @@ a.box_close{background:url(../images/img_floatbox.png) -22px 0 no-repeat;} .uppic_btn:hover {background-color: #329cbd;} /*20150820课程作业 LB*/ -.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd;} +.HomeWork {width:718px; background-color:#ffffff; padding:15px; border:1px solid #dddddd; float:right;} .RightBanner {width:708px; height:34px; border-bottom:1px solid #e9e9e9;} select.InputBox,input.InputBox,textarea.InputBox{ border:1px solid #d9d9d9; color:#888888; height:28px; line-height:28px; padding-left:5px; font-size:14px;} a.BlueCirBtn{ display:block;width:75px; height:28px; background-color:#ffffff; line-height:28px; vertical-align:middle; text-align:center; border:1px solid #269ac9; color:#269ac9; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;} From 53c57668aa0d7522c2a790b637d739a83053bd34 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 2 Sep 2015 14:19:47 +0800 Subject: [PATCH 37/48] =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=9B=B4=E5=A4=9A=E6=8C=89=E9=92=AE=E7=9A=84=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E4=B8=8E=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_activities.html.erb | 5 ++++- app/views/users/show.js.erb | 4 +--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 2eba84efa..8c9111dce 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -61,4 +61,7 @@ <% end %> <% end %> -<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> +<% if user_activities.count == 10%> + <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> +<% end%> + diff --git a/app/views/users/show.js.erb b/app/views/users/show.js.erb index bf7443f8c..eb5de9c6a 100644 --- a/app/views/users/show.js.erb +++ b/app/views/users/show.js.erb @@ -1,4 +1,2 @@ $("#show_more_activities").replaceWith("<%= escape_javascript( render :partial => 'users/user_activities',:locals => {:user_activities => @user_activities, :page => @page,:type => @type} )%>"); -<% if @user_activities.count < 10%> -$("#show_more_activities").hide(); -<% end%> + From fcdf9b3fc16237b01984437d670664a7d4adf545 Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 2 Sep 2015 14:21:50 +0800 Subject: [PATCH 38/48] =?UTF-8?q?=E6=B8=85=E7=90=86=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/user_messages.html.erb | 24 +----------------------- 1 file changed, 1 insertion(+), 23 deletions(-) diff --git a/app/views/users/user_messages.html.erb b/app/views/users/user_messages.html.erb index f5da35009..2b57d76a8 100644 --- a/app/views/users/user_messages.html.erb +++ b/app/views/users/user_messages.html.erb @@ -216,16 +216,8 @@ <%=link_to ma.journals_for_message.user, user_path(ma.journals_for_message.user), :class => "newsBlue homepageNewsPublisher" %> "><%= ma.journals_for_message.reply_id == 0 ? "给你留言了：" : "回复了你的留言：" %> -
  • - - <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", - :title => "#{ma.journals_for_message.notes}", - :onmouseover =>"message_titile_show('message_title')", - :onmouseout => "message_titile_hide('message_title')" %> - + <%= link_to ma.journals_for_message.notes.html_safe, feedback_path(ma.journals_for_message.jour_id), :class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}", :title => "#{ma.journals_for_message.notes}" %>
  • <%= time_tag(ma.journals_for_message.created_on).html_safe %>
    • @@ -248,20 +240,6 @@ - - - - - From ea4a0050484ccf70d041d4475851957cefd6817a Mon Sep 17 00:00:00 2001 From: suntao <719450423@qq.com> Date: Wed, 2 Sep 2015 14:31:03 +0800 Subject: [PATCH 39/48] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=8E=92=E7=89=88=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/courses.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css index bc7f62aea..833613574 100644 --- a/public/stylesheets/courses.css +++ b/public/stylesheets/courses.css @@ -502,7 +502,7 @@ blockquote { } a.member_search_edit {width: 43px;background: #15bccf;color: #fff;text-align: center;text-decoration: none;padding: 2px;} .min_search_edit {width: 150px;height: 20px;border: 1px solid #d0d0d0 !important;color: #666;} -.r_txt_tit{max-width:510px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;} +.r_txt_tit{max-width:450px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;color:#15bccf; float:left; color:#09658c; font-size:14px;} /*日历选择图*/ img.ui-datepicker-trigger { From 3208574a5eb2fe0efc0d1dfac9a6ebf6d738c130 Mon Sep 17 00:00:00 2001 From: cxt Date: Wed, 2 Sep 2015 14:31:46 +0800 Subject: [PATCH 40/48] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=92=8C=E9=A6=96?= =?UTF-8?q?=E9=A1=B5=E7=9A=84=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A=E4=BC=A0?= =?UTF-8?q?=E9=80=92page=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_activities.html.erb | 2 +- app/views/users/_user_homework_list.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 2eba84efa..06daedb42 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -61,4 +61,4 @@ <% end %> <% end %> -<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> +<%= link_to "点击展开更多",user_activities_path(@user.id,:type => type, :page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index fc6e723f2..677f0303b 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -54,4 +54,4 @@ <% end%> -<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%> \ No newline at end of file +<%= link_to "加载更多",user_homeworks_user_path(User.current.id, :page=> page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%> \ No newline at end of file From 05739931f3a1fcdfe46ef1a07ca3fc2e5afcb436 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 2 Sep 2015 14:34:32 +0800 Subject: [PATCH 41/48] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=8A=A0=E8=BD=BD=E6=9B=B4=E5=A4=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_list.html.erb | 6 +++--- app/views/users/user_homeworks.js.erb | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/app/views/users/_user_homework_list.html.erb b/app/views/users/_user_homework_list.html.erb index fc6e723f2..076383607 100644 --- a/app/views/users/_user_homework_list.html.erb +++ b/app/views/users/_user_homework_list.html.erb @@ -52,6 +52,6 @@
    <% end%> - - -<%= link_to "加载更多",user_homeworks_user_path(User.current.id),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%> \ No newline at end of file +<% if homework_commons.count == 10%> + <%= link_to "加载更多",user_homeworks_user_path(User.current.id,:page => page),:id => "user_show_more_homework",:remote => "true",:class => "loadMore f_grey"%> +<% end%> \ No newline at end of file diff --git a/app/views/users/user_homeworks.js.erb b/app/views/users/user_homeworks.js.erb index a2e778a21..b6703dd43 100644 --- a/app/views/users/user_homeworks.js.erb +++ b/app/views/users/user_homeworks.js.erb @@ -1,4 +1,2 @@ $("#user_show_more_homework").replaceWith("<%= escape_javascript( render :partial => 'users/user_homework_list',:locals => {:homework_commons => @homework_commons, :page => @page} )%>"); -<% if @homework_commons.count < 10%> - $(window).off("scroll", scrollHandler); -<% end%> + From 43f99c45e80b2c0c845a557fef0474a76dbc8c9a Mon Sep 17 00:00:00 2001 From: huang Date: Wed, 2 Sep 2015 14:37:57 +0800 Subject: [PATCH 42/48] =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/users_controller.rb | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 1fac6737b..281924f55 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -106,16 +106,16 @@ class UsersController < ApplicationController return end # 当前用户查看消息，则设置消息为已读 - # 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 + 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 # @new_message_count = forge_querys.count + forum_querys.count + course_querys.count + user_querys.count case params[:type] when nil From 9df301b4ccf554425c3befbefebe1c5ecd52f374 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 2 Sep 2015 14:37:58 +0800 Subject: [PATCH 43/48] =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=97=A0=E7=94=A8?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_activities.html.erb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb index 18125eaa9..906787070 100644 --- a/app/views/users/_user_activities.html.erb +++ b/app/views/users/_user_activities.html.erb @@ -60,7 +60,6 @@ <% end %> <% end %> <% end %> - <% if user_activities.count == 10%> <%= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%> From c8eb7804df2ca4ed59d3c3b401d0896e47dd3098 Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Wed, 2 Sep 2015 16:12:33 +0800 Subject: [PATCH 44/48] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=92=8C=E5=8F=91=E9=80=81=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=9A=84js=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_user_homework_form.html.erb | 5 ++- public/javascripts/new_user.js | 39 +++++++++++++++++++- 2 files changed, 42 insertions(+), 2 deletions(-) diff --git a/app/views/users/_user_homework_form.html.erb b/app/views/users/_user_homework_form.html.erb index 4a38e630b..7be8811a4 100644 --- a/app/views/users/_user_homework_form.html.erb +++ b/app/views/users/_user_homework_form.html.erb @@ -15,9 +15,12 @@
    <%= calendar_for('homework_end_time')%> +
    +

    +