Changeset 10970

Timestamp:

May 21, 2011, 2:25:26 AM (13 years ago)

Author:

mistic100

Message:

remplace FCBKcomplete by TokenInput

Location:

trunk

Files:

• admin/include/functions.php (modified) (2 diffs)
• admin/themes/default/template/batch_manager_global.tpl (modified) (1 diff)
• admin/themes/default/template/batch_manager_unit.tpl (modified) (3 diffs)
• admin/themes/default/template/picture_modify.tpl (modified) (2 diffs)
• admin/themes/default/theme.css (modified) (2 diffs)
• language/en_UK/admin.lang.php (modified) (3 diffs)
• language/fr_FR/admin.lang.php (modified) (1 diff)
• picture.php (modified) (1 diff)
• themes/default/js/plugins/jquery.fcbkcomplete.js (deleted)
• themes/default/js/plugins/jquery.tokeninput.js (added)

trunk/admin/include/functions.php

@@ -2107 +2107 @@
       $taglist,
       array(
-        'key' => $row['tag_name'],
-        'value' => '~~'.$row['tag_id'].'~~',
+        'name' => $row['tag_name'],
+        'id' => '~~'.$row['tag_id'].'~~',
         )
       );
@@ -2124 +2124 @@
 
   $tag_ids = array();
+  $raw_tags = explode(',',$raw_tags);
 
   foreach ($raw_tags as $raw_tag)

trunk/admin/themes/default/template/batch_manager_global.tpl

@@ -6 +6 @@
 {/literal}{/footer_script}
 
-{combine_script id='jquery.fcbkcomplete' load='footer' require='jquery' path='themes/default/js/plugins/jquery.fcbkcomplete.js'}
+{combine_script id='jquery.tokeninput' load='footer' require='jquery' path='themes/default/js/plugins/jquery.tokeninput.js'}
 {combine_script id='jquery.progressBar' load='footer' path='themes/default/js/plugins/jquery.progressbar.min.js'}
 {combine_script id='jquery.ajaxmanager' load='footer' path='themes/default/js/plugins/jquery.ajaxmanager.js'}
 
-{footer_script require='jquery.fcbkcomplete'}{literal}
+{footer_script require='jquery.tokeninput'}{literal}
 jQuery(document).ready(function() {
-  jQuery("#tags").fcbkcomplete({
-    json_url: "admin.php?fckb_tags=1",
-    cache: false,
-    filter_case: false,
-    filter_hide: true,
-    firstselected: true,
-    filter_selected: true,
-    maxitems: 100,
-    newel: true
+  jQuery.getJSON('admin.php?fckb_tags=1', function(data) {
+    jQuery("#tags").tokenInput(
+      data,
+      {
+    {/literal}
+        hintText: '{'Type in a search term'|@translate}',
+        noResultsText: '{'No results'|@translate}',
+        searchingText: '{'Searching...'|@translate}',
+        animateDropdown: false,
+        preventDuplicates: true,
+        allowCreation: true
+    {literal}
+      }
+    );
   });
 });

trunk/admin/themes/default/template/batch_manager_unit.tpl

@@ -3 +3 @@
 {include file='include/colorbox.inc.tpl'}
 
-{combine_script id='jquery.fcbkcomplete' load='async' require='jquery' path='themes/default/js/plugins/jquery.fcbkcomplete.js'}
-{footer_script require='jquery.fcbkcomplete'}
+{combine_script id='jquery.tokeninput' load='async' require='jquery' path='themes/default/js/plugins/jquery.tokeninput.js'}
+{footer_script require='jquery.tokeninput'}
 var tag_boxes_selector = "";
 {foreach from=$elements item=element name=element}
@@ -16 +16 @@
 {literal}
 jQuery(document).ready(function() {
-        $(tag_boxes_selector).fcbkcomplete({
-                json_url: "admin.php?fckb_tags=1",
-                cache: false,
-                filter_case: false,
-                filter_hide: true,
-                firstselected: true,
-                filter_selected: true,
-                maxitems: 100,
-                newel: true
-        });
+  jQuery.getJSON('admin.php?fckb_tags=1', function(data) {
+    jQuery(tag_boxes_selector).tokenInput(
+      data,
+      {
+    {/literal}
+        hintText: '{'Type in a search term'|@translate}',
+        noResultsText: '{'No results'|@translate}',
+        searchingText: '{'Searching...'|@translate}',
+        animateDropdown: false,
+        preventDuplicates: true,
+        allowCreation: true
+    {literal}
+      }
+    );
+  });
   
   $("a.preview-box").colorbox();
@@ -113 +118 @@
 <select id="tags-{$element.ID}" name="tags-{$element.ID}">
 {foreach from=$element.TAGS item=tag}
-  <option value="{$tag.value}" class="selected">{$tag.key}</option>
+  <option value="{$tag.id}" class="selected">{$tag.name}</option>
 {/foreach}
 </select>

trunk/admin/themes/default/template/picture_modify.tpl

@@ -3 +3 @@
 {include file='include/datepicker.inc.tpl'}
 
-{combine_script id='jquery.fcbkcomplete' load='async' require='jquery' path='themes/default/js/plugins/jquery.fcbkcomplete.js'}
-{footer_script require='jquery.fcbkcomplete'}{literal}
+{combine_script id='jquery.tokeninput' load='async' require='jquery' path='themes/default/js/plugins/jquery.tokeninput.js'}
+{footer_script require='jquery.tokeninput'}{literal}
 jQuery(document).ready(function() {
-        jQuery("#tags").fcbkcomplete({
-                json_url: "admin.php?fckb_tags=1",
-                cache: false,
-                filter_case: false,
-                filter_hide: true,
-                firstselected: true,
-                filter_selected: true,
-                maxitems: 100,
-                newel: true
-        });
+  jQuery.getJSON('admin.php?fckb_tags=1', function(data) {
+    jQuery("#tags").tokenInput(
+      data,
+      {
+    {/literal}
+        hintText: '{'Type in a search term'|@translate}',
+        noResultsText: '{'No results'|@translate}',
+        searchingText: '{'Searching...'|@translate}',
+        animateDropdown: false,
+        preventDuplicates: true,
+        allowCreation: true
+    {literal}
+      }
+    );
+  });
 });
 {/literal}{/footer_script}
@@ -138 +143 @@
 <select id="tags" name="tags">
 {foreach from=$tags item=tag}
-  <option value="{$tag.value}" class="selected">{$tag.key}</option>
+  <option value="{$tag.id}" class="selected">{$tag.name}</option>
 {/foreach}
 </select>

trunk/admin/themes/default/theme.css

@@ -586 +586 @@
 }
 
-/* jQuery FCBKcomplete */
-/* TextboxList sample CSS */
-ul.holder { margin: 0; border: 1px solid #999; overflow: hidden; height: auto !important; height: 1%; padding: 4px 5px 0; }
-*:first-child+html ul.holder { padding-bottom: 2px; } * html ul.holder { padding-bottom: 2px; } /* ie7 and below */
-ul.holder li { float: left; list-style-type: none; margin: 0 5px 4px 0; white-space:nowrap;}
-ul.holder li.bit-box, ul.holder li.bit-input input { font: 11px "Lucida Grande", "Verdana"; }
-ul.holder li.bit-box { -moz-border-radius: 6px; -webkit-border-radius: 6px; border-radius: 6px; border: 1px solid #CAD8F3; background: #DEE7F8; padding: 1px 5px 2px; }
-ul.holder li.bit-box-focus { border-color: #598BEC; background: #598BEC; color: #fff; }
-ul.holder li.bit-input input { width: auto; overflow:visible; margin: 0; border: 0px; outline: 0; padding: 3px 0px 2px; } /* no left/right padding here please */
-ul.holder li.bit-input input.smallinput { width: 20px; }
-
-/* Facebook demo CSS */      
-#add { border: 1px solid #999; width: 550px; margin: 50px; padding: 20px 30px 10px; }
-form ol li { list-style-type: none; }
-form ol { font: 11px "Lucida Grande", "Verdana"; margin: 0; padding: 0; }
-form ol li.input-text { margin-bottom: 10px; list-style-type: none; padding-bottom: 10px; }
-form ol li.input-text label { font-weight: bold; cursor: pointer; display: block; font-size: 13px; margin-bottom: 10px; }
-form ol li.input-text input { width: 500px; padding: 5px 5px 6px; font: 11px "Lucida Grande", "Verdana"; border: 1px solid #999; }
-form ul.holder { width: 500px; }
-form ul { margin: 0 !important }
-ul.holder li.bit-box, #apple-list ul.holder li.bit-box { padding-right: 15px; position: relative; z-index:1000;}
-#apple-list ul.holder li.bit-input { margin: 0; }
-#apple-list ul.holder li.bit-input input.smallinput { width: 5px; }
-ul.holder li.bit-hover { background: #BBCEF1; border: 1px solid #6D95E0; }
-ul.holder li.bit-box-focus { border-color: #598BEC; background: #598BEC; color: #fff; }
-ul.holder li.bit-box a.closebutton { position: absolute; right: 4px; top: 5px; display: block; width: 7px; height: 7px; font-size: 1px; background: url(icon/fcbkcomplete_close.gif); }
-ul.holder li.bit-box a.closebutton:hover { background-position: 7px; }
-ul.holder li.bit-box-focus a.closebutton, ul.holder li.bit-box-focus a.closebutton:hover { background-position: bottom; }
-
-/* Autocompleter */
-
-.facebook-auto { display: none; position: absolute; width: 512px; background: #eee; }
-.facebook-auto .default { padding: 5px 7px; border: 1px solid #ccc; border-width: 0 1px 1px;font-family:"Lucida Grande","Verdana"; font-size:11px; }
-.facebook-auto ul { display: none; margin: 0; padding: 0; overflow: auto; position:absolute; z-index:9999}
-.facebook-auto ul li { padding: 5px 12px; z-index: 1000; cursor: pointer; margin: 0; list-style-type: none; border: 1px solid #ccc; border-width: 0 1px 1px; font: 11px "Lucida Grande", "Verdana"; background-color: #eee }
-.facebook-auto ul li em { font-weight: bold; font-style: normal; background: #ccc; }
-.facebook-auto ul li.auto-focus { background: #4173CC; color: #fff; }
-.facebook-auto ul li.auto-focus em { background: none; }
-.deleted { background-color:#4173CC !important; color:#ffffff !important;}
-.hidden { display:none;}
-
-#demo ul.holder li.bit-input input { padding: 2px 0 1px; border: 1px solid #999; }
-.ie6fix {height:1px;width:1px; position:absolute;top:0px;left:0px;z-index:1;}
-
 /* Add photos, direct mode */
 #uploadBoxes P {
@@ -1058 +1014 @@
 #batchManagerGlobal #applyFilterBlock {margin-top:20px;}
 #batchManagerGlobal .useFilterCheckbox {display:none}
+
+
+/* TokenInput (with Facebook style) */
+ul.token-input-list {overflow: hidden; height: auto !important; height: 1%;width: 400px;border: 1px solid #8496ba;cursor: text;font-size: 12px;font-family: Verdana;min-height: 1px;z-index: 999;margin: 0;padding: 0;background-color: #fff;list-style-type: none;clear: left;}
+ul.token-input-list li input {border: 0;width: 100px;padding: 3px 8px;background-color: white;margin: 2px 0;-webkit-appearance: caret;}
+li.token-input-token {overflow: hidden; height: auto !important; height: 15px;margin: 3px;padding: 1px 3px;background-color: #eff2f7;color: #000;cursor: default;border: 1px solid #ccd5e4;font-size: 11px;border-radius: 5px;-moz-border-radius: 5px;-webkit-border-radius: 5px;float: left;white-space: nowrap;}
+li.token-input-token p {display: inline;padding: 0;margin: 0;}
+li.token-input-token span {color: #a6b3cf;margin-left: 5px;font-weight: bold;cursor: pointer;}
+li.token-input-selected-token {background-color: #5670a6;border: 1px solid #3b5998;color: #fff;}
+li.token-input-input-token {float: left;margin: 0;padding: 0;list-style-type: none;}
+div.token-input-dropdown {position: absolute;width: 400px;background-color: #fff;overflow: hidden;border-left: 1px solid #ccc;border-right: 1px solid #ccc;border-bottom: 1px solid #ccc;cursor: default;font-size: 11px;font-family: Verdana;z-index: 1;}
+div.token-input-dropdown p {margin: 0;padding: 5px;font-weight: bold;color: #777;}
+div.token-input-dropdown ul {margin: 0;padding: 0;}
+div.token-input-dropdown ul li {background-color: #fff;padding: 3px;margin: 0;list-style-type: none;}
+div.token-input-dropdown ul li.token-input-dropdown-item {background-color: #fff;}
+div.token-input-dropdown ul li.token-input-dropdown-item2 {background-color: #fff;}
+div.token-input-dropdown ul li em {font-weight: bold;font-style: normal;}
+div.token-input-dropdown ul li.token-input-selected-dropdown-item {background-color: #3b5998;color: #fff;}

trunk/language/en_UK/admin.lang.php

@@ -446 +446 @@
 $lang['No photo selected, %d photos in current set'] = 'No photo selected, %d photos in current set';
 $lang['No photo selected, no action possible.'] = 'No photo selected, no action possible.';
+$lang['No results'] = "No results";
 $lang['No user to send notifications by mail.'] = "No user to be notified by mail.";
 $lang['no write access'] = "no write access";
@@ -580 +581 @@
 $lang['Save Settings'] = 'Save Settings';
 $lang['Save to permalink history'] = "Save to permalinks history";
+$lang['Searching...'] = "Searching...";
 $lang['Search for new images in the directories'] = "Search for new images in the directories";
 $lang['Section'] = "Section";
@@ -696 +698 @@
 $lang['Type here the author name'] = 'Type here the author name';
 $lang['Type here the title'] = 'Type here the title';
+$lang['Type in a search term'] = "Type in a search term";
 $lang['Unable to check for upgrade.'] = "Unable to check for upgrade.";
 $lang['Uncheck all'] = "Uncheck all";

trunk/language/fr_FR/admin.lang.php

@@ -843 +843 @@
 $lang['Graphics Library'] = 'Bibliothèque graphique';
 $lang['Show menubar'] = "Afficher le menu";
+$lang['No results'] = "Pas de résultat";
+$lang['Type in a search term'] = "Entrez un terme de recherche";
+$lang['Searching...'] = "Recherche...";
 ?>

trunk/picture.php

@@ -1045 +1045 @@
 if ($conf['picture_menu'] AND (!isset($themeconf['hide_menu_on']) OR !in_array('thePicturePage', $themeconf['hide_menu_on'])))
 {
+  if (!isset($page['start'])) $page['start'] = 0;
   include( PHPWG_ROOT_PATH.'include/menubar.inc.php');
   if (is_admin()) $template->assign('U_ADMIN', $url_admin); // overwrited by the menu