rating user improvements: faster javascript, by default sorted by last rate date, better tooltips ...

git-svn-id: http://piwigo.org/svn/trunk@29053 68402e56-0260-453c-a942-63ccdbb3a9ee

2 files changed, 149 insertions, 67 deletions

diff --git a/admin/rating_user.php b/admin/rating_user.php
index 746538610..e6eea9ee9 100644
--- a/admin/rating_user.php
+++ b/admin/rating_user.php
@@ -93,8 +93,11 @@ while ($row = pwg_db_fetch_assoc($result))
     $rating = $by_user_rating_model;
     $rating['uid'] = (int)$row['user_id'];
     $rating['aid'] = $usr['anon'] ? $row['anonymous_id'] : '';
-    $rating['last_date'] = $row['date'];
+    $rating['last_date'] = $rating['first_date'] = $row['date'];
   }
+  else
+    $rating['first_date'] = $row['date'];
+
   $rating['rates'][$row['rate']][] = array(
     'id' => $row['element_id'],
     'date' => $row['date'],
@@ -107,14 +110,15 @@ while ($row = pwg_db_fetch_assoc($result))
 $image_urls = array();
 if (count($image_ids) > 0 )
 {
-  $query = 'SELECT id, name, file, path, representative_ext
+  $query = 'SELECT id, name, file, path, representative_ext, level
   FROM '.IMAGES_TABLE.'
   WHERE id IN ('.implode(',', array_keys($image_ids)).')';
   $result = pwg_query($query);
+  $params = ImageStdParams::get_by_type(IMG_SQUARE);
   while ($row = pwg_db_fetch_assoc($result))
   {
     $image_urls[ $row['id'] ] = array(
-      'tn' => DerivativeImage::thumb_url($row),
+      'tn' => DerivativeImage::url($params, $row),
       'page' => make_picture_url( array('image_id'=>$row['id'], 'image_file'=>$row['file']) ),
     );
   }
@@ -171,7 +175,7 @@ foreach($by_user_ratings as $id => &$rating)
     'avg' => $s/$c,
     'cv'  => $s==0 ? -1 : sqrt($var)/($s/$c), // http://en.wikipedia.org/wiki/Coefficient_of_variation
     'cd'  => $consensus_dev,
-    'cdtop'  => $consensus_dev_top_count ? $consensus_dev_top : ''
+    'cdtop'  => $consensus_dev_top_count ? $consensus_dev_top : '',
   );
 }
 unset($rating);
@@ -210,7 +214,12 @@ function consensus_dev_compare($a, $b)
   return ($d==0) ? 0 : ($d<0 ? -1 : 1);
 }
 
-$order_by_index=3;
+function last_rate_compare($a, $b)
+{
+  return -strcmp( $a['last_date'], $b['last_date']);
+}
+
+$order_by_index=4;
 if (isset($_GET['order_by']) and is_numeric($_GET['order_by']))
 {
   $order_by_index = $_GET['order_by'];
@@ -221,6 +230,7 @@ $available_order_by= array(
     array(l10n('Number of rates'), 'count_compare'),
     array(l10n('Variation'), 'cv_compare'),
     array(l10n('Consensus deviation'), 'consensus_dev_compare'),
+    array(l10n('Last'), 'last_rate_compare'),
   );
 
 for ($i=0; $i<count($available_order_by); $i++)
@@ -241,7 +251,7 @@ $template->assign( array(
   'available_rates' => $conf['rate_items'],
   'ratings' => $by_user_ratings,
   'image_urls' => $image_urls,
-  'TN_WIDTH' => 28+2*ImageStdParams::get_by_type(IMG_THUMB)->sizing->ideal_size[0],
+  'TN_WIDTH' => ImageStdParams::get_by_type(IMG_SQUARE)->sizing->ideal_size[0],
   ) );
 $template->set_filename('rating', 'rating_user.tpl');
 $template->assign_var_from_handle('ADMIN_CONTENT', 'rating');
diff --git a/admin/themes/default/template/rating_user.tpl b/admin/themes/default/template/rating_user.tpl
index 5f0952c94..bc2b29ad6 100644
--- a/admin/themes/default/template/rating_user.tpl
+++ b/admin/themes/default/template/rating_user.tpl
@@ -12,8 +12,29 @@
 
 .dtBar {
 	text-align:left;
-	padding-left: 20px;
+	padding: 10px 0 10px 20px
 }
+.dtBar DIV{
+	display:inline;
+	padding-right: 5px;
+}
+
+.dataTables_paginate A {
+	padding-left: 3px;
+}
+
+.ui-tooltip {
+	padding: 8px;
+	position: absolute;
+	z-index: 9999;
+	max-width: {3*$TN_WIDTH}px;
+	-webkit-box-shadow: 0 0 5px #aaa;
+	box-shadow: 0 0 5px #aaa;
+}
+body .ui-tooltip {
+	border-width: 2px;
+}
+
 {/html_style}
 
 <h2>{$ratings|@count} {'Users'|@translate}</h2>
@@ -42,103 +63,154 @@
 </form>
 
 {combine_script id='core.scripts' load='async' path='themes/default/js/scripts.js'}
+{combine_script id='jquery.geoip' load='async' path='admin/themes/default/js/jquery.geoip.js'}
 {footer_script}
 var oTable = jQuery('#rateTable').dataTable({
-	sDom : '<"dtBar"f>rt',
-	bPaginate: false,
-	aaSorting: [[5,'desc']],
+	sDom : '<"dtBar"filp>rt<"dtBar"ilp>',
+	iDisplayLength: 100,
+	aLengthMenu: [ [25, 50, 100, 500, -1], [25, 50, 100, 500, "All"]],
+	aaSorting: [], //[[1,'desc']],
+	bAutoWidth: false,
+	bSortClasses: false,
 	aoColumnDefs: [
-		/*{
-			aTargets: ["dtc_user"]
-		},*/
+		{
+			aTargets: ["dtc_user"],
+			sType: "string",
+			sClass: null
+		},
 		{
 			aTargets: ["dtc_date"],
-			asSorting: ["desc","asc"]
+			asSorting: ["desc","asc"],
+			sType: "string",
+			sClass: null
 		},
 		{
 			aTargets: ["dtc_stat"],
 			asSorting: ["desc","asc"],
-			bSearchable: false
+			bSearchable: false,
+			sType: "numeric",
+			sClass: null
 		},
 		{
 			aTargets: ["dtc_rate"],
 			asSorting: ["desc","asc"],
-			bSearchable: false
+			bSearchable: false,
+			sType: "html",
+			sClass: null
 		},
 		{
 			aTargets: ["dtc_del"],
 			bSortable: false,
-			bSearchable: false
+			bSearchable: false,
+			sType: "string",
+			sClass: null
 		}
 	]
 });
 
-function del(elt,uid,aid){
-	if (!confirm('{'Are you sure?'|@translate|@escape:'javascript'}'))
-		return false;
-	var tr = elt;
+
+function uidFromCell(cell){
+	var tr = cell;
 	while ( tr.nodeName != "TR") tr = tr.parentNode;
-	tr = jQuery(tr).fadeTo(1000, 0.4);
+	return $(tr).data("usr");
+}
 
-	(new PwgWS('{$ROOT_URL|@escape:javascript}')).callService(
-		'pwg.rates.delete', { user_id:uid, anonymous_id:aid},
-		{
-			method: 'POST',
-			onFailure: function(num, text) { tr.stop(); tr.fadeTo(0,1); alert(num + " " + text); },
-			onSuccess: function(result){
-				if (result)
-					oTable.fnDeleteRow(tr[0]);
-				else 
-					alert(result); 
+{* -----DELETE----- *}
+$(document).ready( function(){
+	$("#rateTable").on( "click", ".del", function(e) {
+		e.preventDefault();
+		if (!confirm('{'Are you sure?'|@translate|@escape:'javascript'}'))
+			return;
+		var cell = e.target.parentNode,
+			tr = cell;
+		while ( tr.nodeName != "TR") tr = tr.parentNode;
+		tr = jQuery(tr).fadeTo(1000, 0.4);
+
+		var data=uidFromCell(cell);
+		
+		(new PwgWS('{$ROOT_URL|@escape:javascript}')).callService(
+			'pwg.rates.delete', { user_id:data.uid, anonymous_id:data.aid},
+			{
+				method: 'POST',
+				onFailure: function(num, text) { tr.stop(); tr.fadeTo(0,1); alert(num + " " + text); },
+				onSuccess: function(result){
+					if (result)
+						oTable.fnDeleteRow(tr[0]);
+					else 
+						alert(result); 
+				}
 			}
-		}
-	);
-	
-	return false;
-}
+		);
+
+	});
+});
+
 {/footer_script}
 <table id="rateTable">
 <thead>
 <tr class="throw">
-	<td class="dtc_user">{'Username'|@translate}</td>
-	<td class="dtc_date">{'Last'|@translate}</td>
-	<td class="dtc_stat">{'Number of rates'|@translate}</td>
-	<td class="dtc_stat">{'Average rate'|@translate}</td>
-	<td class="dtc_stat">{'Variation'|@translate}</td>
-	<td class="dtc_stat">{'Consensus deviation'|@translate|@replace:' ':'<br>'}</td>
-	<td class="dtc_stat">{'Consensus deviation'|@translate|@replace:' ':'<br>'} {$CONSENSUS_TOP_NUMBER}</td>
+	<th class="dtc_user">{'Username'|@translate}</th>
+	<th class="dtc_date">{'Last'|@translate}</th>
+	<th class="dtc_stat">{'Number of rates'|@translate}</th>
+	<th class="dtc_stat">{'Average rate'|@translate}</th>
+	<th class="dtc_stat">{'Variation'|@translate}</th>
+	<th class="dtc_stat">{'Consensus deviation'|@translate|@replace:' ':'<br>'}</th>
+	<th class="dtc_stat">{'Consensus deviation'|@translate|@replace:' ':'<br>'} {$CONSENSUS_TOP_NUMBER}</th>
 {foreach from=$available_rates item=rate}
-	<td class="dtc_rate">{$rate}</td>
+	<th class="dtc_rate">{$rate}</th>
 {/foreach}
-	<td class="dtc_del"></td>
+	<th class="dtc_del"></th>
 </tr>
 </thead>
 {foreach from=$ratings item=rating key=user}
-<tr>
-	<td>{$user}</td>
-	<td>{$rating.last_date}</td>
-	<td>{$rating.count}</td>
-	<td>{$rating.avg|@number_format:2}</td>
-	<td>{$rating.cv|@number_format:3}</td>
-	<td>{$rating.cd|@number_format:3}</td>
-	<td>{if !empty($rating.cdtop)}{$rating.cdtop|@number_format:3}{/if}</td>
-	{foreach from=$rating.rates item=rates key=rate}
-	<td>{if !empty($rates)}
-		{capture assign=rate_over}{foreach from=$rates item=rate_arr}<img src="{$image_urls[$rate_arr.id].tn}" alt="thumb-{$rate_arr.id}" title="{$rate_arr.date}"></img>
-		{/foreach}{/capture}
-		<a class="cluetip" title="|{$rate_over|@htmlspecialchars}">{$rates|@count}</a>
-		{/if}</td>
-	{/foreach}
-	<td><a onclick="return del(this,{$rating.uid},'{$rating.aid}');" class="icon-trash"></a></td>
+<tr data-usr='{ldelim}"uid":{$rating.uid},"aid":"{$rating.aid}"}'>
+{strip}
+<td class=usr>{$user}</td><td title="First: {$rating.first_date}">{$rating.last_date}</td>
+<td>{$rating.count}</td><td>{$rating.avg|@number_format:2}</td>
+<td>{$rating.cv|@number_format:3}</td><td>{$rating.cd|@number_format:3}</td><td>{if !empty($rating.cdtop)}{$rating.cdtop|@number_format:3}{/if}</td>
+{foreach from=$rating.rates item=rates key=rate}
+<td>{if !empty($rates)}
+{capture assign=rate_over}{foreach $rates as $rate_arr}{if $rate_arr@index>29}{break}{/if}<img src="{$image_urls[$rate_arr.id].tn}" alt="thumb-{$rate_arr.id}" width="{$TN_WIDTH}" height="{$TN_WIDTH}">{/foreach}{/capture}
+<a title="{$rate_over|@htmlspecialchars}">{$rates|@count}</a>
+{/if}</td>
+{/foreach}
+<td><a class="del icon-trash"></a></td>
 </tr>
+{/strip}
 {/foreach}
 </table>
 
-{combine_script id='jquery.cluetip' load='footer' require='jquery' path='themes/default/js/plugins/jquery.cluetip.js'}
-{footer_script require='jquery.cluetip'}
-jQuery(document).ready(function(){ldelim}
-	jQuery('.cluetip').cluetip({ldelim}
-		width: {$TN_WIDTH}, showTitle:false, splitTitle: '|'
+{combine_script id='jquery.ui.tooltip' load='footer'}
+{footer_script require='jquery.ui.tooltip'}
+jQuery(document).ready(function(){
+	jQuery("#rateTable").tooltip({
+		items: ".usr,[title]",
+		content: function(callback) {
+			var t = $(this).attr("title");
+			if (t)
+				return t;
+			var that = $(this),
+				udata = uidFromCell(this);
+			if (!udata.aid)
+				return;
+			that
+				.data("isOver", true)
+				.one("mouseleave", function() {
+					that.removeData("isOver");
+				});
+
+			GeoIp.get( udata.aid + ".1", function(data) {
+				if (!data.fullName) return;
+				var content = data.fullName;
+				if (data.latitude && data.region_name) {
+					content += "<br><img width=300 height=220 src=\"http://maps.googleapis.com/maps/api/staticmap?sensor=false&size=300x220&zoom=6"
+						+ "&markers=size:tiny%7C" + data.latitude + "," + data.longitude
+						+ "\">";
+				}
+				if (that.data("isOver"))
+					callback(content);
+			});
+		}
 	});
 })
 {/footer_script}
\ No newline at end of file