gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-17 05:22:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2017-01-10 07:08:18 +01:00
commit d659627959
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
views/bootstrap/class.AddDocument.php
View File

@ -99,10 +99,10 @@ $(document).ready(function() {
},
rules: {
'userfile[]': {
alternatives: [$('#dropfolderfileform1'), $('#choosedocsearch')]
alternatives: [$('#dropfolderfileform1'), $('#choosedocsearchform1')]
},
dropfolderfileform1: {
alternatives: [$(".btn-file input"), $('#choosedocsearch')]
alternatives: [$(".btn-file input"), $('#choosedocsearchform1')]
}
},
messages: {

4
views/bootstrap/class.Bootstrap.php
View File

@ -1122,7 +1122,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
$folderid = $folder->getID();
print "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
print "<div class=\"input-append\">\n";
print "<input type=\"text\" id=\"choosedocsearch\" data-target=\"docid".$form."\" data-provide=\"typeahead\" name=\"docname".$form."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" />";
print "<input type=\"text\" id=\"choosedocsearch".$form."\" data-target=\"docid".$form."\" data-provide=\"typeahead\" name=\"docname".$form."\" value=\"". (($default) ? htmlspecialchars($default->getName()) : "") ."\" placeholder=\"".getMLText('type_to_search')."\" autocomplete=\"off\" />";
print "<a data-target=\"#docChooser".$form."\" href=\"out.DocumentChooser.php?form=".$form."&folderid=".$folderid."&partialtree=".$partialtree."\" role=\"button\" class=\"btn\" data-toggle=\"modal\">".getMLText("document")."…</a>\n";
print "</div>\n";
?>
@ -1145,7 +1145,7 @@ background-image: linear-gradient(to bottom, #882222, #111111);;
?>
function documentSelected<?php echo $formName ?>(id, name) {
$('#docid<?php echo $formName ?>').val(id);
$('#choosedocsearch').val(name);
$('#choosedocsearch<?php echo $formName ?>').val(name);
$('#docChooser<?php echo $formName ?>').modal('hide');
}
function folderSelected<?php echo $formName ?>(id, name) {