Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
U
UNL Resource Scheduler
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Digital Experience Group
UNL Resource Scheduler
Merge requests
!13
Clean up users page and make user toolbox display on load
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Clean up users page and make user toolbox display on load
JSTUREK8/unl-resource-scheduler:clean-up-users-page
into
master
Overview
0
Commits
1
Pipelines
0
Changes
1
Merged
Jeff Sturek
requested to merge
JSTUREK8/unl-resource-scheduler:clean-up-users-page
into
master
5 years ago
Overview
0
Commits
1
Pipelines
0
Changes
1
Expand
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
b8f10de3
1 commit,
5 years ago
1 file
+
10
−
6
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
views/admin/users.erb
+
10
−
6
Options
<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
id=
"toolbox"
class=
"toolbox"
style=
"display: none;"
>
@@ -7,7 +7,7 @@
<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
%><%=
@user
.
id
%>
/edit/"
>
Edit My User
</a>
<a
class=
"dcf-btn
n
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>
@@ -16,7 +16,7 @@
<div
class=
"dcf-col-100% dcf-col-25%-start@sm"
>
<label
style=
"font-size: 120%; margin-right: 20px;"
>
Find users by:
</label>
<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
class=
"dcf-col-100% dcf-col-75%-end@sm"
"
>
<label>
Resource Authorization:
</label>
@@ -62,10 +62,10 @@
<%
end
%>
</td>
<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
%>
/manage/"
class=
"dcf-btn wdn-button-triad"
>
Resources
</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
dcf-mb-2
"
>
Resources
</a>
<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>
</td>
</tr>
@@ -91,6 +91,7 @@
$('#show-toolbox').hide();
$('#toolbox').slideDown();
});
$('#hide-toolbox').click(function (click) {
click.preventDefault();
$('#toolbox').slideUp(400, function () {
@@ -107,5 +108,8 @@
window.location = '?' + conditions.join('&');
});
$( "#show-toolbox" ).trigger( "click" );
});
});]
)
%>
\ No newline at end of file
Loading