diff --git a/lib/actions/documentviewlet.inc.php b/lib/actions/documentviewlet.inc.php
new file mode 100644
index 0000000..613ff12
--- /dev/null
+++ b/lib/actions/documentviewlet.inc.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * $Id: documentaction.inc.php 5848 2006-08-16 15:58:51Z bshuttle $
+ *
+ * The contents of this file are subject to the KnowledgeTree Public
+ * License Version 1.1 ("License"); You may not use this file except in
+ * compliance with the License. You may obtain a copy of the License at
+ * http://www.ktdms.com/KPL
+ * 
+ * Software distributed under the License is distributed on an "AS IS"
+ * basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ * 
+ * The Original Code is: KnowledgeTree Open Source
+ * 
+ * The Initial Developer of the Original Code is The Jam Warehouse Software
+ * (Pty) Ltd, trading as KnowledgeTree.
+ * Portions created by The Jam Warehouse Software (Pty) Ltd are Copyright
+ * (C) 2006 The Jam Warehouse Software (Pty) Ltd;
+ * All Rights Reserved.
+ *
+ */
+ 
+require_once(KT_LIB_DIR . "/actions/documentaction.inc.php");
+
+class KTDocumentViewlet extends KTDocumentAction {
+    var $sName;
+    var $sDescription;
+
+    var $_sShowPermission = "ktcore.permissions.read";
+    
+    // the only major distinction of the viewlet vs. the action is the
+    // display_viewlet() method.
+
+    function display_viewlet() {
+        return "";
+    }
+}
+
+?>
diff --git a/templates/ktcore/document/view.smarty b/templates/ktcore/document/view.smarty
index eebe3a7..4097ab5 100644
--- a/templates/ktcore/document/view.smarty
+++ b/templates/ktcore/document/view.smarty
@@ -40,20 +40,14 @@ these tasks, use the Request Assistance action.{/i18n}
 {$oFieldset->render($document_data)}
 {/foreach}
 
+{if !empty($viewlets)}
+
 <!--  Document "Views" -->
 <div id="document-views">
 
-<div class="ktError"><p>Someone please suggest some "viewlets" we can ship by default ...
-this is a tad bare.</p></div>
-
-{*
-<div class="downloadbox">
-    <ul>
-        {foreach from=$viewlet_info item=aInfo}
-        <li class="{$aInfo.icon_class}"><a href="{$aInfo.url}">{$aInfo.name}</a></li>       
-        {/foreach}
-    </ul>
-</div>
-*}
+{foreach from=$viewlets item=oViewlet}
+  {$oViewlet->display_viewlet()}
+{/foreach}
 
 </div>
+{/if}
diff --git a/view.php b/view.php
index 91a52d7..4cfbb57 100755
--- a/view.php
+++ b/view.php
@@ -200,36 +200,26 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
             }
         }
 
-        $this->oPage->setContentClass('view');
-        /*
-        // we want to enable the viewlets.
-
-        $aMajorInfo = KTDocumentActionUtil::getDocumentActionsByNames(array('ktcore.actions.document.view',), 'documentinfo', $this->oDocument, $this->oUser);                
-        $aMajorActions = KTDocumentActionUtil::getDocumentActionsByNames(array(
-            'ktcore.actions.document.checkout',
-            'ktcore.actions.document.cancelcheckout',
-             'ktcore.actions.document.checkin',
-             'ktcore.actions.document.edit'
-            ), 'documentaction', $this->oDocument, $this->oUser);
-
-        $aMajorViewletActions = kt_array_merge($aMajorInfo, $aMajorActions);
-        $aViewletInfo = array();
-
-        //var_dump($aMajorActions[0]);
-
-        foreach ($aMajorViewletActions as $action) {
-
-            $aInfo = $action->getInfo();
-
+        // viewlets.
+        $aViewlets = array();
+        $aViewletActions = KTDocumentActionUtil::getDocumentActionsForDocument($this->oDocument, $this->oUser, 'documentviewlet');
+        foreach ($aViewletActions as $oAction) {
+            $aInfo = $oAction->getInfo();
+            
             if ($aInfo !== null) {
-                if ($aInfo["ns"] == $this->sName) {
-                    unset($aInfo["url"]);
-                    $aInfo['active'] = true;
-                }
-                $aViewletInfo[] = $aInfo;
+                $aViewlets[] = $oAction; // use the action, since we display_viewlet() later.            
             }
-        }
-        */
+        } 
+        
+        
+        $content_class = 'view';
+        if (!empty($aViewlets)) {
+            $content_class = 'view withviewlets';
+        } 
+        $this->oPage->setContentClass($content_class);
+        
+
+        
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate = $oTemplating->loadTemplate("ktcore/document/view");
         $aTemplateData = array(
@@ -241,7 +231,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
               "document" => $oDocument,
               "document_data" => $document_data,
               "fieldsets" => $fieldsets,
-              'viewlet_info' => $aViewletInfo,
+              'viewlets' => $aViewlets,
         );
         //return '<pre>' . print_r($aTemplateData, true) . '</pre>';
         return $oTemplate->render($aTemplateData);