gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-14 05:31:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

use two column layout (left for check in, right for cancel checkout)

Browse Source
This commit is contained in:
Uwe Steinmann 2023-03-02 09:55:08 +01:00
parent 8bfe9e92db
commit 97778d3e2b
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
views/bootstrap/class.CheckInDocument.php
View File

@ -79,7 +79,6 @@ $(document).ready(function() {
$this->globalNavigation($folder); $this->globalNavigation($folder);
$this->contentStart(); $this->contentStart();
$this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document); $this->pageNavigation($this->getFolderPathHTML($folder, true, $document), "view_document", $document);
$this->contentHeading(getMLText("checkin_document"));
if ($document->isLocked()) { if ($document->isLocked()) {
@ -120,7 +119,10 @@ $(document).ready(function() {
} }
$checkoutinfo = $document->getCheckOutInfo(); $checkoutinfo = $document->getCheckOutInfo();
$this->rowStart();
if($checkoutstatus == 0) { if($checkoutstatus == 0) {
$this->columnStart(6);
$this->contentHeading(getMLText("checkin_document"));
$latestContent = $document->getLatestContent(); $latestContent = $document->getLatestContent();
$reviewStatus = $latestContent->getReviewStatus(); $reviewStatus = $latestContent->getReviewStatus();
@ -134,13 +136,13 @@ $(document).ready(function() {
} }
} }
$this->contentContainerStart();
?> ?>
<form class="form-horizontal" action="../op/op.CheckInDocument.php" method="post" id="form1" name="form1"> <form class="form-horizontal" action="../op/op.CheckInDocument.php" method="post" id="form1" name="form1">
<?php echo createHiddenFieldWithKey('checkindocument'); ?> <?php echo createHiddenFieldWithKey('checkindocument'); ?>
<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>"> <input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
<?php <?php
$this->contentContainerStart();
if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) { if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) {
$this->formField( $this->formField(
getMLText("comment"), getMLText("comment"),
@ -664,18 +666,21 @@ $(document).ready(function() {
); );
} }
$this->contentContainerEnd();
$this->formSubmit(getMLText('checkin_document')); $this->formSubmit(getMLText('checkin_document'));
?> ?>
</form> </form>
<?php <?php
$this->contentContainerEnd(); $this->columnEnd();
$this->columnStart(6);
if(!empty($settings->_enableCancelCheckout)) { if(!empty($settings->_enableCancelCheckout)) {
$this->contentContainerStart(); $this->contentHeading(getMLText("cancel_checkout_document"));
$this->warningMsg(getMLText('cancel_checkout_warning')); $this->warningMsg(getMLText('cancel_checkout_warning'));
?> ?>
<form class="form-horizontal" action="../op/op.CancelCheckOut.php" method="post"> <form class="form-horizontal" action="../op/op.CancelCheckOut.php" method="post">
<input type="hidden" name="documentid" value="<?php print $document->getID(); ?>"> <input type="hidden" name="documentid" value="<?php print $document->getID(); ?>">
<?php <?php
$this->contentContainerStart();
echo createHiddenFieldWithKey('cancelcheckout'); echo createHiddenFieldWithKey('cancelcheckout');
$this->formField( $this->formField(
getMLText("checkout_cancel_confirm"), getMLText("checkout_cancel_confirm"),
@ -686,13 +691,15 @@ $(document).ready(function() {
'value'=>1 'value'=>1
) )
); );
$this->contentContainerEnd();
$this->formSubmit(getMLText('cancel_checkout'), '', '', 'danger'); $this->formSubmit(getMLText('cancel_checkout'), '', '', 'danger');
?> ?>
</form> </form>
<?php <?php
$this->contentContainerEnd();
} }
$this->columnEnd();
} else { } else {
$this->columnStart(12);
?> ?>
<form action="../op/op.CancelCheckOut.php" method="post"> <form action="../op/op.CancelCheckOut.php" method="post">
<?php echo createHiddenFieldWithKey('cancelcheckout'); ?> <?php echo createHiddenFieldWithKey('cancelcheckout'); ?>
@ -701,7 +708,9 @@ $(document).ready(function() {
<?php $this->formSubmit(getMLText('cancel_checkout'),'','','danger');?> <?php $this->formSubmit(getMLText('cancel_checkout'),'','','danger');?>
</form> </form>
<?php <?php
$this->columnEnd();
} }
$this->rowEnd();
$this->contentEnd(); $this->contentEnd();
$this->htmlEndPage(); $this->htmlEndPage();
} /* }}} */ } /* }}} */