用户个人留言页面的改版

app/controllers/users_controller.rb

@@ -746,14 +746,34 @@ class UsersController < ApplicationController
       end
     end
     # end
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    if params[:type].present?
+      case params[:type]
+        when "public"
+          jours = @user.journals_for_messages.where('m_parent_id IS NULL and private = 0').order('created_on DESC')
+          @jour_count = jours.count
+          @jour = jours.limit(10).offset(@page * 10)
+        when "private"
+          jours = @user.journals_for_messages.where('m_parent_id IS NULL and private = 1').order('created_on DESC')
+          @jour_count = jours.count
+          @jour = jours.limit(10).offset(@page * 10)
+        else
           jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+          @jour_count = jours.count
+          @jour = jours.limit(10).offset(@page * 10)
+      end
+    else
+      jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+      @jour_count = jours.count
+      @jour = jours.limit(10).offset(@page * 10)
+    end
+    @type = params[:type]
     if User.current == @user
       jours.update_all(:is_readed => true, :status => false)
       jours.each do |journal|
         fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
       end
     end
-    @jour = paginateHelper jours,10
     @state = false
     render :layout=>'new_base_user'
   end

app/controllers/words_controller.rb

@@ -225,11 +225,11 @@ class WordsController < ApplicationController
   def leave_user_message
     if User.current.logged?
       @user = User.find(params[:id])
-      if params[:new_form][:user_message].size>0 && User.current.logged? && @user
+      if params[:new_form][:content].size>0 && User.current.logged? && @user
         if params[:private] && params[:private] == '1'
-          @user.journals_for_messages << JournalsForMessage.new(:user_id => User.current.id, :notes => params[:new_form][:user_message], :reply_id => 0, :status => true, :is_readed => false, :private => 1)
+          @user.journals_for_messages << JournalsForMessage.new(:user_id => User.current.id, :notes => params[:new_form][:content], :reply_id => 0, :status => true, :is_readed => false, :private => 1)
         else
-          @user.add_jour(User.current, params[:new_form][:user_message])
+          @user.add_jour(User.current, params[:new_form][:content])
         end
       end
       redirect_to feedback_path(@user)

app/views/users/_jour_form.html.erb

@@ -0,0 +1,19 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
+<%= error_messages_for 'message' %>
+<li>
+  <%= text_area :quote,:quote,:style => 'display:none' %>
+  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+  <%= f.kindeditor :content, :editor_id => 'jour_content_editor',
+                   :width => '99.7%',
+                   :height => 40,
+                   :minHeight=>40,
+                   :input_html => { :id => 'jour_content',
+                                    :class => 'talk_text fl',
+                                    :maxlength => 5000 }%>
+  <div class="cl"></div>
+  <p id="jour_content_span"></p>
+</li>
+<div class="cl"></div>

app/views/users/_user_jours_list.html.erb

@@ -0,0 +1,32 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: true) %>
+    <%#= javascript_include_tag "init_KindEditor","user" %>
+<% end %>
+<style type="text/css">
+    /*回复框*/
+    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
+    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-outline {border: none;}
+    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
+    .homepagePostReplyInputContainer .ke-container {float: left;}
+</style>
+<%if jours %>
+    <% jours.each do |jour|%>
+        <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id)) %>
+            <script type="text/javascript">
+                $(function(){
+                    init_activity_KindEditor_data(<%= jour.id%>, null, "87%", "<%=jour.class.to_s%>");
+                });
+            </script>
+            <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id} %>
+            <%#= render :partial => 'user_jours_new', :locals => {:jour => jour} %>
+        <% end %>
+    <%end%>
+<% end%>
+<% if (jours.count + page * 10) < count %>
+    <%= link_to "点击展开更多",feedback_path(@user.id, :type => type, :page => page),:id => "show_more_jours",:remote => "true",:class => "loadMore mt10 f_grey"%>
+<% end %>

app/views/users/user_newfeedback.html.erb

@@ -1,68 +1,40 @@
-<%= content_for(:header_tags) do %>
+<div>
-    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
-    <%= javascript_include_tag "init_KindEditor","user" %>
-<% end %>
-
-<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;}
-    /*.ke-container{height: 80px !important;}*/
-</style>
-<div >
   <div class="homepageRightBanner mb10">
-      <div class="NewsBannerName">留言</div>
+    <div class="NewsBannerName pr"><span id="mesLabel">留言</span></div>
+    <ul class="resourcesSelect">
+      <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+        <ul class="mesType">
+          <li><%= link_to "全部", {:controller => "users", :action => "user_newfeedback", :type => nil}, :class =>"resourcesTypeAll resourcesGrey"%></li>
+          <li><%= link_to "留言", {:controller => "users", :action => "user_newfeedback", :type => "public"}, :class => "mesIcon resourcesGrey"%></li>
+          <li><%= link_to "私信", {:controller => "users", :action => "user_newfeedback", :type => "private"}, :class => "personalIcon resourcesGrey"%></li>
+        </ul>
+      </li>
+    </ul>
   </div>
-
   <div class="cl"></div>
 
-  <div class="message_box mb10" id="users_setting"  style="min-height:192px;">
+  <div id="messageContent">
-    <div nhname='new_message' style="display:none;">
+    <div class="resources"><%= link_to image_tag(url_to_avatar(User.current),:class=>"fl mr10", :width => "50", :height => "50"),  :alt => "用户头像" %>
+      <div class="fl" style="width:658px;">
         <%= form_for('new_form',:url =>  leave_user_message_path(@user.id), :html =>{:id => "user_feedback_new"}, :method => "post") do |f|%>
-          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea' name="new_form[user_message]"></textarea>
+            <%=render :partial => "jour_form", :locals => {:f => f} %>
-          <p nhname='contentmsg'></p>
             <input id="private_flag" name="private" type="hidden" value="0"/>
-          <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:6px;">取消</a>-->
             <a href="javascript:void(0);" class="blue_n_btn fr" id="submit_feedback_user" style="margin-top:6px;" >留言</a>
-          <a href="javascript:void(0);" class="greyBtn2 postReplySubmit mt5 mr15" id="private_submit_feedback_user">私信</a> </div>
+            <a href="javascript:void(0);" class="greyBtn2 postReplySubmit mt5 mr15" id="private_submit_feedback_user">私信</a>
-      <% end%>
-    </div>
-    <div class="cl"></div>
-
-    <div class="message_list_box " id="user_jour_list" style="padding: <%= @jour && @jour.count > 0 ? '10' : '0'%>px;">
-      <%if @jour%>
-          <% @jour.each do |jour|%>
-              <% unless jour.private == 1 && (!User.current || (User.current && jour.jour_id != User.current.id && jour.user_id != User.current.id)) %>
-                <%= render :partial => 'user_jours_new', :locals => {:jour => jour} %>
         <% end %>
-          <%end%>
-      <% end%>
-
-      <ul class="wlist" style=" border:none;">
-        <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
-      </ul>
-      <div class="cl"></div>
       </div>
+    </div>
+    <%=render :partial => "users/user_jours_list", :locals => {:jours =>@jour, :page => 0, :type => @type, :count => @jour_count} %>
     <div class="cl"></div>
   </div><!--message_box end-->
 </div>
-
 <script type="text/javascript">
     $(function(){
         $("#submit_feedback_user").one('click',function() {
-            $("#private_flag").val("0");
+            jour_submit();
-            $("#submit_feedback_user").submit();
         });
         $("#private_submit_feedback_user").one('click',function() {
-            $("#private_flag").val("1");
+            private_jour_submit();
-            $("#submit_feedback_user").submit();
         });
     });
-
 </script>

app/views/users/user_newfeedback.js.erb

@@ -0,0 +1 @@
+$("#show_more_jours").replaceWith("<%= escape_javascript( render :partial =>  'users/user_jours_list',:locals => {:jours => @jour, :page => @page,:type => @type, :count => @jour_count} )%>");

public/javascripts/new_user.js

@@ -55,6 +55,43 @@ function show_more_project(url){
     );
 }
 
+//个人留言
+function jour_submit(){
+    if(jourReplyVerify()){
+        $("#private_flag").val("0");
+        jour_content_editor.sync();//提交内容之前要sync，不然服务器端取不到值
+        $("#user_feedback_new").submit();
+    }
+}
+
+function private_jour_submit(){
+    if(jourReplyVerify()){
+        $("#private_flag").val("1");
+        jour_content_editor.sync();//提交内容之前要sync，不然服务器端取不到值
+        $("#user_feedback_new").submit();
+    }
+}
+
+function jourReplyVerify() {
+    var content = jour_content_editor.html();//$.trim($("#message_content").val());
+    if (jour_content_editor.isEmpty()) {
+        $("#jour_content_span").text("回复不能为空");
+        $("#jour_content_span").css('color', '#ff0000');
+        $("#submit_feedback_user").one('click',function() {
+            jour_submit();
+        });
+        $("#private_submit_feedback_user").one('click',function() {
+            private_jour_submit();
+        });
+        return  false;
+    }
+    else {
+        $("#jour_content_span").text("填写正确");
+        $("#jour_content_span").css('color', '#008000');
+        return true;
+    }
+}
+
 //老师提交 新建/修改 作业
 function submit_homework(id){
     if(!regex_homework_name()){

public/stylesheets/share.css

@@ -35,7 +35,7 @@ ul.subNavArrow:hover li ul {display:block;}
 a.mesIcon {background:url(../images/mes_icon.png) -5px -73px no-repeat; padding-left:23px;}
 a.personalIcon {background:url(../images/mes_icon.png) -6px -16px no-repeat; padding-left:23px;}
 .mesType {background-color:#ffffff; float:left; list-style:none; position:absolute; border:1px solid #eaeaea; border-radius:5px; top:15px; padding:10px 15px; left:-50px; font-size:12px; color:#888888; display:none; line-height:2; z-index:999; white-space:nowrap;}
-a.greyBtn2 {float:right; text-align:center; font-size:12px; color:#ffffff; background-color:#cecece; padding:3px 10px;}
+a.greyBtn2 {float:right; text-align:center; font-size:12px; color:#ffffff; background-color:#aaaaaa; padding:3px 10px;}
 .PMTag {padding:0px 5px; background-color:#555555; border-radius:3px; color:#ffffff;}
 .upload_con h2{ display:block; background:#eaeaea; font-size:14px; color:#343333; height:31px; width: auto;  margin-top:25px; padding-left:20px; padding-top:5px;}
 .upload_box{ width:430px; margin:15px auto;}