Merge branch 'cxt_course' into develop

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)

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|

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);

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',

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 %>

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 %>

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);