From 035e2633566a1bfb7282db80e6ca3a5daeb84835 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Thu, 3 Sep 2015 15:57:00 -0400
Subject: [PATCH] Two column layout for hamburger

---
 .../templates/components/hamburger-menu.hbs   | 30 +++++++++++--------
 .../templates/components/menu-links.hbs       |  7 +++++
 .../stylesheets/common/base/menu-panel.scss   | 10 +++++--
 3 files changed, 31 insertions(+), 16 deletions(-)
 create mode 100644 app/assets/javascripts/discourse/templates/components/menu-links.hbs

diff --git a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs
index c5ab7182b5..65d5debbe3 100644
--- a/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs
+++ b/app/assets/javascripts/discourse/templates/components/hamburger-menu.hbs
@@ -1,6 +1,6 @@
 {{#menu-panel visible=visible}}
   {{#if currentUser.staff}}
-    <ul class="menu-links">
+    {{#menu-links class="columned"}}
       <li>{{d-link route="admin" class="admin-link" icon="wrench" label="admin_title"}}</li>
       <li>
         {{#d-link route="adminFlags" class="flagged-posts-link"}}
@@ -24,12 +24,18 @@
       <li>{{d-link route="adminSiteSettings" icon="gear" label="admin.site_settings.title"}}</li>
 
       {{plugin-outlet "hamburger-admin"}}
-    </ul>
-    <hr>
+    {{/menu-links}}
   {{/if}}
 
-  <ul class="menu-links">
+  {{#menu-links}}
     <li>{{d-link route="discovery.latest" class="latest-topics-link" label="filters.latest.title.zero"}}</li>
+
+    {{#if currentUser}}
+      <li>{{d-link route="discovery.new" class="new-topics-link" label="filters.new.title.zero"}}</li>
+      <li>{{d-link route="discovery.unread" class="unread-topics-link" label="filters.unread.title.zero"}}</li>
+    {{/if}}
+    <li>{{d-link route="discovery.top" class="top-topics-link" label="filters.top.title"}}</li>
+
     {{#if siteSettings.enable_badges}}
       <li>{{d-link route="badges" class="badge-link" label="badges.title"}}</li>
     {{/if}}
@@ -40,16 +46,12 @@
 
     {{plugin-outlet "site-map-links"}}
 
-    <li>{{d-link path=faqUrl class="faq-link" label="faq"}}</li>
-    <li>{{d-link route="about" class="about-link" label="about.simple_title"}}</li>
-
     {{#if showMobileToggle}}
       <li>{{d-link action="toggleMobileView" class="mobile-toggle-link" label=mobileViewLinkTextKey}}</li>
     {{/if}}
 
     {{plugin-outlet "site-map-links-last"}}
-  </ul>
-  <hr>
+  {{/menu-links}}
 
   {{#if categories}}
     <ul class="category-links clearfix">
@@ -64,12 +66,14 @@
       {{/each}}
     </ul>
   {{/if}}
-
   <hr>
 
-  <ul class="menu-links">
+  {{#menu-links omitRule="true"}}
+    <li>{{d-link route="about" class="about-link" label="about.simple_title"}}</li>
+    <li>{{d-link path=faqUrl class="faq-link" label="faq"}}</li>
+
     {{#if showKeyboardShortcuts}}
-    <li>{{d-link action="keyboardShortcuts" class="keyboard-shortcuts-link" label="keyboard_shortcuts_help.title"}}</li>
+      <li>{{d-link action="keyboardShortcuts" class="keyboard-shortcuts-link" label="keyboard_shortcuts_help.title"}}</li>
     {{/if}}
-  </ul>
+  {{/menu-links}}
 {{/menu-panel}}
diff --git a/app/assets/javascripts/discourse/templates/components/menu-links.hbs b/app/assets/javascripts/discourse/templates/components/menu-links.hbs
new file mode 100644
index 0000000000..fe9b872fcb
--- /dev/null
+++ b/app/assets/javascripts/discourse/templates/components/menu-links.hbs
@@ -0,0 +1,7 @@
+<ul class="menu-links columned">
+  {{yield}}
+  <div class="clearfix"></div>
+</ul>
+{{#unless omitRule}}
+  <hr>
+{{/unless}}
diff --git a/app/assets/stylesheets/common/base/menu-panel.scss b/app/assets/stylesheets/common/base/menu-panel.scss
index 8a599647f1..ce8219a482 100644
--- a/app/assets/stylesheets/common/base/menu-panel.scss
+++ b/app/assets/stylesheets/common/base/menu-panel.scss
@@ -46,6 +46,13 @@
 
 }
 
+.menu-links.columned {
+  li {
+    width: 50%;
+    float: left;
+  }
+}
+
 .menu-panel {
   ul.menu-links li, ul li.heading {
     a {
@@ -278,6 +285,3 @@ div.menu-links-header {
     margin-right: 0.2em;
   }
 }
-
-
-