From 84ff3450d2724e4f42afb65142efd5e07a539ee2 Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Tue, 1 Sep 2015 10:43:30 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=A8=E5=8A=A8=E6=80=81=E4=B8=AD=E5=9B=9E?=
 =?UTF-8?q?=E5=A4=8D=E9=80=9A=E7=9F=A5=E5=8A=A8=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/comments_controller.rb    |  13 +-
 app/views/comments/create.js.erb          |   3 +
 app/views/users/_course_news.html.erb     |  25 +++-
 app/views/users/_user_activities.html.erb |   9 +-
 app/views/users/user_newfeedback.html.erb |  27 +---
 public/javascripts/init_KindEditor.js     | 100 +++++++++++++
 public/javascripts/user.js                | 175 ----------------------
 public/stylesheets/new_user.css           |  16 +-
 8 files changed, 156 insertions(+), 212 deletions(-)
 create mode 100644 app/views/comments/create.js.erb
 create mode 100644 public/javascripts/init_KindEditor.js

diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
index c10f8bc84..ac25fbe9d 100644
--- a/app/controllers/comments_controller.rb
+++ b/app/controllers/comments_controller.rb
@@ -34,7 +34,7 @@ class CommentsController < ApplicationController
         ids = params[:asset_id].split(',')
         update_kindeditor_assets_owner ids,@comment.id,OwnerTypeHelper::COMMENT
       end
-      # 与我相关动态的记录add start
+      # 锟斤拷锟斤拷锟斤拷囟锟教拷募锟铰糰dd start
       if( @comment.id && @news.course )
         if(@news.author_id != User.current.id)
           notify = ActivityNotify.new()
@@ -47,11 +47,18 @@ class CommentsController < ApplicationController
           notify.save()
         end
       end
-      # 与我相关动态的记录add end
+      # 锟斤拷锟斤拷锟斤拷囟锟教拷募锟铰糰dd end
       flash[:notice] = l(:label_comment_added)
     end
 
-    redirect_to news_url(@news)
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+      respond_to do |format|
+        format.js
+      end
+    else
+      redirect_to news_url(@news)
+    end
   end
 
   def destroy
diff --git a/app/views/comments/create.js.erb b/app/views/comments/create.js.erb
new file mode 100644
index 000000000..d55b714ad
--- /dev/null
+++ b/app/views/comments/create.js.erb
@@ -0,0 +1,3 @@
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+
+init_KindEditor_data(<%= @user_activity_id%>);
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 4295139e0..fb9561df6 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -1,4 +1,4 @@
-<div class="resources mt10" id="course_news_<%= activity.id%>">
+<div class="resources mt10" id="user_activity_<%= user_activity_id%>">
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%= link_to image_tag(url_to_avatar(activity.author), :width => "50", :height => "50"), user_path(activity.author_id), :alt => "鐢ㄦ埛澶村儚" %>
@@ -18,9 +18,9 @@
       <div class="homepagePostDate">
         鍙戝竷鏃堕棿锛�<%= format_date(activity.created_on) %>
       </div>
-      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity.id %>">閫氱煡鎻忚堪锛�<%= activity.description.html_safe %></div>
+      <div class="homepagePostIntro break_word upload_img" id="activity_description_<%= user_activity_id %>">閫氱煡鎻忚堪锛�<%= activity.description.html_safe %></div>
 
-      <div class="homepagePostSetting" id="act-<%= user_activity.id %>" style="visibility: hidden">
+      <div class="homepagePostSetting none" id="act-<%= user_activity_id %>">
         <ul>
           <li class="homepagePostSettingIcon">
             <ul class="homepagePostSettiongText">
@@ -40,12 +40,27 @@
       <div class="homepagePostReplyBannerCount">鍥炲锛�<%= count %>锛�</div>
       <div class="homepagePostReplyBannerTime"><%#= format_date(activity.updated_on) %></div>
       <%if count>2 %>
-          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity.id%>" onclick="expand_reply('#reply_div_<%= user_activity.id %> li','#reply_btn_<%=user_activity.id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >鐐瑰嚮灞曞紑鏇村鍥炲(<%= count.to_s%>)</a></div>
+          <div class="homepagePostReplyBannerMore"><a id="reply_btn_<%=user_activity_id%>" onclick="expand_reply('#reply_div_<%= user_activity_id %> li','#reply_btn_<%=user_activity_id%>')" data-count="<%= count %>" data-init="0" class=" replyGrey" href="javascript:void(0)" value="show_help" >鐐瑰嚮灞曞紑鏇村鍥炲(<%= count.to_s%>)</a></div>
       <% end %>
     </div>
+
+    <div class="homepagePostReplyInputContainer">
+      <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
+        <%= form_for('new_form',:url =>  {:controller => 'comments', :action => 'create', :id => activity},:method => "post", :remote => true) do |f|%>
+            <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
+            <textarea placeholder="鏈夐棶棰樻垨鏈夊缓璁紝璇风洿鎺ョ粰鎴戠暀瑷�鍚э紒" nhname='new_message_textarea' name="comment"></textarea>
+            <p nhname='contentmsg'></p>
+            <div nhname='toolbar_container' style="float:left;padding-top:3px;"></div>
+            <a id="new_message_cancel_btn" href="javascript:void(0)" class="grey_n_btn fr  " style="margin-top:3px;">鍙栨秷</a>
+            <a id="new_message_submit_btn" href="javascript:void(0)" class="blue_n_btn fr mr5 " style="margin-top:3px;">鍙戦��</a>
+        <% end%>
+      </div>
+      <div class="cl"></div>
+    </div>
+
     <% replies_all_i = 0 %>
     <% unless activity.comments.empty? %>
-        <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity.id %>">
+        <div class="homepagePostReplyContainer" id="reply_div_<%= user_activity_id %>">
           <ul>
             <% activity.comments.reorder("created_on desc").each do |comment| %>
                 <% replies_all_i=replies_all_i+1 %>
diff --git a/app/views/users/_user_activities.html.erb b/app/views/users/_user_activities.html.erb
index 511c416c2..4e705157a 100644
--- a/app/views/users/_user_activities.html.erb
+++ b/app/views/users/_user_activities.html.erb
@@ -1,5 +1,6 @@
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor" %>
 <% user_activities.each do |user_activity|
-  unless user_activities.nil? %>
+  if user_activities %>
         <script>
             function expand_reply(container,btnid){
                 var target = $(container);
@@ -16,6 +17,10 @@
                     target.eq(1).show();
                 }
             }
+
+            $(function() {
+                init_KindEditor_data(<%= user_activity.id%>);
+            });
         </script>
         <% act= user_activity.act unless user_activity.act_type == "ProjectCreateInfo" %>
         <% case user_activity.container_type.to_s %>
@@ -25,7 +30,7 @@
                 <% when 'HomeworkCommon' %>
                     <%= render :partial => 'course_homework', :locals => {:activity => act,:user_activity =>user_activity} %>
                 <% when 'News' %>
-                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity =>user_activity} %>
+                    <%= render :partial => 'course_news', :locals => {:activity => act,:user_activity_id =>user_activity.id} %>
                 <% when 'Message'%>
                     <%= render :partial => 'course_message', :locals => {:activity => act,:user_activity =>user_activity} %>
                 <% when 'Poll' %>
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index 556069a1f..035391472 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -1,29 +1,4 @@
-<!--<div class="top_new">-->
-  <!--<span class="<%#= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>-->
-  <!--<%# if @user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true) %>-->
-      <!--<a href="<%#= url_for(:controller => 'courses', :action => 'new',) %>" class="green_n_btn fr mt2" target="_blank">鏂板缓璇剧▼</a>-->
-  <!--<%# end %>-->
-  <!--<div class="cl"></div>-->
-<!--</div>-->
-<style type="text/css">
-    div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
-    span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
-    span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
-    div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
-    span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
-    span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
-    div.ke-toolbar .ke-outline{border:none;}
-
-    div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
-    div.recall_con{width:570px;}
-    div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
-    .fr.cr{ clear: right}
-</style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"user" %>
-<!--<div id="RSide" class="fl">-->
-  <!--<div class="users_r_top">-->
-    <!--<h2 class="users_r_h2">鐢ㄦ埛鐣欒█</h2>-->
-  <!--</div>-->
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor","user" %>
 <div >
   <div class="resources mb10">
     <div class="homepageRightBanner">
diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js
new file mode 100644
index 000000000..38aabda79
--- /dev/null
+++ b/public/javascripts/init_KindEditor.js
@@ -0,0 +1,100 @@
+function init_editor(params){
+    var editor = params.kindutil.create(params.textarea, {
+        resizeType : 1,minWidth:"1px",width:"100%",height:"80px",
+        items:['emoticons'],
+        afterChange:function(){//鎸夐敭浜嬩欢
+            nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
+        },
+        afterCreate:function(){
+            var toolbar = $("div[class='ke-toolbar']",params.div_form);
+            $(".ke-outline>.ke-toolbar-icon",toolbar).append('琛ㄦ儏');
+            params.toolbar_container.append(toolbar);
+        }
+    }).loadPlugin('paste');
+    return editor;
+}
+
+function nh_check_field(params){
+    var result=true;
+    if(params.content!=undefined){
+        if(params.content.isEmpty()){
+            result=false;
+        }
+        if(params.content.html()!=params.textarea.html() || params.issubmit==true){
+            params.textarea.html(params.content.html());
+            params.content.sync();
+            if(params.content.isEmpty()){
+                params.contentmsg.html('鍐呭涓嶈兘涓虹┖');
+                params.contentmsg.css({color:'#ff0000'});
+            }else{
+                params.contentmsg.html('濉啓姝ｇ‘');
+                params.contentmsg.css({color:'#008000'});
+            }
+            params.contentmsg.show();
+        }
+    }
+    return result;
+}
+function init_form(params){
+    params.form.submit(function(){
+        var flag = false;
+        if(params.form.attr('data-remote') != undefined ){
+            flag = true
+        }
+        var is_checked = nh_check_field({
+            issubmit:true,
+            content:params.editor,
+            contentmsg:params.contentmsg,
+            textarea:params.textarea
+        });
+        if(is_checked){
+            if(flag){
+                return true;
+            }else{
+                $(this)[0].submit();
+                return false;
+            }
+        }
+        return false;
+    });
+}
+function nh_reset_form(params){
+    params.form[0].reset();
+    params.textarea.empty();
+    if(params.editor != undefined){
+        params.editor.html(params.textarea.html());
+    }
+    params.contentmsg.hide();
+}
+
+function init_KindEditor_data(id){
+    KindEditor.ready(function (K) {
+        $("div[nhname='new_message_" + id + "']").each(function () {
+            var params = {};
+            params.kindutil = K;
+            params.div_form = $(this);
+            params.form = $("form", params.div_form);
+            if (params.form == undefined || params.form.length == 0) {
+                return;
+            }
+            params.textarea = $("textarea[nhname='new_message_textarea']", params.div_form);
+            params.contentmsg = $("p[nhname='contentmsg']", params.div_form);
+            params.toolbar_container = $("div[nhname='toolbar_container']", params.div_form);
+            params.cancel_btn = $("#new_message_cancel_btn");
+            params.submit_btn = $("#new_message_submit_btn");
+
+            if (params.textarea.data('init') == undefined) {
+                params.editor = init_editor(params);
+                init_form(params);
+                params.cancel_btn.click(function () {
+                    nh_reset_form(params);
+                });
+                params.submit_btn.click(function () {
+                    params.form.submit();
+                });
+                params.textarea.data('init', 1);
+                $(this).show();
+            }
+        });
+    });
+}
\ No newline at end of file
diff --git a/public/javascripts/user.js b/public/javascripts/user.js
index b032221f8..6a5d93139 100644
--- a/public/javascripts/user.js
+++ b/public/javascripts/user.js
@@ -1,74 +1,5 @@
 //涓汉鍔ㄦ��
 $(function(){
-    function init_editor(params){
-        var editor = params.kindutil.create(params.textarea, {
-            resizeType : 1,minWidth:"1px",width:"100%",height:"80px",
-            items:['emoticons'],
-            afterChange:function(){//鎸夐敭浜嬩欢
-                nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
-            },
-            afterCreate:function(){
-                var toolbar = $("div[class='ke-toolbar']",params.div_form);
-                $(".ke-outline>.ke-toolbar-icon",toolbar).append('琛ㄦ儏');
-                params.toolbar_container.append(toolbar);
-            }
-        }).loadPlugin('paste');
-        return editor;
-    }
-
-    function nh_check_field(params){
-        var result=true;
-        if(params.content!=undefined){
-            if(params.content.isEmpty()){
-                result=false;
-            }
-            if(params.content.html()!=params.textarea.html() || params.issubmit==true){
-                params.textarea.html(params.content.html());
-                params.content.sync();
-                if(params.content.isEmpty()){
-                    params.contentmsg.html('鍐呭涓嶈兘涓虹┖');
-                    params.contentmsg.css({color:'#ff0000'});
-                }else{
-                    params.contentmsg.html('濉啓姝ｇ‘');
-                    params.contentmsg.css({color:'#008000'});
-                }
-                params.contentmsg.show();
-            }
-        }
-        return result;
-    }
-    function init_form(params){
-        params.form.submit(function(){
-            var flag = false;
-            if(params.form.attr('data-remote') != undefined ){
-                flag = true
-            }
-            var is_checked = nh_check_field({
-                issubmit:true,
-                content:params.editor,
-                contentmsg:params.contentmsg,
-                textarea:params.textarea
-            });
-            if(is_checked){
-                if(flag){
-                    return true;
-                }else{
-                    $(this)[0].submit();
-                    return false;
-                }
-            }
-            return false;
-        });
-    }
-    function nh_reset_form(params){
-        params.form[0].reset();
-        params.textarea.empty();
-        if(params.editor != undefined){
-            params.editor.html(params.textarea.html());
-        }
-        params.contentmsg.hide();
-    }
-
     KindEditor.ready(function(K){
         $("a[nhname='reply_btn']").live('click',function(){
             var params = {};
@@ -167,110 +98,4 @@ $(function(){
         });
     });
 });
-function init_list_more_div(params){
-    var p=params;
-    p.exbtn.click(function(){
-        var isclose = p.container.data('isclose');
-        var hasmore = p.container.data('hasmore');
-        if(isclose == '1'){
-            $("div[nhname='rec']",p.container).show();
-            p.container.data('isclose','0');
-            change_status_4_list_more_div(params);
-            return;
-        }
-        if(hasmore == '0'){
-            change_status_4_list_more_div(params,'get');
-            return;
-        }
-        var url = p.container.data('url');
-        if($("div[nhname='rec']",p.container).length > 0){
-            var lastid = $("div[nhname='rec']",p.container).filter(':last').data('id');
-            url += "?lastid="+lastid;
-            var lasttime = $("div[nhname='rec']",p.container).filter(':last').data('time');
-            if(lasttime != undefined){
-                url += "&lasttime="+lasttime;
-            }
-        }
-        $.ajax( {url:url,dataType:'text',success:function(data){
-            var html = $("<div>"+data+"</div>");
-            var lens = $("div[nhname='rec']",html).length;
-            if(lens < p.size){
-                p.container.data('hasmore','0');
-            }
-            if(lens>0){
-                var currpage = parseInt(p.container.data('currpage'))+1;
-                p.container.data('currpage',currpage);
-                p.container.append(html.html())
-            }
-            change_status_4_list_more_div(params,'get');
-            p.div.show();
-        }} );
-    });
-    p.clbtn.click(function(){
-        var i=0;
-        $("div[nhname='rec']",p.container).each(function(){
-            i++;
-            if(i> p.size){
-                $(this).hide();
-            }
-        });
-        p.container.data('isclose','1');
-        change_status_4_list_more_div(params);
-    });
-    p.exbtn.click();
-}
-function change_status_4_list_more_div(params,opt){
-    var p=params;
-    if($("div[nhname='rec']",p.container).length == 0 && opt != 'get'){
-        p.exbtn.click();
-        return;
-    }
-    var show_lens = $("div[nhname='rec']",p.container).length - $("div[nhname='rec']",p.container).filter(':hidden').length;
-    if( show_lens > p.size ){
-        p.clbtn.show();
-    }else{
-        p.clbtn.hide();
-    }
-    if($("div[nhname='rec']",p.container).length == 0){
-        p.exbtn.html(p.nodatamsg);
-    }else if( p.container.data('hasmore') == '1' || p.container.data('isclose')=='1' ){
-        p.exbtn.html('鐐瑰嚮灞曞紑鏇村');
-    }else{
-        p.exbtn.html('娌℃湁鏇村浜�');
-    }
-}
-function init_list_more_div_params(div){
-    var params = {};
-    params.div = div;
-    params.container = $("div[nhname='container']",div);
-    params.exbtn = $("a[nhname='expand']",div);
-    params.clbtn = $("a[nhname='close']",div);
-    params.size = params.container.data('pagesize');
-    params.nodatamsg = params.container.data('nodatamsg');
-    if( params.size == undefined ){
-        params.size = 13;
-    }
-    return params;
-}
-$(function(){
-    $("div[nhname='list_more_div']").each(function(){
-        var params = init_list_more_div_params($(this));
-        init_list_more_div(params)
-    });
-});
-
-$(function(){
-    $(".newsType").mouseover(function(){
-        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px -25px no-repeat"});
-    });
-    $(".newsType").mouseout(function(){
-        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px 0px no-repeat"});
-    });
-    $(".resourcesSelected").mouseover(function(){
-        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px -25px no-repeat"});
-    });
-    $(".resourcesSelected").mouseout(function(){
-        $(".resourcesIcon").css({background:"url(images/resource_icon_list.png) 0px 0px no-repeat"});
-    });
-});
 //涓汉鍔ㄦ�� end
\ No newline at end of file
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 1e729cce2..54280b1c4 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -587,7 +587,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:0px auto;}
+.homepagePostReplyInputContainer {width:670px; 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;}
@@ -955,6 +955,20 @@ img.ui-datepicker-trigger {
 .is_public{display: none !important;}
 .ui-corner-left{background: #64bdd9;}
 
+/*鍥炲妗�*/
+div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
+span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
+span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
+div.ke-toolbar .ke-outline{padding:0px 0px;line-height:26px;font-size:14px;}
+span.ke-icon-emoticons{background-position:0px -671px;width:50px;height:26px;}
+span.ke-icon-emoticons:hover{background-position:-79px -671px;width:50px;height:26px;}
+div.ke-toolbar .ke-outline{border:none;}
+
+div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
+div.recall_con{width:570px;}
+div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
+.fr.cr{ clear: right}
+