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
Léo-Paul Géneau
gitlab-ce
Commits
04e3e609
Commit
04e3e609
authored
Aug 25, 2017
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
show alternate description text for disabled visibility settings
parent
10a7478e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
6 deletions
+20
-6
app/assets/stylesheets/pages/settings.scss
app/assets/stylesheets/pages/settings.scss
+14
-1
app/views/shared/_visibility_radios.html.haml
app/views/shared/_visibility_radios.html.haml
+6
-5
No files found.
app/assets/stylesheets/pages/settings.scss
View file @
04e3e609
...
@@ -158,15 +158,28 @@
...
@@ -158,15 +158,28 @@
color
:
$gl-text-color
;
color
:
$gl-text-color
;
}
}
.option-descr
{
.option-description
,
.option-disabled-reason
{
margin-left
:
29px
;
margin-left
:
29px
;
color
:
$project-option-descr-color
;
color
:
$project-option-descr-color
;
}
}
.option-disabled-reason
{
display
:
none
;
}
&
.disabled
{
&
.disabled
{
i
.fa
{
i
.fa
{
opacity
:
0
.5
;
opacity
:
0
.5
;
}
}
.option-description
{
display
:
none
;
}
.option-disabled-reason
{
display
:
block
;
}
}
}
}
}
}
}
...
...
app/views/shared/_visibility_radios.html.haml
View file @
04e3e609
...
@@ -8,9 +8,10 @@
...
@@ -8,9 +8,10 @@
=
visibility_level_icon
(
level
)
=
visibility_level_icon
(
level
)
.option-title
.option-title
=
visibility_level_label
(
level
)
=
visibility_level_label
(
level
)
.option-descr
.option-descr
iption
=
visibility_level_description
(
level
,
form_model
)
=
visibility_level_description
(
level
,
form_model
)
-
unless
restricted_visibility_levels
.
empty?
.option-disabled-reason
%div
-
if
restricted
%span
.info
This visibility level has been restricted by the administrator.
Some visibility level settings have been restricted by the administrator.
-
elsif
disallowed
This option is not available the visibility of parent or child items prevents it.
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