gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-02-11 17:44:56 +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-21 10:40:25 +02:00
commit 88ace95baa
6 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
views/bootstrap/class.ApprovalSummary.php
View File

@ -56,8 +56,6 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Theme_Style {
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
$previewer->setConverters($previewconverters);
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
$this->htmlStartPage(getMLText("approval_summary"));
$this->globalNavigation();
$this->contentStart();

2
views/bootstrap/class.ExpiredDocuments.php
View File

@ -58,8 +58,6 @@ class SeedDMS_View_ExpiredDocuments extends SeedDMS_Theme_Style {
$xsendfile = $this->params['xsendfile'];
$order = $orderby.$orderdir;
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
$db = $dms->getDB();
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);

2
views/bootstrap/class.ReviewSummary.php
View File

@ -56,8 +56,6 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Theme_Style {
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
$previewer->setConverters($previewconverters);
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
$this->htmlStartPage(getMLText("my_documents"));
$this->globalNavigation();
$this->contentStart();

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

@ -226,8 +226,6 @@ div.timeline-event-selected {
$todate = $this->params['todate'];
$skip = $this->params['skip'];
$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
if($fromdate) {
$from = makeTsFromLongDate($fromdate.' 00:00:00');
} else {

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

@ -689,7 +689,6 @@ class SeedDMS_View_ViewDocument extends SeedDMS_Theme_Style {
if($versions === null)
$versions = $document->getContent();
// $this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
$this->htmlAddHeader('<link href="../styles/bootstrap/timeline/timeline.css" rel="stylesheet">'."\n", 'css');
$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-min.js"></script>'."\n", 'js');
$this->htmlAddHeader('<script type="text/javascript" src="../styles/bootstrap/timeline/timeline-locales.js"></script>'."\n", 'js');

2
views/bootstrap/class.ViewFolder.php
View File

@ -572,8 +572,6 @@ $('body').on('click', '.order-btn', function(ev) {
$previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth, $timeout, $xsendfile);
$previewer->setConverters($previewconverters);
//$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/bootbox/bootbox.min.js"></script>'."\n", 'js');
// echo $this->callHook('startPage');
$this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName()))));
$this->globalNavigation($folder);