Aufgrund einer Wartung wird GitLab am 29.10. zwischen 9:00 und 10:00 Uhr kurzzeitig nicht zur Verfügung stehen. / Due to maintenance, GitLab will be temporarily unavailable on 29.10. between 9:00 and 10:00 am.

Commit a19674d6 authored by Marcel Nellesen's avatar Marcel Nellesen

Merge branch 'Sprint/2020-06' into 'master'

Sprint/2020-06

See merge request !23
parents 842b75ab d8161007
......@@ -24,7 +24,6 @@
</ul>
</nav>
</header>
<div class="container-fluid app-content">
<div class="row">
<div class="col-xl-2"></div>
......@@ -36,19 +35,26 @@
</h1>
<div class="row">
<div class="col-sm-12 col-md-7">
<div class="card bg-light mb-3 w-100">
<div class="card-body">
<h5 class="card-title">{{ $t('description_headline') }}</h5>
<p class="card-text">{{ $t('description_text') }}</p>
<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>
<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>
{{ $t('alert_text2') }}
</p>
</div>
<div class="card bg-light mb-3 w-100">
<div class="card-body">
<h5 class="card-title">{{ $t('description_headline') }}</h5>
<p class="card-text">{{ $t('description_text') }}</p>
<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>
</p>
</div>
</div>
</div>
<div class="col-sm-12 col-md-5">
<div class="col-sm-12 col-md-5">
<div class="row">
<div class="card bg-light mb-3 w-100">
<div class="card-body">
......@@ -77,11 +83,10 @@
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col-xl-2"></div>
</div>
</div>
<footer id="footer">
<div class="row container">
<div id="servicecol" class="col-xs-12 col-sm-6">
......@@ -345,4 +350,13 @@ export default Vue.extend({
#signup-toggle {
margin: 0em;
}
.alert-heading {
text-align: left;
border-radius: .2rem;
}
.alert-title {
text-align: left;
border-radius: .2rem;
}
</style>
......@@ -25,4 +25,10 @@ export default {
imprint: 'Impressum',
contact: 'Kontakt',
otherLocale: 'En',
alert_headline: 'Informationen zur Pilotphase',
alert_text2: '] senden.',
alert_text1: `CoScInE befindet sich derzeit in der ersten Pilotphase. Sie können sich also gerne
einloggen und das System erkunden, aber benutzen Sie es noch nicht für Ihre wichtigen Forschungsdaten!
Bitte kontaktieren Sie uns, wenn Sie an dem Pilotprogramm teilnehmen möchten. Feedback und
Verbesserungsvorschläge können Sie gerne an [`,
};
......@@ -25,4 +25,10 @@ export default {
imprint: 'Imprint',
contact: 'Contact',
otherLocale: 'De',
alert_headline: 'Information about the pilot phase',
alert_text2: ']',
alert_text1: `CoScInE is currently in the first pilot phase. So you are welcome to
log in and explore the system, but do not use it for your important
research data yet! Please contact us if you want to be part of the
pilot program. If you have feedback you are welcome to send it to [`,
};
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