Added announcement feature
Change-Id: Iea35a96e67f31d5cf71ad4437172907ae5e32928
diff --git a/Changes b/Changes
index b2a32c3..ce0e989 100755
--- a/Changes
+++ b/Changes
@@ -1,6 +1,7 @@
-0.23 2017-06-29
+0.23 2017-09-20
- Added query creator tool.
- Fix visualization of empty contexts in KWIC.
+ - Added announcement template.
0.22 2017-06-26
- Added user authentification using Kustvakts LDAP
diff --git a/Gruntfile.js b/Gruntfile.js
index 1ca8362..7311342 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -117,7 +117,7 @@
'dev/scss/footer/footer.scss',
'dev/scss/sidebar/sidebar.scss',
'dev/scss/header/{header,hint,menu,searchbar,vc,datepicker}.scss',
- 'dev/scss/main/{alertify,koralquery,highlight,kwic,logos,tagger,' +
+ 'dev/scss/main/{alertify,intro,koralquery,highlight,kwic,logos,tagger,' +
'main,matchinfo,tree,pagination,query,'+
'resultinfo,sidebar,tutorial}.scss'
],
diff --git a/dev/scss/main/intro.scss b/dev/scss/main/intro.scss
new file mode 100644
index 0000000..7c71e1b
--- /dev/null
+++ b/dev/scss/main/intro.scss
@@ -0,0 +1,19 @@
+div.intro {
+ // Visited links
+ a:visited {
+ color: $darkest-orange
+ }
+
+ div.announcement {
+ background-color: $light-orange;
+ padding: $base-padding;
+ border: 5px dashed $dark-orange;
+ border-radius: 1em;
+ width: 90%;
+ margin: auto;
+ }
+}
+
+aside.active ~ main div.intro {
+ margin-left: $logo-left-distance - $standard-margin + $base-padding;
+}
\ No newline at end of file
diff --git a/dev/scss/main/main.scss b/dev/scss/main/main.scss
index f6d1b7a..39e1a62 100644
--- a/dev/scss/main/main.scss
+++ b/dev/scss/main/main.scss
@@ -10,19 +10,7 @@
@import "koralquery"; // KoralQuery
@import "tagger"; // Tagger
@import "alertify";
-
-div.intro {
- // min-width: 600px;
-
- // Visited links
- a:visited {
- color: $darkest-orange
- }
-}
-
-aside.active ~ main div.intro {
- margin-left: $logo-left-distance - $standard-margin + $base-padding;
-}
+@import "intro"; // Intro page
main {
margin: {
diff --git a/kalamar.dict b/kalamar.dict
index 004d7ba..963564e 100644
--- a/kalamar.dict
+++ b/kalamar.dict
@@ -52,9 +52,6 @@
desc => 'KorAP - Korpusanalyseplattform der nächsten Generation',
overview => 'KorAP - Übersicht',
},
- template => {
- intro => 'de/intro'
- },
Auth => {
loginSuccess => 'Anmeldung erfolgreich',
loginFail => 'Anmeldung fehlgeschlagen',
@@ -62,6 +59,7 @@
logoutFail => 'Abmeldung fehlgeschlagen'
},
Template => {
+ intro => 'de/intro',
doc => {
ql => {
'poliqarp-plus' => 'de/doc/ql/poliqarp-plus'
@@ -151,6 +149,7 @@
logoutFail => 'Logout failed'
},
Template => {
+ intro => 'intro',
doc => {
ql => {
'poliqarp-plus' => 'doc/ql/poliqarp-plus'
diff --git a/lib/Kalamar/Controller/Search.pm b/lib/Kalamar/Controller/Search.pm
index 5069996..984f639 100644
--- a/lib/Kalamar/Controller/Search.pm
+++ b/lib/Kalamar/Controller/Search.pm
@@ -23,7 +23,7 @@
# No query
unless ($query) {
- return $c->render(template => $c->loc('template_intro', 'intro'));
+ return $c->render(template => $c->loc('Template_intro', 'intro'));
};
# Base parameters for remote access
diff --git a/templates/de/intro.html.ep b/templates/de/intro.html.ep
index b9f87f8..9593193 100644
--- a/templates/de/intro.html.ep
+++ b/templates/de/intro.html.ep
@@ -9,6 +9,8 @@
<p><strong>Neu bei KorAP?</strong> Dann starten Sie doch mit unserer <%= doc_opener 'korap', begin %>Einführung<% end %>!</p>
+ %= include 'announcement', lang => 'de'
+
<p>KorAP wird am <a href="http://www.ids-mannheim.de">Institut für Deutsche Sprache</a> in Mannheim entwickelt, Mitglied der <a href="http://www.leibniz-gemeinschaft.de/en/about-us/leibniz-competition/projekte-2011/2011-funding-line-2/">Leibniz Gemeinschaft</a>. Die einzelnen Module werden als Open Source auf <a href="http://github.com/KorAP">GitHub</a> veröffentlicht.</p>
</div>
diff --git a/templates/intro.html.ep b/templates/intro.html.ep
index 2782cab..3052a3e 100644
--- a/templates/intro.html.ep
+++ b/templates/intro.html.ep
@@ -10,6 +10,8 @@
<p><strong>New to KorAP?</strong> Please check out our <%= doc_opener 'korap', begin %>tutorial<% end %>!</p>
+ %= include 'announcement', lang => 'en'
+
<p>KorAP is developed at the <a href="http://www.ids-mannheim.de">Institute for the German Language</a>, member of the <a href="http://www.leibniz-gemeinschaft.de/en/about-us/leibniz-competition/projekte-2011/2011-funding-line-2/">Leibniz Association</a>. The separated modules are being published as open source at <a href="http://github.com/KorAP">GitHub</a>.</p>
</div>