place submit button outside content area

This commit is contained in:
Uwe Steinmann 2021-05-17 13:31:32 +02:00
parent abd52ea219
commit 72dcae36a2
6 changed files with 36 additions and 36 deletions

View File

@ -81,7 +81,6 @@ $(document).ready( function() {
<?php
*/
$this->contentHeading(getMLText("add_subfolder"));
$this->contentContainerStart();
?>
<form class="form-horizontal" action="../op/op.AddSubFolder.php" id="form1" name="form1" method="post">
@ -89,6 +88,7 @@ $(document).ready( function() {
<input type="hidden" name="folderid" value="<?php print $folder->getId();?>">
<input type="hidden" name="showtree" value="<?php echo showtree();?>">
<?php
$this->contentContainerStart();
$this->formField(
getMLText("name"),
array(
@ -143,11 +143,11 @@ $(document).ready( function() {
echo $arrs;
}
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('add_subfolder'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

View File

@ -95,16 +95,16 @@ $(document).ready( function() {
$this->contentHeading(getMLText("edit_document_access"));
$this->rowStart();
$this->columnStart(4);
$this->contentContainerStart();
if ($user->isAdmin()) {
?>
<form action="../op/op.DocumentAccess.php">
<form class="form-horizontal mb-4" action="../op/op.DocumentAccess.php">
<?php echo createHiddenFieldWithKey('documentaccess'); ?>
<input type="Hidden" name="action" value="setowner">
<input type="Hidden" name="documentid" value="<?php print $document->getId();?>">
<?php
$this->contentContainerStart();
$owner = $document->getOwner();
$options = array();
foreach ($allUsers as $currUser) {
@ -120,16 +120,17 @@ $(document).ready( function() {
'options'=>$options
)
);
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
?>
</form>
<?php
}
$this->contentSubHeading(getMLText("access_inheritance"));
$this->contentHeading(getMLText("access_inheritance"));
if ($document->inheritsAccess()) {
printMLText("inherits_access_msg");
$this->infoMsg(getMLText("inherits_access_msg"));
?>
<p>
<form action="../op/op.DocumentAccess.php" style="display: inline-block;">
@ -148,7 +149,6 @@ $(document).ready( function() {
</form>
</p>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
@ -163,23 +163,23 @@ $(document).ready( function() {
<input type="submit" class="btn btn-primary" value="<?php printMLText("does_not_inherit_access_msg")?>">
</form>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->columnStart(4);
$this->contentContainerStart();
$accessList = $document->getAccessList();
?>
<form class="form-horizontal" action="../op/op.DocumentAccess.php">
<form class="form-horizontal mb-4" action="../op/op.DocumentAccess.php">
<?php echo createHiddenFieldWithKey('documentaccess'); ?>
<input type="Hidden" name="documentid" value="<?php print $document->getId();?>">
<input type="Hidden" name="action" value="setdefault">
<?php
$this->contentContainerStart();
$this->formField(
getMLText("default_access"),
$this->getAccessModeSelection($document->getDefaultAccess())
);
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
?>
</form>
@ -189,6 +189,7 @@ $(document).ready( function() {
<input type="Hidden" name="documentid" value="<?php print $document->getId()?>">
<input type="Hidden" name="action" value="addaccess">
<?php
$this->contentContainerStart();
$memusers = array();
foreach ($accessList["users"] as $userAccess) {
$userObj = $userAccess->getUser();
@ -234,11 +235,11 @@ $(document).ready( function() {
getMLText("access_mode"),
$this->getAccessModeSelection(M_READ)
);
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->columnStart(4);
/* memorize users with access rights */
@ -264,7 +265,7 @@ $(document).ready( function() {
print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">\n";
print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
print "<button type=\"submit\" class=\"btn btn-primary btn-mini btn-sm\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
print "</td>\n";
print "</form>\n";
print "<form action=\"../op/op.DocumentAccess.php\">\n";
@ -273,7 +274,7 @@ $(document).ready( function() {
print "<input type=\"Hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
print "<span></td>\n";
print "</form>\n";
print "</tr>\n";
@ -295,7 +296,7 @@ $(document).ready( function() {
print "<input type=\"hidden\" name=\"documentid\" value=\"".$document->getId()."\">";
print "<input type=\"hidden\" name=\"action\" value=\"editaccess\">";
print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">";
print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
print "<button type=\"submit\" class=\"btn btn-primary btn-mini btn-sm\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
print "</span></td>\n";
print "</form>";
print "<form action=\"../op/op.DocumentAccess.php\">\n";
@ -304,7 +305,7 @@ $(document).ready( function() {
print "<input type=\"hidden\" name=\"documentid\" value=\"".$document->getId()."\">\n";
print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
print "<button type=\"submit\" class=\"btn btn-mini\"\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
print "</form>";
print "</span></td>\n";
print "</tr>\n";

View File

@ -82,7 +82,6 @@ $(document).ready( function() {
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
$this->contentHeading(getMLText("edit_document_props"));
$this->contentContainerStart();
if($document->expires())
$expdate = getReadableDate($document->getExpires());
@ -93,6 +92,7 @@ $(document).ready( function() {
<?php echo createHiddenFieldWithKey('editdocument'); ?>
<input type="hidden" name="documentid" value="<?php echo $document->getID() ?>">
<?php
$this->contentContainerStart();
$this->formField(
getMLText("name"),
array(
@ -232,11 +232,11 @@ $(document).ready( function() {
} elseif(is_string($arrs)) {
echo $arrs;
}
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

View File

@ -78,13 +78,13 @@ $(document).ready(function() {
$this->contentStart();
$this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder);
$this->contentHeading(getMLText("edit_folder_props"));
$this->contentContainerStart();
?>
<form class="form-horizontal" action="../op/op.EditFolder.php" id="form1" name="form1" method="post">
<?php echo createHiddenFieldWithKey('editfolder'); ?>
<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="hidden" name="showtree" value="<?php echo showtree();?>">
<?php
$this->contentContainerStart();
$this->formField(
getMLText("name"),
array(
@ -133,11 +133,11 @@ $(document).ready(function() {
} elseif(is_string($arrs)) {
echo $arrs;
}
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

View File

@ -92,16 +92,16 @@ $(document).ready(function() {
$this->contentHeading(getMLText("edit_folder_access"));
$this->rowStart();
$this->columnStart(4);
$this->contentContainerStart();
if ($user->isAdmin()) {
?>
<form action="../op/op.FolderAccess.php">
<form class="form-horizontal mb-4" action="../op/op.FolderAccess.php">
<?php echo createHiddenFieldWithKey('folderaccess'); ?>
<input type="hidden" name="action" value="setowner">
<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
<?php
$this->contentContainerStart();
$owner = $folder->getOwner();
$options = array();
foreach ($allUsers as $currUser) {
@ -117,6 +117,7 @@ $(document).ready(function() {
'options'=>$options
)
);
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
?>
</form>
@ -125,10 +126,10 @@ $(document).ready(function() {
if ($folder->getID() != $rootfolderid && $folder->getParent()){
$this->contentSubHeading(getMLText("access_inheritance"));
$this->contentHeading(getMLText("access_inheritance"));
if ($folder->inheritsAccess()) {
printMLText("inherits_access_msg");
$this->infoMsg(getMLText("inherits_access_msg"));
?>
<p>
<form action="../op/op.FolderAccess.php" style="display: inline-block;">
@ -147,7 +148,6 @@ $(document).ready(function() {
</form>
</p>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->rowEnd();
$this->contentEnd();
@ -163,35 +163,34 @@ $(document).ready(function() {
</form>
<?php
}
$this->contentContainerEnd();
$this->columnEnd();
$this->columnStart(4);
$this->contentContainerStart();
$accessList = $folder->getAccessList();
?>
<form class="form-horizontal" action="../op/op.FolderAccess.php">
<form class="form-horizontal mb-4" action="../op/op.FolderAccess.php">
<?php echo createHiddenFieldWithKey('folderaccess'); ?>
<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="hidden" name="action" value="setdefault">
<?php
$this->contentContainerStart();
$this->formField(
getMLText("default_access"),
$this->getAccessModeSelection($folder->getDefaultAccess())
);
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->contentContainerStart();
?>
<form class="form-horizontal" action="../op/op.FolderAccess.php" id="form1" name="form1">
<?php echo createHiddenFieldWithKey('folderaccess'); ?>
<input type="hidden" name="folderid" value="<?php print $folder->getID()?>">
<input type="hidden" name="action" value="addaccess">
<?php
$this->contentContainerStart();
$options = array();
$options[] = array(-1, getMLText('select_one'));
foreach ($allUsers as $currUser) {
@ -228,11 +227,11 @@ $(document).ready(function() {
getMLText("access_mode"),
$this->getAccessModeSelection(M_READ)
);
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-plus\"></i> ".getMLText('add'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->columnStart(4);
@ -254,7 +253,7 @@ $(document).ready(function() {
$this->printAccessModeSelection($userAccess->getMode());
print "</td>\n";
print "<td>\n";
print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
print "<button type=\"submit\" class=\"btn btn-primary btn-mini btn-sm\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
print "</td>\n";
print "</form>\n";
print "<form action=\"../op/op.FolderAccess.php\">\n";
@ -263,7 +262,7 @@ $(document).ready(function() {
print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
print "<input type=\"hidden\" name=\"userid\" value=\"".$userObj->getID()."\">\n";
print "<td>\n";
print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
print "</td>\n";
print "</form>\n";
print "</tr>\n";
@ -284,7 +283,7 @@ $(document).ready(function() {
$this->printAccessModeSelection($groupAccess->getMode());
print "</td>\n";
print "<td><span class=\"actions\">\n";
print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
print "<button type=\"submit\" class=\"btn btn-primary btn-mini btn-sm\"><i class=\"fa fa-save\"></i> ".getMLText("save")."</button>";
print "</span></td>\n";
print "</form>";
print "<form action=\"../op/op.FolderAccess.php\">\n";
@ -293,7 +292,7 @@ $(document).ready(function() {
print "<input type=\"hidden\" name=\"action\" value=\"delaccess\">\n";
print "<input type=\"hidden\" name=\"groupid\" value=\"".$groupObj->getID()."\">\n";
print "<td>";
print "<button type=\"submit\" class=\"btn btn-mini\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
print "<button type=\"submit\" class=\"btn btn-danger btn-mini btn-sm\"><i class=\"fa fa-remove\"></i> ".getMLText("delete")."</button>";
print "</td>\n";
print "</form>";
print "</tr>\n";

View File

@ -220,13 +220,13 @@ console.log(element);
}
if($msg)
$this->warningMsg($msg);
$this->contentContainerStart();
?>
<form class="form-horizontal" action="../op/op.UpdateDocument.php" enctype="multipart/form-data" method="post" name="form1" id="form1">
<?php echo createHiddenFieldWithKey('updatedocument'); ?>
<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
<?php
$this->contentContainerStart();
$this->formField(
getMLText("local_file"),
$enablelargefileupload ? $this->getFineUploaderHtml() : $this->getFileChooserHtml('userfile', false)
@ -649,12 +649,12 @@ console.log(element);
}
$this->warningMsg(getMLText("add_doc_reviewer_approver_warning"));
}
$this->contentContainerEnd();
$this->formSubmit(getMLText('update_document'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */