gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2024-10-17 05:22:23 +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-04-27 17:11:09 +02:00
commit 7e7b12f1c3
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
views/bootstrap/class.RemoveUserFromProcesses.php
View File

@ -40,6 +40,8 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Theme_Style {
$this->contentHeading(getMLText("rm_user_from_processes"));
$this->warningMsg(getMLText("confirm_rm_user_from_processes", array ("username" => htmlspecialchars($rmuser->getFullName()))));
$this->rowStart();
$this->columnStart(4);
?>
<form class="form-horizontal" action="../op/op.UsrMgr.php" name="form1" method="post">
<input type="hidden" name="userid" value="<?php print $rmuser->getID();?>">
@ -371,6 +373,9 @@ class SeedDMS_View_RemoveUserFromProcesses extends SeedDMS_Theme_Style {
</form>
<?php
$this->columnEnd();
$this->columnStart(8);
$this->rowEnd();
$this->contentEnd();
$this->htmlEndPage();
} /* }}} */

12
views/bootstrap/class.Timeline.php
View File

@ -48,7 +48,7 @@ class SeedDMS_View_Timeline extends SeedDMS_Theme_Style {
if($document && $version) {
// $this->contentHeading(getMLText("timeline_selected_item"));
print "<table id=\"viewfolder-table\" class=\"table table-condensed\">";
print "<table id=\"viewfolder-table\" class=\"table table-condensed table-sm\">";
print "<thead>\n<tr>\n";
print "<th></th>\n";
print "<th>".getMLText("name")."</th>\n";
@ -56,7 +56,9 @@ class SeedDMS_View_Timeline extends SeedDMS_Theme_Style {
print "<th>".getMLText("action")."</th>\n";
print "</tr>\n</thead>\n<tbody>\n";
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidthdetail, $timeout, $xsendfile);
echo $this->documentListRow($document, $previewer);
$extracontent = array();
$extracontent['below_title'] = $this->getListRowPath($document);
echo $this->documentListRow($document, $previewer, 0, false, $extracontent);
echo "</tbody>\n</table>\n";
}
@ -233,11 +235,11 @@ div.timeline-event-selected {
$this->pageNavigation(getMLText("admin_tools"), "admin_tools");
$this->rowStart();
$this->columnStart(3);
$this->columnStart(4);
$this->contentHeading(getMLText("timeline"));
$this->contentContainerStart();
?>
<form action="../out/out.Timeline.php" class="form form-inline" name="form1" id="form1">
<form action="../out/out.Timeline.php" class="form form-horizontal" name="form1" id="form1">
<?php
$this->formField(
getMLText("from"),
@ -269,7 +271,7 @@ div.timeline-event-selected {
$this->contentContainerEnd();
echo "<div class=\"ajax\" data-view=\"Timeline\" data-action=\"iteminfo\" ></div>";
$this->columnEnd();
$this->columnStart(9);
$this->columnStart(8);
$this->contentHeading(getMLText("timeline"));
$this->printTimelineHtml(550);
$this->columnEnd();