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
0
Merge Requests
0
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
Kazuhiko Shiozaki
gitlab-ce
Commits
4e4ab489
Commit
4e4ab489
authored
Jul 10, 2015
by
Darby
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changed to using the btn class
parent
5571b735
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
2 additions
and
15 deletions
+2
-15
app/assets/stylesheets/pages/admin.scss
app/assets/stylesheets/pages/admin.scss
+0
-13
app/helpers/application_settings_helper.rb
app/helpers/application_settings_helper.rb
+1
-1
app/views/admin/application_settings/_form.html.haml
app/views/admin/application_settings/_form.html.haml
+1
-1
No files found.
app/assets/stylesheets/pages/admin.scss
View file @
4e4ab489
...
@@ -61,16 +61,3 @@
...
@@ -61,16 +61,3 @@
@extend
.broadcast-message
;
@extend
.broadcast-message
;
margin-bottom
:
20px
;
margin-bottom
:
20px
;
}
}
.btn-visibility
{
.btn-primary
{
color
:
black
;
background-color
:
white
;
border-color
:
black
;
}
.btn-primary.active
{
color
:
black
;
background-color
:
#d3d3d3
;
border-color
:
black
;
}
}
app/helpers/application_settings_helper.rb
View file @
4e4ab489
...
@@ -28,7 +28,7 @@ module ApplicationSettingsHelper
...
@@ -28,7 +28,7 @@ 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
btn-primary
'
css_class
=
'btn'
css_class
+=
' active'
if
checked
css_class
+=
' active'
if
checked
checkbox_name
=
'application_setting[restricted_visibility_levels][]'
checkbox_name
=
'application_setting[restricted_visibility_levels][]'
...
...
app/views/admin/application_settings/_form.html.haml
View file @
4e4ab489
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
=
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'
}
-
data_attrs
=
{
toggle:
'buttons'
}
.btn-group
.btn-visibility
{
data:
data_attrs
}
.btn-group
{
data:
data_attrs
}
-
restricted_level_checkboxes
(
'restricted-visibility-help'
).
each
do
|
level
|
-
restricted_level_checkboxes
(
'restricted-visibility-help'
).
each
do
|
level
|
=
level
=
level
%span
.help-block
#restricted-visibility-help
Selected levels cannot be used by non-admin users for projects or snippets
%span
.help-block
#restricted-visibility-help
Selected levels cannot be used by non-admin users for projects or snippets
...
...
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