gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-18 02:59:27 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

change to two column layout

Browse Source
This commit is contained in:
Uwe Steinmann 2021-02-16 14:35:16 +01:00
parent c8956a365d
commit b4fd707a60
1 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
views/bootstrap/class.AddDocument.php
View File

@ -70,7 +70,7 @@ $(document).ready(function() {
}
return false;
}, "<?php printMLText("js_no_file");?>");
$("#form1").validate({
$("#adddocform").validate({
debug: false,
ignore: ":hidden:not(.do_validate)",
invalidHandler: function(e, validator) {
@ -101,15 +101,15 @@ $(document).ready(function() {
if($enablelargefileupload) {
?>
'userfile-fine-uploader-uuids': {
fineuploader: [ userfileuploader, $('#dropfolderfileform1') ]
fineuploader: [ userfileuploader, $('#dropfolderfileadddocform') ]
}
<?php
} else {
?>
'userfile[]': {
alternatives: $('#dropfolderfileform1')
alternatives: $('#dropfolderfileadddocform')
},
dropfolderfileform1: {
dropfolderfileadddocform: {
alternatives: $("#userfile") //$(".btn-file input")
}
<?php
@ -137,9 +137,9 @@ $(document).ready(function() {
});
});
<?php
$this->printKeywordChooserJs("form1");
$this->printKeywordChooserJs("adddocform");
if($dropfolderdir) {
$this->printDropFolderChooserJs("form1");
$this->printDropFolderChooserJs("adddocform");
}
$this->printFileChooserJs();
} /* }}} */
@ -182,7 +182,7 @@ $(document).ready(function() {
$msg = getMLText("max_upload_size").": ".SeedDMS_Core_File::format_filesize($mus2);
$this->warningMsg($msg);
$this->contentHeading(getMLText("add_document"));
// Retrieve a list of all users and groups that have review / approve
// privileges.
$docAccess = $folder->getReadAccessList($enableadminrevapp, $enableownerrevapp);
@ -190,14 +190,16 @@ $(document).ready(function() {
$txt = $this->callHook('addDocumentPreForm');
if(is_string($txt))
echo $txt;
$this->contentContainerStart();
?>
<form class="form-horizontal" action="../op/op.AddDocument.php" enctype="multipart/form-data" method="post" id="form1" name="form1">
<form class="form-horizontal" action="../op/op.AddDocument.php" enctype="multipart/form-data" method="post" id="adddocform" name="adddocform">
<?php echo createHiddenFieldWithKey('adddocument'); ?>
<input type="hidden" name="folderid" value="<?php print $folderid; ?>">
<input type="hidden" name="showtree" value="<?php echo showtree();?>">
<?php
$this->rowStart();
$this->columnStart(6);
$this->contentSubHeading(getMLText("document_infos"));
$this->contentContainerStart();
$this->formField(
getMLText("name"),
array(
@ -222,7 +224,7 @@ $(document).ready(function() {
if(!$nodocumentformfields || !in_array('keywords', $nodocumentformfields))
$this->formField(
getMLText("keywords"),
$this->getKeywordChooserHtml('form1')
$this->getKeywordChooserHtml('adddocform')
);
if(!$nodocumentformfields || !in_array('categories', $nodocumentformfields)) {
$options = array();
@ -331,7 +333,11 @@ $(document).ready(function() {
echo $arrs;
}
$this->contentContainerEnd();
$this->columnEnd();
$this->columnStart(6);
$this->contentSubHeading(getMLText("version_info"));
$this->contentContainerStart();
if(!$nodocumentformfields || !in_array('version', $nodocumentformfields)) {
$this->formField(
getMLText("version"),
@ -351,7 +357,7 @@ $(document).ready(function() {
if($dropfolderdir) {
$this->formField(
getMLText("dropfolder_file"),
$this->getDropFolderChooserHtml("form1", $dropfolderfile)
$this->getDropFolderChooserHtml("adddocform", $dropfolderfile)
);
}
if(!$nodocumentformfields || !in_array('version_comment', $nodocumentformfields)) {
@ -397,6 +403,7 @@ $(document).ready(function() {
echo $arrs;
}
$this->contentContainerEnd();
if($workflowmode == 'advanced') {
$mandatoryworkflows = $user->getMandatoryWorkflows();
if($mandatoryworkflows) {
@ -445,6 +452,7 @@ $(document).ready(function() {
} elseif($workflowmode == 'traditional' || $workflowmode == 'traditional_only_approval') {
if($workflowmode == 'traditional') {
$this->contentSubHeading(getMLText("assign_reviewers"));
$this->contentContainerStart();
/* List all mandatory reviewers */
$res=$user->getMandatoryReviewers();
@ -542,9 +550,11 @@ $(document).ready(function() {
}
}
}
$this->contentContainerEnd();
}
$this->contentSubHeading(getMLText("assign_approvers"));
$this->contentContainerStart();
$res=$user->getMandatoryApprovers();
/* List all mandatory approvers */
$tmp = array();
@ -644,10 +654,12 @@ $(document).ready(function() {
}
}
}
$this->contentContainerEnd();
$this->warningMsg(getMLText("add_doc_reviewer_approver_warning"));
}
if(!$nodocumentformfields || !in_array('notification', $nodocumentformfields)) {
$this->contentSubHeading(getMLText("add_document_notify"));
$this->contentSubHeading(getMLText("add_document_notify"));
$this->contentContainerStart();
$options = array();
$allUsers = $dms->getAllUsers($sortusersinlist);
@ -683,12 +695,14 @@ $(document).ready(function() {
'options'=>$options
)
);
$this->contentContainerEnd();
}
$this->columnEnd();
$this->rowEnd();
$this->formSubmit("<i class=\"fa fa-save\"></i> ".getMLText('add_document'));
?>
</form>
<?php
$this->contentContainerEnd();
$txt = $this->callHook('addDocumentPostForm');
if(is_string($txt))
echo $txt;