5 Brad Shuttleworth <brad@jamwarehouse.com> Fri 2005-11-18 15:55:21 +0200

merge up: 2005-11-18 15:55 4 Brad Shuttleworth <brad@jamwarehouse.com> Fri 2005-11-18 15:47:16 +0200 merge in admin first-pass update. 3 Brad Shuttleworth <brad@jamwarehouse.com> Fri 2005-11-18 13:18:04 +0200 merged in the dispatcher / templating changes to correctly handle info and error messages. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4039 c91229c3-7414-0410-bfa2-8a42b809f60b

5 Brad Shuttleworth <brad@jamwarehouse.com> Fri 2005-11-18 15:55:21 +0200
merge up: 2005-11-18 15:55 4 Brad Shuttleworth <brad@jamwarehouse.com> Fri 2005-11-18 15:47:16 +0200 merge in admin first-pass update. 3 Brad Shuttleworth <brad@jamwarehouse.com> Fri 2005-11-18 13:18:04 +0200 merged in the dispatcher / templating changes to correctly handle info and error messages. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4039 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 4d4e3158
Showing 20 changed files with 391 additions and 271 deletions
config/siteMap.inc
lib/dispatcher.inc.php
lib/documentmanagement/Document.inc
lib/foldermanagement/Folder.inc
lib/templating/kt3template.inc.php
plugins/ktcore/KTAdminNavigation.php
plugins/ktcore/KTAdminPlugins.php
presentation/lookAndFeel/knowledgeTree/administration/admin.php
presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/documentCheckout.php
presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutBL.php
presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/editDocCheckoutUI.inc
presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/listDocumentsBL.php
presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php
resources/css/kt-framing.css
templates/kt3/admin_items.smarty
templates/kt3/standard_page.smarty
templates/ktcore/document/admin/checkoutlisting.smarty
templates/ktcore/document/admin/force_checkin_confirm.smarty
templates/ktcore/fields/list.smarty
templates/ktcore/metadata/listFieldsets.smarty
@@ -105,7 +105,7 @@ $default-&gt;siteMap-&gt;addPage(&quot;unitManagement&quot;, &quot;/presentation/lookAndFeel/knowledg
 $default->siteMap->addPage("orgManagement", "/presentation/lookAndFeel/knowledgeTree/administration/orgmanagement/listOrgBL.php", "Administration", SysAdmin, _("Organisation Management"), true, 4);
 $default->siteMap->addPage("doctype", "presentation/lookAndFeel/knowledgeTree/administration/doctypemanagement/documentTypes.php", "Administration", SysAdmin, _("Document Type Management"), true, 5);
-$default->siteMap->addPage("docfield", "/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php", "Administration", SysAdmin, _("Document Field Management"), true, 6);
+$default->siteMap->addPage("docfield", "/presentation/lookAndFeel/knowledgeTree/administration/admin.php/documents/fieldmanagement", "Administration", SysAdmin, _("Document Field Management"), true, 6);
 $default->siteMap->addPage("archivedDocuments", "/presentation/lookAndFeel/knowledgeTree/administration/documentmanagement/manageArchivedDocumentsBL.php", "Administration", UnitAdmin, _("Restore Archived Documents"), true, 7);
 $default->siteMap->addPage("deletedDocuments", "/presentation/lookAndFeel/knowledgeTree/administration/documentmanagement/listDeletedDocumentsBL.php", "Administration", UnitAdmin, _("Deleted Documents"), true, 8);
@@ -179,6 +179,23 @@ class KTStandardDispatcher extends KTDispatcher {
         $this->oPage->setPageContents($data);
         $this->oPage->setUser($this->oUser);
+		// handle errors that were set using KTErrorMessage.
+		$errors = KTUtil::arrayGet($_SESSION, 'KTErrorMessage', array());
+		if (!empty($errors)) {
+            foreach ($errors as $sError) {
+		        $this->oPage->addError($sError);
+			}
+			$_SESSION['KTErrorMessage'] = array(); // clean it out.
+		}
+
+		// handle notices that were set using KTInfoMessage.
+		$info = KTUtil::arrayGet($_SESSION, 'KTInfoMessage', array());
+		if (!empty($info)) {
+            foreach ($info as $sInfo) {
+		        $this->oPage->addInfo($sInfo);
+			}
+			$_SESSION['KTInfoMessage'] = array(); // clean it out.
+		}
 		// add last, standard portlets
 		$this->oPage->addPortlet(new KTSearchPortlet());
@@ -531,7 +531,7 @@ class Document extends KTEntity {
         $sFolderPath = Folder::getFolderDisplayPath($this->iFolderID);
         // #3425 for consistency
         return ($bDisplayIcon ? $this->getIcon() : "") .
-           ($sFolderPath == "" ? "Deleted Folder" : $sFolderPath) . " > " . $this->sFileName;
+           ($sFolderPath == "" ? "Deleted Folder" : $sFolderPath) . " &raquo; " . $this->sFileName;
     }
     // }}}
@@ -421,7 +421,7 @@ class Folder extends KTEntity {
 		global $default;
         $aPathNamesArray = Folder::getFolderPathNamesAsArray($iFolderID);
         if (count($aPathNamesArray) > 0) {
-        	return implode(" > ", $aPathNamesArray);
+        	return implode(" &raquo; ", $aPathNamesArray);
         } else {
         	return "";
         }
@@ -21,6 +21,7 @@ class KTPage {
 	/** context-relevant information */
 	var $errStack = Array();
+    var $infoStack = Array();
 	var $portlets = Array();
     /** miscellaneous items */
@@ -167,6 +168,7 @@ class KTPage {
 	}
 	function addError($sError) { array_push($this->errStack, $sError); }
+	function addInfo($sInfo) { array_push($this->infoStack, $sInfo); }
 	/** no-one cares what a portlet is, but it should be renderable, and have its ->title member set. */
 	function addPortlet($oPortlet) {
@@ -18,14 +18,16 @@ class KTAdminNavigationRegistry {
     // namespace, class, category, title, description
     // if category is specified, it looks for an item with THAT NAME for its details.
     function registerLocation($sName, $sClass, $sCategory, $sTitle, $sDescription, $sDispatcherFilePath = null, $sURL = null) {
+        $sFullname = $sCategory . '/' . $sName;
         $aInfo = array(
             "name" => $sName,
             "class" => $sClass,
             "title" => $sTitle,
             "description"=> $sDescription, 
             "filepath" => $sDispatcherFilePath, 
-            "url" => $sURL);     
-        $this->aResources[$sName] = $aInfo;
+            "url" => $sURL,
+            "fullname" => $sFullname);     
+        $this->aResources[$sFullname] = $aInfo;
         // is this a toplevel item?
         if ($sCategory != null) {
             if (!array_key_exists($sCategory, $this->aCategories)) { 
@@ -7,7 +7,7 @@ $oAdminRegistry =&amp; KTAdminNavigationRegistry::getSingleton();
 // set up the categories.
 $oAdminRegistry->registerCategory("principals", "Users and Groups", " Control which users can log in, and are part of which groups and organisational units from these management panels.");
 $oAdminRegistry->registerCategory("security", "Security Management", " Assign permissions to users and groups, and specify which permissions are required to interact with various parts of the Document Management System.");
-$oAdminRegistry->registerCategory("storage", "Document Storage", "Manage how and where the actual documents will be stored, and work with document archives.");
+$oAdminRegistry->registerCategory("storage", "Document Storage", "Manage how and where the actual documents will be stored, work with document archives and deal with other document related problems.");
 $oAdminRegistry->registerCategory("documents", "Document Type Configuration", "Configure the information that needs to be collected about different kinds of documents.");
 $oAdminRegistry->registerCategory("collections", "Collections", "Specify how groups of documents are displayed in browse and search mode.");
@@ -25,8 +25,15 @@ $oAdminRegistry-&gt;registerCategory(&quot;collections&quot;, &quot;Collections&quot;, &quot;Specify how gro
 // FIXME url traversal DOESN'T WORK
 // users and groups
-$oAdminRegistry->registerLocation("principals/admin",null,"principals", "Add/Remove Users","Add or remove users from the system.",null, "/control.php?action=userManagement")
+$oAdminRegistry->registerLocation("admin",null,"principals", "Add/Remove Users","Add or remove users from the system.",null, "/control.php?action=userManagement");
+// documents
+$oAdminRegistry->registerLocation("fieldmanagement",'KTDocumentFieldDispatcher','documents', 'Document Fieldsets','Control which kinds of documents have which sets of information associated with them.', KT_DIR . '/presentation/lookAndFeel/knowledgeTree/administration/docfieldmanagement/documentFields.php', null);
+
+
+// storage
+$oAdminRegistry->registerLocation("checkout",'KTCheckoutAdminDispatcher','storage', 'Checked Out Document Control','Override the checked-out status of documents if a user has failed to do so.', KT_DIR . '/presentation/lookAndFeel/knowledgeTree/administration/doccheckoutmanagement/documentCheckout.php', null);
+
 ?>
 \ No newline at end of file
@@ -10,53 +10,62 @@ require_once(KT_DIR . &quot;/plugins/ktcore/KTAdminNavigation.php&quot;);
 require_once(KT_DIR . "/plugins/ktcore/KTAdminPlugins.php");
 class AdminSplashDispatcher extends KTAdminDispatcher {
-    var $sub_url = '';
-	
-	var $aBreadcrumbs = array(
+    var $category = '';
+    
+    var $aBreadcrumbs = array(
         array('action' => 'administration', 'name' => 'Administration'),
     );
-	
+    
     function AdminSplashDispatcher() {
-		parent::KTAdminDispatcher();
-	}
+        parent::KTAdminDispatcher();
+    }
-	function do_main() {
-	    // are we categorised, or not?
-		$oRegistry =& KTAdminNavigationRegistry::getSingleton();
-		$categories = $oRegistry->getCategories();		
-		
-		$this->oPage->title = "DMS Administration: ";
+    function do_main() {
+        if ($this->category !== '') {
+            return $this->do_viewCategory();
+        };
+    
+    
+        // are we categorised, or not?
+        $oRegistry =& KTAdminNavigationRegistry::getSingleton();
+        $categories = $oRegistry->getCategories();		
+        
+        // we need to investigate sub_url solutions.
+        
+        $this->oPage->title = "DMS Administration: ";
         $oTemplating = new KTTemplating;
-		$oTemplate = $oTemplating->loadTemplate("kt3/admin_categories");
-		$aTemplateData = array(
+        $oTemplate = $oTemplating->loadTemplate("kt3/admin_categories");
+        $aTemplateData = array(
               "context" => $this,
-			  "categories" => $categories,
-		);
-		return $oTemplate->render($aTemplateData);				
-	}
+              "categories" => $categories,
+              "baseurl" => KTUtil::getRequestScriptName($_SERVER),
+        );
+        return $oTemplate->render($aTemplateData);				
+    }
     function do_viewCategory() {
-	    // are we categorised, or not?
-		
-		$category = KTUtil::arrayGet($_REQUEST, "fCategory");
-		
-		$oRegistry =& KTAdminNavigationRegistry::getSingleton();
-		$aCategory = $oRegistry->getCategory($category);		
-		
-		$aItems = $oRegistry->getItemsForCategory($category);
-		$this->aBreadcrumbs[] = array("name" => $aCategory["title"]);
+        // are we categorised, or not?
+        
+        $category = KTUtil::arrayGet($_REQUEST, "fCategory", $this->category);
+        
+        $oRegistry =& KTAdminNavigationRegistry::getSingleton();
+        $aCategory = $oRegistry->getCategory($category);		
+        
+        $aItems = $oRegistry->getItemsForCategory($category);
+        $this->aBreadcrumbs[] = array("name" => $aCategory["title"]);
-		
-		$this->oPage->title = "DMS Administration: " . $aCategory["title"];
+        
+        $this->oPage->title = "DMS Administration: " . $aCategory["title"];
         $oTemplating = new KTTemplating;
-		$oTemplate = $oTemplating->loadTemplate("kt3/admin_items");
-		$aTemplateData = array(
+        $oTemplate = $oTemplating->loadTemplate("kt3/admin_items");
+        $aTemplateData = array(
               "context" => $this,
-			  "category" => $aCategory,
-			  "items" => $aItems, 
-		);
-		return $oTemplate->render($aTemplateData);				
-	}
+              "category" => $aCategory,
+              "items" => $aItems, 
+              "baseurl" => KTUtil::getRequestScriptName($_SERVER),
+        );
+        return $oTemplate->render($aTemplateData);				
+    }
 }
 $sub_url = KTUtil::arrayGet($_SERVER, 'PATH_INFO');
@@ -69,10 +78,18 @@ if (empty($sub_url)) {
     $oRegistry =& KTAdminNavigationRegistry::getSingleton();
     if ($oRegistry->isRegistered($sub_url)) {
        $oDispatcher = $oRegistry->getDispatcher($sub_url);
-	} else {
-	   // FIXME (minor) redirect to no-suburl?
-	   $oDispatcher = new AdminSplashDispatcher();
-	}
+       
+       $aParts = explode('/',$sub_url);
+        
+       $oRegistry =& KTAdminNavigationRegistry::getSingleton();
+       $aCategory = $oRegistry->getCategory($aParts[0]);			   
+       
+       $oDispatcher->aBreadcrumbs[] = array("name" => $aCategory['title'], "url" => KTUtil::getRequestScriptName($_SERVER) . '/' . $aParts[0]);
+    } else {
+       // FIXME (minor) redirect to no-suburl?
+       $oDispatcher = new AdminSplashDispatcher();
+       $oDispatcher->category = $sub_url;
+    }
 }
 $oDispatcher->dispatch(); // we _may_ be redirected at this point (see KTAdminNavigation)
+<?php
+
+/*
+ * Document Checkout Administration
+ *
+ * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ * @version $Revision$
+ * @author Brad Shuttleworth <brad@jamwarehouse.com>, Jam Warehouse (Pty) Ltd, South Africa
+ * @package documentmanagement
+ */
+
+/* boilerplate */
+
+
+require_once(KT_LIB_DIR . '/dispatcher.inc.php');
+require_once(KT_LIB_DIR . '/templating/kt3template.inc.php');
+
+
+class KTCheckoutAdminDispatcher extends KTAdminDispatcher {
+
+   // Breadcrumbs base - added to in methods
+    var $aBreadcrumbs = array(
+        array('action' => 'administration', 'name' => 'Administration'),
+    );
+
+    function check() {
+        return true;
+    }
+
+    function do_main() {
+        $this->aBreadcrumbs[] = array('name' => 'Document Checkout');
+        $this->oPage->setBreadcrumbDetails("list checked out documents");
+        
+        $aDocuments = Document::getList("is_checked_out = 1");
+    
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplate = $oTemplating->loadTemplate('ktcore/document/admin/checkoutlisting');       
+        $oTemplate->setData(array(
+            "context" => $this,
+            "documents" => $aDocuments,
+        ));
+        return $oTemplate;        
+    }
+    
+
+    function do_confirm() {
+        $this->aBreadcrumbs[] = array('name' => 'Document Checkout');
+        $this->oPage->setBreadcrumbDetails("confirm forced check-in");
+        
+        $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId');
+        if (empty($document_id)) {
+            return $this->errorRedirectToMain('You must select a document to check in first.');
+        }
+    
+        $oDocument = Document::get($document_id);
+        if (PEAR::isError($oDocument)) {
+            return $this->errorRedirectToMain('The document you specified appears to be invalid.');
+        }
+        
+        $oUser = User::get($oDocument->getCheckedOutUserID());
+        // unusually, we could well have an error here:  the user may have checked out and then
+        // been deleted.
+        if (PEAR::isError($oUser) || ($oUser === false)) { 
+            $oUser = null; 
+        }
+        
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplate = $oTemplating->loadTemplate('ktcore/document/admin/force_checkin_confirm');       
+        $oTemplate->setData(array(
+            "context" => $this,
+            "document" => $oDocument,
+            "checkout_user" => $oUser,
+        ));
+        return $oTemplate;                
+        
+    }	
+
+    function do_checkin() {
+        global $default;
+        
+        $document_id = KTUtil::arrayGet($_REQUEST, 'fDocumentId');
+        if (empty($document_id)) {
+            return $this->errorRedirectToMain('You must select a document to check in first.');
+        }
+    
+        $oDocument = Document::get($document_id);
+        if (PEAR::isError($oDocument)) {
+            return $this->errorRedirectToMain('The document you specified appears to be invalid.');
+        }
+        
+        $this->startTransaction();
+        // actually do the checkin.
+        $oDocument->setIsCheckedOut(0);
+        $oDocument->setCheckedOutUserID(-1);
+        if (!$oDocument->update()) {
+            $this->rollbackTransaction();
+            return $this->errorRedirectToMain('Failed to force the document\'s checkin.');
+        }
+        
+        // checkout cancelled transaction
+        $oDocumentTransaction = & new DocumentTransaction($oDocument->getID(), "Document checked out cancelled", FORCE_CHECKIN);
+        if ($oDocumentTransaction->create()) {
+            $default->log->debug("editDocCheckoutBL.php created forced checkin document transaction for document ID=" . $oDocument->getID());                                    	
+        } else {
+            $default->log->error("editDocCheckoutBL.php couldn't create create document transaction for document ID=" . $oDocument->getID());
+        }                                    		
+        $this->commitTransaction(); // FIXME do we want to do this if we can't created the document-transaction?
+        return $this->successRedirectToMain('Successfully forced "'. $oDocument->getName() .'" to be checked in.');
+    }
+
+
+}
+
+// use the new admin framework.
+//$d = new KTCheckoutAdminDispatcher();
+//$d->dispatch();
+
+?>
 \ No newline at end of file
-<?php
-/**
- * $Id$
- *
- * Edit Document CheckOut Status.
- *
- * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Revision$
- * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
- * @package administration.doccheckoutmanagement
- */
-require_once("../../../../../config/dmsDefaults.php");
-
-KTUtil::extractGPC('fDocumentID', 'fUpdate');
-
-if (checkSession()) {
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternListBox.inc");
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternEditableListFromQuery.inc");
-	require_once("editDocCheckoutUI.inc");
-	require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
-    require_once("$default->fileSystemRoot/lib/documentmanagement/DocumentTransaction.inc");	
-	require_once("$default->fileSystemRoot/lib/security/Permission.inc");
-	require_once("$default->fileSystemRoot/lib/links/Link.inc");
-	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");
-	require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");	
-	require_once("$default->fileSystemRoot/lib/foldermanagement/Folder.inc");
-	require_once("$default->fileSystemRoot/presentation/lookAndFeel/knowledgeTree/foldermanagement/folderUI.inc");
-	require_once("$default->fileSystemRoot/presentation/Html.inc");
-	
-	global $default;
-	$oPatternCustom = & new PatternCustom();		
-	
-	if (isset($fDocumentID)) {	
-		if (isset($fUpdate)) {	
-			$oDocument = Document::get($fDocumentID);
-			$oDocument->setIsCheckedOut(0);
-			$oDocument->setCheckedOutUserID(-1);
-			if ($oDocument->update()) {
-				// checkout cancelled transaction
-				$oDocumentTransaction = & new DocumentTransaction($oDocument->getID(), "Document checked out cancelled", FORCE_CHECKIN);
-				if ($oDocumentTransaction->create()) {
-					$default->log->debug("editDocCheckoutBL.php created forced checkin document transaction for document ID=" . $oDocument->getID());                                    	
-				} else {
-					$default->log->error("editDocCheckoutBL.php couldn't create create document transaction for document ID=" . $oDocument->getID());
-				}                                    
-				$oPatternCustom->setHtml(getEditCheckoutSuccessPage());
-			} else {
-				$oPatternCustom->setHtml(getErrorPage(_("Error while trying to update the document checkout.")));
-			}
-		} else {
-			$oPatternCustom->addHtml(getEditCheckoutPage($fDocumentID));
-			$main->setFormAction($_SERVER["PHP_SELF"]);
-		}
-	} else {
-		// no document selected
-		$oPatternCustom->setHtml(getErrorPage(_("No document selected to check back in")));
-	}
-	//render the page
-	$main->setCentralPayload($oPatternCustom);
-    $main->setHasRequiredFields(true);
-	$main->render();
-}
-?>
-<?php
-/**
- * $Id$
- *
- * Edit Document CheckOut Status UI Functions.
- *
- * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Revision$
- * @author Mukhtar Dharsey, Jam Warehouse (Pty) Ltd, South Africa
- * @package administration.doccheckoutmanagement
- */
- 
-function getEditCheckoutSuccessPage(){
-	global $default;
-	return statusPage(_("Edit Document Checkout"), _("Succesfully updated document checkout."), "", "listDocs");
-}
-
-function getErrorPage($sMessage) {
-	return statusPage(_("Edit Document Checkout"), _("Error checking in document"), $sMessage, "listDocs");
-}	
-
-function getEditCheckoutPage($iDocumentID){
-	global $default;
-	
-	$oDocument = Document::get($iDocumentID);
-	$oUser = User::get($oDocument->getCheckedOutUserID());
-	$sToRender .= renderHeading(_("Edit Document Checkout"));	
-	$sToRender .= "<table>\n";
-	$sToRender .= "<tr><td colspan=\"2\">" . _("Are you sure you want to Check In the document:") . "</tr></td>";
-	$sToRender .= "<tr><td width=\"20%\">" . _("Path") . "</td><td><b>" . $oDocument->getDisplayPath() . "</b></td></tr>";
-	$sToRender .= "<tr><td>" . _("Checked Out By") . "</td><td><b>" . ($oUser ? $oUser->getName() : _("Unknown")) . "</b></td></tr>";
- 	$sToRender .= "<input type=\"hidden\" name=\"fUpdate\" value=\"1\">\n";
- 	$sToRender .= "<input type=\"hidden\" name=\"fDocumentID\" value=\"$iDocumentID\">\n";
-	$sToRender .= "<tr>\n";
-	$sToRender .= "<td colspan=\"2\" align=right>\n";	
-	$sToRender .= getUpdateButton();	
-	$sToRender .= getCancelButton();	
-	$sToRender .= "</td>\n";
-	$sToRender .= "</tr>\n";
-	$sToRender .= "</table>\n";
-	return $sToRender;
-}
-
-// gets the updatebutton when a unit is selected
-function getUpdateButton() {
-	global $default;
-	return "<input type=\"image\" src =\"" . KTHtml::getUpdateButton() . "\" value=\"submit\" border=\"0\"/>\n";	
-}
-
-// gets the cancel button when a unit is selected
-function getCancelButton() {
-	global $default;
-	return "<a href=\"$default->rootUrl/control.php?action=listDocs\"><img src =\"" . KTHtml::getCancelButton() . "\" border=\"0\" /></a>\n";
-}
-
-?>
-<?php
-/**
- * $Id$
- *
- * List checked out documents.
- *
- * Copyright (c) 2003 Jam Warehouse http://www.jamwarehouse.com
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- * 
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * @version $Revision$
- * @author Omar Rahbeeni, Jam Warehouse (Pty) Ltd, South Africa
- * @package administration.doccheckoutmanagement
- */
-
-require_once("../../../../../config/dmsDefaults.php");
-require_once("$default->fileSystemRoot/lib/documentmanagement/Document.inc");
-require_once("$default->fileSystemRoot/lib/users/User.inc");
-require_once("$default->fileSystemRoot/lib/visualpatterns/PatternCustom.inc");
-require_once("$default->fileSystemRoot/lib/visualpatterns/PatternTableSqlQuery.inc");
-require_once("$default->fileSystemRoot/presentation/Html.inc");
-	
-if (checkSession()) {
-
-	$oPatternCustom = & new PatternCustom();
-	$aDocuments = Document::getList("is_checked_out = 1");/*ok*/
-	$sToRender .= renderHeading(_("Document Checkout Management"));
-	$sToRender .= "<table><tr/>";
-	if (count($aDocuments) > 0) {
-		for ($i=0; $i<count($aDocuments); $i++) {
-			if ($aDocuments[$i]) {
-				$sToRender .= "<tr bgcolor=\"" . getColour($i) . "\"><td width=\"80%\">" . $aDocuments[$i]->getDisplayPath() . "</td>";
-				$sToRender .= "<td align=\"right\">" . generateControllerLink("editDocCheckout", "fDocumentID=" . $aDocuments[$i]->getID(), _("Check In") . "</td></tr>"); 
-			}
-		}
-	}  else {
-		$sToRender .= "<tr><td colspan=\"3\">" . _("There are no checked out documents") . "</td></tr>";
-	}
-	$sToRender .= "</table>";
-
-    $oPatternCustom->setHtml($sToRender);
-   	    
-	require_once("$default->fileSystemRoot/presentation/webpageTemplate.inc");    	    
-	$main->setCentralPayload($oPatternCustom);
-	$main->setFormAction($_SERVER['PHP_SELF']);	
-    $main->render();
-}
-?>
 <?php
-require_once('../../../../../config/dmsDefaults.php');
+//require_once('../../../../../config/dmsDefaults.php');
 require_once(KT_LIB_DIR . '/dispatcher.inc.php');
 require_once(KT_LIB_DIR . '/templating/templating.inc.php');
+require_once(KT_LIB_DIR . '/templating/kt3template.inc.php');
 require_once(KT_LIB_DIR . '/documentmanagement/DocumentField.inc');
 require_once(KT_LIB_DIR . '/metadata/fieldset.inc.php');
 require_once(KT_LIB_DIR . '/metadata/metadatautil.inc.php');
+
+// FIXME shouldn't this inherit from AdminDispatcher?
 class KTDocumentFieldDispatcher extends KTStandardDispatcher {
     var $bAutomaticTransaction = true;
     // Breadcrumbs base - added to in methods
     var $aBreadcrumbs = array(
         array('action' => 'administration', 'name' => 'Administration'),
-        array('action' => 'docfield', 'name' => 'Document Field Management'),
     );
     // {{{ do_main
     function do_main () {
+        $this->aBreadcrumbs[] = array('action' => 'docfield', 'name' => 'Document Field Management');
+        $this->oPage->setBreadcrumbDetails("view fieldsets");
+    
         $oTemplating =& KTTemplating::getSingleton();
         $oTemplate =& $oTemplating->loadTemplate('ktcore/metadata/listFieldsets');
         $oTemplate->setData(array(
@@ -487,7 +492,8 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
     // }}}
 }
-$d =& new KTDocumentFieldDispatcher;
-$d->dispatch();
+// use the admin dispatch mechanisms.
+//$d =& new KTDocumentFieldDispatcher;
+//$d->dispatch();
 ?>
@@ -536,14 +536,34 @@ a.main_nav_item {
     color: #db9d09;
 }
+/* block level. */
 .ktError 
 {
-    padding: 0.5em 1em;
+    padding: 0 1em;
     border: 1px solid #ffc21e;
     margin: 0.5em 0;
     background: #ffdd80;
 }
+.ktError p {
+    padding-left: 25px;
+    background: transparent  url(/thirdparty/icon-theme/16x16/status/dialog-warning.png) center left no-repeat;
+}
+
+/* block level. */
+.ktInfo
+{
+    padding: 0 1em;
+    border: 1px solid #ffc21e;
+    margin: 0.5em 0;
+    background: #ffdd80;
+}
+
+.ktInfo p {
+    padding-left: 25px;
+    background: transparent  url(/thirdparty/icon-theme/16x16/status/dialog-information.png) center left no-repeat;
+}
+
 /** portlet stuff. */
 #portlet-search-text {
@@ -557,4 +577,46 @@ a.main_nav_item {
 .searchbutton {
     border: 1px solid black;
     margin: 0.5em;
-}
 \ No newline at end of file
+}
+
+
+/* ========== kt actions 
+
+These are used to mark up various different "actions" (e.g. cut, copy, delete).
+Use them as follows:
+
+<a class="ktAction ktDelete">Delete</a>
+
+The text will be hidden for screen view.  The generic fahrner-ish approach comes from Plone
+
+ */
+
+
+.ktAction { 
+    display: block;
+    text-decoration: none;
+    overflow: hidden;
+    border: 0 !important;
+    margin: 0;
+    padding: 0;
+    padding-top: 16px;
+    height: 0px !important;
+    height /**/: 16px;
+    width: 16px;
+    cursor: pointer;
+}
+ 
+/* FIXME when available icon-naming-conformant sets have better coverage, make these more accurate. */
+.ktAction.ktDelete { background: transparent url(/thirdparty/icon-theme/16x16/mimetypes/x-directory-trash.png) top left no-repeat; }
+
+/* =========== standard listings. */
+
+.listing td {
+   padding: 0.5em;
+}
+
+.listing thead th {
+   border-bottom: 1px solid #888;
+   text-align: left;
+}
+
@@ -5,7 +5,7 @@
 {else}
 <dl class="panel_menu">
    {foreach item=aItem from=$items}
-   <dt><a href="{$smarty.server.PHP_SELF}/{$aItem.name}">{$aItem.title}</a></dt>
+   <dt><a href="{$baseurl}/{$aItem.fullname}">{$aItem.title}</a></dt>
    <dd class="descriptiveText">{$aItem.description}</dd>
    {/foreach}
 </dl>
@@ -103,11 +103,21 @@
 <h1 class="{$page->componentClass}"><span class="fahrner">{$page->componentLabel}</span></h1>
 <!-- any status / error messages get added here. -->
-
+{if (!empty($page->errStack))}
+<div class="ktError">
 {foreach item=sError from=$page->errStack}
- <div class="ktError">{$sError}</div>
+ <p>{$sError}</p>
 {/foreach}
+</div>
+{/if}
+{if (!empty($page->errStack))}
+<div class="ktInfo">
+  {foreach item=sInfo from=$page->infoStack}
+    <p>{$sInfo}</p>
+  {/foreach}
+</div>
+{/if}
 <!-- and finally, the content. -->
 {$page->contents}
+<h2>Checked Out Documents</h2>
+<p class="descriptiveText">If a checked-out document has been lost, or the user
+who checked a document out has not checked it back in, it may be necessary
+to override the "checked-out" status of a document.  Use the <strong>force checkin</strong>
+action in the listing below to override the checked-out status.</p>
+<!-- FIXME set classes here for listing. -->
+{if (count($documents) !== 0)}
+<table class="listing" cellspacing="5px">
+    <thead>
+        <tr>
+            <th>Document</th>
+            <th>Location</th>
+            <th>&nbsp;</th>
+        </tr>
+    </thead>
+    <tbody>
+      
+      {foreach item=oDocument from=$documents}
+        <tr class="{cycle values=even,odd}">
+            <td>{$oDocument->getName()}</td>
+            <td class="descriptiveText">{$oDocument->getDisplayPath()}</td>
+            <td><a href="?action=confirm&fDocumentId={$oDocument->getId()}">force checkin</a></td>
+        </tr>
+      {/foreach}
+    </tbody>
+    <!-- FIXME do we want batching? -->
+</table>
+{else}
+   <div class="ktInfo">
+     <p>No documents are currently checked out.</p>
+   </div>
+{/if}
+<h2>Confirm Forced Check-in</h2>
+<p class="descriptiveText">Please confirm that this is the document that you wish to checkin.</p>
+
+<div class="document_details">
+<h3>Document Details</h3>
+<dl class="metadata">
+   <dt>Document Name</dt>
+   <dd>{$document->getName()}</dd>
+   
+   <dt>Location</dt>
+   <dd>{$document->getDisplayPath()}</dd>
+   
+   <dt>Checked out by</dt>
+   {if ($checkout_user !== null)}
+   <dd>
+      {$checkout_user->getName()}
+   </dd>
+   {else}
+   <dd class="ktError">
+      The user who checked this document out is no longer valid.
+   </dd>
+   {/if}
+   </dd>
+</dl>
+</div>
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+  <input type="hidden" name="action" value="checkin">
+  <input type="hidden" name="fDocumentId" value="{$document->getId()}">
+  <div class="form_actions">
+      <input type="submit" value="Force Checkin" />
+      <!-- FIXME separate this even further. -->
+      <p><a href="?action=main">Cancel</a></p>
+  </div>
+</form>
 \ No newline at end of file
@@ -6,7 +6,7 @@
 <table class="pretty" cellspacing="0" cellpadding="0">
   <thead>
     <tr>
-      <th>Name</th>
+      <th colspan="2">Name</th>
       <th>Generic</th>
       <th>Fields</th>
     </tr>
@@ -14,8 +14,13 @@
   <tbody>
 {foreach from=$fieldsets item=oFieldset}
     <tr>
+	  <td>
+        <a href="?action=edit&fFieldsetId={$oFieldset->getId()}" class="ktAction ktDelete">Delete</a> 	  
+	  </td>
       <td>
-        <a href="?action=edit&fFieldsetId={$oFieldset->getId()}"> { $oFieldset->getName() }
+        
+		<a href="?action=edit&fFieldsetId={$oFieldset->getId()}">
+		   { $oFieldset->getName() }
         </a>
       </td>
       <td>
@@ -3,10 +3,10 @@
 { if $fieldsets}
 <h3>Existing document fieldsets</h3>
-<table class="pretty" cellspacing="0" cellpadding="0">
+<table class="listing" cellpadding="1.5em" cellspacing="0">
   <thead>
     <tr>
-      <th>Name</th>
+      <th colspan="2">Name</th>
       <th>Generic</th>
       <th>Fields</th>
     </tr>
@@ -14,9 +14,10 @@
   <tbody>
 {foreach from=$fieldsets item=oFieldset}
     <tr>
+	  <td>
+	     <a href="?action=delete&fFieldsetId={$oFieldset->getId()}"class="ktAction ktDelete">Delete</a>
+	  </td>
       <td>
-	<a href="?action=delete&fFieldsetId={$oFieldset->getId()}"><img
-border="0" src="{"icons/delete.png"|imgSrc}" title="Delete fieldset" /></a>
         <a href="?action=edit&fFieldsetId={$oFieldset->getId()}"> { $oFieldset->getName() }
         </a>
       </td>