Changeset 15350


Ignore:
Timestamp:
May 27, 2012, 4:18:03 PM (8 years ago)
Author:
grum
Message:

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

Location:
extensions/ColorStat
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • extensions/ColorStat/admin/cstat_database.tpl

    r15344 r15350  
    33{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
    44{combine_script id="jquery.ui.position" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.position.js"}
    5 {combine_script id="jquery.ui.dialog" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.dialog.js"}
     5{combine_script id="jquery.ui.dialog" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.dialog.js"}
    66
    77{literal}
  • extensions/ColorStat/admin/cstat_stat.tpl

    r15344 r15350  
    22{combine_script id="jquery.ui.widget" path="themes/default/js/ui/jquery.ui.widget.js"}
    33{combine_script id="jquery.ui.mouse" path="themes/default/js/ui/jquery.ui.mouse.js"}
    4 {combine_script id="jquery.tipTip" path="themes/default/js/plugins/jquery.tipTip.minified.js" }
    54
    65{literal}
     
    1110    loadColorList();
    1211    displayColorListOrder();
    13     $('.tiptip').tipTip(
     12    tipColor = new simpleTip();
     13    $('.sTip').each( function (index)
    1414      {
    15         'delay' : 0,
    16         'fadeIn' : 0,
    17         'fadeOut' : 0,
    18         'edgeOffset' : 5,
     15        tipColor.doAction('add', this,
     16          {
     17            targetPos:'top-middle',
     18            tipPos:'bottom-middle',
     19            offsetY:10,
     20            drawArrow:true
     21          }
     22        );
    1923      }
    2024    );
     
    99103          <th style="min-width:180px;" colspan="2"><span id="iHLTOrderColor"></span><a onclick="sortColorList('color');">{'cstat_colors'|@translate}</a></th>
    100104
    101           <th width="60px"><span id="iHLTOrderNumImages"></span><a class="tiptip" onclick="sortColorList('img');" title="{'cstat_NumOfImages_help'|@translate}">{'cstat_NumOfImages'|@translate}</a></th>
     105          <th width="60px"><span id="iHLTOrderNumImages"></span><a class="sTip" onclick="sortColorList('img');" title="{'cstat_NumOfImages_help'|@translate}">{'cstat_NumOfImages'|@translate}</a></th>
    102106          <th width="40px">{'cstat_Pct'|@translate}</th>
    103107          <th width="115px">&nbsp;</th>
    104108
    105           <th width="80px"><span id="iHLTOrderNumPixels"></span><a class="tiptip" onclick="sortColorList('pixels');" title="{'cstat_NumOfPixels_help'|@translate}">{'cstat_NumOfPixels'|@translate}</a></th>
     109          <th width="80px"><span id="iHLTOrderNumPixels"></span><a class="sTip" onclick="sortColorList('pixels');" title="{'cstat_NumOfPixels_help'|@translate}">{'cstat_NumOfPixels'|@translate}</a></th>
    106110          <th width="40px">{'cstat_Pct'|@translate}</th>
    107111          <th width="130px">&nbsp;</th>
  • extensions/ColorStat/cstat_aip.class.inc.php

    r15344 r15350  
    230230    global $template;
    231231
     232    GPCCore::addUI('simpleTip');
    232233    $template->set_filename('body_page',
    233234                dirname($this->getFileLocation()).'/admin/cstat_stat.tpl');
  • extensions/ColorStat/cstat_root.class.inc.php

    r10630 r15350  
    379379      global $template;
    380380
     381      GPCCore::addUI('simpleTip');
    381382      $template->set_filename('colors_choose',
    382383                    dirname(__FILE__).'/templates/cstat_dialog_colors_choose.tpl');
  • extensions/ColorStat/templates/cstat_color_table.tpl

    r6176 r15350  
    33  <tr>
    44    {foreach from=$row item=col}
    5     <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}"
     5    <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}"
    66        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>">
    77    </td>
  • extensions/ColorStat/templates/cstat_dialog_colors_choose.tpl

    r15344 r15350  
    33{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
    44{combine_script id="jquery.ui.position" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.position.js"}
    5 {combine_script id="jquery.ui.dialog" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.dialog.js"}
    6 {combine_script id="jquery.tipTip" path="themes/default/js/plugins/jquery.tipTip.minified.js"}
    7 
     5{combine_script id="jquery.ui.dialog" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.dialog.js"}
     6{combine_css id="CStat" path="plugins/ColorStat/cstat.css"}
    87
    98{literal}
     
    3130  var initDialogBox = function()
    3231  {
    33     $('.tiptip').tipTip(
     32    tipColor = new simpleTip();
     33    $('.sTip').each( function (index)
    3434      {
    35         'delay' : 0,
    36         'fadeIn' : 0,
    37         'fadeOut' : 0,
    38         'edgeOffset' : 5,
     35        tipColor.doAction('add', this,
     36          {
     37            targetPos:'top-middle',
     38            tipPos:'bottom-middle',
     39            offsetY:10,
     40            drawArrow:true
     41          }
     42        );
    3943      }
    4044    );
Note: See TracChangeset for help on using the changeset viewer.