Allow indenting settings so that they look like as if they belong to the preceding sibling setting

pull/6715/head
Wieland Lindenthal 6 years ago
parent 41475549a6
commit ba1e40252b
  1. 3
      app/assets/stylesheets/content/_forms.sass
  2. 2
      app/views/settings/_enterprise_feature_hint.html.erb
  3. 10
      app/views/settings/_work_packages.html.erb

@ -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

@ -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>

@ -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>
<%

Loading…
Cancel
Save