修改了“退出”返回页面设置;项目文档页面添加显示选择
This commit is contained in:
parent
797db5a93f
commit
de7665049e
|
@ -42,7 +42,7 @@ class AccountController < ApplicationController
|
|||
redirect_to home_url
|
||||
elsif request.post?
|
||||
logout_user
|
||||
redirect_to home_url
|
||||
redirect_to signin_path
|
||||
end
|
||||
# display the logout form
|
||||
end
|
||||
|
|
|
@ -1,5 +1,11 @@
|
|||
<div class="contextual">
|
||||
<%= link_to l(:label_document_new), new_project_document_path(@project), :class => 'icon icon-add',
|
||||
<%= l(:label_documents_sort) %>
|
||||
<%= link_to l(:field_category), {:sort_by => 'category'}, :class => (@sort_by == 'category' ? 'selected' :nil) %>
|
||||
<%= link_to l(:label_date), {:sort_by => 'date'}, :class => (@sort_by == 'date' ? 'selected' :nil) %>
|
||||
<%= link_to l(:field_title), {:sort_by => 'title'}, :class => (@sort_by == 'title' ? 'selected' :nil) %>
|
||||
<%= link_to l(:field_author), {:sort_by => 'author'}, :class => (@sort_by == 'author' ? 'selected' :nil) %>
|
||||
|
|
||||
<%= link_to l(:label_document_new), new_project_document_path(@project), :class => 'icon icon-add',
|
||||
:onclick => 'showAndScrollTo("add-document", "document_title"); return false;' if User.current.allowed_to?(:add_documents, @project) %>
|
||||
</div>
|
||||
|
||||
|
@ -23,12 +29,4 @@
|
|||
<%= render :partial => 'documents/document', :collection => @grouped[group] %>
|
||||
<% end %>
|
||||
|
||||
<% content_for :sidebar do %>
|
||||
<h3><%= l(:label_sort_by, '') %></h3>
|
||||
<%= link_to l(:field_category), {:sort_by => 'category'}, :class => (@sort_by == 'category' ? 'selected' :nil) %><br />
|
||||
<%= link_to l(:label_date), {:sort_by => 'date'}, :class => (@sort_by == 'date' ? 'selected' :nil) %><br />
|
||||
<%= link_to l(:field_title), {:sort_by => 'title'}, :class => (@sort_by == 'title' ? 'selected' :nil) %><br />
|
||||
<%= link_to l(:field_author), {:sort_by => 'author'}, :class => (@sort_by == 'author' ? 'selected' :nil) %>
|
||||
<% end %>
|
||||
|
||||
<% html_title(l(:label_document_plural)) -%>
|
||||
|
|
|
@ -500,10 +500,12 @@ zh:
|
|||
lastest_respond: 最新反馈
|
||||
label_respond_view_all: 其他120个反馈
|
||||
label_news_lastest: 最新动态
|
||||
label_versions_settings: 显示配置
|
||||
label_versions_settings: 显示设置
|
||||
label_versions_progress: 完成进度
|
||||
label_versions_description: 版本描述
|
||||
label_my_photo: 我的头像
|
||||
label_documents_sort: 排序设置:
|
||||
label_activities_settings: 显示设置
|
||||
#end
|
||||
label_my_page: 我的工作台
|
||||
label_my_account: 我的帐号
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 548 KiB After Width: | Height: | Size: 762 KiB |
Loading…
Reference in New Issue