diff --git a/views/bootstrap/class.ViewDocument.php b/views/bootstrap/class.ViewDocument.php index 3290c51f4..1c4871b40 100644 --- a/views/bootstrap/class.ViewDocument.php +++ b/views/bootstrap/class.ViewDocument.php @@ -725,8 +725,11 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { ?>
contentContainerstart(); - print "\n"; + print "
"; + print "
"; +// $this->contentContainerStart(); + print "".getMLText('reviewers').""; + print "
\n"; /* Just check fo an exting reviewStatus, even workflow mode is set * to traditional_only_approval. There may be old documents which @@ -734,16 +737,12 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { */ if (/*$workflowmode != 'traditional_only_approval' &&*/ is_array($reviewStatus) && count($reviewStatus)>0) { - print ""; - print "\n"; - print "\n"; - print "\n"; - print ""; - print "\n"; - print "\n"; + print "\n"; + print "\n"; +// print ""; + print "\n"; + print "\n"; print "\n"; foreach ($reviewStatus as $r) { @@ -785,13 +784,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } break; } - print "\n"; + print "\n"; print "\n"; - print ""; - print "\n"; } } + print "
\n"; - $this->contentSubHeading(getMLText("reviewers")); - print "
".getMLText("name")."".getMLText("last_update")."".getMLText("comment")."".getMLText("status")."".getMLText("name")."".getMLText("last_update").", ".getMLText("comment")."".getMLText("comment")."".getMLText("status")."
".$reqName."
  • ".$r["date"]."
    • "; + print "
".$r["date"]." - "; /* $updateUser is the user who has done the review */ $updateUser = $dms->getUser($r["userID"]); - print "
  • ".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."
    		• ".htmlspecialchars($r["comment"]); + print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$r["userID"]."'")."
    "; + print htmlspecialchars($r["comment"]); if($r['file']) { echo "
    "; echo " ".getMLText('download').""; @@ -805,9 +804,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if($accessop->mayReview()) { if ($is_reviewer) { if ($r["status"]==0) { - print "
  • getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-mini\">".getMLText("add_review")."
    • "; + print "
  • getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-primary btn-mini\">".getMLText("add_review")."
    • "; } elseif ($accessop->mayUpdateReview($updateUser) && (($r["status"]==1)||($r["status"]==-1))) { - print "
  • getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-mini\">".getMLText("edit")."
    • "; + print "
  • getVersion()."&reviewid=".$r['reviewID']."\" class=\"btn btn-primary btn-mini\">".getMLText("edit")."
    • "; } } } @@ -816,19 +815,22 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { print "
    "; +// $this->contentContainerEnd(); + print "
    "; + print "
    "; +// $this->contentContainerStart(); + print "".getMLText('approvers').""; + print "\n"; if (is_array($approvalStatus) && count($approvalStatus)>0) { - print ""; - print "\n"; - print "\n"; - print "\n"; - print ""; - print "\n"; - print "\n"; + print "\n"; + print "\n"; +// print ""; + print "\n"; + print "\n"; print "\n"; foreach ($approvalStatus as $a) { @@ -870,13 +872,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } break; } - print "\n"; + print "\n"; print "\n"; - print ""; - print "
    \n"; - $this->contentSubHeading(getMLText("approvers")); - print "
    ".getMLText("name")."".getMLText("last_update")."".getMLText("comment")."".getMLText("status")."".getMLText("name")."".getMLText("last_update").", ".getMLText("comment")."".getMLText("comment")."".getMLText("status")."
    ".$reqName."
    • ".$a["date"]."
      • "; + print "
    		".$a["date"]." - "; /* $updateUser is the user who has done the approval */ $updateUser = $dms->getUser($a["userID"]); - print "
  • ".(is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."
    		• ".htmlspecialchars($a["comment"]); + print (is_object($updateUser) ? htmlspecialchars($updateUser->getFullName()." (".$updateUser->getLogin().")") : "unknown user id '".$a["userID"]."'")."
    "; + print htmlspecialchars($a["comment"]); if($a['file']) { echo "
    "; echo " ".getMLText('download').""; @@ -890,9 +892,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { if($accessop->mayApprove()) { if ($is_approver) { if ($a['status'] == 0) { - print "
  • getVersion()."&approveid=".$a['approveID']."\">".getMLText("add_approval")."
    • "; + print "
  • getVersion()."&approveid=".$a['approveID']."\">".getMLText("add_approval")."
    • "; } elseif ($accessop->mayUpdateApproval($updateUser) && (($a["status"]==1)||($a["status"]==-1))) { - print "
  • getVersion()."&approveid=".$a['approveID']."\">".getMLText("edit")."
    • "; + print "
  • getVersion()."&approveid=".$a['approveID']."\">".getMLText("edit")."
    • "; } } } @@ -903,7 +905,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style { } print "
    \n"; - $this->contentContainerEnd(); +// $this->contentContainerEnd(); + print "
    "; + print ""; if($user->isAdmin()) { ?>