Updating styling, fixing some errors, and adding cert logging
This commit is contained in:
@@ -3,6 +3,11 @@
|
||||
<%= link_to 'New Card', new_card_path if can? :create, Card %>
|
||||
<%= link_to 'Upload all cards', upload_all_path if can? :upload_all, Card %>
|
||||
<table>
|
||||
<col />
|
||||
<col />
|
||||
<col class="col_highlight" />
|
||||
<col />
|
||||
<col class="col_highlight" />
|
||||
<tr>
|
||||
<th>User</th>
|
||||
<th>Note</th>
|
||||
|
||||
@@ -17,6 +17,7 @@
|
||||
<%= link_to 'Certifications', certifications_path if can? :read, Certification %>
|
||||
<% end %>
|
||||
<%= link_to 'Logs', door_logs_path if can? :read, DoorLog %>
|
||||
<% if user_signed_in? then %><%= link_to 'Profile', edit_user_registration_path %><% end %>
|
||||
<%= link_to 'Sign out', destroy_user_session_path, :method => :delete if user_signed_in? %>
|
||||
<%= link_to 'Sign in', new_user_session_path unless user_signed_in? %>
|
||||
</div>
|
||||
|
||||
@@ -8,6 +8,15 @@
|
||||
<%= @user_certification.certification.name %>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<b>Created:</b> by <%= link_to @created_by.name, @created_by unless @created_by.blank? %>
|
||||
at <%= @user_certification.created_at %>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<b>Updated:</b> by <%= link_to @updated_by.name, @updated_by unless @updated_by.blank? %>
|
||||
at <%= @user_certification.updated_at %>
|
||||
</p>
|
||||
|
||||
<%= link_to 'Edit', edit_user_certification_path(@user_certification) %> |
|
||||
<%= link_to 'Back', user_certifications_path %>
|
||||
|
||||
@@ -4,6 +4,15 @@
|
||||
<%= link_to 'New User', new_user_path %>
|
||||
<% end %>
|
||||
<table>
|
||||
<col />
|
||||
<col />
|
||||
<col />
|
||||
<% if current_user.admin? %><col /><% end %>
|
||||
<col class="col_highlight" />
|
||||
<col />
|
||||
<col class="col_highlight" />
|
||||
<col />
|
||||
<col class="col_highlight" />
|
||||
<tr>
|
||||
<th>Name</th>
|
||||
<th>Email</th>
|
||||
|
||||
@@ -11,29 +11,29 @@
|
||||
|
||||
<p>
|
||||
<b>Waiver?</b>
|
||||
<%= @user.waiver %>
|
||||
<%= @user.waiver.strftime("%B %d %Y") unless @user.waiver.blank? %>
|
||||
</p>
|
||||
|
||||
<% if current_user.admin? then %>
|
||||
<p>
|
||||
<b>Orientation?</b>
|
||||
<%= @user.orientation %>
|
||||
<%= @user.orientation.strftime("%B %d %Y") unless @user.orientation.blank? %>
|
||||
</p>
|
||||
<% end %>
|
||||
|
||||
<p>
|
||||
<b>Member?</b>
|
||||
<%= @user.member %>
|
||||
<%= raw(@user.member_status) %>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<b>Instructor?</b>
|
||||
<%= @user.instructor %>
|
||||
<%= @user.instructor? %>
|
||||
</p>
|
||||
|
||||
<p>
|
||||
<b>Admin?</b>
|
||||
<%= @user.admin %>
|
||||
<%= @user.admin? %>
|
||||
</p>
|
||||
|
||||
<% if current_user.admin? then %>
|
||||
@@ -53,5 +53,5 @@
|
||||
<% if @user.certifications.blank? %><li>n/a</li><% end %>
|
||||
</ul>
|
||||
|
||||
<%= link_to 'Edit', edit_user_path(@user) %> |
|
||||
<% if can? :update, @user then %><%= link_to 'Edit', edit_user_path(@user) %> |<% end %>
|
||||
<%= link_to 'Back', users_path %>
|
||||
|
||||
Reference in New Issue
Block a user