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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
views/bootstrap/class.DocumentAccess.php
View File

@ -160,7 +160,7 @@ $(document).ready( function() {
<?php echo createHiddenFieldWithKey('documentaccess'); ?> <?php echo createHiddenFieldWithKey('documentaccess'); ?>
<input type="hidden" name="documentid" value="<?php print $document->getId();?>"> <input type="hidden" name="documentid" value="<?php print $document->getId();?>">
<input type="hidden" name="action" value="inherit"> <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> </form>
<?php <?php
$this->contentContainerEnd(); $this->contentContainerEnd();

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

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

6
views/bootstrap/class.FolderAccess.php
View File

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

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

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

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

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

6
views/bootstrap/class.MoveFolder.php
View File

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

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

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

2
views/bootstrap/class.TransferDocument.php
View File

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