From f4d67bc027a1ea6365cb271b26a73983010020a5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 20 Jun 2016 16:03:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E6=9C=AA=E8=AF=BB=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E2=80=9C=E7=82=B9=E5=87=BB=E5=B1=95=E5=BC=80?=
 =?UTF-8?q?=E2=80=9D=E6=98=BE=E7=A4=BA10=E6=9D=A1=E6=9C=AA=E8=AF=BB?=
 =?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/views/layouts/_show_messages_list.html.erb | 11 ++++++++---
 public/stylesheets/new_user.css                |  3 ++-
 public/stylesheets/public.css                  |  5 +++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 423011e3c..762109bf5 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -1,6 +1,7 @@
 <font></font>
 <div id="message_list_detail">
 <h4 class="shadowbox_news_title">未读消息</h4>
+<p style="display: none;" id="none_message" class="shadowbox_news_p text_c">无未读消息</p>
 <ul class="shadowbox_news_list">
   <% messages.each do |ma| %>
     <% if ma.class == SystemMessage %>
@@ -135,8 +136,8 @@
       <% end %>
   <% end %>
 </ul>
-  <a onclick = "show_more();" id = "show_more_messages"  class = "shadowbox_news_all undis">展开更多</a>
-<%= link_to '查看全部', user_message_path(User.current),:id =>'show_all_messages', :class => "shadowbox_news_all undis", :target =>"_Blank" %>
+  <a onclick = "show_more();" id = "show_more_messages" style="display: none" class = "shadowbox_news_all">展开更多</a>
+<%= link_to '查看全部', user_message_path(User.current),:id =>'show_all_messages', :class => "shadowbox_news_all", :style => "display:none", :target =>"_Blank" %>
 </div>
 
 <script type="text/javascript">
@@ -149,7 +150,11 @@
             $(".shadowbox_news_list li").eq(3).show();
             $(".shadowbox_news_list li").eq(4).show();
             $("#show_more_messages").show();
-        } else {
+        } else if ($(".shadowbox_news_list li").length == 0) {
+            $("#none_message").show();
+            $("#show_all_messages").show();
+        }
+        else {
             $("#show_all_messages").show();
         }
     });
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index dcd275d92..6812faf34 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -1620,8 +1620,9 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
 /*消息弹框*/
 .shadowbox_news{ width:305px; background-color:#fff;    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -131px; top: 45px; z-index: 9999;}
 .shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
+.shadowbox_news_p{ height:40px; line-height:40px; font-size:12px; color:#333;}
 .shadowbox_news font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
-.shadowbox_news_list{ max-height:200px; overflow:hidden;}
+.shadowbox_news_list{ max-height:400px; overflow:hidden;}
 .shadowbox_news_list a{ color:#999;}
 .shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
 .shadowbox_news_list li:hover{ background-color:#eee;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index 333c410ca..6c7bde896 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -1155,8 +1155,9 @@ a.st_down{ display: block; width:8px; float:left; height:13px; background:url(..
 /*消息弹框*/
 .shadowbox_news{ width:305px; background-color:#fff;    box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5); position: absolute; left: -131px; top: 45px; z-index: 9999;}
 .shadowbox_news_title{ height:40px; line-height:40px;padding-left:10px; font-size:12px; color:#333;border-bottom:1px solid #eee;}
-.shadowbox_news font{ border: 1px solid #dddddd;   display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
-.shadowbox_news_list{ max-height:200px; overflow:hidden;}
+.shadowbox_news_p{ height:40px; line-height:40px; font-size:12px; color:#333;}
+.shadowbox_news font{ border: 1px solid #dddddd; display: block; border-width: 8px; position: absolute; top: -15px;left: 140px; border-style:solid; border-color:  transparent transparent  #fff transparent;font-size: 0;line-height: 0;  box-shadow:2px rgba(146, 153, 169, 0.5); }
+.shadowbox_news_list{ max-height:400px; overflow:hidden;}
 .shadowbox_news_list a{ color:#999;}
 .shadowbox_news_list li{ height:40px; border-bottom:1px dashed #ebebeb; line-height:40px;overflow:hidden; white-space: nowrap; text-overflow:ellipsis; padding:0 10px;}
 .shadowbox_news_list li:hover{ background-color:#eee;}

From 860068f7ed31acbbc7bc3c35c9030e1b2039b142 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jun 2016 11:03:50 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E6=96=B0=E6=B3=A8=E5=86=8C=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=9A=84=E7=95=99=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 258fe2ea5..19b60e9c2 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -248,7 +248,7 @@ class User < Principal
   before_save   :update_hashed_password
   before_destroy :remove_references_before_destroy,:delete_user_ealasticsearch_index
   # added by fq
-  after_create :act_as_activity, :add_onclick_time, :act_as_principal_activity,:create_user_ealasticsearch_index
+  after_create :act_as_activity, :add_onclick_time, :act_as_principal_activity,:create_user_ealasticsearch_index,:add_new_jour
   # end
   # 更新邮箱用户或用户名的同事，同步更新邀请信息
   after_update :update_invite_list,:update_user_ealasticsearch_index
@@ -1145,6 +1145,22 @@ class User < Principal
     end
   end
 
+  #为新注册用户发送留言
+  def add_new_jour
+    if Message.where("id=19278").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
+      lead_message1 = Message.find(19278)
+      notes1 = lead_message1.content
+      # lead_message2 = Message.find(19292)
+      # notes2 = lead_message2.content
+      # lead_message3 = Message.find(19291)
+      # notes3 = lead_message3.content
+      # user_id 默认为课程使者创建
+      self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes1, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+      # self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes2, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+      # self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes3, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    end
+  end
+
   # 更新邮箱的同事，更新invite_lists表中的邮箱信息
   def update_invite_list
     invite_lists = InviteList.where("user_id =?",self.id).all

From dc70b40309a4afb449b472680a1d62c37f9c5b1c Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jun 2016 11:04:35 +0800
Subject: [PATCH 3/5] =?UTF-8?q?kindeditor=E4=B8=AD=E7=9A=84a=E6=A0=87?=
 =?UTF-8?q?=E7=AD=BE=E5=B1=9E=E6=80=A7=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/assets/kindeditor/kindeditor.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 0354ed467..c78fd430e 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -300,8 +300,8 @@ K.options = {
 			'.text-align', '.color', '.background-color', '.font-size', '.font-family', '.font-weight',
 			'.font-style', '.text-decoration', '.vertical-align', '.background', '.border','.border-color', '.text-overflow','.overflow','.white-space'
 		],
-		a : ['id', 'class', 'href', 'target', 'name'],
-		embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
+        a : ['id', 'class', 'href', 'target', 'name','data-method','data-remote','rel'],
+        embed : ['id', 'class', 'src', 'width', 'height', 'type', 'loop', 'autostart', 'quality', '.width', '.height', 'align', 'allowscriptaccess'],
 		img : ['id', 'class', 'src', 'width', 'height', 'border', 'alt', 'title', 'align', '.width', '.height', '.border'],
 		'p,ol,ul,li,blockquote,h1,h2,h3,h4,h5,h6' : [
 			'id', 'class', 'align', '.text-align', '.color', '.background-color', '.font-size', '.font-family', '.background',

From 4f80e259e84dfbf422c2e45c4efeccc1ae1f0af5 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jun 2016 11:16:45 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E7=9A=84=E5=BB=B6=E6=97=B6=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                         | 24 +++++++++++-----------
 app/views/layouts/_logined_header.html.erb | 16 ++++++---------
 2 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 19b60e9c2..2db66dc31 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1147,18 +1147,18 @@ class User < Principal
 
   #为新注册用户发送留言
   def add_new_jour
-    if Message.where("id=19278").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
-      lead_message1 = Message.find(19278)
-      notes1 = lead_message1.content
-      # lead_message2 = Message.find(19292)
-      # notes2 = lead_message2.content
-      # lead_message3 = Message.find(19291)
-      # notes3 = lead_message3.content
-      # user_id 默认为课程使者创建
-      self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes1, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
-      # self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes2, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
-      # self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes3, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
-    end
+    # if Message.where("id=19278").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
+    #   lead_message1 = Message.find(19278)
+    #   notes1 = lead_message1.content
+    #   lead_message2 = Message.find(19292)
+    #   notes2 = lead_message2.content
+    #   lead_message3 = Message.find(19291)
+    #   notes3 = lead_message3.content
+    #   # user_id 默认为课程使者创建
+    #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes1, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes2, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes3, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+    # end
   end
 
   # 更新邮箱的同事，更新invite_lists表中的邮箱信息
diff --git a/app/views/layouts/_logined_header.html.erb b/app/views/layouts/_logined_header.html.erb
index da22cce7a..d8adece15 100644
--- a/app/views/layouts/_logined_header.html.erb
+++ b/app/views/layouts/_logined_header.html.erb
@@ -112,21 +112,17 @@
     }).mouseleave(function(){
         onNotice = false;
         var obj = $("#user_messages_list");
-        obj.timer = setTimeout(function(){
-            if(!onNotice && !onUserMessages)
-            obj.hide(0);
-            obj.html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
-        }, 500);
+        setTimeout(function(){
+            if(!onNotice && !onUserMessages) {
+                obj.hide();
+                obj.html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
+            } }, 500);
     });
-
-    $("#user_messages_list").mouseenter(function(event){
+    $("#message_list_detail").mouseenter(function(event){
         event.stopPropagation();
         onUserMessages = true;
-        $(this).show();
     }).mouseleave(function(){
         onUserMessages = false;
-        $(this).hide();
-        $(this).html("<%=escape_javascript(render :partial => 'layouts/message_loading') %>");
     });
 
     $("#navHomepageProfile").mouseenter(function(){

From c4cea93a4451003c53ca9f0c4f9edac37d398c1a Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 21 Jun 2016 13:58:17 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E7=9A=84=E2=80=9C=E5=B1=95=E5=BC=80=E6=9B=B4=E5=A4=9A=E2=80=9D?=
 =?UTF-8?q?=E6=8C=87=E9=92=88=E6=89=8B=E5=8A=BF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/user.rb                             | 10 +++++-----
 app/views/layouts/_show_messages_list.html.erb |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/models/user.rb b/app/models/user.rb
index 2db66dc31..3d491c8ab 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1147,18 +1147,18 @@ class User < Principal
 
   #为新注册用户发送留言
   def add_new_jour
-    # if Message.where("id=19278").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
-    #   lead_message1 = Message.find(19278)
-    #   notes1 = lead_message1.content
+     if Message.where("id=19278").any? and Message.where("id=19291").any? and Message.where("id=19292").any?
+       lead_message1 = Message.find(19278)
+       notes1 = lead_message1.content
     #   lead_message2 = Message.find(19292)
     #   notes2 = lead_message2.content
     #   lead_message3 = Message.find(19291)
     #   notes3 = lead_message3.content
     #   # user_id 默认为课程使者创建
-    #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes1, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
+       self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes1, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
     #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes2, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
     #   self.journals_for_messages << JournalsForMessage.new(:user_id => 1, :notes => notes3, :reply_id => 0, :status => true, :is_readed => false, :private => 0)
-    # end
+     end
   end
 
   # 更新邮箱的同事，更新invite_lists表中的邮箱信息
diff --git a/app/views/layouts/_show_messages_list.html.erb b/app/views/layouts/_show_messages_list.html.erb
index 762109bf5..f67250e46 100644
--- a/app/views/layouts/_show_messages_list.html.erb
+++ b/app/views/layouts/_show_messages_list.html.erb
@@ -136,7 +136,7 @@
       <% end %>
   <% end %>
 </ul>
-  <a onclick = "show_more();" id = "show_more_messages" style="display: none" class = "shadowbox_news_all">展开更多</a>
+  <a onclick = "show_more();" id = "show_more_messages" style="display: none; cursor: pointer;" class = "shadowbox_news_all">展开更多</a>
 <%= link_to '查看全部', user_message_path(User.current),:id =>'show_all_messages', :class => "shadowbox_news_all", :style => "display:none", :target =>"_Blank" %>
 </div>