[Piwik-svn] r394 - in trunk: modules modules/LogStats plugins/Login plugins/Login/templates

[svnmaster at piwik.org]

Author: matt
Date: 2008-03-20 14:03:52 +0100 (Thu, 20 Mar 2008)
New Revision: 394

Modified:
   trunk/modules/LogStats/javascriptTag.tpl
   trunk/modules/Piwik.php
   trunk/plugins/Login/Controller.php
   trunk/plugins/Login/templates/login.css
   trunk/plugins/Login/templates/login.tpl
Log:
- updating href in tag

Modified: trunk/modules/LogStats/javascriptTag.tpl
===================================================================
--- trunk/modules/LogStats/javascriptTag.tpl	2008-03-20 12:31:55 UTC (rev 393)
+++ trunk/modules/LogStats/javascriptTag.tpl	2008-03-20 13:03:52 UTC (rev 394)
@@ -1,5 +1,5 @@
 <!-- Piwik -->
-<a href="http://piwik.org" title="Web analytics" onclick="window.open(this.href);return(false);">
+<a href="http://piwik.org" title="{$hrefTitle}" onclick="window.open(this.href);return(false);">
 <script language="javascript" src="{$piwikUrl}piwik.js" type="text/javascript"></script>
 <script type="text/javascript">
 <!--
@@ -9,6 +9,6 @@
 	piwik_log(piwik_action_name, piwik_idsite, piwik_url);
 //-->
 </script><object>
-<noscript><p>Web analytics <img src="{$piwikUrl}piwik.php" style="border:0" alt="piwik"/></p>
+<noscript><p>{$hrefTitle} <img src="{$piwikUrl}piwik.php" style="border:0" alt="piwik"/></p>
 </noscript></object></a>
 <!-- /Piwik -->
\ No newline at end of file

Modified: trunk/modules/Piwik.php
===================================================================
--- trunk/modules/Piwik.php	2008-03-20 12:31:55 UTC (rev 393)
+++ trunk/modules/Piwik.php	2008-03-20 13:03:52 UTC (rev 394)
@@ -111,7 +111,9 @@
 		$jsTag = nl2br(htmlentities($jsTag));
 		$jsTag = str_replace('{$actionName}', $actionName, $jsTag);
 		$jsTag = str_replace('{$idSite}', $idSite, $jsTag);
-		$jsTag = str_replace('{$piwikUrl}', $piwikUrl, $jsTag);
+		$jsTag = str_replace('{$piwikUrl}', $piwikUrl, $jsTag);
+		$jsTag = str_replace('{$hrefTitle}', Piwik::getRandomTitle(), $jsTag);
+		
 		return $jsTag;
 	}
 	
@@ -328,6 +330,29 @@
 		return !is_array($value) && ereg('^([-]{0,1}[0-9]{1,}[.]{0,1}[0-9]*)$', $value);
 	}
 	
+	static public function getRandomTitle()
+	{
+		$titles = array( 'Web analytics',
+						'Website analytics',
+						'Analytics',
+						'Web analytics api',
+						'Open source analytics',
+						'Open source web analytics',
+						'Free analytics',
+						'Analytics software',
+						'Free web analytics',
+						'Free web statistics',
+						'Web 2.0 analytics',
+						'Web analytic',
+						'Web statistics',
+						'Web stats',
+						'Web 2.0 stats',
+						'Statistics web 2.0',
+				);
+		$id = abs(intval(md5(substr(Piwik_Url::getCurrentHost(),7))));
+		$title = $titles[ $id % count($titles)];
+		return $title;
+	}
 	
 	static public function loadPlugins()
 	{

Modified: trunk/plugins/Login/Controller.php
===================================================================
--- trunk/plugins/Login/Controller.php	2008-03-20 12:31:55 UTC (rev 393)
+++ trunk/plugins/Login/Controller.php	2008-03-20 13:03:52 UTC (rev 394)
@@ -68,6 +68,7 @@
 		}
 		$view = new Piwik_View('Login/templates/login.tpl');	
 		$view->AccessErrorString = $messageNoAccess;
+		$view->linkTitle = Piwik::getRandomTitle();
 		$view->addForm( $form );
 		$view->subTemplate = 'genericForm.tpl';
 		echo $view->render();

Modified: trunk/plugins/Login/templates/login.css
===================================================================
--- trunk/plugins/Login/templates/login.css	2008-03-20 12:31:55 UTC (rev 393)
+++ trunk/plugins/Login/templates/login.css	2008-03-20 13:03:52 UTC (rev 394)
@@ -110,7 +110,7 @@
 	margin-top:100px;
 }
 
-#logo h1 { 
+#logo .h1 { 
 font-family: Georgia, "Times New Roman", Times, serif; 
 font-weight: normal; 
 color: #136F8B; 

Modified: trunk/plugins/Login/templates/login.tpl
===================================================================
--- trunk/plugins/Login/templates/login.tpl	2008-03-20 12:31:55 UTC (rev 393)
+++ trunk/plugins/Login/templates/login.tpl	2008-03-20 13:03:52 UTC (rev 394)
@@ -19,7 +19,7 @@
 <!-- shamelessly taken from wordpress 2.5 - thank you guys!!! -->
 
 <div id="logo">
-	<a href="http://piwik.org"><h1 title="Web analytics">Piwik <span class="description"># open source web analytics</span></h1></a>
+	<a href="http://piwik.org" title="{$linkTitle}"><span class="h1">Piwik <span class="description"># open source web analytics</span></span></a>
 </div>
 
 <div id="login">