Merge pull request #109 from pacien/feature-secondary-command-buttons

viewer: secondary command buttons

4 files changed, 39 insertions, 23 deletions

diff --git a/viewer/src/assets/scss/global.scss b/viewer/src/assets/scss/global.scss
index 4acaf13..dda722b 100644
--- a/viewer/src/assets/scss/global.scss
+++ b/viewer/src/assets/scss/global.scss
@@ -60,6 +60,7 @@
 
 .disabled {
   color: $disabled-color !important;
+  cursor: initial;
 }
 
 // === Scrollbar styling
diff --git a/viewer/src/components/LdCommand.vue b/viewer/src/components/LdCommand.vue
index 54b602c..7590ea7 100644
--- a/viewer/src/components/LdCommand.vue
+++ b/viewer/src/components/LdCommand.vue
@@ -2,6 +2,7 @@
 --             pictures into a searchable web gallery.
 --
 -- Copyright (C) 2019-2020  Guillaume FOUET
+--               2020       Pacien TRAN-GIRARD
 --
 -- This program is free software: you can redistribute it and/or modify
 -- it under the terms of the GNU Affero General Public License as
@@ -19,16 +20,21 @@
 
 <template>
   <div class="flex command-btns">
-    <div class="link" :title="$t('title.tags')" @click="$uiStore.toggleFullWidth()">
-      <fa-icon :icon="commandTagsIcon()" size="lg" />
-    </div>
-    <router-link to="/" :class="{'disabled': isRoot()}" :title="$t('title.home')">
+    <a class="link" :title="$t('command.search')" @click="$uiStore.toggleFullWidth()">
+      <fa-icon :icon="commandToggleSearchPanelIcon()" size="lg" />
+    </a>
+    <router-link
+      to="/"
+      class="command-secondary"
+      :class="{'disabled': isRoot()}"
+      :title="$t('command.home')"
+    >
       <fa-icon icon="home" size="lg" />
     </router-link>
-    <div class="link" :title="$t('title.back')" @click="$router.go(-1)">
+    <a class="link command-secondary" :title="$t('command.back')" @click="$router.go(-1)">
       <fa-icon icon="arrow-left" size="lg" />
-    </div>
-    <router-link :class="{'disabled': isRoot()}" :title="$t('title.parent')" :to="parent()">
+    </a>
+    <router-link :class="{'disabled': isRoot()}" :title="$t('command.parent')" :to="parent()">
       <fa-icon icon="folder" size="xs" />
       <fa-icon icon="level-up-alt" size="lg" />
     </router-link>
@@ -41,8 +47,8 @@ import { RawLocation } from "vue-router";
 
 @Component
 export default class LdCommand extends Vue {
-  commandTagsIcon(): string {
-    return this.$uiStore.fullWidth ? "tags" : "window-close";
+  commandToggleSearchPanelIcon(): string {
+    return this.$uiStore.fullWidth ? "search" : "angle-double-left";
   }
 
   isRoot(): boolean {
@@ -57,6 +63,7 @@ export default class LdCommand extends Vue {
 </script>
 
 <style lang="scss">
+@import "@/assets/scss/_buefy_variables.scss";
 @import "@/assets/scss/theme.scss";
 
 .command-btns {
@@ -64,12 +71,22 @@ export default class LdCommand extends Vue {
   justify-content: space-around;
   vertical-align: middle;
   align-items: center;
-  width: $layout-left;
-  > * {
-    // Unify the minor size differences between icons
-    width: 26px;
-    height: 26px;
-    margin-top: 2px;
+  flex: 0 0 $layout-left;
+
+  > a {
+    // normalise icon active boxes
+    width: $layout-top;
+    line-height: $layout-top;
+    text-align: center;
+    vertical-align: middle;
+  }
+
+  @media only screen and (max-width: $tablet) {
+    flex: 0 1;
+
+    > .command-secondary {
+      display: none;
+    }
   }
 }
 </style>
diff --git a/viewer/src/locales/en.json b/viewer/src/locales/en.json
index 453fc5f..dcdf5c5 100644
--- a/viewer/src/locales/en.json
+++ b/viewer/src/locales/en.json
@@ -12,8 +12,8 @@
   "tag-propositions.intersection": "Search for this tag",
   "tag-propositions.item-count": "Item count",
   "gallery.unknowntype": "Unknown item type",
-  "title.tags": "Tags",
-  "title.home": "Home",
-  "title.back": "Back",
-  "title.parent": "Parent"
+  "command.search": "Open search panel",
+  "command.home": "Go to gallery home",
+  "command.back": "Go back",
+  "command.parent": "Go to parent directory"
 }
diff --git a/viewer/src/plugins/fontawesome.ts b/viewer/src/plugins/fontawesome.ts
index d70746d..e8848f9 100644
--- a/viewer/src/plugins/fontawesome.ts
+++ b/viewer/src/plugins/fontawesome.ts
@@ -30,9 +30,8 @@ import {
     faHome,
     faArrowLeft,
     faLevelUpAlt,
-    faTags,
     faAngleRight,
-    faWindowClose,
+    faAngleDoubleLeft,
     faFile,
 } from "@fortawesome/free-solid-svg-icons";
 
@@ -45,9 +44,8 @@ library.add(
     faHome,
     faArrowLeft,
     faLevelUpAlt,
-    faTags,
     faAngleRight,
-    faWindowClose,
+    faAngleDoubleLeft,
     faFile,
 );