diff --git a/src/resources/js/app.js b/src/resources/js/app.js --- a/src/resources/js/app.js +++ b/src/resources/js/app.js @@ -78,7 +78,10 @@ router: window.router, data() { return { - isAdmin: window.isAdmin + isAdmin: window.isAdmin, + appName: window.config['app.name'], + appUrl: window.config['app.url'], + themeDir: '/themes/' + window.config['app.theme'] } }, methods: { @@ -161,6 +164,11 @@ clearTimeout(this.refreshTimeout) }, + logo(mode) { + let src = this.appUrl + this.themeDir + '/images/logo_' + (mode || 'header') + '.png' + + return `${this.appName}` + }, // Display "loading" overlay inside of the specified element addLoader(elem) { $(elem).css({position: 'relative'}).append($(loader).addClass('small')) diff --git a/src/resources/themes/meet.scss b/src/resources/themes/meet.scss --- a/src/resources/themes/meet.scss +++ b/src/resources/themes/meet.scss @@ -160,6 +160,10 @@ #meet-component { overflow: hidden; } + + nav.navbar { + display: none; + } } #meet-setup { @@ -178,6 +182,10 @@ } #meet-session-menu { + background: #f6f5f3; + border-radius: 0 2em 2em 0; + margin: 0.25em 0; + button { font-size: 1.3em; padding: 0 0.25em; @@ -196,6 +204,20 @@ } } +#meet-session-logo { + background: #e9e7e2; + border-radius: 2em 0 0 2em; + margin: 0.25em 0; + display: flex; + flex-direction: column; + justify-content: center; + + img { + height: 1.25em; + padding: 0 1.5em; + } +} + #meet-session-layout { flex: 1; overflow: hidden; @@ -399,3 +421,31 @@ flex: 1; } } + +@include media-breakpoint-down(sm) { + #meet-session-logo { + display: none; + } + + #meet-session-menu { + background: transparent; + } + + #app.meet { + #footer-menu { + display: block !important; + height: 2em; + padding: 0; + + .navbar-brand { + padding: 0; + margin: 0; + } + + img { + width: auto !important; + height: 1em; + } + } + } +} diff --git a/src/resources/vue/Domain/Info.vue b/src/resources/vue/Domain/Info.vue --- a/src/resources/vue/Domain/Info.vue +++ b/src/resources/vue/Domain/Info.vue @@ -23,7 +23,7 @@
Domain configuration
-

In order to let {{ app_name }} receive email traffic for your domain you need to adjust +

In order to let {{ $root.appName }} receive email traffic for your domain you need to adjust the DNS settings, more precisely the MX entries, accordingly.

Edit your domain's zone file and replace existing MX entries with the following values:

{{ domain.config.join("\n") }}

@@ -47,7 +47,6 @@ return { domain_id: null, domain: null, - app_name: window.config['app.name'], status: {} } }, diff --git a/src/resources/vue/Login.vue b/src/resources/vue/Login.vue --- a/src/resources/vue/Login.vue +++ b/src/resources/vue/Login.vue @@ -56,7 +56,6 @@ }, data() { return { - app_url: window.config['app.url'], email: '', password: '', secondFactor: '', diff --git a/src/resources/vue/Meet/Room.vue b/src/resources/vue/Meet/Room.vue --- a/src/resources/vue/Meet/Room.vue +++ b/src/resources/vue/Meet/Room.vue @@ -1,6 +1,7 @@