From b9aa2a0396aa5f7db439bc362952f7710c7c24e9 Mon Sep 17 00:00:00 2001
From: raylu <raylu@mixpanel.com>
Date: Sun, 3 Jul 2011 04:30:08 -0700
Subject: rearrange the header and get rid of wrapper

---
 views/elements/authnav.html.php   |  50 +++++-------
 views/elements/normalnav.html.php |  62 +++++----------
 views/layouts/default.html.php    | 155 ++++++++++++++++----------------------
 3 files changed, 99 insertions(+), 168 deletions(-)

(limited to 'views')

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>
diff --git a/views/layouts/default.html.php b/views/layouts/default.html.php
index 2ca3fc9..e7a26fa 100644
--- a/views/layouts/default.html.php
+++ b/views/layouts/default.html.php
@@ -1,108 +1,81 @@
 <?php
-
-use \lithium\security\Auth; 
-/**
- * Lithium: the most rad php framework
- *
- * @copyright     Copyright 2010, Union of RAD (http://union-of-rad.org)
- * @license       http://opensource.org/licenses/bsd-license.php The BSD License
- */
+use \lithium\security\Auth;
 ?>
-<!doctype html>
+<!DOCTYPE html>
 <html>
 <head>
-	<?php echo $this->html->charset();?>
-	<title>OtakuHub > <?php echo $this->title(); ?></title>
-	<?php echo $this->html->style(array('style', 'base', 'grid')); ?>
-	<?php echo $this->html->style(array('themes/light', 'themes/green')); ?>
-  <?php echo $this->html->style(array('prettyPhoto')); ?>
- 
-  <script src="/js/jquery-1.6.1.min.js" type="text/javascript"></script>  
-  <?php echo $this->html->style(array('jquery.tagsinput')); ?>
-  <?= $this->html->script("/js/jquery.tagsinput.min.js"); ?>
+	<?= $this->html->charset() ?>
+	<title>OtakuHub > <?= $this->title()  ?></title>
+	<?= $this->html->style(array('style', 'base', 'grid')) ?>
+	<?= $this->html->style(array('themes/light', 'themes/green')) ?>
+	<?= $this->html->style(array('prettyPhoto')) ?>
 
+	<script src="/js/jquery-1.6.1.min.js" type="text/javascript"></script>
+	<?= $this->html->style(array('jquery.tagsinput')) ?>
+	<?= $this->html->script("/js/jquery.tagsinput.min.js") ?>
 
 	<script type="text/javascript" >
-		function clearDefault(el) {
-  				if (el.defaultValue==el.value) el.value = ""
-			}
-		function resetValue(el) {
-			el.value = "Search..."
-		}
-		</script>
-	<?php echo $this->html->link('Icon', null, array('type' => 'icon')); ?>
+	function clearDefault(el) {
+		if (el.defaultValue == el.value)
+			el.value = ""
+	}
+	function resetValue(el) {
+		el.value = "Search..."
+	}
+	</script>
+	<?= $this->html->link('Icon', null, array('type' => 'icon')) ?>
 </head>
-<!-- start header -->
-<div id="wrapper"> 
-  <header> 
-    <!-- logo -->
-    <h1 id="logo"><a href="/">Kameleon</a></h1>
-    <!-- nav -->
-   
-  
-<?php 
-    //Get the current user from the session
-    $user = Auth::check('default'); 
-    
-    //If their is data (the user has logged in)
-    if ($user) {
-        echo $this->_render('element', 'authnav', compact('user')); 
-    }
-    else {
-       echo  $this->_render('element', 'normalnav', compact('user'));
-    } 
- ?>
-
-<br class="cl" />  
+<header>
+	<?php
+	$user = Auth::check('default');
+	if ($user)
+	{
+		echo $this->_render('element', 'authnav', compact('user'));
+	}
+	else
+	{
+		echo $this->_render('element', 'normalnav', compact('user'));
+	}
+	?>
+	<br class="cl" />
 </header>
-  <!-- end header --> 
-  <div id="page">
-  	<?php echo $this->content(); ?>
-  	</div>
-   <!-- footer Start -->
-  <footer>
-    <ul class="footer-nav">
-      <li><a href="index.html">Home</a> |</li>
-      <li><a href="about.html">About</a> |</li>
-      <li><a href="portfolio.html">Terms of Use</a> |</li>
-            <li><a href="portfolio.html">Terms of Use</a> |</li>
-      <li><a href="contact.html">Contact</a></li>
-    </ul>
-    <p>Copyright ©2011, <a href="http://www.melenion.org">Melenion Dev Studios</a> Designed by: <a href="http://www.mudodesigns.com">Chris Mooney</a></p>
-    <br class="cl" />
-  </footer>
-  <!-- footer end --> 
-
-  <!-- Javascript at the bottom for fast page loading -->
-  <script src="/js/jquery.tools.min.js" type="text/javascript"></script> 
-  <script src="/js/jquery.lightbox-0.5.min.js" type="text/javascript"></script> 
-  <script src="/js/jquery.form.js" type="text/javascript"></script> 
-  <script src="/js/cufon-yui.js" type="text/javascript"></script> 
-  <script src="/js/Aller.font.js" type="text/javascript"></script> 
-  <script src="/js/jquery.tipsy.js" type="text/javascript"></script> 
-  <script src="/js/functions.js" type="text/javascript"></script> 
-  <?= $this->html->script("/js/jquery.anchor.js"); ?>
-  <?= $this->html->script("/js/jquery.prettyPhoto.js"); ?>
+<div id="page">
+  	<?= $this->content() ?>
+</div>
+<footer>
+	<p>Copyright ©2011, <a href="http://www.melenion.org">Melenion Dev Studios</a></p>
+	<br class="cl" />
+</footer>
 
+<script src="/js/jquery.tools.min.js" type="text/javascript"></script>
+<script src="/js/jquery.lightbox-0.5.min.js" type="text/javascript"></script>
+<script src="/js/jquery.form.js" type="text/javascript"></script>
+<script src="/js/cufon-yui.js" type="text/javascript"></script>
+<script src="/js/Aller.font.js" type="text/javascript"></script>
+<script src="/js/jquery.tipsy.js" type="text/javascript"></script>
+<script src="/js/functions.js" type="text/javascript"></script>
+<?= $this->html->script("/js/jquery.anchor.js"); ?>
+<?= $this->html->script("/js/jquery.prettyPhoto.js"); ?>
 
 <script type="text/javascript" charset="utf-8">
-  $(document).ready(function(){
-    $("a[rel^='prettyPhoto']").prettyPhoto();
-  });
+$(document).ready(function(){
+	$("a[rel^='prettyPhoto']").prettyPhoto();
+});
 </script>
 
-  <?php echo $this->scripts(); ?>
-  <script type="text/javascript">
-     $(document).ready(function(){
-      setTimeout(function(){
-  $(".flash-message").fadeOut("slow", function () {
-  $(".flash-message").remove();
-      }); }, 2000);
- });
-  </script>
+<?= $this->scripts(); ?>
+<script type="text/javascript">
+$(document).ready(function() {
+	setTimeout(function() {
+		$(".flash-message").fadeOut("slow", function () {
+			$(".flash-message").remove();
+		});
+	}, 2000);
+});
+</script>
 
-  <!--[if lt IE 7 ]>
-    <script src="js/dd_belatedpng.js"></script>
-  <![endif]--> 
+<!--[if lt IE 7 ]>
+<script src="js/dd_belatedpng.js"></script>
+<![endif]-->
 </body>
 </html>
-- 
cgit v1.2.3