Page MenuHomeGRNET
Files F886086

No OneTemporary
Actions

File Metadata

Created
Fri, Aug 8, 8:44 PM

View Options

diff --git a/app/views/admin/hosts/pending.html.erb b/app/views/admin/hosts/pending.html.erb
index 77365e1..9eef064 100644
--- a/app/views/admin/hosts/pending.html.erb
+++ b/app/views/admin/hosts/pending.html.erb
@@ -1,24 +1,29 @@
-<h1>Pending Clients</h1>
+<h1 data-toggle="tooltip" title="These clients will receive back ups when the user enters a valid configuration">
+ Pending Clients
+ <small><label class="glyphicon glyphicon-question-sign"></label></small>
+</h1>
<% if @hosts.empty? %>
<h3>There are no clients waiting for configuration</h3>
<% else %>
- <div class="table-responsive">
- <table class="table table-striped table-bordered table-condensed">
- <thead>
- <tr>
- <th>Name</th>
- <th>FQDN</th>
- <th>User</th>
- <th>Port</th>
- <th>Created At</th>
- <th>Approved By</th>
- </tr>
- </thead>
+ <div class="datatable-wrapper">
+ <div class="table-responsive">
+ <table id="admin_clients" class="table table-striped table-bordered table-condensed">
+ <thead>
+ <tr>
+ <th>Name</th>
+ <th>FQDN</th>
+ <th>User</th>
+ <th class="neither-search-nor-order">Port</th>
+ <th>Created At</th>
+ <th>Approved By</th>
+ </tr>
+ </thead>
- <tbody>
- <%= render partial: 'host', collection: @hosts %>
- </tbody>
- </table>
+ <tbody>
+ <%= render partial: 'host', collection: @hosts %>
+ </tbody>
+ </table>
+ </div>
</div>
<% end %>
diff --git a/app/views/shared/_admin.html.erb b/app/views/shared/_admin.html.erb
index 18be359..271e4b2 100644
--- a/app/views/shared/_admin.html.erb
+++ b/app/views/shared/_admin.html.erb
@@ -1,65 +1,66 @@
<ul class="nav navbar-nav navbar-right">
<%= content_tag(:li, active_class(admin_path)) do %>
<%= link_to 'Admin', admin_path %>
<% end %>
- <%= content_tag(:li, active_class(admin_clients_path)) do %>
- <%= link_to 'Clients', admin_clients_path %>
- <% end %>
<%= content_tag(:li,
{ class: ['dropdown',
- active_class([obsolete_admin_clients_path,
+ active_class([ admin_clients_path,
+ obsolete_admin_clients_path,
unverified_admin_hosts_path,
pending_admin_hosts_path,
rejected_admin_hosts_path])[:class]].join(' ')}) do %>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
- Inactive Clients <span class="caret"></span>
+ Clients <span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li>
+ <%= link_to 'Active Clients', admin_clients_path %>
+ </li>
+ <li>
<%= link_to 'Obsolete Clients', obsolete_admin_clients_path %>
</li>
<li>
<%= link_to 'Unverified Clients', unverified_admin_hosts_path %>
</li>
<li>
<%= link_to 'Pending Clients', pending_admin_hosts_path %>
</li>
<li>
<%= link_to 'Rejected Clients', rejected_admin_hosts_path %>
</li>
</ul>
<%#= content_tag(:li, active_class(unverified_admin_hosts_path, true)) do %>
<%#= link_to 'Unverified Clients', unverified_admin_hosts_path %>
<% end %>
<%= content_tag(:li, { class: "dropdown #{active_class(admin_users_path)[:class]}" }) do %>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
Users <span class="caret"></span>
</a>
<ul class="dropdown-menu">
<li>
<%= link_to 'All Users', admin_users_path %>
</li>
<li class="divider"></li>
<li>
<%= link_to 'ViMa Users', admin_users_path(type: :vima) %>
</li>
<li>
<%= link_to 'Institutional Users', admin_users_path(type: :institutional) %>
</li>
<li>
<%= link_to 'Admins', admin_users_path(type: :admin) %>
</li>
<li>
</ul>
<% end %>
<%= content_tag(:li, active_class(admin_faqs_path)) do %>
<%= link_to 'FAQ', admin_faqs_path %>
<% end %>
<%= content_tag(:li, active_class(admin_pools_path)) do %>
<%= link_to 'Pools', admin_pools_path %>
<% end %>
<%= content_tag(:li, active_class(admin_settings_path)) do %>
<%= link_to 'Settings', admin_settings_path %>
<% end %>
</ul>

Event Timeline