make search index work

clean up a lot of code
renamed anime.css to table.css

6 files changed, 24 insertions, 73 deletions

diff --git a/controllers/SearchController.php b/controllers/SearchController.php
index a7b0cee..805b981 100644
--- a/controllers/SearchController.php
+++ b/controllers/SearchController.php
@@ -21,7 +21,6 @@ class SearchController extends \lithium\action\Controller {
 			$kdrama = Kdrama::find('all', compact('conditions', 'limit'));
 			
 			return compact('anime', 'manga', 'kdrama');	
-
 		}
 	}
 
diff --git a/models/Anime.php b/models/Anime.php
index 8281ea7..71a7fd9 100644
--- a/models/Anime.php
+++ b/models/Anime.php
@@ -12,7 +12,7 @@ class Anime extends \lithium\data\Model {
 
 		switch($by) {
 		case 'special_id':
-			$content = self::find('first',
+			$anime = self::find('first',
 				array('conditions' => array(
 						$by => $query
 					),
@@ -28,7 +28,7 @@ class Anime extends \lithium\data\Model {
 			if ($query)
 			{
 				$conditions = null; // TODO
-				$content = self::find('all', array(
+				$anime = self::find('all', array(
 					'conditions' => array($by => array('like' => $query)),
 					'limit' => $limit,
 					'page' => $page
@@ -37,13 +37,13 @@ class Anime extends \lithium\data\Model {
 			}
 			else
 			{
-				$content = self::find('all', array(
+				$anime = self::find('all', array(
 					'limit' => $limit,
 					'page' => $page
 				));
 				$total = Anime::count();
 			}
 		}
-		return compact('content', 'by', 'limit', 'total', 'page');
+		return compact('anime', 'by', 'limit', 'total', 'page');
 	}
 }
diff --git a/views/elements/animetable.html.php b/views/elements/animetable.html.php
index a074c68..0d9f9fb 100644
--- a/views/elements/animetable.html.php
+++ b/views/elements/animetable.html.php
@@ -2,27 +2,27 @@
 <th>Title</th>
 <th>Date</th>
 <th>Type</th>
-<?php foreach ($content as $anime): ?>
+<?php foreach ($anime as $a): ?>
 	<tr>
 		<td>
-			<a href="/anime/view/<?= $anime->special_id ?>"><?= $anime->title ?></a>
-			<?php if ($anime->foreign_titles || $anime->alternative_titles): ?>
+			<a href="/anime/view/<?= $a->special_id ?>"><?= $a->title ?></a>
+			<?php if ($a->foreign_titles || $a->alternative_titles): ?>
 				<span class="alt_titles">
-				<?php if ($anime->foreign_titles): ?>
-					<?= $anime->foreign_titles[0] ?>
+				<?php if ($a->foreign_titles): ?>
+					<?= $a->foreign_titles[0] ?>
 				<?php endif ?>
-				<?php if ($anime->alternative_titles): ?>
+				<?php if ($a->alternative_titles): ?>
 					&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-					<?= $anime->alternative_titles[0] ?>
+					<?= $a->alternative_titles[0] ?>
 				<?php endif ?>
 				</span>
 			<?php endif ?>
 		</td>
 		<td>
-			<?= $anime->aired ?>
+			<?= $a->aired ?>
 		</td>
 		<td>
-			<?= $anime->view_type ?>
+			<?= $a->view_type ?>
 		</td>
 	</tr>
 <?php endforeach ?>
diff --git a/views/search/anime.html.php b/views/search/anime.html.php
index 89cc9e9..94acb84 100644
--- a/views/search/anime.html.php
+++ b/views/search/anime.html.php
@@ -1,6 +1,6 @@
 <?php
-$this->styles($this->html->style('anime'));
 $this->styles($this->html->style('pagination'));
+$this->styles($this->html->style('table'));
 ?>
 
 <?= $this->_render('element', 'search') ?>
@@ -10,6 +10,6 @@ $this->styles($this->html->style('pagination'));
 
 <?= $this->Paginator->paginate(array('separator' => '')) ?>
 
-<?= $this->_render('element', 'animetable', compact('anime')) ?>
+<?= $this->_render('element', 'animetable') ?>
 
 <?= $this->Paginator->paginate(array('separator' => '')) ?>
diff --git a/views/search/index.html.php b/views/search/index.html.php
index a269d01..a05f269 100644
--- a/views/search/index.html.php
+++ b/views/search/index.html.php
@@ -1,65 +1,15 @@
 <?php
-$this->styles($this->html->style('pagination'));
+$this->styles($this->html->style('table'));
 ?>
 
 <h3>Anime</h3>
 <?= $this->_render('element', 'animetable', compact('anime')) ?>
 <?= $this->html->link("More", array('controller' => 'search',
-										'action' => 'anime')); ?>
+									'action' => 'anime')); ?>
 <h3>Manga</h3>
-<hr>
-<table>
-<th>Title</th>
-<th>Date</th>
-<th>Type</th>
-<?php if(count($manga) > 0): ?>
-<?php foreach ($manga as $item): ?>
-	<tr>
-		<td>
-			<a href="/anime/view/<?= $item->special_id ?>"><?= $item->title ?></a>
-		</td>
-		<td>
-			<?= $item->aired ?>
-		</td>
-		<td>
-			<?= $item->view_type ?>
-		</td>
-	</tr>
-<?php endforeach ?>
-</table>
-<div style = "float:right">
-	<?= $this->html->link("More", array('controller' => 'search',
-										'action' => 'anime')); ?>
-</div>
-<?php else: ?>
-<p> No entries found </p>
-<?php endif; ?>
+<?= $this->html->link("More", array('controller' => 'search',
+									'action' => 'anime')); ?>
 
-<h3> K Drama </h3>
-<hr>
-<table>
-<th>Title</th>
-<th>Date</th>
-<th>Type</th>
-<?php if(count($kdrama) > 0): ?>
-<?php foreach ($kdrama as $item): ?>
-	<tr>
-		<td>
-			<a href="/anime/view/<?= $item->special_id ?>"><?= $item->title ?></a>
-		</td>
-		<td>
-			<?= $item->aired ?>
-		</td>
-		<td>
-			<?= $item->view_type ?>
-		</td>
-	</tr>
-<?php endforeach ?>
-</table>
-<div style = "float:right">
-	<?= $this->html->link("More", array('controller' => 'search',
-										'action' => 'anime')); ?>
-</div>
-<?php else: ?>
-<p>No Entries found</p>
-<?php endif; ?>
+<h3>K Drama</h3>
+<?= $this->html->link("More", array('controller' => 'search',
+									'action' => 'anime')); ?>
diff --git a/webroot/css/anime.css b/webroot/css/table.css
index 03f0883..f0a5184 100644
--- a/webroot/css/anime.css
+++ b/webroot/css/table.css
@@ -1,3 +1,5 @@
+/* for search results and anime/manga/kdrama lists */
+
 span.alt_titles {
 	font-size: 90%;
 	opacity: 0.7;