Commit 4b274572 authored by schneider210's avatar schneider210
Browse files

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

ahiqar-code-in-generic-tido

See merge request !212
parents 1e3617c4 f23ef894
Pipeline #221730 passed with stages
in 5 minutes and 6 seconds
...@@ -5,10 +5,11 @@ ...@@ -5,10 +5,11 @@
:class="$q.dark.isActive ? 'bg-white' : 'bg-accent'" :class="$q.dark.isActive ? 'bg-white' : 'bg-accent'"
> >
<BreadCrumbNavigation <BreadCrumbNavigation
v-if="$route.query.source==='external'" v-if="$route.query.source === 'external'"
:config="config" :config="config"
/> />
</div> </div>
<div class="header__wrap"> <div class="header__wrap">
<q-toolbar v-if="config['header_section'].titles"> <q-toolbar v-if="config['header_section'].titles">
<TitleBar <TitleBar
...@@ -30,10 +31,10 @@ ...@@ -30,10 +31,10 @@
<q-toolbar class="q-pb-sm"> <q-toolbar class="q-pb-sm">
<Navbar <Navbar
v-if="config['header_section'].navigation" v-if="config['header_section'].navigation"
:default-view="defaultView"
:itemurls="itemurls" :itemurls="itemurls"
:labels="config.labels" :labels="config.labels"
:manifests="manifests" :manifests="manifests"
:default-view="defaultView"
/> />
<q-space /> <q-space />
...@@ -59,8 +60,8 @@ ...@@ -59,8 +60,8 @@
</template> </template>
<script> <script>
import Navbar from '@/components/navbar.vue';
import BreadCrumbNavigation from '@/components/breadcrumbnavigation.vue'; import BreadCrumbNavigation from '@/components/breadcrumbnavigation.vue';
import Navbar from '@/components/navbar.vue';
import TitleBar from '@/components/titlebar.vue'; import TitleBar from '@/components/titlebar.vue';
import TogglePanels from '@/components/togglebar/togglePanels.vue'; import TogglePanels from '@/components/togglebar/togglePanels.vue';
import Tools from '@/components/tools.vue'; import Tools from '@/components/tools.vue';
...@@ -68,17 +69,13 @@ import Tools from '@/components/tools.vue'; ...@@ -68,17 +69,13 @@ import Tools from '@/components/tools.vue';
export default { export default {
name: 'Header', name: 'Header',
components: { components: {
BreadCrumbNavigation,
Navbar, Navbar,
TitleBar, TitleBar,
TogglePanels, TogglePanels,
BreadCrumbNavigation,
Tools, Tools,
}, },
props: { props: {
defaultView: {
type: Function,
default: () => {},
},
collectiontitle: { collectiontitle: {
type: String, type: String,
default: () => '', default: () => '',
...@@ -87,6 +84,10 @@ export default { ...@@ -87,6 +84,10 @@ export default {
type: Object, type: Object,
default: () => {}, default: () => {},
}, },
defaultView: {
type: Function,
default: () => {},
},
imageurl: { imageurl: {
type: String, type: String,
default: () => '', default: () => '',
......
<template> <template>
<div> <div>
<h1 class="text-h5 text-bold text-uppercase q-mb-none q-mt-xs"> <h1
{{ ahiqar ? $t('cTitle') : collectiontitle }} v-if="collectiontitle"
class="text-h5 text-bold text-uppercase q-mb-none q-mt-xs"
>
{{ collectiontitle }}
</h1> </h1>
<h2 class="text-h6 text-bold text-uppercase q-mt-none q-mb-none"> <h2 class="text-h6 text-bold text-uppercase q-mt-none q-mb-none">
<span>{{ manifesttitle }}</span> <span>{{ manifesttitle }}</span>
<q-icon <q-icon
class="q-pb-xs q-pl-sm q-pr-sm" class="q-pb-xs q-pl-sm q-pr-sm"
size="xs" size="xs"
:color="$q.dark.isActive ? 'white' : 'accent'" :color="$q.dark.isActive ? 'white' : 'accent'"
:name="fasChevronRight" :name="fasChevronRight"
/> />
<span>{{ $t('Sheet') }} {{ item.n }}</span> <span>{{ $t('Sheet') }} {{ item.n }}</span>
</h2> </h2>
</div> </div>
...@@ -37,7 +43,6 @@ export default { ...@@ -37,7 +43,6 @@ export default {
}, },
data() { data() {
return { return {
ahiqar: true,
sequenceindex: 0, sequenceindex: 0,
}; };
}, },
......
...@@ -7,7 +7,6 @@ export default { ...@@ -7,7 +7,6 @@ export default {
colorScheme: 'Farbschema ändern', colorScheme: 'Farbschema ändern',
Contents: 'Inhalt', Contents: 'Inhalt',
contentsMetadata: 'Inhalt & Metadaten', contentsMetadata: 'Inhalt & Metadaten',
cTitle: 'Die Geschichte und Redewendungen von Ahikar dem Weisen',
'Current location': 'Aktueller Standort', 'Current location': 'Aktueller Standort',
'Date of creation': 'Erstelldatum', 'Date of creation': 'Erstelldatum',
Decrease: 'Verkleinern', Decrease: 'Verkleinern',
......
...@@ -7,7 +7,6 @@ export default { ...@@ -7,7 +7,6 @@ export default {
colorScheme: 'Change color', colorScheme: 'Change color',
Contents: 'Contents', Contents: 'Contents',
contentsMetadata: 'Contents & Metadata', contentsMetadata: 'Contents & Metadata',
cTitle: 'The Story and Proverbs of Ahiqar the Wise',
'Current location': 'Current location', 'Current location': 'Current location',
'Date of creation': 'Date of creation', 'Date of creation': 'Date of creation',
Decrease: 'Decrease', Decrease: 'Decrease',
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment