Peter M. Groen / knowledgetree

Commit 397c1b549ba9757ce97a5dcd388f14084212f099

Authored by Jarrett Jordaan
1 parent 4666732e

PT:1434165: Thumbnail render updated. 

Committed by: Jarrett Jordaan

Reviewed by: Megan Watson
Inline Side-by-side
Showing 4 changed files with 6 additions and 5 deletions
plugins/ktcore/KTColumns.inc.php
  View file @397c1b5
... ... @@ -457,7 +457,7 @@ class AdvancedWorkflowColumn extends AdvancedColumn {
457 457  
458 458 function AdvancedWorkflowColumn() {
459 459 $this->label = _kt("Workflow State");
460   - $this->sortable = false;
  460 + $this->sortable = true;
461 461 }
462 462  
463 463 // use inline, since its just too heavy to even _think_ about using smarty.
... ...
plugins/ktstandard/documentpreview/documentPreview.php
  View file @397c1b5
... ... @@ -311,7 +311,7 @@ class DocumentPreview {
311 311 include_once(KT_DIR . '/plugins/thumbnails/thumbnails.php');
312 312 $thumbnailer = new ThumbnailViewlet();
313 313 $thumbnailer->setDocument($this->_oDocument);
314   - $thumbnailDisplay = $thumbnailer->renderThumbnail($this->_IDocId);
  314 + $thumbnailDisplay = $thumbnailer->renderThumbnail($this->_IDocId, null, false);
315 315 if ($thumbnailDisplay != '')
316 316 {
317 317 $sInfo = "<div>$thumbnailDisplay</div>";
... ...
plugins/thumbnails/templates/thumbnail_viewlet.smarty
  View file @397c1b5
  1 +{if $modal}
1 2 {literal}
2 3 <script type="text/javascript">
3 4 $(document).ready(function(){
... ... @@ -5,6 +6,7 @@
5 6 });
6 7 </script>
7 8 {/literal}
  9 +{/if}
8 10 <div class="thumb-shadow">
9 11 <div>
10 12 {if $url && $modal}
... ...
plugins/thumbnails/thumbnails.php
  View file @397c1b5
... ... @@ -242,7 +242,7 @@ class ThumbnailViewlet extends KTDocumentViewlet {
242 242 return $this->renderThumbnail($documentId);
243 243 }
244 244  
245   - public function renderThumbnail($documentId, $height = null) {
  245 + public function renderThumbnail($documentId, $height = null, $modal = null) {
246 246 // Set up the template
247 247 $oKTTemplating =& KTTemplating::getSingleton();
248 248 $oTemplate =& $oKTTemplating->loadTemplate('thumbnail_viewlet');
... ... @@ -274,12 +274,11 @@ class ThumbnailViewlet extends KTDocumentViewlet {
274 274  
275 275 // check for existence and status of the instant view plugin
276 276 $url = '';
277   - $modal = '';
278 277 $title = '';
279 278 if (KTPluginUtil::pluginIsActive('instaview.processor.plugin')) {
280 279 require_once KTPluginUtil::getPluginPath('instaview.processor.plugin') . 'instaViewLinkAction.php';
281 280 $ivLinkAction = new instaViewLinkAction();
282   - $modal = $ivLinkAction->isImage($documentId);
  281 + if(is_null($modal)) $modal = $ivLinkAction->isImage($documentId);
283 282 if($modal) { // If it requires a modal window, it only needs the document content
284 283 $url = $ivLinkAction->getViewLink($documentId, 'document_content');
285 284 $this->loadLightBox(); // Load lightbox effects
... ...