diff --git a/app/views/admin/search.html.erb b/app/views/admin/search.html.erb index 67c97366e..5d49d84fa 100644 --- a/app/views/admin/search.html.erb +++ b/app/views/admin/search.html.erb @@ -26,7 +26,7 @@  
- +
<%= sort_header_tag('login', :caption => l(:field_login)) %> @@ -37,20 +37,20 @@ <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %> <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %> <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %> - + <% for user in @users -%> "> - - - - - - - - + + + + + + + <% end -%> diff --git a/app/views/admin/users.html.erb b/app/views/admin/users.html.erb index 8bd1ef446..4a76a42ef 100644 --- a/app/views/admin/users.html.erb +++ b/app/views/admin/users.html.erb @@ -37,18 +37,9 @@ <%= sort_header_tag('admin', :caption => l(:field_admin), :default_order => 'desc') %> <%= sort_header_tag('created_on', :caption => l(:field_created_on), :default_order => 'desc') %> <%= sort_header_tag('last_login_on', :caption => l(:field_last_login_on), :default_order => 'desc') %> - + - - - - - - - - - <% for user in @users -%> "> @@ -59,7 +50,7 @@ - <% end -%> diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 89fc862d0..204dd519a 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -4,7 +4,9 @@ <%= render :partial => 'action_menu' %> -

<%= issue_heading(@issue) %>

+

+ <%= issue_heading(@issue) %> +

@@ -25,9 +27,9 @@ <% end %> - + -
+
<%= render_issue_subject_with_tree(@issue) %>
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb index e299be182..71bea9cfa 100644 --- a/app/views/projects/show.html.erb +++ b/app/views/projects/show.html.erb @@ -1,7 +1,8 @@ <% if @events_by_day.size >0 %>

- <%= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %> + <% # 暂时隐藏时间的显示%> + <%#= l(:label_date_from_to, :start => format_date(@date_to - @days), :end => format_date(@date_to-1)) %>

<% @events_by_day.keys.sort.reverse.each do |day| %> diff --git a/app/views/stores/_search_bar.html.erb b/app/views/stores/_search_bar.html.erb index c91f90e96..884f8b263 100644 --- a/app/views/stores/_search_bar.html.erb +++ b/app/views/stores/_search_bar.html.erb @@ -4,5 +4,5 @@    <%= submit_tag l(:label_search), :class => "enterprise"%> <% end %> -
全站文件搜索。不会搜索私有项目中的内容、学生已经提交的作业。
+
全站文件搜索。不会搜索私有项目中的内容。
\ No newline at end of file diff --git a/app/views/users/_memberships.html.erb b/app/views/users/_memberships.html.erb index 5f61d2ce2..2c18ed416 100644 --- a/app/views/users/_memberships.html.erb +++ b/app/views/users/_memberships.html.erb @@ -1,4 +1,4 @@ -<% roles = Role.find_all_givable %> +<% roles = Role.find_all_givable[0..2] %> <% projects = Project.active.all %>
@@ -50,12 +50,19 @@

<%= l(:label_no_data) %>

<% end %>
+
<% if projects.any? %> -
<%=l(:label_project_new)%> +
<%=l(:label_project_new)%> <%= form_for(:membership, :remote => true, :url => user_memberships_path(@user)) do %> -<%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects) %> +
<%= select_tag 'membership[project_id]', options_for_membership_project_select(@user, projects)%>

<%= l(:label_role_plural) %>: <% roles.each do |role| %> diff --git a/app/views/welcome/_search_bar.html.erb b/app/views/welcome/_search_bar.html.erb index 73a497835..302aa3c26 100644 --- a/app/views/welcome/_search_bar.html.erb +++ b/app/views/welcome/_search_bar.html.erb @@ -4,5 +4,5 @@    <%= submit_tag l(:label_search), :class => "enterprise"%> <% end %> -

全站文件搜索。不会搜索私有项目中的内容和学生已经提交的作业。
+
全站文件搜索。不会搜索私有项目中的内容。
\ No newline at end of file
<%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %><%= h(user.firstname) %><%= h(user.lastname) %><%= checked_image user.admin? %><%= format_time(user.created_on) %> <%= change_status_link(user) %> + <%= avatar(user, :size => "14") %><%= link_to h(user.login), edit_user_path(user) %><%= h(user.firstname) %><%= h(user.lastname) %><%= checked_image user.admin? %><%= format_time(user.created_on) %> <%= change_status_link(user) %> <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %>
<%= checked_image user.admin? %> <%= format_time(user.created_on) %> <%= change_status_link(user) %> + <%= change_status_link(user) %> <%= delete_link user_path(user, :back_url => admin_users_path(params)) unless User.current == user %>