Moved css into a css file, added link to instant view.

PT: 1434184 Committed by: Megan Watson

Moved css into a css file, added link to instant view.
PT: 1434184 Committed by: Megan Watson
Megan Watson
1 parent c446a64b
Showing 2 changed files with 22 additions and 28 deletions
plugins/thumbnails/templates/thumbnail_viewlet.smarty
plugins/thumbnails/thumbnails.php
-{literal}
-<style>
-.thumb-shadow {
-  float:left;
-  background: url(plugins/thumbnails/templates/shadowAlpha.png) no-repeat bottom right !important;
-  background: url(plugins/thumbnails/templates/shadow.gif) no-repeat bottom right;
-  margin: 10px 0 0 10px !important;
-  margin: 10px 0 0 5px;
-  }
  
-.thumb-shadow img {
-  display: block;
-  position: relative;
-  background-color: #fff;
-  border: 1px solid #a9a9a9;
-  margin: -6px 6px 6px -6px;
-  padding: 4px;
-  }
-</style>
-{/literal}
 <div class="thumb-shadow">
     <div>
         {if $url}
             <a href='{$url}' target='_blank'>
         {/if}
-        <img src="{$thumbnail}"/>
+        <img src="{$thumbnail}" {if $height}height="{$height}"{/if} />
         {if $url}
             </a>
         {/if}
@@ -235,10 +235,14 @@ class ThumbnailViewlet extends KTDocumentViewlet {
     	    return '';
     	}
  
+    	// Get the CSS to render the thumbnail
+    	global $main;
+        $main->requireCSSResource('plugins/thumbnails/resources/thumbnails.css');
+
     	return $this->renderThumbnail($documentId);
     }
  
-    public function renderThumbnail($documentId) {
+    public function renderThumbnail($documentId, $height = null) {
         // Set up the template
         $oKTTemplating =& KTTemplating::getSingleton();
         $oTemplate =& $oKTTemplating->loadTemplate('thumbnail_viewlet');
@@ -284,10 +288,16 @@ class ThumbnailViewlet extends KTDocumentViewlet {
 		$thumbnailUrl = str_replace('\\', '/', $thumbnailUrl);
 		$thumbnailUrl = str_replace(KT_DIR, $sHostPath, $thumbnailUrl);
  
-		$oTemplate->setData(array(
+		$templateData = array(
             'thumbnail' => $thumbnailUrl,
             'url' => $url
-            ));
+        );
+
+        if(is_numeric($height)){
+            $templateData['height'] = $height;
+        }
+
+        $oTemplate->setData($templateData);
         return $oTemplate->render();
     }
  
@@ -317,11 +327,8 @@ class ThumbnailColumn extends AdvancedColumn {
     }
  
     function renderHeader($sReturnURL) {
-        global $main;
-
-        $path = dirname(__FILE__);
-
         // Get the CSS to render the thumbnail
+        global $main;
         $main->requireCSSResource('plugins/thumbnails/resources/thumbnails.css');
         return '&nbsp;';
     }
@@ -360,6 +367,11 @@ class ThumbnailColumn extends AdvancedColumn {
     		    return $tag;
     		}
  
+            // hook into thumbnail plugin to get display for thumbnail
+            $thumbnailer = new ThumbnailViewlet();
+            $thumbnailer->setDocument($oDoc);
+            $thumbnailDisplay = $thumbnailer->renderThumbnail($docid, $height);
+        	/*
         	$sHostPath = KTUtil::kt_url();
     		$plugin_path = KTPluginUtil::getPluginPath('thumbnails.generator.processor.plugin');
     		$thumbnailUrl = $plugin_path . 'thumbnail_view.php?documentId='.$docid;
@@ -370,8 +382,9 @@ class ThumbnailColumn extends AdvancedColumn {
     		<div class="thumb-shadow">
                     <img src="'.$thumbnailUrl.'" height='.$height.' />
             </div>';
+            */
  
-        	return $sInfo;
+        	return $thumbnailDisplay;
         }
         return '';
     }