Merge branch 'imprv/change-position-of-detail-button' into imprv/nav-adjustment

src/server/views/widget/page_tabs.html

@@ -41,59 +41,42 @@
     Right Tabs
   #}
 
-<!-- presentation -->
   {% if not page.isPortal() %}
-    <li class="nav-item ml-md-auto">
+    <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>
     </li>
   {% endif %}
 
-  <!-- revision history -->
+  <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 class="nav-link" href="#revision-history" role="tab" data-toggle="tab">
-        <i class="icon-layers"></i><span class="hidden-xs"> {{ t('History') }}</span>
+      <a
+        {% if user %} role="button" class="nav-link" 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>
     </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>
-        </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 %}
-        class="dropdown-toggle dropdown-toggle-disabled"
-        data-toggle="tooltip" data-placement="top" data-container="body" title="{{ t('Not available for guest') }}"
-      {% endif %}
-    >
-    <li class="nav-item d-flex align-items-center">
+    {% else %}
+    <li class="nav-item dropdown d-flex align-items-center">
+      <a
+        {% if user %} role="button" 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">
@@ -102,12 +85,13 @@
         <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>
+          <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>
-
+    </li>
+    {% endif %}
+  {% endif %}
 </ul>
 
 {% else %} {# for creating portal #}