Add theme column to custom_styles table to save the currently used theme and show the correct one in the select field

app/assets/stylesheets/content/_forms.sass

@@ -236,6 +236,10 @@ hr
 fieldset.form--fieldset
   @extend %form--fieldset-or-section
 
+  &.-collapsible.collapsed
+    .-hide-when-collapsed
+      display: none
+
 .form--fieldset-legend
   @extend %form--fieldset-legend-or-section-title
   width:     100%

app/assets/stylesheets/openproject/_variables.scss.erb

@@ -2,7 +2,7 @@
 Depend on the design file so that this is recompiled on core changes.
 Doesn't work for theme plugins, sorry :-/ just update the core design.rb as well to reload!
 %>
-<% depend_on Rails.root.join('lib', 'open_project', 'design.rb') %>
+<% depend_on Rails.root.join('lib', 'open_project', 'custom_styles', 'design.rb') %>
 
 <%#
 Set defaults for the following variables

app/controllers/custom_styles_controller.rb

@@ -37,6 +37,8 @@ class CustomStylesController < ApplicationController
 
   def show
     @custom_style = CustomStyle.current || CustomStyle.new
+    @themes = OpenProject::CustomStyles::ColorThemes::THEMES.map { |val| val[:name] }
+    @current_theme = @custom_style.theme
   end
 
   def upsale; end
@@ -88,6 +90,7 @@ class CustomStylesController < ApplicationController
   def update_colors
     variable_params = params[:design_colors].first
     set_colors(variable_params)
+    set_theme(params)
 
     redirect_to action: :show
   end
@@ -95,6 +98,7 @@ class CustomStylesController < ApplicationController
   def update_themes
     variable_params = OpenProject::CustomStyles::ColorThemes::THEMES.find { |theme| theme[:name] == params[:theme] }[:colors]
     set_colors(variable_params)
+    set_theme(params)
 
     redirect_to action: :show
   end
@@ -122,6 +126,11 @@ class CustomStylesController < ApplicationController
     end
   end
 
+  def set_theme(params)
+    @custom_style = CustomStyle.current
+    @custom_style.update(params.permit(:theme))
+  end
+
   def require_ee_token
     unless EnterpriseToken.allows_to?(:define_custom_style)
       redirect_to custom_style_upsale_path

app/views/custom_styles/show.html.erb

@@ -33,6 +33,23 @@ See docs/COPYRIGHT.rdoc for more details.
 
 <%= error_messages_for 'custom_style' %>
 
+<%= form_tag update_design_themes_path, method: :post, class: "form" do %>
+  <section class="form--section">
+    <fieldset class="form--fieldset">
+      <legend class="form--fieldset-legend"><%= I18n.t('admin.custom_styles.color_themes') %></legend>
+      <div class="form--field">
+        <div class="form--field-container">
+          <%= styled_select_tag 'theme',
+                                options_for_select(@themes, @current_theme),
+                                container_class: '-slim' %>
+        </div>
+      </div>
+
+      <button type="submit" class="button"><%= I18n.t(:button_save) %></button>
+    </fieldset>
+  </section>
+<% end %>
+
 <%= form_for @custom_style, url: custom_style_path, html: { multipart: true, class: "form -vertical" } do |f| %>
   <section class="form--section">
     <fieldset class="form--fieldset">
@@ -137,23 +154,6 @@ See docs/COPYRIGHT.rdoc for more details.
   </section>
 <% end %>
 
-<%= form_tag update_design_themes_path, method: :post, class: "form" do %>
-  <section class="form--section">
-    <fieldset class="form--fieldset">
-      <legend class="form--fieldset-legend"><%= I18n.t('admin.custom_styles.color_themes') %></legend>
-      <div class="form--field">
-        <div class="form--field-container">
-          <%= styled_select_tag 'theme',
-                                options_for_select(OpenProject::CustomStyles::ColorThemes::THEMES.map { |val| val[:name] }),
-                                container_class: '-slim' %>
-        </div>
-      </div>
-
-      <button type="submit" class="button"><%= I18n.t(:button_save) %></button>
-    </fieldset>
-  </section>
-<% end %>
-
 <%= form_tag update_design_colors_path, method: :post, class: "form" do %>
   <section class="form--section">
     <fieldset class="form--fieldset -collapsible collapsed">
@@ -181,7 +181,7 @@ See docs/COPYRIGHT.rdoc for more details.
         </div>
       <% end %>
 
-      <button type="submit" class="button"><%= I18n.t(:button_save) %></button>
+      <button type="submit" class="button -hide-when-collapsed"><%= I18n.t(:button_save) %></button>
 
     </fieldset>
   </section>

db/migrate/20200114091135_add_theme_name_to_custom_styles.rb

@@ -0,0 +1,5 @@
+class AddThemeNameToCustomStyles < ActiveRecord::Migration[6.0]
+  def change
+    add_column :custom_styles, :theme, :string, default: ""
+  end
+end

lib/open_project.rb

@@ -35,7 +35,7 @@ require 'open_project/custom_field_format'
 require 'open_project/logging/log_delegator'
 require 'redmine/mime_type'
 require 'redmine/core_ext'
-require 'open_project/design'
+require 'open_project/custom_styles/design'
 require 'redmine/hook'
 require 'open_project/hooks'
 require 'redmine/plugin'

modules/bim_seeder/lib/open_project/bim_seeder/patches/design_patch.rb

@@ -1,4 +1,4 @@
-require 'open_project/design'
+require 'open_project/custom_styles/design'
 
 module OpenProject::BimSeeder
   module Patches