Merge pull request #1600 from mozilla/navgroup

update more menu nav groups (bug 1189377)
mozilla · Feb 1, 2016 · b7577d4 · b7577d4
2 parents 90bf673 + 82f795c
commit b7577d4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/src/media/css/nav--global.styl b/src/media/css/nav--global.styl
@@ -262,11 +262,12 @@ menu-item-active() {
 [data-page-type~="nav-addons"] [data-page="addons"],
 [data-page-type~="nav-websites"] [data-page="websites"],
 [data-page-type~="feedback"] [data-page="feedback"],
-[data-page-type~="settings"]:not([data-page-type~="purchases"]):not([data-page-type~="feedback"]) [data-page="settings"],
+[data-page-type~="settings"]:not([data-page-type~="sub_setting"]) [data-page="settings"],
 [data-page-type~="recommended"] [data-page="recommended"],
 [data-page-type~="purchases"] [data-page="purchases"],
 [data-page-type~="terms"] [data-page="terms"],
-[data-page-type~="privacy"] [data-page="privacy"] {
+[data-page-type~="privacy"] [data-page="privacy"],
+[data-page-type~="newsletter"] [data-page="newsletter"] {
     menu-item-active();
 }
 

diff --git a/src/media/js/views/feedback.js b/src/media/js/views/feedback.js
@@ -48,7 +48,7 @@ define('views/feedback',
     return function(builder) {
         var title = gettext('Feedback');
 
-        builder.z('type', 'leaf settings spoke-header feedback');
+        builder.z('type', 'leaf settings sub_setting spoke-header feedback');
         builder.z('title', gettext('Feedback'));
         utilsLocal.headerTitle(title);
         builder.z('parent', urls.reverse('homepage'));

diff --git a/src/media/js/views/newsletter_signup.js b/src/media/js/views/newsletter_signup.js
@@ -7,7 +7,7 @@ define('views/newsletter_signup',
     var gettext = l10n.gettext;
 
     return function(builder, args) {
-        var pageTypes = (settings.meowEnabled ? 'leaf' : 'root') + ' settings';
+        var pageTypes = (settings.meowEnabled ? 'leaf' : 'root') + ' sub_setting newsletter settings';
         var title = gettext('Newsletter Signup');
         var context = {
             standalone_newsletter_signup: true,

diff --git a/src/media/js/views/purchases.js b/src/media/js/views/purchases.js
@@ -6,7 +6,7 @@ define('views/purchases', ['core/l10n', 'core/urls'], function(l10n, urls) {
     var gettext = l10n.gettext;
 
     return function(builder, args) {
-        builder.z('type', 'root settings purchases');
+        builder.z('type', 'root settings sub_setting purchases');
         builder.z('title', gettext('My Apps'));
         builder.z('parent', urls.reverse('homepage'));
 

diff --git a/src/templates/nav.html b/src/templates/nav.html
@@ -61,7 +61,9 @@ <h1 class="site">
     {% if homescreensEnabled %}
       <li><a href="{{ url('homescreens') }}">{{ _('Homescreens') }}</a></li>
     {% endif %}
+
     <li class="overlay-divider"></li>
+
     <li class="more-menu-register nav--settings--logged-out">
       <a class="persona register">{{ _('Register') }}</a>
     </li>
@@ -77,7 +79,6 @@ <h1 class="site">
     <li data-page="purchases" class="more-menu-my-apps nav--settings--logged-in">
       <a href="{{ url('purchases') }}">{{ _('My Apps') }}</a>
     </li>
-    <li data-page="feedback" class="more-menu-feedback"><a href="{{ url('feedback') }}">{{ _('Feedback') }}</a></li>
     <li class="more-menu-sign-out nav--settings--logged-in"><a class="logout">{{ _('Sign out') }}</a></li>
     {% if user.get_permission('developer') %}
       <li><a href="/developers/submissions" rel="external">{{ _('My Submissions') }}</a></li>
@@ -88,7 +89,16 @@ <h1 class="site">
     {% if user.get_permission('lookup') %}
       <li><a href="/lookup/" rel="external">{{ _('Lookup Tool') }}</a></li>
     {% endif %}
+
     <li class="overlay-divider"></li>
+
+    <li><a href="http://support.mozilla.org/products/firefox-os/marketplace">{{ _('Support') }}</a></li>
+    <li data-page="feedback" class="more-menu-feedback"><a href="{{ url('feedback') }}">{{ _('Feedback') }}</a></li>
+    <li><a href="http://wiki.mozilla.org/Marketplace/Contributing/Apps">{{ _('Get Involved') }}</a></li>
+    <li data-page="newsletter"><a href="{{ url('newsletter_signup') }}">{{ _('Newsletter Signup') }}</a></li>
+
+    <li class="overlay-divider"></li>
+
     <li data-page="privacy"><a href="{{ url('privacy') }}">{{ _('Privacy Policy') }}</a></li>
     <li data-page="terms"><a href="{{ url('terms') }}">{{ _('Terms of Use') }}</a></li>
   </ul>