Merge branch 'seeddms-5.0.x' into seeddms-5.1.x

This commit is contained in:
Uwe Steinmann 2017-01-10 09:13:38 +01:00
commit 95cdf17527

View File

@ -1171,6 +1171,7 @@ function folderSelected<?php echo $formName ?>(id, name) {
print "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">"; print "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
print "<div class=\"input-append\">\n"; print "<div class=\"input-append\">\n";
print "<input type=\"text\" id=\"choosefoldersearch".$form."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$form."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>"; print "<input type=\"text\" id=\"choosefoldersearch".$form."\" data-target=\"".$formid."\" data-provide=\"typeahead\" name=\"targetname".$form."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" target=\"".$formid."\"/>";
print "<button type=\"button\" class=\"btn\" id=\"clearfolder".$form."\"><i class=\"icon-remove\"></i></button>";
print "<a data-target=\"#folderChooser".$form."\" href=\"../out/out.FolderChooser.php?form=".$form."&mode=".$accessMode."&exclude=".$exclude."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("folder")."…</a>\n"; print "<a data-target=\"#folderChooser".$form."\" href=\"../out/out.FolderChooser.php?form=".$form."&mode=".$accessMode."&exclude=".$exclude."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("folder")."…</a>\n";
print "</div>\n"; print "</div>\n";
?> ?>
@ -1196,6 +1197,12 @@ function folderSelected<?php echo $form ?>(id, name) {
$('#choosefoldersearch<?php echo $form ?>').val(name); $('#choosefoldersearch<?php echo $form ?>').val(name);
$('#folderChooser<?php echo $form ?>').modal('hide'); $('#folderChooser<?php echo $form ?>').modal('hide');
} }
$(document).ready(function() {
$('#clearfolder<?php print $form ?>').click(function(ev) {
$('#choosefoldersearch<?php echo $form ?>').val('');
$('#targetid<?php echo $form ?>').val('');
});
});
<?php <?php
} /* }}} */ } /* }}} */
@ -1401,9 +1408,6 @@ function folderSelected(name) {
modalDropfolderChooser.modal('hide'); modalDropfolderChooser.modal('hide');
} }
<?php } ?> <?php } ?>
function clearFilename<?php print $formName ?>() {
$('#dropfolderfile<?php echo $formName ?>').val('');
}
$(document).ready(function() { $(document).ready(function() {
$('#clearfilename<?php print $formName ?>').click(function(ev) { $('#clearfilename<?php print $formName ?>').click(function(ev) {
$('#dropfolderfile<?php echo $formName ?>').val(''); $('#dropfolderfile<?php echo $formName ?>').val('');