修改了一些新建、编辑权限

This commit is contained in:
huangjingquan 2013-11-26 16:27:56 +08:00
parent dc00216603
commit 10ce6a87c2
8 changed files with 23 additions and 18 deletions

View File

@ -1,4 +1,4 @@
<%= board_breadcrumb(@board) %> <!-- <%= board_breadcrumb(@board) %> -->
<!--new and follow--> <!--new and follow-->
<div class="content-title-top"> <div class="content-title-top">

View File

@ -21,7 +21,7 @@
</table></td> </table></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" ><span class="font_description">标签</span></td> <td colspan="2" ><span class="font_description"> </span></td>
</tr> </tr>
<tr> <tr>
<td align="left" colspan="2" ><span class="font_lighter"><%= authoring topic.created_at, topic.author %> <td align="left" colspan="2" ><span class="font_lighter"><%= authoring topic.created_at, topic.author %>

View File

@ -9,8 +9,8 @@
<%= %> <%= %>
</p> </p>
<!--modified by huang--> <!--modified by huang-->
<%= 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 %> | <% 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 %> <% end %>
<%= render :partial => 'forums/show_topics', :locals => {:memos => @memos} %> <%= render :partial => 'forums/show_topics', :locals => {:memos => @memos} %>

View File

@ -64,7 +64,7 @@
</div> </div>
<!--tags--> <!--tags-->
<% if User.current.logged? || User.current.admin? %> <% if User.current.logged? || User.current.admin? %>
<div class="forums-tags"><%= render :partial => 'tags/tag', :locals => {:obj => @forum.creator,:object_flag => "1"} %></div> <div class="forums-tags"><%= render :partial => 'tags/tag', :locals => {:obj => @forum,:object_flag => "5"}%></div>
<% end %> <% end %>
</div> </div>
</div> </div>

View File

@ -25,7 +25,9 @@
.memo-title{ .memo-title{
margin: 1em 0; margin: 1em 0;
padding-left: 1%; padding-left: 1%;
border-bottom: 1px dashed padding-bottom: 1%;
font-weight: bold;
border-bottom: 1px dashed rgb(204, 204, 204);
} }
.memo-content{ .memo-content{
padding: 1%; padding: 1%;
@ -55,10 +57,10 @@
<div class="lz"> <div class="lz">
<div class="lz-left"> <div class="lz-left">
<div class=""><%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %></div> <div class=""><%= link_to image_tag(url_to_avatar(@memo.author), :class => "avatar"), user_path(@memo.author) %></div>
<p class=""><%=h @memo.author %></p> <p class=""><%=link_to @memo.author, user_path(@memo.author) %></p>
</div> </div>
<div class="memo-section"> <div class="memo-section">
<div class="memo-title"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div> <div class="memo-title"><%= label_tag l(:field_subject) %>: <%=link_to @memo.subject, forum_path(@forum) %></div>
<div class="memo-content"><%= textilizable(@memo, :content) %></div> <div class="memo-content"><%= textilizable(@memo, :content) %></div>
<div class="memo-timestamp"> <%= authoring @memo.created_at, @memo.author %></div> <div class="memo-timestamp"> <%= authoring @memo.created_at, @memo.author %></div>
</div> </div>
@ -69,7 +71,7 @@
<h3 class="comments"><%= l(:label_reply_plural) %> (<%= @replies.nil? ? 0 : @replies.size %>)</h3> <h3 class="comments"><%= l(:label_reply_plural) %> (<%= @replies.nil? ? 0 : @replies.size %>)</h3>
<% reply_count = 0%> <% reply_count = 0%>
<% @replies.each do |reply| %> <% @replies.each do |reply| %>
<p class="font_lighter"><%= reply_count += 1 %>L :</p> <p class="font_lighter"><%= reply_count += 1 %> :</p>
<div class="reply" id="<%= "reply-#{reply.id}" %>"> <div class="reply" id="<%= "reply-#{reply.id}" %>">
<div class="contextual-borad"> <div class="contextual-borad">
<%= link_to( <%= link_to(

View File

@ -58,7 +58,10 @@
.memo-title{ .memo-title{
margin: 1em 0; margin: 1em 0;
padding-left: 1%; padding-left: 1%;
border-bottom: 1px dashed padding-bottom: 1%;
font-weight: bold;
border-bottom: 1px dashed rgb(204, 204, 204);
} }
.memo-content{ .memo-content{
padding: 1%; padding: 1%;
@ -89,10 +92,10 @@
<div class="lz"> <div class="lz">
<div class="lz-left"> <div class="lz-left">
<div class=""><%= link_to image_tag(url_to_avatar(@topic.author), :class => "avatar"), user_path(@topic.author) %></div> <div class=""><%= link_to image_tag(url_to_avatar(@topic.author), :class => "avatar"), user_path(@topic.author) %></div>
<p class=""><%=h @topic.author %></p> <p class=""><%=link_to @topic.author, user_path(@topic.author) %></p>
</div> </div>
<div class="memo-section"> <div class="memo-section">
<div class="memo-title"><%= label_tag l(:field_subject) %>: <%=h @topic.subject %></div> <div class="memo-title"><%= label_tag l(:field_subject) %>: <%=link_to @topic.subject, project_boards_path(@topic.project) %></div>
<div class="memo-content"><%= textilizable(@topic, :content) %></div> <div class="memo-content"><%= textilizable(@topic, :content) %></div>
<div class="memo-timestamp"> <%= authoring @topic.created_on, @topic.author %></div> <div class="memo-timestamp"> <%= authoring @topic.created_on, @topic.author %></div>
</div> </div>

View File

@ -13,14 +13,14 @@
<td style="padding-left: <%= level * 18 %>px;"><%= link_to board.name, project_board_path(@project, board) %></td> <td style="padding-left: <%= level * 18 %>px;"><%= link_to board.name, project_board_path(@project, board) %></td>
<td><%=h board.description %></td> <td><%=h board.description %></td>
<td align="center"> <td align="center">
<% if authorize_for("boards", "edit") %> <!-- <% if authorize_for("boards", "edit") %>
<%= reorder_links('board', {:controller => 'boards', :action => 'update', :project_id => @project, :id => board}, :put) %> <%= reorder_links('board', {:controller => 'boards', :action => 'update', :project_id => @project, :id => board}, :put) %>
<% end %> <% end %> -->
</td> </td>
<td class="buttons"> <td class="buttons">
<% if User.current.allowed_to?(:manage_boards, @project) %> <% if User.current.allowed_to?(:manage_boards, @project) %>
<%= link_to l(:button_edit), edit_project_board_path(@project, board), :class => 'icon icon-edit' %> <%= link_to l(:button_edit), edit_project_board_path(@project, board), :class => 'icon icon-edit' %>
<%= delete_link project_board_path(@project, board) %> <!-- <%= delete_link project_board_path(@project, board) %> -->
<% end %> <% end %>
</td> </td>
</tr> </tr>
@ -31,6 +31,6 @@
<p class="nodata"><%= l(:label_no_data) %></p> <p class="nodata"><%= l(:label_no_data) %></p>
<% end %> <% end %>
<% if User.current.allowed_to?(:manage_boards, @project) %> <!-- <% if User.current.allowed_to?(:manage_boards, @project) %>
<p><%= link_to l(:label_board_new), new_project_board_path(@project), :class => 'icon icon-add' %></p> <p><%= link_to l(:label_board_new), new_project_board_path(@project), :class => 'icon icon-add' %></p>
<% end %> <% end %> -->

View File

@ -795,7 +795,7 @@ zh:
label_topic_plural: 主题 label_topic_plural: 主题
label_message_plural: 帖子 label_message_plural: 帖子
label_message_last: 最新的帖子 label_message_last: 最新的帖子
label_message_new: 新贴 label_message_new: 发布帖子
label_message_posted: 发帖成功 label_message_posted: 发帖成功
label_reply_plural: 回复 label_reply_plural: 回复
label_send_information: 给用户发送帐号信息 label_send_information: 给用户发送帐号信息