diff --git a/op/op.ApproveDocument.php b/op/op.ApproveDocument.php index abdd3c876..43c826eda 100644 --- a/op/op.ApproveDocument.php +++ b/op/op.ApproveDocument.php @@ -122,7 +122,7 @@ if ($_POST["approvalType"] == "ind" || $_POST["approvalType"] == "grp") { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."¤ttab=revapp"; $notifier->toIndividual($user, $content->getUser(), $subject, $message, $params, SeedDMS_NotificationService::RECV_OWNER); diff --git a/op/op.ReviewDocument.php b/op/op.ReviewDocument.php index 4d96d1321..68852e318 100644 --- a/op/op.ReviewDocument.php +++ b/op/op.ReviewDocument.php @@ -120,7 +120,7 @@ if ($_POST["reviewType"] == "ind" || $_POST["reviewType"] == "grp") { $params['status'] = getReviewStatusText($_POST["reviewStatus"]); $params['comment'] = strip_tags($_POST['comment']); $params['username'] = $user->getFullName(); - $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."¤ttab=revapp"; $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; $notifier->toList($user, $nl["users"], $subject, $message, $params, SeedDMS_NotificationService::RECV_NOTIFICATION); @@ -172,7 +172,7 @@ if ($newdocstatus['status'] == S_DRAFT_APP) { $params['username'] = $user->getFullName(); $params['sitename'] = $settings->_siteName; $params['http_root'] = $settings->_httpRoot; - $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID(); + $params['url'] = getBaseUrl().$settings->_httpRoot."out/out.ViewDocument.php?documentid=".$document->getID()."¤ttab=revapp"; foreach ($docApprovalStatus as $dastat) { if ($dastat["status"] == 0) { diff --git a/views/bootstrap/class.AddDocument.php b/views/bootstrap/class.AddDocument.php index 256603da8..b6071bb81 100644 --- a/views/bootstrap/class.AddDocument.php +++ b/views/bootstrap/class.AddDocument.php @@ -204,14 +204,16 @@ $(document).ready(function() { $txt = $this->callHook('addDocumentPreForm'); if(is_string($txt)) echo $txt; - $this->contentContainerStart(); ?>
rowStart(); + $this->columnStart(6); $this->contentSubHeading(getMLText("document_infos")); + $this->contentContainerStart(); $this->formField( getMLText("name"), array( @@ -345,7 +347,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"), @@ -417,6 +423,7 @@ $(document).ready(function() { echo $arrs; } + $this->contentContainerEnd(); if($workflowmode == 'advanced') { $mandatoryworkflows = $user->getMandatoryWorkflows(); if($mandatoryworkflows) { @@ -465,6 +472,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(); @@ -579,9 +587,11 @@ $(document).ready(function() { } } } + $this->contentContainerEnd(); } $this->contentSubHeading(getMLText("assign_approvers")); + $this->contentContainerStart(); $res=$user->getMandatoryApprovers(); /* List all mandatory approvers */ $tmp = array(); @@ -699,11 +709,13 @@ $(document).ready(function() { } } } + $this->contentContainerEnd(); $this->warningMsg(getMLText("add_doc_reviewer_approver_warning")); } if($enablereceiptworkflow) { $this->contentSubHeading(getMLText("assign_recipients")); + $this->contentContainerStart(); $options = array(); foreach ($docAccess["users"] as $usr) { if (!$enableselfreceipt && $usr->getID()==$user->getID()) continue; @@ -756,10 +768,12 @@ $(document).ready(function() { ) ); + $this->contentContainerEnd(); } 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); @@ -795,12 +809,14 @@ $(document).ready(function() { 'options'=>$options ) ); + $this->contentContainerEnd(); } + $this->columnEnd(); + $this->rowEnd(); $this->formSubmit(" ".getMLText('add_document')); ?>
contentContainerEnd(); $txt = $this->callHook('addDocumentPostForm'); if(is_string($txt)) echo $txt; diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php index 6b42ff0c0..603fd3ec4 100644 --- a/views/bootstrap/class.DefaultKeywords.php +++ b/views/bootstrap/class.DefaultKeywords.php @@ -144,6 +144,7 @@ $(document).ready( function() { function showKeywordForm($category, $user) { /* {{{ */ if(!$category) { + $this->contentContainerStart(); ?>
@@ -163,26 +164,33 @@ $(document).ready( function() { ?>
contentContainerEnd(); } else { + $this->contentContainerStart(); $owner = $category->getOwner(); if ((!$user->isAdmin()) && ($owner->getID() != $user->getID())) return; ?> -
- -
-
- - - - - -
-
-
- -
- -
+
+ + +formField( + getMLText("name"), + array( + 'element'=>'input', + 'type'=>'text', + 'name'=>'name', + 'value'=>$category->getName() + ) + ); + $this->formSubmit(" ".getMLText('save')); +?> +
+contentContainerEnd(); + $this->contentHeading(getMLText("default_keywords")); + $this->contentContainerStart(); +?> getKeywordLists(); if (count($lists) == 0) @@ -190,7 +198,7 @@ $(document).ready( function() { else foreach ($lists as $list) { ?> -
+ "> @@ -208,8 +216,6 @@ $(document).ready( function() {

-
-
@@ -225,6 +231,7 @@ $(document).ready( function() {
contentContainerEnd(); } } /* }}} */ @@ -267,12 +274,10 @@ $(document).ready( function() { columnEnd(); $this->columnStart(8); - $this->contentContainerStart(); ?>
>
contentContainerEnd(); $this->columnEnd(); $this->rowEnd(); $this->contentEnd(); diff --git a/views/bootstrap/class.ExpiredDocuments.php b/views/bootstrap/class.ExpiredDocuments.php index ccafb3a99..0f2ba6a28 100644 --- a/views/bootstrap/class.ExpiredDocuments.php +++ b/views/bootstrap/class.ExpiredDocuments.php @@ -77,8 +77,8 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Bootstrap_Style { print "\n\n"; print ""; print "".getMLText("name"); - print " ".($order=="na"?' ':($order=="nd"?' ':' ')).""; - print " ".($order=="ea"?' ':($order=="ed"?' ':' ')).""; + print " ".($order=="na"?' ':($order=="nd"?' ':' ')).""; + print " ".($order=="ea"?' ':($order=="ed"?' ':' ')).""; print "\n"; print "".getMLText("status")."\n"; print "".getMLText("action")."\n";