Commit bed70bea authored by Marcel Nellesen's avatar Marcel Nellesen
Browse files

Merge branch 'Hotfix/1394-cssLogin' into 'Sprint/2021-05'

Hotfix/1394 css login

See merge request !63
parents fa3d513a da7110bd
......@@ -5,6 +5,7 @@ node_modules
# local env files
.env.local
.env.*.local
package-lock.json
# Log files
npm-debug.log*
......
......@@ -5,7 +5,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge">
<meta name="viewport" content="width=device-width,initial-scale=1.0">
<link rel="icon" href="<%= BASE_URL %>Favicon.png">
<title>Login - CoScInE</title>
<title>Login - Coscine</title>
</head>
<body class="fullwidth">
<noscript>
......
......@@ -17,7 +17,7 @@
<div class="alert alert-warning" role="alert">
<h5 class="alert-heading">{{ $t('alert_headline') }}</h5>
<p class="alert-title">{{ $t('alert_text1') }}
<a href="mailto:servicedesk@itc.rwth-aachen.de?subject=CoScInE%20Pilot%20Program">Servicedesk</a>
<a href="mailto:servicedesk@rwth-aachen.de?subject=Coscine%20Pilot%20Program">Servicedesk</a>
{{ $t('alert_text2') }}
</p>
</div>
......@@ -63,7 +63,7 @@
<h5 class="card-title">{{ $t('description_help_headline') }}</h5>
<p class="card-text">
{{ $t('description_help') }}
<a href="mailto:servicedesk@itc.rwth-aachen.de">Servicedesk</a>
<a href="mailto:servicedesk@rwth-aachen.de">Servicedesk</a>
</p>
</div>
</div>
......@@ -311,4 +311,15 @@ export default Vue.extend({
.alert.alert-warning {
border-radius: .2rem;
}
.multiselect__option--highlight {
background:#00549f;
}
.multiselect__option--selected.multiselect__option--highlight {
background: #00549f;
}
.multiselect__content-wrapper {
overflow-x: hidden;
text-overflow: ellipsis;
}
</style>
......@@ -9,6 +9,9 @@
label="DisplayName"
track-by="DisplayName"
:multiple="false"
select-label=""
selected-label=""
deselect-label=""
/>
<b-form-group>
<b-button
......@@ -74,23 +77,14 @@ export default Vue.extend({
Logo: '',
});
};
if (this.$i18n.locale === 'de') {
for (let institute in institutes) {
this.options.push({
entityID: institute,
DisplayName: institutes[institute].DisplayName.de,
Logo: institutes[institute].Logo,
});
}
} else {
for (let institute in institutes) {
this.options.push({
entityID: institute,
DisplayName: institutes[institute].DisplayName.en,
Logo: institutes[institute].Logo,
});
}
for (let institute in institutes) {
this.options.push({
entityID: institute,
DisplayName: institutes[institute].DisplayName[this.$i18n.locale],
Logo: institutes[institute].Logo,
});
}
this.options.sort((a:any, b:any) => (a.DisplayName > b.DisplayName) ? 1 : ((b.DisplayName > a.DisplayName) ? -1 : 0))
},
changePage(){
localStorage.setItem('coscine.login.storedData', JSON.stringify(this.selected));
......
Markdown is supported
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