Pequenas atualizacoes, nao importantes

fabiancarlos · May 8, 2012 · 4b18eb2 · 4b18eb2
1 parent 892e3ce
commit 4b18eb2
Show file tree

Hide file tree

Showing 863 changed files with 7 additions and 137,031 deletions.
diff --git a/application/classes/controller/applicationBlog.php b/application/classes/controller/applicationBlog.php
@@ -2,7 +2,7 @@
 
 abstract class Controller_ApplicationBlog extends Controller_Template{
 
-	public $template = 'site/template_blog';
+	public $template = 'layouts/template_blog';
 
 	public function before(){
 
@@ -11,10 +11,6 @@ public function before(){
 		parent::before();
 		View::set_global('site_name', 'Blog com Kohana 3.2');
 		View::set_global('description', 'Exemplo de blog usando framework kohana');
-		View::set_global('X_UA_Compatible', 'IE=edge,chrome=1');
-		View::set_global('viewport', 'width=device-width,initial-scale=1');
-		View::set_global('author', 'Fabian Carlos');
-		View::set_global('reply_to', '[email protected]');
 		View::set_global('shortcut_icon', $icon);
 
 		$this->template->content = '';

diff --git a/application/views/site/template_blog.php → application/views/layouts/template_blog.php b/application/views/site/template_blog.php → application/views/layouts/template_blog.php
@@ -2,12 +2,6 @@
 <html lang="pt-br">
 <head>
 	<meta charset="utf-8" />
-	<meta http-equiv="X-UA-Compatible" content="<?php echo $X_UA_Compatible; ?>" />
-	<meta name="viewport" content="<?php echo $viewport; ?>" />
-	<meta name="robots" content="index, follow" />
-    <meta name="GOOGLEBOT" content="index, follow" />
-	<meta name="author" content="<?php echo $author; ?>" />
-	<meta name="reply-to" content="<?php echo $reply_to; ?>" />
 	<meta name="description" content=" <?php echo $description; ?>" />
 	<title><?php echo $site_name; ?></title>
 
@@ -17,16 +11,13 @@
 		<link rel="stylesheet" href="<?php echo URL::base(); ?>media/css/<?php echo $style; ?>.css" type="text/css" media="screen" />
 	<?php endforeach ?>
 
-	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.1/jquery.min.js"></script>
-	<script>window.jQuery || document.write('<script src="js/libs/jquery-1.7.1.min.js"><\/script>')</script>
+	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
+	<script>window.jQuery || document.write('<script src="media/js/jquery-1.7.2.min.js"><\/script>')</script>
 
 	<?php foreach ($scripts as $script): ?>
 		<script src="<?php echo URL::base(); ?>media/js/<?php echo $script; ?>.js" /></script>
 	<?php endforeach ?>	
 
-	<!-- CKEDITOR -->
-	<script type="text/javascript" src="<?php echo URL::base(); ?>media/ckeditor/ckeditor.js"></script>
-
 	<script>
 		var _gaq=[['_setAccount','UA-XXXXX-X'],['_trackPageview']]; // Change UA-XXXXX-X to be your site's ID
 		(function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];g.async=1;

diff --git a/media/ckeditor/.htaccess b/media/ckeditor/.htaccess
diff --git a/media/ckeditor/CHANGES.html b/media/ckeditor/CHANGES.html
diff --git a/media/ckeditor/INSTALL.html b/media/ckeditor/INSTALL.html