GC-2000 abolish theme method

src/server/models/config.js

@@ -460,11 +460,6 @@ module.exports = function(crowi) {
     return getValueForCrowiNS(config, key);
   };
 
-  configSchema.statics.theme = function(config) {
-    const key = 'customize:theme';
-    return getValueForCrowiNS(config, key);
-  };
-
   configSchema.statics.customTitle = function(config, page) {
     validateCrowi();
 

src/server/util/swigFunctions.js

@@ -225,11 +225,6 @@ module.exports = function(crowi, app, req, locals) {
     return Config.customHeader(config);
   };
 
-  locals.theme = function() {
-    const config = crowi.getConfig();
-    return Config.theme(config);
-  };
-
   locals.customTitle = function(page) {
     const config = crowi.getConfig();
     return Config.customTitle(config, page);

src/server/views/admin/customize.html

@@ -3,18 +3,11 @@
 {% block html_title %}{{ customTitle(t('Customize')) }} {% endblock %}
 
 {% block theme_css_block %}
-  {% if 'kibela' === layoutType() %}
-    {% if env === 'development' %}
-      <script src="{{ webpack_asset('styles/theme-kibela.js') }}"></script>
-    {% else %}
-      <link rel="stylesheet" href="{{ webpack_asset('styles/theme-kibela.css') }}">
-    {% endif %}
+  {% set themeName = getConfig('crowi', 'customize:theme') %}
+  {% if env === 'development' %}
+    <script src="{{ webpack_asset('styles/theme-' + themeName + '.js') }}"></script>
   {% else %}
-    {% if env === 'development' %}
-      <script src="{{ webpack_asset('styles/theme-' + theme() + '.js') }}"></script>
-    {% else %}
-    <link rel="stylesheet" id="jssDefault" {# append id for theme selector #} href="{{ webpack_asset('styles/theme-' + theme() + '.css') }}">
-    {% endif %}
+  <link rel="stylesheet" id="jssDefault" {# append id for theme selector #} href="{{ webpack_asset('styles/theme-' + themeName + '.css') }}">
   {% endif %}
 {% endblock %}
 

src/server/views/layout/layout.html

@@ -40,11 +40,12 @@
 
   <!-- styles -->
   {% include '../widget/headers/styles-for-app.html' %}
-  {% if 'kibela' === layoutType() %}
+  {% if 'kibela' === getConfig('crowi', 'customize:layout') %}
     {% include '../widget/headers/styles-theme-kibela.html' %}
   {% else %}
     {% block theme_css_block %}
-      {% include '../widget/headers/styles-theme.html' with {theme: theme()} %}
+      {% set themeName = getConfig('crowi', 'customize:theme') %}
+      {% include '../widget/headers/styles-theme.html' with {themeName: themeName} %}
     {% endblock %}
   {% endif %}