kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

show alternate description text for disabled visibility settings

Browse source
This commit is contained in:
Mike Greiling 2017-08-25 13:48:15 -05:00
parent 10a7478ed0
commit 04e3e609da
2 changed files with 20 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/assets/stylesheets/pages/settings.scss
View file

@ -158,15 +158,28 @@
color: $gl-text-color;
}
.option-descr {
.option-description,
.option-disabled-reason {
margin-left: 29px;
color: $project-option-descr-color;
}
.option-disabled-reason {
display: none;
}
&.disabled {
i.fa {
opacity: 0.5;
}
.option-description {
display: none;
}
.option-disabled-reason {
display: block;
}
}
}
}

11
app/views/shared/_visibility_radios.html.haml
View file

@ -8,9 +8,10 @@
= visibility_level_icon(level)
.option-title
= visibility_level_label(level)
.option-descr
.option-description
= visibility_level_description(level, form_model)
- unless restricted_visibility_levels.empty?
%div
%span.info
Some visibility level settings have been restricted by the administrator.
.option-disabled-reason
- if restricted
This visibility level has been restricted by the administrator.
- elsif disallowed
This option is not available the visibility of parent or child items prevents it.