From dcc965ab293655136c251afe4fb6f4f41ac5cb75 Mon Sep 17 00:00:00 2001
From: raylu <raylu@mixpanel.com>
Date: Sat, 16 Jul 2011 23:08:10 -0700
Subject: manga/kdrama individual search pages

---
 controllers/SearchController.php | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

(limited to 'controllers')

diff --git a/controllers/SearchController.php b/controllers/SearchController.php
index abcaabd..efd25f3 100644
--- a/controllers/SearchController.php
+++ b/controllers/SearchController.php
@@ -25,8 +25,22 @@ class SearchController extends \lithium\action\Controller {
 
 	public function anime($by = 'title')
 	{
-		$q = isset($this->request->query['q']) ?  '/' . $this->request->query['q'] . '/i' : '';
+		$q = isset($this->request->query['q']) ? $this->request->query['q'] : '';
 		$page = isset($this->request->query['page']) ? $this->request->query['page'] : 1;
-		return Anime::search($q, $page, 'title');
+		return Anime::search("/$q/i", $page, 'title');
+	}
+
+	public function manga($by = 'title')
+	{
+		$q = isset($this->request->query['q']) ? $this->request->query['q'] : '';
+		$page = isset($this->request->query['page']) ? $this->request->query['page'] : 1;
+		return Manga::search("/$q/i", $page, 'title');
+	}
+
+	public function kdrama($by = 'title')
+	{
+		$q = isset($this->request->query['q']) ? $this->request->query['q'] : '';
+		$page = isset($this->request->query['page']) ? $this->request->query['page'] : 1;
+		return Kdrama::search("/$q/i", $page, 'title');
 	}
 }
-- 
cgit v1.2.3


From 384834c9fb85d3a408c60dd38e8d1474116793ad Mon Sep 17 00:00:00 2001
From: raylu <raylu@mixpanel.com>
Date: Sun, 17 Jul 2011 16:41:22 -0700
Subject: some anime view styling

---
 controllers/AnimeController.php |  18 +++++--
 views/anime/view.html.php       | 117 +++++++++++++++++++++++-----------------
 views/layouts/default.html.php  |   4 +-
 webroot/css/base.css            |   6 ++-
 webroot/css/view.css            |  21 ++++++++
 5 files changed, 110 insertions(+), 56 deletions(-)
 create mode 100644 webroot/css/view.css

(limited to 'controllers')

diff --git a/controllers/AnimeController.php b/controllers/AnimeController.php
index bd29116..09c0828 100644
--- a/controllers/AnimeController.php
+++ b/controllers/AnimeController.php
@@ -16,10 +16,22 @@ class AnimeController extends \lithium\action\Controller {
 
 	public function view($id = null)
 	{
-		if (is_numeric($id)) {
-			return Anime::search($id, null, 'special_id');
+		if (is_numeric($id))
+		{
+			$data = Anime::search($id, null, 'special_id');
+			$related = $data['anime']->related;
+			$str = '';
+			for ($i = 0; $i < count($related); $i++)
+			{
+				if ($i > 0) $str .= ', ';
+				$ra = Anime::search($related[$i], null, 'special_id');
+				$str .= '<a href="' . $related[$i] . '">' . $ra['anime']->title .  '</a>';
+			}
+			$data['related'] = $str;
+			return $data;
 		}
-		else {
+		else
+		{
 			return $this->redirect(array('controller' => 'search','q' => array('search' => $id)));
 		}
 	
diff --git a/views/anime/view.html.php b/views/anime/view.html.php
index 4a3b8c9..1b0eb0c 100644
--- a/views/anime/view.html.php
+++ b/views/anime/view.html.php
@@ -1,58 +1,77 @@
-<h2 class="ribbon full"><?= $content->title ?></h2>
+<?php
+$this->styles($this->html->style('view'));
+?>
+
+<h2 class="ribbon full"><?= $anime->title ?></h2>
 <div class="triangle-ribbon"></div>
-<br class="cl" />
+<br class="cl">
 
-<div class="container_12">
-<!-- Start Sidebar -->
-<div class="grid_4" id="sidebar">
-<img src="<?=$content->image ?>" >
+<aside id="img">
+<img src="<?=$anime->image ?>" alt="<?= $anime->title ?>">
+</aside>
 
-<h2 class="ribbon"> Alternative Titles </h2>
-<hr/>
-<p>
-<?php if(isset($content->alternative_titles)) : ?>
-<?php foreach($content->alternative_titles as $title): ?>
-	<?= $title ?>
-<?php endforeach; ?>
+<section><p>
+<?php if(isset($anime->foreign_titles)):
+	$str = 'Foreign titles:';
+	for ($i = 0; $i < count($anime->foreign_titles); $i++) {
+		if ($i > 0) $str .= '<b>,</b>';
+		$str .= ' ' . $anime->foreign_titles[$i];
+	}
+	$str .= '<br>';
+	?>
+	<?= $str ?>
 <?php endif; ?>
-</p>
-<h2> Information </h2>
-<span> Type: <?= $content->view_type ?> </span>
-Episodes: <?= $content->episode_count ?><br/>
-Status: <?= $content->status ?><br/>
-Aired: <?= $content->aired ?><br/>
-Producers: <?php foreach($content->producers as $producer): ?>
-<a href="/producer/view/<?= $producer ?>"><?= $producer ?></a>,
-<?php endforeach; ?><br/>
-Genres: <?php foreach($content->genres as $genres): ?>
-<a href="/genres/view/<?= $genres ?>"><?= $genres ?></a>,
-<?php endforeach ?><br/>
-Duration: <?= $content->episode_duration ?><br/>
-Rating: <?= $content->rating ?><br/>
-
-<h2 class="ribbon">Statistics</h2>
-Score: <br/>
-Ranked: <br/>
-Popularity: <br/>
-Members:<br/>
-Favorited by: over 9000 Users<br/>
+<?php if(isset($anime->alternative_titles)):
+	$str = 'Alternative titles:';
+	for ($i = 0; $i < count($anime->alternative_titles); $i++) {
+		if ($i > 0) $str .= '<b>,</b>';
+		$str .= ' ' . $anime->alternative_titles[$i];
+	}
+	$str .= '<br>';
+	?>
+	<?= $str ?>
+<?php endif; ?>
+Type: <?= $anime->view_type ?><br>
+Episodes: <?= $anime->episode_count ?><br>
+Aired: <?= $anime->aired ?><br>
+Producers: <?php
+$str = '';
+for ($i = 0; $i < count($anime->producers); $i++) {
+	if ($i > 0) $str .= ',';
+	$str .= ' <a href="/producer/view/' . $anime->producers[$i] . '">' . $anime->producers[$i] . '</a>';
+} ?><?= $str ?><br>
+Genres: <?php
+$str = '';
+for ($i = 0; $i < count($anime->genres); $i++) {
+	if ($i > 0) $str .= ',';
+	$str .= ' <a href="/producer/view/' . $anime->genres[$i] . '">' . $anime->genres[$i] . '</a>';
+} ?><?= $str ?><br>
+Duration: <?= $anime->episode_duration ?><br>
+Rating: <?= $anime->rated ?><br>
+Related: <?= $related ?>
+</p></section>
 
-<h2 class="ribbon">  My Info </h2>
-<hr/>
-<!-- End Sidebar -->
-</div>
-<div class="grid_8" id="content">
-<!-- Start Content -->
-<h2>Synopsis</h2>
-<hr/>
-<?= $content->synopsis ?>
+<aside id="malstats">
+<h2>MAL Stats</h2>
+<p>
+Score: <?= $anime->mal_score ?><br>
+Votes: <?= $anime->mal_score_voted ?><br>
+Ranked: <?= $anime->mal_rank ?><br>
+Popularity: <?= $anime->mal_popularity ?><br>
+Members: <?= $anime->mal_score ?>
+</p>
+</aside>
+<br class="cl">
 
-<h2>Related Animes</h2>
-<hr/>
+<h2 class="ribbon">Synopsis</h2>
+<div class="triangle-ribbon"></div>
+<br class="cl">
+<p><?= $anime->synopsis ?></p>
 
-<h2>Characters And VA's </h2>
-<hr/>
-<?php foreach($content->cast as $char): ?>
+<h2 class="ribbon">Characters and VA's</h2>
+<div class="triangle-ribbon"></div>
+<br class="cl">
+<?php foreach($anime->cast as $char): ?>
 <?= $char->character ?>
 <?= $char->role ?>
 Played by:
@@ -65,4 +84,4 @@ Played by:
 <?php endforeach; ?>
 </div>
 <br class="cl"/>
-</div>
\ No newline at end of file
+</div>
diff --git a/views/layouts/default.html.php b/views/layouts/default.html.php
index 9464d80..9313414 100644
--- a/views/layouts/default.html.php
+++ b/views/layouts/default.html.php
@@ -69,9 +69,9 @@ use \lithium\security\Auth;
 
 	<br class="cl" />
 </header>
-<div id="page">
+<article>
 	<?php echo $this->content() ?>
-</div>
+</article>
 <footer>
 	<p>Copyright ©2011, <a href="http://www.melenion.org">Melenion Dev Studios</a></p>
 	<br class="cl" />
diff --git a/webroot/css/base.css b/webroot/css/base.css
index da366c6..1bbd83c 100644
--- a/webroot/css/base.css
+++ b/webroot/css/base.css
@@ -24,6 +24,8 @@ h2.ribbon {
 	border-radius: 3px 3px 3px 0px;
 	-moz-border-radius: 3px 3px 3px 0px;
 	-webkit-border-radius: 3px 3px 3px 0px;
+}
+h2.full {
 	width: 890px;
 }
 .triangle-ribbon {
@@ -146,11 +148,11 @@ footer {
 	width: 980px;
 	margin: 25px auto 20px;
 }
-#page {
+article {
 	background: #fff;
 	color: #191919;
 	border: 1px solid #d9d9d9;
-	padding: 40px;
+	padding: 25px 40px 30px;
 	position: relative;
 	width: 898px;
 	margin: 0 auto;
diff --git a/webroot/css/view.css b/webroot/css/view.css
new file mode 100644
index 0000000..c973201
--- /dev/null
+++ b/webroot/css/view.css
@@ -0,0 +1,21 @@
+/* for viewing individual anime/manga/kdrama, rather than table.css */
+
+aside#img {
+	float: left;
+	margin: 0 25px 25px 0;
+	width: 225px;
+}
+
+section {
+	float: left;
+	width: 470px;
+}
+
+aside#malstats {
+	float: right;
+	width: 150px;
+}
+
+p {
+	text-indent: 0;
+}
-- 
cgit v1.2.3


From 2baaf56e140a06eed8fe0b1d28d744d34a537d49 Mon Sep 17 00:00:00 2001
From: raylu <raylu@mixpanel.com>
Date: Sun, 17 Jul 2011 17:35:41 -0700
Subject: cast (chars/VAs) on anime view page

there isn't yet a views/anime/cast.html.php for non-JS, but the
controller is set up for it
---
 controllers/AnimeController.php | 11 +++++++--
 views/anime/view.html.php       | 51 +++++++++++++++++++++++++----------------
 webroot/css/view.css            | 29 ++++++++++++++++++++++-
 webroot/js/functions.js         | 18 +++++++++++++--
 4 files changed, 84 insertions(+), 25 deletions(-)

(limited to 'controllers')

diff --git a/controllers/AnimeController.php b/controllers/AnimeController.php
index 09c0828..3a40cee 100644
--- a/controllers/AnimeController.php
+++ b/controllers/AnimeController.php
@@ -5,7 +5,7 @@ namespace app\controllers;
 use app\models\Anime;
 
 class AnimeController extends \lithium\action\Controller {
-	public $publicActions = array('index', 'view');
+	public $publicActions = array('index', 'view', 'cast');
 
 	public function index()
 	{
@@ -34,6 +34,13 @@ class AnimeController extends \lithium\action\Controller {
 		{
 			return $this->redirect(array('controller' => 'search','q' => array('search' => $id)));
 		}
-	
+	}
+
+	public function cast($id = null)
+	{
+		if (is_numeric($id))
+		{
+			return Anime::search($id, null, 'special_id');
+		}
 	}
 }
diff --git a/views/anime/view.html.php b/views/anime/view.html.php
index 1b0eb0c..a722935 100644
--- a/views/anime/view.html.php
+++ b/views/anime/view.html.php
@@ -10,7 +10,7 @@ $this->styles($this->html->style('view'));
 <img src="<?=$anime->image ?>" alt="<?= $anime->title ?>">
 </aside>
 
-<section><p>
+<section id="info"><p>
 <?php if(isset($anime->foreign_titles)):
 	$str = 'Foreign titles:';
 	for ($i = 0; $i < count($anime->foreign_titles); $i++) {
@@ -44,12 +44,13 @@ Genres: <?php
 $str = '';
 for ($i = 0; $i < count($anime->genres); $i++) {
 	if ($i > 0) $str .= ',';
-	$str .= ' <a href="/producer/view/' . $anime->genres[$i] . '">' . $anime->genres[$i] . '</a>';
+	$str .= ' <a href="/genre/view/' . $anime->genres[$i] . '">' . $anime->genres[$i] . '</a>';
 } ?><?= $str ?><br>
 Duration: <?= $anime->episode_duration ?><br>
 Rating: <?= $anime->rated ?><br>
 Related: <?= $related ?>
-</p></section>
+</p>
+</section>
 
 <aside id="malstats">
 <h2>MAL Stats</h2>
@@ -61,27 +62,37 @@ Popularity: <?= $anime->mal_popularity ?><br>
 Members: <?= $anime->mal_score ?>
 </p>
 </aside>
-<br class="cl">
-
-<h2 class="ribbon">Synopsis</h2>
-<div class="triangle-ribbon"></div>
-<br class="cl">
-<p><?= $anime->synopsis ?></p>
 
-<h2 class="ribbon">Characters and VA's</h2>
-<div class="triangle-ribbon"></div>
-<br class="cl">
+<section id="cast">
+<p>
+<a href="/anime/cast/<?= $anime->special_id ?>" onclick="return toggleCast()">Cast &#x2193;</a>
+</p>
+<p><table>
 <?php foreach($anime->cast as $char): ?>
-<?= $char->character ?>
-<?= $char->role ?>
-Played by:
+	<tr>
+		<td colspan="3">
+			<?= $char->character ?>
+		</td>
+	</tr>
 	<?php if (isset($char->people)): ?>
 		<?php foreach($char->people as $actor): ?>
-		<?= $actor->name ?>
-		<?= $actor->language ?>
+			<tr>
+				<td></td>
+				<td><?= $actor->name ?></td>
+				<td><?= $actor->language ?></td>
+			</tr>
 		<?php endforeach; ?>
 	<?php endif; ?>
 <?php endforeach; ?>
-</div>
-<br class="cl"/>
-</div>
+</table></p>
+<p id="castlink">
+<a href="" onclick="return toggleCast()">Cast &#x2191;</a>
+</p>
+</section>
+
+<br class="cl">
+
+<h2 class="ribbon">Synopsis</h2>
+<div class="triangle-ribbon"></div>
+<br class="cl">
+<p><?= $anime->synopsis ?></p>
diff --git a/webroot/css/view.css b/webroot/css/view.css
index c973201..4b0a9a1 100644
--- a/webroot/css/view.css
+++ b/webroot/css/view.css
@@ -6,11 +6,38 @@ aside#img {
 	width: 225px;
 }
 
-section {
+section#info {
 	float: left;
 	width: 470px;
 }
 
+section#cast {
+	float: left;
+	width: 620px;
+}
+section#cast p {
+	margin: 0;
+}
+section#cast table {
+	table-layout: fixed;
+	display: none;
+}
+section#cast td {
+	padding: 3px;
+}
+section#cast td:nth-child(1) {
+	width: 60px;
+}
+section#cast td:nth-child(2) {
+	width: 250px;
+}
+section#cast td:nth-child(3) {
+	width: 200px;
+}
+section#cast #castlink {
+	display: none;
+}
+
 aside#malstats {
 	float: right;
 	width: 150px;
diff --git a/webroot/js/functions.js b/webroot/js/functions.js
index 510b0cf..86f3f3c 100644
--- a/webroot/js/functions.js
+++ b/webroot/js/functions.js
@@ -10,8 +10,22 @@ jQuery(document).ready(function($) {
 	$('form [title]').tipsy({fade: true, trigger: 'focus', gravity: 'w'});
 
 	setTimeout(function() {
-		$(".flash-message").fadeOut("slow", function () {
-			$(".flash-message").remove();
+		$('.flash-message').fadeOut('slow', function () {
+			$('.flash-message').remove();
 		});
 	}, 2000);
 });
+
+function toggleCast() {
+	var table = $('#cast table');
+	if (table.css('display') == 'inline') {
+		table.css('display', 'none');
+		$('#cast > p > a').text('Cast ↓');
+		$('#castlink').css('display', 'none');
+	} else {
+		table.css('display', 'inline');
+		$('#cast > p > a').text('Cast ↑');
+		$('#castlink').css('display', 'inline');
+	}
+	return false;
+}
-- 
cgit v1.2.3