gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-04 15:12:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2021-05-03 08:07:29 +02:00
commit 0a8659826f
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -649,7 +649,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
print "<th colspan=\"2\">".htmlspecialchars($latestContent->getOriginalFileName())."</th>\n";
// print "<th width='*'>".getMLText("file")."</th>\n";
// print "<th width='25%'>".getMLText("comment")."</th>\n";
print "<th width='20%'>".getMLText("status")."</th>\n";
print "<th width='25%'></th>\n";
print "</tr></thead><tbody>\n";
print "<tr>\n";
@ -691,7 +690,13 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".htmlspecialchars($updatingUser->getEmail())."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
print "<li>".getLongReadableDate($latestContent->getDate())."</li>";
print "<li>".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 "<br><span".($document->hasExpired()?" class=\"warning\" ":"").">".(!$document->getExpires() ? getMLText("does_not_expire") : getMLText("expires").": ".getReadableDate($document->getExpires()))."</span>";
}
print "</li>";
print "</ul>\n";
$txt = $this->callHook('showVersionComment', $latestContent);
if($txt) {
echo $txt;
@ -703,13 +708,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
$this->printVersionAttributes($folder, $latestContent);
print "</ul></td>\n";
print "<td width='10%'>";
print getOverallStatusText($status["status"]);
if ( $status["status"]==S_DRAFT_REV || $status["status"]==S_DRAFT_APP || $status["status"]==S_IN_WORKFLOW || $status["status"]==S_EXPIRED ){
print "<br><span".($document->hasExpired()?" class=\"warning\" ":"").">".(!$document->getExpires() ? getMLText("does_not_expire") : getMLText("expires").": ".getReadableDate($document->getExpires()))."</span>";
}
print "</td>";
print "<td>";
if ($file_exists){
@ -810,14 +808,14 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
$this->contentContainerStart();
$statuslog = $latestContent->getStatusLog();
echo "<table class=\"table table-condensed table-sm\"><thead>";
echo "<th>".getMLText('date')."</th><th>".getMLText('status')."</th><th>".getMLText('user')."</th><th>".getMLText('comment')."</th></tr>\n";
echo "<th>".getMLText('date')."/".getMLText('user')."</th><th>".getMLText('status')."</th><th>".getMLText('comment')."</th></tr>\n";
echo "</thead><tbody>";
foreach($statuslog as $entry) {
if($suser = $dms->getUser($entry['userID']))
$fullname = htmlspecialchars($suser->getFullName());
else
$fullname = "--";
echo "<tr><td>".getLongReadableDate($entry['date'])."</td><td>".getOverallStatusText($entry['status'])."</td><td>".$fullname."</td><td>".htmlspecialchars($entry['comment'])."</td></tr>\n";
echo "<tr><td>".getLongReadableDate($entry['date'])."<br />".$fullname."</td><td>".getOverallStatusText($entry['status'])."</td><td>".htmlspecialchars($entry['comment'])."</td></tr>\n";
}
print "</tbody>\n</table>\n";
$this->contentContainerEnd();
@ -1578,7 +1576,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
print "<table class=\"table\">";
print "<thead>\n<tr>\n";
print "<th colspan=\"2\"></th>\n";
print "<th width='20%'>".getMLText("status")."</th>\n";
print "<th width='25%'></th>\n";
print "</tr>\n</thead>\n<tbody>\n";
@ -1615,7 +1612,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
print "</a>\n";
}
print "</td>\n";
print "<td><ul class=\"properties unstyled\">\n";
print "<td><ul class=\"actions unstyled\">\n";
print "<li>".htmlspecialchars($version->getOriginalFileName())."</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>";
@ -1623,6 +1620,7 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
$updatingUser = $version->getUser();
print "<li>".getMLText("uploaded_by")." <a href=\"mailto:".htmlspecialchars($updatingUser->getEmail())."\">".htmlspecialchars($updatingUser->getFullName())."</a></li>";
print "<li>".getLongReadableDate($version->getDate())."</li>";
print "<li>".getMLText('status').": ".getOverallStatusText($vstat["status"])."</li>";
print "</ul>\n";
$txt = $this->callHook('showVersionComment', $version);
if($txt) {
@ -1635,7 +1633,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
$this->printVersionAttributes($folder, $version);
print "</ul></td>\n";
// print "<td>".htmlspecialchars($version->getComment())."</td>";
print "<td>".getOverallStatusText($vstat["status"])."</td>";
print "<td>";
if ($file_exists){
print "<ul class=\"actions unstyled\">";

1
views/bootstrap4/styles/application.css
View File

@ -69,6 +69,7 @@ span.list-details {
ul.actions {
list-style: none;
padding-left: 0px;
}
ul.actions li a:hover > i {
text-decoration: none;