pull in dev branch changes

not pulled: swiftmailer, gzip

5 files changed, 42 insertions, 4 deletions

diff --git a/views/anime_list/add.html.php b/views/anime_list/add.html.php
index 2e93ffd..de3da9c 100644
--- a/views/anime_list/add.html.php
+++ b/views/anime_list/add.html.php
@@ -3,11 +3,11 @@
 <?php if (empty($anime)): ?>
 <h2 class="ribbon full">Find an Anime:</h2>
 <div class="triangle-ribbon"></div>
-<br class="clear" />
+<br class="cl" />
 <?php else: ?>
 <h2 class="ribbon full"><?= $anime->title ?></h2>
 <div class="triangle-ribbon"></div>
-<br class="clear" />
+<br class="cl" />
 <?php endif; ?>
 
 <script type="text/javascript">		
@@ -30,6 +30,7 @@
 	}
 
 	echo $this->form->field('my_watched_episodes', array('label' => 'Watched Episodes'));
+	echo "Start date";
 	echo $this->form->field('my_start_date', array('label' => 'Start Date'));
 	echo $this->form->field('my_finish_date', array('label' => 'Finish Date'));
 	echo $this->form->field('my_score', array('label' => 'Score'));
@@ -46,4 +47,5 @@
 	echo $this->form->field('tags', array('type' => 'textarea', 'id' => 'tags'));
 	echo $this->form->checkbox('rewatching', array('label' =>'Rewatching?', 'value' => false));
 	echo $this->form->submit('Save!');
-?>
\ No newline at end of file
+	echo $this->form->end();
+?>
diff --git a/views/elements/animesearch.html.php b/views/elements/animesearch.html.php
new file mode 100644
index 0000000..370ff1a
--- /dev/null
+++ b/views/elements/animesearch.html.php
@@ -0,0 +1,4 @@
+<tr><th>img</th><th>Name</th><th>Episodes</th><th>Type</th><th>Score</th></tr>
+		<?php foreach($content as $item): ?>
+			<tr><td>"image"</td><td><a href="/anime/view/<?= $item->special_id ?>"><?= $item->title ?></a></td> <td><?= $item->episode_count ?></td><td><?= $item->view_type ?></td><td><?= $item->mal_score ?></td></tr>
+<?php endforeach; ?>
\ No newline at end of file
diff --git a/views/elements/authnav.html.php b/views/elements/authnav.html.php
index b961c39..e2f3d99 100644
--- a/views/elements/authnav.html.php
+++ b/views/elements/authnav.html.php
@@ -1,7 +1,7 @@
 <nav>
 <ul id="nav">
 	<li class="current"><a href="/users/feed">Home</a></li>
-	<li><a href="about.html">Anime</a></li>
+	<li><a href="about.html">Anime</a>
     <ul>
       <li><a href="about.html">Top Anime</a>
       <li><a href="#">Recomendations</a></li>
diff --git a/views/import/index.html.php b/views/import/index.html.php
new file mode 100644
index 0000000..da0d396
--- /dev/null
+++ b/views/import/index.html.php
@@ -0,0 +1,5 @@
+<?php
+	echo $this->form->create();
+		echo $this->form->field(array('type' => 'file'));
+	echo $this->form->end();
+?>
\ No newline at end of file
diff --git a/views/search/anime.html.php b/views/search/anime.html.php
new file mode 100644
index 0000000..70a6315
--- /dev/null
+++ b/views/search/anime.html.php
@@ -0,0 +1,27 @@
+
+<div class="container_12">
+<div class="grid_4">
+<h2> Search options </h2>
+<hr />
+<?= $this->form->create(null, array('method' => 'get')); ?>
+	<?= $this->form->field('search', array('type' => 'textbox', 'class' => 'sidebar-search', 'style' => 'width:200px')); ?>
+	<?= $this->form->label('type', 'For:'); ?>
+	<?= $this->form->select('type', array('Anime'  => 'Anime',
+								  		  'Manga'  => 'Manga',
+								  		  'Kdrama' => 'Kdrama')); ?>
+	<?= $this->form->submit('Search', array('style' => 'width: 100px')); ?>
+<?= $this->form->end(); ?>
+</div>
+<div class="grid_8">
+<h2>Search Results</h2>
+<hr />
+	<table class="table">
+	<tr><th>img</th><th>Name</th><th>Episodes</th><th>Type</th><th>Score</th></tr>
+		<?php foreach($content as $item): ?>
+			<tr><td>"image"</td><td><a href="/anime/view/<?= $item->special_id ?>"><?= $item->title ?></a></td> <td><?= $item->episode_count ?></td><td><?= $item->view_type ?></td><td><?= $item->mal_score ?></td></tr>
+		<?php endforeach; ?>
+	</table>
+<?=$this->Paginator->paginate(array('separator' => '', 'action' => 'index/anime')); ?>
+</div>
+<br class="cl">
+</div>
\ No newline at end of file