refs #389 Fixing date selection, fixing column sorting, few styles modifications

author: matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> 2009-12-14 20:36:50 +0300
committer: matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105> 2009-12-14 20:36:50 +0300
commit: ad52991d789c971c679362f9fd5e34eb31542fd1 (patch)
tree: bf7a7dc507287ecc2495d0681f5f39089fd8b767 /plugins
parent: 47a2ecd21a3d7a352a6c65c2334b6fd8a4296f5a (diff)
12 files changed, 199 insertions, 212 deletions
diff --git a/plugins/CoreHome/templates/broadcast.js b/plugins/CoreHome/templates/broadcast.js
index 1a2d67383c..ce5468fbca 100644
--- a/plugins/CoreHome/templates/broadcast.js
+++ b/plugins/CoreHome/templates/broadcast.js
@@ -106,7 +106,10 @@ broadcast.propagateNewPage = function (str)
     for( var i=0; i<params_vals.length; i++ ) {
         // update both the current search query and hash string
         currentSearchStr = broadcast.updateParamValue(params_vals[i],currentSearchStr);
-        currentHashStr   = broadcast.updateParamValue(params_vals[i],currentHashStr);
+
+        if(currentHashStr.length != 0 ) {
+        	currentHashStr   = broadcast.updateParamValue(params_vals[i],currentHashStr);
+        }
     }
 
     // Now load the new page.
@@ -164,21 +167,21 @@ broadcast.loadAjaxContent = function(urlAjax)
 
     function sectionLoaded(content)
     {
-	if(content.substring(0, 14) == '<!DOCTYPE html') {
-		window.location.reload();
-		return;
-	}
+		if(content.substring(0, 14) == '<!DOCTYPE html') {
+			window.location.reload();
+			return;
+		}
 
         if(urlAjax == broadcast.lastUrlRequested) {
-	    $('#content').html( content ).show();
-	    $('#loadingPiwik').hide();
-	    broadcast.lastUrlRequested = null;
-	}
+		    $('#content').html( content ).show();
+		    $('#loadingPiwik').hide();
+		    broadcast.lastUrlRequested = null;
+		}
     }
-    piwikMenu.activateMenu(
-        broadcast.getParamValue('module', urlAjax),
-        broadcast.getParamValue('action', urlAjax),
-        broadcast.getParamValue('idGoal', urlAjax)
+	piwikMenu.activateMenu(
+	    broadcast.getParamValue('module', urlAjax),
+	    broadcast.getParamValue('action', urlAjax),
+	    broadcast.getParamValue('idGoal', urlAjax)
     );
     ajaxRequest = {
         type: 'GET',
diff --git a/plugins/CoreHome/templates/header.tpl b/plugins/CoreHome/templates/header.tpl
index d88d17ac95..32baad9f4d 100644
--- a/plugins/CoreHome/templates/header.tpl
+++ b/plugins/CoreHome/templates/header.tpl
@@ -1,7 +1,16 @@
-<div id="header">
-{include file="CoreHome/templates/header_message.tpl"}
-{include file="CoreHome/templates/logo.tpl"}
-{include file="CoreHome/templates/period_select.tpl"}
-{include file="CoreHome/templates/js_disabled_notice.tpl"}
-</div>
-<br />
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<title>Piwik &rsaquo; Web Analytics Reports</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+<meta name="generator" content="Piwik {$piwik_version}" />
+<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
+<link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico" /> 
+{loadJavascriptTranslations plugins='CoreHome'}
+{include file="CoreHome/templates/js_global_variables.tpl"}
+{include file="CoreHome/templates/js_css_includes.tpl"}
+</head>
+<body>
+{include file="CoreHome/templates/top_bar.tpl"}
+{include file="CoreHome/templates/top_screen.tpl"}
diff --git a/plugins/CoreHome/templates/index.tpl b/plugins/CoreHome/templates/index.tpl
index 530f3c14d2..276f67ec27 100644
--- a/plugins/CoreHome/templates/index.tpl
+++ b/plugins/CoreHome/templates/index.tpl
@@ -1,20 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>Piwik &rsaquo; Web Analytics Reports</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<meta name="generator" content="Piwik {$piwik_version}" />
-<meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7" />
-<link rel="shortcut icon" href="plugins/CoreHome/templates/images/favicon.ico" /> 
-{loadJavascriptTranslations plugins='CoreHome'}
-{include file="CoreHome/templates/js_global_variables.tpl"}
-{include file="CoreHome/templates/js_css_includes.tpl"}
-</head>
-<body>
 {assign var=showSitesSelection value=true}
-{include file="CoreHome/templates/top_bar.tpl"}
+
 {include file="CoreHome/templates/header.tpl"}
+
 {if isset($menu) && $menu}{include file="CoreHome/templates/menu.tpl"}{/if}
 <div style='clear:both'></div>
 {include file="CoreHome/templates/loading.tpl"}
diff --git a/plugins/CoreHome/templates/top_screen.tpl b/plugins/CoreHome/templates/top_screen.tpl
new file mode 100644
index 0000000000..d88d17ac95
--- /dev/null
+++ b/plugins/CoreHome/templates/top_screen.tpl
@@ -0,0 +1,7 @@
+<div id="header">
+{include file="CoreHome/templates/header_message.tpl"}
+{include file="CoreHome/templates/logo.tpl"}
+{include file="CoreHome/templates/period_select.tpl"}
+{include file="CoreHome/templates/js_disabled_notice.tpl"}
+</div>
+<br />
diff --git a/plugins/DBStats/templates/DBStats.tpl b/plugins/DBStats/templates/DBStats.tpl
index bcc3e0bb9b..9fdbff5436 100644
--- a/plugins/DBStats/templates/DBStats.tpl
+++ b/plugins/DBStats/templates/DBStats.tpl
@@ -12,7 +12,7 @@
 <table class="adminTable">
 	<thead>
 		<th>{'DBStats_Table'|translate}</th>
-		<th>{'DBStats_RowNumber'|translate}</th>
+		<th>{'DBStats_RowCount'|translate}</th>
 		<th>{'DBStats_DataSize'|translate}</th>
 		<th>{'DBStats_IndexSize'|translate}</th>
 		<th>{'DBStats_TotalSize'|translate}</th>
diff --git a/plugins/MultiSites/Controller.php b/plugins/MultiSites/Controller.php
index 62059ed2b0..f8eaa8bc9d 100644
--- a/plugins/MultiSites/Controller.php
+++ b/plugins/MultiSites/Controller.php
@@ -1,19 +1,5 @@
 <?php
-/**
- * Piwik - Open source web analytics
- * 
- * @link http://piwik.org
- * @license http://www.gnu.org/licenses/gpl-3.0.html Gpl v3 or later
- * @version $Id$
- * 
- * @category Piwik_Plugins
- * @package Piwik_MultiSites
- */
-
-/**
- *
- * @package Piwik_MultiSites
- */
+
 class Piwik_MultiSites_Controller extends Piwik_Controller
 {
 	protected $orderBy = 'names';
@@ -26,30 +12,24 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
 	protected $date;
 	protected $dateToStr;
 
-	public function index()
-	{
-		$view = Piwik_View::factory('index');
-		$this->setGeneralVariablesView($view);
-		$view->basicHtmlView = true;
-
-		$view->content = $this->getSitesInfo();
 
-		echo $view->render();		
+	function index()
+	{
+		$this->getSitesInfo();
 	}
 
+
 	public function getSitesInfo()
 	{
-		$view = Piwik_View::factory('getSitesInfo');
-		$this->setGeneralVariablesView($view);
-		$view->basicHtmlView = true;
-
+		$view = new Piwik_View("MultiSites/templates/index.tpl");
 		$mySites = Piwik_SitesManager_API::getSitesWithAtLeastViewAccess();
 
+
 		$params = $this->getGraphParamsModified();
 		$this->dateToStr = $params['date'];
 
 		$ids = 'all';
-		$this->period = PiwiK_Common::getRequestVar('period', 'day');
+		$this->period = PiwiK_Common::getRequestVar('period', 'day');		
 
 		$this->date = PiwiK_Common::getRequestVar('date', 'today');
 		$lastDate =  date('Y-m-d',strtotime("-1 ".$this->period, strtotime($this->date)));
@@ -88,8 +68,8 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
 		}
 
 		$view->mySites = $mySites;
-		$view->arrowDown = '<img src="plugins/MultiSites/images/arrow_asc.gif" width="16px" height="16px" />';
-		$view->arrowUp = '<img src="plugins/MultiSites/images/arrow_desc.gif" width="16px" height="16px" />';
+		$view->arrowAsc = '<img src="plugins/MultiSites/images/arrow_asc.gif" width="16px" height="16px" />';
+		$view->arrowDesc = '<img src="plugins/MultiSites/images/arrow_desc.gif" width="16px" height="16px" />';
 		$view->evolutionBy = $this->evolutionBy;
 		$view->period = $this->period;
 		$view->date = $this->date;
@@ -98,12 +78,12 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
 		$view->orderBy = $this->orderBy;
 		$view->order = $this->order;
 		$view->dateToStr = $this->dateToStr;
-
-		$this->setPeriodVariablesView($view);
+		
+		$this->setGeneralVariablesView($view);
 		$period = Piwik_Period::factory(Piwik_Common::getRequestVar('period'), Piwik_Date::factory($this->strDate));
 		$view->prettyDate = $period->getLocalizedLongString();
-
-		return $view->render();
+		
+		echo $view->render();
 	}
 
 	private function getSummary($lastVisits, $currentVisits, $mySites, $type)
@@ -153,3 +133,4 @@ class Piwik_MultiSites_Controller extends Piwik_Controller
 		return $this->renderView($view, $fetch);
 	}
 }
+?>
diff --git a/plugins/MultiSites/templates/common.js b/plugins/MultiSites/templates/common.js
index 0f6b878f0a..07fa44ebc0 100644
--- a/plugins/MultiSites/templates/common.js
+++ b/plugins/MultiSites/templates/common.js
@@ -11,7 +11,7 @@ function setRowData (idsite, visits, actions, unique, name, url, visitsSummaryVa
 	this.uniqueSummaryValue = parseFloat(uniqueSummaryValue);
 }
 
-function setOrderBy(allSites, params, mOrderBy)
+function setOrderBy(self, allSites, params, mOrderBy)
 {
 	if(params['mOrderBy'] == mOrderBy)
 	{
@@ -26,6 +26,10 @@ function setOrderBy(allSites, params, mOrderBy)
 	}
 	params['mOrderBy'] = mOrderBy;
 	prepareRows(allSites, params);
+
+	$('#arrow_asc').hide();
+	$('#arrow_desc').hide();
+	$(self).append(params['arrow_'+params['order']]);
 	return params;
 }
 
@@ -38,14 +42,6 @@ function prepareRows(allUnsortedSites, params)
 	$(".asc").hide();
 	$(".desc").hide();
 	var mOrderBy = params['mOrderBy'];
-	if(mOrderBy.indexOf('summary') != -1)
-	{
-		$("#evolution_" + params['order']).show();
-	}
-	else
-	{
-		$("#" + mOrderBy + '_' + params['order']).show();
-	}
 
 	allSites = orderBy(allUnsortedSites, params);
 	if(allSites.length > params['limit'])
@@ -56,17 +52,13 @@ function prepareRows(allUnsortedSites, params)
 	displayRows(allSites.reverse(), params);
 	showPagination(allUnsortedSites, params);
 	params['sitesVisible'] = allSites;
-
 }
 
 function orderBy(allSites, params)
 {
-
 	if(params['mOrderBy'] == 'names')
 	{
-		allSites.sort(function(a,b)
-		{
-
+		allSites.sort(function(a,b) {
 			if (a['name'].toLowerCase() == b['name'].toLowerCase())
 			{
 				return 0;
@@ -74,23 +66,18 @@ function orderBy(allSites, params)
 			return (a['name'].toLowerCase() < b['name'].toLowerCase()) ? 1 : -1;
 		});
 	}
-
 	else if(params['mOrderBy'] == 'visits')
 	{
-		allSites.sort(function(a,b)
-		{
+		allSites.sort(function(a,b) {
 			if (a['visits'] == b['visits']) {
 				return 0;
 			}
 			return (a['visits'] < b['visits']) ? 1 : -1;
-		}
-		);
+		});
 	}
-
 	else if(params['mOrderBy'] == 'actions')
 	{
-		allSites.sort(function (a,b)
-		{
+		allSites.sort(function (a,b) {
 			if (a['actions'] == b['actions']) {
 				return 0;
 			}
@@ -99,8 +86,7 @@ function orderBy(allSites, params)
 	}
 	else if(params['mOrderBy'] == 'unique')
 	{
-		allSites.sort(function (a,b)
-		{
+		allSites.sort(function (a,b) {
 			if (a['unique'] == b['unique']) {
 				return 0;
 			}
@@ -109,8 +95,7 @@ function orderBy(allSites, params)
 	}
 	else if(params['mOrderBy'] == 'uniqueSummary')
 	{
-		allSites.sort(function (a,b)
-		{
+		allSites.sort(function (a,b) {
 			if (a['uniqueSummaryValue'] == b['uniqueSummaryValue']) {
 				return 0;
 			}
@@ -119,34 +104,27 @@ function orderBy(allSites, params)
 	}
 	else if(params['mOrderBy'] == 'actionsSummary')
 	{
-		allSites.sort(function (a,b)
-		{
+		allSites.sort(function (a,b) {
 			if (a['actionsSummaryValue'] == b['actionsSummaryValue']) {
 				return 0;
 			}
-
-	return (a['actionsSummaryValue'] - b['actionsSummaryValue'] <= 0.01) ? 1 : -1;
-			});
-		}
+			return (a['actionsSummaryValue'] - b['actionsSummaryValue'] <= 0.01) ? 1 : -1;
+		});
+	}
 	else if(params['mOrderBy'] == 'visitsSummary')
 	{
-
-		allSites.sort(function (a,b)
-		{
+		allSites.sort(function (a,b) {
 			if (a['visitsSummaryValue'] == b['visitsSummaryValue']) {
 				return 0;
 			}
-
-	return (a['visitsSummaryValue'] - b['visitsSummaryValue'] <= 0.01) ? 1 : -1;
+			return (a['visitsSummaryValue'] - b['visitsSummaryValue'] <= 0.01) ? 1 : -1;
 		});
 	}
 
-
 	if(params['order'] == 'desc')
 	{
 		allSites.reverse();
 	}
-
 	return allSites;
 }
 
@@ -168,11 +146,8 @@ function switchEvolution(params)
 	{
 		$('#sparkline_' + allSites[i].idsite).html(getSparklineImg(allSites[i].idsite, params['evolutionBy'], params));
 	}
-
 }
 
-
-
 function displayRows(allSites, params)
 {
 	var table = document.getElementById('tb');
@@ -202,8 +177,9 @@ function displayRows(allSites, params)
 	$('.actions').hide();
 	$('.unique').hide();
 	$('.visits').hide();
+	$('#main_indicator').hide();
 	$('.' + params['evolutionBy']).show();
-	$("#content").show();
+	$("#main_indicator").hide();
 }
 
 function getSparklineImg(id, column, params)
diff --git a/plugins/MultiSites/templates/getSitesInfo.tpl b/plugins/MultiSites/templates/getSitesInfo.tpl
deleted file mode 100644
index 2959855fc3..0000000000
--- a/plugins/MultiSites/templates/getSitesInfo.tpl
+++ /dev/null
@@ -1,68 +0,0 @@
-<span id="loadingDataTable"><img src="{$piwikUrl}themes/default/images/loading-blue.gif" /> {'General_LoadingData'|translate}</span>
-<div id="multisites" style="margin: auto">
-<div id="main">
-{include file='MultiSites/templates/row.tpl' assign=row}
-<script type="text/javascript">
-var allSites = new Array();
-var params = new Array();
-{foreach from=$mySites key=i item=site}
-	allSites[{$i}] = new setRowData({$site.idsite}, {$site.visits}, {$site.actions}, {$site.unique}, '{$site.name}', '{$site.main_url}', '{$site.visitsSummaryValue|replace:",":"."}', '{$site.actionsSummaryValue|replace:",":"."}', '{$site.uniqueSummaryValue|replace:",":"."}');
-{/foreach}
-params['period'] = '{$period}';
-	params['date'] = '{$date}';
-	params['dateToStr'] = '{$dateToStr}';
-	params['evolutionBy'] = '{$evolutionBy}';
-	params['mOrderBy'] = '{$orderBy}';
-	params['order'] = '{$order}';
-	params['site'] = '{$site}';
-	params['limit'] = '{$limit}';
-	params['page'] = 1;
-	params['prev'] = "{'General_Previous'|translate}";
-	params['next'] = "{'General_Next'|translate}";
-	params['row'] = '{$row|escape:"javascript"}';
-</script>
-
-{postEvent name="template_headerMultiSites"}
-<table id="mt" class="dataTable" cellspacing="0" style="width: 90%; margin: auto">
-<thead>
-<th width="30px" class="label"></th>
-<th width="30px"></th>
-<th style="text-align:center">
-	<span style="cursor:pointer;" onClick="params = setOrderBy(allSites, params, 'names');">{'General_ColumnLabel'|translate}</span><span id="names_asc" class="asc" style="display: none;">{$arrowDown}</span><span id="names_desc" class="desc" style="display: none;">{$arrowUp}</span >
-</th>
-<th style="text-align:center">
-	<span style="cursor:pointer;" onClick="params = setOrderBy(allSites, params, 'visits');">{'General_ColumnNbVisits'|translate}</span><span id="visits_asc" class="asc" style="display: none;">{$arrowDown}</span><span id="visits_desc" class="desc" style="display: none;">{$arrowUp}</span>
-</th>
-<th style="text-align:center">
-	<span style="cursor:pointer;" onClick="params = setOrderBy(allSites, params, 'actions');">{'General_ColumnPageviews'|translate}</span><span id="actions_asc" class="asc" style="display: none;">{$arrowDown}</span><span id="actions_desc" class="desc" style="display: none;">{$arrowUp}</span>
-</th>
-<th style="text-align:center">
-	<span style="cursor:pointer;" onClick="params = setOrderBy(allSites, params, 'unique');">{'General_ColumnNbUniqVisitors'|translate}</span><span id="unique_asc" class="asc" style="display: none;">{$arrowDown}</span><span id="unique_desc" class="desc" style="display: none;">{$arrowUp}</span>
-</th>
-<th style="text-align:center" colspan="2">
-	<span style="cursor:pointer;" onClick="params = setOrderBy(allSites, params, $('#evolution_selector').val() + '_summary');"> Evolution</span><span id="evolution_asc" class="asc" style="display: none;">{$arrowDown}</span><span id="evolution_desc" class="desc" style="display: none;">{$arrowUp}</span>
-<select class="selector" id="evolution_selector" onchange="params['evolutionBy'] = $('#evolution_selector').val(); switchEvolution(params);">
-		<option value="visits" {if $evolutionBy eq 'visits'} selected {/if}>{'General_ColumnNbVisits'|translate}</option>
-		<option value="actions" {if $evolutionBy eq 'actions'} selected {/if}>{'General_ColumnPageviews'|translate}</option>
-		<option value="unique"{if $evolutionBy eq 'unique'} selected {/if}>{'General_ColumnNbUniqVisitors'|translate}</option>
-	</select>
-</th>
-</thead>
-<tbody id="tb">
-</tbody>
-<tfoot>
-<tr row_id="last">
-<td colspan="8" style="text-align: center" class="clean">
-<span id="prev" class="pager"  style="padding-right: 20px;"></span>
-<span id="counter">
-</span>
-<span id="next" class="clean" style="padding-left: 20px;"></span>
-</td>
-</tr>
-</tfoot>
-</table>
-<script type="text/javascript">
-prepareRows(allSites, params, '{$orderBy}');
-</script>
-</div>
-</div>
diff --git a/plugins/MultiSites/templates/index.tpl b/plugins/MultiSites/templates/index.tpl
index 12b9f95eec..0d74ddfff9 100644
--- a/plugins/MultiSites/templates/index.tpl
+++ b/plugins/MultiSites/templates/index.tpl
@@ -1 +1,88 @@
-{include file="CoreHome/templates/index.tpl"}
+
+{assign var=showSitesSelection value=false}
+{assign var=showPeriodSelection value=true}
+{include file="CoreHome/templates/header.tpl"}
+
+<script type="text/javascript" src="plugins/MultiSites/templates/common.js"></script>
+<style>
+{fetch file="plugins/MultiSites/templates/styles.css"}
+</style>
+
+<div id="multisites" style="margin: auto">
+<div id="main">
+{include file="MultiSites/templates/row.tpl" assign="row"}
+
+<script type="text/javascript">
+	var allSites = new Array();
+	var params = new Array();
+	{foreach from=$mySites key=i item=site}
+		allSites[{$i}] = new setRowData({$site.idsite}, {$site.visits}, {$site.actions}, {$site.unique}, '{$site.name}', '{$site.main_url}', '{$site.visitsSummaryValue|replace:",":"."}', '{$site.actionsSummaryValue|replace:",":"."}', '{$site.uniqueSummaryValue|replace:",":"."}');
+	{/foreach}
+    params['period'] = '{$period}';
+	params['date'] = '{$date}';
+	params['dateToStr'] = '{$dateToStr}';
+	params['evolutionBy'] = '{$evolutionBy}';
+	params['mOrderBy'] = '{$orderBy}';
+	params['order'] = '{$order}';
+	params['site'] = '{$site}';
+	params['limit'] = '{$limit}';
+	params['page'] = 1;
+	params['prev'] = "{'General_Previous'|translate}";
+	params['next'] = "{'General_Next'|translate}";
+	params['row'] = '{$row|escape:"javascript"}';
+	params['arrow_desc'] = '<span id="arrow_desc" class="desc">{$arrowDesc}</span>';
+	params['arrow_asc'] = '<span id="arrow_asc" class="asc">{$arrowAsc}</span>';
+</script>
+
+{postEvent name="template_headerMultiSites"}
+<table id="mt" class="dataTable" cellspacing="0" style="width:850px;margin: auto">
+	<thead>
+		<th class="label" style="text-align:center">
+			<span style="cursor:pointer;" onClick="params = setOrderBy(this,allSites, params, 'names');">{'General_Website'|translate}</span>
+		</th>
+		<th class="multisites-column">
+			<span style="cursor:pointer;" onClick="params = setOrderBy(this,allSites, params, 'visits');">{'General_ColumnNbVisits'|translate}</span>
+		</th>
+		<th class="multisites-column">
+			<span style="cursor:pointer;" onClick="params = setOrderBy(this,allSites, params, 'actions');">{'General_ColumnPageviews'|translate}</span>
+		</th>
+		<th class="multisites-column">
+			<span style="cursor:pointer;" onClick="params = setOrderBy(this,allSites, params, 'unique');">{'General_ColumnNbUniqVisitors'|translate}</span>
+		</th>
+		<th style="text-align:center;width:350px" colspan="2">
+			<span style="cursor:pointer;" onClick="params = setOrderBy(this,allSites, params, $('#evolution_selector').val() + 'Summary');"> Evolution</span>
+			<span id="evolution_asc" class="asc" style="display: none;">{$arrowDown}</span>
+			<span id="evolution_desc" class="desc" style="display: none;">{$arrowUp}</span>
+			<select class="selector" id="evolution_selector" onchange="params['evolutionBy'] = $('#evolution_selector').val(); switchEvolution(params);">
+				<option value="visits" {if $evolutionBy eq 'visits'} selected {/if}>{'General_ColumnNbVisits'|translate}</option>
+				<option value="actions" {if $evolutionBy eq 'actions'} selected {/if}>{'General_ColumnPageviews'|translate}</option>
+				<option value="unique"{if $evolutionBy eq 'unique'} selected {/if}>{'General_ColumnNbUniqVisitors'|translate}</option>
+			</select>
+		</th>
+	</thead>
+	
+	<tbody id="tb">
+	</tbody>
+	
+	<tfoot>
+	<tr row_id="last">
+		<td colspan="8" class="clean">
+		<span id="prev" class="pager"  style="padding-right: 20px;"></span>
+		<div id="dataTablePages">
+			<span id="counter">
+			</span>
+		</div>
+		<span id="next" class="clean" style="padding-left: 20px;"></span>
+	</td>
+	</tr>
+	</tfoot>
+</table>
+
+<script type="text/javascript">
+prepareRows(allSites, params, '{$orderBy}');
+</script>
+</div>
+</div>
+
+</body>
+</html>
diff --git a/plugins/MultiSites/templates/row.tpl b/plugins/MultiSites/templates/row.tpl
index cb5864f3ba..43bc8f851b 100644
--- a/plugins/MultiSites/templates/row.tpl
+++ b/plugins/MultiSites/templates/row.tpl
@@ -1,32 +1,25 @@
-<td style="width: 30px" class="label">
-    <div style="width: 10px; margin: auto">
-	<a target="_blank" href="%main_url%"><img src="plugins/MultiSites/images/link.gif"></a>
-    </div>
-</td>
-<td>
-    <div style="width: 20px; margin: auto">
-	<a href="index.php?module=CoreHome&action=index&date=%date%&period=%period%&idSite=%idsite%"><img src="plugins/MultiSites/images/door_in.png"></a>
-    </div>
-</td>
-<td>
-    %name%
-</td>
-<td>
+<td class="multisites-label label" >
+    <a title="View reports" href="index.php?module=CoreHome&action=index&date=%date%&period=%period%&idSite=%idsite%">%name%</a>
+    
+    <span style="width: 10px; margin-left:3px"> 
+	<a target="_blank" title="Go to %main_url%" href="%main_url%"><img src="plugins/MultiSites/images/link.gif"></a>
+    </span>
+</td>
+<td class="multisites-column">
     %visits%
 </td>
-<td>
+<td class="multisites-column">
     %actions%&nbsp;
 </td>
-<td>
+<td class="multisites-column">
     %unique%&nbsp;
 </td>
-<td>
+<td style="width:150px">
     <div class="visits" style="display:none">%visitsSummary%</div>
     <div class="actions"style="display:none">%actionsSummary%</div>
     <div class="unique" >%uniqueSummary%</div>
 </td>
-
-<td>
+<td style="width:185px">
     <div id="sparkline_%idsite%" style="width: 100px; margin: auto">
 	%sparkline%
     </div
diff --git a/plugins/MultiSites/templates/styles.css b/plugins/MultiSites/templates/styles.css
index 9473e04928..991d14ecda 100644
--- a/plugins/MultiSites/templates/styles.css
+++ b/plugins/MultiSites/templates/styles.css
@@ -1,6 +1,3 @@
-@CHARSET "UTF-8";
-
-
 .indicator {
 	background-image: url("../images/loading-blue.gif");
 	background-position:	center;
@@ -11,17 +8,30 @@
 	border: 0px !important;
 }
 
-.clean
-{
+.clean {
     border: 0px !important;
 }
 
-#multisites td, #multisites tr, #multisites .sparkline
-{
+#multisites td, #multisites tr, #multisites .sparkline {
     text-align: center;
     vertical-align: middle;
-    padding: 1px !important;
-    margin: 0px !important;
+    padding: 1px ;
+    margin: 0px ;
+}
+
+#multisites td.multisites-label {
+    padding-left: 15px ;
+    text-align:left;
+    width: 250px;
+}
+#multisites td.multisites-label a:hover {
+    text-decoration: underline;
+}
+#multisites td.multisites-column, #multisites th.multisites-column  {
+	width:70px;
+}
+#multisites td.multisites-column-evolution, #multisites th.multisites-column-evolution  {
+	width:70px;
 }
 
 
diff --git a/plugins/Widgetize/templates/index.tpl b/plugins/Widgetize/templates/index.tpl
index f2f3573019..303c643ac6 100644
--- a/plugins/Widgetize/templates/index.tpl
+++ b/plugins/Widgetize/templates/index.tpl
@@ -1,6 +1,6 @@
 {assign var=showSitesSelection value=true}
 {assign var=showPeriodSelection value=true}
-{include file="CoreAdminHome/templates/header.tpl"}
+{include file="CoreHome/templates/header.tpl"}
 {loadJavascriptTranslations plugins='Dashboard'}
 
 <link rel="stylesheet" type="text/css" href="plugins/CoreHome/templates/styles.css" />
@@ -17,7 +17,9 @@
 <script type="text/javascript" src="plugins/Dashboard/templates/widgetMenu.js"></script>
 
 <script type="text/javascript" src="plugins/Widgetize/templates/widgetize.js"></script>
-<script src="http://cdn.clearspring.com/launchpad/v2/standalone.js" type="text/javascript"></script>
+<!--
+	<script src="http://cdn.clearspring.com/launchpad/v2/standalone.js" type="text/javascript"></script>
+-->
 {literal}
 <style>
 .menu {
author	matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>	2009-12-14 20:36:50 +0300
committer	matt <matt@59fd770c-687e-43c8-a1e3-f5a4ff64c105>	2009-12-14 20:36:50 +0300
commit	ad52991d789c971c679362f9fd5e34eb31542fd1 (patch)
tree	bf7a7dc507287ecc2495d0681f5f39089fd8b767 /plugins
parent	47a2ecd21a3d7a352a6c65c2334b6fd8a4296f5a (diff)