Commit a38d425f authored by schneider210's avatar schneider210
Browse files

Merge branch 'issue/#265-move-misc-icons' into 'develop'

move-misc-icons

See merge request subugoe/emo/Qviewer!186
parents aeae4358 a533f92b
Pipeline #205145 passed with stages
in 7 minutes and 10 seconds
......@@ -187,7 +187,7 @@ You can fully customize the Viewer's behaviour:
There are options to
- change the color scheme
- show or hide individual bars (info, navigation, toggles)
- show or hide individual bars (titles, navigation, toggles)
- group multiple components inside a single panel
- set the order of the panels
- rename labels and / or panel headings
......@@ -232,11 +232,11 @@ As a rule of thumb, each key with a boolean value (e.g. *true* or *false*) defau
"secondary": "",
"accent": ""
},
"headers": {
"all": true,
"info": true,
"header_section": {
"show": true,
"navigation": true,
"panelheadings": true,
"titles": true,
"toggle": true
},
"labels": {
......@@ -346,7 +346,7 @@ As a rule of thumb, each key with a boolean value (e.g. *true* or *false*) defau
If any value is left blank (e.g. `"primary": "",`), a default color scheme will be used.
- **headers**
- **header_section**
- **show**
......@@ -356,10 +356,6 @@ As a rule of thumb, each key with a boolean value (e.g. *true* or *false*) defau
*(A use case might be to embed the Viewer into an existing website and you simply need more screen space)*
- **info**
set this value to `false` if you want to switch off the Infobar (a.k.a. breadcrumbs)
- **navigation**
set this value to `false` if you want to switch off the NavBar
......@@ -368,6 +364,10 @@ As a rule of thumb, each key with a boolean value (e.g. *true* or *false*) defau
set this value to `false` if you want to switch off the panels' headings respectively
- **titles**
set this value to `false` if you want to switch off the Titlebar (a.k.a. breadcrumbs)
- **toggle**
set this value to `false` if you want to switch off the ToggleBar.
......
......@@ -5,7 +5,7 @@
view="hHh Lpr fFf"
>
<Header
v-if="config.headers.all"
v-if="config['header_section'].show"
:collectiontitle="collectiontitle"
:config="config"
:imageurl="imageurl"
......
<template>
<q-header :class="$q.dark.isActive ? 'bg-dark' : 'bg-secondary text-primary'">
<div class="header__wrap">
<q-toolbar v-if="config.headers.info">
<Infobar
v-if="config.headers.info && manifests.length"
<q-toolbar v-if="config['header_section'].titles">
<TitleBar
v-if="manifests.length"
class="col-xs-9"
:collectiontitle="collectiontitle"
:item="item"
:manifests="manifests"
/>
<div class="row no-wrap justify-end col-xs-3">
<!-- TODO: make component out of the following and re-use it to avoid duplication -->
<Language
v-if="standalone"
:config="config"
/>
<Color :projectcolors="projectcolors" />
<Softwareinfo />
</div>
<Tools
:config="config"
:projectcolors="projectcolors"
:standalone="standalone"
/>
</q-toolbar>
<div>
<q-toolbar class="q-pb-sm">
<Navbar
v-if="config.headers.navigation"
v-if="config['header_section'].navigation"
:itemurls="itemurls"
:labels="config.labels"
:manifests="manifests"
......@@ -32,21 +29,18 @@
<q-space />
<TogglePanels
v-if="config.headers.toggle"
v-if="config['header_section'].toggle"
:panels="panels"
/>
<div
v-if="!config.headers.info"
class="row no-wrap justify-end col-xs-3"
v-if="!config['header_section'].titles"
>
<!-- TODO: make component out of the following and re-use it to avoid duplication -->
<Language
v-if="standalone"
<Tools
:config="config"
:projectcolors="projectcolors"
:standalone="standalone"
/>
<Color :projectcolors="projectcolors" />
<Softwareinfo />
</div>
</q-toolbar>
</div>
......@@ -55,22 +49,18 @@
</template>
<script>
import Color from '@/components/color.vue';
import Infobar from '@/components/infobar.vue';
import Language from '@/components/language.vue';
import Navbar from '@/components/navbar.vue';
import Softwareinfo from '@/components/softwareinfo.vue';
import TitleBar from '@/components/titlebar.vue';
import TogglePanels from '@/components/togglebar/togglePanels.vue';
import Tools from '@/components/tools.vue';
export default {
name: 'Header',
components: {
Color,
Infobar,
Language,
Navbar,
Softwareinfo,
TitleBar,
TogglePanels,
Tools,
},
props: {
collectiontitle: {
......
......@@ -20,7 +20,7 @@
import { fasChevronRight } from '@quasar/extras/fontawesome-v5';
export default {
name: 'Infobar',
name: 'Titlebar',
props: {
collectiontitle: {
type: String,
......
<template>
<div class="row no-wrap justify-end col-xs-3">
<Language
v-if="standalone"
:config="config"
/>
<Color :projectcolors="projectcolors" />
<Softwareinfo />
</div>
</template>
<script>
import Color from '@/components/color.vue';
import Language from '@/components/language.vue';
import Softwareinfo from '@/components/softwareinfo.vue';
export default {
name: 'Tools',
components: {
Color,
Language,
Softwareinfo,
},
props: {
config: {
type: Object,
default: () => {},
},
projectcolors: {
type: Object,
default: () => {},
},
standalone: Boolean,
},
};
</script>
......@@ -31,7 +31,7 @@
-->
<script id="tido-config" type="application/json">
{
"entrypoint": "",
"entrypoint": "https://ahikar-dev.sub.uni-goettingen.de/api/textapi/ahikar/syriac/collection.json",
"annotations": {
"show": true,
"types": [
......@@ -66,11 +66,11 @@
"secondary": "",
"accent": ""
},
"headers": {
"all": true,
"info": true,
"header_section": {
"show": true,
"navigation": true,
"panelheadings": true,
"titles": true,
"toggle": true
},
"labels": {
......
......@@ -10,7 +10,7 @@
class="item"
>
<Toolbar
v-if="config.headers.panelheadings"
v-if="config['header_section'].panelheadings"
:heading="p.panel_label"
/>
......
Markdown is supported
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