From f64d1fbf75656ab59487bc1fbfda7c7071a8406e Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Sun, 28 Apr 2013 09:58:23 +1000
Subject: [PATCH] Upstream changes for review

---
 application/classes/Controller/Redirection.php  | 6 ++++++
 modules/lnApp/views/theme/bootstrap/default.php | 8 +++++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/application/classes/Controller/Redirection.php b/application/classes/Controller/Redirection.php
index fe59a8f..e085baa 100644
--- a/application/classes/Controller/Redirection.php
+++ b/application/classes/Controller/Redirection.php
@@ -68,6 +68,12 @@ class Controller_Redirection extends lnApp_Controller_TemplateDefault {
                 ));
 
 		$this->template->content = $output;
+		$this->template->meta->keywords = join(',',array(
+			'Web URL Shortener',
+			'URL Shortener',
+			'URL Redirector',
+			'Web Redirector',
+		));
 	}
 
 	final public function action_post() {
diff --git a/modules/lnApp/views/theme/bootstrap/default.php b/modules/lnApp/views/theme/bootstrap/default.php
index db3dfa6..5749741 100644
--- a/modules/lnApp/views/theme/bootstrap/default.php
+++ b/modules/lnApp/views/theme/bootstrap/default.php
@@ -11,7 +11,7 @@
 
 		<meta name="viewport" content="width=device-width, initial-scale=1.0">
 		<!-- Bootstrap -->
-		<?php echo HTML::style('media/theme/bootstrap/css/bootstrap.min.css',array('media'=>'screen')); ?>
+		<?php echo HTML::style('http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/css/bootstrap.min.css'); ?>
 		<style type="text/css">
 			body { padding-top: 50px; padding-bottom: 10px; }
 		</style>
@@ -46,8 +46,10 @@
 				<p><?php echo $footer; ?></p>
 			</footer>
 		</div><!-- container -->
-		<script src="http://code.jquery.com/jquery.min.js"></script>
-		<?php echo HTML::script('media/theme/bootstrap/js/bootstrap.min.js'); ?>
+		<?php
+		echo HTML::script('http://code.jquery.com/jquery-1.9.1.min.js');
+		echo HTML::script('http://netdna.bootstrapcdn.com/twitter-bootstrap/2.3.1/js/bootstrap.min.js');
+		?>
 		<?php echo Script::factory(); ?>
 	</body>
 </html>