Просмотр исходного кода

enable new layout from customize page

mayu morita 7 лет назад
Родитель
Сommit
3ec21afc21

+ 1 - 1
lib/views/admin/customize.html

@@ -197,7 +197,7 @@
             <h4>
               <div class="radio radio-primary">
                 <input type="radio" id="radioLayoutKibela" name="settingForm[customize:layout]" value="kibela"
-                    {% if !isLayoutGrowi %}checked="checked"{% endif %}>
+                    {% if isLayoutKibela %}checked="checked"{% endif %}>
                 <label   for="radioLayoutKibela">
                   Kibela Like Layout
                 </label>

+ 2 - 0
lib/views/customlayout-selector/forbidden.html

@@ -1,5 +1,7 @@
 {% if !layoutType() || 'crowi' === layoutType() %}
   {% include '../layout-crowi/forbidden.html' %}
+{% elseif !layoutType() || 'kibela' === layoutType()%}
+  {% include '../layout-kibela/forbidden.html' %}
 {% else %}
   {% include '../layout-growi/forbidden.html' %}
 {% endif %}

+ 2 - 0
lib/views/customlayout-selector/not_found.html

@@ -1,5 +1,7 @@
 {% if !layoutType() || 'crowi' === layoutType() %}
   {% include '../layout-crowi/not_found.html' %}
+{% elseif !layoutType() || 'kibela' === layoutType()%}
+  {% include '../layout-kibela/not_found.html' %}
 {% else %}
   {% include '../layout-growi/not_found.html' %}
 {% endif %}

+ 2 - 0
lib/views/customlayout-selector/page.html

@@ -1,5 +1,7 @@
 {% if !layoutType() || 'crowi' === layoutType() %}
   {% include '../layout-crowi/page.html' %}
+{% elseif %}
+  {% include '../layout-kibela/page.html' %}
 {% else %}
   {% include '../layout-growi/page.html' %}
 {% endif %}

+ 2 - 0
lib/views/customlayout-selector/page_list.html

@@ -1,5 +1,7 @@
 {% if !layoutType() || 'crowi' === layoutType() %}
   {% include '../layout-crowi/page_list.html' %}
+{% elseif !layoutType() || 'kibela' === layoutType()%}
+  {% include '../layout-kibela/page_list.html' %}
 {% else %}
   {% include '../layout-growi/page_list.html' %}
 {% endif %}

+ 2 - 0
lib/views/customlayout-selector/user_page.html

@@ -1,5 +1,7 @@
 {% if !layoutType() || 'crowi' === layoutType() %}
   {% include '../layout-crowi/user_page.html' %}
+{% elseif !layoutType() || 'kibela' === layoutType()%}
+  {% include '../layout-kibela/user_page.html' %}
 {% else %}
   {% include '../layout-growi/user_page.html' %}
 {% endif %}

+ 8 - 0
resource/styles/scss/theme/kibela.scss

@@ -0,0 +1,8 @@
+// import colors
+@import '../../agile-admin/inverse/colors/kibela';
+
+// apply agile-admin theme
+@import '../../agile-admin/inverse/style';
+
+// override
+@import 'override-agileadmin';