diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb index d5faf8f03..7761e499e 100644 --- a/app/views/boards/show.html.erb +++ b/app/views/boards/show.html.erb @@ -1,4 +1,4 @@ -<%= board_breadcrumb(@board) %> +
diff --git a/app/views/forums/_show_topics.html.erb b/app/views/forums/_show_topics.html.erb index 047c957f2..cf90ca621 100644 --- a/app/views/forums/_show_topics.html.erb +++ b/app/views/forums/_show_topics.html.erb @@ -21,7 +21,7 @@ - 标签 + <%= authoring topic.created_at, topic.author %> diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index a33a7547f..91ef22395 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -9,8 +9,8 @@ <%= %>

-<%= link_to '新建', new_forum_memo_path(@forum), :class => 'icon icon-add' %> +<%= link_to '发布帖子', new_forum_memo_path(@forum), :class => 'icon icon-add' %> <% if User.current.admin?||User.current.login==@forum.creator.login %> | -<%= link_to '编辑', edit_forum_path(@forum), :class => 'icon icon-edit' %> +<%= link_to '编辑帖子', edit_forum_path(@forum), :class => 'icon icon-edit' %> <% end %> <%= render :partial => 'forums/show_topics', :locals => {:memos => @memos} %> diff --git a/app/views/layouts/base_forums.html.erb b/app/views/layouts/base_forums.html.erb index 694806d72..25d9b5d59 100644 --- a/app/views/layouts/base_forums.html.erb +++ b/app/views/layouts/base_forums.html.erb @@ -64,7 +64,7 @@
<% if User.current.logged? || User.current.admin? %> -
<%= render :partial => 'tags/tag', :locals => {:obj => @forum.creator,:object_flag => "1"} %>
+
<%= render :partial => 'tags/tag', :locals => {:obj => @forum,:object_flag => "5"}%>
<% end %> diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index 767eb3053..afc6f9de0 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -25,7 +25,9 @@ .memo-title{ margin: 1em 0; padding-left: 1%; - border-bottom: 1px dashed + padding-bottom: 1%; + font-weight: bold; + border-bottom: 1px dashed rgb(204, 204, 204); } .memo-content{ padding: 1%; @@ -55,10 +57,10 @@
<%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %>
-

<%=h @memo.author %>

+

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

-
<%= label_tag l(:field_subject) %>: <%=h @memo.subject %>
+
<%= label_tag l(:field_subject) %>: <%=link_to @memo.subject, forum_path(@forum) %>
<%= textilizable(@memo, :content) %>
<%= authoring @memo.created_at, @memo.author %>
@@ -69,7 +71,7 @@

<%= l(:label_reply_plural) %> (<%= @replies.nil? ? 0 : @replies.size %>)

<% reply_count = 0%> <% @replies.each do |reply| %> -

<%= reply_count += 1 %>L :

+

<%= reply_count += 1 %>楼 :

">
<%= link_to( diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 55fd99f36..ddb60e109 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -58,7 +58,10 @@ .memo-title{ margin: 1em 0; padding-left: 1%; - border-bottom: 1px dashed + padding-bottom: 1%; + font-weight: bold; + border-bottom: 1px dashed rgb(204, 204, 204); + } .memo-content{ padding: 1%; @@ -89,10 +92,10 @@
<%= link_to image_tag(url_to_avatar(@topic.author), :class => "avatar"), user_path(@topic.author) %>
-

<%=h @topic.author %>

+

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

-
<%= label_tag l(:field_subject) %>: <%=h @topic.subject %>
+
<%= label_tag l(:field_subject) %>: <%=link_to @topic.subject, project_boards_path(@topic.project) %>
<%= textilizable(@topic, :content) %>
<%= authoring @topic.created_on, @topic.author %>
diff --git a/app/views/projects/settings/_boards.html.erb b/app/views/projects/settings/_boards.html.erb index 1050ef70c..a3cad7f91 100644 --- a/app/views/projects/settings/_boards.html.erb +++ b/app/views/projects/settings/_boards.html.erb @@ -13,14 +13,14 @@ <%= link_to board.name, project_board_path(@project, board) %> <%=h board.description %> - <% if authorize_for("boards", "edit") %> + <% if User.current.allowed_to?(:manage_boards, @project) %> <%= link_to l(:button_edit), edit_project_board_path(@project, board), :class => 'icon icon-edit' %> - <%= delete_link project_board_path(@project, board) %> + <% end %> @@ -31,6 +31,6 @@

<%= l(:label_no_data) %>

<% end %> -<% if User.current.allowed_to?(:manage_boards, @project) %> + diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 9f7dfcff4..dbe9d4400 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -795,7 +795,7 @@ zh: label_topic_plural: 主题 label_message_plural: 帖子 label_message_last: 最新的帖子 - label_message_new: 新贴 + label_message_new: 发布帖子 label_message_posted: 发帖成功 label_reply_plural: 回复 label_send_information: 给用户发送帐号信息