Skip to content
Snippets Groups Projects
Commit 0ac18578 authored by Jeff Sturek's avatar Jeff Sturek
Browse files

Merge branch 'clean-up-users-page' into 'master'

Clean up users page and make user toolbox display on load

See merge request iim/unl-resource-scheduler!13
parents a8e19b49 b8f10de3
No related branches found
No related tags found
1 merge request!13Clean up users page and make user toolbox display on load
<div id="pagetitle"> <div id="pagetitle">
<h3>Manage Users<span class="dcf-subhead"><a id="show-toolbox" href="#">Show Toolbox</a></span></h3> <h3>Manage Users<span class="dcf-subhead"><a id="show-toolbox" href="#">Show User Toolbox</a></span></h3>
</div> </div>
<div id="toolbox" class="toolbox" style="display: none;"> <div id="toolbox" class="toolbox" style="display: none;">
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div class="tools"> <div class="tools">
<a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_users_href %>add/">Add User</a> <a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_users_href %>add/">Add User</a>
<a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_users_href %><%= @user.id %>/edit/">Edit My User</a> <a class="dcf-btn dcf-btn-primary" href="<%= @space.admin_users_href %><%= @user.id %>/edit/">Edit My User</a>
<a class="dcf-btnn wdn-button-triad" href="<%= @space.admin_users_href %><%= @user.id %>/manage/">My Resources</a> <a class="dcf-btn wdn-button-triad" href="<%= @space.admin_users_href %><%= @user.id %>/manage/">My Resources</a>
</div> </div>
</div> </div>
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<div class="dcf-col-100% dcf-col-25%-start@sm"> <div class="dcf-col-100% dcf-col-25%-start@sm">
<label style="font-size: 120%; margin-right: 20px;">Find users by:</label> <label style="font-size: 120%; margin-right: 20px;">Find users by:</label>
<br> <br>
<a href="<%= @space.admin_users_href %>" class="dcf-btn" style="font-size: 60%">Clear</a> <a href="<%= @space.admin_users_href %>" class="dcf-btn dcf-mb-6" style="font-size: 60%">Clear</a>
</div> </div>
<div class="dcf-col-100% dcf-col-75%-end@sm""> <div class="dcf-col-100% dcf-col-75%-end@sm"">
<label>Resource Authorization:</label> <label>Resource Authorization:</label>
...@@ -62,10 +62,10 @@ ...@@ -62,10 +62,10 @@
<% end %> <% end %>
</td> </td>
<td class="table-actions"> <td class="table-actions">
<a href="<%= @space.admin_users_href %><%= user.id %>/edit/" class="dcf-btn dcf-btn-primary">Edit</a> <a href="<%= @space.admin_users_href %><%= user.id %>/edit/" class="dcf-btn dcf-btn-primary dcf-mb-2">Edit</a>
<a href="<%= @space.admin_users_href %><%= user.id %>/manage/" class="dcf-btn wdn-button-triad">Resources</a> <a href="<%= @space.admin_users_href %><%= user.id %>/manage/" class="dcf-btn wdn-button-triad dcf-mb-2">Resources</a>
<form class="delete-form delete-user" action="<%= @space.admin_users_href %><%= user.id %>/delete/" method="POST"> <form class="delete-form delete-user" action="<%= @space.admin_users_href %><%= user.id %>/delete/" method="POST">
<button type="submit" class="dcf-btn">Delete</button> <button type="submit" class="dcf-btn dcf-mb-2">Delete</button>
</form> </form>
</td> </td>
</tr> </tr>
...@@ -91,6 +91,7 @@ ...@@ -91,6 +91,7 @@
$('#show-toolbox').hide(); $('#show-toolbox').hide();
$('#toolbox').slideDown(); $('#toolbox').slideDown();
}); });
$('#hide-toolbox').click(function (click) { $('#hide-toolbox').click(function (click) {
click.preventDefault(); click.preventDefault();
$('#toolbox').slideUp(400, function () { $('#toolbox').slideUp(400, function () {
...@@ -107,5 +108,8 @@ ...@@ -107,5 +108,8 @@
window.location = '?' + conditions.join('&'); window.location = '?' + conditions.join('&');
}); });
$( "#show-toolbox" ).trigger( "click" );
}); });
});]) %> });]) %>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment