From facd12640a16eaee73d4575f0445e1dfe935bc92 Mon Sep 17 00:00:00 2001 From: cxt Date: Mon, 21 Sep 2015 16:54:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E5=8A=A8=E6=80=81=E7=9A=84?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E4=B8=BA0=E6=97=B6=E4=B8=8D=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E2=80=9C=E5=9B=9E=E5=A4=8D(0)=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/users/_course_message.html.erb | 15 ++++++++------- app/views/users/_course_news.html.erb | 5 +++-- app/views/users/_project_issue.html.erb | 6 +++--- app/views/users/_project_message.html.erb | 15 ++++++++------- public/stylesheets/new_user.css | 1 + public/stylesheets/public.css | 1 + 6 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb index 702e2d6b4..250f385e5 100644 --- a/app/views/users/_course_message.html.erb +++ b/app/views/users/_course_message.html.erb @@ -45,15 +45,16 @@
+ <% count=0 %> + <% if activity.parent %> + <% count=activity.parent.children.count%> + <% else %> + <% count=activity.children.count%> + <% end %>
-
- <% count=0 %> +
+
回复( - <% if activity.parent %> - <% count=activity.parent.children.count%> - <% else %> - <% count=activity.children.count%> - <% end %> <%= count %> )
<%#=format_date(activity.updated_on)%>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb index 64080136f..456a3a7bd 100644 --- a/app/views/users/_course_news.html.erb +++ b/app/views/users/_course_news.html.erb @@ -24,9 +24,10 @@
+ <% count=activity.comments.count %>
-
- <% count=activity.comments.count %> +
+
回复（<%= count %>）
diff --git a/app/views/users/_project_issue.html.erb b/app/views/users/_project_issue.html.erb index ce7b6a884..8ea8804d5 100644 --- a/app/views/users/_project_issue.html.erb +++ b/app/views/users/_project_issue.html.erb @@ -63,10 +63,10 @@
+ <% count = activity.journals.count %>
- -
- <% count = activity.journals.count %> +
+
回复（<%= count %>）
<%#= format_date(activity.updated_on) %>
<% if count > 2 %> diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb index 2b64ceb9d..7d810c065 100644 --- a/app/views/users/_project_message.html.erb +++ b/app/views/users/_project_message.html.erb @@ -36,15 +36,16 @@
+ <% count = 0 %> + <% if activity.parent %> + <% count=activity.parent.children.count%> + <% else %> + <% count=activity.children.count%> + <% end %>
-
- <% count = 0 %> +
+
回复( - <% if activity.parent %> - <% count=activity.parent.children.count%> - <% else %> - <% count=activity.children.count%> - <% end %> <%=count %> )
<%#=format_date(activity.updated_on)%>
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 144589d5b..99260b458 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -568,6 +568,7 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;} .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;} .borderBottomNone {border-bottom:none !important;} +.topBorder {border-top: 1px solid #e4e4e4;} div.minHeight48{min-height: 48px;} .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:20px;} .homepagePostReplyBannerTime{width:85px; display:inline-block;} diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css index 4f44a8b60..43e77a36d 100644 --- a/public/stylesheets/public.css +++ b/public/stylesheets/public.css @@ -604,6 +604,7 @@ a.postTypeGrey:hover {color:#269ac9;} .homepagePostReply {width:720px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;} .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;} .borderBottomNone {border-bottom:none !important;} +.topBorder {border-top: 1px solid #e4e4e4;} .homepagePostReplyBannerCount{width:255px; display:inline-block; margin-left:20px;} .homepagePostReplyBannerTime{width:85px; display:inline-block;} .homepagePostReplyBannerMore{width:330px; display:inline-block; text-align:right;}