morning changes

twig/cp/control-panel.html.twig

@@ -9,17 +9,17 @@
   
 {# Page Header #}
 <header> 
-  <h1 id="biglogo"><span class="main">Novaconium PHP</span></h1>
+  <h1 id="biglogo"><span class="main">Novaconium</span></h1>
 </header>
 
 <!-- Main Content Of The Page -->
 <div id="panel" class="container">
   
-    {% include ['@novaconium/controlPanel/menu.html.twig'] %}
+    {% include ['@novaconium/cp/menu.html.twig'] %}
 
-    <article>
+    <main id="content">
       {% block content %}{% endblock %}
-    </article>
+    </main>
 
 </div>
 
@@ -27,6 +27,12 @@
     <footer>
       <div class="copyright">&copy; {{ 'now' | date('Y') }} Novaconium</div>
     </footer>
+    
+    {% include '@novaconium/javascript/page-edit.html.twig' %}
+
+    {% if editor == 'ace' %}
+    {% include '@novaconium/javascript/ace.html.twig' %}
+    {% endif %}
 
     {% if debug is not empty %}
       <div id="debug">

twig/cp/menu.html.twig

@@ -1,9 +1,9 @@
-<div class="left">
-    <ul id="leftnav">
+<div id="cp-menu">
+    <ul id="cp-nav">
         <li><a href="/novaconium/dashboard">Dashboard</a></li>
         <li><a href="/novaconium/pages">Pages</a></li>
         <li><a href="/novaconium/messages">Messages</a></li>
+        <li><a href="/novaconium/settings">Settings</a></li>
         <li><a href="/novaconium/logout">Logout</a></li>
-        <li><a href="/novaconium/login">Login</a></li>
     </ul>
 </div>