Changeset 7349 for extensions

Timestamp:

Oct 22, 2010, 10:07:46 PM (14 years ago)

Author:

grum

Message:

add the ui.tagSelector.js jQuery plugin

Location:

extensions/GrumPluginClasses

Files:

• css/categorySelector_clear.css (modified) (1 diff)
• css/tagSelector_clear.css (added)
• css/tagSelector_roma.css (added)
• gpc_ajax.php (modified) (6 diffs)
• icons/expand_collapse_checked.xcf (modified) (previous)
• js/ui.tagSelector.js (added)
• js/ui.tagSelector.packed.js (added)
• main.inc.php (modified) (1 diff)
• templates/GPCRequestBuilder_search.tpl (modified) (1 diff)

extensions/GrumPluginClasses/css/categorySelector_clear.css

@@ -54 +54 @@
 
 li.ui-category-selector-item:hover {
-  background-color:#999999;
+  background-color:#AAAAAA;
+  color:#DDDDDD;
 }
 
 .ui-category-selector-selected-item {
-  background-color:#AAAAAA;
+  background-color:#999999;
+  color:#DDDDDD;
 }
 

extensions/GrumPluginClasses/gpc_ajax.php

@@ -20 +20 @@
  *  - admin.rbuilder.fillCaddie
  *  - admin.categorySelector.getList
+ *  - public.categorySelector.getList
+ *  - public.rbuilder.searchExecute
+ *  - public.rbuilder.searchGetPage
+ *  - public.tagSelector.get
+ *  - admin.tagSelector.get
+ *
  *
  * -----------------------------------------------------------------------------
@@ -80 +86 @@
            $_REQUEST['ajaxfct']=='public.rbuilder.searchGetPage' or
            $_REQUEST['ajaxfct']=='admin.categorySelector.getList' or
-           $_REQUEST['ajaxfct']=='public.categorySelector.getList'
+           $_REQUEST['ajaxfct']=='public.categorySelector.getList' or
+           $_REQUEST['ajaxfct']=='public.tagSelector.get' or
+           $_REQUEST['ajaxfct']=='admin.tagSelector.get'
           )
         ) $_REQUEST['ajaxfct']='';
@@ -127 +135 @@
 
         /*
-         * check admin.categorySelector.getList values
+         * check admin.tagSelector.get values
+         */
+        if($_REQUEST['ajaxfct']=="admin.tagSelector.get" or
+           $_REQUEST['ajaxfct']=="public.tagSelector.get")
+        {
+          if(!isset($_REQUEST['letters'])) $_REQUEST['ajaxfct']="";
+          if(!isset($_REQUEST['filter'])) $_REQUEST['filter']="affected";
+
+          if(!($_REQUEST['filter']=="affected" or
+               $_REQUEST['filter']=="all")
+            ) $_REQUEST['filter']="affected";
+
+          if(!isset($_REQUEST['maxTags'])) $_REQUEST['maxTags']=1000;
+          if($_REQUEST['maxTags']<0) $_REQUEST['maxTags']=0;
+
+          if(!isset($_REQUEST['ignoreCase'])) $_REQUEST['ignoreCase']=true;
+
+        }
+
+
+        /*
+         * check public.categorySelector.getList values
          */
         if($_REQUEST['ajaxfct']=="admin.categorySelector.getList" or
@@ -152 +181 @@
         }
 
-
       }
     } //checkRequest()
@@ -179 +207 @@
         case 'public.categorySelector.getList':
           $result=$this->ajax_gpc_public_CategorySelectorGetList($_REQUEST['filter'], $_REQUEST['galleryRoot'], $_REQUEST['tree']);
+          break;
+        case 'admin.tagSelector.get':
+          $result=$this->ajax_gpc_both_TagSelectorGet('admin', $_REQUEST['letters'], $_REQUEST['filter'], $_REQUEST['maxTags'], $_REQUEST['ignoreCase']);
+          break;
+        case 'public.tagSelector.get':
+          $result=$this->ajax_gpc_both_TagSelectorGet('public', $_REQUEST['letters'], $_REQUEST['filter'], $_REQUEST['maxTags'], $_REQUEST['ignoreCase']);
           break;
       }
@@ -322 +356 @@
 
 
+
+    /**
+     * return the list of all known tags
+     *
+     * @param Striong $mode : 'admin' or 'public'
+     * @param String $letters : filtering on letters
+     * @param String $filter : 'accessible' or 'all'
+     * @param Integer $maxTags : maximum of items returned ; 0 = no limits
+     * @return String : json string
+     */
+    private function ajax_gpc_both_TagSelectorGet($mode, $letters, $filter, $maxTags, $ignoreCase)
+    {
+      global $user;
+
+      $returned=array(
+        'totalNbTags' => 0,
+        'tags' => array(),
+      );
+
+      $binary='';
+      if(!$ignoreCase) $binary=" BINARY ";
+
+
+      $sql="SELECT DISTINCT SQL_CALC_FOUND_ROWS ptt.id, ptt.name
+            FROM ((".TAGS_TABLE." ptt ";
+
+      if($filter=='affected')
+      {
+        $sql.=" JOIN ".IMAGE_TAG_TABLE." pitt
+                ON pitt.tag_id = ptt.id ) ";
+      }
+      else
+      {
+        $sql.=" ) ";
+      }
+
+
+      if($mode=='public' and $filter=='affected')
+      {
+        $sql.=" JOIN ".IMAGE_CATEGORY_TABLE." pict
+                ON pict.image_id = pitt.image_id )
+                JOIN ".USER_CACHE_CATEGORIES_TABLE." pucc
+                ON (pucc.cat_id = pict.category_id AND pucc.user_id='".$user['id']."' )";
+      }
+      else
+      {
+        $sql.=" ) ";
+      }
+
+      $sql.=" WHERE ptt.name LIKE $binary '%$letters%'
+            ORDER BY ptt.name ";
+
+      if($maxTags>0) $sql.=" LIMIT 0, ".$maxTags;
+
+      $result=pwg_query($sql);
+      if($result)
+      {
+        while($row=pwg_db_fetch_assoc($result))
+        {
+          $returned['tags'][]=$row;
+        }
+
+        $sql="SELECT FOUND_ROWS();";
+        $result=pwg_query($sql);
+        if($result)
+        {
+          while($row=pwg_db_fetch_row($result))
+          {
+            $returned['totalNbTags']=$row[0];
+          }
+        }
+      }
+
+      return(json_encode($returned));
+    } //ajax_gpc_both_TagSelectorGet
+
+
   } //class
 
 
   $returned=new GPC_Ajax($prefixeTable, __FILE__);
+
+
+
+
+
 ?>

extensions/GrumPluginClasses/main.inc.php

@@ -85 +85 @@
 |         |            |   and templates
 |         |            |
+|         |            | * Add the jQuery plugins
+|         |            |   . ui.tagSelector.js + ui.tagSelector.packed.js
+|         |            |
+|         |            |
+|         |            |
 |         |            |
 |         |            | ===== Don't forget to update the plugin version ! =====

extensions/GrumPluginClasses/templates/GPCRequestBuilder_search.tpl

@@ -376 +376 @@
   {/foreach}
 
+  $('.ui-dialog').css('overflow', 'visible');
+
   init();
 </script>