From 38a24e8fe4b95061a35f492a95e1b01644f12bde Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Thu, 24 Sep 2015 12:17:14 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BA=E5=9D=9B=E6=B6=88=E6=81=AF=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/show.html.erb | 114 +++++++++++++++----------------- public/stylesheets/new_user.css | 1 + 2 files changed, 53 insertions(+), 62 deletions(-) diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 57b6875e5..81758ff97 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -1,4 +1,4 @@ -<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_KindEditor","forum" %> +<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg',"init_activity_KindEditor","forum" %>
@@ -53,75 +71,47 @@
-
- <%= form_for(@memo_new, url: forum_memos_path, :html => {:multipart => true}) do |f|%> - <%= f.hidden_field :subject, :required => true, value: @memo.subject %> - <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %> - <%= f.hidden_field :parent_id, :required => true, value: @memo.id %> - -

-
- 取消 - 留言 - <% end %> -
-
- <% @replies.each do |reply| %> -
-
- - <%= link_to image_tag(url_to_avatar(reply.author), :width => 45,:height => 45), user_path(reply.author) %> +
+
回复（<%=@reply_count %>）
+
+
+ 点击展开更多回复
-
-
<%= reply.author.name%> - <% if reply.parent && reply.parent.id != @memo.id%> - 回复<%= reply.parent.author.name%> - <% end %> - - <%= format_date(reply.created_at)%> - - <%= link_to( - l(:button_delete), - {:action => 'destroy', :id => reply}, - :method => :delete, - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete),:class=>'replyGrey fr ml10' - ) if reply.destroyable_by?(User.current) %> - 回复
+
+
+ <% @replies.each_with_index do |reply,i| %> +
+
+ <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %> +
+
+
<%= reply.author.name%><%= format_date(reply.created_at) %>
<%= reply.content.html_safe%>
- +
+
+ <% end %> +
+
+
+
<%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(User.current), :alt => "用户头像" %>
+
+
+ <%= form_for('memo',:url=>forum_memos_path,:method => "post") do |f|%> <%= f.hidden_field :subject, :required => true, value: @memo.subject %> <%= f.hidden_field :forum_id, :required => true, value: @memo.forum_id %> <%= f.hidden_field :parent_id, :required => true, value: @memo.id %> <%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %> - -

-
- 取消 - 发布 - <% end %> -
+ +
+ +
+

+ <% end%>
- <% end %> - - - - - - - - - - -
-
    - <%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false,:flag=>true %> -
\ No newline at end of file diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index 859a5db27..b2330b18d 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -776,6 +776,7 @@ a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repe .postEdit {background:url(images/post_image_list.png) 0px -94px no-repeat; width:18px; height:18px; display:block; float:left;} .postDelete {background:url(images/post_image_list.png) -42px -93px no-repeat; width:18px; height:18px; display:block; float:right;} .pageBanner {width:968px; margin:0px auto; border:1px solid #dddddd; background-color: #FFF; padding: 10px 15px; float:left;} +.homepagePostReplyInput {width:543px; height:33px; max-width:543px; max-height:33px; border:1px solid #d9d9d9; outline:none;} /*底部*/ #Footer{background-color:#ffffff; padding-bottom:15px; color:#666666;} /*margin-bottom:10px;*/ .footerAboutContainer {width:auto; border-bottom:1px solid #efefef;}