Adding wysiwyg and settings

2013-09-28 04:59:19 -07:00
parent f03ffcd356
commit 2c204a8f9d
171 changed files with 26473 additions and 72 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -18,7 +18,7 @@
      <%= link_to 'Certifications', certifications_path if can? :read, Certification %>
    <% end %>
    <%= link_to 'Payments', payments_path if can? :read, Payment %>
-    <%= link_to 'Computers', macs_path if user_signed_in? && (can? :read, Mac) %>
+    <%= link_to 'Computers', macs_path if user_signed_in? || (can? :read, Mac) %>
    <% if user_signed_in? then %><%= link_to 'Profile', edit_user_registration_path %><% end %>
    <%= link_to 'Logout', destroy_user_session_path, :method => :delete if user_signed_in? %>
    <%= link_to 'Login', new_user_session_path unless user_signed_in? %>