Fixed moving menu items
diff --git a/Changes b/Changes
index 2f8972c..d2de607 100755
--- a/Changes
+++ b/Changes
@@ -1,3 +1,7 @@
+0.17 2015-11-13
+ - Support a larger template cache.
+ - Minor style adjustments.
+
0.16 2015-06-18
- Update to new KoralQuery API.
WARNING! This version is no longer compatible
diff --git a/dev/scss/main/alertify/alertify-default.scss b/dev/scss/main/alertify/alertify-default.scss
index 00524cd..7228a29 100644
--- a/dev/scss/main/alertify/alertify-default.scss
+++ b/dev/scss/main/alertify/alertify-default.scss
@@ -69,7 +69,7 @@
padding: 15px;
border-radius: 4px;
color: #FFF;
- text-shadow: -1px -1px 0 rgba(0,0,0,.5);
+ // text-shadow: -1px -1px 0 rgba(0,0,0,.5);
}
.alertify-log-error {
background: #FE1A00;
diff --git a/dev/scss/main/resultinfo.scss b/dev/scss/main/resultinfo.scss
index 5abc95e..e36c6a3 100644
--- a/dev/scss/main/resultinfo.scss
+++ b/dev/scss/main/resultinfo.scss
@@ -6,7 +6,9 @@
#resultinfo {
clear: both;
text-align: right;
-
+ line-height: 1.5em;
+ min-height: 1.5em;
+ margin-top:.4em;
font-size: 10pt;
p.found {
display: inline;
@@ -16,19 +18,20 @@
}
div.result {
+ vertical-align: bottom;
display: inline-block;
- margin: 2pt 0 0 2pt;
+ line-height: 1.3em;
> a {
display: inline-block;
- cursor:pointer;
+ cursor: pointer;
position: relative;
> span {
@include blind;
}
box-shadow: $choose-box-shadow;
@include standard-text-padding;
- padding-top: 1pt;
- padding-bottom: 1pt;
+ // padding-top: 1pt;
+ // padding-bottom: 3pt;
@include choose-item;
border: {
@@ -41,7 +44,6 @@
@include choose-hover;
}
}
-
> a:last-child {
border: {
top-right-radius: $standard-border-radius;
@@ -94,19 +96,12 @@
color: $total-results;
font-weight: bold;
}
-/*
+
#no-results {
margin: 0 auto;
text-align: center;
code {
- &::before {
- content : open-quote;
- }
- &::after {
- content : close-quote;
- }
font-weight: bold;
}
}
-*/
\ No newline at end of file
diff --git a/kalamar.dict b/kalamar.dict
index b5964f5..39d9e99 100644
--- a/kalamar.dict
+++ b/kalamar.dict
@@ -22,7 +22,8 @@
},
about => 'Über KorAP',
login => 'Anmelden',
- searchtitle => 'KorAP: Finde »<%== $q %>« <% if (param("collection-name")) { %>in <%== param("collection-name") %><% } %> mit <%== loc("QL_" . $ql, "unbekannter Anfragesprache") %>',
+ searchjob => '»<%== $q %>« <% if (param("collection-name")) { %>in <%== param("collection-name") %><% } %> mit <%== loc("QL_" . $ql, "unbekannter Anfragesprache") %>',
+ searchtitle => 'KorAP: Finde <%== loc("searchjob") %>',
searchplaceholder => 'Finde ...',
go => 'Los!',
in => 'in',
@@ -36,7 +37,7 @@
tutorial => 'Einführung',
pubOn => 'veröffentlicht am',
matchCount => 'Treffer',
- noMatches => 'Es wurden keine Treffer für <code><%= stash("q") %></code> gefunden.',
+ noMatches => 'Es wurden keine Treffer für <%== loc("searchjob") %> gefunden.',
notFound => '404 - Seite nicht gefunden',
jsFile => 'kalamar-<%= $Kalamar::VERSION %>-de.js',
underConstruction => 'In Vorbereitung!',
@@ -60,14 +61,15 @@
about => 'About KorAP',
login => 'Login',
go => 'Go!',
- searchtitle => 'KorAP: Find »<%== $q %>« <% if (param("collection-name")) { %>in <%== param("collection-name") %><% } %> with <%== loc("QL_". $ql, "unknown query language") %>)',
+ searchjob => '»<%== $q %>« <% if (param("collection-name")) { %>in <%== param("collection-name") %><% } %> with <%== loc("QL_". $ql, "unknown query language") %>',
+ searchtitle => 'KorAP: Find <%== loc("searchjob") %>',
searchplaceholder => 'Find ...',
in => 'in',
by => 'by',
with => 'with',
pubOn => 'published on',
matchCount => '<%= num($found, "match", "matches") %>',
- noMatches => 'There were no matches for <code><%= stash("q") %></code>.',
+ noMatches => 'There were no matches found for <%== loc("searchjob") %>.',
notFound => '404 - Page not found',
glimpse => {
-short => 'Sample',
diff --git a/lib/Kalamar.pm b/lib/Kalamar.pm
index 0fd7d3d..a9dd538 100644
--- a/lib/Kalamar.pm
+++ b/lib/Kalamar.pm
@@ -4,7 +4,7 @@
use Mojo::JSON 'decode_json';
# Minor version - may be patched from package.json
-our $VERSION = '0.16';
+our $VERSION = '0.17';
# TODO: The FAQ-Page has a contact form for new questions
# TODO: Embed query serialization
@@ -22,6 +22,9 @@
my $pkg = b($self->home . '/package.json')->slurp;
$Kalamar::VERSION = decode_json($pkg)->{version};
+ # Lift maximum template cache
+ $self->renderer->cache->max_keys(200);
+
# Add additional plugin path
push(@{$self->plugins->namespaces}, __PACKAGE__ . '::Plugin');
diff --git a/package.json b/package.json
index 61e2062..6e62df0 100755
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
{
"name": "Kalamar",
"description": "Mojolicious-based Frontend for KorAP",
- "version": "0.16.0",
+ "version": "0.17.0",
"repository" : {
"type": "git",
"url": "https://github.com/KorAP/Kalamar.git"
diff --git a/templates/search.html.ep b/templates/search.html.ep
index 27dfa53..a08a4ee 100644
--- a/templates/search.html.ep
+++ b/templates/search.html.ep
@@ -27,6 +27,6 @@
% end
</ol>
% } elsif (search->results->size == 0) {
-<p id="no-results"><%== loc 'noMatches', q => search->query %></p>
+<p id="no-results"><%== loc 'noMatches', q => search->query, ql => search->query_language %></p>
% }
</div>