From 856aaec7ca970b3f1e1e4ae2d6aedf57f78608d3 Mon Sep 17 00:00:00 2001
From: Timothy J Warren <tim@timshomepage.net>
Date: Thu, 16 Feb 2017 14:30:39 -0500
Subject: [PATCH] Reference svg logos as image files, not raw html

---
 app/views/anime/cover.php   |  4 ++--
 app/views/anime/details.php | 18 +++++++++---------
 app/views/anime/list.php    |  6 +++---
 app/views/header.php        |  9 ++++++---
 app/views/main-menu.php     |  6 +++---
 public/css/base.css         |  1 +
 public/css/base.myth.css    |  1 +
 7 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/app/views/anime/cover.php b/app/views/anime/cover.php
index 51cffb84..bd320894 100644
--- a/app/views/anime/cover.php
+++ b/app/views/anime/cover.php
@@ -55,10 +55,10 @@
 								<div class="cover_streaming_link">
 									<?php if($link['meta']['link']): ?>
 										<a href="<?= $link['link']?>" title="Stream '<?= $item['anime']['title'] ?>' on <?= $link['meta']['name'] ?>">
-											<?= $link['meta']['logo'] ?>
+											<img class="streaming-logo" width="20" height="20" src="<?= $urlGenerator->assetUrl('images', $link['meta']['image']) ?>" alt="<?= $link['meta']['name'] ?> logo" />
 										</a>
 									<?php else: ?>
-										<?= $link['meta']['logo'] ?>
+										<img class="streaming-logo" width="20" height="20" src="<?= $urlGenerator->assetUrl('images', $link['meta']['image']) ?>" alt="<?= $link['meta']['name'] ?> logo" />
 									<?php endif ?>
 								</div>
 							<?php endforeach ?>
diff --git a/app/views/anime/details.php b/app/views/anime/details.php
index 6aa91b08..389d060c 100644
--- a/app/views/anime/details.php
+++ b/app/views/anime/details.php
@@ -54,21 +54,21 @@
 					</tr>
 				</thead>
 				<tbody>
-				<?php foreach($data['streaming_links'] as $streaming_link): ?>
+				<?php foreach($data['streaming_links'] as $link): ?>
 					<tr>
 						<td class="align_left">
-							<?php if ($streaming_link['meta']['link'] !== FALSE): ?>
-							<a href="<?= $streaming_link['link'] ?>">
-								<?= $streaming_link['meta']['logo'] ?>
-								&nbsp;&nbsp;<?= $streaming_link['meta']['name'] ?>
+							<?php if ($link['meta']['link'] !== FALSE): ?>
+							<a href="<?= $link['link'] ?>" title="Stream '<?= $data['title'] ?>' on <?= $link['meta']['name'] ?>">
+								<img class="streaming-logo" width="50" height="50" src="<?= $urlGenerator->assetUrl('images', $link['meta']['image']) ?>" alt="<?= $link['meta']['name'] ?> logo" />
+								&nbsp;&nbsp;<?= $link['meta']['name'] ?>
 							</a>
 							<?php else: ?>
-								<?= $streaming_link['meta']['logo'] ?>
-								&nbsp;&nbsp;<?= $streaming_link['meta']['name'] ?>
+								<img class="streaming-logo" width="50" height="50" src="<?= $urlGenerator->assetUrl('images', $link['meta']['image']) ?>" alt="<?= $link['meta']['name'] ?> logo" />
+								&nbsp;&nbsp;<?= $link['meta']['name'] ?>
 							<?php endif ?>
 						</td>
-						<td><?= implode(', ', $streaming_link['subs']) ?></td>
-						<td><?= implode(', ', $streaming_link['dubs']) ?></td>
+						<td><?= implode(', ', $link['subs']) ?></td>
+						<td><?= implode(', ', $link['dubs']) ?></td>
 					</tr>
 				<?php endforeach ?>
 				</tbody>
diff --git a/app/views/anime/list.php b/app/views/anime/list.php
index f2857e26..a9ff92b6 100644
--- a/app/views/anime/list.php
+++ b/app/views/anime/list.php
@@ -64,11 +64,11 @@
 				<td>
 					<?php foreach($item['anime']['streaming_links'] as $link): ?>
 						<?php if ($link['meta']['link'] !== FALSE): ?>
-							<a href="<?= $link['link'] ?>">
-								<?= $link['meta']['logo'] ?>
+							<a href="<?= $link['link'] ?>" title="Stream '<?= $item['anime']['title'] ?>' on <?= $link['meta']['name'] ?>">
+								<img class="streaming-logo" width="50" height="50" src="<?= $urlGenerator->assetUrl('images', $link['meta']['image']) ?>" alt="<?= $link['meta']['name'] ?> logo" />
 							</a>
 						<?php else: ?>
-							<?= $link['meta']['logo'] ?>
+							<img class="streaming-logo" width="50" height="50" src="<?= $urlGenerator->assetUrl('images', $link['meta']['image']) ?>" alt="<?= $link['meta']['name'] ?> logo" />
 						<?php endif ?>
 					<?php endforeach ?>
 				</td>
diff --git a/app/views/header.php b/app/views/header.php
index e49e45f2..3575945c 100644
--- a/app/views/header.php
+++ b/app/views/header.php
@@ -6,7 +6,7 @@
 	<meta http-equiv="cache-control" content="no-store" />
 	<meta http-equiv="Content-Security-Policy" content="script-src 'self'" />
 	<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1, user-scalable=0" />
-	<link rel="icon" href="/favicon.ico" />
+	<link rel="icon" href="favicon.ico" />
 	<link rel="stylesheet" href="<?= $urlGenerator->assetUrl('css.php/g/base') ?>" />
 	<script defer="defer" src="<?= $urlGenerator->assetUrl('js.php/g/base') ?>"></script>
 </head>
@@ -14,7 +14,10 @@
 	<header>
 		<?php include 'main-menu.php' ?>
 		<?php if(isset($message) && is_array($message)):
-	 		extract($message);
-	 		include 'message.php';
+			foreach($message as $m)
+			{
+				extract($message);
+	 			include 'message.php';
+			}
 	 	endif ?>
 	</header>
\ No newline at end of file
diff --git a/app/views/main-menu.php b/app/views/main-menu.php
index 9542d7eb..dc5d86a5 100644
--- a/app/views/main-menu.php
+++ b/app/views/main-menu.php
@@ -33,12 +33,12 @@
 	</span>
 </h1>
 <nav>
-	<?php if ($container->get('util')->is_view_page()): ?>
+	<?php if ($container->get('util')->isViewPage()): ?>
 		<?= $helper->menu($menu_name) ?>
 		<br />
 		<ul>
-			<li class="<?= Util::is_not_selected('list', $urlGenerator->lastSegment()) ?>"><a href="<?= $urlGenerator->url($route_path) ?>">Cover View</a></li>
-			<li class="<?= Util::is_selected('list', $urlGenerator->lastSegment()) ?>"><a href="<?= $urlGenerator->url("{$route_path}/list") ?>">List View</a></li>
+			<li class="<?= Util::isNotSelected('list', $urlGenerator->lastSegment()) ?>"><a href="<?= $urlGenerator->url($route_path) ?>">Cover View</a></li>
+			<li class="<?= Util::isSelected('list', $urlGenerator->lastSegment()) ?>"><a href="<?= $urlGenerator->url("{$route_path}/list") ?>">List View</a></li>
 		</ul>
 	<?php endif ?>
 </nav>
diff --git a/public/css/base.css b/public/css/base.css
index 475583b1..fca8d1cc 100644
--- a/public/css/base.css
+++ b/public/css/base.css
@@ -1316,6 +1316,7 @@ a:hover, a:active {
 .streaming-logo {
 	width: 50px;
 	height: 50px;
+	vertical-align:middle;
 }
 
 .cover_streaming_link .streaming-logo {
diff --git a/public/css/base.myth.css b/public/css/base.myth.css
index a70e419c..d855d069 100644
--- a/public/css/base.myth.css
+++ b/public/css/base.myth.css
@@ -568,6 +568,7 @@ a:hover, a:active {
 .streaming-logo {
 	width: 50px;
 	height: 50px;
+	vertical-align:middle;
 }
 
 .cover_streaming_link .streaming-logo {