Changeset 15350 for extensions/ColorStat

Timestamp:

May 27, 2012, 4:18:03 PM (12 years ago)

Author:

grum

Message:

feature:2639 - Compatibility with Piwigo 2.4
Fix some problem with user interface display

Location:

extensions/ColorStat

Files:

• admin/cstat_database.tpl (modified) (1 diff)
• admin/cstat_stat.tpl (modified) (3 diffs)
• cstat_aip.class.inc.php (modified) (1 diff)
• cstat_root.class.inc.php (modified) (1 diff)
• templates/cstat_color_table.tpl (modified) (1 diff)
• templates/cstat_dialog_colors_choose.tpl (modified) (2 diffs)

extensions/ColorStat/admin/cstat_database.tpl

@@ -3 +3 @@
 {combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
 {combine_script id="jquery.ui.position" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.position.js"}
-{combine_script id="jquery.ui.dialog" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.dialog.js"}
+{combine_script id="jquery.ui.dialog" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.dialog.js"}
 
 {literal}

extensions/ColorStat/admin/cstat_stat.tpl

@@ -2 +2 @@
 {combine_script id="jquery.ui.widget" path="themes/default/js/ui/jquery.ui.widget.js"}
 {combine_script id="jquery.ui.mouse" path="themes/default/js/ui/jquery.ui.mouse.js"}
-{combine_script id="jquery.tipTip" path="themes/default/js/plugins/jquery.tipTip.minified.js" }
 
 {literal}
@@ -11 +10 @@
     loadColorList();
     displayColorListOrder();
-    $('.tiptip').tipTip(
+    tipColor = new simpleTip();
+    $('.sTip').each( function (index)
       {
-        'delay' : 0,
-        'fadeIn' : 0,
-        'fadeOut' : 0,
-        'edgeOffset' : 5,
+        tipColor.doAction('add', this,
+          {
+            targetPos:'top-middle',
+            tipPos:'bottom-middle',
+            offsetY:10,
+            drawArrow:true
+          }
+        );
       }
     );
@@ -99 +103 @@
           <th style="min-width:180px;" colspan="2"><span id="iHLTOrderColor"></span><a onclick="sortColorList('color');">{'cstat_colors'|@translate}</a></th>
 
-          <th width="60px"><span id="iHLTOrderNumImages"></span><a class="tiptip" onclick="sortColorList('img');" title="{'cstat_NumOfImages_help'|@translate}">{'cstat_NumOfImages'|@translate}</a></th>
+          <th width="60px"><span id="iHLTOrderNumImages"></span><a class="sTip" onclick="sortColorList('img');" title="{'cstat_NumOfImages_help'|@translate}">{'cstat_NumOfImages'|@translate}</a></th>
           <th width="40px">{'cstat_Pct'|@translate}</th>
           <th width="115px">&nbsp;</th>
 
-          <th width="80px"><span id="iHLTOrderNumPixels"></span><a class="tiptip" onclick="sortColorList('pixels');" title="{'cstat_NumOfPixels_help'|@translate}">{'cstat_NumOfPixels'|@translate}</a></th>
+          <th width="80px"><span id="iHLTOrderNumPixels"></span><a class="sTip" onclick="sortColorList('pixels');" title="{'cstat_NumOfPixels_help'|@translate}">{'cstat_NumOfPixels'|@translate}</a></th>
           <th width="40px">{'cstat_Pct'|@translate}</th>
           <th width="130px">&nbsp;</th>

extensions/ColorStat/cstat_aip.class.inc.php

@@ -230 +230 @@
     global $template;
 
+    GPCCore::addUI('simpleTip');
     $template->set_filename('body_page',
                 dirname($this->getFileLocation()).'/admin/cstat_stat.tpl');

extensions/ColorStat/cstat_root.class.inc.php

@@ -379 +379 @@
       global $template;
 
+      GPCCore::addUI('simpleTip');
       $template->set_filename('colors_choose',
                     dirname(__FILE__).'/templates/cstat_dialog_colors_choose.tpl');

extensions/ColorStat/templates/cstat_color_table.tpl

@@ -3 +3 @@
   <tr>
     {foreach from=$row item=col}
-    <td id="cellColor_{$col.color}" style="width:{$data.size}px;height:{$data.size}px;background-color:#{$col.color};{if $col.num!=''}cursor:pointer;{/if}" class="tiptip {if $col.num!=''}csSelectable{/if}"
+    <td id="cellColor_{$col.color}" style="width:{$data.size}px;height:{$data.size}px;background-color:#{$col.color};{if $col.num!=''}cursor:pointer;{/if}" class="sTip {if $col.num!=''}csSelectable{/if}"
         title="<table><tr style='vertical-align:middle;'><td><div style='display:inline-block;width:18px;height:18px;background-color:#{$col.color};'></div></td><td style='display:inline-block;'>{'cstat_color'|@translate}&nbsp;#{$col.color}{if $col.num!=''}&nbsp;:&nbsp;{$col.num}&nbsp;{'cstat_images'|@translate}{/if}{if $col.pct!=''} {$data.br} {'cstat_surface'|@translate}&nbsp;{$col.pct}%{/if}</td></tr></table>">
     </td>

extensions/ColorStat/templates/cstat_dialog_colors_choose.tpl

@@ -3 +3 @@
 {combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
 {combine_script id="jquery.ui.position" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.position.js"}
-{combine_script id="jquery.ui.dialog" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.dialog.js"}
-{combine_script id="jquery.tipTip" path="themes/default/js/plugins/jquery.tipTip.minified.js"}
-
+{combine_script id="jquery.ui.dialog" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.dialog.js"}
+{combine_css id="CStat" path="plugins/ColorStat/cstat.css"}
 
 {literal}
@@ -31 +30 @@
   var initDialogBox = function()
   {
-    $('.tiptip').tipTip(
+    tipColor = new simpleTip();
+    $('.sTip').each( function (index)
       {
-        'delay' : 0,
-        'fadeIn' : 0,
-        'fadeOut' : 0,
-        'edgeOffset' : 5,
+        tipColor.doAction('add', this,
+          {
+            targetPos:'top-middle',
+            tipPos:'bottom-middle',
+            offsetY:10,
+            drawArrow:true
+          }
+        );
       }
     );