Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
nopaque
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
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
SFB 1288 - INF
nopaque
Commits
8e7d44ec
Commit
8e7d44ec
authored
1 year ago
by
Patrick Jentsch
Browse files
Options
Downloads
Patches
Plain Diff
Settings ui polish
parent
4ca2c0c8
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
app/static/js/App.js
+4
-0
4 additions, 0 deletions
app/static/js/App.js
app/templates/admin/user_settings.html.j2
+12
-19
12 additions, 19 deletions
app/templates/admin/user_settings.html.j2
app/templates/users/settings/settings.html.j2
+23
-12
23 additions, 12 deletions
app/templates/users/settings/settings.html.j2
with
39 additions
and
31 deletions
app/static/js/App.js
+
4
−
0
View file @
8e7d44ec
...
...
@@ -60,6 +60,10 @@ class App {
iconPrefix
=
'
<i class="left nopaque-icons">J</i>
'
;
break
;
}
case
'
settings
'
:
{
iconPrefix
=
'
<i class="left material-icons">settings</i>
'
;
break
;
}
default
:
{
iconPrefix
=
'
<i class="left material-icons">notifications</i>
'
;
break
;
...
...
This diff is collapsed.
Click to expand it.
app/templates/admin/user_settings.html.j2
+
12
−
19
View file @
8e7d44ec
...
...
@@ -19,25 +19,18 @@
<i class="caret material-icons">keyboard_arrow_right</i>
</div>
<div class="collapsible-body">
<div class="row">
<div class="col s12 l1">
<p><i class="material-icons">check</i></p>
</div>
<div class="col s12 l7">
<p>
Confirmed<br>
<span class="light">Change confirmation status manually.</span>
</p>
</div>
<div class="col s3 l4">
<div class="switch">
<label>
unconfirmed
<input {% if user.confirmed %}checked{% endif %} id="user-confirmed-switch" type="checkbox">
<span class="lever"></span>
confirmed
</label>
</div>
<div style="overflow: auto;">
<p class="left"><i class="material-icons">check</i></p>
<p class="left" style="margin-left: 10px;">
Confirmed<br>
<span class="light">Change confirmation status manually.</span>
</p>
<br class="hide-on-med-and-down">
<div class="switch right">
<label>
<input {% if user.confirmed %}checked{% endif %} id="user-confirmed-switch" type="checkbox">
<span class="lever"></span>
</label>
</div>
</div>
</div>
...
...
This diff is collapsed.
Click to expand it.
app/templates/users/settings/settings.html.j2
+
23
−
12
View file @
8e7d44ec
...
...
@@ -20,21 +20,32 @@
<ul class="collapsible no-autoinit settings-collapsible">
<li>
<div class="collapsible-header" style="justify-content: space-between;">
<span>
Profile
Privacy</span>
<span>Privacy</span>
<i class="material-icons caret">keyboard_arrow_right</i>
</div>
<div class="collapsible-body">
<div class="row">
<div class="col s12 l3">
<div class="switch">
<label>
private
<input {% if user.is_public %}checked{% endif %} id="profile-is-public-switch" type="checkbox">
<span class="lever"></span>
public
</label>
</div>
<div style="overflow: auto;">
<p class="left"><i class="material-icons">public</i></p>
<p class="left" style="margin-left: 10px;">
Public status<br>
<span class="light">Choose whether your profile is visible to other users.</span>
</p>
<br class="hide-on-med-and-down">
<div class="switch right">
<label>
<input {% if user.is_public %}checked{% endif %} id="profile-is-public-switch" type="checkbox">
<span class="lever"></span>
</label>
</div>
</div>
<div style="overflow: auto;">
<p class="left"><i class="material-icons">badge</i></p>
<p class="left" style="margin-left: 10px;">
Public data<br>
<span class="light">Choose which data is visible on your profile.</span>
</p>
</div>
<div class="row" style="margin-left: 24px;">
<div class="col s12 l3">
<label>
<input {% if user.has_profile_privacy_setting('SHOW_EMAIL') %}checked{% endif %} class="profile-privacy-setting-checkbox" data-profile-privacy-setting-name="SHOW_EMAIL" {% if not user.is_public %}disabled{% endif %} type="checkbox">
...
...
@@ -58,7 +69,7 @@
</li>
<li>
<div class="collapsible-header" style="justify-content: space-between;">
<span>
Profile i
nformation</span>
<span>
I
nformation</span>
<i class="material-icons caret">keyboard_arrow_right</i>
</div>
<div class="collapsible-body">
...
...
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