Issue 5636 - Changed navbar contents

templates/default.tmpl

 {#
  # This file is part of the Adblock Plus website,
  # Copyright (C) 2006-present eyeo GmbH
  #
  # Adblock Plus is free software: you can redistribute it and/or modify
  # it under the terms of the GNU General Public License version 3 as
  # published by the Free Software Foundation.
  #
  # Adblock Plus is distributed in the hope that it will be useful,
  # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 75 matching lines @@
             src="/img/navbar-logo.png"
             srcset="/img/navbar-logo.svg 2x">
           <span>{{ "Adblock <strong>Plus</strong>" | translate("navbar-logo-text", "Navbar logo text") }}</span>
         </a>
         <a href="#" id="navbar-menu-toggle">
           <img
             src="/img/menu-toggle.png"
             srcset="/img/menu-toggle.svg 2x">
         </a>
         <ul id="navbar-menu">
-          {% for pagename in ["about", "features", "bugs", "contribute"] %}
+          {% for pagename in ["contribute", "about"] %}

[ire, 2017/10/27 12:47:27]

In the spec, the order is ["about", "contribute"]

[juliandoucette, 2017/10/28 11:35:16]

See
https://bitbucket.org/adblockplus/spec/pull-requests/76/added-abp-website-spe...

We are supposed to go by what the spec says not what the screenshots show. That
being said, I'm not sure that the spec is right :D

Can you please confirm Jeen?

             <li>
               {{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a>
             </li>
           {% endfor %}
+          <li>
+            <a href="https://help.eyeo.com/adblockplus">{{ get_string("help", "menu") }}</a>
+          </li>
           <li id="navbar-locale-menubar">
             <a href="#" id="navbar-locale-selected">
               {{ config.get("langnames", locale) }} ({{ locale | to_og_locale | to_og_location }})
             </a>
             <ul id="navbar-locale-menu">
               {% for available_locale in available_locales %}
                 <li>
                   {{ page | linkify(available_locale) }}
                     {{ config.get("langnames", available_locale) }} ({{ available_locale | to_og_locale | to_og_location }})
                   </a>
@@ skipping 102 matching lines @@
               <li>{{ pagename | linkify }}{{ get_string(pagename, "menu") }}</a></li>
             {% endfor %}
           </ul>
         </div> {# #footer-legal #}
       </div> {# .container #}
     </footer> {# #footer #}
 
     <script src="/js/main.js"></script>
   </body>
 </html>