From ba1e40252ba0b110e48445170bc156acf32ee12f Mon Sep 17 00:00:00 2001
From: Wieland Lindenthal <w.lindenthal@forkmerge.com>
Date: Mon, 15 Oct 2018 16:37:55 +0200
Subject: [PATCH] Allow indenting settings so that they look like as if they
 belong to the preceding sibling setting

---
 app/assets/stylesheets/content/_forms.sass           |  3 +++
 app/views/settings/_enterprise_feature_hint.html.erb |  2 +-
 app/views/settings/_work_packages.html.erb           | 10 ++++++----
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/assets/stylesheets/content/_forms.sass b/app/assets/stylesheets/content/_forms.sass
index 446ab4af9e..a11af54924 100644
--- a/app/assets/stylesheets/content/_forms.sass
+++ b/app/assets/stylesheets/content/_forms.sass
@@ -363,6 +363,9 @@ fieldset.form--fieldset
   &.-no-margin
     margin-bottom: 0
 
+  &.-indented
+    @extend %form--field-after-container
+
 .form--label
   @include grid-content(2)
   @extend %label-style
diff --git a/app/views/settings/_enterprise_feature_hint.html.erb b/app/views/settings/_enterprise_feature_hint.html.erb
index 7cdf87c9a9..0bb68a36e1 100644
--- a/app/views/settings/_enterprise_feature_hint.html.erb
+++ b/app/views/settings/_enterprise_feature_hint.html.erb
@@ -1,5 +1,5 @@
 <% unless EnterpriseToken.allows_to?(ee_feature) %>
-  <span class="form--field-instructions">
+  <span class="form--field -indented">
     <div class="ee-attribute-highlighting-upsale notification-box -ee-upsale">
       <div class="notification-box--content">
         <p><strong><%= title.present? ? title : t('js.upsale.ee_only') %></strong></p>
diff --git a/app/views/settings/_work_packages.html.erb b/app/views/settings/_work_packages.html.erb
index cbe4c4c0cb..496c14a723 100644
--- a/app/views/settings/_work_packages.html.erb
+++ b/app/views/settings/_work_packages.html.erb
@@ -54,13 +54,15 @@ See docs/COPYRIGHT.rdoc for more details.
                    }
                  } %>
     </div>
-    <div class="form--field settings--highlighted-attributes" style="<%= 'display: none' unless Setting[:work_package_list_default_highlighting_mode] == 'inline' %>">
-      <%= setting_multiselect :work_package_list_default_highlighted_attributes,
+    <% if EnterpriseToken.allows_to? :conditional_highlighting %>
+      <div class="form--field -indented -vertical settings--highlighted-attributes" style="<%= 'display: none' unless Setting[:work_package_list_default_highlighting_mode] == 'inline' %>">
+        <%= setting_multiselect :work_package_list_default_highlighted_attributes,
                               Query.available_columns(nil).select(&:highlightable).map { |column|
                                 [column.caption, column.name.to_s]
                               }
-      %>
-    </div>
+        %>
+      </div>
+    <% end %>
   </section>
   <fieldset class="form--fieldset"><legend class="form--fieldset-legend"><%= t(:setting_column_options) %></legend>
     <%