Merge branch 'issue/#325-ahiqar-code-in-generic-tido' into 'develop'

ahiqar-code-in-generic-tido

See merge request !212

src/components/header.vue

@@ -5,10 +5,11 @@
       :class="$q.dark.isActive ? 'bg-white' : 'bg-accent'"
     >
       <BreadCrumbNavigation
-        v-if="$route.query.source==='external'"
+        v-if="$route.query.source === 'external'"
         :config="config"
       />
     </div>
+
     <div class="header__wrap">
       <q-toolbar v-if="config['header_section'].titles">
         <TitleBar
@@ -30,10 +31,10 @@
         <q-toolbar class="q-pb-sm">
           <Navbar
             v-if="config['header_section'].navigation"
+            :default-view="defaultView"
             :itemurls="itemurls"
             :labels="config.labels"
             :manifests="manifests"
-            :default-view="defaultView"
           />
 
           <q-space />
@@ -59,8 +60,8 @@
 </template>
 
 <script>
-import Navbar from '@/components/navbar.vue';
 import BreadCrumbNavigation from '@/components/breadcrumbnavigation.vue';
+import Navbar from '@/components/navbar.vue';
 import TitleBar from '@/components/titlebar.vue';
 import TogglePanels from '@/components/togglebar/togglePanels.vue';
 import Tools from '@/components/tools.vue';
@@ -68,17 +69,13 @@ import Tools from '@/components/tools.vue';
 export default {
   name: 'Header',
   components: {
+    BreadCrumbNavigation,
     Navbar,
     TitleBar,
     TogglePanels,
-    BreadCrumbNavigation,
     Tools,
   },
   props: {
-    defaultView: {
-      type: Function,
-      default: () => {},
-    },
     collectiontitle: {
       type: String,
       default: () => '',
@@ -87,6 +84,10 @@ export default {
       type: Object,
       default: () => {},
     },
+    defaultView: {
+      type: Function,
+      default: () => {},
+    },
     imageurl: {
       type: String,
       default: () => '',

src/components/titlebar.vue

 <template>
   <div>
-    <h1 class="text-h5 text-bold text-uppercase q-mb-none q-mt-xs">
-      {{ ahiqar ? $t('cTitle') : collectiontitle }}
+    <h1
+      v-if="collectiontitle"
+      class="text-h5 text-bold text-uppercase q-mb-none q-mt-xs"
+    >
+      {{ collectiontitle }}
     </h1>
+
     <h2 class="text-h6 text-bold text-uppercase q-mt-none q-mb-none">
       <span>{{ manifesttitle }}</span>
+
       <q-icon
         class="q-pb-xs q-pl-sm q-pr-sm"
         size="xs"
         :color="$q.dark.isActive ? 'white' : 'accent'"
         :name="fasChevronRight"
       />
+
       <span>{{ $t('Sheet') }} {{ item.n }}</span>
     </h2>
   </div>
@@ -37,7 +43,6 @@ export default {
   },
   data() {
     return {
-      ahiqar: true,
       sequenceindex: 0,
     };
   },

src/i18n/de/index.js

@@ -7,7 +7,6 @@ export default {
   colorScheme: 'Farbschema ändern',
   Contents: 'Inhalt',
   contentsMetadata: 'Inhalt & Metadaten',
-  cTitle: 'Die Geschichte und Redewendungen von Ahikar dem Weisen',
   'Current location': 'Aktueller Standort',
   'Date of creation': 'Erstelldatum',
   Decrease: 'Verkleinern',

src/i18n/en-us/index.js

@@ -7,7 +7,6 @@ export default {
   colorScheme: 'Change color',
   Contents: 'Contents',
   contentsMetadata: 'Contents & Metadata',
-  cTitle: 'The Story and Proverbs of Ahiqar the Wise',
   'Current location': 'Current location',
   'Date of creation': 'Date of creation',
   Decrease: 'Decrease',