Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/courses/_history.html.erb

@@ -5,7 +5,7 @@
               <div class="ping_dispic">
                   <%= link_to image_tag(url_to_avatar(journal.user),:width => '46',:height => '46'), user_path(journal.user) %>
               </div>
-              <div class="ping_discon" style="width: 610px;">
+              <div class="ping_discon upload_img" style="width: 610px;">
                 <div class="ping_distop">
                   <!-- <a style=" font-weight:bold; color:#15bccf; margin-right:30px; background:none;" target="_blank" href="#">gugu01</a> -->
                   <span>
@@ -15,7 +15,7 @@
                     <%= format_time(journal.created_on) %>
                   </span>
                   <div class="cl"></div>
-                  <p class="upload_img">
+                  <p>
                     <%= journal.notes.html_safe %>
                   </p>
                 </div>

app/views/news/_course_show.html.erb

@@ -68,13 +68,13 @@
       <div class="ping_C mb10">
         <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(comment.author),:width => 42,:height => 42), user_path(comment.author)%></div>
         <div class="ping_discon">
-          <div class="ping_distop">
+          <div class="ping_distop upload_img">
             <%= link_to_user_header(comment.author,false,:class => 'c_blue fb fl mb10 ') if comment.respond_to?(:author) %>
             <span class="c_grey fr">
                 <%= format_time(comment.created_on) %>
             </span>
             <div class="cl"></div>
-            <p class="upload_img"><%= comment.comments.html_safe %></p>
+            <p><%= comment.comments.html_safe %></p>
             </div>
             <div class="ping_disfoot">
               <%= link_to_if_authorized_course image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},