Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
34f8a52a
Commit
34f8a52a
authored
10 years ago
by
Allen Gilliland
Browse files
Options
Downloads
Patches
Plain Diff
get the superadmin section navbar updated.
parent
9f080eda
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
resources/frontend_client/app/directives.js
+2
-1
2 additions, 1 deletion
resources/frontend_client/app/directives.js
resources/frontend_client/index.html
+22
-12
22 additions, 12 deletions
resources/frontend_client/index.html
with
24 additions
and
13 deletions
resources/frontend_client/app/directives.js
+
2
−
1
View file @
34f8a52a
...
...
@@ -137,13 +137,14 @@ NavbarDirectives.directive('mbProfileLink', [function () {
'
<span class="UserNick">
'
+
'
<span class="UserInitials NavItem-text">{{initials}}</span>
'
+
'
</span>
'
+
'
<cv-chevron-down-icon class="Dropdown-chevron ml1" width="8px" height="8px"></cv-chevron-down-icon>
'
+
'
<cv-chevron-down-icon class="Dropdown-chevron ml1" width="8px" height="8px"></cv-chevron-down-icon>
'
+
'
</a>
'
+
'
<ul class="Dropdown-content right">
'
+
'
<li><a class="link" href="/user/edit_current">Account Settings</a></li>
'
+
'
<li><a class="link" ng-if="userIsAdmin && context ==
\'
main
\'
" cv-org-href="/admin/">Admin</a></li>
'
+
'
<li><a class="link" ng-if="userIsAdmin && context ==
\'
admin
\'
" cv-org-href="/">Exit Admin</a></li>
'
+
'
<li><a class="link" ng-if="userIsSuperuser && context !=
\'
superadmin
\'
" href="/superadmin/">Site Administration</a></li>
'
+
'
<li><a class="link" ng-if="userIsSuperuser && context ==
\'
superadmin
\'
" href="/">Exit Site Administration</a></li>
'
+
'
<li><a class="link" href="/auth/logout">Logout</a></li>
'
+
'
</ul>
'
+
'
</li>
'
+
...
...
This diff is collapsed.
Click to expand it.
resources/frontend_client/index.html
+
22
−
12
View file @
34f8a52a
...
...
@@ -146,19 +146,29 @@
<!-- SITE ADMINISTRATION (SUPER ADMIN) NAV -->
<nav
class=
"AdminNav"
ng-show=
"nav === 'superadmin'"
>
<div
class=
"bg-white border-bottom"
>
<div
class=
"py2 wrapper"
>
<a
class=
"AdminTitle link"
href=
"/superadmin/"
>
Site Administration
</a>
<div
class=
"mx1 float-right"
>
<a
class=
"AdminExit-trigger link"
href=
"/"
>
Exit Site Administration
</a>
</div>
<div
class=
"wrapper flex align-center"
>
<div
class=
"NavTitle flex align-center"
>
<svg
id=
"cog"
class=
"mr1"
xmlns=
"http://www.w3.org/2000/svg"
viewBox=
"0 0 32 32"
width=
"16px"
height=
"16px"
fill=
"currentcolor"
>
<path
d=
"M14 0 H18 L19 6 L20.707 6.707 L26 3.293 L28.707 6 L25.293 11.293 L26 13 L32 14 V18 L26 19 L25.293 20.707 L28.707 26 L26 28.707 L20.707 25.293 L19 26 L18 32 L14 32 L13 26 L11.293 25.293 L6 28.707 L3.293 26 L6.707 20.707 L6 19 L0 18 L0 14 L6 13 L6.707 11.293 L3.293 6 L6 3.293 L11.293 6.707 L13 6 L14 0 z M16 10 A6 6 0 0 0 16 22 A6 6 0 0 0 16 10 "
></path>
</svg>
<span
class=
"NavItem-text"
>
Site Administration
</span>
</div>
<section
class=
"mt1 wrapper"
>
<a
class=
"NavItem"
ng-class=
"{ 'is--selected' : isActive('/superadmin/') && !isActive('/superadmin/organization')}"
href=
"/superadmin/"
>
Global Settings
</a>
<a
class=
"NavItem"
ng-class=
"{ 'is--selected' : isActive('/superadmin/organization')}"
href=
"/superadmin/organization/"
>
Organizations
</a>
</section>
<ul
class=
"ml4 flex flex-full"
>
<li>
<a
class=
"NavItem"
ng-class=
"{ 'is--selected' : isActive('/superadmin/settings')}"
href=
"/superadmin/settings/"
>
<span
class=
"NavItem-text"
>
Global Settings
</span>
</a>
</li>
<li>
<a
class=
"NavItem"
ng-class=
"{ 'is--selected' : isActive('/superadmin/organization')}"
href=
"/superadmin/organization/"
>
<span
class=
"NavItem-text"
>
Organizations
</span>
</a>
</li>
</ul>
<!-- user profile dropdown -->
<mb-profile-link
user=
"user"
context=
"nav"
></mb-profile-link>
</div>
</nav>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment