From 6228873cf9d6471463d2413e7dfd7447f759baf2 Mon Sep 17 00:00:00 2001
From: "christophe.boulain" <>
Date: Wed, 3 Dec 2008 14:22:03 +0000
Subject: Merge from trunk

---
 framework/Web/UI/WebControls/THead.php | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

(limited to 'framework/Web/UI/WebControls/THead.php')

diff --git a/framework/Web/UI/WebControls/THead.php b/framework/Web/UI/WebControls/THead.php
index 1b51f8ae..62ee46d3 100644
--- a/framework/Web/UI/WebControls/THead.php
+++ b/framework/Web/UI/WebControls/THead.php
@@ -4,7 +4,7 @@
  *
  * @author Marcus Nyeholt <tanus@users.sourceforge.net> and Qiang Xue <qiang.xue@gmail.com>
  * @link http://www.pradosoft.com/
- * @copyright Copyright &copy; 2005-2008 PradoSoft
+ * @copyright Copyright &copy; 2005-2008 PradoSoft
  * @license http://www.pradosoft.com/license/
  * @version $Id$
  * @package System.Web.UI
@@ -29,6 +29,13 @@
  *   <com:TMetaTag Name="keywords" Content="Prado" />
  * </com:THead>
  * </code>
+ * 
+ * A MetaTag for "generator" is added by default if you haven't specified your own generator meta tag. You can override
+ * the property by adding the following code to your template:
+ * <com:THead>
+ *   <com:TMetaTag Name="generator" Content="Custom name" />
+ * </com:THead>
+ * </code>
  *
  * Note, {@link TPage} has a property {@link TPage::getHead Head} that refers to
  * the THead control currently on the page. A page can have at most once THead
@@ -155,14 +162,24 @@ class THead extends TControl
 		if(($icon=$this->getShortcutIcon())!=='')
 			$writer->write('<link rel="shortcut icon" href="'.$icon."\" />\n");
 
+		$generatorAdded = false;
 		if(($metaTags=$this->getMetaTags())!==null)
 		{
 			foreach($metaTags as $metaTag)
 			{
+				if(strtolower($metaTag->getName()) == 'generator')
+					$generatorAdded = true;
 				$metaTag->render($writer);
 				$writer->writeLine();
 			}
 		}
+		if(!$generatorAdded)
+		{
+			$metaTag = new TMetaTag();
+			$metaTag->setName('generator');
+			$metaTag->setContent(Prado::metaGenerator());
+			$metaTag->render($writer);
+		}
 		$cs=$page->getClientScript();
 		$cs->renderStyleSheetFiles($writer);
 		$cs->renderStyleSheets($writer);
@@ -374,4 +391,4 @@ class TMetaTagCollection extends TList
 	}
 }
 
-?>
+?>
-- 
cgit v1.2.3