rearrange the header and get rid of wrapper

2 files changed, 35 insertions, 77 deletions

diff --git a/views/elements/authnav.html.php b/views/elements/authnav.html.php
index e2f3d99..9b0af38 100644
--- a/views/elements/authnav.html.php
+++ b/views/elements/authnav.html.php
@@ -1,39 +1,23 @@
 <nav>
 <ul id="nav">
 	<li class="current"><a href="/users/feed">Home</a></li>
-	<li><a href="about.html">Anime</a>
-    <ul>
-      <li><a href="about.html">Top Anime</a>
-      <li><a href="#">Recomendations</a></li>
-      <li><a href="/animelist/view/<?= $user['username'] ?>">My Animelist</a></li>
-    </ul>
-  </li>
-  <li><a href="#">Manga</a>
-    <ul>
-      <li><a href="#">Top Manga</a></li>
-      <li><a href="#">Recomendations</a></li>
-    </ul>
-    </li>
-   <li><a href="#">Friends</a>
-    <ul>
-      <li><a href="">Add Friend</a></li>
-    </ul>
-  </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')); ?>
-        <?= $this->form->text('search', array('value' => 'Search...', 'onFocus' => 'clearDefault(this)', 'class' => 'sidebar-search', 'style' => 'width:200px')); ?>
-        <button class="search" type="submit">Go</button>
-        <br class="cl"/>
-        <?= $this->form->end(); ?>
-      </li>
+	<li><a href="about.html">Anime</a></li>
+	<li><a href="/animelist/view/<?= $user['username'] ?>">My List</a></li>
+	<li><a href="#">Manga</a></li>
+	<li><a href="#">Friends</a></li>
+	<li><a href="/users/settings">Settings</a></li>
+	<li><a href="/logout">Logout</a></li>
 </ul>
-<br class="cl" />
 </nav>
+
+<?= $this->form->create(null, array('url' => '/search/index/anime', 'class' => 'search', 'method' => 'get')); ?>
+<?= $this->form->text('search', array('value' => 'Search...', 'onFocus' => 'clearDefault(this)', 'style' => 'width: 200px')); ?>
+<button class="search" type="submit">Go</button>
+<?= $this->form->end(); ?>
+
 <div id="friend" style="display:none">
-  <?= $this->form->create(); ?>
-   <?= $this->form->field('username', array('type' => 'textbox')); ?>
-   <?= $this->form->submit('Add'); ?>
-  <?= $this->form->end(); ?>
-</div>  
\ No newline at end of file
+	<?= $this->form->create(); ?>
+	<?= $this->form->field('username', array('type' => 'textbox')); ?>
+	<?= $this->form->submit('Add'); ?>
+	<?= $this->form->end(); ?>
+</div>
diff --git a/views/elements/normalnav.html.php b/views/elements/normalnav.html.php
index c700aba..28eeeff 100644
--- a/views/elements/normalnav.html.php
+++ b/views/elements/normalnav.html.php
@@ -1,50 +1,24 @@
-<script type="text/javascript">
-</script>
-    <nav>
+<nav>
 <ul id="nav">
 	<li class="current"><a href="/users/feed">Home</a></li>
-	<li><a href="about.html">Anime</a>
-    <ul>
-      <li><a href="about.html">Top Anime</a></li>
-      <li><a href="#">recomendations</a>
-    </ul>
-    <li><a href="about.html">Manga</a>
-    <ul>
-      <li><a href="about.html">Top Manga</a></li>
-      <li><a href="#">recomendations</a>
-    </ul>
-    </li>    
-    </li>
+	<li><a href="about.html">Anime</a></li>
+    <li><a href="about.html">Manga</a></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="#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')); ?>
-        <button class="search" type="submit">Go</button>
-        <br class="cl"/>
-        <?= $this->form->end(); ?>
-      </li>
+	<li><a href="#login" rel="prettyPhoto">Login</a></li>
 </ul>
-<br class="cl" />
-    </nav>
+</nav>
+
+<?= $this->form->create(null, array('url' => '/search/index/anime', 'class' => 'search', 'method' => 'get')); ?>
+<?= $this->form->text('search', array('value' => 'Search...', 'onFocus' => 'clearDefault(this)', 'style' => 'width: 200px')); ?>
+<button class="search" type="submit">Go</button>
+<?= $this->form->end(); ?>
+
 <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
+<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>