From faaecec2ff4f7db478e9c8589db1ed4e88c8572e Mon Sep 17 00:00:00 2001 From: mlorb Date: Fri, 23 Mar 2018 14:08:27 +0100 Subject: [PATCH 1/3] implement new Help dropup in navigation --- app/assets/stylesheets/themes/menu_bar.scss | 12 +++++++++++ app/views/shared/_left_menu_bar.html.erb | 23 +++++++++++++++++++-- config/initializers/constants.rb | 8 +++---- 3 files changed, 36 insertions(+), 7 deletions(-) diff --git a/app/assets/stylesheets/themes/menu_bar.scss b/app/assets/stylesheets/themes/menu_bar.scss index ec5d9e9b2..781043b8e 100644 --- a/app/assets/stylesheets/themes/menu_bar.scss +++ b/app/assets/stylesheets/themes/menu_bar.scss @@ -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) { diff --git a/app/views/shared/_left_menu_bar.html.erb b/app/views/shared/_left_menu_bar.html.erb index 805727fa2..80efde0c9 100644 --- a/app/views/shared/_left_menu_bar.html.erb +++ b/app/views/shared/_left_menu_bar.html.erb @@ -38,11 +38,30 @@ <%= t('left_menu_bar.activities') %> -
  • "> - + +
  • + +
    • diff --git a/config/initializers/constants.rb b/config/initializers/constants.rb index 2bf846e03..4fdbbc1a6 100644 --- a/config/initializers/constants.rb +++ b/config/initializers/constants.rb @@ -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 From 9aa87a17e579e3493402c9eb0377a56ac1228f3f Mon Sep 17 00:00:00 2001 From: mlorb Date: Fri, 23 Mar 2018 14:26:53 +0100 Subject: [PATCH 2/3] remove help helper --- app/helpers/left_menu_bar_helper.rb | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/helpers/left_menu_bar_helper.rb b/app/helpers/left_menu_bar_helper.rb index f81bfecbb..e5a599bed 100644 --- a/app/helpers/left_menu_bar_helper.rb +++ b/app/helpers/left_menu_bar_helper.rb @@ -24,8 +24,4 @@ module LeftMenuBarHelper def activities_are_selected? controller_name == 'activities' end - - def help_is_selected? - # TODO - end end From eee597b31515e925da55275ba516eea6903f8e20 Mon Sep 17 00:00:00 2001 From: mlorb Date: Fri, 23 Mar 2018 15:56:38 +0100 Subject: [PATCH 3/3] fix naming --- app/views/shared/_left_menu_bar.html.erb | 14 +++++++------- config/locales/en.yml | 13 +++++-------- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/app/views/shared/_left_menu_bar.html.erb b/app/views/shared/_left_menu_bar.html.erb index 80efde0c9..00c7cd824 100644 --- a/app/views/shared/_left_menu_bar.html.erb +++ b/app/views/shared/_left_menu_bar.html.erb @@ -38,27 +38,27 @@ <%= t('left_menu_bar.activities') %> - +
    • -
    • <%= link_to t('nav.help.support'), +
    • <%= link_to t('left_menu_bar.support_links.support'), Constants::SUPPORT_URL, target: "_blank" %>
      • -
    • <%= link_to t('nav.help.tutorials'), +
    • <%= link_to t('left_menu_bar.support_links.tutorials'), Constants::TUTORIALS_URL, target: "_blank" %>
      • -
    • <%= link_to t('nav.help.premium'), +
    • <%= link_to t('left_menu_bar.support_links.webinars'), Constants::WEBINARS_URL, target: "_blank" %>
    diff --git a/config/locales/en.yml b/config/locales/en.yml index b675d7f22..dc691831f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -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"