4 files changed, 7 insertions, 22 deletions
diff --git a/admin/themes/default/template/batch_manager_global.tpl b/admin/themes/default/template/batch_manager_global.tpl
index 913000a9a..0c7347026 100644
--- a/admin/themes/default/template/batch_manager_global.tpl
+++ b/admin/themes/default/template/batch_manager_global.tpl
@@ -55,6 +55,7 @@ jQuery(document).ready(function() {
 });
 {/literal}{/footer_script}
 
+{combine_css path='themes/default/js/plugins/jquery.tokeninput.css'}
 {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'}
@@ -73,7 +74,7 @@ jQuery(document).ready(function() {ldelim}
       newText: ' ({'new'|@translate})',
       animateDropdown: false,
       preventDuplicates: true,
-      allowCreation: true
+      allowFreeTagging: true
     }
   );
 	
@@ -85,7 +86,7 @@ jQuery(document).ready(function() {ldelim}
       searchingText: '{'Searching...'|@translate}',
       animateDropdown: false,
       preventDuplicates: true,
-      allowCreation: false
+      allowFreeTagging: false
     }
   );
 
diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl
index 7dee4fa51..859a9b6a0 100644
--- a/admin/themes/default/template/batch_manager_unit.tpl
+++ b/admin/themes/default/template/batch_manager_unit.tpl
@@ -2,6 +2,7 @@
 {include file='include/datepicker.inc.tpl'}
 {include file='include/colorbox.inc.tpl'}
 
+{combine_css path='themes/default/js/plugins/jquery.tokeninput.css'}
 {combine_script id='jquery.tokeninput' load='async' require='jquery' path='themes/default/js/plugins/jquery.tokeninput.js'}
 {footer_script require='jquery.tokeninput'}
 jQuery(document).ready(function() {ldelim}
@@ -14,7 +15,7 @@ jQuery(document).ready(function() {ldelim}
       newText: ' ({'new'|@translate})',
       animateDropdown: false,
       preventDuplicates: true,
-      allowCreation: true
+      allowFreeTagging: true
     }
   );
 
diff --git a/admin/themes/default/template/picture_modify.tpl b/admin/themes/default/template/picture_modify.tpl
index 5d2238eea..a19815f1c 100644
--- a/admin/themes/default/template/picture_modify.tpl
+++ b/admin/themes/default/template/picture_modify.tpl
@@ -11,6 +11,7 @@ jQuery(document).ready(function() {
 });
 {/literal}{/footer_script}
 
+{combine_css path='themes/default/js/plugins/jquery.tokeninput.css'}
 {combine_script id='jquery.tokeninput' load='async' require='jquery' path='themes/default/js/plugins/jquery.tokeninput.js'}
 {footer_script require='jquery.tokeninput'}
 jQuery(document).ready(function() {ldelim}
@@ -23,7 +24,7 @@ jQuery(document).ready(function() {ldelim}
       newText: ' ({'new'|@translate})',
       animateDropdown: false,
       preventDuplicates: true,
-      allowCreation: true
+      allowFreeTagging: true
     }
   );
 });
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index ce8b78b9e..760d73398 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -962,24 +962,6 @@ LEGEND {
 #batchManagerGlobal #filter_dimension blockquote {margin:5px 0 20px 15px;}
 #batchManagerGlobal #filter_dimension .ui-slider-horizontal {width:650px;margin:5px 0 10px 0;}
 
-
-/* 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;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;}
-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;}
-
 #mainConf a.addFilter {font-weight:normal;margin-left:20px;}
 #mainConf a.removeFilter {font-weight:normal;}
 #mainConf span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */