From 6c6d3c75c69d3f003abc3d2a0819591c88ab7686 Mon Sep 17 00:00:00 2001 From: steinm Date: Fri, 25 Jan 2013 07:36:43 +0000 Subject: [PATCH] - added preview images - put comment of folder/document below of name --- views/bootstrap/class.Search.php | 35 +++++++++++++++++++++++--------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/views/bootstrap/class.Search.php b/views/bootstrap/class.Search.php index 2443d5ed9..51b9c2f30 100644 --- a/views/bootstrap/class.Search.php +++ b/views/bootstrap/class.Search.php @@ -41,6 +41,7 @@ class LetoDMS_View_Search extends LetoDMS_Bootstrap_Style { $searchTime = $this->params['searchtime']; $urlparams = $this->params['urlparams']; $searchin = $this->params['searchin']; + $cachedir = $this->params['cachedir']; $this->htmlStartPage(getMLText("search_results")); $this->globalNavigation($folder); @@ -60,17 +61,25 @@ class LetoDMS_View_Search extends LetoDMS_Bootstrap_Style { print "".getMLText("owner")."\n"; print "".getMLText("status")."\n"; print "".getMLText("version")."\n"; - print "".getMLText("comment")."\n"; +// print "".getMLText("comment")."\n"; //print "".getMLText("reviewers")."\n"; //print "".getMLText("approvers")."\n"; print "\n\n\n"; + $previewer = new LetoDMS_Preview_Previewer($cachedir, 40); $foldercount = $doccount = 0; foreach ($entries as $entry) { if(get_class($entry) == 'LetoDMS_Core_Document') { $document = $entry; $doccount++; $lc = $document->getLatestContent(); + $previewer->createPreview($lc); + + if (in_array(3, $searchin)) + $comment = markQuery(htmlspecialchars($document->getComment())); + else + $comment = htmlspecialchars($document->getComment()); + if (strlen($comment) > 150) $comment = substr($comment, 0, 147) . "..."; print ""; //print ""; if (in_array(2, $searchin)) { @@ -78,7 +87,13 @@ class LetoDMS_View_Search extends LetoDMS_Bootstrap_Style { } else { $docName = htmlspecialchars($document->getName()); } - print "getID()."\">getMimeIcon($lc->getFileType())."\" title=\"".htmlspecialchars($lc->getMimeType())."\">"; + print "getID()."\">"; + if($previewer->hasPreview($lc)) { + print "getID()."&version=".$lc->getVersion()."&width=40\" title=\"".htmlspecialchars($lc->getMimeType())."\">"; + } else { + print "getMimeIcon($lc->getFileType())."\" title=\"".htmlspecialchars($lc->getMimeType())."\">"; + } + print ""; print "getID()."\">/"; $folder = $document->getFolder(); $path = $folder->getPath(); @@ -86,11 +101,15 @@ class LetoDMS_View_Search extends LetoDMS_Bootstrap_Style { print htmlspecialchars($path[$i]->getName())."/"; } print $docName; - print ""; + print ""; + if($comment) { + print "
".htmlspecialchars($comment).""; + } + print ""; $attributes = $lc->getAttributes(); print ""; - print "