From d5e97c6131f9acc33eab7cf57ffc74514233788e Mon Sep 17 00:00:00 2001
From: sw <939547590@qq.com>
Date: Fri, 31 Jul 2015 15:25:01 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E7=95=99=E8=A8=80=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BAtop=5Fview=202=E3=80=81=E7=95=99=E8=A8=80?=
 =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=88=A0=E9=99=A4=E9=83=A8=E5=88=86=E7=95=99?=
 =?UTF-8?q?=E8=A8=80=E5=90=8E=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_jour_reply.html.erb | 68 ++++++++++++-----------
 app/views/users/user_newfeedback.html.erb | 14 ++++-
 2 files changed, 46 insertions(+), 36 deletions(-)

diff --git a/app/views/users/_user_jour_reply.html.erb b/app/views/users/_user_jour_reply.html.erb
index 8822fdc56..ee94cb35a 100644
--- a/app/views/users/_user_jour_reply.html.erb
+++ b/app/views/users/_user_jour_reply.html.erb
@@ -1,38 +1,40 @@
-  <% parent_jour = JournalsForMessage.where("id = #{reply.m_reply_id}").first %>
-  <div class="mes_box02" id = '<%= reply.id %>'>
-    <%= link_to image_tag(url_to_avatar(reply.user),:width => '32',:height => '32'), user_path(reply.user),:class => "users_pic_sub fl mr5" %>
-    <div class=" mes_box02_info fl">
-      <%= link_to "#{reply.user.login}&nbsp;".html_safe, user_path(reply.user),:class => 'course_name fl c_blue02 ', :target => "_blank"%>
-      <span class="fl c_grey">&nbsp;回复&nbsp;</span>
-      <%= link_to "#{parent_jour.user.login}&nbsp;:&nbsp;".html_safe, user_path(parent_jour.user),:class => 'course_name fl c_blue02 mr5 ', :target => "_blank"%>
-      <div class="cl">
-        <%= reply.notes.html_safe %>
+<% parent_jour = JournalsForMessage.where("id = #{reply.m_reply_id}").first %>
+<% if parent_jour%>
+    <div class="mes_box02" id = '<%= reply.id %>'>
+      <%= link_to image_tag(url_to_avatar(reply.user),:width => '32',:height => '32'), user_path(reply.user),:class => "users_pic_sub fl mr5" %>
+      <div class=" mes_box02_info fl">
+        <%= link_to "#{reply.user.login}&nbsp;".html_safe, user_path(reply.user),:class => 'course_name fl c_blue02 ', :target => "_blank"%>
+        <span class="fl c_grey">&nbsp;回复&nbsp;</span>
+        <%= link_to "#{parent_jour.user.login}&nbsp;:&nbsp;".html_safe, user_path(parent_jour.user),:class => 'course_name fl c_blue02 mr5 ', :target => "_blank"%>
+        <div class="cl">
+          <%= reply.notes.html_safe %>
+        </div>
       </div>
-    </div>
     <span class="c_grey fr">
       <%= time_tag(reply.created_on).html_safe%>
     </span>
-    <div class="fr cr">
-      <%= link_to l(:button_reply),'javascript:void(0);',:nhname=>"sub_reply_btn", :class => "ml5 c_purple" %>
-      <% if User.current.admin? || reply.user == User.current%>
-          <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
-                      :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "c_purple ml5", :title => l(:button_delete))  %>
-      <% end %>
-    </div>
-    <div class="cl"></div>
-    <div nhname='sub_div_form' class="mt10 ml40" style="display:none;">
-      <form action="<%= url_for(:controller => 'words', :action => 'create_reply') %>" data-remote="true" method="post">
-        <input id="reference_id" name="reference_id" type="hidden" value="<%= (reply.m_parent_id.nil? || reply.m_parent_id==0 ) ? reply.id : reply.m_parent_id %>">
-        <input id="reference_user_id" name="reference_user_id" type="hidden" value="<%= reply.user.id %>">
-        <input id="reference_message_id" name="reference_message_id" type="hidden" value="<%= reply.id %>">
-        <input id="show_name" name="show_name" type="hidden" value="true">
-        <textarea name='user_notes' style="display:none;"></textarea>
-        <p nhname='sub_contentmsg'></p>
-        <div nhname='sub_toolbar_container' style="float:left;padding-top:3px;"></div>
-        <a nhname="sub_cancel_btn" href="javascript:void(0);" class="grey_n_btn fr" style="margin-top:3px;">取消</a>
-        <a nhname="sub_submit_btn" href="javascript:void(0);" class="blue_n_btn fr mr5" style="margin-top:3px;">发布</a>
-      </form>
+      <div class="fr cr">
+        <%= link_to l(:button_reply),'javascript:void(0);',:nhname=>"sub_reply_btn", :class => "ml5 c_purple" %>
+        <% if User.current.admin? || reply.user == User.current%>
+            <%= link_to(l(:label_newfeedback_delete), {:controller => 'words', :action => 'destroy', :object_id => reply, :user_id => reply.user},
+                        :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "c_purple ml5", :title => l(:button_delete))  %>
+        <% end %>
+      </div>
       <div class="cl"></div>
-    </div>
-    <div class="cl"></div>
-  </div><!--mes_box02 end-->
\ No newline at end of file
+      <div nhname='sub_div_form' class="mt10 ml40" style="display:none;">
+        <form action="<%= url_for(:controller => 'words', :action => 'create_reply') %>" data-remote="true" method="post">
+          <input id="reference_id" name="reference_id" type="hidden" value="<%= (reply.m_parent_id.nil? || reply.m_parent_id==0 ) ? reply.id : reply.m_parent_id %>">
+          <input id="reference_user_id" name="reference_user_id" type="hidden" value="<%= reply.user.id %>">
+          <input id="reference_message_id" name="reference_message_id" type="hidden" value="<%= reply.id %>">
+          <input id="show_name" name="show_name" type="hidden" value="true">
+          <textarea name='user_notes' style="display:none;"></textarea>
+          <p nhname='sub_contentmsg'></p>
+          <div nhname='sub_toolbar_container' style="float:left;padding-top:3px;"></div>
+          <a nhname="sub_cancel_btn" href="javascript:void(0);" class="grey_n_btn fr" style="margin-top:3px;">取消</a>
+          <a nhname="sub_submit_btn" href="javascript:void(0);" class="blue_n_btn fr mr5" style="margin-top:3px;">发布</a>
+        </form>
+        <div class="cl"></div>
+      </div>
+      <div class="cl"></div>
+    </div><!--mes_box02 end-->
+<% end%>
\ No newline at end of file
diff --git a/app/views/users/user_newfeedback.html.erb b/app/views/users/user_newfeedback.html.erb
index 91c049f7a..a8107ce5f 100644
--- a/app/views/users/user_newfeedback.html.erb
+++ b/app/views/users/user_newfeedback.html.erb
@@ -1,8 +1,16 @@
+<div class="top_new">
+  <span class="<%= (@user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true)) ? 'top_new_bg' : 'top_newcourses_bg'%> fl"></span>
+  <% if @user.user_extensions.identity == 0 && @user.allowed_to?(:add_course, nil, :global => true) %>
+      <a href="<%= url_for(:controller => 'courses', :action => 'new',) %>" class="green_n_btn fr mt2" target="_blank">新建课程</a>
+  <% end %>
+  <div class="cl"></div>
+</div>
+
 <%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"user" %>
 <div id="RSide" class="fl">
-  <div class="users_r_top">
-    <h2 class="users_r_h2">用户留言</h2>
-  </div>
+  <!--<div class="users_r_top">-->
+    <!--<h2 class="users_r_h2">用户留言</h2>-->
+  <!--</div>-->
   <div class="message_box mb10">
     <div nhname='new_message' style="display:none;">
       <%= form_for('new_form',:url =>  leave_user_message_path(@user.id),:method => "post") do |f|%>