From 0d3bb32e9cb4a6dc7c08bf52b8229f58c2b8fd75 Mon Sep 17 00:00:00 2001
From: Marcin Kurczewski <mkurczew@gmail.com>
Date: Sun, 1 Dec 2013 15:16:10 +0100
Subject: [PATCH] Refactor to HTML structure

- <script> moved outside <ul>
- Youtube posts pass W3C validation
---
 src/Views/layout-normal.phtml    | 9 +++++----
 src/Views/post-file-render.phtml | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/Views/layout-normal.phtml b/src/Views/layout-normal.phtml
index 4584bc5a..6b21cb4a 100644
--- a/src/Views/layout-normal.phtml
+++ b/src/Views/layout-normal.phtml
@@ -21,6 +21,10 @@
 	</head>
 
 	<body>
+		<script type="text/javascript">
+			var lastSearchQuery = <?php echo json_encode(isset($this->context->transport->lastSearchQuery) ? $this->context->transport->lastSearchQuery : '') ?>;
+		</script>
+
 		<nav id="top-nav">
 			<div class="main-wrapper">
 				<ul class="main-nav">
@@ -87,11 +91,8 @@
 							<input class="autocomplete" type="search" name="query" placeholder="Search&hellip;" value="<?php echo isset($this->context->transport->searchQuery) ? htmlspecialchars($this->context->transport->searchQuery) : '' ?>" data-autocomplete-url="<?php echo \Chibi\UrlHelper::route('tag', 'list') ?>"/>
 						</form>
 					</li>
-
-					<script type="text/javascript">
-						var lastSearchQuery = <?php echo json_encode(isset($this->context->transport->lastSearchQuery) ? $this->context->transport->lastSearchQuery : '') ?>;
-					</script>
 				</ul>
+
 				<div class="clear"></div>
 			</div>
 		</nav>
diff --git a/src/Views/post-file-render.phtml b/src/Views/post-file-render.phtml
index 9d59c0a4..06ab13df 100644
--- a/src/Views/post-file-render.phtml
+++ b/src/Views/post-file-render.phtml
@@ -18,6 +18,6 @@
 
 <?php elseif ($post->type == PostType::Youtube): ?>
 
-	<iframe width="800" height="600" src="//www.youtube.com/embed/<?php echo $post->orig_name ?>" frameborder="0" allowfullscreen></iframe>
+	<iframe style="width: 800px; height: 600px; border: 0;" src="//www.youtube.com/embed/<?php echo $post->orig_name ?>" allowfullscreen></iframe>
 
 <?php endif ?>
