jro_apps/redmine Commit - r15514:6aff505b902c

Don't show an empty table....

Jean-Philippe Lang -

r15514:6aff505b902c

parent child

Context file:

r15514:6aff505b902c

Collapse all files

app/views/admin/projects.html.erb +5 -1

             <div class="contextual">
             <%= link_to l(:label_project_new), new_project_path, :class => 'icon icon-add' %>
             </div>
             <%= title l(:label_project_plural) %>
             <%= form_tag({}, :method => :get) do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <label for='status'><%= l(:field_status) %> :</label>
             <%= select_tag 'status', project_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
             <label for='name'><%= l(:label_project) %>:</label>
             <%= text_field_tag 'name', params[:name], :size => 30 %>
             <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
             <%= link_to l(:button_clear), admin_projects_path, :class => 'icon icon-reload' %>
             </fieldset>
             <% end %>
             &nbsp;
+            <% if @projects.any? %>
             <div class="autoscroll">
             <table class="list">
               <thead><tr>
               <th><%=l(:label_project)%></th>
               <th><%=l(:field_is_public)%></th>
               <th><%=l(:field_created_on)%></th>
               <th></th>
               </tr></thead>
               <tbody>
             <% project_tree(@projects, :init_level => true) do |project, level| %>
               <tr class="<%= cycle("odd", "even") %> <%= project.css_classes %> <%= level > 0 ? "idnt idnt-#{level}" : nil %>">
               <td class="name"><span><%= link_to_project_settings(project, {}, :title => project.short_description) %></span></td>
               <td><%= checked_image project.is_public? %></td>
               <td><%= format_date(project.created_on) %></td>
               <td class="buttons">
                 <%= link_to(l(:button_archive), archive_project_path(project, :status => params[:status]), :data => {:confirm => l(:text_are_you_sure)}, :method => :post, :class => 'icon icon-lock') unless project.archived? %>
                 <%= link_to(l(:button_unarchive), unarchive_project_path(project, :status => params[:status]), :method => :post, :class => 'icon icon-unlock') if project.archived? && (project.parent.nil? || !project.parent.archived?) %>
                 <%= link_to(l(:button_copy), copy_project_path(project), :class => 'icon icon-copy') %>
                 <%= link_to(l(:button_delete), project_path(project), :method => :delete, :class => 'icon icon-del') %>
               </td>
               </tr>
             <% end %>
               </tbody>
             </table>
             </div>
-            <span class="pagination"><%= pagination_links_full @project_pages, @project_count %></span>
  No newline at end of file
+            <span class="pagination"><%= pagination_links_full @project_pages, @project_count %></span>
+            <% else %>
+            <p class="nodata"><%= l(:label_no_data) %></p>
+            <% end %>

app/views/users/index.html.erb +4 0

             <div class="contextual">
             <%= link_to l(:label_user_new), new_user_path, :class => 'icon icon-add' %>
             </div>
             <h2><%=l(:label_user_plural)%></h2>
             <%= form_tag(users_path, :method => :get) do %>
             <fieldset><legend><%= l(:label_filter_plural) %></legend>
             <label for='status'><%= l(:field_status) %>:</label>
             <%= select_tag 'status', users_status_options_for_select(@status), :class => "small", :onchange => "this.form.submit(); return false;"  %>
             <% if @groups.present? %>
             <label for='group_id'><%= l(:label_group) %>:</label>
             <%= select_tag 'group_id', content_tag('option') + options_from_collection_for_select(@groups, :id, :name, params[:group_id].to_i), :onchange => "this.form.submit(); return false;"  %>
             <% end %>
             <label for='name'><%= l(:label_user) %>:</label>
             <%= text_field_tag 'name', params[:name], :size => 30 %>
             <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
             <%= link_to l(:button_clear), users_path, :class => 'icon icon-reload' %>
             </fieldset>
             <% end %>
             &nbsp;
+            <% if @users.any? %>
             <div class="autoscroll">
             <table class="list users">
               <thead><tr>
               <%= sort_header_tag('login', :caption => l(:field_login)) %>
               <%= sort_header_tag('firstname', :caption => l(:field_firstname)) %>
               <%= sort_header_tag('lastname', :caption => l(:field_lastname)) %>
               <th><%= l(:field_mail) %></th>
               <%= 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') %>
                 <th></th>
               </tr></thead>
               <tbody>
             <% for user in @users -%>
               <tr class="<%= user.css_classes %> <%= cycle("odd", "even") %>">
               <td class="username"><%= avatar(user, :size => "14") %><%= link_to user.login, edit_user_path(user) %></td>
               <td class="firstname"><%= user.firstname %></td>
               <td class="lastname"><%= user.lastname %></td>
               <td class="email"><%= mail_to(user.mail) %></td>
               <td class="tick"><%= checked_image user.admin? %></td>
               <td class="created_on"><%= format_time(user.created_on) %></td>
               <td class="last_login_on"><%= format_time(user.last_login_on) unless user.last_login_on.nil? %></td>
                 <td class="buttons">
                   <%= change_status_link(user) %>
                   <%= delete_link user_path(user, :back_url => request.original_fullpath) unless User.current == user %>
                 </td>
               </tr>
             <% end -%>
               </tbody>
             </table>
             </div>
             <span class="pagination"><%= pagination_links_full @user_pages, @user_count %></span>
+            <% else %>
+            <p class="nodata"><%= l(:label_no_data) %></p>
+            <% end %>
             <% html_title(l(:label_user_plural)) -%>

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages