留言页面的样式修改

app/views/users/_jour_form.html.erb

@@ -8,8 +8,8 @@
   <%= 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,
+                   :height => 100,
+                   :minHeight=>100,
                    :input_html => { :id => 'jour_content',
                                     :class => 'talk_text fl',
                                     :maxlength => 5000 }%>

app/views/users/_user_activities.html.erb

@@ -111,7 +111,7 @@
                 <% case user_activity.act_type.to_s %>
                 <% when 'JournalsForMessage' %>
                     <% unless act.private == 1 && (!User.current || (User.current && act.jour_id != User.current.id && act.user_id != User.current.id)) %>
-                        <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_activity=>true} %>
+                        <%= render :partial => 'user_journalsformessage', :locals => {:activity => act,:user_activity_id =>user_activity.id,:is_activity=>1} %>
                     <% end %>
                 <% end %>
             <% end %>

app/views/users/_user_journalsformessage.html.erb

@@ -16,7 +16,7 @@
             <% end %>
         <% end %>
       </div>
-      <% if is_activity %>
+      <% if is_activity.to_i == 1 %>
           <div class="homepagePostTitle break_word list_style upload_img">
             <% if activity.parent %>
                 <%= link_to activity.parent.notes.html_safe, feedback_path(activity.jour, :host=> Setting.host_user), :class => "postGrey" %>

app/views/users/_user_jours_list.html.erb

@@ -22,7 +22,7 @@
                     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,:is_activity=>false} %>
+            <%= render :partial => 'user_journalsformessage', :locals => {:activity => jour,:user_activity_id =>jour.id,:is_activity=>0} %>
             <%#= render :partial => 'user_jours_new', :locals => {:jour => jour} %>
         <% end %>
     <%end%>

app/views/words/create_reply.js.erb

@@ -3,7 +3,7 @@
         <% if @reply_type == 'user' %>
             $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
         <% else %>
-            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
+            $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
         <% end %>
         init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity");
     <% else %>

db/schema.rb

@@ -1371,6 +1371,7 @@ ActiveRecord::Schema.define(:version => 20160122094829) do
     t.integer  "changeset_num",     :default => 0
     t.integer  "board_message_num", :default => 0
     t.integer  "board_num",         :default => 0
+    t.integer  "act_num",           :default => 0
     t.integer  "attach_num",        :default => 0
     t.datetime "commit_time"
   end