diff --git a/common/locales/de.json b/common/locales/de.json index 69d1817126..cdc41afcfc 100644 --- a/common/locales/de.json +++ b/common/locales/de.json @@ -117,7 +117,8 @@ "day": { "fields": { "dayResponsibles": "Tagesverantwortliche" - } + }, + "name": "Tag | Tage" }, "materialList": { "name": "Materialliste" @@ -139,5 +140,22 @@ }, "name": "Zeitplaneintrag" } + }, + "print": { + "toc": { + "title": "Inhaltsverzeichnis" + }, + "cover": { + "title": "Titelseite" + }, + "program": { + "title": "Detailprogramm" + }, + "story": { + "title": "Roter Faden" + }, + "picasso": { + "title": "Grobprogramm für {period}" + } } } \ No newline at end of file diff --git a/common/locales/en.json b/common/locales/en.json index afa49cddba..cd181f88e1 100644 --- a/common/locales/en.json +++ b/common/locales/en.json @@ -125,7 +125,8 @@ "day": { "fields": { "dayResponsibles": "Responsible of the day" - } + }, + "name": "Day | Days" }, "materialItem": { "fields": { @@ -157,5 +158,22 @@ }, "name": "Activity scheduled" } + }, + "print": { + "toc": { + "title": "Table of content" + }, + "cover": { + "title": "Cover page" + }, + "program": { + "title": "Program" + }, + "story": { + "title": "Storyline" + }, + "picasso": { + "title": "Program overview for {period}" + } } } \ No newline at end of file diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 8ddc108e41..e9b99102b7 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -119,7 +119,7 @@ export default { } @media #{map-get($display-breakpoints, 'xs-only')}{ - .v-main .container { + .v-main > .v-main__wrap > .container { min-height: 100%; display: flex; @@ -137,6 +137,7 @@ export default { } @media #{map-get($display-breakpoints, 'sm-and-down')}{ + // TODO: this changes look & feel of all v-containers. Do we really want this? .container.container--fluid { padding: 0; diff --git a/frontend/src/components/print/PrintConfigurator.vue b/frontend/src/components/print/PrintConfigurator.vue index 1eb672990d..d831eb236e 100644 --- a/frontend/src/components/print/PrintConfigurator.vue +++ b/frontend/src/components/print/PrintConfigurator.vue @@ -2,11 +2,9 @@
-

{{ $tc('components.camp.campPrint.selectPrintPreview') }}

- - + @@ -15,9 +13,9 @@ -

{{ content.type }}

+

{{ $tc('components.print.printConfigurator.config.' + content.type) }}

-
@@ -32,51 +30,56 @@
- {{ component.name }} + {{ $tc('components.print.printConfigurator.config.' + idx) }}
- -
- - {{ $tc('components.camp.campPrint.openPrintPreview') }} - - - - - - - View Print-Config - -
{{ cnf }}
-
-
-
-
+ + + + View Print-Config + +
{{ cnf }}
+
+
+
+
+
+ + + + Print with Nuxt + Print with React + + + + + + +
@@ -85,28 +88,28 @@ + + diff --git a/frontend/src/components/print/print-nuxt/PrintPreviewNuxt.vue b/frontend/src/components/print/print-nuxt/PrintPreviewNuxt.vue new file mode 100644 index 0000000000..3e44d3add2 --- /dev/null +++ b/frontend/src/components/print/print-nuxt/PrintPreviewNuxt.vue @@ -0,0 +1,68 @@ +