From 6f8f56ad4bfd2c2a66b5e28d6ce2fd101ab884e9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Sun, 12 Nov 2023 19:05:35 +0100 Subject: [PATCH] sync with layout of ViewDocument --- .../bootstrap/class.DocumentVersionDetail.php | 139 ++++++++++++------ 1 file changed, 90 insertions(+), 49 deletions(-) diff --git a/views/bootstrap/class.DocumentVersionDetail.php b/views/bootstrap/class.DocumentVersionDetail.php index 4d751bff9..91c2404c0 100644 --- a/views/bootstrap/class.DocumentVersionDetail.php +++ b/views/bootstrap/class.DocumentVersionDetail.php @@ -46,6 +46,41 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style { "; + foreach($items as $item) { + if(is_string($item)) + echo "
  • ".$item."
    • "; + elseif(is_array($item)) { + echo "
  • ".(!empty($item['icon']) ? " " : "").''.getMLText($item['label'])."
    • "; + } + } + print ""; + return; + print ""; + } /* }}} */ + function preview() { /* {{{ */ $dms = $this->params['dms']; $document = $this->params['document']; @@ -139,7 +174,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style { $user = $this->params['user']; $folder = $this->params['folder']; $document = $this->params['document']; - $accessop = $this->params['accessobject']; + $accessobject = $this->params['accessobject']; $version = $this->params['version']; $viewonlinefiletypes = $this->params['viewonlinefiletypes']; $enableversionmodification = $this->params['enableversionmodification']; @@ -249,18 +284,20 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style { $file_exists=file_exists($dms->contentDir . $version->getPath()); $this->contentHeading(getMLText("details_version", array ("version" => $version->getVersion()))); - $this->contentContainerStart(); - print ""; - print "\n\n"; - print "\n"; +// $this->contentContainerStart(); +// print "
    ".htmlspecialchars($version->getOriginalFileName())."
    "; +// print "\n\n"; +// print "\n"; // print "\n"; - print "\n"; - print "\n"; - print "\n\n\n"; - print "\n"; - print "\n"; +// print "\n"; +// print "\n\n\n"; +// print "\n"; +// print "\n"; +// print "\n"; - print "\n"; - - print ""; + print ""; + print ""; +// print "\n"; - print ""; + +// print ""; - print "\n
    ".htmlspecialchars($version->getOriginalFileName())."".getMLText("comment")."".getMLText("status")."
      "; +// print "
    		".getMLText("status")."
      "; - print "
    "; +// print ""; + $this->rowStart(); + $this->columnStart(3); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile); if($conversionmgr) $previewer->setConversionMgr($conversionmgr); @@ -282,9 +319,12 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style { if ($file_exists) { print ""; } - print "
      \n"; +// print "
    		"; + $this->columnEnd(); + $this->columnStart(5); + print "
      \n"; print "
    • ".getMLText('version').": ".$version->getVersion()."
      • \n"; if ($file_exists) @@ -316,50 +356,51 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style { } } } - print "
    		"; - print getOverallStatusText($status["status"]); + print "
  • ".getMLText('status').": ".getOverallStatusText($status["status"]); if ( $status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP || $status["status"]==S_IN_WORKFLOW || $status["status"]==S_EXPIRED ){ print "
    hasExpired()?" class=\"warning\" ":"").">".(!$document->getExpires() ? getMLText("does_not_expire") : getMLText("expires").": ".getReadableDate($document->getExpires())).""; } - print "
    		• "; +// print ""; + $this->columnEnd(); + $this->columnStart(4); +// print ""; - //if (($document->getAccessMode($user) >= M_READWRITE)) { if ($file_exists){ - print ""; - } - - print ""; - echo "
    \n"; + $items = array(); + if($accessobject->mayRemoveVersion()) { + $items[] = array('link'=>$this->html_url('RemoveVersion', array('documentid'=>$version->getDocument()->getId(),'version'=>$version->getVersion())), 'icon'=>'remove', 'label'=>'rm_version'); + } - $this->contentContainerEnd(); + if($newitems = $this->callHook('extraVersionActions', $version)) + $items = array_merge($items, $newitems); + if($items) { + $this->showActions($items); + } +// echo ""; +// print "\n\n"; + + $this->columnEnd(); + $this->rowEnd(); +// $this->contentContainerEnd(); $this->rowStart(); $this->columnStart(6); @@ -554,7 +595,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style { $this->contentContainerEnd(); } /* }}} */ - if($accessop->check_view_access($this, array('action'=>'statuslog'))) { + if($accessobject->check_view_access($this, array('action'=>'statuslog'))) { $this->contentHeading(getMLText("status")); $this->contentContainerStart(); $statuslog = $version->getStatusLog(); @@ -572,7 +613,7 @@ class SeedDMS_View_DocumentVersionDetail extends SeedDMS_Theme_Style { $this->contentContainerEnd(); } - if($accessop->check_view_access($this, array('action'=>'finished_workflowlog'))) { + if($accessobject->check_view_access($this, array('action'=>'finished_workflowlog'))) { $wkfalllogs = $version->getWorkflowLog(); if($wkfalllogs) { $this->contentHeading(getMLText("finished_workflow_log"));