From 04e3e609daa54a62b0caf5a5ed5ade1cdb8c5eae Mon Sep 17 00:00:00 2001
From: Mike Greiling <mike@pixelcog.com>
Date: Fri, 25 Aug 2017 13:48:15 -0500
Subject: [PATCH] show alternate description text for disabled visibility
 settings

---
 app/assets/stylesheets/pages/settings.scss    | 15 ++++++++++++++-
 app/views/shared/_visibility_radios.html.haml | 11 ++++++-----
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/app/assets/stylesheets/pages/settings.scss b/app/assets/stylesheets/pages/settings.scss
index f7f8119994b..41a6ba2023a 100644
--- a/app/assets/stylesheets/pages/settings.scss
+++ b/app/assets/stylesheets/pages/settings.scss
@@ -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;
+      }
     }
   }
 }
diff --git a/app/views/shared/_visibility_radios.html.haml b/app/views/shared/_visibility_radios.html.haml
index d8d1093d4e3..8a80ccd4030 100644
--- a/app/views/shared/_visibility_radios.html.haml
+++ b/app/views/shared/_visibility_radios.html.haml
@@ -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.