From c731753e33befcedc4ce7be02180b871d318348f Mon Sep 17 00:00:00 2001 From: Alice Harris Date: Fri, 5 Sep 2014 20:57:44 +1000 Subject: [PATCH] add Help menu --- public/css/menu.styl | 1 + views/shared/header/menu.jade | 38 +++++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/public/css/menu.styl b/public/css/menu.styl index cd101bf0bb..67610f2ba4 100644 --- a/public/css/menu.styl +++ b/public/css/menu.styl @@ -74,6 +74,7 @@ hrpg-button-color-mixin($color-toolbar) // Top level menu items: Tasks – User – Social – Inventory .toolbar-nav + white-space: nowrap float:left; padding: 0.618em @media screen and (max-width:768px) diff --git a/views/shared/header/menu.jade b/views/shared/header/menu.jade index 42a589597d..a77f4dd70f 100644 --- a/views/shared/header/menu.jade +++ b/views/shared/header/menu.jade @@ -43,11 +43,28 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}') a(ui-sref='options.inventory.mounts')=env.t('mounts') li a(ui-sref='options.inventory.equipment')=env.t('equipment') + + ul.toolbar-submenu + li + a(target="_blank" href='http://habitrpg.wikia.com/wiki/FAQ')=env.t('FAQ') + li + a(target="_blank" href='https://github.com/HabitRPG/habitrpg/issues/2760')=env.t('reportBug') + li + a(target="_blank" href='https://habitrpg.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a')=env.t('askQuestion') + li + a(target="_blank" href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents')=env.t('requestAF') + li + a(target="_blank" href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG')=env.t('contributeToHRPG') + li + a(target="_blank" href='http://habitrpg.wikia.com/wiki/')=env.t('overview') + ul.toolbar-controls li.toolbar-subscribe-button button(ng-if='!user.purchased.plan.customerId',ui-sref='options.settings.subscription',popover-trigger='mouseenter',popover-placement='bottom',popover-title=env.t('subscriptions'),popover=env.t('subDescription'),popover-append-to-body='true')=env.t('subscribe') li.toolbar-controls-button a(ng-click='expandMenu(null)')=env.t('close') + + ul.toolbar-nav li.toolbar-button a(ui-sref='tasks') @@ -99,6 +116,27 @@ nav.toolbar(ng-controller='AuthCtrl', ng-class='{active: isToolbarHidden}') a(ui-sref='options.inventory.mounts')=env.t('mounts') li a(ui-sref='options.inventory.equipment')=env.t('equipment') + + li.toolbar-button-dropdown + a(target="_blank" href='http://habitrpg.wikia.com/wiki/') + span=env.t('help') + a(ng-click='expandMenu("help")', ng-class='{active: _expandedMenu == "help"}') + span ☰ + div(ng-if='_expandedMenu == "help"') + ul.toolbar-submenu(ng-click='expandMenu(null)') + li + a(target="_blank" href='http://habitrpg.wikia.com/wiki/FAQ')=env.t('FAQ') + li + a(target="_blank" href='https://github.com/HabitRPG/habitrpg/issues/2760')=env.t('reportBug') + li + a(target="_blank" href='https://habitrpg.com/#/options/groups/guilds/5481ccf3-5d2d-48a9-a871-70a7380cee5a')=env.t('askQuestion') + li + a(target="_blank" href='https://trello.com/c/odmhIqyW/440-read-first-table-of-contents')=env.t('requestAF') + li + a(target="_blank" href='http://habitrpg.wikia.com/wiki/Contributing_to_HabitRPG')=env.t('contributeToHRPG') + li + a(target="_blank" href='http://habitrpg.wikia.com/wiki/')=env.t('overview') + ul.toolbar-subscribe(ng-if='!user.purchased.plan.customerId') li.toolbar-subscribe-button button(ui-sref='options.settings.subscription',popover-trigger='mouseenter',popover-placement='bottom',popover-title=env.t('subscriptions'),popover=env.t('subDescription'),popover-append-to-body='true')=env.t('subscribe')