Make login information more flexible with content block
Change-Id: I713834ee68a53732a315abd0dc9f93082369cf97
diff --git a/dev/scss/footer/footer.scss b/dev/scss/footer/footer.scss
index 663510c..15a98b1 100644
--- a/dev/scss/footer/footer.scss
+++ b/dev/scss/footer/footer.scss
@@ -8,6 +8,7 @@
position: absolute;
background-color: $dark-grey;
bottom: 0;
+ padding-bottom: 2px;
font-size: 70%;
width: 100%;
text-align: right;
diff --git a/dev/scss/sidebar/sidebar.scss b/dev/scss/sidebar/sidebar.scss
index 7ef4fde..6d08d14 100644
--- a/dev/scss/sidebar/sidebar.scss
+++ b/dev/scss/sidebar/sidebar.scss
@@ -153,6 +153,17 @@
> p {
color: $light-green;
}
+ > p.announcement {
+ color: $nearly-white;
+ > time {
+ display: block;
+ font-size: 70%;
+ }
+ }
+ hr {
+ border: none;
+ border-top: 2px solid $ids-grey-2;
+ }
ul {
display: block;
font-size: 80%;
diff --git a/kalamar.dict b/kalamar.dict
index 8229566..6ec2e52 100644
--- a/kalamar.dict
+++ b/kalamar.dict
@@ -48,7 +48,6 @@
notFound => '404 - Seite nicht gefunden',
jsFile => 'kalamar-<%= $Kalamar::VERSION %>-de.js',
underConstruction => 'In Vorbereitung!',
- loginExplanation => 'Anmeldung mit einem registrierten <%= link_to "Cosmas-II" => "https://www.ids-mannheim.de/cosmas2/projekt/registrierung/", style => "white-space: nowrap" %>-Konto',
korap => {
-short => 'KorAP',
desc => 'KorAP - Korpusanalyseplattform der nächsten Generation',
@@ -137,7 +136,6 @@
activateJS => 'To make use of all features, please activate JavaScript!',
faq => 'F.A.Q.',
underConstruction => 'Under Construction!',
- loginExplanation => 'Login with a registered <%= link_to "Cosmas-II" => "https://www.ids-mannheim.de/cosmas2/projekt/registrierung/", style => "white-space: nowrap" %> account',
tutorial => 'Tutorial',
korap => {
-short => 'KorAP',
diff --git a/templates/partial/side.html.ep b/templates/partial/side.html.ep
index 99e3926..0cdc6fb 100644
--- a/templates/partial/side.html.ep
+++ b/templates/partial/side.html.ep
@@ -15,7 +15,9 @@
<button type="submit"><span><%= loc 'go' %></span></button>
</div>
% end
- <p><%== loc 'loginExplanation' %></p>
+
+ %= content_block 'loginInfo'
+
%# <ul>
%# <li><%= link_to loc('register') => 'register' %></li>
%# <li><%= link_to loc('pwdforgotten') => 'pwd_forgotten' %></li>