scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-12-27 02:04:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1052 from mlorb/ml-sci-2125

Browse source 
Implement new Help dropup in navigation [SCI-2125]
This commit is contained in:
mlorb 2018-03-26 09:22:39 +02:00 committed by GitHub
commit 70e0d8bd1d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 42 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/assets/stylesheets/themes/menu_bar.scss
View file

@ -47,6 +47,18 @@
position: fixed;
width: inherit;
}
.dropup {
.dropdown-menu {
bottom: 0;
left: 99%;
margin-bottom: 0;
}
&.open > a {
color: $color-emperor;
}
}
}
@media(max-height:480px) {

4
app/helpers/left_menu_bar_helper.rb
View file

@ -24,8 +24,4 @@ module LeftMenuBarHelper
def activities_are_selected?
controller_name == 'activities'
end
def help_is_selected?
# TODO
end
end

25
app/views/shared/_left_menu_bar.html.erb
View file

@ -38,11 +38,30 @@
<span><%= t('left_menu_bar.activities') %></span>
</a>
</li>
<li class="<%= "active" if help_is_selected? %>">
<a id="activities-link" title="<%= t('left_menu_bar.help') %>" href="#">
<!-- support -->
<li class="dropup">
<a href="#"
id="support-link"
class="dropdown-toggle"
title="<%= t('left_menu_bar.support') %>"
data-toggle="dropdown"
role="button"
aria-haspopup="true"
aria-expanded="false">
<span class="glyphicon glyphicon-paperclip"></span>
<span><%= t('left_menu_bar.help') %></span>
<span><%= t('left_menu_bar.support') %></span>
</a>
<ul class="dropdown-menu">
<li><%= link_to t('left_menu_bar.support_links.support'),
Constants::SUPPORT_URL,
target: "_blank" %></li>
<li><%= link_to t('left_menu_bar.support_links.tutorials'),
Constants::TUTORIALS_URL,
target: "_blank" %></li>
<li><%= link_to t('left_menu_bar.support_links.webinars'),
Constants::WEBINARS_URL,
target: "_blank" %></li>
</ul>
</li>
</ul>
</div>

8
config/initializers/constants.rb
View file

@ -184,11 +184,9 @@ class Constants
#=============================================================================
HTTP = 'http://'.freeze
TUTORIALS_URL = (HTTP + 'scinote.net/product/tutorials/').freeze
SUPPORT_URL = (HTTP + 'scinote.net/support').freeze
PREMIUM_URL = (HTTP + 'scinote.net/premium/').freeze
CONTACT_URL = (HTTP + 'scinote.net/story-of-scinote/#contact-scinote').freeze
RELEASE_NOTES_URL = (HTTP + 'scinote.net/docs/release-notes/').freeze
TUTORIALS_URL = (HTTP + 'scinote.net/tutorials/').freeze
SUPPORT_URL = (HTTP + 'support.scinote.net/hc/en-us').freeze
WEBINARS_URL = (HTTP + 'scinote.net/join-a-webinar/').freeze
# Default user picture avatar
DEFAULT_AVATAR_URL = '/images/:style/missing.png'.freeze

13
config/locales/en.yml
View file

@ -75,13 +75,6 @@ en:
user:
settings: "Settings"
logout: "Log out"
help:
tutorials: "Tutorials"
release_notes: "Release notes"
support: "Customer support"
premium: "Premium"
contact: "Contact us"
about: "About sciNote"
activities:
none: "No activities!"
label:
@ -109,7 +102,11 @@ en:
reports: "Reports"
settings: "Settings"
activities: "Activities"
help: "Help"
support: "Support"
support_links:
support: "Support Center"
tutorials: "Video tutorials"
webinars: "Webinars"
sidebar:
title: "Navigation"