Page MenuHomeGRNET

No OneTemporary

File Metadata

Created
Thu, Apr 24, 3:44 PM
diff --git a/app/views/shared/_nav.html.erb b/app/views/shared/_nav.html.erb
index 343a4b1..dd0e7e5 100644
--- a/app/views/shared/_nav.html.erb
+++ b/app/views/shared/_nav.html.erb
@@ -1,61 +1,58 @@
<!-- Fixed navbar -->
<nav class="navbar navbar-default navbar-fixed-top">
<div class="container-fluid">
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
</div>
<div id="navbar" class="navbar-collapse collapse">
<ul class="nav navbar-nav">
<li class="logo">
<%= link_to root_path do %>
<p><b>GRNET NOC</b></p>
<p>Archiving</p>
<% end %>
</li>
<% if current_user %>
<%= content_tag(:li, active_class(clients_path, true)) do %>
<%= link_to 'Clients', clients_path %>
<% end %>
- <li><a href="/contact">Contact</a></li>
- <li class="dropdown">
- <a href="#" class="dropdown-toggle" data-toggle="dropdown">Profile <span class="caret"></span></a>
- <ul class="dropdown-menu">
- <li><a href="#">Logout</a></li>
- <li class="divider"></li>
- <li class="dropdown-header">Profile</li>
- <li><a href="#">Edit</a></li>
- </ul>
- </li>
- <% if current_user %>
- <li><%= link_to current_user.username, '#' %></li>
- <% end %>
- <li><%= link_to 'logout', logout_path %></li>
+ <li><%= link_to current_user.username, '#' %></li>
<% end %>
</ul>
+ <% if current_user %>
+ <ul class="nav navbar-nav navbar-right">
+ <li>
+ <%= link_to logout_path do %>
+ <label class="glyphicon glyphicon-log-out"></label>
+ Logout
+ <% end %>
+ </li>
+ </ul>
+ <% end %>
<% if current_user.try(:admin?) %>
<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, true)) do %>
<%= link_to 'Clients', admin_clients_path %>
<% end %>
<%= content_tag(:li, active_class(unverified_admin_hosts_path, true)) do %>
<%= link_to 'Hosts', unverified_admin_hosts_path %>
<% end %>
<%= content_tag(:li, active_class(admin_users_path)) do %>
<%= link_to 'Users', admin_users_path %>
<% end %>
<%= content_tag(:li, active_class(admin_settings_path)) do %>
<%= link_to 'Settings', admin_settings_path %>
<% end %>
</ul>
<% end %>
</div><!--/.nav-collapse -->
</div>
</nav>

Event Timeline