New views for the nav bar.

2 files changed, 15 insertions, 18 deletions

diff --git a/views/elements/authnav.html.php b/views/elements/authnav.html.php
index 80493ba..eab05aa 100644
--- a/views/elements/authnav.html.php
+++ b/views/elements/authnav.html.php
@@ -4,31 +4,18 @@
 	<li><a href="about.html">Anime</a>
     <ul>
       <li><a href="about.html">Top Anime</a></li>
-      <li><a href="#">recomendations</a></li>
+      <li><a href="#">Recomendations</a></li>
       <li><a href="/animelist/view/<?= $user['username'] ?>">My Animelist</a></li>
 
     </ul>
     <li><a href="about.html">Manga</a>
     <ul>
       <li><a href="about.html">Top Manga</a></li>
-      <li><a href="#">recomendations</a>
+      <li><a href="#">Recomendations</a>
     </ul>
     </li>    
     </li>
-	<li><a href="portfolio.html">Stuff</a>
-    
-    <ul>
-    <li><a href="portfolio.html">3 Column Portfolio</a></li>
-    <li><a href="portfolio-list.html">Portfolio List</a></li>
-    </ul>
-    
-    </li>	
-	<li><a href="services.html">Foo</a>
-    <ul>
-    <li><a href="pricing.html">Pricing Table</a></li>
-    </ul>
-    </li>
-	<li><a href="contact.html">Contact Us</a></li>
+  <li><a href="/users/settings"> Settings </a></li>
   <li><a href="/logout">Logout</a></li>
       <li>
         <?= $this->form->create(null, array('url' => '/search/index/anime', 'class' => 'search', 'style' => 'height:20px', 'method' => 'get')); ?>
diff --git a/views/elements/normalnav.html.php b/views/elements/normalnav.html.php
index 460eb16..c700aba 100644
--- a/views/elements/normalnav.html.php
+++ b/views/elements/normalnav.html.php
@@ -1,3 +1,5 @@
+<script type="text/javascript">
+</script>
     <nav>
 <ul id="nav">
 	<li class="current"><a href="/users/feed">Home</a></li>
@@ -27,7 +29,7 @@
     </ul>
     </li>
 	<li><a href="contact.html">Contact Us</a></li>
-  <li><a href="/login?iframe=true&width=100%&height=600px" rel="prettyPhoto[iframes]">Login</a></li>
+  <li><a href="#login" rel="prettyPhoto">Login</a></li>
       <li>
         <?= $this->form->create(null, array('url' => '/search/index/anime', 'class' => 'search', 'style' => 'height:20px', 'method' => 'get')); ?>
         <?= $this->form->text('search', array('value' => 'Search...', 'onFocus' => 'clearDefault(this)', 'class' => 'sidebar-search', 'style' => 'width:200px')); ?>
@@ -37,4 +39,12 @@
       </li>
 </ul>
 <br class="cl" />
-    </nav>
\ No newline at end of file
+    </nav>
+<div id="login" style="display: none;">
+<h2> Login </h2>
+  <?= $this->form->create(null, array('url' => '/login', 'id' => 'login')); ?>
+    <?= $this->form->field('username', array('type' => 'textbox')); ?>
+    <?= $this->form->field('password', array('type' => 'password')); ?>
+    <?= $this->form->submit('Login'); ?>
+  <?= $this->form->end(); ?>
+</div>
\ No newline at end of file