more use of formField() instead of plain html

This commit is contained in:
Uwe Steinmann 2018-06-21 11:30:58 +02:00
parent b949a50dad
commit 639b11b52b
5 changed files with 48 additions and 51 deletions

View File

@ -1140,30 +1140,36 @@ function folderSelected<?php echo $formName ?>(id, name) {
<?php <?php
} /* }}} */ } /* }}} */
function printFolderChooserHtml($form, $accessMode, $exclude = -1, $default = false, $formname = '') { /* {{{ */ function getFolderChooserHtml($form, $accessMode, $exclude = -1, $default = false, $formname = '') { /* {{{ */
$formid = "targetid".$form; $formid = "targetid".$form;
if(!$formname) if(!$formname)
$formname = "targetid"; $formname = "targetid";
print "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">"; $content = '';
print "<div class=\"input-append\">\n"; $content .= "<input type=\"hidden\" id=\"".$formid."\" name=\"".$formname."\" value=\"". (($default) ? $default->getID() : "") ."\">";
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."\"/>"; $content .= "<div class=\"input-append\">\n";
print "<button type=\"button\" class=\"btn\" id=\"clearfolder".$form."\"><i class=\"icon-remove\"></i></button>"; $content .= "<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 "<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"; $content .= "<button type=\"button\" class=\"btn\" id=\"clearfolder".$form."\"><i class=\"icon-remove\"></i></button>";
print "</div>\n"; $content .= "<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";
?> $content .= "</div>\n";
<div class="modal hide" id="folderChooser<?php echo $form ?>" tabindex="-1" role="dialog" aria-labelledby="folderChooser<?php echo $form ?>Label" aria-hidden="true"> $content .= '
<div class="modal hide" id="folderChooser'.$form.'" tabindex="-1" role="dialog" aria-labelledby="folderChooser'.$form.'Label" aria-hidden="true">
<div class="modal-header"> <div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
<h3 id="folderChooser<?php echo $form ?>Label"><?php printMLText("choose_target_folder") ?></h3> <h3 id="folderChooser'.$form.'Label">'.getMLText("choose_target_folder").'</h3>
</div> </div>
<div class="modal-body"> <div class="modal-body">
<p><?php printMLText('tree_loading') ?></p> <p>'.getMLText('tree_loading').'</p>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button class="btn btn-primary" data-dismiss="modal" aria-hidden="true"><?php printMLText("close") ?></button> <button class="btn btn-primary" data-dismiss="modal" aria-hidden="true">'.getMLText("close").'</button>
</div> </div>
</div> </div>
<?php ';
return $content;
} /* }}} */
function printFolderChooserHtml($form, $accessMode, $exclude = -1, $default = false, $formname = '') { /* {{{ */
echo self::getFolderChooserHtml($form, $accessMode, $exclude, $default, $formname);
} /* }}} */ } /* }}} */
function printFolderChooserJs($form) { /* {{{ */ function printFolderChooserJs($form) { /* {{{ */

View File

@ -51,22 +51,14 @@ class SeedDMS_View_ImportFS extends SeedDMS_Bootstrap_Style {
$this->contentHeading(getMLText("import_fs")); $this->contentHeading(getMLText("import_fs"));
if($dropfolderdir && file_exists($dropfolderdir.'/'.$user->getLogin())) { if($dropfolderdir && file_exists($dropfolderdir.'/'.$user->getLogin())) {
echo "<div class=\"alert alert-warning\">"; $this->warningMsg(getMLText("import_fs_warning"));
printMLText("import_fs_warning");
echo "</div>\n";
$this->contentContainerStart(); $this->contentContainerStart();
print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">"; print "<form class=\"form-horizontal\" action=\"../op/op.ImportFS.php\" name=\"form1\">";
print "<div class=\"control-group\"><label class=\"control-label\">".getMLText('choose_target_folder')."</label><div class=\"controls\">"; $this->formField(getMLText("choose_target_folder"), $this->getFolderChooserHtml("form1", M_READWRITE));
$this->printFolderChooserHtml("form1",M_READWRITE); $this->formField(
print "</div></div>"; getMLText("dropfolder_folder"),
print "<div class=\"control-group\"><label class=\"control-label\">"; $this->getDropFolderChooserHtml("form1", "", 1)
printMLText("dropfolder_folder"); );
echo ": ";
print "</label><div class=\"controls\">";
/* Setting drop folder dir to "" will force to take the default from settings.xml */
$this->printDropFolderChooserHtml("form1", "", 1);
print "</div></div>";
$this->formField( $this->formField(
getMLText("removeFolderFromDropFolder"), getMLText("removeFolderFromDropFolder"),
array( array(

View File

@ -164,18 +164,27 @@ class SeedDMS_View_ManageNotify extends SeedDMS_Bootstrap_Style {
$this->contentHeading(getMLText("edit_folder_notify")); $this->contentHeading(getMLText("edit_folder_notify"));
$this->contentContainerStart(); $this->contentContainerStart();
print "<form method=\"post\" action=\"../op/op.ManageNotify.php?type=folder&action=add\" name=\"form1\">"; print "<form class=\"form-horizontal\" method=\"post\" action=\"../op/op.ManageNotify.php?type=folder&action=add\" name=\"form1\">";
$this->contentSubHeading(getMLText("choose_target_folder")); $this->formField(getMLText("choose_target_folder"), $this->getFolderChooserHtml("form1", M_READ));
$this->printFolderChooserHtml("form1",M_READ); $this->formField(
print "<label class=\"checkbox\">"; getMLText("include_subdirectories"),
print "<input type=\"checkbox\" name=\"recursefolder\" value=\"1\">"; array(
print getMLText("include_subdirectories"); 'element'=>'input',
print "</label>"; 'type'=>'checkbox',
print "<label class=\"checkbox\">"; 'name'=>'recursefolder',
print "<input type=\"checkbox\" name=\"recursedoc\" value=\"1\">"; 'value'=>1
print getMLText("include_documents"); )
print "</label>"; );
print "<button type='submit' class='btn'><i class=\"icon-plus\"></i> ".getMLText("add")."</button>"; $this->formField(
getMLText("include_documents"),
array(
'element'=>'input',
'type'=>'checkbox',
'name'=>'recursedoc',
'value'=>1
)
);
$this->formSubmit("<i class=\"icon-plus\"></i> ".getMLText('add'));
print "</form>"; print "</form>";
$this->contentContainerEnd(); $this->contentContainerEnd();
echo "</div>"; echo "</div>";

View File

@ -53,13 +53,8 @@ class SeedDMS_View_MoveDocument extends SeedDMS_Bootstrap_Style {
?> ?>
<form class="form-horizontal" action="../op/op.MoveDocument.php" name="form1"> <form class="form-horizontal" action="../op/op.MoveDocument.php" name="form1">
<input type="hidden" name="documentid" value="<?php print $document->getID();?>"> <input type="hidden" name="documentid" value="<?php print $document->getID();?>">
<div class="control-group">
<label class="control-label"><?php printMLText("choose_target_folder");?>:</label>
<div class="controls">
<?php $this->printFolderChooserHtml("form1", M_READWRITE, -1, $target);?>
</div>
</div>
<?php <?php
$this->formField(getMLText("choose_target_folder"), $this->getFolderChooserHtml("form1", M_READWRITE, -1, $target));
$this->formSubmit(getMLText('move')); $this->formSubmit(getMLText('move'));
?> ?>
</form> </form>

View File

@ -54,13 +54,8 @@ class SeedDMS_View_MoveFolder extends SeedDMS_Bootstrap_Style {
<form class="form-horizontal" action="../op/op.MoveFolder.php" name="form1"> <form class="form-horizontal" action="../op/op.MoveFolder.php" name="form1">
<input type="hidden" name="folderid" value="<?php print $folder->getID();?>"> <input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="hidden" name="showtree" value="<?php echo showtree();?>"> <input type="hidden" name="showtree" value="<?php echo showtree();?>">
<div class="control-group">
<label class="control-label"><?php printMLText("choose_target_folder");?>:</label>
<div class="controls">
<?php $this->printFolderChooserHtml("form1", M_READWRITE, $folder->getID(), $target);?>
</div>
</div>
<?php <?php
$this->formField(getMLText("choose_target_folder"), $this->getFolderChooserHtml("form1", M_READWRITE, $folder->getID(), $target));
$this->formSubmit(getMLText('move_folder')); $this->formSubmit(getMLText('move_folder'));
?> ?>
</form> </form>