From 2757498333ec71db4ca28d24b26ab78989dcdc1c Mon Sep 17 00:00:00 2001
From: pbarroca <pbarroca@afi-sa.fr>
Date: Wed, 15 Jul 2015 16:40:08 +0200
Subject: [PATCH] dev #23805 : adminvars ergonomics

---
 .../admin/views/scripts/index/adminvar.phtml  | 29 +++++++------------
 public/admin/css/global.css                   |  2 +-
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/application/modules/admin/views/scripts/index/adminvar.phtml b/application/modules/admin/views/scripts/index/adminvar.phtml
index f902a7f982c..af9ff145c07 100644
--- a/application/modules/admin/views/scripts/index/adminvar.phtml
+++ b/application/modules/admin/views/scripts/index/adminvar.phtml
@@ -8,17 +8,7 @@ Class_ScriptLoader::getInstance()
 	{'orderable': false, 'targets': 2}
 ]
 })")
-->loadJQueryUI()
-->addJQueryReady('$(document).tooltip({
-items: "[data-tooltip]",
-content: function() {
-	var element = $(this);
-	var html = element.find("span").html();
-  return (html.trim() != "") ? html : "Description non disponible";
-},
-position: { my: "left top+30", at: "left top"},
-hide: {duration: 1000}
-})');
+->loadJQueryUI();
 ?>
 
 <table id="adminvars">
@@ -34,12 +24,15 @@ hide: {duration: 1000}
 		$ligne = 0;
 		foreach($this->vars as $var) {
 			$ligne ++ ;
+			$edit_url = $this->url(['controller' => 'index',
+															'action' => 'adminvaredit',
+															'cle' => $var->getClef()]);
 			?>
-			<tr class="<?php echo ($ligne & 1) ? "first" : "second";?>" data-tooltip="">
-				<td style="vertical-align:top;" ><?php echo $var->getClef();?>
-					<span style="display:none;">
-						<?php echo $var->getDescription();?>
-					</span>
+			<tr class="<?php echo ($ligne & 1) ? "first" : "second";?>">
+				<td style="vertical-align:top;" >
+					<?php echo $var->getDescription();?>
+					<br><sub><a data-popup="true" href="<?php echo $edit_url; ?>">
+						<?php echo $var->getClef();?></a></sub>
 				</td>
 				<td>
 					<?php
@@ -48,9 +41,7 @@ hide: {duration: 1000}
 					?>
 				</td>
 				<td style="width:2%;text-align:center">
-					<a data-popup="true" href="<?php echo $this->url(['controller' => 'index',
-																														'action' => 'adminvaredit',
-																														'cle' => $var->getClef()])?>"><?php echo $this->boutonIco("type=edit");?></a>
+					<a data-popup="true" href="<?php echo $edit_url; ?>"><?php echo $this->boutonIco("type=edit");?></a>
 				</td>
 			</tr>
 		<?php	} ?>
diff --git a/public/admin/css/global.css b/public/admin/css/global.css
index 169005624ac..6c276f4f751 100644
--- a/public/admin/css/global.css
+++ b/public/admin/css/global.css
@@ -320,7 +320,7 @@ div#permalink {
 
 .first,
 .second {color:#575757;}
-.first {background-color:rgba(125,125,125,0.1);}
+.first, table.dataTable tbody tr.even {background-color:rgba(125,125,125,0.1);}
 
 
 .main .barre_nav{height:39px; background: transparent url(../images/box/menu/titre_menu.jpg) repeat-x; overflow: hidden;}
-- 
GitLab