From 55f8484654ccf9bdf9eb337d2cc0cbf752900f8a Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 29 Jul 2015 16:54:10 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=95=99=E8=A8=80=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4JS=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_project_jours.html.erb | 272 ++++++++++-----------
 public/javascripts/project.js              |   5 +
 2 files changed, 141 insertions(+), 136 deletions(-)

diff --git a/app/views/projects/_project_jours.html.erb b/app/views/projects/_project_jours.html.erb
index baee72475..919abfcbf 100644
--- a/app/views/projects/_project_jours.html.erb
+++ b/app/views/projects/_project_jours.html.erb
@@ -1,15 +1,15 @@
 <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.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;}
+    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;}
 </style>
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <div class="msg_box" id='leave-message' nhname='new_message' style="height:auto;">
@@ -22,18 +22,18 @@
         <hr/>
       </div>
   <% else %>
-
-        <%= 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)}",:nhname=>'new_message_textarea' %>
-            <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 %>
+      <%= form_for('new_form', :method => :post, :html => {:id => 'project_feedback_form', :multipart => true},
+                   :url => {:controller => 'words', :action => 'leave_project_message'}) do |f|%>
+          <%= f.text_area 'project_message', :rows => 3, :cols => 65,
+                          :placeholder => "#{l(:label_welcome_my_respond)}",:nhname=>'new_message_textarea' %>
+          <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" %>
+          <%= link_to l(:button_leave_meassge), "javascript:void(0)", :onclick => 'submitProjectFeedback();', :onmouseover => 'submitFocus(this);', :class => 'blue_btn fr mt10 mb10' %>
+      <% end %>
 
   <% end %>
-    <div class="cl"></div>
+  <div class="cl"></div>
 </div>
 <div id="history">
   <%= render :partial => 'history',:locals => { :journals => @jour, :state => false} %>
@@ -42,47 +42,47 @@
 
 <div style="display:none;"><a href="#" id="nhjump"></a></div>
 <script type="text/javascript">
-  $(function(){
+    $(function(){
 
-    function init_editor(params){
-      params.textarea.removeAttr('placeholder');
-      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);
+        function init_editor(params){
+            params.textarea.removeAttr('placeholder');
+            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;
         }
-      }).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();
+        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;
         }
-      }
-      return result;
-    }
-    function init_form(params){
+        function init_form(params){
 //      var flag = false;
 //      if(params.form.attr('data-remote') != undefined ){
 //        flag = true
@@ -108,93 +108,93 @@
 //        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;
-          }
+            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()算了
+                    //$(this).trigger('submit');  //这个虽然能提交  但是他是个死循环
+                    //$(this)[0].submit();        //用这个form的data-remote='true'没效果了
+                    //肿么破阿  我滴个神   实在不行就用$.ajax()算了
+                }
+                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 = {};
-        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);
-          });
+        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();
         }
-        params.cancel_btn.click();
-        toggleAndSettingWordsVal(params.div_form, params.textarea);
-        setTimeout(function(){
-          if(!params.div_form.is(':hidden')){
-            params.textarea.show();
-            params.textarea.focus();
-            params.textarea.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();
+                toggleAndSettingWordsVal(params.div_form, params.textarea);
+                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);
-      });
+                    }
+                },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);
+            $("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);
-        }
-      });
+                    params.textarea.data('init',1);
+                }
+            });
+        });
     });
-  });
 </script>
diff --git a/public/javascripts/project.js b/public/javascripts/project.js
index 98c148372..c7a615ba3 100644
--- a/public/javascripts/project.js
+++ b/public/javascripts/project.js
@@ -491,3 +491,8 @@ function judgeprojectname(){
         }
     });
 }
+
+//用户反馈
+function submitProjectFeedback() {
+    $("#project_feedback_form").submit();
+}
\ No newline at end of file