Commit: 1188d88061c91fdc944ba42e7d99d5e6b985d673

Author: gwoo | Date: 2010-01-27 21:44:23 -0800
adding page titles
diff --git a/views/extensions/form.html.php b/views/extensions/form.html.php index dde4948..f7391ce 100644 --- a/views/extensions/form.html.php +++ b/views/extensions/form.html.php @@ -1,4 +1,4 @@ -<h2>Add Extension</h2> +<h2><?=$this->title('Add Extension');?></h2> <?php $errors = $extension->errors(); ?> diff --git a/views/extensions/index.html.php b/views/extensions/index.html.php index 563071c..02c48da 100644 --- a/views/extensions/index.html.php +++ b/views/extensions/index.html.php @@ -1,4 +1,4 @@ -<h2>Available Extensions</h2> +<h2><?=$this->title('Available Extensions');?></h2> <ul> <?php diff --git a/views/extensions/view.html.php b/views/extensions/view.html.php index fa06a59..434a47e 100644 --- a/views/extensions/view.html.php +++ b/views/extensions/view.html.php @@ -6,10 +6,9 @@ ?> - <div id="extension"> <div class="details"> - <h1><?=$extension->namespace;?></h1> + <h1><?=<?=$this->title($extension->namespace);?></h1> <h2><?=$extension->name;?></h2> <p class="summary"><?=$extension->summary;?></p> <div class="actions"> diff --git a/views/home/index.html.php b/views/home/index.html.php index 1a1c7e4..120a4d9 100644 --- a/views/home/index.html.php +++ b/views/home/index.html.php @@ -1,3 +1,6 @@ + +<?php $this->title('Home');?> + <div class="column latest-plugins"> <h2> <?php echo $this->html->link('Latest Plugins', array( diff --git a/views/layouts/default.html.php b/views/layouts/default.html.php index 140f8f1..f9ad458 100644 --- a/views/layouts/default.html.php +++ b/views/layouts/default.html.php @@ -1,12 +1,8 @@ <?php /** * Lithium: the most rad php framework - * Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) * - * Licensed under The BSD License - * Redistributions of files must retain the above copyright notice. - * - * @copyright Copyright 2009, Union of Rad, Inc. (http://union-of-rad.org) + * @copyright Copyright 2010, Union of RAD (http://union-of-rad.org) * @license http://opensource.org/licenses/bsd-license.php The BSD License */ ?> @@ -14,16 +10,18 @@ <html> <head> <?=$this->html->charset(); ?> - <title>Li3 Lab</title> - <?=$this->html->link('Icon', null, array('type' => 'icon')); ?> + <title>Li3 Lab<?php echo (!empty($this->title)) ? " > {$this->title}" : null;?></title> + <?=$this->html->link('Icon', null, array('type' => 'icon'));?> + + <?=$this->html->style('base');?> - <?=$this->html->style(array('base', 'http://li3.rad-dev.org/css/li3.css', 'li3_lab'))?> <?=$this->html->script(array( 'http://jqueryjs.googlecode.com/files/jquery-1.3.2.min.js', - 'http://li3.rad-dev.org/js/jquery.input_list.js' + 'http://lithify.me/js/jquery.input_list.js' ));?> - <script type="text/javascript"><?=$this->scripts();?></script> - + <script type="text/javascript"> + <?=$this->scripts();?> + </script> </head> <body> <div id="wrapper"> @@ -64,17 +62,5 @@ </div> </div> </div> - <div id="footer"> - <p class="copyright">Pretty much everything is &copy; 2009 and beyond, the Union of Rad</p> - </div> - - <?php echo $this->html->script(array( - 'http://li3.rad-dev.org/js/li3.console.js' - )); ?> - <script type="text/javascript" charset="utf-8"> - $(document).ready(function () { - li3Console.setup(); - }); - </script> </body> -</html> +</html> \ No newline at end of file diff --git a/views/plugins/add.html.php b/views/plugins/add.html.php index 39e7a83..024c6da 100644 --- a/views/plugins/add.html.php +++ b/views/plugins/add.html.php @@ -1,4 +1,4 @@ -<h2>Add Plugin</h2> +<h2><?=$this->title('Add Plugin');?></h2> <?php $errors = $plugin->errors(); ?> @@ -30,7 +30,7 @@ <h3>Upload JSON</h3> <?php echo $this->form->create($plugin, array( 'method' => 'POST', 'url' => $url, 'enctype' => 'multipart/form-data' - ));?> + ));?> <input type="file" name="formula"> <?php echo $this->form->submit('upload'); diff --git a/views/plugins/index.html.php b/views/plugins/index.html.php index 4e1a17f..c7b47cd 100644 --- a/views/plugins/index.html.php +++ b/views/plugins/index.html.php @@ -1,4 +1,4 @@ -<h2>Available plugins</h2> +<h2><?=$this->title('Available Plugins');?></h2> <ul> <?php diff --git a/views/plugins/verify.html.php b/views/plugins/verify.html.php index 92bdd8d..4798392 100644 --- a/views/plugins/verify.html.php +++ b/views/plugins/verify.html.php @@ -1,4 +1,4 @@ -<h2>Add Plugin</h2> +<h2><?=$this->title('Add Plugin');?></h2> <?php $errors = $plugin->errors(); ?> diff --git a/views/plugins/view.html.php b/views/plugins/view.html.php index 0840f29..68b548f 100644 --- a/views/plugins/view.html.php +++ b/views/plugins/view.html.php @@ -1,6 +1,6 @@ <div id="plugin"> <div class="details"> - <h1><?=$plugin->name;?></h1> + <h1><?=$this->title($plugin->name);?></h1> <h2><?=$plugin->summary;?></h2> <div class="actions"> <a href="#">Download</a>