[Piwik-svn] r364 - in trunk: modules plugins/SitesManager/templates plugins/UsersManager/templates

[svnmaster at piwik.org]

Author: matt
Date: 2008-03-12 12:38:26 +0100 (Wed, 12 Mar 2008)
New Revision: 364

Modified:
   trunk/modules/View.php
   trunk/plugins/SitesManager/templates/DisplayJavascriptCode.tpl
   trunk/plugins/SitesManager/templates/SitesManager.js
   trunk/plugins/SitesManager/templates/SitesManager.tpl
   trunk/plugins/UsersManager/templates/UsersManager.js
   trunk/plugins/UsersManager/templates/UsersManager.tpl
Log:
- fix #128 now ALIAS and WEBSITE NAME can be UTF8 (chinese, arabic etc)

Modified: trunk/modules/View.php
===================================================================
--- trunk/modules/View.php	2008-03-12 10:22:59 UTC (rev 363)
+++ trunk/modules/View.php	2008-03-12 11:38:26 UTC (rev 364)
@@ -100,6 +100,8 @@
 			$this->totalNumberOfQueries = 0;
 		}
 		
+	   header('Content-Type: text/html; charset=utf-8');
+		   
 		return $this->smarty->fetch($this->template);
 		
 	}

Modified: trunk/plugins/SitesManager/templates/DisplayJavascriptCode.tpl
===================================================================
--- trunk/plugins/SitesManager/templates/DisplayJavascriptCode.tpl	2008-03-12 10:22:59 UTC (rev 363)
+++ trunk/plugins/SitesManager/templates/DisplayJavascriptCode.tpl	2008-03-12 11:38:26 UTC (rev 364)
@@ -4,4 +4,4 @@
 {$jsTag}
 </code>
 
-<p><a href='?module=Home&action=index&idSite=1&period=day&date=yesterday'>Back to Piwik homepage</a></p>
\ No newline at end of file
+<p><a href='?module=Home'>Back to Piwik homepage</a></p>
\ No newline at end of file

Modified: trunk/plugins/SitesManager/templates/SitesManager.js
===================================================================
--- trunk/plugins/SitesManager/templates/SitesManager.js	2008-03-12 10:22:59 UTC (rev 363)
+++ trunk/plugins/SitesManager/templates/SitesManager.js	2008-03-12 11:38:26 UTC (rev 364)
@@ -1,4 +1,15 @@
 
+function getEncoded(siteName)
+{
+	// compatible with old browsers but wouldnt work for UTF8 strings
+	if (encodeURIComponent) {
+   		siteName = encodeURIComponent(siteName);
+	} else {
+	    siteName = escape(siteName);
+	}
+	return siteName;
+}
+
 function getDeleteSiteAJAX( idSite )
 {
 	var ajaxRequest = getStandardAjaxConf();
@@ -32,15 +43,16 @@
 	request += '&module=API';
 	request += '&format=json';
 	request += '&method=SitesManager.addSite';
-	request += '&siteName='+escape(siteName);
 	
+	siteName = getEncoded(siteName);
+	request += '&siteName='+siteName;
+	
 	$.each(urls, function (key,value){ request+= '&urls[]='+escape(value);} );
 
 	ajaxRequest.data = request;
  	
 	return ajaxRequest;
 }
-
 function getUpdateSiteAJAX( row )
 {
 	var ajaxRequest = getStandardAjaxConf();
@@ -54,7 +66,8 @@
 	request += '&module=API';
 	request += '&format=json';
 	request += '&method=SitesManager.updateSite';
-	request += '&siteName='+escape(siteName);
+	siteName = getEncoded(siteName);
+	request += '&siteName='+siteName;
 	request += '&idSite='+idSite;
 	$.each(urls, function (key,value){ if(value.length>1) request+= '&urls[]='+value;} );
 

Modified: trunk/plugins/SitesManager/templates/SitesManager.tpl
===================================================================
--- trunk/plugins/SitesManager/templates/SitesManager.tpl	2008-03-12 10:22:59 UTC (rev 363)
+++ trunk/plugins/SitesManager/templates/SitesManager.tpl	2008-03-12 11:38:26 UTC (rev 364)
@@ -1,4 +1,6 @@
 
+
+
 <script type="text/javascript" src="libs/jquery/jquery.js"></script>
 <script type="text/javascript" src="themes/default/common.js"></script>
 
@@ -43,4 +45,6 @@
 {/if}
 
 
-<p><a href='?module=Home&action=index&idSite=1&period=day&date=yesterday'>Back to Piwik homepage</a></p>
+<p><a href='?module=Home'>Back to Piwik homepage</a></p>
+
+

Modified: trunk/plugins/UsersManager/templates/UsersManager.js
===================================================================
--- trunk/plugins/UsersManager/templates/UsersManager.js	2008-03-12 10:22:59 UTC (rev 363)
+++ trunk/plugins/UsersManager/templates/UsersManager.js	2008-03-12 11:38:26 UTC (rev 364)
@@ -63,6 +63,7 @@
 {
 	return $('#selectIdsite option:selected').val();
 }
+
 function getUpdateUserAccess(login, access, successCallback)
 {
 	var ajaxRequest = getStandardAjaxConf();

Modified: trunk/plugins/UsersManager/templates/UsersManager.tpl
===================================================================
--- trunk/plugins/UsersManager/templates/UsersManager.tpl	2008-03-12 10:22:59 UTC (rev 363)
+++ trunk/plugins/UsersManager/templates/UsersManager.tpl	2008-03-12 11:38:26 UTC (rev 364)
@@ -107,4 +107,4 @@
 <div id="addrow"><img src='plugins/UsersManager/images/add.png'> <a href="#">Add a new user</a></div>
 <script type="text/javascript" src="plugins/UsersManager/templates/UsersManager.js"></script>
 
-<p><a href='?module=Home&action=index&idSite=1&period=day&date=yesterday'>Back to Piwik homepage</a></p>
\ No newline at end of file
+<p><a href='?module=Home'>Back to Piwik homepage</a></p>
\ No newline at end of file