fix layout of buttons, place submit button outside of container around form

This commit is contained in:
Uwe Steinmann 2021-05-01 14:08:50 +02:00
parent 23bc6ad49c
commit feee7732ca
8 changed files with 15 additions and 17 deletions

View File

@ -160,7 +160,7 @@ $(document).ready( function() {
<?php echo createHiddenFieldWithKey('documentaccess'); ?>
<input type="hidden" name="documentid" value="<?php print $document->getId();?>">
<input type="hidden" name="action" value="inherit">
<input type="submit" class="btn" value="<?php printMLText("does_not_inherit_access_msg")?>">
<input type="submit" class="btn btn-primary" value="<?php printMLText("does_not_inherit_access_msg")?>">
</form>
<?php
$this->contentContainerEnd();

View File

@ -91,7 +91,6 @@ $(document).ready( function() {
$this->rowStart();
$this->columnStart(6);
$this->contentContainerStart();
?>
@ -111,6 +110,7 @@ $(document).ready( function() {
} elseif (!$user->isGuest() && !in_array($user->getID(), $userNotifyIDs)) {
$options[] = array($user->getID(), htmlspecialchars($user->getLogin() . " - " .$user->getFullName()));
}
$this->contentContainerStart();
$this->formField(
getMLText("user"),
array(
@ -139,11 +139,11 @@ $(document).ready( function() {
'options'=>$options
)
);
$this->contentContainerEnd();
$this->formSubmit(getMLText('add'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->columnStart(6);
print "<table class=\"table-condensed\">\n";

View File

@ -136,14 +136,14 @@ $(document).ready(function() {
<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="hidden" name="action" value="notinherit">
<input type="hidden" name="mode" value="copy">
<input type="submit" class="btn" value="<?php printMLText("inherits_access_copy_msg")?>">
<input type="submit" class="btn btn-primary" value="<?php printMLText("inherits_access_copy_msg")?>">
</form>
<form action="../op/op.FolderAccess.php" style="display: inline-block;">
<?php echo createHiddenFieldWithKey('folderaccess'); ?>
<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="hidden" name="action" value="notinherit">
<input type="hidden" name="mode" value="empty">
<input type="submit" class="btn" value="<?php printMLText("inherits_access_empty_msg")?>">
<input type="submit" class="btn btn-primary" value="<?php printMLText("inherits_access_empty_msg")?>">
</form>
</p>
<?php
@ -159,7 +159,7 @@ $(document).ready(function() {
<?php echo createHiddenFieldWithKey('folderaccess'); ?>
<input type="hidden" name="folderid" value="<?php print $folder->getID();?>">
<input type="hidden" name="action" value="inherit">
<input type="submit" class="btn" value="<?php printMLText("does_not_inherit_access_msg")?>">
<input type="submit" class="btn btn-primary" value="<?php printMLText("does_not_inherit_access_msg")?>">
</form>
<?php
}

View File

@ -91,7 +91,6 @@ $(document).ready(function() {
$this->rowStart();
$this->columnStart(6);
$this->contentContainerStart();
?>
@ -111,6 +110,7 @@ $(document).ready(function() {
} elseif (!$user->isGuest() && !in_array($user->getID(), $userNotifyIDs)) {
$options[] = array($user->getID(), htmlspecialchars($user->getLogin() . " - " .$user->getFullName()));
}
$this->contentContainerStart();
$this->formField(
getMLText("user"),
array(
@ -139,11 +139,11 @@ $(document).ready(function() {
'options'=>$options
)
);
$this->contentContainerEnd();
$this->formSubmit(getMLText('add'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->columnEnd();
$this->columnStart(6);
print "<table class=\"table-condensed\">\n";

View File

@ -49,18 +49,18 @@ class SeedDMS_View_MoveDocument extends SeedDMS_Theme_Style {
$this->contentStart();
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
$this->contentHeading(getMLText("move_document"));
$this->contentContainerStart('warning');
?>
<form class="form-horizontal" action="../op/op.MoveDocument.php" name="form1">
<?php echo createHiddenFieldWithKey('movedocument'); ?>
<input type="hidden" name="documentid" value="<?php print $document->getID();?>">
<?php
$this->contentContainerStart('warning');
$this->formField(getMLText("choose_target_folder"), $this->getFolderChooserHtml("form1", M_READWRITE, -1, $target));
$this->contentContainerEnd();
$this->formSubmit(getMLText('move'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

View File

@ -48,7 +48,6 @@ class SeedDMS_View_MoveFolder extends SeedDMS_Theme_Style {
$this->contentStart();
$this->pageNavigation($this->getFolderPathHTML($folder, true), "view_folder", $folder);
$this->contentHeading(getMLText("move_folder"));
$this->contentContainerStart();
?>
<form class="form-horizontal" action="../op/op.MoveFolder.php" name="form1">
@ -56,14 +55,13 @@ class SeedDMS_View_MoveFolder extends SeedDMS_Theme_Style {
<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("choose_target_folder"), $this->getFolderChooserHtml("form1", M_READWRITE, $folder->getID(), $target));
$this->contentContainerEnd();
$this->formSubmit(getMLText('move_folder'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

View File

@ -56,7 +56,6 @@ $(document).ready( function() {
$this->contentStart();
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
$this->contentHeading(getMLText("set_expiry"));
$this->contentContainerStart();
if($document->expires())
$expdate = getReadableDate($document->getExpires());
@ -68,6 +67,7 @@ $(document).ready( function() {
<input type="hidden" name="documentid" value="<?php print $document->getID();?>">
<?php echo createHiddenFieldWithKey('setexpires'); ?>
<?php
$this->contentContainerStart();
$options = array();
$options[] = array('never', getMLText('does_not_expire'));
$options[] = array('date', getMLText('expire_by_date'), $expdate != '');
@ -89,11 +89,11 @@ $(document).ready( function() {
getMLText("expires"),
$this->getDateChooser($expdate, "expdate", $this->params['session']->getLanguage())
);
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('save'));
?>
</form>
<?php
$this->contentContainerEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

View File

@ -67,8 +67,8 @@ class SeedDMS_View_TransferDocument extends SeedDMS_Theme_Style {
getMLText("transfer_to_user"),
$html
);
$this->formSubmit("<i class=\"fa fa-exchange\"></i> ".getMLText('transfer_document'));
$this->contentContainerEnd();
$this->formSubmit("<i class=\"fa fa-exchange\"></i> ".getMLText('transfer_document'));
} else {
$this->warningMsg('transfer_no_users');
}