Changeset 15344

Timestamp:

May 27, 2012, 1:34:26 PM (12 years ago)

Author:

grum

Message:

feature:2639 - Compatibility with Piwigo 2.4

Location:

extensions/ColorStat

Files:

• admin.php (added)
• admin/cstat_config.tpl (modified) (1 diff)
• admin/cstat_database.tpl (modified) (3 diffs)
• admin/cstat_install_page.tpl (modified) (1 diff)
• admin/cstat_stat.tpl (modified) (1 diff)
• admin/plugin_admin.php (deleted)
• cstat_aip.class.inc.php (modified) (5 diffs)
• cstat_aip_install.class.inc.php (modified) (3 diffs)
• cstat_version.inc.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)
• templates/cstat_dialog_colors_choose.tpl (modified) (1 diff)

extensions/ColorStat/admin/cstat_config.tpl

@@ -1 @@
-{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
-{combine_script id="jquery.ui.slider" path="themes/default/js/ui/minified/jquery.ui.slider.min.js"}
+{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"}
+{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"}
+{combine_script id="jquery.ui.mouse" require='jquery.ui.widget' path="themes/default/js/ui/jquery.ui.mouse.js"}
+{combine_script id="jquery.ui.slider" require='jquery.ui.widget' src="themes/default/js/ui/jquery.ui.slider.js"}
 
 

extensions/ColorStat/admin/cstat_database.tpl

@@ -1 @@
-{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
-{combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
+{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"}
+{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"}
+{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"}
 
 {literal}
@@ -74 +77 @@
         resizable: false,
         width:480,
-        height:120,
+        height:150,
         modal: true,
         draggable:true,
@@ -160 +163 @@
           resizable: false,
           width:480,
-          height:120,
+          height:150,
           modal: true,
           draggable:true,

extensions/ColorStat/admin/cstat_install_page.tpl

@@ -1 @@
-{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
+{combine_script id="jquery.ui" path="themes/default/js/ui/jquery.ui.core.js"}
+{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" }
 

extensions/ColorStat/admin/cstat_stat.tpl

@@ -1 @@
-{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
+{combine_script id="jquery.ui" path="themes/default/js/ui/jquery.ui.core.js"}
+{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" }
 

extensions/ColorStat/cstat_aip.class.inc.php

@@ -37 +37 @@
     $this->tabsheet->add('database',
                           l10n('cstat_database'),
-                          $this->getAdminLink()."&f_tabsheet=database");
+                          $this->getAdminLink()."-database");
     $this->tabsheet->add('stat',
                           l10n('cstat_stat'),
-                          $this->getAdminLink()."&f_tabsheet=stat");
+                          $this->getAdminLink()."-stat");
     $this->tabsheet->add('search',
                           l10n('cstat_search'),
-                          $this->getAdminLink()."&f_tabsheet=search");
+                          $this->getAdminLink()."-search");
     $this->tabsheet->add('config',
                           l10n('cstat_config'),
-                          $this->getAdminLink()."&f_tabsheet=config");
+                          $this->getAdminLink()."-config");
   }
 
@@ -61 +61 @@
   {
     parent::initEvents();
-    if($_REQUEST['f_tabsheet']=='search')
+    if($_GET['tab']=='search')
     {
       // load request builder JS only on the search page
@@ -81 +81 @@
     $template->set_filename('plugin_admin_content', dirname(__FILE__)."/admin/cstat_admin.tpl");
 
-
-    switch($_REQUEST['f_tabsheet'])
+    switch($_GET['tab'])
     {
       case 'database':
@@ -98 +97 @@
     }
 
-    $this->tabsheet->select($_REQUEST['f_tabsheet']);
+    $this->tabsheet->select($_GET['tab']);
     $this->tabsheet->assign();
     $selected_tab=$this->tabsheet->get_selected();
@@ -152 +151 @@
   protected function checkRequest()
   {
-    if(!isset($_REQUEST['f_tabsheet'])) $_REQUEST['f_tabsheet']='stat';
-
-
-    if(!($_REQUEST['f_tabsheet']=='database' or
-         $_REQUEST['f_tabsheet']=='stat' or
-         $_REQUEST['f_tabsheet']=='search' or
-         $_REQUEST['f_tabsheet']=='config')) $_REQUEST['f_tabsheet']='stat';
+    if(!isset($_GET['tab'])) $_GET['tab']='stat';
+
+
+    if(!($_GET['tab']=='database' or
+         $_GET['tab']=='stat' or
+         $_GET['tab']=='search' or
+         $_GET['tab']=='config')) $_GET['tab']='stat';
 
 

extensions/ColorStat/cstat_aip_install.class.inc.php

@@ -31 +31 @@
     $this->tabsheet->add('install',
                           l10n('cstat_install'),
-                          $this->getAdminLink()."&f_tabsheet=install");
+                          $this->getAdminLink()."-install");
   }
 
@@ -63 +63 @@
     $this->displayInstallPage();
 
-    $this->tabsheet->select($_REQUEST['f_tabsheet']);
+    $this->tabsheet->select($_GET['tab']);
     $this->tabsheet->assign();
     $selected_tab=$this->tabsheet->get_selected();
@@ -102 +102 @@
   protected function checkRequest()
   {
-    $_REQUEST['f_tabsheet']='install';
+    $_GET['tab']='install';
 
     if(isset($_REQUEST['ajaxfct']))

extensions/ColorStat/cstat_version.inc.php

@@ -15 +15 @@
   if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-  define('CSTAT_VERSION',  '1.1.0');
-  define('CSTAT_VERSION2', '01.01.00');
-  define('CSTAT_GPC_NEEDED', '3.5.1');
+  define('CSTAT_VERSION',  '1.2.0');
+  define('CSTAT_VERSION2', '01.02.00');
+  define('CSTAT_GPC_NEEDED', '3.5.2');
 ?>

extensions/ColorStat/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: ColorStat
-Version: 1.1.0
+Version: 1.2.0
 Description: Allow to make stat on pictures colors
 Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=393
@@ -43 +43 @@
 |         |            |   . Compatibility with Piwigo 2.2
 |         |            |
+| 1.2.0   | 2012/05/25 | * mantis feature:2639
+|         |            |   . Compatibility with Piwigo 2.4
 |         |            |
 |         |            |

extensions/ColorStat/templates/cstat_dialog_colors_choose.tpl

@@ -1 @@
-{combine_script id="jquery.ui" path="themes/default/js/ui/minified/jquery.ui.core.min.js"}
-{combine_script id="jquery.ui.dialog" path="themes/default/js/ui/minified/jquery.ui.dialog.min.js"}
+{combine_script id="jquery.ui" require='jquery' path="themes/default/js/ui/jquery.ui.core.js"}
+{combine_script id="jquery.ui.widget" require='jquery.ui' path="themes/default/js/ui/jquery.ui.widget.js"}
+{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"}