Add help/doc button to dropdown menu, remove button from old position, edit Change file
Change-Id: I6aed5457e0872f58d3d549c8fa6e119f31c1c648
diff --git a/Changes b/Changes
index ccf74ea..b81aab5 100644
--- a/Changes
+++ b/Changes
@@ -1,23 +1,12 @@
0.59 2025-01-23
+ - Create top navbar and modify sidebar. (uyen-nhu)
- Improve appearance of title-addon on logo. (uyen-nhu)
- Create and style new item on top navbar for 'News'. (uyen-nhu)
- - Change settings link in logout.html.ep to dynamic link. (uyen-nhu)
- - Add an indicator for user login, and some minor design changes. (uyen-nhu)
- - Add back content_block headerButtonGroup due to backwards
- compatibility and modify header.html.ep to fit changes. (uyen-nhu)
- - Correct color of minimize button for snippets to
- nearly-white, and add media query for border-radius of
- the search bar. (uyen-nhu)
- - Delete helper class get_user_name and set user_handle
- instead to get the user name. (uyen-nhu)
- - Add scroll functionality for navbar: hide on scroll down,
- show on scroll up. (uyen-nhu)
- - Create burger menu and add responsive styles for navbar,
- optimize element positions in header. (uyen-nhu)
- - Add and style registration link to fit in login area,
- change navbar size and input fields, improve positionings of
- logo and icons, fix animation of navbar when scrolling on
- small devices. (uyen-nhu)
+ - Add an indicator for user login. (uyen-nhu)
+ - Create burger menu and add responsive styles for navbar. (uyen-nhu)
+ - Add and style registration link to fit in login area. (uyen-nhu)
+ - Fix animation of navbar when scrolling on small devices. (uyen-nhu)
+ - Edit general page layout to fit new navigation. (uyen-nhu)
- Return cursor position for query object (fixes #228; diewald)
- Keep plugin state in statemanager (fixes #201; diewald)
- Fix alerts in hint helper (diewald)
diff --git a/dev/js/spec/tourSpec.js b/dev/js/spec/tourSpec.js
index ef85069..c342483 100644
--- a/dev/js/spec/tourSpec.js
+++ b/dev/js/spec/tourSpec.js
@@ -55,7 +55,6 @@
"<div class='button right'>" +
"<input checked='' class='checkbox' id='q-cutoff-field' name='cutoff' type='checkbox' value='1'>" +
"<label for='q-cutoff-field' title='Zeige nur die ersten Treffer in beliebiger Reihenfolge'><span id='glimpse'></span>Glimpse</label>" +
- "<a class='tutorial' id='view-tutorial' tabindex='-1' title='Einführung'><span>Einführung</span></a>"+
"</div>" +
"<div class='clear'></div>"+
"</form>" +
diff --git a/dev/scss/header/header.scss b/dev/scss/header/header.scss
index 8cb8e0f..a785117 100644
--- a/dev/scss/header/header.scss
+++ b/dev/scss/header/header.scss
@@ -192,6 +192,7 @@
-o-transition: all .2s ease-in-out;
-moz-transition: all .2s ease-in-out;
-webkit-transition: all .2s ease-in-out;
+ cursor: pointer;
&:hover {
color: $nearly-white;
@@ -335,9 +336,9 @@
@include icon-font;
}
- > a.tutorial::after {
- content: $fa-tutorial;
- }
+ // > a.tutorial::after {
+ // content: $fa-tutorial;
+ // }
> a.question::after {
content: $fa-question;
diff --git a/kalamar.dict b/kalamar.dict
index 22787fd..e0436c1 100644
--- a/kalamar.dict
+++ b/kalamar.dict
@@ -54,7 +54,7 @@
},
activateJS => 'Für den vollen Funktionsumfang aktivieren Sie bitte JavaScript!',
faq => 'FAQ',
- tutorial => 'Hilfe und Dokumentation',
+ tutorial => 'Einführung',
notAvailInCorpus => 'Im vorliegenden Korpus nicht verfügbar',
pubOn => 'veröffentlicht am',
matchCount => 'Treffer',
@@ -191,7 +191,7 @@
faq => 'FAQ',
'oclock' => 'o\'clock',
underConstruction => 'Under Construction!',
- tutorial => 'Help and Documentation',
+ tutorial => 'Introduction',
korap => {
-short => 'KorAP',
label => '<%= loc "korap_short" %><% if (loc("title_addon")) { %>-<%= loc("title_addon") %><% } %>',
diff --git a/lib/Kalamar/Plugin/Auth/templates/partial/auth/logout.html.ep b/lib/Kalamar/Plugin/Auth/templates/partial/auth/logout.html.ep
index 1b7fd80..52606eb 100644
--- a/lib/Kalamar/Plugin/Auth/templates/partial/auth/logout.html.ep
+++ b/lib/Kalamar/Plugin/Auth/templates/partial/auth/logout.html.ep
@@ -12,6 +12,9 @@
<span><%= $item->{title} %></span>
</a>
<% } %>
+ <a href="<%= url_for 'doc' %>" class="dropdown-item tutorial" id="view-tutorial" title="<%= loc 'tutorial' %>">
+ <span><%= loc 'tutorial' %></span>
+ </a>
<a href="<%= url_for 'logout' %>"
class="dropdown-item logout"
title="<%= loc 'logout' %>: <%= user_handle %>">
diff --git a/templates/partial/header.html.ep b/templates/partial/header.html.ep
index ac6f344..514f225 100644
--- a/templates/partial/header.html.ep
+++ b/templates/partial/header.html.ep
@@ -30,7 +30,7 @@
% 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"></span><%= loc('glimpse') %></label>
- <%= link_to 'doc_start', title => loc('tutorial'), class => "tutorial", id => "view-tutorial", tabindex => '-1', begin %><span><%= loc 'tutorial' %></span><% end %>
+ %# <%= 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>
</form>