Skip to content
GitLab
Commit d7b05768 authored by Daniel Regenass's avatar Daniel Regenass 👽
Browse files

Merge branch 'develop' into 'master' 

Merge for Release 2022.1.2

See merge request !16
parents 2dfaec50 b9bbc359
Hide whitespace changes
Inline Side-by-side
package-lock.json
View file @ d7b05768
......@@ -7055,9 +7055,9 @@
"dev": true
},
"floating-vue": {
"version": "2.0.0-beta.11",
"resolved": "https://registry.npmjs.org/floating-vue/-/floating-vue-2.0.0-beta.11.tgz",
"integrity": "sha512-46z395tjnnF/OqWbVk19ajFaCZMS06sDRxv/AFQtZxdIcaq53xhWYIlaFLdxH8S3JV8NfMlNEkR2VGerPG4U1A==",
"version": "2.0.0-beta.16",
"resolved": "https://registry.npmjs.org/floating-vue/-/floating-vue-2.0.0-beta.16.tgz",
"integrity": "sha512-MoVA9pLGMVkuyG9cvlzpSB9//HGynbWnkLr0cxDgnEWORL98kuSa2ph/bcq7sDGNM3l0/3v6HYSqhBMBp9F3/A==",
"requires": {
"@floating-ui/dom": "^0.1.10",
"vue-resize": "^2.0.0-alpha.1"
......
pom.xml
View file @ d7b05768
......@@ -6,7 +6,7 @@
<groupId>ch.ethz.id.sws.doi</groupId>
<artifactId>doi-online-gui</artifactId>
<packaging>war</packaging>
<version>2022.1.1</version>
<version>2022.1.2</version>
<name>DOI Online GUI</name>
<scm>
......
public/css/application.css
View file @ d7b05768
......@@ -9,7 +9,6 @@
box-shadow: none;
}
/* v-tooltip, */
.v-popper--theme-tooltip .v-popper__inner {
background: rgba(0, 0, 0, .9) !important;
......@@ -66,27 +65,7 @@
}
/* checkbox in td */
th.has-checkbox {
padding-left: 2px;
padding-top: 0px;
padding-bottom: 3px;
width: 0 !important;
}
td.has-checkbox {
padding-left: 2px !important;
padding-top: 4px;
padding-bottom: 0;
width: 0 !important;
}
th.has-checkbox label,
td.has-checkbox label {
width: 0;
margin-right: 3rem;
}
/* td special */
td:empty {
height: 17px !important
......
public/css/base.css
View file @ d7b05768
/* @override
*/
@font-face {
......@@ -2520,6 +2521,7 @@ th {
font-size: 1.6rem;
line-height: 1.8rem;
color: black;
border-top: 1px solid #a9a9a9;
border-bottom: 1px solid #a9a9a9;
}
......@@ -2740,6 +2742,27 @@ table.table-header-left thead th:first-child {
/* @end */
/* @group tables-has-checkbox */
th.has-checkbox {
padding-left: 5px;
padding-bottom: 0;
width: 0 !important;
}
td.has-checkbox {
padding-left: 5px !important;
width: 0 !important;
}
th.has-checkbox input[type="checkbox"] + label, td.has-checkbox input[type="checkbox"] + label {
width: 0;
margin-right: 2rem;
padding-top: 0;
}
/* @end */
/* @group helpers */
.buttonList {
......@@ -3041,6 +3064,8 @@ input[type="checkbox"] + label, input[type="radio"] + label {
input[type="checkbox"], input[type="radio"] {
opacity: 0;
position: absolute;
top: 0;
left: 0;
}
input[type="checkbox"] + label, input[type="radio"] + label {
......
public/template.html
View file @ d7b05768
......@@ -2,7 +2,7 @@
<html lang="en">
<head>
<meta charset="utf-8" />
<title>DOI Web Management Interface – ETH Zürich</title>
<title>ETH Zürich</title>
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta name="robots" content="all,follow" />
......
src/components/layout/Menu.vue
View file @ d7b05768
......@@ -7,14 +7,18 @@
>
<li v-if="isMenuItemVisibleForRole(menuItem)" v-bind:class="{ 'active first' : menuItem.routeName == currentRouteName }">
<a href="#"
v-bind:class="{ 'active' : menuItem.routeName == currentRouteName }"
v-bind:aria-current-value="menuItem.routeName == currentRouteName ? 'page' : ''"
v-on:click.prevent="onMenuSelected(menuItem)">{{ menuItem.title }}</a>
<ul v-if="menuItem.subMenuItems && menuItem.subMenuItems.length > 0">
<template v-for="subMenuItem in menuItem.subMenuItems" v-bind:key="subMenuItem.title">
<li v-if="isMenuItemVisibleForRole(subMenuItem)">
<li v-if="isMenuItemVisibleForRole(subMenuItem)"
v-bind:class="{ 'active' : subMenuItem.routeName == currentRouteName }">
<a v-if="subMenuItem.disabled" href="#" style="color: grey;">{{ subMenuItem.title }}</a>
<a v-if="!subMenuItem.disabled" href="#" v-on:click.prevent="onMenuSelected(subMenuItem)">{{ subMenuItem.title }}</a>
<a v-if="!subMenuItem.disabled" href="#"
v-bind:class="{ 'active' : subMenuItem.routeName == currentRouteName }"
v-on:click.prevent="onMenuSelected(subMenuItem)">{{ subMenuItem.title }}</a>
</li>
</template>
</ul>
......@@ -48,7 +52,7 @@ export default {
'$route'(to) {
let menuItem = this.searchMainMenuItem(this.menuItems, to.name)
if (menuItem) {
this.currentRouteName = menuItem.routeName
this.currentRouteName = to.name
}
},
'$store.state.currentUser': function() {
......
src/components/layout/PageFooter.vue
View file @ d7b05768
......@@ -2,31 +2,39 @@
<footer id="footer">
<h1 class="visually-hidden">Footer</h1>
<div class="footer-inside">
<router-link
class="path"
v-bind:to="{ name: 'imprint' }" v-bind:title=" $t('components.layout.pageFooter.imprint') "
>{{ $t('components.layout.pageFooter.imprintTitle') }}</router-link>
<a v-bind:href="$t('components.layout.pageFooter.disclaimerUrl')" target="_blank">
{{ $t('components.layout.pageFooter.disclaimerTitle') }}
</a>
<a v-bind:href="$t('components.layout.pageFooter.copyrightUrl')" target="_blank">
{{ $t('components.layout.pageFooter.copyrightTitle') }}
</a>
<a id="footer-copyright"
v-bind:href="$t('components.layout.pageFooter.homepageUrl')"
v-bind:title="$t('components.layout.pageFooter.copyright')"
target="_blank"
>&#169;{{currentYear}} {{ $t('components.layout.pageFooter.copyright') }}, {{ appBuildDate }}&nbsp;</a>
<a v-bind:href="$store.getters.getAppHelloUrl" target="_blank"
v-tooltip="$store.getters.getAppBuildBranch + '/' + $store.getters.getAppBuildNumber + ' - ' + $store.getters.getAppStage + ' (' + $store.getters.getAppServerName + ')'">
&nbsp;{{ $t('components.layout.pageFooter.versionTitle') }} {{ $store.getters.getAppVersion }}
</a>
</div>
<ul class="footer-inside">
<li>
<router-link
class="path"
v-bind:to="{ name: 'imprint' }" v-bind:title=" $t('components.layout.pageFooter.imprint') "
>{{ $t('components.layout.pageFooter.imprintTitle') }}</router-link>
</li>
<li>
<a v-bind:href="$t('components.layout.pageFooter.disclaimerUrl')" target="_blank">
{{ $t('components.layout.pageFooter.disclaimerTitle') }}
</a>
</li>
<li>
<a v-bind:href="$t('components.layout.pageFooter.copyrightUrl')" target="_blank">
{{ $t('components.layout.pageFooter.copyrightTitle') }}
</a>
</li>
<li id="footer-copyright">
<a
v-bind:href="$t('components.layout.pageFooter.homepageUrl')"
v-bind:title="$t('components.layout.pageFooter.copyright')"
target="_blank"
>&#169;{{currentYear}} {{ $t('components.layout.pageFooter.copyright') }}, {{ appBuildDate }}&nbsp;</a>
<a v-bind:href="$store.getters.getAppHelloUrl" target="_blank"
v-tooltip="$store.getters.getAppBuildBranch + '/' + $store.getters.getAppBuildNumber + ' - ' + $store.getters.getAppStage + ' (' + $store.getters.getAppServerName + ')'">
&nbsp;{{ $t('components.layout.pageFooter.versionTitle') }} {{ $store.getters.getAppVersion }}
</a>
</li>
</ul>
</footer>
</template>
......
src/components/layout/UserStatusBar.vue
View file @ d7b05768
......@@ -36,13 +36,12 @@
v-if="hasNavigation"
v-on:click="toggleNavigation()"
v-bind:class="[navigationActive ? 'active' : 'not-active']"
role="button"
>
<div>
<a class="nav-burger-btn" role="button" aria-label="Open Navigation">
<b></b>
<b></b>
<b></b>
</div>
</a>
</div>
</div>
......
src/main.js
View file @ d7b05768
......@@ -19,6 +19,9 @@ if (process.env.VUE_APP_VERSION != 'dev') {
Logger.setLevel(Logger.TRACE)
}
// make the tooltip appear immediately on hover
FloatingVue.options.themes.tooltip.delay.show = 0
const myApp = createApp(AppMain)
myApp.use(store)
......
src/views/ShowUserDetails/ShowUserDetails.vue
View file @ d7b05768
......@@ -454,7 +454,7 @@ export default {
this.poolNames = []
}
this.poolNames.sort((a,b) => a.localeCompare(b))
this.poolNames.sort((a,b) => String(a).localeCompare(String(b)))
},
delayedValidation(v) {
v.$reset()
......
vue.config.js
View file @ d7b05768
const path = require('path');
const path = require('path')
let indexPage = ''
if (process.env.version) {
......@@ -21,7 +21,7 @@ if (process.env.version) {
}
process.env.VUE_APP_CALL_WHOAMI = true
process.env.VUE_APP_BUILDDATE = new Date().getTime();
process.env.VUE_APP_BUILDDATE = new Date().getTime()
process.env.VUE_APP_CLIENT_ID = 'doi-online-gui'
const selectedAccount = 0
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment