adjust nav

src/server/views/widget/page_tabs.html

@@ -41,47 +41,51 @@
     Right Tabs
   #}
 
-  <li class="nav-item ml-md-auto">
-    <a class="nav-link" href="#revision-history" role="tab" data-toggle="tab">
-      <i class="icon-layers"></i><span class="hidden-xs"> {{ t('History') }}</span>
-    </a>
-  </li>
-
-  {% if !isTrashPage() %}
-    {% if page.isPortal() %}
-    <li class="nav-item">
-      <a
-        {% if user %} role="button" class="nav-link  dropdown-toggle" data-toggle="dropdown" {% endif %}
-        {% if not user %}
-          class="dropdown-toggle dropdown-toggle-disabled"
-          data-toggle="tooltip" data-placement="top" data-container="body" title="{{ t('Not available for guest') }}"
-        {% endif %}
-      >
-        <i class="icon-options-vertical"></i>
+<!-- presentation -->
+  {% if not page.isPortal() %}
+    <li class="nav-item ml-md-auto">
+      <a href="?presentation=1" class="nav-link toggle-presentation">
+        <i class="icon-film"></i><span class="hidden-xs"> {{ t('Presentation Mode') }}</span>
       </a>
-      <div class="dropdown-menu dropdown-menu-right">
-        <a class="dropdown-item" href="#" data-target="#create-template" data-toggle="modal"><i class="icon-fw icon-magic-wand"></i> {{ t('template.option_label.create/edit') }}</a>
-        {% if ('/' !== path) %}
-          <div class="dropdown-divider"></div>
-          <a class="dropdown-item" href="#" data-target="#unportalize" data-toggle="modal"><i class="fa fa-share"></i> {{ t('Unportalize') }}</a>
-          {% if isDeletablePage() %}
-            <a class="dropdown-item" href="#" data-target="#deletePage" data-toggle="modal"><i class="icon-fw icon-fire text-danger"></i> {{ t('Delete') }}</a>
-          {% endif %}
-        {% endif %}
-      </div>
     </li>
-    {% else %}
-    {% endif %}
   {% endif %}
 
-  {% if not page.isPortal() %}
+  <!-- revision history -->
     <li class="nav-item">
-      <a href="?presentation=1" class="nav-link toggle-presentation">
-        <i class="icon-film"></i><span class="hidden-xs"> {{ t('Presentation Mode') }}</span>
+      <a class="nav-link" href="#revision-history" role="tab" data-toggle="tab">
+        <i class="icon-layers"></i><span class="hidden-xs"> {{ t('History') }}</span>
       </a>
     </li>
-  {% endif %}
-  <li class="nav-item dropdown d-flex align-items-center">
+
+    {% if !isTrashPage() %}
+      {% if page.isPortal() %}
+      <li class="nav-item">
+        <a
+          {% if user %} role="button" class="nav-link  dropdown-toggle" data-toggle="dropdown" {% endif %}
+          {% if not user %}
+            class="dropdown-toggle dropdown-toggle-disabled"
+            data-toggle="tooltip" data-placement="top" data-container="body" title="{{ t('Not available for guest') }}"
+          {% endif %}
+        >
+          <i class="icon-options-vertical"></i>
+        </a>
+        <div class="dropdown-menu dropdown-menu-right">
+          <a class="dropdown-item" href="#" data-target="#create-template" data-toggle="modal"><i class="icon-fw icon-magic-wand"></i> {{ t('template.option_label.create/edit') }}</a>
+          {% if ('/' !== path) %}
+            <div class="dropdown-divider"></div>
+            <a class="dropdown-item" href="#" data-target="#unportalize" data-toggle="modal"><i class="fa fa-share"></i> {{ t('Unportalize') }}</a>
+            {% if isDeletablePage() %}
+              <a class="dropdown-item" href="#" data-target="#deletePage" data-toggle="modal"><i class="icon-fw icon-fire text-danger"></i> {{ t('Delete') }}</a>
+            {% endif %}
+          {% endif %}
+        </div>
+      </li>
+      {% else %}
+      {% endif %}
+    {% endif %}
+
+  <!-- vertical dot icon -->
+  <li class="nav-item dropdown">
     <a
       {% if user %} role="button" data-toggle="dropdown" {% endif %}
       {% if not user %}
@@ -89,20 +93,20 @@
         data-toggle="tooltip" data-placement="top" data-container="body" title="{{ t('Not available for guest') }}"
       {% endif %}
     >
-      <i class="icon-options-vertical"></i>
-    </a>
-    <div class="dropdown-menu dropdown-menu-right">
-      <a class="dropdown-item" href="#" data-target="#renamePage" data-toggle="modal"><i class="icon-fw icon-action-redo"></i> {{ t('Move/Rename') }}</a>
-      <a class="dropdown-item" href="#" data-target="#duplicatePage" data-toggle="modal"><i class="icon-fw icon-docs"></i> {{ t('Duplicate') }}</a>
-      <div class="dropdown-divider"></div>
-      <a class="dropdown-item" href="#" data-target="#create-template" data-toggle="modal"><i class="icon-fw icon-magic-wand"></i> {{ t('template.option_label.create/edit') }}</a>
-      {% if isDeletablePage() %}
-      <div class="dropdown-divider"></div>
-      <a class="dropdown-item" href="#" data-target="#deletePage" data-toggle="modal"><i class="icon-fw icon-fire text-danger"></i> {{ t('Delete') }}</a>
-      {% endif %}
-    </u>
+    <li class="nav-item d-flex align-items-center">
+        <i class="icon-options-vertical"></i>
+      </a>
+      <div class="dropdown-menu dropdown-menu-right">
+        <a class="dropdown-item" href="#" data-target="#renamePage" data-toggle="modal"><i class="icon-fw icon-action-redo"></i> {{ t('Move/Rename') }}</a>
+        <a class="dropdown-item" href="#" data-target="#duplicatePage" data-toggle="modal"><i class="icon-fw icon-docs"></i> {{ t('Duplicate') }}</a>
+        <div class="dropdown-divider"></div>
+        <a class="dropdown-item" href="#" data-target="#create-template" data-toggle="modal"><i class="icon-fw icon-magic-wand"></i> {{ t('template.option_label.create/edit') }}</a>
+        {% if isDeletablePage() %}
+        <div class="dropdown-divider"></div>
+        <a class="dropdown-item" href="#" data-target="#deletePage" data-toggle="modal"><i class="icon-fw icon-fire text-danger"></i> {{ t('Delete') }}</a>
+        {% endif %}
+      </u>
   </li>
-
 </ul>
 
 {% else %} {# for creating portal #}