Changeset 15344


Ignore:
Timestamp:
05/27/12 13:34:26 (7 years ago)
Author:
grum
Message:

feature:2639 - Compatibility with Piwigo 2.4

Location:
extensions/ColorStat
Files:
1 added
1 deleted
9 edited

Legend:

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

    r10630 r15344  
    1 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 
    2 {combine_script id="jquery.ui.slider" path="themes/default/js/ui/minified/jquery.ui.slider.min.js"} 
     1{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"} 
     2{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"} 
     3{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"} 
     4{combine_script id="jquery.ui.slider" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.slider.js"} 
    35 
    46 
  • extensions/ColorStat/admin/cstat_database.tpl

    r10630 r15344  
    1 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 
    2 {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"} 
     1{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"} 
     2{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"} 
     3{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"} 
     4{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"} 
    36 
    47{literal} 
     
    7477        resizable: false, 
    7578        width:480, 
    76         height:120, 
     79        height:150, 
    7780        modal: true, 
    7881        draggable:true, 
     
    160163          resizable: false, 
    161164          width:480, 
    162           height:120, 
     165          height:150, 
    163166          modal: true, 
    164167          draggable:true, 
  • extensions/ColorStat/admin/cstat_install_page.tpl

    r10630 r15344  
    1 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 
     1{combine_script id="jquery.ui" path="themes/default/js/ui/jquery.ui.core.js"} 
     2{combine_script id="jquery.ui.widget" path="themes/default/js/ui/jquery.ui.widget.js"} 
     3{combine_script id="jquery.ui.mouse" path="themes/default/js/ui/jquery.ui.mouse.js"} 
    24{combine_script id="jquery.tipTip" path="themes/default/js/plugins/jquery.tipTip.minified.js" } 
    35 
  • extensions/ColorStat/admin/cstat_stat.tpl

    r10630 r15344  
    1 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 
     1{combine_script id="jquery.ui" path="themes/default/js/ui/jquery.ui.core.js"} 
     2{combine_script id="jquery.ui.widget" path="themes/default/js/ui/jquery.ui.widget.js"} 
     3{combine_script id="jquery.ui.mouse" path="themes/default/js/ui/jquery.ui.mouse.js"} 
    24{combine_script id="jquery.tipTip" path="themes/default/js/plugins/jquery.tipTip.minified.js" } 
    35 
  • extensions/ColorStat/cstat_aip.class.inc.php

    r8544 r15344  
    3737    $this->tabsheet->add('database', 
    3838                          l10n('cstat_database'), 
    39                           $this->getAdminLink()."&f_tabsheet=database"); 
     39                          $this->getAdminLink()."-database"); 
    4040    $this->tabsheet->add('stat', 
    4141                          l10n('cstat_stat'), 
    42                           $this->getAdminLink()."&f_tabsheet=stat"); 
     42                          $this->getAdminLink()."-stat"); 
    4343    $this->tabsheet->add('search', 
    4444                          l10n('cstat_search'), 
    45                           $this->getAdminLink()."&f_tabsheet=search"); 
     45                          $this->getAdminLink()."-search"); 
    4646    $this->tabsheet->add('config', 
    4747                          l10n('cstat_config'), 
    48                           $this->getAdminLink()."&f_tabsheet=config"); 
     48                          $this->getAdminLink()."-config"); 
    4949  } 
    5050 
     
    6161  { 
    6262    parent::initEvents(); 
    63     if($_REQUEST['f_tabsheet']=='search') 
     63    if($_GET['tab']=='search') 
    6464    { 
    6565      // load request builder JS only on the search page 
     
    8181    $template->set_filename('plugin_admin_content', dirname(__FILE__)."/admin/cstat_admin.tpl"); 
    8282 
    83  
    84     switch($_REQUEST['f_tabsheet']) 
     83    switch($_GET['tab']) 
    8584    { 
    8685      case 'database': 
     
    9897    } 
    9998 
    100     $this->tabsheet->select($_REQUEST['f_tabsheet']); 
     99    $this->tabsheet->select($_GET['tab']); 
    101100    $this->tabsheet->assign(); 
    102101    $selected_tab=$this->tabsheet->get_selected(); 
     
    152151  protected function checkRequest() 
    153152  { 
    154     if(!isset($_REQUEST['f_tabsheet'])) $_REQUEST['f_tabsheet']='stat'; 
    155  
    156  
    157     if(!($_REQUEST['f_tabsheet']=='database' or 
    158          $_REQUEST['f_tabsheet']=='stat' or 
    159          $_REQUEST['f_tabsheet']=='search' or 
    160          $_REQUEST['f_tabsheet']=='config')) $_REQUEST['f_tabsheet']='stat'; 
     153    if(!isset($_GET['tab'])) $_GET['tab']='stat'; 
     154 
     155 
     156    if(!($_GET['tab']=='database' or 
     157         $_GET['tab']=='stat' or 
     158         $_GET['tab']=='search' or 
     159         $_GET['tab']=='config')) $_GET['tab']='stat'; 
    161160 
    162161 
  • extensions/ColorStat/cstat_aip_install.class.inc.php

    r6176 r15344  
    3131    $this->tabsheet->add('install', 
    3232                          l10n('cstat_install'), 
    33                           $this->getAdminLink()."&f_tabsheet=install"); 
     33                          $this->getAdminLink()."-install"); 
    3434  } 
    3535 
     
    6363    $this->displayInstallPage(); 
    6464 
    65     $this->tabsheet->select($_REQUEST['f_tabsheet']); 
     65    $this->tabsheet->select($_GET['tab']); 
    6666    $this->tabsheet->assign(); 
    6767    $selected_tab=$this->tabsheet->get_selected(); 
     
    102102  protected function checkRequest() 
    103103  { 
    104     $_REQUEST['f_tabsheet']='install'; 
     104    $_GET['tab']='install'; 
    105105 
    106106    if(isset($_REQUEST['ajaxfct'])) 
  • extensions/ColorStat/cstat_version.inc.php

    r10888 r15344  
    1515  if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!'); 
    1616 
    17   define('CSTAT_VERSION',  '1.1.0'); 
    18   define('CSTAT_VERSION2', '01.01.00'); 
    19   define('CSTAT_GPC_NEEDED', '3.5.1'); 
     17  define('CSTAT_VERSION',  '1.2.0'); 
     18  define('CSTAT_VERSION2', '01.02.00'); 
     19  define('CSTAT_GPC_NEEDED', '3.5.2'); 
    2020?> 
  • extensions/ColorStat/main.inc.php

    r10630 r15344  
    22/* 
    33Plugin Name: ColorStat 
    4 Version: 1.1.0 
     4Version: 1.2.0 
    55Description: Allow to make stat on pictures colors 
    66Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=393 
     
    4343|         |            |   . Compatibility with Piwigo 2.2 
    4444|         |            | 
     45| 1.2.0   | 2012/05/25 | * mantis feature:2639 
     46|         |            |   . Compatibility with Piwigo 2.4 
    4547|         |            | 
    4648|         |            | 
  • extensions/ColorStat/templates/cstat_dialog_colors_choose.tpl

    r10630 r15344  
    1 {combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"} 
    2 {combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"} 
     1{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"} 
     2{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"} 
     3{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"} 
     4{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"} 
    36{combine_script id="jquery.tipTip" path="themes/default/js/plugins/jquery.tipTip.minified.js"} 
    47 
Note: See TracChangeset for help on using the changeset viewer.