diff options
| author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-14 19:26:37 +0000 |
|---|---|---|
| committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2016-11-21 19:14:18 +0000 |
| commit | cf94db702e486562cda04e3eaf6b5e915e4e7f36 (patch) | |
| tree | 5dea46e5d0a4025f72e25e19c541da14766018ec | |
| parent | 36fa5d660df96c49484cd27695da1df6e361eb8f (diff) | |
| download | gitlab-ce-cf94db702e486562cda04e3eaf6b5e915e4e7f36.tar.gz | |
Removed button styling from restricted visibility levels and added checkboxes with icons18136-ui-for-restricting-global-visibility-levels-is-unclear
Review changes
3 files changed, 11 insertions, 8 deletions
diff --git a/app/helpers/application_settings_helper.rb b/app/helpers/application_settings_helper.rb index be5e0301a43..6d10fe3e9d7 100644 --- a/app/helpers/application_settings_helper.rb +++ b/app/helpers/application_settings_helper.rb @@ -50,14 +50,14 @@ module ApplicationSettingsHelper def restricted_level_checkboxes(help_block_id) Gitlab::VisibilityLevel.options.map do |name, level| checked = restricted_visibility_levels(true).include?(level) - css_class = 'btn' - css_class += ' active' if checked - checkbox_name = 'application_setting[restricted_visibility_levels][]' + css_class = checked ? 'active' : '' + 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, autocomplete: 'off', - 'aria-describedby' => help_block_id) + name + 'aria-describedby' => help_block_id, + id: name) + visibility_level_icon(level) + name end end end diff --git a/app/views/admin/application_settings/_form.html.haml b/app/views/admin/application_settings/_form.html.haml index a236335131a..95cae5ea24b 100644 --- a/app/views/admin/application_settings/_form.html.haml +++ b/app/views/admin/application_settings/_form.html.haml @@ -22,9 +22,8 @@ .form-group = f.label :restricted_visibility_levels, class: 'control-label col-sm-2' .col-sm-10 - - data_attrs = { toggle: 'buttons' } - .btn-group{ data: data_attrs } - - restricted_level_checkboxes('restricted-visibility-help').each do |level| + - restricted_level_checkboxes('restricted-visibility-help').each do |level| + .checkbox = level %span.help-block#restricted-visibility-help Selected levels cannot be used by non-admin users for projects or snippets. diff --git a/changelogs/unreleased/18136-ui-for-restricting-global-visibility-levels-is-unclear.yml b/changelogs/unreleased/18136-ui-for-restricting-global-visibility-levels-is-unclear.yml new file mode 100644 index 00000000000..b8b8810ecfa --- /dev/null +++ b/changelogs/unreleased/18136-ui-for-restricting-global-visibility-levels-is-unclear.yml @@ -0,0 +1,4 @@ +--- +title: Changed restricted visibility admin buttons to checkboxes +merge_request: 7463 +author: |