From e0fec965dc6ee1c774cba4c123dde1f96b74da7d Mon Sep 17 00:00:00 2001
From: Brent Vardy <brent.vardy@challengelogic.net>
Date: Tue, 3 Sep 2019 16:33:15 +0100
Subject: [PATCH] improved navigation layout when not logged in, moved locale
 selector to nav on login page

---
 webapp/layouts/blank.vue              |  9 +++++----
 webapp/pages/changelog.vue            |  2 +-
 webapp/pages/code-of-conduct.vue      |  1 +
 webapp/pages/data-privacy.vue         |  2 +-
 webapp/pages/imprint.vue              |  1 +
 webapp/pages/login.vue                | 14 ++------------
 webapp/pages/registration.vue         |  2 +-
 webapp/pages/terms-and-conditions.vue |  2 +-
 8 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/webapp/layouts/blank.vue b/webapp/layouts/blank.vue
index c5a57171f..37df16a05 100644
--- a/webapp/layouts/blank.vue
+++ b/webapp/layouts/blank.vue
@@ -1,14 +1,15 @@
 <template>
   <div class="layout-blank">
     <div class="main-navigation">
-      <ds-container class="main-navigation-container" style="padding: 10px 10px;">
-        <ds-flex style="flex: auto; flex-direction: row;">
-          <ds-flex-item>
+      <ds-container width="x-large" class="main-navigation-container" style="padding: 10px 10px;">
+        <ds-flex class="main-navigation-flex" centered>
+          <ds-flex-item width="5.5%" />
+          <ds-flex-item style="flex-grow:1;" width="20%">
             <a @click="redirectToRoot">
               <ds-logo />
             </a>
           </ds-flex-item>
-          <ds-flex-item style="width:50px;">
+          <ds-flex-item width="20%" style="flex-grow:0;">
             <client-only>
               <locale-switch class="topbar-locale-switch" placement="top" offset="16" />
             </client-only>
diff --git a/webapp/pages/changelog.vue b/webapp/pages/changelog.vue
index ddaec5962..55896c321 100644
--- a/webapp/pages/changelog.vue
+++ b/webapp/pages/changelog.vue
@@ -76,7 +76,7 @@
 
 <script>
 export default {
-  layout: 'default',
+  layout: 'blank',
   head() {
     return {
       title: this.$t('site.changelog'),
diff --git a/webapp/pages/code-of-conduct.vue b/webapp/pages/code-of-conduct.vue
index 33ecb69ab..b5e732694 100644
--- a/webapp/pages/code-of-conduct.vue
+++ b/webapp/pages/code-of-conduct.vue
@@ -36,6 +36,7 @@
 
 <script>
 export default {
+  layout: 'blank',
   head() {
     return {
       title: this.$t('site.code-of-conduct'),
diff --git a/webapp/pages/data-privacy.vue b/webapp/pages/data-privacy.vue
index c20b29a22..47cc2c2a4 100644
--- a/webapp/pages/data-privacy.vue
+++ b/webapp/pages/data-privacy.vue
@@ -385,7 +385,7 @@
 
 <script>
 export default {
-  layout: 'default',
+  layout: 'blank',
   head() {
     return {
       title: this.$t('site.data-privacy'),
diff --git a/webapp/pages/imprint.vue b/webapp/pages/imprint.vue
index 67e144237..07758c3f1 100644
--- a/webapp/pages/imprint.vue
+++ b/webapp/pages/imprint.vue
@@ -73,6 +73,7 @@
 
 <script>
 export default {
+  layout: 'blank',
   head() {
     return {
       title: this.$t('site.imprint'),
diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index b53e56446..9f0f921ee 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -10,9 +10,6 @@
       <ds-card class="login-card">
         <ds-flex gutter="small">
           <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
-            <client-only>
-              <locale-switch class="login-locale-switch" offset="5" />
-            </client-only>
             <ds-space margin-top="small" margin-bottom="xxx-small" centered>
               <img
                 class="login-image"
@@ -53,17 +50,13 @@
                 name="submit"
                 type="submit"
                 icon="sign-in"
-              >
-                {{ $t('login.login') }}
-              </ds-button>
+              >{{ $t('login.login') }}</ds-button>
               <ds-space margin="x-small">
                 <a
                   :href="$t('login.moreInfoURL')"
                   :title="$t('login.moreInfoHint')"
                   target="_blank"
-                >
-                  {{ $t('login.moreInfo') }}
-                </a>
+                >{{ $t('login.moreInfo') }}</a>
               </ds-space>
             </form>
           </ds-flex-item>
@@ -78,9 +71,6 @@ import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
 
 export default {
-  components: {
-    LocaleSwitch,
-  },
   layout: 'blank',
   data() {
     return {
diff --git a/webapp/pages/registration.vue b/webapp/pages/registration.vue
index e75ec03e1..654942869 100644
--- a/webapp/pages/registration.vue
+++ b/webapp/pages/registration.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  layout: 'default',
+  layout: 'blank',
   asyncData({ store, redirect }) {
     if (store.getters['auth/isLoggedIn']) {
       redirect('/')
diff --git a/webapp/pages/terms-and-conditions.vue b/webapp/pages/terms-and-conditions.vue
index 0bd849575..d627e863e 100644
--- a/webapp/pages/terms-and-conditions.vue
+++ b/webapp/pages/terms-and-conditions.vue
@@ -23,7 +23,7 @@
 
 <script>
 export default {
-  layout: 'default',
+  layout: 'blank',
   head() {
     return {
       title: this.$t('site.termsAndConditions'),