Update version and fix BG color of drop down menus
Change-Id: Ia34924d90eb5ddad2ed9ced9d0026c678ec7adea
diff --git a/Changes b/Changes
index 2d19511..f4b7bcc 100755
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+0.34 2019-04-02
+ - Introduced guided tour (hebasta, #19)
+
0.33 2019-03-28
- Fix problem with serialization and deserialization
of large numerical values (#87).
diff --git a/README.md b/README.md
index 75e3770..fa22b9e 100644
--- a/README.md
+++ b/README.md
@@ -220,13 +220,14 @@
is released under the terms of the MIT License.
[Platform.js](https://mths.be/platform/)
is released under the terms of the MIT License.
-[INTRO.JS] (https://github.com/usablica/intro.js)
-is released under the terms of GNU AFFERO GENERAL PUBLIC LICENSE (GNU AGPLv3).
+[INTRO.JS](https://github.com/usablica/intro.js)
+is released under the terms of the GNU AFFERO GENERAL
+PUBLIC LICENSE (GNU AGPLv3).
### Original Software
-Copyright (C) 2015-2018, [IDS Mannheim](http://www.ids-mannheim.de/)<br>
-Author: [Nils Diewald](http://nils-diewald.de/)
+Copyright (C) 2015-2019, [IDS Mannheim](http://www.ids-mannheim.de/)<br>
+Author: [Nils Diewald](http://nils-diewald.de/), Helge Stallkamp
Contributor: Susanne Feix (Translations)
Kalamar is developed as part of the [KorAP](http://korap.ids-mannheim.de/)
diff --git a/dev/demo/all.html b/dev/demo/all.html
index f2134f8..9b63bc4 100644
--- a/dev/demo/all.html
+++ b/dev/demo/all.html
@@ -57,7 +57,7 @@
name="cutoff"
class="checkbox"
id="q-cutoff-field" />
- <label for="q-cutoff-field"><span id="glimpse-intrjs"></span>Glimpse</label>
+ <label for="q-cutoff-field"><span id="glimpse"></span>Glimpse</label>
<!-- Todo: open tutorial - like openTutorial() -->
<a href="doc/faq" tabindex="-1" class="question"><span>Question</span></a>
diff --git a/dev/demo/alldemo.js b/dev/demo/alldemo.js
index c282103..c32ce7e 100644
--- a/dev/demo/alldemo.js
+++ b/dev/demo/alldemo.js
@@ -772,7 +772,6 @@
};
*/
require(['app/en', 'init', 'hint/foundries/cnx'], function (lang) {
-//require([app/en', 'init', 'hint/foundries/cnx'], function (lang) {
KorAP.hintArray = hintArray;
// Set current virtual collection
diff --git a/dev/demo/sidebar-login.html b/dev/demo/sidebar-login.html
index 1700d07..eb2f429 100644
--- a/dev/demo/sidebar-login.html
+++ b/dev/demo/sidebar-login.html
@@ -74,7 +74,7 @@
name="cutoff"
class="checkbox"
id="q-cutoff-field" />
- <label for="q-cutoff-field"><span id="glimpse-intrjs"></span>Glimpse</label>
+ <label for="q-cutoff-field"><span id="glimpse"></span>Glimpse</label>
<!-- Todo: open tutorial - like openTutorial() -->
<a href="doc/faq" tabindex="-1" class="question"><span>Question</span></a>
diff --git a/dev/js/spec/tourSpec.js b/dev/js/spec/tourSpec.js
index bb5df70..5e4dca6 100644
--- a/dev/js/spec/tourSpec.js
+++ b/dev/js/spec/tourSpec.js
@@ -23,7 +23,7 @@
"</span>" +
"<div class='button right'>" +
"<input checked class='checkbox' id='q-cutoff-field' name='cutoff' type='checkbox' value='1'>"+
- "<label for='q-cutoff-field' title='Just show the first matches in arbitrary order'><span id='glimpse-intrjs'></span>Glimpse</label>" +
+ "<label for='q-cutoff-field' title='Just show the first matches in arbitrary order'><span id='glimpse'></span>Glimpse</label>" +
"<a class='tutorial' href='/doc' id='view-tutorial' tabindex='-1' title='Tutorial'><span>Tutorial</span></a>" +
"</div>" +
"<div class='clear'></div>" +
@@ -44,7 +44,7 @@
//expect(intrkorap.querySelector('#vc-choose')).not.toBeNull();
expect(intrkorap.querySelector('#vc-view')).not.toBeNull();
expect(intrkorap.querySelector('#ql-field').parentNode).not.toBeNull();
- expect(intrkorap.querySelector('#glimpse-intrjs')).not.toBeNull();
+ expect(intrkorap.querySelector('#glimpse')).not.toBeNull();
expect(intrkorap.querySelector('#view-tutorial')).not.toBeNull();
expect(intrkorap.querySelector('#searchbar button[type=submit]')).not.toBeNull();
});
diff --git a/dev/js/src/tour/tours.js b/dev/js/src/tour/tours.js
index 0b5d2a8..f33c56d 100644
--- a/dev/js/src/tour/tours.js
+++ b/dev/js/src/tour/tours.js
@@ -89,7 +89,7 @@
position: "bottom",
},
{
- element:'#glimpse-intrjs',
+ element:'#glimpse',
intro: loc.TOUR_glimpse,
position: "bottom",
},
diff --git a/dev/scss/header/header.scss b/dev/scss/header/header.scss
index 9187946..20f1e67 100644
--- a/dev/scss/header/header.scss
+++ b/dev/scss/header/header.scss
@@ -50,7 +50,6 @@
pointer-events: none;
font-family: FontAwesome;
text-align: center;
- background-color: $light-green;
}
}
span.select {
diff --git a/lib/Kalamar.pm b/lib/Kalamar.pm
index 1e8b0c7..7856e91 100644
--- a/lib/Kalamar.pm
+++ b/lib/Kalamar.pm
@@ -8,7 +8,7 @@
use List::Util 'none';
# Minor version - may be patched from package.json
-our $VERSION = '0.33';
+our $VERSION = '0.34';
# Supported version of Backend API
our $API_VERSION = '1.0';
diff --git a/package.json b/package.json
index a86ba60..e06a30c 100755
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "Kalamar",
"description": "Mojolicious-based Frontend for KorAP",
"license": "BSD-2-Clause",
- "version": "0.33.1",
+ "version": "0.34.1",
"pluginVersion": "0.1",
"repository": {
"type": "git",
diff --git a/templates/partial/header.html.ep b/templates/partial/header.html.ep
index de20994..d007f94 100644
--- a/templates/partial/header.html.ep
+++ b/templates/partial/header.html.ep
@@ -22,7 +22,7 @@
<div class="button right">
% param(cutoff => 1) unless param 'q';
%= check_box cutoff => 1, id => 'q-cutoff-field', class => 'checkbox'
- <label for="q-cutoff-field" title="<%= loc('glimpse_desc') %>"><span id="glimpse-intrjs"></span><%= loc('glimpse') %></label>
+ <label for="q-cutoff-field" title="<%= loc('glimpse_desc') %>"><span id="glimpse"></span><%= loc('glimpse') %></label>
<%= link_to 'doc_start', title => loc('tutorial'), class => "tutorial", id => "view-tutorial", tabindex => '-1', begin %><span><%= loc 'tutorial' %></span><% end %>
</div>
<div class="clear"></div>