Upstream changes for review

This commit is contained in:
Deon George 2013-04-28 09:58:23 +10:00
parent 9b60e759c9
commit f64d1fbf75
2 changed files with 11 additions and 3 deletions

View File

@ -68,6 +68,12 @@ class Controller_Redirection extends lnApp_Controller_TemplateDefault {
)); ));
$this->template->content = $output; $this->template->content = $output;
$this->template->meta->keywords = join(',',array(
'Web URL Shortener',
'URL Shortener',
'URL Redirector',
'Web Redirector',
));
} }
final public function action_post() { final public function action_post() {

View File

@ -11,7 +11,7 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<!-- Bootstrap --> <!-- 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"> <style type="text/css">
body { padding-top: 50px; padding-bottom: 10px; } body { padding-top: 50px; padding-bottom: 10px; }
</style> </style>
@ -46,8 +46,10 @@
<p><?php echo $footer; ?></p> <p><?php echo $footer; ?></p>
</footer> </footer>
</div><!-- container --> </div><!-- container -->
<script src="http://code.jquery.com/jquery.min.js"></script> <?php
<?php echo HTML::script('media/theme/bootstrap/js/bootstrap.min.js'); ?> 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(); ?> <?php echo Script::factory(); ?>
</body> </body>
</html> </html>