From 1833f15e19772f5e1d750435551ad335cfabcdb3 Mon Sep 17 00:00:00 2001
From: Tim <txz124@sina.com>
Date: Fri, 13 May 2016 14:23:51 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=BA=93=E5=AF=BC=E5=85=A5=E8=B5=84=E6=BA=90=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../users/_user_import_resource_list.html.erb | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/app/views/users/_user_import_resource_list.html.erb b/app/views/users/_user_import_resource_list.html.erb
index f48e6c8fb..38770421d 100644
--- a/app/views/users/_user_import_resource_list.html.erb
+++ b/app/views/users/_user_import_resource_list.html.erb
@@ -1,19 +1,19 @@
-<%= form_tag( url_for({:controller => 'users', :action => 'import_into_container',
-                     :mul_id => @resource_id,
-                     :mul_type => @resource_type}),
-                     :method => 'post',  :id => 'resource_import_container_form') do %>
-    <% @attachments.each do |attach| %>
-        <ul class="subjectRow">
-          <li class="subjectName fl hidden">
-            <label>
-              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
-              <span><%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%></span>
-            </label>
-          </li>
-          <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
-          <li class="subjectCount fl hidden"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li>
-          <li class="subjectPublisher fl"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
-          <li class="fl subjectDate"><%= format_date(attach.created_on) %></li>
-        </ul>
-    <% end %>
+<%= form_tag( url_for({:controller => 'users', :action => 'import_into_container',
+                     :mul_id => @resource_id,
+                     :mul_type => @resource_type}),
+                     :method => 'post',  :id => 'resource_import_container_form') do %>
+    <% @attachments.each do |attach| %>
+        <ul class="subjectRow">
+          <li class="subjectName fl hidden">
+            <label>
+              <input name="checkbox1[]" type="checkbox" data-has-history="<%= attach.attachment_histories.count == 0 ? 'N' : 'Y' %>" data-deleteble="<%= User.current.id ==attach.author_id ? 'Y' : 'N'  %>" onclick="checkAllBox($(this));" value="<%= attach.id%>" class="mr5" style="vertical-align:middle;"  />
+              <span><%= link_to truncate(attach.filename, :length => 30), download_named_attachment_path(attach.id, attach.filename), :title => attach.filename%></span>
+            </label>
+          </li>
+          <li class="subjectType fl"><%= get_resource_type(attach.container_type)%></li>
+          <li class="subjectCount fl hidden"><%= (number_to_human_size(attach.filesize)).gsub("ytes", "") %></li>
+          <li class="subjectPublisher fl hidden"><%=User.find(attach.author_id).realname.blank? ? User.find(attach.author_id).nickname : User.find(attach.author_id).realname %></li>
+          <li class="fl subjectDate"><%= format_date(attach.created_on) %></li>
+        </ul>
+    <% end %>
 <% end %>
\ No newline at end of file

From 402976cf4064ca50d09b0fa403248e98d7dc32e8 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 13 May 2016 14:33:06 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E7=9A=84=E5=9B=9E=E5=A4=8D=E9=98=B2=E6=AD=A2=E5=A4=9A=E6=AC=A1?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/courses/_courses_jours.html.erb    | 9 +++++----
 app/views/words/_new_respond_course.html.erb | 3 ++-
 public/javascripts/init_KindEditor.js        | 9 +++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/app/views/courses/_courses_jours.html.erb b/app/views/courses/_courses_jours.html.erb
index c7e4a7428..4a9b07ec7 100644
--- a/app/views/courses/_courses_jours.html.erb
+++ b/app/views/courses/_courses_jours.html.erb
@@ -36,7 +36,7 @@
             <textarea placeholder="有问题或有建议，请直接给我留言吧！" nhname='new_message_textarea_' name="new_form[course_message]"></textarea>
             <p nhname='contentmsg_'></p>
             <a id="new_message_cancel_btn_" href="javascript:void(0)" class="grey_btn fr mt10">取消</a>
-            <a href="javascript:void(0);" class="blue_btn fr ml10 mt10" id="submit_feedback_course" >留言</a>
+            <a href="javascript:void(0);" class="blue_btn fr ml10 mt10" id="new_message_submit_btn_" >留言</a>
         <% end %>
       </div>
   <% end %>
@@ -55,9 +55,6 @@
 <script type="text/javascript">
 
     $(function(){
-        $("#submit_feedback_course").one('click',function() {
-            $("#course_feedback_new").submit();
-        });
         KindEditor.ready(function(K){
             $("a[nhname='reply_btn']").live('click',function(){
                 var params = {};
@@ -68,6 +65,7 @@
                 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.submit_btn = $("input[nhname='submit_btn']",params.div_form);
                 params.cancel_btn = $("input[nhname='cancel_btn']",params.div_form);
                 params.height = 55;
                 if(params.textarea.data('init') == undefined){
@@ -76,6 +74,9 @@
                     params.cancel_btn.click(function(){
                         nh_reset_form(params);
                     });
+                    params.submit_btn.one('click', function () {
+                        params.form.submit();
+                    });
                 }
                 params.cancel_btn.click();
                 toggleAndSettingWordsVal(params.div_form, params.textarea);
diff --git a/app/views/words/_new_respond_course.html.erb b/app/views/words/_new_respond_course.html.erb
index 99c119a0c..88581b3bf 100644
--- a/app/views/words/_new_respond_course.html.erb
+++ b/app/views/words/_new_respond_course.html.erb
@@ -12,7 +12,8 @@
     <%= 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 ,
+    <input nhname="submit_btn" type="button" class="reply_btn" value="<%=l(:button_feedback_respond) %>"/>
+    <%#= submit_tag l(:button_feedback_respond), :name => nil ,
                    :class => "reply_btn"%>
     <input nhname="cancel_btn" type="button" style="display:none;"/>
 <% end %>
\ No newline at end of file
diff --git a/public/javascripts/init_KindEditor.js b/public/javascripts/init_KindEditor.js
index f9b94e2d3..9d47778b5 100644
--- a/public/javascripts/init_KindEditor.js
+++ b/public/javascripts/init_KindEditor.js
@@ -49,6 +49,9 @@ function nh_check_field(params){
             if(params.content.isEmpty()){
                 params.contentmsg.html('内容不能为空');
                 params.contentmsg.css({color:'#ff0000'});
+                params.submit_btn.one('click', function(){
+                    params.form.submit();
+                });
             }else{
                 params.contentmsg.html('填写正确');
                 params.contentmsg.css({color:'#008000'});
@@ -68,7 +71,9 @@ function init_form(params){
             issubmit:true,
             content:params.editor,
             contentmsg:params.contentmsg,
-            textarea:params.textarea
+            textarea:params.textarea,
+            submit_btn:params.submit_btn,
+            form:params.form
         });
         if(is_checked){
             if(flag){
@@ -115,7 +120,7 @@ function init_KindEditor_data(id){
                 params.cancel_btn.click(function () {
                     nh_reset_form(params);
                 });
-                params.submit_btn.click(function () {
+                params.submit_btn.one('click', function () {
                     params.form.submit();
                 });
                 params.textarea.data('init', 1);

From 89749b853bffe19d2af6f2df3764b34bd394485f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 13 May 2016 14:43:22 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E5=B8=96=E5=AD=90api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/message.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/api/mobile/entities/message.rb b/app/api/mobile/entities/message.rb
index 912b07e62..051c92886 100644
--- a/app/api/mobile/entities/message.rb
+++ b/app/api/mobile/entities/message.rb
@@ -51,6 +51,7 @@ module Mobile
       message_expose :replies_count
       message_expose :praise_count
       message_expose :created_on
+      message_expose :locked
       message_expose :id
       message_expose :lasted_comment
       expose :message_children,using:Mobile::Entities::Message do |c,opt|

From 22523d25b89c890ee14e03c76b23cb1c10b297eb Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 13 May 2016 14:52:38 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E5=8F=91=E5=B8=96?=
 =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=A4=9A=E6=AC=A1=E6=8F=90=E4=BA=A4=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/forums/show.html.erb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb
index 2b3772734..61ffb8b10 100644
--- a/app/views/forums/show.html.erb
+++ b/app/views/forums/show.html.erb
@@ -109,11 +109,13 @@
         <% end %>
     });
 
+    var first_click = true;
     function check_and_submit(){
         if(!check_memo_name()){
             return;
         }
-        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() ){
+        if($("textarea[name='memo[subject]']").val().trim() != "" && !memo_content.isEmpty() && first_click){
+            first_click = false;
             memo_content.sync();
             $.ajax({
                 url:'/forums/'+'<%= @forum.id.to_s%>'+'/memos',

From 3e340b6ef9dea1aec707004573a88c2d38454dcd Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Fri, 13 May 2016 15:01:36 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E5=8D=9A=E5=AE=A2=E5=BE=AE=E4=BF=A1api?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/mobile/entities/blog_comment.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/api/mobile/entities/blog_comment.rb b/app/api/mobile/entities/blog_comment.rb
index b11194b30..67904d11e 100644
--- a/app/api/mobile/entities/blog_comment.rb
+++ b/app/api/mobile/entities/blog_comment.rb
@@ -47,6 +47,7 @@ module Mobile
       blog_comment_expose :created_at
       blog_comment_expose :lasted_comment
       blog_comment_expose :id
+      blog_comment_expose :locked
       blog_comment_expose :praise_count
       expose :blog_comment_children, using:Mobile::Entities::BlogComment do |c,opt|
         if c.is_a? (::BlogComment)