Page MenuHomePhorge
Files F117773478

D1906.1775240062.diff
No OneTemporary
Actions

Authored By
Unknown
Size
6 KB
Referenced Files
None
Subscribers
None

D1906.1775240062.diff
View Options

diff --git a/src/resources/themes/app.scss b/src/resources/themes/app.scss
--- a/src/resources/themes/app.scss
+++ b/src/resources/themes/app.scss
@@ -167,11 +167,10 @@
}
.plan-selector {
-
-
.plan-header {
display: flex;
}
+
.plan-ico {
margin:auto;
font-size: 3.8rem;
@@ -294,6 +293,12 @@
}
}
+#logon-form-footer {
+ a:not(:first-child) {
+ margin-left: 2em;
+ }
+}
+
// Various improvements for mobile
@include media-breakpoint-down(sm) {
.card,
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
@@ -1,6 +1,6 @@
<template>
<div class="container d-flex flex-column align-items-center justify-content-center">
- <div class="card col-sm-8 col-lg-6">
+ <div id="logon-form" class="card col-sm-8 col-lg-6">
<div class="card-body">
<h1 class="card-title text-center mb-3">Please sign in</h1>
<div class="card-text">
@@ -42,9 +42,9 @@
</div>
</div>
</div>
- <div class="mt-1">
+ <div id="logon-form-footer" class="mt-1">
<router-link v-if="!$root.isAdmin && $root.hasRoute('password-reset')" :to="{ name: 'password-reset' }" id="forgot-password">Forgot password?</router-link>
- <a v-if="webmailURL" :href="webmailURL" class="ml-5" id="webmail">Webmail</a>
+ <a v-if="webmailURL && !$root.isAdmin" :href="webmailURL" id="webmail">Webmail</a>
</div>
</div>
</template>
diff --git a/src/resources/vue/Widgets/Menu.vue b/src/resources/vue/Widgets/Menu.vue
--- a/src/resources/vue/Widgets/Menu.vue
+++ b/src/resources/vue/Widgets/Menu.vue
@@ -12,10 +12,6 @@
</button>
<div :id="mode + '-menu-navbar'" :class="'navbar' + (mode == 'header' ? ' collapse navbar-collapse' : '')">
<ul class="navbar-nav">
- <li class="nav-item" v-if="!loggedIn">
- <router-link v-if="!$root.isAdmin && $root.hasRoute('signup')" class="nav-link link-signup" active-class="active" :to="{name: 'signup'}">Signup</router-link>
- <a v-else class="nav-link link-signup" :href="appUrl + '/signup'">Signup</a>
- </li>
<li class="nav-item" v-for="item in menu()" :key="item.index">
<a v-if="item.href" :class="'nav-link link-' + item.index" :href="item.href">{{ item.title }}</a>
<router-link v-if="item.to"
@@ -27,17 +23,18 @@
{{ item.title }}
</router-link>
</li>
+ <li class="nav-item" v-if="!loggedIn">
+ <router-link v-if="!$root.isAdmin && $root.hasRoute('signup')" class="nav-link link-signup" active-class="active" :to="{name: 'signup'}">Signup</router-link>
+ <a v-else class="nav-link link-signup" :href="appUrl + '/signup'">Signup</a>
+ </li>
<li class="nav-item" v-if="loggedIn">
<router-link class="nav-link link-dashboard" active-class="active" :to="{name: 'dashboard'}">Cockpit</router-link>
</li>
<li class="nav-item" v-if="loggedIn">
<router-link class="nav-link menulogin link-logout" active-class="active" :to="{name: 'logout'}">Logout</router-link>
</li>
- <li class="nav-item" v-if="!loggedIn && route != 'room'">
- <a class="nav-link menulogin link-login" :href="webmailURL">Login</a>
- </li>
- <li class="nav-item" v-if="!loggedIn && route == 'room'">
- <a class="nav-link menulogin link-login" :href="app_url + '/login'">Login</a>
+ <li class="nav-item" v-if="!loggedIn">
+ <a class="nav-link menulogin link-login" :href="appUrl + '/login'">Login</a>
</li>
</ul>
<div v-if="mode == 'footer'" class="footer">
diff --git a/src/tests/Browser/Admin/LogonTest.php b/src/tests/Browser/Admin/LogonTest.php
--- a/src/tests/Browser/Admin/LogonTest.php
+++ b/src/tests/Browser/Admin/LogonTest.php
@@ -77,7 +77,7 @@
// Checks if we're really on Dashboard page
$browser->on(new Dashboard())
->within(new Menu(), function ($browser) {
- $browser->assertMenuItems(['explore', 'blog', 'support', 'logout']);
+ $browser->assertMenuItems(['explore', 'blog', 'support', 'dashboard', 'logout']);
})
->assertUser('jeroen@jeroen.jeroen');
diff --git a/src/tests/Browser/LogonTest.php b/src/tests/Browser/LogonTest.php
--- a/src/tests/Browser/LogonTest.php
+++ b/src/tests/Browser/LogonTest.php
@@ -85,12 +85,12 @@
->assertVisible('@links a.link-wallet')
->assertVisible('@links a.link-webmail')
->within(new Menu(), function ($browser) {
- $browser->assertMenuItems(['explore', 'blog', 'support', 'logout']);
+ $browser->assertMenuItems(['explore', 'blog', 'support', 'dashboard', 'logout']);
});
if ($browser->isDesktop()) {
$browser->within(new Menu('footer'), function ($browser) {
- $browser->assertMenuItems(['explore', 'blog', 'support', 'tos', 'logout']);
+ $browser->assertMenuItems(['explore', 'blog', 'support', 'tos', 'dashboard', 'logout']);
});
} else {
$browser->assertMissing('#footer-menu .navbar-nav');
diff --git a/src/tests/Browser/Meet/RoomSetupTest.php b/src/tests/Browser/Meet/RoomSetupTest.php
--- a/src/tests/Browser/Meet/RoomSetupTest.php
+++ b/src/tests/Browser/Meet/RoomSetupTest.php
@@ -213,12 +213,12 @@
})
->assertElementsCount('@session div.meet-video', 2)
->within(new Menu(), function ($browser) {
- $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'login']);
+ $browser->assertMenuItems(['explore', 'blog', 'support', 'signup', 'login']);
});
if ($guest->isDesktop()) {
$guest->within(new Menu('footer'), function ($browser) {
- $browser->assertMenuItems(['signup', 'explore', 'blog', 'support', 'tos', 'login']);
+ $browser->assertMenuItems(['explore', 'blog', 'support', 'tos', 'signup', 'login']);
});
}

File Metadata

Mime Type
text/plain
Expires
Fri, Apr 3, 6:14 PM (7 h, 32 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
18825495
Default Alt Text
D1906.1775240062.diff (6 KB)

Event Timeline