Merge branch 'szzh' into dev_hjq

app/helpers/activity_notifys_helper.rb

@@ -1,7 +1,6 @@
 module ActivityNotifysHelper
   def get_new_notify_count(container,type)
-    logger.info('xxoo')
+    query = ActivityNotify.where('activity_container_id=? and activity_container_type=? and notify_to=? and is_read=0',container.id,type,User.current.id);
-    query = ActivityNotify.where('activity_container_id=? and activity_container_type=? and notify_to=?',container.id,type,User.current.id);
     return query.count()
   end
 end

app/views/boards/_course_show.html.erb

@@ -253,7 +253,7 @@
                 };
                 params.get_ref_str_call=function(btn){
                     var div = btn.parent('div');
-                    var str = '<blockquote>'+$('a',div).filter(':first').html()+' 写到： <br/>'+$("input[nhname='nh_content_val']",div).val()+'</blockquote>';
+                    var str = '<blockquote>'+$('a',div).filter(':first').html()+' 写到： <br/>'+$("input[nhname='nh_content_val']",div).val()+'<div class="cl"></div></blockquote>';
                     return str;
                 }
                 nh_init_board(params);

app/views/boards/_form_project.html.erb

@@ -47,6 +47,7 @@
 </li>
 <li>
   <div nhname="quote_show" id="message_quote" class="wiki" style="width: 100%;word-break: break-all;word-wrap: break-word;"></div>
+  <div class="cl"></div>
   <% unless replying %>
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>

app/views/boards/_project_show.html.erb

@@ -238,7 +238,7 @@
               };
               params.get_ref_str_call=function(btn){
                   var div = btn.parent('div');
-                  var str = '<blockquote>'+$('a',div).filter(':first').html()+' 写到： <br/>'+$("input[nhname='nh_content_val']",div).val()+'</blockquote>';
+                  var str = '<blockquote>'+$('a',div).filter(':first').html()+' 写到： <br/>'+$("input[nhname='nh_content_val']",div).val()+'<div class="cl"></div></blockquote>';
                   return str;
               }
               nh_init_board(params);

app/views/boards/show.html.erb

@@ -185,9 +185,17 @@ function nh_init_board(params){
                     if(params.quote_input!=undefined)params.quote_input.empty();
                 }else{
                     if(params.type=='reply'){
-                        params.jumphref.attr('href','#'+params.form.attr('id'));
+                      params.textarea.show();
-                        params.jumphref[0].click();
+                      params.textarea.focus();
-                    }else params.inputsubject.focus();
+                      params.textarea.hide();
+                        //params.jumphref.attr('href','#'+params.form.attr('id'));
+                        //params.jumphref[0].click();
+                    }else{
+                      params.textarea.show();
+                      params.textarea.focus();
+                      params.textarea.hide();
+//                      params.inputsubject.focus();
+                    }
                 }
             });
             params.textarea.data('init','1');//标记为已经初始化

app/views/courses/_courses_jours.html.erb

@@ -168,8 +168,11 @@
         params.cancel_btn.click();
         setTimeout(function(){
           if(!params.div_form.is(':hidden')){
-            $("#nhjump").attr('href','#'+params.div_form.attr('id'));
+            params.textarea.show();
-            $("#nhjump")[0].click();
+            params.textarea.focus();
+            params.textarea.hide();
+//            $("#nhjump").attr('href','#'+params.div_form.attr('id'));
+//            $("#nhjump")[0].click();
           }
         },300);
         params.textarea.data('init',1);

app/views/courses/show.html.erb

@@ -49,7 +49,7 @@
                   <br />
                   <%= l :label_activity_time %> ：  <%= format_activity_day(day) %>&nbsp;<%= format_time(e.event_datetime, false) %>
                 </p>
-                <%= link_to_attachments_course(e) if e.is_a?(News) %>
+                <%= link_to_attachments_course(e) if e.class.to_s == "News" %>
               </div>
               <div class="cl"></div>
             </div><!--课程动态 end-->

app/views/projects/_history.html.erb

@@ -21,7 +21,7 @@
                     <% end %>
                     <% if reply_allow %>
                         <%= link_to l(:label_bid_respond_quote),'',
-                                    {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
+                                    {:focus => 'project_respond',:nhname=>"reply_btn", :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
 
                     <% end %>
                 </span>

app/views/projects/_project_jours.html.erb

@@ -1,4 +1,18 @@
-<div class="msg_box" id='leave-message'>
+<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:600px;}
+  div.recall_con .reply_btn{margin-left:555px;margin-top:5px;}
+</style>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<div class="msg_box" id='leave-message' nhname='new_message' style="height:auto;">
   <% reply_allow = JournalsForMessage.create_by_user? User.current %>
   <h4><%= l(:label_user_response) %></h4>
   <% if !User.current.logged?%>
@@ -12,8 +26,10 @@
         <%= form_for('new_form', :method => :post,
                      :url => {:controller => 'words', :action => 'leave_project_message'}) do |f|%>
             <%= f.text_area 'project_message', :rows => 3, :cols => 65,
-                            :placeholder => "#{l(:label_welcome_my_respond)}" %>
+                            :placeholder => "#{l(:label_welcome_my_respond)}",:nhname=>'new_message_textarea' %>
-            <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "blue_btn fr" %>
+            <p nhname="contentmsg"></p>
+            <div class="fl mt10" style="padding-top:5px;" nhname="toolbar_container"></div>
+            <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "blue_btn fr mt10 mb10" %>
         <% end %>
 
   <% end %>
@@ -24,3 +40,158 @@
 </div>
 <ul class="wlist"><%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%></ul>
 
+<div style="display:none;"><a href="#" id="nhjump"></a></div>
+<script type="text/javascript">
+  $(function(){
+    function init_editor(params){
+      var editor = params.kindutil.create(params.textarea, {
+        resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
+        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){
+//      var flag = false;
+//      if(params.form.attr('data-remote') != undefined ){
+//        flag = true
+//      }
+//      params.form[0].onsubmit = function(){
+//        if(flag){
+//          $(this).removeAttr('data-remote');//不这么搞return false没用 花擦花擦
+//        }
+//        var is_checked = nh_check_field({
+//          issubmit:true,
+//          content:params.editor,
+//          contentmsg:params.contentmsg,
+//          textarea:params.textarea
+//        });
+//        if(is_checked){
+//          if(flag){
+//            alert('add')
+//            $(this).attr('data-remote','true');
+//          }
+//          alert('ok')
+//          return true;
+//        }
+//        return false;
+//      }
+
+      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 true;      //这个涛哥的firefox不能提交
+          //$(this).trigger('submit');  //这个虽然能提交  但是他是个死循环
+          //$(this)[0].submit();        //用这个form的data-remote='true'没效果了
+          //肿么破阿  我滴个神   实在不行就用$.ajax()算了
+        }
+        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 = {};
+        params.kindutil = K;
+        params.container = $(this).parent('div').parent('div');
+        params.div_form = $(">.respond-form",params.container);
+        params.form = $("form",params.div_form);
+        params.textarea = $("textarea[name='user_notes']",params.div_form);
+        params.contentmsg = $("p[nhname='contentmsg']",params.div_form),
+        params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+        params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
+        if(params.textarea.data('init') == undefined){
+          params.editor = init_editor(params);
+          init_form(params);
+          params.cancel_btn.click(function(){
+            nh_reset_form(params);
+          });
+        }
+        params.cancel_btn.click();
+        setTimeout(function(){
+          if(!params.div_form.is(':hidden')){
+            params.textarea.show();
+            params.textarea.focus();
+            params.textarea.hide();
+//            $("#nhjump").attr('href','#'+params.div_form.attr('id'));
+//            $("#nhjump")[0].click();
+          }
+        },300);
+        params.textarea.data('init',1);
+      });
+
+      $("div[nhname='new_message']").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);
+        if(params.textarea.data('init') == undefined){
+          params.editor = init_editor(params);
+          init_form(params);
+//          $("a[nhname='cancel_btn']",params.div_form).click(function(){
+//            nh_reset_form(params);
+//          });
+          params.textarea.data('init',1);
+        }
+      });
+    });
+  });
+</script>

app/views/users/_history.html.erb

@@ -24,7 +24,7 @@
                     <% end %>
                     <% if reply_allow %>
                         <%= link_to l(:label_bid_respond_quote),'',
-                                    {:focus => 'project_respond', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
+                                    {:focus => 'project_respond',:nhname=>'reply_btn', :onclick => "toggleAndSettingWordsVal($('##{ids}'), $('##{ids} textarea')); $('##{ids} textarea') ;return false;"} %>
 
                     <% end %>
                 </span>

app/views/users/_user_jours.html.erb

@@ -1,3 +1,17 @@
+<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:600px;}
+  div.recall_con .reply_btn{margin-left:555px;margin-top:5px;}
+</style>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
 <div class="dis">
   <div class="msg_box" id='leave-message'>
     <% reply_allow = JournalsForMessage.create_by_user? User.current %>
@@ -49,3 +63,163 @@
     }
 
 </script>
+
+<div style="display:none;"><a href="#" id="nhjump"></a></div>
+<script type="text/javascript">
+  $(function(){
+    function init_editor(params){
+      var editor = params.kindutil.create(params.textarea, {
+        resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
+        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){
+//      var flag = false;
+//      if(params.form.attr('data-remote') != undefined ){
+//        flag = true
+//      }
+//      params.form[0].onsubmit = function(){
+//        if(flag){
+//          $(this).removeAttr('data-remote');//不这么搞return false没用 花擦花擦
+//        }
+//        var is_checked = nh_check_field({
+//          issubmit:true,
+//          content:params.editor,
+//          contentmsg:params.contentmsg,
+//          textarea:params.textarea
+//        });
+//        if(is_checked){
+//          if(flag){
+//            alert('add')
+//            $(this).attr('data-remote','true');
+//          }
+//          alert('ok')
+//          return true;
+//        }
+//        return false;
+//      }
+
+      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 true;      //这个涛哥的firefox不能提交
+          //$(this).trigger('submit');  //这个虽然能提交  但是他是个死循环
+          //$(this)[0].submit();        //用这个form的data-remote='true'没效果了
+          //肿么破阿  我滴个神   实在不行就用$.ajax()算了
+        }
+        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 = {};
+        params.kindutil = K;
+        if($(this).parent('span')==undefined || $(this).parent('span').length==0){
+          params.container = $(this).parent('div').parent('div');
+        }else{
+          params.container = $(this).parent('span').parent('div').parent('div');
+        }
+        params.div_form = $(">.respond-form",params.container);
+        params.form = $("form",params.div_form);
+        params.textarea = $("textarea[name='user_notes']",params.div_form);
+        params.contentmsg = $("p[nhname='contentmsg']",params.div_form),
+          params.toolbar_container = $("div[nhname='toolbar_container']",params.div_form);
+        params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
+        if(params.textarea.data('init') == undefined){
+          params.editor = init_editor(params);
+          init_form(params);
+          params.cancel_btn.click(function(){
+            nh_reset_form(params);
+          });
+        }
+        params.cancel_btn.click();
+        setTimeout(function(){
+          if(!params.div_form.is(':hidden')){
+            params.textarea.show();
+            params.textarea.focus();
+            params.textarea.hide();
+//            $("#nhjump").attr('href','#'+params.div_form.attr('id'));
+//            $("#nhjump")[0].click();
+          }
+        },300);
+        params.textarea.data('init',1);
+      });
+
+      $("div[nhname='new_message']").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);
+        if(params.textarea.data('init') == undefined){
+          params.editor = init_editor(params);
+          init_form(params);
+//          $("a[nhname='cancel_btn']",params.div_form).click(function(){
+//            nh_reset_form(params);
+//          });
+          params.textarea.data('init',1);
+        }
+      });
+    });
+  });
+</script>

app/views/words/_new.html.erb

@@ -35,7 +35,7 @@
 		border: #d5dee9 1px solid;
 	}
 </style>
-<div style="width: 80%; margin-left:10%;">
+<div style="width: 80%; margin-left:10%;" nhname='new_message'>
   <%= form_for('new_form', :remote => true, :method => :post,
                 :url => {:controller => 'words',
                 :action => 'create',
@@ -51,10 +51,12 @@
       <%= f.text_area 'user_message', :rows => 3, :cols => 65,
                               :placeholder => "#{l(:label_leave_a_message)}",
                               :style => "resize: none;  width: 98%",
-                              :class => 'noline'%>
+                              :class => 'noline',:nhname=>'new_message_textarea'%>
        <%# end %>
       <%= f.text_field :reference_user_id, :style=>"display:none"%>
-      <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right; margin-right: 1%; margin-top: 1px;"%>
+      <p nhname="contentmsg"></p>
+      <div style="padding-top:5px;float:left;" nhname="toolbar_container"></div>
+      <%= submit_tag l(:button_leave_meassge), :name => nil , :class => "enterprise" , :style => "display: block; float: right;  margin-top: 5px;"%>
     <%else %>
       <div style="font-size: 14px;margin:10px;">
 	    <%= l(:label_user_login_tips) %>

app/views/words/_new_respond.html.erb

@@ -1,15 +1,19 @@
 <%= form_tag(words_create_reply_path, :remote => true) do %>
     <%= text_area_tag 'user_notes', "", :class => 'noline',
                       :style => "resize: none;", :rows => 4,
-                      :placeholder => l(:label_feedback_respond_content),
+                      :placeholder => l(:label_feedback_respond_content)#,
-                      :maxlength => 250 %>
+                      #:maxlength => 250
+    %>
+    <p nhname="contentmsg"></p>
 
     <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
     <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
     <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
     <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
+    <div class="fl" style="padding-top:5px;float:left;" nhname="toolbar_container"></div>
     <%= submit_tag l(:button_feedback_respond), :name => nil ,
                    :class => "enterprise",
                    :style => "float: right; margin-top: 1px; margin-right: 4px;margin-bottom: 5px;"%>
+    <input nhname="cancel_btn" type="button" style="display:none;"/>
 
 <% end %>

app/views/words/_new_respond_course.html.erb

@@ -1,9 +1,10 @@
 <%= form_tag(words_create_reply_path, :remote => true) do %>
     <%= text_area_tag 'user_notes', "", :class => 'w520 h50 mb5',
                       :style => "resize: none;overflow: hidden;",:rows => 4,
-                      :placeholder => l(:label_feedback_respond_content),
+                      :placeholder => l(:label_feedback_respond_content)#,
 
-                      :maxlength => 250 %>
+                      #:maxlength => 250
+    %>
     <p nhname="contentmsg"></p>
     <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
     <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>

app/views/words/_new_respond_project.html.erb

@@ -1,15 +1,18 @@
 <%= form_tag(words_create_reply_path, :remote => true) do %>
     <%= text_area_tag 'user_notes', "", :class => 'w520 h50 mb5',
                       :style => "resize: none;overflow: hidden;",:rows => 4,
-                      :placeholder => l(:label_feedback_respond_content),
+                      :placeholder => l(:label_feedback_respond_content)
-
+                      #,:maxlength => 250
-                      :maxlength => 250 %>
+    %>
+    <p nhname="contentmsg"></p>
     <%= hidden_field_tag 'reference_id', params[:reference_id], :value => journal.id %>
     <%= hidden_field_tag 'reference_user_id', params[:reference_user_id], :value => m_reply_id.user.id %>
     <%= hidden_field_tag 'reference_message_id', params[:reference_message_id], :value => m_reply_id.id %>
     <%= hidden_field_tag 'show_name',params[:show_name],:value => show_name.nil? ? true : show_name %>
 
+    <div class="fl" style="padding-top:5px;" nhname="toolbar_container"></div>
     <%= submit_tag l(:button_feedback_respond), :name => nil ,
                    :class => "reply_btn"%>
+    <input nhname="cancel_btn" type="button" style="display:none;"/>
 
 <% end %>

public/assets/kindeditor/kindeditor.js

@@ -5620,7 +5620,8 @@ _plugin('core', function(K) {
         afterUpload : function(data) {
             if (data.error === 0) {
                 var url = K.formatUrl(data.url, 'absolute');
-                self.exec('insertimage', url, 'image','','','1','left');
+                //self.exec('insertimage', url, 'image','','','1','left');
+				self.insertHtml('<img src="'+url+'"/>');
                 var asset_id  = data.asset_id;
                 if ( asset_id != "" && parent.document.getElementById('asset_id') != null ) {
                     parent.document.getElementById('asset_id').value += asset_id.toString();