Tutorial: move dev/team section to the bottom
... and change navigationan bar and header accordingly.
Resolves #139
Change-Id: I05dbd6d938324151e5eb1cbe15a66790da13c63c
diff --git a/kalamar.dict b/kalamar.dict
index a18616c..8ff653e 100644
--- a/kalamar.dict
+++ b/kalamar.dict
@@ -95,6 +95,7 @@
'corpus' => 'Korpora',
'annotation' => 'Annotationen',
'#default-foundries' => 'Standard Foundries',
+ 'korap' => 'Entwicklung',
'faq' => 'Häufig gestellte Fragen'
}
},
@@ -191,6 +192,7 @@
'corpus' => 'Corpora',
'annotation' => 'Annotations',
'#default-foundries' => 'Default Foundries',
+ 'korap' => 'Development',
'faq' => 'F.A.Q.'
}
},
diff --git a/lib/Kalamar.pm b/lib/Kalamar.pm
index fd8fe69..00852a6 100644
--- a/lib/Kalamar.pm
+++ b/lib/Kalamar.pm
@@ -331,7 +331,7 @@
$r->get('/')->to('search#query')->name('index');
# Documentation routes
- $r->get('/doc')->to('documentation#page', page => 'korap')->name('doc_start');
+ $r->get('/doc')->to('documentation#page', page => 'ql')->name('doc_start');
$r->get('/doc/:scope/:page')->to('documentation#page', scope => undef)->name('doc');
# Settings routes
diff --git a/t/docembed.t b/t/docembed.t
index 2bdc69a..8ead445 100644
--- a/t/docembed.t
+++ b/t/docembed.t
@@ -17,7 +17,7 @@
});
$t->get_ok('/doc')
- ->text_is('nav > ul.nav > li.active a', 'KorAP')
+ ->text_is('nav > ul.nav > li.active a', 'Query Languages')
->text_is('nav > ul.nav > li:last-child a', 'Privacy')
->element_exists('nav > ul.nav > li:last-child a[href=/doc/privacy#page-top]')
;
diff --git a/templates/de/intro.html.ep b/templates/de/intro.html.ep
index 970aa7a..e15c9a2 100644
--- a/templates/de/intro.html.ep
+++ b/templates/de/intro.html.ep
@@ -4,7 +4,7 @@
<p><strong>KorAP</strong> ist eine neue Korpusanalyseplattform, optimiert für große, mehrfach annotierte Korpora und komplexe Suchmechanismen. Dabei versucht KorAP unabhängig von spezifischen Forschungsfragen zu sein.</p>
<p><noscript>KorAP erwartet für einige Funktionen die Aktivierung von JavaScript.</noscript></p>
- <p><strong>Neu bei KorAP?</strong> Dann starten Sie doch mit unserer <a id="link-guided-tour">Tour</a> oder lesen Sie unsere <%= doc_opener 'korap', begin %>Einführung<% end %>!</p>
+ <p><strong>Neu bei KorAP?</strong> Dann starten Sie doch mit unserer <a id="link-guided-tour">Tour</a> oder lesen Sie unsere <%= doc_opener 'ql', begin %>Einführung<% end %>!</p>
%= include 'announcement', lang => 'de'
diff --git a/templates/doc/korap.html.ep b/templates/doc/korap.html.ep
index b7e7091..2b0cae5 100644
--- a/templates/doc/korap.html.ep
+++ b/templates/doc/korap.html.ep
@@ -1,4 +1,4 @@
-% layout 'main', title => 'KorAP: Overview';
+% layout 'main', title => 'KorAP: Architecture & Development';
%= page_title
diff --git a/templates/doc/navigation.json b/templates/doc/navigation.json
index ffac704..03315ff 100644
--- a/templates/doc/navigation.json
+++ b/templates/doc/navigation.json
@@ -1,131 +1,131 @@
[
{
- "title": "KorAP",
- "id" : "korap",
- "items" : [
+ "title": "Query Languages",
+ "id": "ql",
+ "items": [
{
- "title" : "Kalamar",
- "id" : "kalamar"
- },
- {
- "title" : "Kustvakt",
- "id" : "kustvakt"
- },
- {
- "title" : "Koral",
- "id" : "koral"
- },
- {
- "title" : "Krill",
- "id" : "krill"
- },
- {
- "title" : "Karang",
- "id" : "karang"
- }
- ]
- },
- {
- "title" : "Query Languages",
- "id" : "ql",
- "items" : [
- {
- "title" : "Cosmas II",
- "id" : "cosmas-2",
- "class" : "folded",
- "items" : [
+ "title": "Cosmas II",
+ "id": "cosmas-2",
+ "class": "folded",
+ "items": [
{
- "title" : "Query Terms",
- "id" : "#queryterms"
+ "title": "Query Terms",
+ "id": "#queryterms"
},
{
- "title" : "Logical Operators",
- "id" : "#logical-operators"
+ "title": "Logical Operators",
+ "id": "#logical-operators"
},
{
- "title" : "Distance Operators",
- "id" : "#distance-operators"
+ "title": "Distance Operators",
+ "id": "#distance-operators"
},
{
- "title" : "Annotation Operators",
- "id" : "#annotation-operators"
+ "title": "Annotation Operators",
+ "id": "#annotation-operators"
},
{
- "title" : "Combination Operators",
- "id" : "#combination-operators"
+ "title": "Combination Operators",
+ "id": "#combination-operators"
},
{
- "title" : "Area Operators",
- "id" : "#area-operators"
+ "title": "Area Operators",
+ "id": "#area-operators"
}
]
},
{
- "title" : "Poliqarp+",
- "id" : "poliqarp-plus",
- "class" : "folded",
- "items" : [
+ "title": "Poliqarp+",
+ "id": "poliqarp-plus",
+ "class": "folded",
+ "items": [
{
- "title" : "Simple Segments",
- "id" : "#segments"
+ "title": "Simple Segments",
+ "id": "#segments"
},
{
- "title" : "Complex Segments",
- "id" : "#complex"
+ "title": "Complex Segments",
+ "id": "#complex"
},
{
- "title" : "Span Segments",
- "id" : "#spans"
+ "title": "Span Segments",
+ "id": "#spans"
},
{
- "title" : "Paradigmatic Operators",
- "id" : "#paradigmatic-operators"
+ "title": "Paradigmatic Operators",
+ "id": "#paradigmatic-operators"
},
{
- "title" : "Syntagmatic Operators",
- "id" : "#syntagmatic-operators"
+ "title": "Syntagmatic Operators",
+ "id": "#syntagmatic-operators"
},
{
- "title" : "Class Operators",
- "id" : "#class-operators"
+ "title": "Class Operators",
+ "id": "#class-operators"
}
]
},
{
- "title" : "Annis QL",
- "id" : "annis"
+ "title": "Annis QL",
+ "id": "annis"
},
{
- "title" : "CQL",
- "id" : "cql"
+ "title": "CQL",
+ "id": "cql"
},
{
- "title" : "FCSQL",
- "id" : "fcsql"
+ "title": "FCSQL",
+ "id": "fcsql"
},
{
- "title" : "Regular Expressions",
- "id" : "regexp"
+ "title": "Regular Expressions",
+ "id": "regexp"
}
]
},
{
- "title" : "Data",
- "id" : "data",
- "class" : "folded",
- "items" : [
+ "title": "Data",
+ "id": "data",
+ "class": "folded",
+ "items": [
{
- "title" : "Annotations",
- "id" : "annotation"
+ "title": "Annotations",
+ "id": "annotation"
}
]
},
{
- "title" : "API",
- "id" : "api"
+ "title": "F.A.Q.",
+ "id": "faq"
},
{
- "title" : "F.A.Q.",
- "id" : "faq"
+ "title": "API",
+ "id": "api"
+ },
+ {
+ "title": "Development",
+ "id": "korap",
+ "items": [
+ {
+ "title": "Kalamar",
+ "id": "kalamar"
+ },
+ {
+ "title": "Kustvakt",
+ "id": "kustvakt"
+ },
+ {
+ "title": "Koral",
+ "id": "koral"
+ },
+ {
+ "title": "Krill",
+ "id": "krill"
+ },
+ {
+ "title": "Karang",
+ "id": "karang"
+ }
+ ]
}
]
diff --git a/templates/intro.html.ep b/templates/intro.html.ep
index 975a9ab..1ecab62 100644
--- a/templates/intro.html.ep
+++ b/templates/intro.html.ep
@@ -6,7 +6,7 @@
<p><noscript>KorAP expects activated JavaScript for some features.</noscript></p>
- <p><strong>New to KorAP?</strong> Please check out our <a id="link-guided-tour">guided tour</a> or our <%= doc_opener 'korap', begin %>tutorial<% end %>!</p>
+ <p><strong>New to KorAP?</strong> Please check out our <a id="link-guided-tour">guided tour</a> or our <%= doc_opener 'ql', begin %>tutorial<% end %>!</p>
%= include 'announcement', lang => 'en'