add tab style

lib/views/layout-kibela/page.html

@@ -35,7 +35,7 @@
   {% if 'growi' === behaviorType() || 'crowi-plus' === behaviorType() %}
   <div class="row page-list m-t-30 p-10 p-t-20 p-b-20 bg-white">
     <div class="col-md-10">
-      {% include '../widget/page_list_and_timeline.html' %}
+      {% include '../widget/page_list_and_timeline_kibela.html' %}
     </div>
   </div>
   {% endif %}

lib/views/layout-kibela/page_list.html

@@ -41,7 +41,7 @@
 
   <div class="row page-list bg-white {% if isPortal %}m-t-30{% endif %}">
     <div class="col-md-10">
-      {% include '../widget/page_list_and_timeline.html' %}
+      {% include '../widget/page_list_and_timeline_kibela.html' %}
     </div>
   </div>
 {% endblock %}

lib/views/layout-kibela/user_page.html

@@ -54,7 +54,7 @@
   {% if 'growi' === behaviorType() || 'crowi-plus' === behaviorType() %}
   <div class="row page-list m-t-30">
     <div class="col-md-10">
-      {% include '../widget/page_list_and_timeline.html' %}
+      {% include '../widget/page_list_and_timeline_kibela.html' %}
     </div>
   </div>
   {% endif %}

lib/views/widget/page_content.html

@@ -14,7 +14,11 @@
 
   {% include 'page_alerts.html' %}
 
-  {% include 'page_tabs.html' %}
+
+ <!--
+    kibela layoutのために一時差し替え
+  {% include 'page_tabs.html' %} -->
+  {% include 'page_tabs_kibela.html' %}
 
   <div class="tab-content">
 

lib/views/widget/page_list_and_timeline_kibela.html

@@ -0,0 +1,43 @@
+<div class="page-list-container">
+  <ul class="nav nav-tabs customtab">
+      <li class="active"><a href="#view-list" data-toggle="tab">{{ t('List View') }}</a></li>
+      {% if isEnabledTimeline() %}
+      <li><a href="#view-timeline" data-toggle="tab">{{ t('Timeline View') }}</a></li>
+      {% endif %}
+  </ul>
+
+  <div class="tab-content">
+    {# list view #}
+    <div class="p-t-10 active tab-pane fade page-list-container in" id="view-list">
+      {% if pages.length == 0 %}
+        <div class="m-t-10">
+          {% if isTrashPage() %}
+          No deleted pages.
+          {% else %}
+          There are no pages under <strong>{{ path }}</strong>.
+          {% endif %}
+        </div>
+      {% else %}
+        {% include 'page_list.html' with { pages: pages, pager: pager, viewConfig: viewConfig } %}
+      {% endif %}
+    </div>
+
+    {# timeline view #}
+    {% if isEnabledTimeline() %}
+    <div class="tab-pane m-t-30" id="view-timeline" data-shown=0>
+      {% for page in pages %}
+      <div class="timeline-body" id="id-{{ page.id }}" data-page-path="{{ page.path }}">
+        <div class="panel panel-timeline">
+          <div class="panel-heading"><a href="{{ page.path }}">{{ decodeURIComponent(page.path) }}</a></div>
+          <div class="panel-body">
+            <div class="revision-body wiki"></div>
+          </div>
+        </div>
+        <script type="text/template">{{ page.revision.body.toString() | encodeHTML }}</script>
+      </div>
+      <hr>
+      {% endfor %}
+    </div>
+    {% endif %}
+  </div>
+</div>

lib/views/widget/page_tabs_kibela.html

@@ -0,0 +1,97 @@
+{% if page %}
+<ul class="nav nav-tabs customtab hidden-print">
+
+  {#
+    Left Tabs
+  #}
+  <li class="nav-main-left-tab active">
+    <a href="#revision-body" data-toggle="tab">
+      <i class="icon-control-play"></i> View
+    </a>
+  </li>
+
+  {% if !isTrashPage() %}
+  <li class="nav-main-left-tab nav-tab-edit">
+    <a {% if user %}href="#edit" data-toggle="tab"{% endif %} class="edit-button {% if not user %}edit-button-disabled{% endif %}">
+      <i class="icon-note"></i> {{ t('Edit') }}
+    </a>
+  </li>
+  {% if isHackmdSetup() %}
+  <li class="nav-main-left-tab nav-tab-hackmd">
+    <a {% if user %}href="#hackmd" data-toggle="tab"{% endif %} class="{% if not user %}edit-button-disabled{% endif %}">
+      <i class="fa fa-file-text-o"></i> {{ t('HackMD') }}
+    </a>
+  </li>
+  {% endif %}
+  {% endif %}
+
+  {#
+    Right Tabs
+  #}
+  {% if !isTrashPage() %}
+    {% if isPortal %}
+    <li class="nav-main-right-tab dropdown pull-right">
+      <a class="dropdown-toggle {% if not user %}dropdown-disabled{% endif %}" {% if user %}data-toggle="dropdown" href="#"{% endif %}>
+        <i class="icon-options-vertical"></i>
+      </a>
+      <ul class="dropdown-menu">
+        <li><a href="#" data-target="#create-template" data-toggle="modal"><i class="icon-fw icon-magic-wand"></i> {{ t('template.option_label.create/edit') }}</a></li>
+        {% if ('/' !== path) %}
+        <li class="divider"></li>
+        <li><a href="#" data-target="#unportalize" data-toggle="modal"><i class="fa fa-share"></i> {{ t('Unportalize') }}</a></li>
+        {% endif %}
+      </ul>
+    </li>
+    {% else %}
+    <li class="nav-main-right-tab dropdown pull-right">
+      <a class="dropdown-toggle {% if not user %}dropdown-disabled{% endif %}" {% if user %}data-toggle="dropdown" href="#"{% endif %}>
+        <i class="icon-options-vertical"></i>
+      </a>
+      <ul class="dropdown-menu">
+        <li><a href="#" data-target="#renamePage" data-toggle="modal"><i class="icon-fw icon-action-redo"></i> {{ t('Move') }}</a></li>
+        <li><a href="#" data-target="#duplicatePage" data-toggle="modal"><i class="icon-fw icon-docs"></i> {{ t('Duplicate') }}</a></li>
+        <li class="divider"></li>
+        <li><a href="#" data-target="#create-template" data-toggle="modal"><i class="icon-fw icon-magic-wand"></i> {{ t('template.option_label.create/edit') }}</a></li>
+        {% if isDeletablePage() %}
+        <li class="divider"></li>
+        <li><a href="#" data-target="#deletePage" data-toggle="modal"><i class="icon-fw icon-fire text-danger"></i> {{ t('Delete') }}</a></li>
+        {% endif %}
+      </ul>
+    </li>
+    {% endif %}
+  {% endif %}
+
+  <li class="nav-main-right-tab pull-right">
+    <a href="#revision-history" data-toggle="tab">
+      <i class="icon-layers"></i><span class="hidden-xs"> {{ t('History') }}</span>
+    </a>
+  </li>
+  {% if not isPortal %}
+    <li class="nav-main-right-tab pull-right">
+      <a href="?presentation=1" class="toggle-presentation">
+        <i class="icon-film"></i><span class="hidden-xs"> {{ t('Presentation Mode') }}</span>
+      </a>
+    </li>
+  {% endif %}
+
+</ul>
+
+{% else %} {# for creating portal #}
+
+<ul class="nav nav-tabs customtab nav-tabs-create-portal hidden-print">
+
+  <li class="nav-main-left-tab">
+    <a id="portal-form-close" href="#">
+      <i class="icon-action-undo"></i> {{ t('Cancel') }}
+    </a>
+  </li>
+
+  <li class="nav-main-left-tab active">
+    <a>
+      <i class="icon-note"></i> {{ t('Create') }}
+    </a>
+  </li>
+
+{% endif %}
+
+</ul>

resource/styles/agile-admin/inverse/colors/kibela.scss

@@ -25,6 +25,7 @@ $wikilinktext: lighten($themecolor, 20%);
 $wikilinktext-hover: lighten($wikilinktext, 20%);
 $inline-code-color: $subthemecolor;
 $inline-code-bg: lighten($subthemecolor,70%);
+$border: rgba(181, 203, 247, 0.61);
 
 @import 'apply-colors';
 @import 'apply-colors-light';

resource/styles/agile-admin/inverse/widgets.scss

@@ -665,7 +665,7 @@ Basic List
 }
 
 /*custom tab*/
-/*
+
 .tab-content{
   margin-top:30px;
 }
@@ -683,10 +683,10 @@ Basic List
   border:0px;
 
 }
-/*
+
 
 /*custom tab2*/
-/*
+
 .customtab2{
   border-bottom:1px solid $extralight;
   border-top:1px solid $extralight;
@@ -702,10 +702,10 @@ Basic List
   border:0px;
 
 }
-*/
+
 
 /*Vertical tabs*/
-/*
+
 .vtabs{
     display:table;
     .tabs-vertical{
@@ -732,10 +732,10 @@ Basic List
   margin-right:-1px;
   color:$white;
 }
-*/
+
 
 /*Custom vertical tab*/
-/*
+
 .customvtab .tabs-vertical li.active a, .customvtab .tabs-vertical li.active a:hover,  .customvtab .tabs-vertical li.active a:focus{
   background:$white;
   border:0px;
@@ -743,7 +743,7 @@ Basic List
   margin-right:-1px;
   color:$dark;
 }
-*/
+
 
 /*Nav pills*/
 .nav-pills>li.active>a, .nav-pills>li.active>a:focus, .nav-pills>li.active>a:hover{
@@ -756,7 +756,7 @@ Basic List
 }
 
 /*Accordion*/
-/*
+
 .panel-group {
   .panel {
     .panel-heading {
@@ -805,7 +805,7 @@ Basic List
     padding: 12px 20px;
   }
 }
-*/
+
 
 /*Progressbars*/
 /*