archive/piwigo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feature:2927 Update TokenInput to 1.6.1/mistic100

Browse source 
git-svn-id: http://piwigo.org/svn/trunk@23275 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
mistic100 2013-06-16 20:53:20 +00:00
parent c17bc66aeb
commit 68ffc79d86
7 changed files with 540 additions and 234 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
admin/themes/default/template/batch_manager_global.tpl
View file

@ -55,6 +55,7 @@ jQuery(document).ready(function() {
}); });
{/literal}{/footer_script} {/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.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.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'} {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})', newText: ' ({'new'|@translate})',
animateDropdown: false, animateDropdown: false,
preventDuplicates: true, preventDuplicates: true,
allowCreation: true allowFreeTagging: true
} }
); );
@ -85,7 +86,7 @@ jQuery(document).ready(function() {ldelim}
searchingText: '{'Searching...'|@translate}', searchingText: '{'Searching...'|@translate}',
animateDropdown: false, animateDropdown: false,
preventDuplicates: true, preventDuplicates: true,
allowCreation: false allowFreeTagging: false
} }
); );

3
admin/themes/default/template/batch_manager_unit.tpl
View file

@ -2,6 +2,7 @@
{include file='include/datepicker.inc.tpl'} {include file='include/datepicker.inc.tpl'}
{include file='include/colorbox.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'} {combine_script id='jquery.tokeninput' load='async' require='jquery' path='themes/default/js/plugins/jquery.tokeninput.js'}
{footer_script require='jquery.tokeninput'} {footer_script require='jquery.tokeninput'}
jQuery(document).ready(function() {ldelim} jQuery(document).ready(function() {ldelim}
@ -14,7 +15,7 @@ jQuery(document).ready(function() {ldelim}
newText: ' ({'new'|@translate})', newText: ' ({'new'|@translate})',
animateDropdown: false, animateDropdown: false,
preventDuplicates: true, preventDuplicates: true,
allowCreation: true allowFreeTagging: true
} }
); );

3
admin/themes/default/template/picture_modify.tpl
View file

@ -11,6 +11,7 @@ jQuery(document).ready(function() {
}); });
{/literal}{/footer_script} {/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'} {combine_script id='jquery.tokeninput' load='async' require='jquery' path='themes/default/js/plugins/jquery.tokeninput.js'}
{footer_script require='jquery.tokeninput'} {footer_script require='jquery.tokeninput'}
jQuery(document).ready(function() {ldelim} jQuery(document).ready(function() {ldelim}
@ -23,7 +24,7 @@ jQuery(document).ready(function() {ldelim}
newText: ' ({'new'|@translate})', newText: ' ({'new'|@translate})',
animateDropdown: false, animateDropdown: false,
preventDuplicates: true, preventDuplicates: true,
allowCreation: true allowFreeTagging: true
} }
); );
}); });

18
admin/themes/default/theme.css
View file

@ -962,24 +962,6 @@ LEGEND {
#batchManagerGlobal #filter_dimension blockquote {margin:5px 0 20px 15px;} #batchManagerGlobal #filter_dimension blockquote {margin:5px 0 20px 15px;}
#batchManagerGlobal #filter_dimension .ui-slider-horizontal {width:650px;margin:5px 0 10px 0;} #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.addFilter {font-weight:normal;margin-left:20px;}
#mainConf a.removeFilter {font-weight:normal;} #mainConf a.removeFilter {font-weight:normal;}
#mainConf span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */ #mainConf span.property span.filter:first-child a.removeFilter {display:none;} /* can't delete the first field */

12
admin/themes/roma/theme.css
View file

@ -274,12 +274,12 @@ color:transparent;}
#batchManagerGlobal #selectedMessage {background-color:#555; color:#ddd;} #batchManagerGlobal #selectedMessage {background-color:#555; color:#ddd;}
/* TokenInput (with Facebook style for ROMA) */ /* TokenInput (with Facebook style for ROMA) */
ul.token-input-list {border-color:#666;background-color:#444;} ul.token-input-list {border-color:#666 !important;background-color:#444 !important;}
ul.token-input-list li input {background-color:#444;} ul.token-input-list li input {background-color:#444 !important;}
li.token-input-token span {color:#878787;} li.token-input-token span {color:#878787 !important;}
div.token-input-dropdown {background-color:#eee;border-color:#666;} div.token-input-dropdown {background-color:#eee !important;border-color:#666 !important;}
div.token-input-dropdown ul li {background-color:#eee;} div.token-input-dropdown ul li {background-color:#eee !important;}
div.token-input-dropdown ul li.token-input-selected-dropdown-item {background-color:#FF7800;} div.token-input-dropdown ul li.token-input-selected-dropdown-item {background-color:#FF7800 !important;}
#progressbar {border:1px solid #666; background-color:#666;} #progressbar {border:1px solid #666; background-color:#666;}

16
themes/default/js/plugins/jquery.tokeninput.css Normal file
View file

@ -0,0 +1,16 @@
/* 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;}

709
themes/default/js/plugins/jquery.tokeninput.js
View file

File diff suppressed because it is too large Load diff