Changeset 7175

Timestamp:

Oct 13, 2010, 5:22:04 PM (14 years ago)

Author:

grum

Message:

Packing js files + add categorySelector functionnalities

Location:

extensions/GrumPluginClasses

Files:

• classes/GPCCategorySelector.class.inc.php (added)
• classes/GPCCore.class.inc.php (modified) (5 diffs)
• classes/GPCRequestBuilder.class.inc.php (modified) (1 diff)
• css/categorySelector_clear.css (added)
• css/categorySelector_roma.css (added)
• css/gpc.css (modified) (1 diff)
• css/iconSelector_clear.css (added)
• css/iconSelector_roma.css (added)
• gpc_ajax.php (modified) (6 diffs)
• icons/check_checked_clear.png (added)
• icons/check_checked_clear.xcf (added)
• icons/check_checked_roma.png (added)
• icons/check_notchecked_clear.png (added)
• icons/check_notchecked_roma.png (added)
• icons/collapse_clear.png (added)
• icons/collapse_roma.png (added)
• icons/expand_clear.png (added)
• icons/expand_collapse_checked.xcf (added)
• icons/expand_roma.png (added)
• js/criteriaBuilder.js (modified) (18 diffs)
• js/criteriaBuilder.packed.js (added)
• js/pagesNavigator.js (modified) (8 diffs)
• js/pagesNavigator.packed.js (added)
• js/simpleTip.js (modified) (9 diffs)
• js/simpleTip.packed.js (added)
• js/ui.categorySelector.help.txt (added)
• js/ui.categorySelector.js (added)
• js/ui.categorySelector.packed.js (added)
• js/ui.iconSelector.js (modified) (26 diffs)
• js/ui.iconSelector.packed.js (added)
• language/fr_FR/plugin.lang.php (modified) (1 diff)
• main.inc.php (modified) (4 diffs)
• templates/GPCRequestBuilder_search.tpl (modified) (1 diff)

extensions/GrumPluginClasses/classes/GPCCore.class.inc.php

@@ -3 +3 @@
 /* -----------------------------------------------------------------------------
   class name     : GPCCore
-  class version  : 1.2.0
-  plugin version : 3.2.0
+  class version  : 1.3.0
+  plugin version : 3.3.0
   date           : 2010-07-28
   ------------------------------------------------------------------------------
@@ -20 +20 @@
 | 1.2.0   | 2010/07/28 | * add the loadConfigFromFile function
 |         |            |
-|         |            |
+| 1.3.0   | 2010/10/13 | * add the addHeaderCSS, addHeaderJS functions
 |         |            |
 |         |            |
@@ -35 +35 @@
     - static function unregister
     - static function BBtoHTML
+    - static function addHeaderCSS
+    - static function addHeaderJS
    ---------------------------------------------------------------------- */
 
@@ -42 +44 @@
 {
   static public $pluginName = "GPCCore";
+  static protected $headerItems = array(
+    'css' => array(),
+    'js'  => array()
+  );
 
   /* ---------------------------------------------------------------------------
@@ -305 +311 @@
   }
 
+  /**
+   * used to add a css file in the header
+   *
+   * @param String $id : a unique id for the file
+   * @param String $file : the css file
+   */
+  static public function addHeaderCSS($id, $file)
+  {
+    if(!array_key_exists($file, self::$headerItems['css']))
+    {
+      self::$headerItems['css'][$id]=$file;
+    }
+  }
+  static public function addHeaderJS($id, $file)
+  {
+    global $template;
+
+    if(!array_key_exists($id,  $template->known_scripts) and !array_key_exists($file, self::$headerItems['js']))
+    {
+     $template->known_scripts[$id]=$url;
+     self::$headerItems['js'][$id]=$file;
+    }
+  }
+
+  /**
+   * declared as public to be accessible by the event manager, but this funcion
+   * is not aimed to be used directly
+   */
+  static public function applyHeaderItems()
+  {
+    global $template;
+
+    foreach(self::$headerItems['css'] as $file)
+    {
+      $template->block_html_head(null, '<link rel="stylesheet" type="text/css" href="'.$file.'"/>', $template->smarty, $false);
+    }
+
+    foreach(self::$headerItems['js'] as $file)
+    {
+      $template->block_html_head(null, '<script type="text/javascript" src="'.$file.'"></script>', $template->smarty, $false);
+    }
+  }
+
 } //class
 
+add_event_handler('loc_end_page_header', array('GPCCore', 'applyHeaderItems'));
+
+
 ?>

extensions/GrumPluginClasses/classes/GPCRequestBuilder.class.inc.php

@@ -466 +466 @@
     $template->append('head_elements', '<script type="text/javascript" src="plugins/'.$baseName.'external/interface/interface.js"></script>');
     $template->append('head_elements', '<script type="text/javascript" src="plugins/'.$baseName.'external/inestedsortable.pack.js"></script>');
-    $template->append('head_elements', '<script type="text/javascript" src="plugins/'.$baseName.'criteriaBuilder.js"></script>');
+    $template->append('head_elements', '<script type="text/javascript" src="plugins/'.$baseName.'criteriaBuilder.packed.js"></script>');
     $template->append('head_elements',
 "<script type=\"text/javascript\">

extensions/GrumPluginClasses/css/gpc.css

@@ -90 +90 @@
 }
 
-
-.ui-icon-selector {
-  background:none no-repeat scroll 2px 2px;
-  padding:2px;
-}
-.ui-icon-selector-icon {
-  background: none no-repeat scroll 2px 2px;
-  padding:2px;
-  float:left;
-}
-
-
-div.roma div.ui-icon-selector {
-  background-color:#444444;
-  border:1px solid #666666;
-}
-div.roma div.ui-icon-selector-list {
-  background-color:#444444;
-  border:1px solid #666666;
-  margin-top:-1px;
-}
-div.roma div.ui-icon-selector-list li.ui-icon-selector-icon:hover {
-  background-color:#666666;
-}
-div.roma div.ui-icon-selector-list li.ui-icon-selector-selected-icon {
-  background-color:#777777;
-}
-
-
-div.clear div.ui-icon-selector {
-  background-color:#CCCCCC;
-   border:1px solid #777777;
-}
-div.clear div.ui-icon-selector-list {
-  background-color:#CCCCCC;
-  border:1px solid #777777;
-  margin-top:-1px;
-}
-div.clear div.ui-icon-selector-list li.ui-icon-selector-icon:hover {
-  background-color:#777777;
-}
-div.clear div.ui-icon-selector-list li.ui-icon-selector-selected-icon {
-  background-color:#888888;
-}

extensions/GrumPluginClasses/gpc_ajax.php

@@ -16 +16 @@
  *
  * manage all the ajax requests
+ *
+ * known functions :
+ *  - admin.rbuilder.fillCaddie
+ *  - admin.categorySelector.getList
+ *
  * -----------------------------------------------------------------------------
  */
@@ -68 +73 @@
       // check if asked function is valid
       if(!(
-           $_REQUEST['ajaxfct']=='admin.rbuilder.fillCaddie'
+           $_REQUEST['ajaxfct']=='admin.rbuilder.fillCaddie' or
+           $_REQUEST['ajaxfct']=='admin.categorySelector.getList' or
+           $_REQUEST['ajaxfct']=='public.categorySelector.getList'
           )
         ) $_REQUEST['ajaxfct']='';
@@ -77 +84 @@
       {
         /*
-         * check admin.makeStats.getList values
+         * check admin.rbuilder.fillCaddie values
          */
         if($_REQUEST['ajaxfct']=="admin.rbuilder.fillCaddie")
@@ -88 +95 @@
           if(!isset($_REQUEST['requestNumber'])) $_REQUEST['ajaxfct']="";
         }
+
+        /*
+         * check admin.categorySelector.getList values
+         */
+        if($_REQUEST['ajaxfct']=="admin.categorySelector.getList" or
+           $_REQUEST['ajaxfct']=="public.categorySelector.getList")
+        {
+          if(!isset($_REQUEST['filter'])) $_REQUEST['filter']="accessible";
+
+          if(!($_REQUEST['filter']=="public" or
+               $_REQUEST['filter']=="accessible" or
+               $_REQUEST['filter']=="all")
+            ) $_REQUEST['filter']="accessible";
+
+          if(!isset($_REQUEST['galleryRoot'])) $_REQUEST['galleryRoot']="y";
+
+          if(!($_REQUEST['galleryRoot']=="y" or
+               $_REQUEST['galleryRoot']=="n")
+            ) $_REQUEST['galleryRoot']="y";
+
+          if(!isset($_REQUEST['tree'])) $_REQUEST['tree']="n";
+
+          if(!($_REQUEST['tree']=="y" or
+               $_REQUEST['tree']=="n")
+            ) $_REQUEST['tree']="n";
+        }
+
+
       }
-    }
+    } //checkRequest()
 
 
@@ -102 +137 @@
         case 'admin.rbuilder.fillCaddie':
           $result=$this->ajax_gpc_admin_rbuilderFillCaddie($_REQUEST['fillMode'], $_REQUEST['requestNumber']);
+          break;
+        case 'admin.categorySelector.getList':
+          $result=$this->ajax_gpc_admin_CategorySelectorGetList($_REQUEST['filter'], $_REQUEST['galleryRoot'], $_REQUEST['tree']);
+          break;
+        case 'public.categorySelector.getList':
+          $result=$this->ajax_gpc_public_CategorySelectorGetList($_REQUEST['filter'], $_REQUEST['galleryRoot'], $_REQUEST['tree']);
           break;
       }
@@ -141 +182 @@
     }
 
+
+
+    /**
+     * return the list of all categories
+     *
+     * @param String $filter : 'public' or 'accessible' or 'all'
+     * @param String $galleryRoot : 'y' if the gallery root is in the list
+     * @param String $tree : 'y' to obtain a recursive array, 'n' to obtain a flat array
+     * @return String : json string
+     */
+    private function ajax_gpc_admin_CategorySelectorGetList($filter, $galleryRoot, $tree)
+    {
+      global $user;
+
+      include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCCategorySelector.class.inc.php');
+
+      $categorySelector=new GPCCategorySelector(
+        array(
+          'filter' => $filter,
+          'galleryRoot' => ($galleryRoot=='y')?true:false,
+          'tree' => ($tree=='y')?true:false,
+          'userMode' => 'admin'
+        )
+      );
+
+      $returned=array(
+        'userId' => $user['id'],
+        'nbCategories' => 0,
+        'categories' => $categorySelector->getCategoryList(),
+        'status' => array(
+          0=>l10n('Private'),
+          1=>l10n('Public')
+        )
+      );
+      $returned['nbCategories']=count($returned['categories']);
+
+      return(json_encode($returned));
+    } //ajax_gpc_admin_CategorySelectorGetList
+
+
+    /**
+     * return the list of all categories
+     *
+     * @param String $filter : 'public' or 'accessible' or 'all'
+     * @param String $galleryRoot : 'y' if the gallery root is in the list
+     * @param String $tree : 'y' to obtain a recursive array, 'n' to obtain a flat array
+     * @param String $userMode : 'public' or 'admin'
+     * @return String : json string
+     */
+    private function ajax_gpc_public_CategorySelectorGetList($filter, $galleryRoot, $tree)
+    {
+      global $user;
+
+      include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/GPCCategorySelector.class.inc.php');
+
+      $categorySelector=new GPCCategorySelector(
+        array(
+          'filter' => $filter,
+          'galleryRoot' => ($galleryRoot=='y')?true:false,
+          'tree' => ($tree=='y')?true:false,
+          'userMode' => 'public'
+        )
+      );
+
+      $returned=array(
+        'userId' => $user['id'],
+        'nbCategories' => 0,
+        'categories' => $categorySelector->getCategoryList(),
+        'status' => array(
+          0=>l10n('Private'),
+          1=>l10n('Public')
+        )
+      );
+      $returned['nbCategories']=count($returned['categories']);
+
+      return(json_encode($returned));
+    } //ajax_gpc_public_CategorySelectorGetList
+
+
+
   } //class
 

extensions/GrumPluginClasses/js/criteriaBuilder.js

@@ -69 +69 @@
 {
   var itemsId = {
-    group:'iCbGroup',
-    item:'iCbItem',
-    container:container,
-  }
-
-  var counters = {
-    group:0,
-    item:0,
-  }
-
-  var options = {
-      textAND:'AND',
-      textOR:'OR',
-      textHint:'',
-      classGroup:'',
-      classItem:'',
-      classOperator:'',
-      classHelper:'helper',
-      opacity:0.8,
-      onEdit:null,
-      onDelete:null,
-      onRequestSuccess:null,
-      onRequestError:null,
-      onGetPageSuccess:null,
-      onGetPageError:null,
-      imgEditUrl:'',
-      imgDeleteUrl:'',
-      ajaxUrl:'',
-    };
-
-  var extraData = new Array();
+          group:'iCbGroup',
+          item:'iCbItem',
+          container:container,
+        },
+      counters = {
+          group:0,
+          item:0,
+        },
+      options = {
+          textAND:'AND',
+          textOR:'OR',
+          textHint:'',
+          classGroup:'',
+          classItem:'',
+          classOperator:'',
+          classHelper:'helper',
+          opacity:0.8,
+          onEdit:null,
+          onDelete:null,
+          onRequestSuccess:null,
+          onRequestError:null,
+          onGetPageSuccess:null,
+          onGetPageError:null,
+          imgEditUrl:'',
+          imgDeleteUrl:'',
+          ajaxUrl:'',
+        },
+      extraData = new Array();
 
   if(arguments.length==2)
@@ -213 +210 @@
         break;
     }
-  }
+  };
 
   /**
@@ -243 +240 @@
 
     applyNested();
-  }
+  };
 
   /**
@@ -253 +250 @@
   {
     $('#'+groupId).remove();
-  }
+  };
 
   /**
@@ -292 +289 @@
 
     extraData[counters.item]=data;
-  }
+  };
 
   /**
@@ -309 +306 @@
       manage();
     }
-  }
+  };
 
   /**
@@ -327 +324 @@
       extraData[eval(re.exec(itemId)[0])]=data;
     }
-  }
+  };
 
   /**
@@ -339 +336 @@
     counters.group=0;
     extraData=new Array();
-  }
+  };
 
   /**
@@ -370 +367 @@
     }
     return(returned);
-  }
+  };
 
 
@@ -410 +407 @@
 
     return(serialized);
-  }
+  };
 
 
@@ -423 +420 @@
 
     return(extraData[extraDataNumber]);
-  }
+  };
 
 
@@ -433 +430 @@
   {
     options = jQuery.extend(options, optionsToSet);
-  }
+  };
 
   /**
@@ -465 +462 @@
       }
     }
-  }
+  };
 
   /**
@@ -505 +502 @@
       }
     );
-  }
+  };
 
   /**
@@ -531 +528 @@
       }
     );
-  }
+  };
 
   /**
@@ -554 +551 @@
       $('#'+groupId+'OpOR').css('display', 'none');
     }
-  }
+  };
 
   /**
@@ -580 +577 @@
      );
 
-  }
+  };
 
   /**
@@ -606 +603 @@
      );
 
-  }
+  };
 
   applyNested();

extensions/GrumPluginClasses/js/pagesNavigator.js

@@ -56 +56 @@
 {
   var itemsId = {
-    first:'iNavFirst',
-    last:'iNavLast',
-    previous:'iNavPrevious',
-    next:'iNavNext',
-    pageNumber:'iNavPage',
-    morePrevious:'iNavPrevMore',
-    moreNext:'iNavNextMore',
-    container:container,
-  };
-
-  var pages = {
-    num:0,
-    current:1,
-  }
-
-  var options = {
-    numberItem:0,
-    itemPerPage:25,
-    defaultPage:0,
-    displayNumPage:7,
-    displayFirst:true,
-    displayLast:true,
-    displayPrevious:true,
-    displayNext:true,
-    hideMode:'1,<', // "1": hide nav if only 1 page to display, "<": hide nav First, Previous, Next & Last if num of page < displayNumPage
-    textFirst:'&lt;&lt;',
-    textLast:'&gt;&gt;',
-    textPrevious:'&lt;',
-    textNext:'&gt;',
-    textMore:'...',
-    onPageChange:null,
-    classActive:'',
-    classInactive:'',
-    classDisabled:'',
-  };
+          first:'iNavFirst',
+          last:'iNavLast',
+          previous:'iNavPrevious',
+          next:'iNavNext',
+          pageNumber:'iNavPage',
+          morePrevious:'iNavPrevMore',
+          moreNext:'iNavNextMore',
+          container:container,
+        },
+      pages = {
+          num:0,
+          current:1,
+        },
+      options = {
+        numberItem:0,
+        itemPerPage:25,
+        defaultPage:0,
+        displayNumPage:7,
+        displayFirst:true,
+        displayLast:true,
+        displayPrevious:true,
+        displayNext:true,
+        hideMode:'1,<', // "1": hide nav if only 1 page to display, "<": hide nav First, Previous, Next & Last if num of page < displayNumPage
+        textFirst:'&lt;&lt;',
+        textLast:'&gt;&gt;',
+        textPrevious:'&lt;',
+        textNext:'&gt;',
+        textMore:'...',
+        onPageChange:null,
+        classActive:'',
+        classInactive:'',
+        classDisabled:'',
+      };
 
 
@@ -110 +108 @@
         break;
     }
-  }
+  };
 
   /**
@@ -122 +120 @@
   {
     return(Math.ceil(numItems/numPerPage));
-  }
+  };
 
   /**
@@ -143 +141 @@
       build();
     }
-  }
+  };
 
   /**
@@ -195 +193 @@
 
     $('#'+itemsId.container).css('visibility', 'visible');
-  }
+  };
 
 
@@ -206 +204 @@
       prev=pages.current-1;
     }
-    next=options.displayNumPage-1-prev
+    next=options.displayNumPage-1-prev;
+
     if(pages.current+next>=pages.num)
     {
@@ -283 +282 @@
     );
 
-  }
+  };
 
 
@@ -325 +324 @@
     displayNav();
     if(options.onPageChange!=null && jQuery.isFunction(options.onPageChange)) options.onPageChange(pages.current);
-  }
+  };
 
   if(arguments.length==2)

extensions/GrumPluginClasses/js/simpleTip.js

@@ -81 +81 @@
 function simpleTip()
 {
-  var items = new Array();
-  var itemIndexInc = 0;
-  var options={
-    name:'',
-  }
+  var items = new Array(),
+      itemIndexInc = 0,
+      options={
+          name:'',
+        };
 
   if(arguments.length>=1)
@@ -134 +134 @@
         break;
     }
-  }
+  };
 
   var add = function (item, options)
@@ -169 +169 @@
     }
 
-  }
+  };
 
 
@@ -191 +191 @@
       items.splice(index,1);
     }
-  }
+  };
 
 
@@ -216 +216 @@
     }
     itemIndexInc=0;
-  }
+  };
 
 
@@ -228 +228 @@
     }
     return(-1);
-  }
+  };
 
   /**
@@ -255 +255 @@
           display: 'block',
         }
-      )
+      );
 
     switch(items[itemIndex].options.targetPos)
@@ -415 +415 @@
       .addClass(items[itemIndex].options.classes);
 
-  }
+  };
 
   var show = function ()
   {
     $('#iSimpleTip'+options.name).css('display', 'block');
-  }
+  };
 
   var hide = function ()
   {
     $('#iSimpleTip'+options.name).css('display', 'none');
-  }
+  };
 
 
@@ -435 +435 @@
       $('body').append(text);
     }
-  }
+  };
 
 

extensions/GrumPluginClasses/js/ui.iconSelector.js

@@ -128 +128 @@
               if(opt) $.extend(options, opt);
 
-              if(!data)
-              {
-                $this.data('options', options);
-                options.initialized=false;
-              }
+              $this.data('options', options);
 
               if(!properties)
@@ -239 +235 @@
           {
             // set images list values
-            this.each(function()
-              {
-                var $this=$(this);
-                privateMethods.setImages($this, list);
-                return($this);
+            return this.each(function()
+              {
+                privateMethods.setImages($(this), list);
               }
             );
@@ -250 +244 @@
           {
             // return images list values
-            var data = this.data('options');
-
-            if(data)
-            {
-              return(data.images);
+            var options = this.data('options');
+
+            if(options)
+            {
+              return(options.images);
             }
             else
@@ -267 +261 @@
           {
             // set numCols values
-            this.each(function()
-              {
-                var $this=$(this);
-                privateMethods.setCols($this, value);
-                return($this);
+            return this.each(function()
+              {
+                privateMethods.setCols($(this), value);
               }
             );
@@ -278 +270 @@
           {
             // return images list values
-            var data = this.data('options');
-
-            if(data)
-            {
-              return(data.numCols);
+            var options = this.data('options');
+
+            if(options)
+            {
+              return(options.numCols);
             }
             else
@@ -295 +287 @@
           {
             // set numRows values
-            this.each(function()
-              {
-                var $this=$(this);
-                privateMethods.setRows($this, value);
-                return($this);
+            return this.each(function()
+              {
+                privateMethods.setRows($(this), value);
               }
             );
@@ -306 +296 @@
           {
             // return images list values
-            var data = this.data('options');
-
-            if(data)
-            {
-              return(data.numRows);
+            var options = this.data('options');
+
+            if(options)
+            {
+              return(options.numRows);
             }
             else
@@ -323 +313 @@
           {
             // set cell width values
-            this.each(function()
-              {
-                var $this=$(this);
-                privateMethods.setCellWidth($this, value);
-                return($this);
+            return this.each(function()
+              {
+                privateMethods.setCellWidth($(this), value);
               }
             );
@@ -334 +322 @@
           {
             // return images list values
-            var data = this.data('options');
-
-            if(data)
-            {
-              return(data.cellWidth);
+            var options = this.data('options');
+
+            if(options)
+            {
+              return(options.cellWidth);
             }
             else
@@ -351 +339 @@
           {
             // set cell width values
-            this.each(function()
-              {
-                var $this=$(this);
-                privateMethods.setCellHeight($this, value);
-                return($this);
+            return this.each(function()
+              {
+                privateMethods.setCellHeight($(this), value);
               }
             );
@@ -362 +348 @@
           {
             // return images list values
-            var data = this.data('options');
-
-            if(data)
-            {
-              return(data.cellHeight);
+            var options = this.data('options');
+
+            if(options)
+            {
+              return(options.cellHeight);
             }
             else
@@ -379 +365 @@
           {
             // set selected value
-            this.each(function()
-              {
-                var $this=$(this);
-                privateMethods.setValue($this, value);
-                return($this);
+            return this.each(function()
+              {
+                privateMethods.setValue($(this), value);
               }
             );
@@ -390 +374 @@
           {
             // return the selected value
-            var data=this.data('options'),
+            var options=this.data('options'),
                 properties=this.data('properties');
 
-            if(data && properties && properties.index>-1)
-            {
-              return(data.images[properties.index]);
+            if(options && properties && properties.index>-1 && properties.index<options.images.length)
+            {
+              return(options.images[properties.index]);
             }
             else
@@ -408 +392 @@
           {
             // set selected value
-            this.each(function()
-              {
-                var $this=$(this);
-                privateMethods.setEventPopup($this, value);
-                return($this);
+            return this.each(function()
+              {
+                privateMethods.setEventPopup($(this), value);
               }
             );
@@ -419 +401 @@
           {
             // return the selected value
-            var data=this.data('options');
-
-            if(data)
-            {
-              return(data.popup);
+            var options=this.data('options');
+
+            if(options)
+            {
+              return(options.popup);
             }
             else
@@ -436 +418 @@
           {
             // set selected value
-            this.each(function()
-              {
-                var $this=$(this);
-                privateMethods.setEventChange($this, value);
-                return($this);
+            return this.each(function()
+              {
+                privateMethods.setEventChange($(this), value);
               }
             );
@@ -447 +427 @@
           {
             // return the selected value
-            var data=this.data('options');
-
-            if(data)
-            {
-              return(data.change);
+            var options=this.data('options');
+
+            if(options)
+            {
+              return(options.change);
             }
             else
@@ -458 +438 @@
             }
           }
-        }, // popup
-
-    } // methods
+        } // popup
+
+    }; // methods
 
 
@@ -470 +450 @@
       updateListArea : function (object)
         {
-          var data=object.data('options'),
+          var options=object.data('options'),
               objects=object.data('objects'),
               icon=objects.list.children().first(),
-              width=icon.outerWidth()*data.numCols,
-              height=icon.outerHeight()*data.numRows;
+              width=icon.outerWidth()*options.numCols,
+              height=icon.outerHeight()*options.numRows;
 
           objects.listContainer.css(
@@ -492 +472 @@
       setImages : function (object, value)
         {
-          var data=object.data('options'),
+          var options=object.data('options'),
               objects=object.data('objects'),
               properties=object.data('properties');
-          data.images=value;
+          options.images=value;
 
           objects.list.children().unbind();
           objects.list.html('');
-          for(var i=0;i<data.images.length;i++)
+          for(var i=0;i<options.images.length;i++)
           {
             liClass=' ui-icon-selector-icon ';
@@ -507 +487 @@
             }
             objects.list.append(
-              $('<li indexValue="'+i+'" class="'+liClass+'" style="display:inline-block;width:'+data.cellWidth+'px;height:'+data.cellHeight+'px;background-image:url('+data.images[i]+');"></li>')
+              $('<li indexValue="'+i+'" class="'+liClass+'" style="display:inline-block;width:'+options.cellWidth+'px;height:'+options.cellHeight+'px;background-image:url('+options.images[i]+');"></li>')
                 .bind('click',
                   {object:object},
@@ -519 +499 @@
           }
 
-          return(data.images);
+          return(options.images);
         },
       setNumCols : function (object, value)
         {
-          var data=object.data('options'),
+          var options=object.data('options'),
               properties=object.data('properties');
-          if((!properties.initialized || data.numCols!=value) && value>0)
-          {
-            data.numCols=value;
-          }
-          return(data.numCols);
+          if((!properties.initialized || options.numCols!=value) && value>0)
+          {
+            options.numCols=value;
+          }
+          return(options.numCols);
         },
       setNumRows : function (object, value)
         {
-          var data=object.data('options'),
+          var options=object.data('options'),
               properties=object.data('properties');
-          if((!properties.initialized || data.numRows!=value) && value>0)
-          {
-            data.numRows=value;
-          }
-          return(data.numRows);
+          if((!properties.initialized || options.numRows!=value) && value>0)
+          {
+            options.numRows=value;
+          }
+          return(options.numRows);
         },
       setCellWidth : function (object, value)
         {
-          var data=object.data('options'),
+          var options=object.data('options'),
               properties=object.data('properties'),
               objects=object.data('objects');
-          if((!properties.initialized || data.cellWidth!=value) && value>=0)
-          {
-            data.cellWidth=value;
+          if((!properties.initialized || options.cellWidth!=value) && value>=0)
+          {
+            options.cellWidth=value;
             objects.container.css('width', value+'px');
           }
-          return(data.cellWidth);
+          return(options.cellWidth);
         },
       setCellHeight : function (object, value)
         {
-          var data=object.data('options'),
+          var options=object.data('options'),
               properties=object.data('properties'),
               objects=object.data('objects');
-          if((!properties.initialized || data.cellHeight!=value) && value>=0)
-          {
-            data.cellHeight=value;
+          if((!properties.initialized || options.cellHeight!=value) && value>=0)
+          {
+            options.cellHeight=value;
             objects.container.css('height', value+'px');
           }
-          return(data.cellHeight);
+          return(options.cellHeight);
         },
       setValue : function (object, value)
         {
-          var data=object.data('options'),
+          var options=object.data('options'),
               properties=object.data('properties'),
               index=-1;
@@ -574 +554 @@
           {
             case ':first':
-              if(data.images.length>0) index=0;
+              if(options.images.length>0) index=0;
               break;
             case ':last':
-              index=data.images.length-1;
+              index=options.images.length-1;
               break;
             default:
-              index=$.inArray(value, data.images);
+              index=$.inArray(value, options.images);
               break;
           }
@@ -588 +568 @@
             privateMethods.setValueByIndex(object, index, false);
           }
-          return(data.images[properties.index]);
+          return(options.images[properties.index]);
         },
       setValueByIndex : function (object, value, trigger)
         {
-          var data=object.data('options'),
+          var options=object.data('options'),
               properties=object.data('properties'),
               objects=object.data('objects');
-          if((!properties.initialized || properties.index!=value) && value>-1 && value<data.images.length)
+          if((!properties.initialized || properties.index!=value) && value>-1 && value<options.images.length)
           {
             objects.list.children('.ui-icon-selector-selected-icon').removeClass('ui-icon-selector-selected-icon');
             objects.list.children('[indexValue="'+value+'"]').addClass('ui-icon-selector-selected-icon');
             properties.index=value;
-            objects.container.css('background-image', 'url('+data.images[properties.index]+')');
-            if(trigger && data.change) object.trigger('iconSelectorChange', [properties.index]);
-          }
-          return(data.images[properties.index]);
+            objects.container.css('background-image', 'url('+options.images[properties.index]+')');
+            if(trigger && options.change) object.trigger('iconSelectorChange', [properties.index]);
+          }
+          return(options.images[properties.index]);
         },
       displaySelector : function (object, value)
         {
-          var data=object.data('options'),
+          var options=object.data('options'),
               properties=object.data('properties'),
               objects=object.data('objects');
@@ -625 +605 @@
               objects.listContainer.css('display', 'none');
             }
-            if(data.popup) object.trigger('iconSelectorPopup', [properties.selectorVisible]);
+            if(options.popup) object.trigger('iconSelectorPopup', [properties.selectorVisible]);
           }
           return(properties.selectorVisible);
@@ -631 +611 @@
       setEventPopup : function (object, value)
         {
-          var data=object.data('options');
-          data.popup=value;
+          var options=object.data('options');
+          options.popup=value;
           object.unbind('iconSelectorPopup');
-          if(value) object.bind('iconSelectorPopup', data.popup);
-          return(data.popup);
+          if(value) object.bind('iconSelectorPopup', options.popup);
+          return(options.popup);
         },
       setEventChange : function (object, value)
         {
-          var data=object.data('options');
-          data.change=value;
+          var options=object.data('options');
+          options.change=value;
           object.unbind('iconSelectorChange');
-          if(value) object.bind('iconSelectorChange', data.change);
-          return(data.change);
+          if(value) object.bind('iconSelectorChange', options.change);
+          return(options.change);
         }
-    }
+    };
 
 

extensions/GrumPluginClasses/language/fr_FR/plugin.lang.php

@@ -10 +10 @@
 $lang['Infos'] = 'Informations';
 $lang['Some plugins are dependent on Grum Plugin Classes: before uninstall, you must first uninstall the plugins dependent'] = 'Certains plugins sont dépendants de Grum Plugin Classes : avant le désinstaller, il faut au préalable désinstaller les plugins dépendants';
+
+// gpc > 3.3.0
+$lang['Public'] = 'Publique';
+$lang['Private'] = 'Privée';
+$lang['All the gallery'] = 'Toute la galerie';
+
 ?>

extensions/GrumPluginClasses/main.inc.php

@@ -1 +1 @@
 <?php
 /*
-Plugin Name: Grum Plugins Classes.3
-Version: 3.2.1
-Description: Collection de classes partagées entre mes plugins (existants, ou à venir) / Partaged classes between my plugins (actuals or futures)
-Plugin URI: http://piwigo.org/ext/extension_view.php?eid=199
+Plugin Name: GMaps
+Version: 0.2.0
+Description: Display and manage (google) maps
+Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=
 Author: grum@piwigo.org
-Author URI: http://photos.grum.fr/
+Author URI: http://photos.grum.fr
 */
 
@@ -12 +12 @@
 --------------------------------------------------------------------------------
   Author     : Grum
-    email    : grum@piwigo.org
+    email    : grum@piwigo.com
     website  : http://photos.grum.fr
+    PWG user : http://forum.phpwebgallery.net/profile.php?id=3706
 
     << May the Little SpaceFrog be with you ! >>
@@ -21 +22 @@
 
 | release | date       |
-| 2.0.0   | 2008/07/20 | * convert classes for piwigo 2.0
+| 0.1.0   | 2010-08-22 | * first lines of code
+|         |            |   . release not published
 |         |            |
-| 2.0.1   | 2008/12/28 | * convert classe tables.class.inc to php5
+| 0.2.0   | 2010-09-30 | * first official release
 |         |            |
-| 2.0.2   | 2009/04/26 | * add setOptions/getOptions for GPCPagesNavigation class
-|         |            | * add option to set first/prev/next/last textes
 |         |            |
-| 2.0.3   | 2009/07/24 | * modify common_plugin class config loader (r2.0.1)
 |         |            |
-| 2.0.4   | 2009/11/29 | * modify users class
 |         |            |
-| 3.0.0   | 2010/03/28 | * Uses piwigo pwg_db_* functions instead of mysql_* functions
-|         |            | * update classes & functions names
-|         |            | * include the JpegMetaData class
 |         |            |
-| 3.0.1   | 2010/04/11 | * little bug on the template (call of an undefined var)
-|         |            | * Add new languages
-|         |            |   . es_ES
-|         |            |   . hu_HU
-|         |            |   . it_IT
 |         |            |
-| 3.1.0   | 2010/04/24 | * add the GPCTabSheet class
-|         |            | * add the GPCRequestBuilder class
-|         |            | * add the pageNavigator.js
-|         |            | * update the GPCCore class
-|         |            | * Add new languages
-|         |            |   . nl_NL
-|         |            |   . de_DE
-|         |            |
-| 3.1.1   | 2010/05/18 | * fix bug in the install process (CommonPlugin not
-|         |            |   included)
-|         |            |
-| 3.2.0   | 2010/09/12 | * Enhance GPCTabSheet functionnalities
-|         |            |   - possibility to choose tab classes
-|         |            | * Add the simpleTip.js
-|         |            | * Enhance GPCRequestBuilder functionnalities
-|         |            |   - now abble to manage complex request with multi-record
-|         |            |   - result can be stored in the caddie
-|         |            |
-| 3.2.1   | 2010/10/09 | * Enhance GPCTabSheet functionnalities
-|         |            |   - add 'id' attribute for tabs (<li> items)
-|         |            |
-|         |            | * Fix JS & CSS bug with IE8
-|         |            |
-| 3.2.2   | 2010/mm/dd | *
-|         |            |
-|         |            | ===== Don't forget to update the plugin version ! =====
 |         |            |
 |         |            |
@@ -82 +46 @@
 :: TO DO
 
-:: WHAT ? WHY ?
-This plugin doesn't do anything itself. It just provide classes for others plugins.
+--------------------------------------------------------------------------------
 
-Classes version for this package
-    CommonPlugin.class.php
-    GPCAjax.class.php
-    GPCCss.class.php
-    GPCPagesNavigation.class.php
-    GPCPublicIntegration.class.php
-    GPCTables.class.php -v1.5
-    GPCTranslate.class.inc.php + google_translate.js
-    GPCUsersGroups.class.inc.php
-    GPCTabSheet.class.inc.php
+:: NFO
+  GMaps_root : common classe for admin and public classes
+  GMaps_AIM  : classe to manage plugin integration into plugin menu
+  GMaps_AIP  : classe to manage plugin admin pages
+  GMaps_PIP  : classe to manage plugin public pages
 
-    genericjs.class.inc.php  + genericjs.js
-
-See each file to know more about them
 --------------------------------------------------------------------------------
 */
 
+// pour faciliter le debug :o)
+ //ini_set('error_reporting', E_ALL);
+ //ini_set('display_errors', true);
+
 if(!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-define('GPC_DIR' , basename(dirname(__FILE__)));
-define('GPC_PATH' , PHPWG_PLUGINS_PATH . GPC_DIR . '/');
 
-include_once('gpc_version.inc.php'); // => Don't forget to update this file !!
-include_once(GPC_PATH.'classes/GPCCore.class.inc.php');
+define('GMAPS_DIR' , basename(dirname(__FILE__)));
+define('GMAPS_PATH' , PHPWG_PLUGINS_PATH . GMAPS_DIR . '/');
+
+include_once(PHPWG_PLUGINS_PATH.'GrumPluginClasses/classes/CommonPlugin.class.inc.php');
+include_once('gmaps_version.inc.php'); // => Don't forget to update this file !!
 
 global $prefixeTable;
 
-
-
-$config=Array();
-GPCCore::loadConfig('gpc', $config);
-
-if(!isset($config['installed'])) $config['installed']='03.01.00';
-if($config['installed']!=GPC_VERSION2)
+if(defined('IN_ADMIN'))
 {
-  /* the plugin was updated without being deactivated
-   * deactivate + activate the plugin to process the database upgrade
-   */
-  include(GPC_PATH."gpc_install.class.inc.php");
-  $gpc=new GPC_Install($prefixeTable, __FILE__);
-  $gpc->deactivate();
-  $gpc->activate();
+  //GMaps admin interface loaded and active only if in admin page
+  include_once("gmaps_aim.class.inc.php");
+  $obj=new GMaps_AIM($prefixeTable, __FILE__);
+  $obj->initEvents();
+}
+else
+{
+  if(CommonPlugin::checkGPCRelease(GMAPS_GPC_NEEDED))
+  {
+    //GMaps public interface loaded and active only if in public page
+    include_once("gmaps_pip.class.inc.php");
+    $obj=new GMaps_PIP($prefixeTable, __FILE__);
+  }
 }
 
-
-if(defined('IN_ADMIN'))
-{
-  //GPC admin interface is loaded and active only if in admin page
-  include_once("gpc_aim.class.inc.php");
-
-  $obj = new GPC_AIM($prefixeTable, __FILE__);
-  $obj->initEvents();
-  set_plugin_data($plugin['id'], $obj);
-}
+set_plugin_data($plugin['id'], $obj);
 
 ?>

extensions/GrumPluginClasses/templates/GPCRequestBuilder_search.tpl

@@ -3 +3 @@
 {known_script id="jquery.tipTip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.tipTip.minified.js"}
 
-{known_script id="gpc.pagesNavigator" src=$ROOT_URL|@cat:"plugins/GrumPluginClasses/js/pagesNavigator.js"}
+{known_script id="gpc.pagesNavigator" src=$ROOT_URL|@cat:"plugins/GrumPluginClasses/js/pagesNavigator.packed.js"}