gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-13 13:11:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

place comment of version below version data (remove extra column)

Browse Source
This commit is contained in:
Uwe Steinmann 2020-04-21 11:56:20 +02:00
parent 560827ffdd
commit 2ca619045d
1 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
views/bootstrap/class.ViewDocument.php
View File

@ -567,14 +567,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$this->contentContainerStart(); $this->contentContainerStart();
print "<table class=\"table\">"; print "<table class=\"table\">";
print "<thead>\n<tr>\n"; print "<thead>\n<tr>\n";
print "<th width='*'></th>\n"; print "<th colspan=\"2\">".htmlspecialchars($latestContent->getOriginalFileName())."</th>\n";
print "<th width='*'>".getMLText("file")."</th>\n"; // print "<th width='*'>".getMLText("file")."</th>\n";
print "<th width='25%'>".getMLText("comment")."</th>\n"; // print "<th width='25%'>".getMLText("comment")."</th>\n";
print "<th width='15%'>".getMLText("status")."</th>\n"; print "<th width='20%'>".getMLText("status")."</th>\n";
print "<th width='20%'></th>\n"; print "<th width='25%'></th>\n";
print "</tr></thead><tbody>\n"; print "</tr></thead><tbody>\n";
print "<tr>\n"; print "<tr>\n";
print "<td>"; print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile); $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile);
$previewer->setConverters($previewconverters); $previewer->setConverters($previewconverters);
$previewer->createPreview($latestContent); $previewer->createPreview($latestContent);
@ -596,7 +596,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "</td>\n"; print "</td>\n";
print "<td><ul class=\"actions unstyled\">\n"; print "<td><ul class=\"actions unstyled\">\n";
print "<li class=\"wordbreak\">".$latestContent->getOriginalFileName() ."</li>\n"; // print "<li class=\"wordbreak\">".$latestContent->getOriginalFileName() ."</li>\n";
print "<li>".getMLText('version').": ".$latestContent->getVersion()."</li>\n"; print "<li>".getMLText('version').": ".$latestContent->getVersion()."</li>\n";
if ($file_exists) if ($file_exists)
@ -608,6 +608,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "<li>".getLongReadableDate($latestContent->getDate())."</li>"; print "<li>".getLongReadableDate($latestContent->getDate())."</li>";
print "</ul>\n"; print "</ul>\n";
$txt = $this->callHook('showVersionComment', $latestContent);
if($txt) {
echo $txt;
} else {
if($latestContent->getComment())
print "<p style=\"font-style: italic;\">".htmlspecialchars($latestContent->getComment())."</p>";
}
print "<ul class=\"actions unstyled\">\n"; print "<ul class=\"actions unstyled\">\n";
$attributes = $latestContent->getAttributes(); $attributes = $latestContent->getAttributes();
if($attributes) { if($attributes) {
@ -623,7 +630,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
} }
print "</ul></td>\n"; print "</ul></td>\n";
print "<td>".htmlspecialchars($latestContent->getComment())."</td>"; // print "<td>".htmlspecialchars($latestContent->getComment())."</td>";
print "<td width='10%'>"; print "<td width='10%'>";
print getOverallStatusText($status["status"]); print getOverallStatusText($status["status"]);
@ -1174,11 +1181,9 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "<table class=\"table\">"; print "<table class=\"table\">";
print "<thead>\n<tr>\n"; print "<thead>\n<tr>\n";
print "<th width='10%'></th>\n"; print "<th colspan=\"2\"></th>\n";
print "<th width='30%'>".getMLText("file")."</th>\n"; print "<th width='20%'>".getMLText("status")."</th>\n";
print "<th width='25%'>".getMLText("comment")."</th>\n"; print "<th width='25%'></th>\n";
print "<th width='15%'>".getMLText("status")."</th>\n";
print "<th width='20%'></th>\n";
print "</tr>\n</thead>\n<tbody>\n"; print "</tr>\n</thead>\n<tbody>\n";
for ($i = count($versions)-2; $i >= 0; $i--) { for ($i = count($versions)-2; $i >= 0; $i--) {
@ -1191,7 +1196,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
$file_exists=file_exists($dms->contentDir . $version->getPath()); $file_exists=file_exists($dms->contentDir . $version->getPath());
print "<tr>\n"; print "<tr>\n";
print "<td nowrap>"; print "<td style=\"width:".$previewwidthdetail."px; text-align: center;\">";
if($file_exists) { if($file_exists) {
if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes))) { if ($viewonlinefiletypes && (in_array(strtolower($version->getFileType()), $viewonlinefiletypes) || in_array(strtolower($version->getMimeType()), $viewonlinefiletypes))) {
print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\">"; print "<a target=\"_blank\" href=\"../op/op.ViewOnline.php?documentid=".$version->getDocument()->getId()."&version=".$version->getVersion()."\">";
@ -1210,7 +1215,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
} }
print "</td>\n"; print "</td>\n";
print "<td><ul class=\"unstyled\">\n"; print "<td><ul class=\"unstyled\">\n";
print "<li>".$version->getOriginalFileName()."</li>\n"; print "<li>".htmlspecialchars($version->getOriginalFileName())."</li>\n";
print "<li>".getMLText('version').": ".$version->getVersion()."</li>\n"; print "<li>".getMLText('version').": ".$version->getVersion()."</li>\n";
if ($file_exists) print "<li>". SeedDMS_Core_File::format_filesize($version->getFileSize()) .", ".htmlspecialchars($version->getMimeType())."</li>"; if ($file_exists) print "<li>". SeedDMS_Core_File::format_filesize($version->getFileSize()) .", ".htmlspecialchars($version->getMimeType())."</li>";
else print "<li><span class=\"warning\">".getMLText("document_deleted")."</span></li>"; else print "<li><span class=\"warning\">".getMLText("document_deleted")."</span></li>";
@ -1218,6 +1223,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$updatingUser->getEmail()."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>"; print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".$updatingUser->getEmail()."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
print "<li>".getLongReadableDate($version->getDate())."</li>"; print "<li>".getLongReadableDate($version->getDate())."</li>";
print "</ul>\n"; print "</ul>\n";
$txt = $this->callHook('showVersionComment', $version);
if($txt) {
echo $txt;
} else {
if($version->getComment())
print "<p style=\"font-style: italic;\">".htmlspecialchars($version->getComment())."</p>";
}
print "<ul class=\"actions unstyled\">\n"; print "<ul class=\"actions unstyled\">\n";
$attributes = $version->getAttributes(); $attributes = $version->getAttributes();
if($attributes) { if($attributes) {
@ -1232,7 +1244,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Bootstrap_Style {
} }
} }
print "</ul></td>\n"; print "</ul></td>\n";
print "<td>".htmlspecialchars($version->getComment())."</td>"; // print "<td>".htmlspecialchars($version->getComment())."</td>";
print "<td>".getOverallStatusText($vstat["status"])."</td>"; print "<td>".getOverallStatusText($vstat["status"])."</td>";
print "<td>"; print "<td>";
print "<ul class=\"actions unstyled\">"; print "<ul class=\"actions unstyled\">";