Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
cf94db70
Commit
cf94db70
authored
Nov 14, 2016
by
Luke "Jared" Bennett
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Removed button styling from restricted visibility levels and added checkboxes with icons
Review changes
parent
36fa5d66
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
8 deletions
+11
-8
app/helpers/application_settings_helper.rb
app/helpers/application_settings_helper.rb
+5
-5
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+2
-3
changelogs/unreleased/18136-ui-for-restricting-global-visibility-levels-is-unclear.yml
...i-for-restricting-global-visibility-levels-is-unclear.yml
+4
-0
No files found.
app/helpers/application_settings_helper.rb
View file @
cf94db70
...
@@ -50,14 +50,14 @@ module ApplicationSettingsHelper
...
@@ -50,14 +50,14 @@ module ApplicationSettingsHelper
def
restricted_level_checkboxes
(
help_block_id
)
def
restricted_level_checkboxes
(
help_block_id
)
Gitlab
::
VisibilityLevel
.
options
.
map
do
|
name
,
level
|
Gitlab
::
VisibilityLevel
.
options
.
map
do
|
name
,
level
|
checked
=
restricted_visibility_levels
(
true
).
include?
(
level
)
checked
=
restricted_visibility_levels
(
true
).
include?
(
level
)
css_class
=
'btn'
css_class
=
checked
?
'active'
:
''
css_class
+=
' active'
if
checked
checkbox_name
=
"application_setting[restricted_visibility_levels][]"
checkbox_name
=
'application_setting[restricted_visibility_levels][]'
label_tag
(
checkbox_
name
,
class:
css_class
)
do
label_tag
(
name
,
class:
css_class
)
do
check_box_tag
(
checkbox_name
,
level
,
checked
,
check_box_tag
(
checkbox_name
,
level
,
checked
,
autocomplete:
'off'
,
autocomplete:
'off'
,
'aria-describedby'
=>
help_block_id
)
+
name
'aria-describedby'
=>
help_block_id
,
id:
name
)
+
visibility_level_icon
(
level
)
+
name
end
end
end
end
end
end
...
...
app/views/admin/application_settings/_form.html.haml
View file @
cf94db70
...
@@ -22,9 +22,8 @@
...
@@ -22,9 +22,8 @@
.form-group
.form-group
=
f
.
label
:restricted_visibility_levels
,
class:
'control-label col-sm-2'
=
f
.
label
:restricted_visibility_levels
,
class:
'control-label col-sm-2'
.col-sm-10
.col-sm-10
-
data_attrs
=
{
toggle:
'buttons'
}
-
restricted_level_checkboxes
(
'restricted-visibility-help'
).
each
do
|
level
|
.btn-group
{
data:
data_attrs
}
.checkbox
-
restricted_level_checkboxes
(
'restricted-visibility-help'
).
each
do
|
level
|
=
level
=
level
%span
.help-block
#restricted-visibility-help
%span
.help-block
#restricted-visibility-help
Selected levels cannot be used by non-admin users for projects or snippets.
Selected levels cannot be used by non-admin users for projects or snippets.
...
...
changelogs/unreleased/18136-ui-for-restricting-global-visibility-levels-is-unclear.yml
0 → 100644
View file @
cf94db70
---
title
:
Changed restricted visibility admin buttons to checkboxes
merge_request
:
7463
author
:
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment