added adminbar

Author: nickyeoman

src/adminbar.twig

@@ -0,0 +1,16 @@
+{% if admin == 'admin' %}
+    {% if adminbar == true %}
+        <div id="adminbar">
+            <ul>
+                <li><em>Admin Menu</em></li>
+                <li><a href="/admin">Admin Dashboard</a></li>
+                <li><a href="/page/admin">Pages</a></li>
+                <li><a href="/contact/admin">Manage Messages</a></li>
+                <li><a href="/logs">Logs</a></li>
+                <li><a href="/page/admincomment">Edit Comments</a></li>
+                <li><a href="/user/admin">Users</a></li>
+                <li><a href="/spamwords">Spam Phrases</a></li>
+            </ul>
+        </div>
+    {% endif %}
+{% endif %}

src/master.html.twig

@@ -18,27 +18,35 @@
     {% block headerafter %}{% endblock %}
   </header>
 
-  {% if error|default is not empty %}
-    {% for key, val in error %}
-      <div class="error">{{ val }}</div>
-    {% endfor %}
-  {% endif %}
-
   <!-- Main Content Of The Page -->
   <div id="page">
     <div class="container">
-
-      {% include 'cms/mod_lance.html.twig' ignore missing %}
+      
       <aside id="beforeContent">
+        {% include ['cms/adminbar.html.twig', '@nytwig/adminbar.twig'] %}
         {% include 'cms/mod_henry.html.twig' ignore missing %}
         {% block asidebefore %}{% endblock %}
       </aside>
 
-      <article>
-        {% include 'cms/mod_alex.html.twig' ignore missing %}
-        {% block content %}{% endblock %}
-        {% include 'cms/mod_simon.html.twig' ignore missing %}
-      </article>
+      <div class="middle">
+        {% if error|default is not empty %}
+          {% for key, val in error %}
+            <div class="error">{{ val }}</div>
+          {% endfor %}
+        {% endif %}
+
+        {% if notice|default is not empty %}
+          {% for key, val in notice %}
+            <div class="notice">{{ val }}</div>
+          {% endfor %}
+        {% endif %}
+
+        <article>
+          {% include 'cms/mod_alex.html.twig' ignore missing %}
+          {% block content %}{% endblock %}
+          {% include 'cms/mod_simon.html.twig' ignore missing %}
+        </article>
+      </div>
 
       <aside id="afterContent">
         {% include 'cms/mod_fred.html.twig' ignore missing %}

src/nav.html.twig

@@ -1,13 +1,20 @@
-<div class="container flexbox">
-  <div id="logo"><a href="/">LOGO</a></div>
+<div class="container">
+  <div id="logo"><a href="/">Logo Goes Here</a></div>
 
   <nav>
 
     <ul>
 
       <li><a href="/">Home</a></li>
-      <li><a href="/user/index">Login/Register</a></li>
-
+      <li><a href="/contact">Contact Us</a></li>
+      {% if loggedin %}
+        <li><a href="/logout/">Logout</a></li>
+      {% else %}
+        <li><a href="/login/">Login</a></li>
+      {% endif %}
+      {% if admin == 'admin' %}
+        <li><a href="/admin">Admin</a></li>
+      {% endif %}
     </ul>
 
   </nav>