[Piwik-svn] r459 - in trunk: . modules/ViewDataTable modules/Visualization plugins/Home/templates plugins/SitesManager/templates plugins/UsersManager/templates

svnmaster at piwik.org svnmaster at piwik.org
Wed May 7 00:39:43 CEST 2008


Author: matt
Date: 2008-05-07 00:39:42 +0200 (Wed, 07 May 2008)
New Revision: 459

Modified:
   trunk/TODO
   trunk/modules/ViewDataTable/GenerateGraphData.php
   trunk/modules/Visualization/Chart.php
   trunk/modules/Visualization/ChartEvolution.php
   trunk/modules/Visualization/ChartPie.php
   trunk/modules/Visualization/ChartVerticalBar.php
   trunk/plugins/Home/templates/index.tpl
   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:
- improved admin usability (hover show pointer:cursor everywhere)

Modified: trunk/TODO
===================================================================
--- trunk/TODO	2008-05-06 21:24:53 UTC (rev 458)
+++ trunk/TODO	2008-05-06 22:39:42 UTC (rev 459)
@@ -1,7 +1,46 @@
+commenting remaining core files 6 hours
+review all TODO from code + create tickets OR fix
+
+comparer avant update et apres update
+bien tester les recherches recursives
+loading recursive
+appels call API examples 
+
+execute unit tests
+
+tickets next roadmap 
+- INTEGRATION (subtickets)
+- OPTIMIZATION
+- SECURITE 
+- DOCUMENTATION: 
+http://producingoss.com/en/getting-started.html#documentation
+page: comment aider piwik ? mail sending, outlink/download tracking documentation,
+voir la page thought about dev process et creer la liste de documentations
+see marketing last.zip
+
+
+http://producingoss.com/en/share-management.html
+http://producingoss.com/en/getting-started.html#starting-a-faq
+FAQ manager
+
+translation manager
+issues manager
+
+features
+screenshots
+
+Usability 
+Documentation
+- write beginners tutorials medium level user http://producingoss.com/en/funding-non-programming.html
+
+
+
 simple fix
 ====
+
+regarder pour error_reporting
+admin sites css overwrite
 Review all english strings, make them more explicit
-make API token easily available in admin UI
 
 En fait, j'ai affich� le lien complet dans ma page, et j'ai cliqu� dessus pour voir ce qu'il disait, et j'ai re�u deux erreurs un peu plus claire, la premi�re, c'est qu'il a r�clam� sur la premi�re visite que la colonne LOCATION_PROVIDER (piwik_log_visit) n'avait pas de default value, j'en ai mis une avec '$' et c'est pass�.
  

Modified: trunk/modules/ViewDataTable/GenerateGraphData.php
===================================================================
--- trunk/modules/ViewDataTable/GenerateGraphData.php	2008-05-06 21:24:53 UTC (rev 458)
+++ trunk/modules/ViewDataTable/GenerateGraphData.php	2008-05-06 22:39:42 UTC (rev 459)
@@ -83,7 +83,6 @@
 		// we load the data with the filters applied
 		$this->loadDataTableFromAPI();
 		$this->dataTable->queueFilter('Piwik_DataTable_Filter_AddSummaryRow',array($this->getGraphLimit()));
-//		echo $this->dataTable;
 		$this->dataAvailable = $this->dataTable->getRowsCount() != 0;
 		
 		if(!$this->dataAvailable)
@@ -119,18 +118,20 @@
 		{
 			$label = $row->getColumn('label');
 			$value = $row->getColumn('nb_uniq_visitors');
+			
 			// case no unique visitors
 			if($value === false)
 			{
 				$value = $row->getColumn('nb_visits');
 			}
+			
 			$data[] = array(
 				'label' => $label,
 				'value' => $value,
 				'url' 	=> $row->getDetail('url'),
 			);
 		}
-//		var_dump($data);exit;
+		
 		return $data;
 	}
 }

Modified: trunk/modules/Visualization/Chart.php
===================================================================
--- trunk/modules/Visualization/Chart.php	2008-05-06 21:24:53 UTC (rev 458)
+++ trunk/modules/Visualization/Chart.php	2008-05-06 22:39:42 UTC (rev 459)
@@ -55,13 +55,11 @@
 		$this->set_inner_background('#ffffff');
 		
 		$this->set_tool_tip( '#x_label# <br>#val# #key# ' );
-		
 	}
 	
 	function prepareData()
 	{		
 		$label = $data = array();
-//		var_dump($this->dataGraph); exit;
 		$max = 0;
 		foreach($this->dataGraph as $row)
 		{
@@ -83,26 +81,10 @@
 		{
 			$this->maxData = $max + 10 - $max % 10;
 		}
-		
-//		var_dump($label);var_dump($data);
 	}
 	
 	function render()
 	{
-		//some tests data
-		/*return '&y_legend=Time of day,#736AFF,12&
-			&y_ticks=5,10,6&
-			&line_dot=3,0x736AFF,Avg. wave height (cm),10,3&
-			&values=1.5,1.6986693307951,1.8894183423087,2.064642473395,2.2173560908995,2.3414709848079,2.4320390859672,2.4854497299885,2.4995736030415,2.4738476308782,2.4092974268257,2.3084964038196,2.1754631805512,2.0155013718215,1.8349881501559,1.6411200080599,1.4416258565724,1.2444588979732,1.0574795567051,0.88814210905728,0.74319750469207,0.62842422758641,0.54839792611048,0.50630899636654,0.50383539116416,0.54107572533686,0.61654534427985,0.72723551244401,0.86873336212768,1.0353978205862,1.2205845018011,1.4169105971825,1.6165492048505,1.8115413635134,1.9941133511386,2.1569865987188,2.2936678638492,2.3987080958116,2.4679196720315,2.4985433453746,2.4893582466234,2.4407305566798,2.3545989080883,2.2343970978741,2.0849171928918&
-			&x_labels=2:00am,2:10,2:20,2:30,2:40,2:50,3:00am,3:10,3:20,3:30,3:40,3:50,4:00am,4:10,4:20,4:30,4:40,4:50,5:00am,,,,,,,6:00am,,,,,,,7:00am,,,,,,,8:00am,,,,,,&
-			&y_min=0&
-			&y_max=3&
-			&bg_colour=0xDFFFDF&
-			&x_label_style=13,0x9933CC,0,6&
-			
-			&y_label_style=none&
-			';
-			*/
 		return parent::render();
 	}
 	

Modified: trunk/modules/Visualization/ChartEvolution.php
===================================================================
--- trunk/modules/Visualization/ChartEvolution.php	2008-05-06 21:24:53 UTC (rev 458)
+++ trunk/modules/Visualization/ChartEvolution.php	2008-05-06 22:39:42 UTC (rev 459)
@@ -19,7 +19,6 @@
  */
 class Piwik_Visualization_ChartEvolution extends Piwik_Visualization_Chart
 {		
-	
 	function customizeGraph()
 	{
 		parent::customizeGraph();
@@ -39,8 +38,7 @@
 				$spacePosition = strlen($this->arrayLabel[$i]);
 			}
 			
-			// generate the link on the dot
-			// links to the given day statistics
+			// generate the link on the dot, to the given day' statistics
 			$link = Piwik_Url::getCurrentScriptName() 
 							. Piwik_Url::getCurrentQueryStringWithParametersModified( array(
 										'date' => substr($this->arrayLabel[$i],0,$spacePosition),
@@ -48,17 +46,13 @@
 										'action' => 'index',
 										'viewDataTable' => null// we reset the viewDataTable parameter (useless in the link)
 										));
-										
-//			$link = 'http://piwik.org';
 			
 			$line_1->add_link($value, $link );
 			$i++;
 		}
 		$this->data_sets[] = $line_1;
 		
-		
 		$this->set_x_labels( $this->arrayLabel );
 		$this->area_hollow( 1, 3, 4,'0x3357A0',  ' visits', 10 );	
 	}
-	
 }
\ No newline at end of file

Modified: trunk/modules/Visualization/ChartPie.php
===================================================================
--- trunk/modules/Visualization/ChartPie.php	2008-05-06 21:24:53 UTC (rev 458)
+++ trunk/modules/Visualization/ChartPie.php	2008-05-06 22:39:42 UTC (rev 459)
@@ -23,27 +23,15 @@
 		parent::customizeGraph();
 		
 		$this->prepareData();		
-//		$this->title( 'PIE Chart', '{font-size: 20px;}' );
 	
-	    // strip labels
 	    for($i = 0, $cnt = count($this->arrayLabel); $i < $cnt; $i++) 
 	    {
 	    	$label = $this->arrayLabel[$i];
 			$this->arrayLabel[$i] = (strlen($label) > 20 ? substr($label, 0, 20).'...' : $label);
 	    }
 	    $this->set_x_label_style( 12, $this->x_axis_colour, 0, 2, $this->bg_colour );
-		
-		//
 		$this->pie(60,'#505050','{font-size: 12px; color: #142448}', true);
-		//
-		// pass in two arrays, one of data, the other data labels
-		//
 		$this->pie_values( $this->arrayData, $this->arrayLabel );
-		//
-		// Colours for each slice, in this case some of the colours
-		// will be re-used (3 colurs for 5 slices means the last two
-		// slices will have colours colour[0] and colour[1]):
-		//
 		$this->pie_slice_colours( array('#3C5A69','#679BB5','#695A3C','#B58E67','#969696') );
 		
 		$this->set_tool_tip( '#x_label# <br>#val# ' );

Modified: trunk/modules/Visualization/ChartVerticalBar.php
===================================================================
--- trunk/modules/Visualization/ChartVerticalBar.php	2008-05-06 21:24:53 UTC (rev 458)
+++ trunk/modules/Visualization/ChartVerticalBar.php	2008-05-06 22:39:42 UTC (rev 459)
@@ -26,22 +26,13 @@
 	{
 		parent::customizeGraph();
 		$this->prepareData();
-//		$this->set_x_labels( $this->arrayLabel );
-//		$this->area_hollow( 1, 3, 4,'0x3357A0',  ' visits', 10 );
-//		
 		$this->set_data( $this->arrayData );
 		$this->set_x_labels( $this->arrayLabel );
 		$this->set_x_label_style( 12, $this->x_axis_colour, 0, 2, $this->bg_colour );
-		
 		$this->set_x_axis_steps( 2 );
-		
 		$this->set_y_max( $this->maxData );
-		
 		$this->y_label_steps( 2 );
-		//$this->set_links( array('http://piwik.org','http://piwik.org','http://piwik.org','http://piwik.org','http://piwik.org'));
-		
 		$this->bar_filled( 50, '#3B5AA9', '#063E7E', 'visits', 10 );
-//		$this->set_y_legend( 'Open Flash Chart', 12, '#736AFF' );
 	}
 	
 }
\ No newline at end of file

Modified: trunk/plugins/Home/templates/index.tpl
===================================================================
--- trunk/plugins/Home/templates/index.tpl	2008-05-06 21:24:53 UTC (rev 458)
+++ trunk/plugins/Home/templates/index.tpl	2008-05-06 22:39:42 UTC (rev 459)
@@ -1,6 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd ">
 <html>
 <head>
+<title>Piwik - Your Web Analytics Reports
 </head>
 <body>
 
@@ -12,7 +13,6 @@
 var minDateYear = {$minDateYear};
 var minDateMonth = {$minDateMonth};
 var minDateDay = {$minDateDay};
-
 </script>
 
 <script type="text/javascript" src="libs/jquery/jquery.js"></script>
@@ -34,241 +34,16 @@
 <script type="text/javascript" src="libs/jquery/ui.mouse.js"></script>
 <script type="text/javascript" src="libs/jquery/ui.sortable_modif.js"></script>
 
-
-
 <link rel="stylesheet" href="plugins/Home/templates/datatable.css">
 <link rel="stylesheet" href="plugins/Dashboard/templates/dashboard.css">
 
-
 <style type="text/css">@import url(libs/jquery/jquery-calendar.css);</style>
 
-
 <script type="text/javascript" src="libs/jquery/superfish_modified.js"></script>
 <script type="text/javascript" src="plugins/Home/templates/menu.js"></script>
 <link rel="stylesheet" type="text/css" href="plugins/Home/templates/menu.css" media="screen">
+<link rel="stylesheet" type="text/css" href="plugins/Home/templates/style.css" media="screen">
 
-{literal}
-
-<style>
-/* reset style */
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
-	margin: 0;
-	padding: 0;
-	border: 0;
-	outline: 0;
-	font-size: 100%;
-	vertical-align: baseline;
-	background: transparent;
-}
-body {
-	line-height: 1.33;
-}
-ol, ul {
-	list-style: none;
-}
-blockquote, q {
-	quotes: none;
-}
-
-/* remember to define focus styles! */
-:focus {
-	outline: 0;
-}
-
-/* remember to highlight inserts somehow! */
-ins {
-	text-decoration: none;
-}
-del {
-	text-decoration: line-through;
-}
-
-
-/* start piwik styles */
-body {
-	font-family: Georgia,"Trebuchet MS", Verdana, Arial, Helvetica, sans-serif;
-	font-size:1em;
-}
-
-#h1, #h1 a {
-	color: #136F8B;
-	font-size: 45px;
-	font-weight: lighter;
-	text-decoration : none;
-	margin:5px;
-}
-
-#subh1 {
-	color: #879dbd;
-	font-size: 25px;
-	font-weight: lighter;
-}
-h1 {
-	font-size:2em;
-	color:#0F1B2E;
-	padding-bottom:1em;
-}
-h2 {
-	font-size:1.6em;
-	color:#1D3256;	
-	padding-bottom:0.5em;
-	
-}
-h3 {
-	font-size:1.3em;
-	margin-top:2em;
-	color:#1D3256;
-}
-a {
-	color:#0F1B2E;
-}
-p { 
-	padding-bottom:1em;
-	margin-right:1em;
-}
-
-/* Content */
-#content {
-	margin-left:10px;
-}
-/* 2 columns reports */
-#leftcolumn {
-	float:left;
-	width:45%;
-	padding-left:10px;
-	padding-right:20px;
-}
-#rightcolumn {
-	float: right;
-	width:45%;
-	padding-left:20px;
-}
-
-
-
-/* Calendar */
-#calendar {
-	position: relative;
-	margin-left:350px;
-}
-.calendar td.dateToday, .calendar td.dateToday a{
-	font-weight:bold;
-}
-
-.calendar td.dateUsedStats, .calendar td.dateUsedStats a{
-	color:#2E85FF;
-	border-color:#2E85FF ;
-}
-
-.calendar td.calendar_unselectable {
-	color:#F2F7FF;
-}
-
-/* style for the date picking */
-#periodString {
-	margin-left:350px;
-}
-
-#periodString #date, #periodString #periods, 
-#periodString #date a, #periodString #periods a  {
-	color:#520202;
-	font-size:15pt;
-}
-#otherPeriods a{
-	 text-decoration:none;
-}
-#otherPeriods a:hover{
-	 text-decoration:underline;
-}
-#currentPeriod {
-	border-bottom:1px dotted #520202;
-}
-.hoverPeriod {
-	cursor: pointer;
-	font-weight:bold;
-	border-bottom:1px solid #520202;
-}
-
-
-/* OTHER */
-#loadingError {
-	font-weight:bold;
-	font-size: 1.1em;
-	color:#F88D22;
-	padding:0.5em;
-	margin-left:30%;
-	display:none;
-}
-#loadingPiwik {
-	font-weight:bold;
-	font-size: 1.1em;
-	color:#193B6C;
-	padding:0.5em;
-	margin-left:30%;
-}
-
-#miscLinks{
-	padding-right:20px;
-}
-
-#periodSelection, #periodSelection a {
-	color:#8D92AA;
-}
-
-#messageToUsers, #messageToUsers a {
-	color:red;
-	font-size:0.9em;
-	text-decoration : none;
-	width:100%;
-}
-
-.sparkline {
-	vertical-align: middle;
-	padding-right:10px;
-}
-
-
-#stuff {
-	position: absolute;
-	margin-left:70%;
-	margin-top:10px;
-	font-size:0.9em;
-	width:20%;
-}
-
-
-/* top right bar */
-#loggued {
-	float:right;
-	text-align:right;
-	margin-right: 20px;
-	padding-bottom:5px;
-	padding-top:5px;
-	padding-left:5px;
-	border-bottom:1px dotted #E2E3FE;
-	border-left:1px dotted #E2E3FE;
-}
-#loggued form {
-	display:inline;
-}
-
-
-#javascriptDisable, #javascriptDisable a {
-	font-weight:bold;
-	color:#F88D22;
-}
-</style>
-{/literal}
-
-
 <span id="loggued">
 <form action="{url idSite=null}" method="GET" id="siteSelection">
 <small>

Modified: trunk/plugins/SitesManager/templates/DisplayJavascriptCode.tpl
===================================================================
--- trunk/plugins/SitesManager/templates/DisplayJavascriptCode.tpl	2008-05-06 21:24:53 UTC (rev 458)
+++ trunk/plugins/SitesManager/templates/DisplayJavascriptCode.tpl	2008-05-06 22:39:42 UTC (rev 459)
@@ -1,3 +1,21 @@
+{literal}
+<style>
+code {
+	background-color:#F0F7FF;
+	border-color:#00008B;
+	border-style:dashed dashed dashed solid;
+	border-width:1px 1px 1px 5px;
+	direction:ltr;
+	display:block;
+	font-size:80%;
+	margin:2px 2px 20px;
+	padding:4px;
+	text-align:left;
+	font-family: "Courier New" Courier monospace;
+}
+</style>
+{/literal}
+
 <p>{'SitesManager_JsCodeHelp'|translate}:</p>
 
 <code>

Modified: trunk/plugins/SitesManager/templates/SitesManager.js
===================================================================
--- trunk/plugins/SitesManager/templates/SitesManager.js	2008-05-06 21:24:53 UTC (rev 458)
+++ trunk/plugins/SitesManager/templates/SitesManager.js	2008-05-06 22:39:42 UTC (rev 459)
@@ -79,26 +79,25 @@
 
 
 	$(document).ready( function() {
-	$('#addRowSite').click( function() {
+	$('.addRowSite').click( function() {
 		ajaxHideError();
 		$(this).toggle();
 		
 		var numberOfRows = $('table#editSites')[0].rows.length;
-		var newRowIdNumeric = numberOfRows ;
-		var newRowId = 'row' + newRowIdNumeric;
+		var newRowId = 'row' + numberOfRows;
 	
 		$(' <tr id="'+newRowId+'">\
-				<td>'+newRowIdNumeric+'</td>\
+				<td>&nbsp;</td>\
 				<td><input id="siteadd_name" value="Name" size=10></td>\
 				<td><textarea cols=30 rows=3 id="siteadd_urls">http://siteUrl.com/\nhttp://siteUrl2.com/</textarea></td>\
-				<td><img src="plugins/UsersManager/images/ok.png" id="addsite" href="#"></td>\
-	  			<td><img src="plugins/UsersManager/images/remove.png" id="cancel"></td>\
+				<td><img src="plugins/UsersManager/images/ok.png" class="addsite" href="#"></td>\
+	  			<td><img src="plugins/UsersManager/images/remove.png" class="cancel"></td>\
 	 		</tr>')
 	  			.appendTo('#editSites')
 		;
 		$('#'+newRowId).keypress( submitSiteOnEnter );
-		$('#addsite').click( function(){ $.ajax( getAddSiteAJAX($('tr#'+newRowId)) ); } );
-		$('#cancel').click(function() { ajaxHideError(); $(this).parents('tr').remove();  $('#addRowSite').toggle(); });
+		$('.addsite').click( function(){ $.ajax( getAddSiteAJAX($('tr#'+newRowId)) ); } );
+		$('.cancel').click(function() { ajaxHideError(); $(this).parents('tr').remove();  $('.addRowSite').toggle(); });
 	
 	 } );
 	
@@ -116,7 +115,6 @@
 	);
 	
 	var alreadyEdited = new Array;
-	// when click on edituser, the cells become editable
 	$('.editSite')
 		.click( function() {
 				ajaxHideError();
@@ -147,7 +145,7 @@
 				$(this)
 					.toggle()
 					.parent()
-					.prepend( $('<img src="plugins/UsersManager/images/ok.png" id="updateSite">')
+					.prepend( $('<img src="plugins/UsersManager/images/ok.png" class="updateSite">')
 								.click( function(){ $.ajax( getUpdateSiteAJAX( $('tr#'+idRow) ) ); } ) 
 						);
 				
@@ -156,17 +154,7 @@
 			}
 	);
 	
-	
-	$('td.editableSite')
-		.hover( function() {  
-		 	 $(this).css({ cursor: "pointer"}); 
-		  	},
-		  	function() {  
-		 	 $(this).css({ cursor: "auto"}); 
-		  	}
-	 	)
-	 	.click( function(){ $(this).parent().find('.editSite').click(); } )
-	 ;
+	$('td.editableSite').click( function(){ $(this).parent().find('.editSite').click(); } );
 });
  
 function submitSiteOnEnter(e)
@@ -174,7 +162,7 @@
 	var key=e.keyCode || e.which;
 	if (key==13)
 	{
-		$(this).parent().find('#updateSite').click();
-		$(this).find('#addsite').click();
+		$(this).parent().find('.updateSite').click();
+		$(this).find('.addsite').click();
 	}
 }

Modified: trunk/plugins/SitesManager/templates/SitesManager.tpl
===================================================================
--- trunk/plugins/SitesManager/templates/SitesManager.tpl	2008-05-06 21:24:53 UTC (rev 458)
+++ trunk/plugins/SitesManager/templates/SitesManager.tpl	2008-05-06 22:39:42 UTC (rev 459)
@@ -1,7 +1,19 @@
 {loadJavascriptTranslations modules='SitesManager'}
 
 <script type="text/javascript" src="plugins/SitesManager/templates/SitesManager.js"></script>
+{literal}
+<style>
+.addRowSite:hover, .editableSite:hover, .addsite:hover, .cancel:hover, .deleteSite:hover, .editSite:hover, .updateSite:hover{
+	cursor: pointer;
+}
 
+.addRowSite {
+	font-color:#3A477B;
+	padding:1em;
+	font-weight:bold;
+}
+</style>
+{/literal}
 <h2>{'SitesManager_Sites'|translate}</h2>
 <div id="ajaxError" style="display:none"></div>
 <div id="ajaxLoading" style="display:none">{'General_LoadingData'|translate} <img src="themes/default/loading.gif"></div>
@@ -34,6 +46,6 @@
 			
 		</tbody>
 	</table>
-	<div id="addRowSite"><img src='plugins/UsersManager/images/add.png'> <a href="#">{'SitesManager_AddSite'|translate}</a></div>
+	<div class="addRowSite"><img src='plugins/UsersManager/images/add.png'>{'SitesManager_AddSite'|translate}</div>
 {/if}
 

Modified: trunk/plugins/UsersManager/templates/UsersManager.js
===================================================================
--- trunk/plugins/UsersManager/templates/UsersManager.js	2008-05-06 21:24:53 UTC (rev 458)
+++ trunk/plugins/UsersManager/templates/UsersManager.js	2008-05-06 22:39:42 UTC (rev 459)
@@ -95,8 +95,8 @@
 	var key=e.keyCode || e.which;
 	if (key==13)
 	{
-		$(this).find('#adduser').click();
-		$(this).find('#updateuser').click();
+		$(this).find('.adduser').click();
+		$(this).find('.updateuser').click();
 	}
 }
 
@@ -196,7 +196,7 @@
 				$(this)
 					.toggle()
 					.parent()
-					.prepend( $('<img src="plugins/UsersManager/images/ok.png" id="updateuser">')
+					.prepend( $('<img src="plugins/UsersManager/images/ok.png" class="updateuser">')
 								.click( function(){ $.ajax( getUpdateUserAJAX( $('tr#'+idRow) ) ); } ) 
 						);
 				
@@ -207,18 +207,12 @@
 	$('.editable').keypress( submitOnEnter );
 	
 	$('td.editable')
-		.hover( function() {  
-		 	 $(this).css({ cursor: "pointer"}); 
-		  	},
-		  	function() {  
-		 	 $(this).css({ cursor: "auto"}); 
-		  	}
-	 	)
 	 	.click( function(){ $(this).parent().find('.edituser').click(); } )
 	 ;
 	
 	// when click on deleteuser, the we ask for confirmation and then delete the user
-	$('.deleteuser').click( function() {
+	$('.deleteuser')
+		.click( function() {
 			ajaxHideError();
 			var idRow = $(this).attr('id');
 			var loginToDelete = $(this).parent().parent().find('#userLogin').html();
@@ -229,14 +223,7 @@
 		}
 	);
 	
-	$('#addrow').hover( function() {  
-		 	 $(this).css({ cursor: "pointer"}); 
-		  	},
-		  	function() {  
-		 	 $(this).css({ cursor: "auto"}); 
-		  	}
-	 	)
-	 		.click( function() {
+	$('.addrow').click( function() {
 		ajaxHideError();
 		$(this).toggle();
 		
@@ -250,16 +237,18 @@
 				<td><input id="useradd_email" value="email at domain.com" size=15></td>\
 				<td><input id="useradd_alias" value="alias" size=15></td>\
 				<td>-</td>\
-				<td><img src="plugins/UsersManager/images/ok.png" id="adduser"></td>\
-	  			<td><img src="plugins/UsersManager/images/remove.png" id="cancel"></td>\
+				<td><img src="plugins/UsersManager/images/ok.png" class="adduser"></td>\
+	  			<td><img src="plugins/UsersManager/images/remove.png" class="cancel"></td>\
 	 		</tr>')
 	  			.appendTo('#users')
 		;
 		$('#'+newRowId).keypress( submitOnEnter );
-		$('#adduser').click( function(){ $.ajax( getAddUserAJAX($('tr#'+newRowId)) ); } );
-		$('#cancel').click(function() { ajaxHideError(); $(this).parents('tr').remove();  $('#addrow').toggle(); });
+		$('.adduser').click( function(){ $.ajax( getAddUserAJAX($('tr#'+newRowId)) ); } );
+		$('.cancel').click(function() { ajaxHideError(); $(this).parents('tr').remove();  $('.addrow').toggle(); });
 	
 	 } );
-	$('.updateAccess').click( bindUpdateAccess );
+	$('.updateAccess')
+		.click( bindUpdateAccess )
+		;
 });	
 

Modified: trunk/plugins/UsersManager/templates/UsersManager.tpl
===================================================================
--- trunk/plugins/UsersManager/templates/UsersManager.tpl	2008-05-06 21:24:53 UTC (rev 458)
+++ trunk/plugins/UsersManager/templates/UsersManager.tpl	2008-05-06 22:39:42 UTC (rev 459)
@@ -16,6 +16,15 @@
 	font-weight:bold;
 	text-align:center;
 }
+.editable:hover, .addrow:hover, .updateAccess:hover, .accessGranted:hover, .adduser:hover, .edituser:hover, .deleteuser:hover, .updateuser:hover, .cancel:hover{
+	cursor: pointer;
+}
+
+.addrow {
+	font-color:#3A477B;
+	padding:1em;
+	font-weight:bold;
+}
 </style>
 {/literal}
 
@@ -104,5 +113,5 @@
 	</tbody>
 </table>
 
-<div id="addrow"><img src='plugins/UsersManager/images/add.png'> {'UsersManager_AddUser'|translate}</div>
+<div class="addrow"><img src='plugins/UsersManager/images/add.png'> {'UsersManager_AddUser'|translate}</div>
 <script type="text/javascript" src="plugins/UsersManager/templates/UsersManager.js"></script>



More information about the Piwik-svn mailing list