From c1bbe004f00d5381c37c12855606bb22b4dd005b Mon Sep 17 00:00:00 2001
From: Eric Barbour <ebarbour@redhat.com>
Date: Jul 28 2016 15:55:49 +0000
Subject: Avoid empty nav bar if visiting hub logged out


Move check for g.auth.logged_in to surround all of the nav bar

---

diff --git a/hubs/templates/master.html b/hubs/templates/master.html
index f093304..83f7608 100644
--- a/hubs/templates/master.html
+++ b/hubs/templates/master.html
@@ -53,36 +53,33 @@
   </div>
 </div>
 <div class="bodycontent">
-
-  
-<div class="col-md-2">
+  <div class="col-md-2">
     <nav class="navbar navbar-light p-t-2 p-b-0">
-        <button type="button" class="navbar-toggler hidden-sm-up"
-            data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
-          <span class="sr-only">Toggle navigation</span>
-          <span class="oi" data-glyph="menu"></span>
-        </button>
+      <button type="button" class="navbar-toggler hidden-sm-up"
+        data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
+        <span class="sr-only">Toggle navigation</span>
+        <span class="oi" data-glyph="menu"></span>
+      </button>
 
-<!-- Collect the nav links, forms, and other content for toggling -->
-  <div class="collapse navbar-toggleable-xs" id="bs-example-navbar-collapse-1">
+      <!-- Collect the nav links, forms, and other content for toggling -->
+      {% if g.auth.logged_in %}
+      <div class="collapse navbar-toggleable-xs" id="bs-example-navbar-collapse-1">
         <ul class="nav navbar-nav">
-          {% if g.auth.logged_in %}
           <li class="p-x-1 nav-item {% if request.path.endswith('/' + g.auth.user.username + '/') %}active{% endif %}">
             <a class="nav-link" href="/{{g.auth.user.username}}">me</a></li>
           {% for hub in g.auth.user.bookmarks %}
           <li class='p-x-1 nav-item idle-{{hub.activity_class}}{% if request.path.endswith('/' + hub.name + '/') %} active{% endif %}'>
-          <a class="nav-link" href="/{{hub.name}}">{{hub.name}}</a></li>
+            <a class="nav-link" href="/{{hub.name}}">{{hub.name}}</a></li>
           {% endfor %}
           <!-- At the end of the list, tack on a link to all groups -->
 
- <li class="p-x-1 nav-item"><a class="nav-link" href="/groups">all</a></li>
-          {% endif %}
+            <li class="p-x-1 nav-item"><a class="nav-link" href="/groups">all</a></li>
         </ul>
-  </div><!-- /.navbar-collapse -->
-  </nav>
-  
-</div>  
-  
+      </div><!-- /.navbar-collapse -->
+      {% endif %}
+    </nav>
+  </div>
+
 {% block content %}{% endblock %}
 
 </div> <!--end bodycontent-->