Merge branch 'cxt_course' into develop

app/views/issues/show.html.erb

@@ -36,7 +36,13 @@
       <div class="homepagePostReply">
         <div class="topBorder" style="display: <%= @issue.journals.count>0 ? 'none': '' %>"></div>
         <div class="homepagePostReplyBanner" >
-          <div class="homepagePostReplyBannerCount" >回复（<%= @issue.journals.count %>）</div>
+          <% count = @issue.journals.count %>
+          <div class="homepagePostReplyBannerCount" >回复
+            <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+            <span id="praise_count_<%=@issue.id %>">
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@issue, :user_activity_id=>@issue.id,:type=>"activity"}%>
+            </span>
+          </div>
           <div class="homepagePostReplyBannerTime"></div>
         </div>
         <div class="" id="reply_div_<%= @issue.id %>" >

app/views/layouts/base_courses.html.erb

@@ -131,10 +131,13 @@
       <%= render :partial => 'courses/course_activity_users', :locals => {:course => @course} %>
       <%# 课程英雄榜 %>
       <%= render :partial => 'courses/course_heroes', :locals => {:course => @course} %>
-      <div class="sy_class_leftbox mb15" >
+      <div class="sy_class_leftbox" >
         <h3 class="fontGrey7">班级推荐</h3>
         <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
       </div>
+      <%# 更新访问数,刷新的时候更新访问次数 %>
+      <%  update_visiti_count @course %>
+      <div class="fontGrey5 mt10 ml20">访问计数 <%= @course.visits.to_i %> （自2016年5月）</div>
     </div><!--sy_class_l end-->
     <div class="fl">
       <%= yield %>

app/views/layouts/new_base_user.html.erb

@@ -110,8 +110,10 @@
                 </div>
             </div>
         <% else %>
-            <a href="javascript:void(0)" class="user_leftinfo_img"><%=image_tag(url_to_avatar(@user),width:"74", height: "74")%></a>
+			<a href="javascript:void(0)" class="user_leftinfo_img" style="cursor: default">
-        <% end %>
+              <%=image_tag(url_to_avatar(@user),width:"74", height: "74", :id=>'nh_source_tx') %>
+            </a>
+	    <% end %>
         <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
             <span class="<%= @user.user_extensions.gender == 1 ? 'user_leftinfo_female' : 'user_leftinfo_male' %> "></span>
         <% end %>
@@ -214,6 +216,8 @@
         </ul>
       </div><!--sy_class_leftnav end-->
 
+      <%# 更新访问数,刷新的时候更新访问次数 %>
+      <%  update_visiti_count @user %>
       <div class="fontGrey5 mt10 ml20">访问计数 <%= @user.visits.to_i %> （自2016年5月）</div>
     </div>
     <div class="homepageRight">

public/stylesheets/css/common.css

@@ -398,7 +398,7 @@ a:hover.c_grey{ color:#333;}
 .fontGrey2 {color:#888888;}
 .fontGrey3 {color:#484848;}
 .fontGrey4{color:#999999;}
-.fontGrey5 {color:#a1a1a1;}
+.fontGrey5 {color:#ddd;}
 .fontGrey6 {color:#7a7a7a;}
 .fontGrey7 {color:#555;}
 .fontBlue {color:#3498db;}

public/stylesheets/css/structure.css

@@ -199,7 +199,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostBrief {width:720px; margin:0px auto; position:relative;}
 .homepagePostPortrait {float:left; width:50px;}
 .homepagePostDes {float:left; width:655px; margin-left:15px; overflow:hidden;}
-.homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px;}
+.homepagePostTo {font-size:14px; color:#484848; margin-bottom:5px; margin-right: 20px;}
 .homepagePostTitle {font-size:14px; color:#484848; margin-bottom:5px; font-weight:bold;}
 .homepagePostSubmitContainer {height:25px; margin-top: 8px; margin-bottom: 5px;}
 .homepagePostSubmit {font-size:14px; color:#888888; border:1px solid #dddddd; background-color:#eaeaea; float:left; margin-right:20px; padding:0px 10px;}