added navbar

rladdusaw · Jun 27, 2016 · 09e0dbb · 09e0dbb
1 parent eb90143
commit 09e0dbb
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 6 deletions.
diff --git a/giftexchange/settings.py b/giftexchange/settings.py
@@ -38,6 +38,7 @@
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'accounts',
+    'wishlist',
 ]
 
 MIDDLEWARE_CLASSES = [

diff --git a/templates/base.html b/templates/base.html
@@ -12,13 +12,32 @@
 </head>
 
 <body>
-    <a href="{% url 'home' %}">
+    <nav class="navbar navbar-inverse navbar-static-top">
         <div class="container">
-            <div class="jumbotron">
-                <h1>{% block header_text %}{% endblock %}</h1>
+            <div class="navbar-header">
+                <button class="navbar-toggle collapsed" aria-controls="navbar" aria-expanded="false" data-target="#navbar" data-togle="collapse" type="button">
+                    <span class="sr-only"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                    <span class="icon-bar"></span>
+                </button>
+                <a class="navbar-brand" href="{% url 'home' %}">Gift Exchange</a>
+            </div>
+            <div id="navbar" class="collapse navbar-collapse">
+                <ul class="nav navbar-nav">
+                    <li class="active">
+                        <a href="{% url 'home' %}">Home</a>
+                    </li>
+                    <li>
+                        <a href="{% url 'login_view' %}">Login</a>
+                    </li>
+                    <li>
+                        <a href="{% url 'register_view' %}">Register</a>
+                    </li>
+                </ul>
             </div>
         </div>
-    </a>
+    </nav>
     {% block content %}
     {% endblock %}
 

diff --git a/templates/home.html b/templates/home.html
@@ -5,7 +5,7 @@
 {% block header_text %}Login or Register{% endblock %}
 
 {% block content %}
-
+<!--
 <div class="container col-md-4 col-md-offset-4">
     {% if user.is_authenticated %}
         <h3>Welcome, {{ user.get_username }}</h3>
@@ -19,5 +19,5 @@ <h3>Welcome, Anonymous User</h3>
     <a href="{% url 'logout_view' %}" id="id_logout_button" class="btn btn-lg btn-default" role="button">Logout</a>
     {% endif %}
 </div>
-
+-->
 {% endblock %}