itizawa 5 лет назад
Родитель
Сommit
4a87bde62c

+ 1 - 1
src/server/models/config.js

@@ -107,7 +107,7 @@ module.exports = function(crowi) {
       'customize:highlightJsStyle' : 'github',
       'customize:highlightJsStyle' : 'github',
       'customize:highlightJsStyleBorder' : false,
       'customize:highlightJsStyleBorder' : false,
       'customize:theme' : 'default',
       'customize:theme' : 'default',
-      'customize:layout' : 'crowi',
+      'customize:layout' : 'growi',
       'customize:isEnabledTimeline' : true,
       'customize:isEnabledTimeline' : true,
       'customize:isSavedStatesOfTabChanges' : true,
       'customize:isSavedStatesOfTabChanges' : true,
       'customize:isEnabledAttachTitleHeader' : false,
       'customize:isEnabledAttachTitleHeader' : false,

+ 1 - 3
src/server/views/customlayout-selector/forbidden.html

@@ -1,6 +1,4 @@
-{% if !getConfig('crowi', 'customize:layout') || 'crowi' === getConfig('crowi', 'customize:layout') %}
-  {% include '../layout-crowi/forbidden.html' %}
-{% elseif !getConfig('crowi', 'customize:layout') || 'kibela' === getConfig('crowi', 'customize:layout')%}
+{% if 'kibela' === getConfig('crowi', 'customize:layout')%}
   {% include '../layout-kibela/forbidden.html' %}
   {% include '../layout-kibela/forbidden.html' %}
 {% else %}
 {% else %}
   {% include '../layout-growi/forbidden.html' %}
   {% include '../layout-growi/forbidden.html' %}

+ 1 - 3
src/server/views/customlayout-selector/not_creatable.html

@@ -1,6 +1,4 @@
-{% if !getConfig('crowi', 'customize:layout') || 'crowi' === getConfig('crowi', 'customize:layout') %}
-  {% include '../layout-crowi/not_creatable.html' %}
-{% elseif !getConfig('crowi', 'customize:layout') || 'kibela' === getConfig('crowi', 'customize:layout')%}
+{% if 'kibela' === getConfig('crowi', 'customize:layout')%}
   {% include '../layout-kibela/not_creatable.html' %}
   {% include '../layout-kibela/not_creatable.html' %}
 {% else %}
 {% else %}
   {% include '../layout-growi/not_creatable.html' %}
   {% include '../layout-growi/not_creatable.html' %}

+ 1 - 3
src/server/views/customlayout-selector/not_found.html

@@ -1,6 +1,4 @@
-{% if !getConfig('crowi', 'customize:layout') || 'crowi' === getConfig('crowi', 'customize:layout') %}
-  {% include '../layout-crowi/not_found.html' %}
-{% elseif !getConfig('crowi', 'customize:layout') || 'kibela' === getConfig('crowi', 'customize:layout')%}
+{% if 'kibela' === getConfig('crowi', 'customize:layout')%}
   {% include '../layout-kibela/not_found.html' %}
   {% include '../layout-kibela/not_found.html' %}
 {% else %}
 {% else %}
   {% include '../layout-growi/not_found.html' %}
   {% include '../layout-growi/not_found.html' %}

+ 1 - 3
src/server/views/customlayout-selector/page.html

@@ -1,6 +1,4 @@
-{% if !getConfig('crowi', 'customize:layout') || 'crowi' === getConfig('crowi', 'customize:layout') %}
-  {% include '../layout-crowi/page.html' %}
-{% elseif !getConfig('crowi', 'customize:layout') || 'kibela' === getConfig('crowi', 'customize:layout')%}
+{% if 'kibela' === getConfig('crowi', 'customize:layout')%}
   {% include '../layout-kibela/page.html' %}
   {% include '../layout-kibela/page.html' %}
 {% else %}
 {% else %}
   {% include '../layout-growi/page.html' %}
   {% include '../layout-growi/page.html' %}

+ 1 - 3
src/server/views/customlayout-selector/page_list.html

@@ -1,6 +1,4 @@
-{% if !getConfig('crowi', 'customize:layout') || 'crowi' === getConfig('crowi', 'customize:layout') %}
-  {% include '../layout-crowi/page_list.html' %}
-{% elseif !getConfig('crowi', 'customize:layout') || 'kibela' === getConfig('crowi', 'customize:layout')%}
+{% if 'kibela' === getConfig('crowi', 'customize:layout')%}
   {% include '../layout-kibela/page_list.html' %}
   {% include '../layout-kibela/page_list.html' %}
 {% else %}
 {% else %}
   {% include '../layout-growi/page_list.html' %}
   {% include '../layout-growi/page_list.html' %}

+ 1 - 3
src/server/views/customlayout-selector/user_page.html

@@ -1,6 +1,4 @@
-{% if !getConfig('crowi', 'customize:layout') || 'crowi' === getConfig('crowi', 'customize:layout') %}
-  {% include '../layout-crowi/user_page.html' %}
-{% elseif !getConfig('crowi', 'customize:layout') || 'kibela' === getConfig('crowi', 'customize:layout')%}
+{% if 'kibela' === getConfig('crowi', 'customize:layout')%}
   {% include '../layout-kibela/user_page.html' %}
   {% include '../layout-kibela/user_page.html' %}
 {% else %}
 {% else %}
   {% include '../layout-growi/user_page.html' %}
   {% include '../layout-growi/user_page.html' %}