Merge branch 'master' of git.raylu.net:otakuhub

5 files changed, 47 insertions, 111 deletions

diff --git a/views/anime/index.html.php b/views/anime/index.html.php
index 270ed76..6b1adc0 100644
--- a/views/anime/index.html.php
+++ b/views/anime/index.html.php
@@ -1,5 +1,5 @@
 <?php
-$this->styles($this->html->style('anime'));
+$this->styles($this->html->style('table'));
 $this->styles($this->html->style('pagination'));
 ?>
 
diff --git a/views/anime/view.html.php b/views/anime/view.html.php
index 11ac437..11a1f75 100644
--- a/views/anime/view.html.php
+++ b/views/anime/view.html.php
@@ -48,8 +48,49 @@ for ($i = 0; $i < count($anime->genres); $i++) {
 } ?><?= $str ?><br>
 <b>Duration:</b> <?= $anime->episode_duration ?><br>
 <b>Rating:</b> <?= $anime->rated ?><br>
-<b>Related:</b> <?= $related ?>
+<b>Related:</b> <?php
+$str = '';
+$keys = array_keys($related);
+for ($i = 0; $i < count($keys); $i++) {
+	if ($i > 0) $str .= ',';
+	$str .= ' <a href="/anime/view/' . $related[$keys[$i]] . '">' . $keys[$i] . '</a>';
+} ?><?= $str ?>
 </p>
+
+<p>
+<a href="/animelist/add/<?= $anime->special_id ?>" id="add">Add</a>
+</p>
+
+<?php if (count($anime->cast) > 1): // why is this 1? ?>
+	<section id="cast">
+	<p>
+	<a href="/anime/cast/<?= $anime->special_id ?>" onclick="return toggleCast()">Cast &#x2193;</a>
+	</p>
+	<table>
+	<?php for ($i = 0; $i < count($anime->cast); $i++): ?>
+		<tr<? if ($i > 0) echo ' class="char"' ?>>
+			<td colspan="3">
+				<?= $anime->cast[$i]->character ?>
+			</td>
+		</tr>
+		<?php if (isset($anime->cast[$i]->people)): ?>
+			<?php foreach($anime->cast[$i]->people as $actor): ?>
+				<tr>
+					<td></td>
+					<td><?= $actor->name ?></td>
+					<td><?= $actor->language ?></td>
+				</tr>
+			<?php endforeach; ?>
+		<?php endif; ?>
+	<?php endfor; ?>
+	</table>
+	<br>
+	<p id="castlink">
+	<a href="" onclick="return toggleCast()">Cast &#x2191;</a>
+	</p>
+	</section>
+<?php endif; ?>
+
 </section>
 
 <aside id="malstats">
@@ -63,34 +104,6 @@ for ($i = 0; $i < count($anime->genres); $i++) {
 </p>
 </aside>
 
-<section id="cast">
-<p>
-<a href="/anime/cast/<?= $anime->special_id ?>" onclick="return toggleCast()">Cast &#x2193;</a>
-</p>
-<table>
-<?php for ($i = 0; $i < count($anime->cast); $i++): ?>
-	<tr<? if ($i > 0) echo ' class="char"' ?>>
-		<td colspan="3">
-			<?= $anime->cast[$i]->character ?>
-		</td>
-	</tr>
-	<?php if (isset($anime->cast[$i]->people)): ?>
-		<?php foreach($anime->cast[$i]->people as $actor): ?>
-			<tr>
-				<td></td>
-				<td><?= $actor->name ?></td>
-				<td><?= $actor->language ?></td>
-			</tr>
-		<?php endforeach; ?>
-	<?php endif; ?>
-<?php endfor; ?>
-</table>
-<br>
-<p id="castlink">
-<a href="" onclick="return toggleCast()">Cast &#x2191;</a>
-</p>
-</section>
-
 <br class="cl">
 
 <h2 class="ribbon">Synopsis</h2>
diff --git a/views/anime_list/index.html b/views/anime_list/index.html
deleted file mode 100644
index ad9911a..0000000
--- a/views/anime_list/index.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1><?= $user->username ?>'s AnimeList</h1>
-
-<?= print_r($watching); ?>
\ No newline at end of file
diff --git a/views/anime_list/index.html.php b/views/anime_list/index.html.php
deleted file mode 100644
index abe931b..0000000
--- a/views/anime_list/index.html.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<h1><?= $user->username ?>'s AnimeList</h1>
-<hr/>
-<table><tr><?= $this->html->link("Completed", "/animelist/view/$user->username/completed"); ?> </tr></table>
-
-<?php if (isset($watching)): ?>
-<h2 class="ribbon">Watching</h2><button value="Add" style="float:right">
-<tr><th>Entry #</th><th>Anime Title</th><th>Score</th><th>Type</th><th>Progress</th></tr>
-<?php $i = 1; ?>
-<?php foreach ($watching as $anime): ?>
-	<tr>
-	<td><?= $i ?></td>
-	<td><?= $anime->series_title ?></td>
-	<td><?= ($anime->my_score != 0) ? $anime->my_score : "-"; ?></td>
-	<td><?= $anime->series_type ?></td>
-	<td><?= $anime->my_watched_episodes ?>/<?= ($anime->series_episodes != 0) ? $anime->series_episodes : "-"; ?></td>
-	</tr>
-<?php $i += 1; ?>
-<?php endforeach; ?>
-</table>
-<?php endif; ?>
-
-<?php if (isset($planning)): ?>
-<h2 class="ribbon">Plans to Watch</h2>
-<table>
-<tr><th>Entry #</th><th>Anime Title</th><th>Score</th><th>Type</th><th>Progress</th></tr>
-<?php $i = 1; ?>
-<?php foreach ($planning as $anime): ?>
-	<tr>
-	<td><?= $i ?></td>
-	<td><?= $anime->series_title ?></td>
-	<td><?= ($anime->my_score != 0) ? $anime->my_score : "-"; ?></td>
-	<td><?= $anime->series_type ?></td>
-	<td><?= $anime->my_watched_episodes ?>/<?= ($anime->series_episodes != 0) ? $anime->series_episodes : "-"; ?></td>
-	</tr>
-<?php $i += 1; ?>
-<?php endforeach; ?>
-</table>
-<?php endif; ?>
-
-<?php if(isset($paused)): ?>
-<h2 class="ribbon">Paused</h2>
-<table>
-<tr><th>Entry #</th><th>Anime Title</th><th>Score</th><th>Type</th><th>Progress</th></tr>
-<?php $i = 1; ?>
-<?php foreach ($paused as $anime): ?>
-	<tr>
-	<td><?= $i ?></td>
-	<td><?= $anime->series_title ?></td>
-	<td><?= ($anime->my_score != 0) ? $anime->my_score : "-"; ?></td>
-	<td><?= $anime->series_type ?></td>
-	<td><?= $anime->my_watched_episodes ?>/<?= ($anime->series_episodes != 0) ? $anime->series_episodes : "-"; ?></td>
-	</tr>
-<?php $i += 1; ?>
-<?php endforeach; ?>
-</table>
-<?php endif; ?>
-
-<?php if (isset($dropped)): ?>
-<h2 class="ribbon">Dropped</h2>
-<table>
-<tr><th>Entry #</th><th>Anime Title</th><th>Score</th><th>Type</th><th>Progress</th></tr>
-<?php $i = 1; ?>
-<?php foreach ($dropped as $anime): ?>
-	<tr>
-	<td><?= $i ?></td>
-	<td><?= $anime->series_title ?></td>
-	<td><?= ($anime->my_score != 0) ? $anime->my_score : "-"; ?></td>
-	<td><?= $anime->series_type ?></td>
-	<td><?= $anime->my_watched_episodes ?>/<?= ($anime->series_episodes != 0) ? $anime->series_episodes : "-"; ?></td>
-	</tr>
-<?php $i += 1; ?>
-<?php endforeach; ?>
-</table>
-<?php endif; ?>
\ No newline at end of file
diff --git a/views/pages/home.html.php b/views/pages/home.html.php
index 53cc58d..227a18b 100644
--- a/views/pages/home.html.php
+++ b/views/pages/home.html.php
@@ -69,13 +69,13 @@ $this->styles($this->html->style("/css/home.css"));
 <h2 class="ribbon">Why you'll &#9825; OtakuHub~</h2>
 <div class="triangle-ribbon"></div>
 <br class="cl" />
-<h3>For Us By Us</h3>
+<h3>For us by us</h3>
 <p>
-	Built by Otakus for Otakus, we know what you want, and we work tirelessly to give it to you.
+	Built by otakus for otakus. We know what you want and we work tirelessly to give it to you.
 </p>
-<h3>Data Portability</h3>
+<h3>Data portability</h3>
 <p>
-	Move your data between AnimePlanet AnimeDB or MAL or export your list for your own records
+	Move your data between AnimePlanet AnimeDB or MAL or export your list for your own records.
 </p>
 <h3>Meet others</h3>
 <p>