From 313bc8573d344bd029349e83ee2ceb0784d25f24 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 29 Aug 2016 14:01:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E8=AE=BF=E9=97=AE?= =?UTF-8?q?=E8=AE=A1=E6=95=B0=E5=A4=B1=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 3f7cc47b4..e4221e8ba 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -214,6 +214,8 @@ + <%# 更新访问数,刷新的时候更新访问次数 %> + <% update_visiti_count @user %>
访问计数 <%= @user.visits.to_i %> （自2016年5月）
From 95ec0476532ed7f4032974aa012ff745a6e28b79 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 29 Aug 2016 14:12:42 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E8=BF=87=E9=95=BF=E6=97=B6=EF=BC=8C=E5=8A=A8=E6=80=81=E4=B8=AD?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E6=98=BE=E7=A4=BA=E4=B8=8E=E5=8A=A8=E6=80=81?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=9B=BE=E6=A0=87=E6=8C=89=E9=92=AE=E9=87=8D?= =?UTF-8?q?=E5=8F=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css/structure.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css index c9a4059e0..e2bc16913 100644 --- a/public/stylesheets/css/structure.css +++ b/public/stylesheets/css/structure.css @@ -201,7 +201,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;} From 0b0a23f270d809e4e10b56399d7fb78df54c110d Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 29 Aug 2016 14:26:25 +0800 Subject: [PATCH 3/7] =?UTF-8?q?issue=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E7=9A=84=E7=82=B9=E8=B5=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/issues/show.html.erb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 13642c0ca..540e9d4ca 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -36,7 +36,13 @@
-
回复（<%= @issue.journals.count %>）
+ <% count = @issue.journals.count %> +
回复 + <%= count>0 ? "（#{count}）" : "" %>▪ + + <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@issue, :user_activity_id=>@issue.id,:type=>"activity"}%> + +
From 547fb8a1a5ac11eca427e509eca2ec083f85143c Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 29 Aug 2016 14:41:01 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E6=9C=AA=E7=99=BB=E5=BD=95=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=AE=BF=E9=97=AE=E4=B8=AA=E4=BA=BA=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E6=97=B6=E7=9A=84=E5=A4=B4=E5=83=8F=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index e4221e8ba..f6ba11983 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -110,7 +110,9 @@
<% else %> - + + <%=image_tag(url_to_avatar(@user),width:"74", height: "74", :id=>'nh_source_tx') %> + <% end %> <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %> From cbcf414e63484942530d7cf1f411c179240342c0 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 29 Aug 2016 14:44:33 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=B8=BB=E9=A1=B5?= =?UTF-8?q?=E7=9A=84=E8=AE=BF=E9=97=AE=E8=AE=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/base_courses.html.erb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb index b6082fb82..de4d2bbb3 100644 --- a/app/views/layouts/base_courses.html.erb +++ b/app/views/layouts/base_courses.html.erb @@ -130,10 +130,13 @@ <%= render :partial => 'courses/course_activity_users', :locals => {:course => @course} %> <%# 课程英雄榜 %> <%= render :partial => 'courses/course_heroes', :locals => {:course => @course} %> -
+

班级推荐

<%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
+ <%# 更新访问数,刷新的时候更新访问次数 %> + <% update_visiti_count @course %> +
访问计数 <%= @course.visits.to_i %> （自2016年5月）
<%= yield %> From 1e169985a438fb4a3a31bef1e78340962a90e296 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 29 Aug 2016 15:23:35 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E8=AE=BF=E9=97=AE=E8=AE=A1=E6=95=B0?= =?UTF-8?q?=E7=9A=84=E9=A2=9C=E8=89=B2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/css/common.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css index f704a3f0d..11c1c963f 100644 --- a/public/stylesheets/css/common.css +++ b/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;} From 15ba4a6136b64983078136b3823b5763031dc384 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 29 Aug 2016 15:38:58 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E5=A4=B4=E5=83=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/layouts/new_base_user.html.erb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/views/layouts/new_base_user.html.erb b/app/views/layouts/new_base_user.html.erb index 6ef006d8f..e60593387 100644 --- a/app/views/layouts/new_base_user.html.erb +++ b/app/views/layouts/new_base_user.html.erb @@ -112,7 +112,8 @@ <% else %> <%=image_tag(url_to_avatar(@user),width:"74", height: "74", :id=>'nh_source_tx') %> - <% end %> + + <% end %> <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %> <% end %>