More resource tweaks

This commit is contained in:
2014-02-09 04:32:45 -07:00
parent 23dcb0715c
commit a2cbcac798
9 changed files with 119 additions and 57 deletions

View File

@@ -17,6 +17,11 @@
float: left;
margin-top: 5px;
}
@media (max-width: 768px) {
#logo {
margin-left: 15px;
}
}
#content {
margin: 1em;
}
@@ -25,54 +30,66 @@
<body>
<nav class="navbar navbar-default" role="navigation">
<div class="container-fluid">
<ul class="nav navbar-nav">
<a id="home_nav_link" href="/" title="Home"><img src="/assets/logo.png" id="logo" /></a>
<li>
<%= link_to 'People', users_path if can? :read, User %>
</li>
<li class="active">
<%= link_to 'Tools', resources_path if can? :read, Resource %>
</li>
<li>
<%= link_to 'Access Cards', cards_path if can? :manage, Card %>
</li>
<li class="dropdown">
<% if can? :create, UserCertification %>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Certifications <b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<%= link_to 'Classes', certifications_path if can? :read, Certification %>
</li>
<li>
<%= link_to 'User Certs', user_certifications_path if can? :create, UserCertification %>
</li>
</ul>
<% else %>
<%= link_to 'Certifications', certifications_path if can? :read, Certification %>
<% end %>
</li>
<li>
<%= link_to 'Payments', payments_path if can? :create, Payment %>
</li>
<li>
<%= link_to 'Computers', macs_path if user_signed_in? || (can? :read, Mac) %>
</li>
<li>
<%= link_to 'Settings', settings_path if can? :read, Setting %>
</li>
<li>
<% if user_signed_in? then %><%= link_to 'Profile', edit_user_registration_path %><% end %>
</li>
<li>
<%= link_to 'Logout', destroy_user_session_path, :method => :delete if user_signed_in? %>
</li>
<li>
<%= link_to 'Login', new_user_session_path unless user_signed_in? %>
</li>
<li>
<%= link_to 'Membership Application', new_user_registration_path unless user_signed_in? %>
</li>
</ul>
<div class="navbar-header">
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#mainmenu-collapse">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a id="home_nav_link" href="/" title="Home"><img src="/assets/logo.png" id="logo" /></a>
</div>
<div class="collapse navbar-collapse" id="mainmenu-collapse">
<ul class="nav navbar-nav">
<li>
<%= link_to 'People', users_path if can? :read, User %>
</li>
<li class="active">
<%= link_to 'Tools', resources_path if can? :read, Resource %>
</li>
<li>
<%= link_to 'Access Cards', cards_path if can? :manage, Card %>
</li>
<li class="dropdown">
<% if can? :create, UserCertification %>
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Certifications <b class="caret"></b></a>
<ul class="dropdown-menu">
<li>
<%= link_to 'Classes', certifications_path if can? :read, Certification %>
</li>
<li>
<%= link_to 'User Certs', user_certifications_path if can? :create, UserCertification %>
</li>
</ul>
<% else %>
<%= link_to 'Certifications', certifications_path if can? :read, Certification %>
<% end %>
</li>
<li>
<%= link_to 'Payments', payments_path if can? :create, Payment %>
</li>
<li>
<%= link_to 'Computers', macs_path if user_signed_in? || (can? :read, Mac) %>
</li>
<li>
<%= link_to 'Settings', settings_path if can? :read, Setting %>
</li>
<li>
<% if user_signed_in? then %><%= link_to 'Profile', edit_user_registration_path %><% end %>
</li>
<li>
<%= link_to 'Logout', destroy_user_session_path, :method => :delete if user_signed_in? %>
</li>
<li>
<%= link_to 'Login', new_user_session_path unless user_signed_in? %>
</li>
<li>
<%= link_to 'Membership Application', new_user_registration_path unless user_signed_in? %>
</li>
</ul>
</div>
</div>
</nav>
<div class="container-fluid" id="content">