Skip to content
Snippets Groups Projects
Commit 045c4731 authored by m431m's avatar m431m :speech_balloon:
Browse files

Merge branch 'ogs-header-footer' into '1.1'

REDMINE_ISSUE-17882

See merge request onegeo-suite/sites/onegeo-suite-site-login-vuejs!52
parents af3c8626 3c5ec530
No related branches found
No related tags found
No related merge requests found
Pipeline #24830 passed
.nvmrc 0 → 100644
14
...@@ -10,6 +10,7 @@ export default { ...@@ -10,6 +10,7 @@ export default {
email: "contact@neogeo.fr", email: "contact@neogeo.fr",
warning: false warning: false
}, },
customHeaderAndFooter: false,
forms: { forms: {
signin: { signin: {
title: { title: {
......
<template> <template>
<div id="app"> <div
id="app"
:class="{
'custom-header-footer': $config.customHeaderAndFooter
}"
>
<ogs-header
v-if="$config.customHeaderAndFooter"
/>
<LocaleChanger /> <LocaleChanger />
<router-view id="page"/> <router-view id="page" />
<ogs-footer
v-if="$config.customHeaderAndFooter"
/>
</div> </div>
</template> </template>
...@@ -9,10 +20,8 @@ ...@@ -9,10 +20,8 @@
import LocaleChanger from '@/components/LocaleChanger.vue'; import LocaleChanger from '@/components/LocaleChanger.vue';
export default { export default {
components: { components: {
LocaleChanger LocaleChanger,
} },
}; };
</script> </script>
...@@ -2,3 +2,31 @@ $primary: #187CC6; ...@@ -2,3 +2,31 @@ $primary: #187CC6;
@import 'node_modules/bootstrap/scss/bootstrap.scss'; @import 'node_modules/bootstrap/scss/bootstrap.scss';
@import 'node_modules/bootstrap-vue/src/index.scss'; @import 'node_modules/bootstrap-vue/src/index.scss';
// WC ogs-header ogs-footer / override
// Hide default header logo & footer
.custom-header-footer {
.app-header > img {
visibility: hidden !important;
}
.terms-header > img {
visibility: hidden !important;
}
.footer {
display: none !important;
}
// Try to remove scrollbar and show footer
#page {
height: auto !important;
}
// forgottenpwd add some space...
.container {
height: 500px !important;
margin-top: 150px !important;
}
// signout add some space
.center {
height: 400px !important;
}
}
...@@ -18,6 +18,10 @@ import router from '@/router'; ...@@ -18,6 +18,10 @@ import router from '@/router';
import store from '@/store'; import store from '@/store';
Vue.config.productionTip = false; Vue.config.productionTip = false;
Vue.config.ignoredElements = [
'ogs-header',
'ogs-footer'
];
import config from '../public/config.js'; import config from '../public/config.js';
...@@ -33,6 +37,20 @@ Vue.mixin({ ...@@ -33,6 +37,20 @@ Vue.mixin({
}); });
Vue.prototype.$config = config; Vue.prototype.$config = config;
// Use WC header and footer if configured
if (config.customHeaderAndFooter) {
const headElement = document.getElementsByTagName('head')[0];
let s = document.createElement('script');
s.type = 'text/javascript';
s.src = '/portal/wc/ogs-header.js';
headElement.append(s);
s = document.createElement('script');
s.type = 'text/javascript';
s.src = '/portal/wc/ogs-footer.js';
headElement.append(s);
}
new Vue({ new Vue({
i18n, i18n,
router, router,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment