Theme redirect page

owncloud · Nov 23, 2020 · 4b2c0b2 · 4b2c0b2
1 parent a32cdff
commit 4b2c0b2
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 12 deletions.
diff --git a/src/pages/accessDenied.vue b/src/pages/accessDenied.vue
@@ -1,9 +1,7 @@
 <template>
  <div class="oc-login" uk-height-viewport>
  <div class="oc-login-card uk-position-center">
- <h1 v-translate class="oc-login-logo">
- ownCloud
- </h1>
+ <img class="oc-login-logo" :src="logoImg" :alt="configuration.theme.general.name" />
  <div class="oc-login-card-body uk-width-large">
  <h3 class="oc-login-card-title">
  <span v-translate>Login Error</span>
@@ -62,6 +60,10 @@ export default {
  return this.configuration.theme.general.helpDeskLinkText
  }
  return ''
+ },
+
+ logoImg() {
+ return this.configuration.theme.logo.login
  }
  },
  methods: {

diff --git a/src/pages/oidcCallback.vue b/src/pages/oidcCallback.vue
@@ -1,9 +1,11 @@
 <template>
- <div class="oc-login" uk-height-viewport>
+ <div
+ class="oc-login"
+ :style="{ backgroundImage: 'url(' + backgroundImg + ')' }"
+ uk-height-viewport
+ >
  <div class="oc-login-card uk-position-center">
- <h1 v-translate class="oc-login-logo">
- ownCloud
- </h1>
+ <img class="oc-login-logo" :src="logoImg" :alt="configuration.theme.general.name" />
  <div v-show="error" class="oc-login-card-body">
  <h3 class="oc-login-card-title">
  <translate>Authentication failed</translate>
@@ -38,9 +40,19 @@ export default {
  error: false
  }
  },
+
  computed: {
- ...mapGetters(['configuration'])
+ ...mapGetters(['configuration']),
+
+ backgroundImg() {
+ return this.configuration.theme.loginPage.backgroundImg
+ },
+
+ logoImg() {
+ return this.configuration.theme.logo.login
+ }
  },
+
  mounted() {
  this.$nextTick(() => {
  if (this.$route.query.error) {

diff --git a/src/store/config.js b/src/store/config.js
@@ -24,13 +24,15 @@ const state = {
  },
  logo: {
  sidebar: '',
- favicon: ''
+ favicon: '',
+ login: ''
  },
  filesList: {
  hideDefaultStatusIndicators: false
  },
  loginPage: {
- autoRedirect: true
+ autoRedirect: true,
+ backgroundImg: ''
  }
  },
  options: {

diff --git a/themes/owncloud.json b/themes/owncloud.json
@@ -5,12 +5,14 @@
  },
  "logo": {
  "sidebar": "themes/owncloud/assets/logo.svg",
- "favicon": "themes/owncloud/favicon.jpg"
+ "favicon": "themes/owncloud/favicon.jpg",
+ "login": "themes/owncloud/assets/logo.svg"
  },
  "filesList": {
  "hideDefaultStatusIndicators": false
  },
  "loginPage": {
- "autoRedirect": true
+ "autoRedirect": true,
+ "backgroundImg": "themes/owncloud/assets/loginBackground.jpg"
  }
 }
diff --git a/themes/owncloud/assets/loginBackground.jpg b/themes/owncloud/assets/loginBackground.jpg