From c231f3bd35b85ffdbe7db2267d51f65815f59aca Mon Sep 17 00:00:00 2001 From: Wen Date: Thu, 23 Jan 2014 15:13:38 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=92=8C=E8=AF=BE=E7=A8=8B?= =?UTF-8?q?=E7=9A=84=E8=AE=A8=E8=AE=BA=E5=8C=BA=E7=95=8C=E9=9D=A2=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E5=BC=95=E7=94=A8=E3=80=81=E7=BC=96=E8=BE=91=E3=80=81?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=9D=87=E6=94=B9=E4=B8=BA=E6=96=87=E5=AD=97?= =?UTF-8?q?=EF=BC=8C=E4=B8=94=E6=94=BE=E7=BD=AE=E5=9C=A8=E6=A5=BC=E5=B1=82?= =?UTF-8?q?=E6=95=B0=E6=97=81=E8=BE=B9=EF=BC=9B=20=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E8=B7=9D=E7=A6=BB=E9=93=B8=E9=93=81=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E4=BA=86=E5=9B=9B=E8=A1=8C=E7=9A=84=E8=B7=9D=E7=A6=BB?= =?UTF-8?q?=EF=BC=9B=20=E5=8F=91=E8=A1=A8=E4=BA=BA=E5=8F=8A=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E4=BD=8D=E7=BD=AE=E6=9B=B4=E6=94=B9=E4=B8=BA=E4=B8=BB?= =?UTF-8?q?=E8=B4=B4=E5=B7=A6=E4=B8=8B=E8=A7=92=EF=BC=8C=E5=8F=B3=E4=B8=8B?= =?UTF-8?q?=E8=A7=92=E6=94=B9=E4=B8=BA=E2=80=9C=E5=9B=9E=E5=A4=8D=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/messages/show.html.erb | 282 ++++++++++++++++------------- public/stylesheets/application.css | 2 +- 2 files changed, 157 insertions(+), 127 deletions(-) diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index fae3c4c38..51ed6a884 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -1,151 +1,181 @@
-
- <%= watcher_link(@topic, User.current) %> - <%= link_to( - l(:button_quote), - {:action => 'quote', :id => @topic}, - :remote => true, - :method => 'get', - :class => 'icon icon-comment', - :remote => true) if !@topic.locked? && authorize_for('messages', 'reply') %> - <%= link_to( - l(:button_edit), - {:action => 'edit', :id => @topic}, - :class => 'icon icon-edit' - ) if @message.editable_by?(User.current) %> - <%= link_to( - l(:button_delete), - {:action => 'destroy', :id => @topic}, - :method => :post, - :data => {:confirm => l(:text_are_you_sure)}, - :class => 'icon icon-del' - ) if @message.destroyable_by?(User.current) %> -
-
-
<%= link_to image_tag(url_to_avatar(@topic.author), :class => "avatar"), user_path(@topic.author) %>
-

<%=link_to @topic.author, user_path(@topic.author) %>

+
+ <%= watcher_link(@topic, User.current) %> + <%= link_to( + l(:button_quote), + {:action => 'quote', :id => @topic}, + :remote => true, + :method => 'get', + :class => 'icon icon-comment', + :remote => true) if !@topic.locked? && authorize_for('messages', 'reply') %> + <%= link_to( + l(:button_edit), + {:action => 'edit', :id => @topic}, + :class => 'icon icon-edit' + ) if @message.editable_by?(User.current) %> + <%= link_to( + l(:button_delete), + {:action => 'destroy', :id => @topic}, + :method => :post, + :data => {:confirm => l(:text_are_you_sure)}, + :class => 'icon icon-del' + ) if @message.destroyable_by?(User.current) %> +
+
+
+ <%= link_to image_tag(url_to_avatar(@topic.author), :class => "avatar"), user_path(@topic.author) %> +
+

+ <%= link_to @topic.author, user_path(@topic.author) %> +

-
<%= label_tag l(:field_subject) %>: <%=link_to @topic.subject, project_boards_path(@topic.project) %>
-
<%= textilizable(@topic, :content) %> - <%= link_to_attachments @topic, :author => false %> -
-
<%= authoring @topic.created_on, @topic.author %>
+
+ <%= label_tag l(:field_subject) %>: <%= link_to @topic.subject, project_boards_path(@topic.project) %> +
+
+ <%= textilizable(@topic, :content) %> + <%= link_to_attachments @topic, :author => false %> +
+
+ <%= authoring @topic.created_on, @topic.author %> +
+ <% if !@topic.locked? && authorize_for('messages', 'reply') %> +

+ <%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %> +


<% unless @replies.empty? %> +
+
+
+

<%= l(:label_reply_plural) %> (<%= @reply_count %>)

-<% reply_count = 0 %> +<% reply_count = 0 %> <% @replies.each do |message| %> -
"> -
- <%= link_to( - image_tag('comment.png'), - {:action => 'quote', :id => message}, - :remote => true, - :method => 'get', - :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %> - <%= link_to( - image_tag('edit.png'), - {:action => 'edit', :id => message}, - :title => l(:button_edit) - ) if message.editable_by?(User.current) %> - <%= link_to( - image_tag('delete.png'), - {:action => 'destroy', :id => message}, - :method => :post, - :data => {:confirm => l(:text_are_you_sure)}, - :title => l(:button_delete) - ) if message.destroyable_by?(User.current) %> -
- - - - - - -
<%= reply_count += 1 %>楼
<%= link_to image_tag(url_to_avatar(message.author), :class => "avatar"), user_path(message.author) %>
<%= textilizable message, :content, :attachments => message.attachments %>
- <%= link_to_attachments message, :author => false %> -
<%= authoring message.created_on, message.author %>
-
- +
"> + + + + + + + + + + + + + +
<%= reply_count += 1 %>楼 +
+ <%= link_to( + "引用", + {:action => 'quote', :id => message}, + :remote => true, + :method => 'get', + :title => l(:button_quote)) if !@topic.locked? && authorize_for('messages', 'reply') %> + <%= link_to( + #image_tag('edit.png'), + "编辑", + {:action => 'edit', :id => message}, + :title => l(:button_edit) + ) if message.editable_by?(User.current) %> + <%= link_to( + #image_tag('delete.png'), + "删除", + {:action => 'destroy', :id => message}, + :method => :post, + :data => {:confirm => l(:text_are_you_sure)}, + :title => l(:button_delete) + ) if message.destroyable_by?(User.current) %> +
<%= link_to image_tag(url_to_avatar(message.author), :class => "avatar"), user_path(message.author) %> +
+ <%= textilizable message, :content, :attachments => message.attachments %> +
<%= link_to_attachments message, :author => false %>
<%= authoring message.created_on, message.author %>
+
+ <% end %> - + <% end %> -<% if !@topic.locked? && authorize_for('messages', 'reply') %> -

<%= toggle_link l(:button_reply), "reply", :focus => 'message_content' %>

+ + + <% end %> diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css index 46baeb5e7..032b40916 100644 --- a/public/stylesheets/application.css +++ b/public/stylesheets/application.css @@ -258,7 +258,7 @@ span.forums-avatar-right{ text-overflow: ellipsis; } .contextual-borad{ - float:right; + /*float:right;*/ white-space: nowrap; line-height:1.4em; margin-top:0px;