diff --git a/views/bootstrap/class.MyDocuments.php b/views/bootstrap/class.MyDocuments.php index b623fa49c..3c95909a5 100644 --- a/views/bootstrap/class.MyDocuments.php +++ b/views/bootstrap/class.MyDocuments.php @@ -39,8 +39,10 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $cachedir = $this->params['cachedir']; $workflowmode = $this->params['workflowmode']; + $previewwidth = 40; + $db = $dms->getDB(); - $previewer = new SeedDMS_Preview_Previewer($cachedir, 40); + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); $this->htmlStartPage(getMLText("my_documents")); $this->globalNavigation(); @@ -165,7 +167,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } @@ -202,7 +204,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } @@ -250,7 +252,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } @@ -284,7 +286,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } @@ -374,7 +376,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } @@ -450,7 +452,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } @@ -531,7 +533,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { print "".getMLText("expires")."\n"; print "\n\n\n"; - $previewer = new SeedDMS_Preview_Previewer($cachedir, 40); + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); foreach ($resArr as $res) { $document = $dms->getDocument($res["documentID"]); @@ -547,7 +549,7 @@ class SeedDMS_View_MyDocuments extends SeedDMS_Bootstrap_Style { $previewer->createPreview($latestContent); print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index d7dac0d79..5cd049654 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -79,6 +79,8 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { $searchin = $this->params['searchin']; $cachedir = $this->params['cachedir']; + $previewwidth = 40; + $this->htmlStartPage(getMLText("search_results")); $this->globalNavigation(); $this->contentStart(); @@ -324,7 +326,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { print "".getMLText("action")."\n"; print "\n\n\n"; - $previewer = new SeedDMS_Preview_Previewer($cachedir, 40); + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); foreach ($entries as $entry) { if(get_class($entry) == 'SeedDMS_Core_Document') { $document = $entry; @@ -347,7 +349,7 @@ class SeedDMS_View_Search extends SeedDMS_Bootstrap_Style { } print "getID()."\">"; if($previewer->hasPreview($lc)) { - print "getID()."&version=".$lc->getVersion()."&width=40\" title=\"".htmlspecialchars($lc->getMimeType())."\">"; + print "getID()."&version=".$lc->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($lc->getMimeType())."\">"; } else { print "getMimeIcon($lc->getFileType())."\" title=\"".htmlspecialchars($lc->getMimeType())."\">"; } diff --git a/views/bootstrap/class.ViewFolder.php b/views/bootstrap/class.ViewFolder.php index 00edd9104..f2f20661b 100644 --- a/views/bootstrap/class.ViewFolder.php +++ b/views/bootstrap/class.ViewFolder.php @@ -85,6 +85,8 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { $enableRecursiveCount = $this->params['enableRecursiveCount']; $maxRecursiveCount = $this->params['maxRecursiveCount']; + $previewwidth = 40; + $folderid = $folder->getId(); $this->htmlStartPage(getMLText("folder_title", array("foldername" => htmlspecialchars($folder->getName())))); @@ -274,7 +276,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { print "\n"; } - $previewer = new SeedDMS_Preview_Previewer($cachedir, 40); + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); foreach($documents as $document) { $owner = $document->getOwner(); @@ -305,7 +307,7 @@ class SeedDMS_View_ViewFolder extends SeedDMS_Bootstrap_Style { if (file_exists($dms->contentDir . $latestContent->getPath())) { print ""; if($previewer->hasPreview($latestContent)) { - print "getID()."&version=".$latestContent->getVersion()."&width=40\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; + print "getID()."&version=".$latestContent->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } else { print "getMimeIcon($latestContent->getFileType())."\" title=\"".htmlspecialchars($latestContent->getMimeType())."\">"; } diff --git a/views/bootstrap/class.WorkflowSummary.php b/views/bootstrap/class.WorkflowSummary.php index 39e4e1f17..847858de2 100644 --- a/views/bootstrap/class.WorkflowSummary.php +++ b/views/bootstrap/class.WorkflowSummary.php @@ -36,6 +36,8 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style { $user = $this->params['user']; $cachedir = $this->params['cachedir']; + $previewwidth = 40; + $this->htmlStartPage(getMLText("my_documents")); $this->globalNavigation(); $this->contentStart(); @@ -47,7 +49,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style { // Get document list for the current user. $workflowStatus = $user->getWorkflowStatus(); - $previewer = new SeedDMS_Preview_Previewer($cachedir, 40); + $previewer = new SeedDMS_Preview_Previewer($cachedir, $previewwidth); $printheader=true; $iRev = array(); @@ -81,7 +83,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style { print "\n"; print "getID()."&version=".$st['version']."\">"; if($previewer->hasPreview($version)) { - print "getID()."&version=".$version->getVersion()."&width=40\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } else { print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } @@ -137,7 +139,7 @@ class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style { print "\n"; print "getID()."&version=".$st['version']."\">"; if($previewer->hasPreview($version)) { - print "getID()."&version=".$version->getVersion()."&width=40\" title=\"".htmlspecialchars($version->getMimeType())."\">"; + print "getID()."&version=".$version->getVersion()."&width=".$previewwidth."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; } else { print "getMimeIcon($version->getFileType())."\" title=\"".htmlspecialchars($version->getMimeType())."\">"; }