Changeset 11008

Timestamp:

May 23, 2011, 1:25:50 PM (10 years ago)

Author:

mistic100

Message:

TokenInput : order tags, theme for roma, 'new' text translated

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) (1 diff)
• admin/themes/default/template/picture_modify.tpl (modified) (1 diff)
• admin/themes/default/theme.css (modified) (1 diff)
• admin/themes/roma/theme.css (modified) (1 diff)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)
• themes/default/js/plugins/jquery.tokeninput.js (modified) (3 diffs)

trunk/admin/include/functions.php

@@ -2101 +2101 @@
 {
   $result = pwg_query($query);
+  
   $taglist = array();
   while ($row = pwg_db_fetch_assoc($result))
@@ -2112 +2113 @@
       );
   }
-
+  
+  $cmp = create_function('$a,$b', 'return strcasecmp($a["name"], $b["name"]);');
+  usort($taglist, $cmp);
+  
   return $taglist;
 }

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

@@ -20 +20 @@
         noResultsText: '{'No results'|@translate}',
         searchingText: '{'Searching...'|@translate}',
+        newText: ' ({'new'|@translate})',
         animateDropdown: false,
         preventDuplicates: true,

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

@@ -24 +24 @@
         noResultsText: '{'No results'|@translate}',
         searchingText: '{'Searching...'|@translate}',
+        newText: ' ({'new'|@translate})',
         animateDropdown: false,
         preventDuplicates: true,

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

@@ -14 +14 @@
         noResultsText: '{'No results'|@translate}',
         searchingText: '{'Searching...'|@translate}',
+        newText: ' ({'new'|@translate})',
         animateDropdown: false,
         preventDuplicates: true,

trunk/admin/themes/default/theme.css

@@ -1023 +1023 @@
 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;}
+li.token-input-input-token {float: left;margin: 0;padding: 0;list-style-type: none;width:10px;}
 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;}

trunk/admin/themes/roma/theme.css

@@ -250 +250 @@
 #batchManagerGlobal #selectedMessage {background-color:#555; color:#ddd;}
 
+/* TokenInput (with Facebook style for ROMA) */
+ul.token-input-list {border-color:#666;background-color:#444;}
+ul.token-input-list li input {background-color:#444;}
+li.token-input-token span {color:#878787;}
+div.token-input-dropdown {background-color:#eee;border-color:#666;}
+div.token-input-dropdown ul li {background-color:#eee;}
+div.token-input-dropdown ul li.token-input-selected-dropdown-item {background-color:#FF7800;}

trunk/language/en_UK/admin.lang.php

@@ -432 +432 @@
 $lang['Move'] = "Move";
 $lang['Name'] = "Name";
+$lang['new'] = "new";
 $lang['New name'] = "New name";
 $lang['New parent album'] = "New parent album";

trunk/language/fr_FR/admin.lang.php

@@ -846 +846 @@
 $lang['Type in a search term'] = "Entrez un terme de recherche";
 $lang['Searching...'] = "Recherche...";
+$lang['new'] = "nouveau";
 ?>

trunk/themes/default/js/plugins/jquery.tokeninput.js

@@ -22 +22 @@
     noResultsText: "No results",
     searchingText: "Searching...",
+    newText: "(new)",
     deleteText: "×",
     searchDelay: 300,
@@ -706 +707 @@
                   
                   if(settings.allowCreation) {
-                      results.push({name: input_box.val() + ' (new)', id: input_box.val()});
+                      results.push({name: input_box.val() + settings.newText, id: input_box.val()});
                   }
                   cache.add(query, settings.jsonContainer ? results[settings.jsonContainer] : results);
@@ -729 +730 @@
                 
                 if(settings.allowCreation) {
-                    results.push({name: input_box.val() + ' (new)', id: input_box.val()});
+                    results.push({name: input_box.val() + settings.newText, id: input_box.val()});
                 }