- massively improve the workflow editing / management system

- fix html-error in listFieldsets - make the titlebar slightly less verbose to accommodate smaller screens better. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4699 c91229c3-7414-0410-bfa2-8a42b809f60b

- massively improve the workflow editing / management system
- fix html-error in listFieldsets - make the titlebar slightly less verbose to accommodate smaller screens better. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4699 c91229c3-7414-0410-bfa2-8a42b809f60b
bshuttle
1 parent 33b4625b
Showing 19 changed files with 866 additions and 172 deletions
kthelp/.htaccess
kthelp/ktcore/EN/admin/workflow/overview.html
lib/browse/BrowseColumns.inc.php
plugins/ktcore/KTDocumentActions.php
plugins/ktcore/admin/workflows.php
resources/css/kt-framing.css
resources/css/workflow-admin.css
templates/kt3/standard_page.smarty
templates/ktcore/help_with_edit.smarty
templates/ktcore/metadata/listFieldsets.smarty
templates/ktcore/workflow/admin_portlet.smarty
templates/ktcore/workflow/createState.smarty
templates/ktcore/workflow/documentWorkflow.smarty
templates/ktcore/workflow/editState.smarty
templates/ktcore/workflow/editWorkflow.smarty
templates/ktcore/workflow/listWorkflows.smarty
templates/ktcore/workflow/manageActions.smarty
templates/ktcore/workflow/manageStates.smarty
templates/ktcore/workflow/manageTransitions.smarty
+Order deny,allow
+Deny from all
+
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+<head>
+
+	
+  <title>Workflow Overview</title>
+</head>
+
+<body>
+
+<h2>Workflow Overview</h2>
+
+<p>Workflow allows you to assign a series of steps to the document creation and
+management process.  For example, a "News" workflow might have documents which
+go from <strong>Research</strong> to <strong>Draft</strong> to <strong>Under Review</strong>
+to <strong>Published</strong>,
+with different people participating in the document's
+lifecycle at each stage. &nbsp;Naturally, not all documents have the
+same needs in terms of workflow: &nbsp;Invoices (which must be <span style="font-weight: bold;">drawn up</span>, <span style="font-weight: bold;">maile</span>d, and then marked as <span style="font-weight: bold;">paid</span>) are very different from Marketing documents.&nbsp;</p>
+<p>To facilitate this, KnowledgeTree&trade; allows the Administrator to
+define a number of different workflows, each of which can be applied to
+different documents as their organisation requires.</p>
+
+</body>
+</html>
@@ -72,7 +72,7 @@ class TitleColumn extends BrowseColumn {
     function renderFolderLink($aDataRow) {
         $outStr = '<a href="' . $this->buildFolderLink($aDataRow) . '">';
         $outStr .= $aDataRow["folder"]->getName();
-        $outStr .= '</a>';
+        $outStr .= '</a> ';
         return $outStr;
     }
  
@@ -585,7 +585,7 @@ class KTDocumentWorkflowAction extends KTDocumentAction {
  
         $oUser =& User::get($_SESSION['userID']);
         $aTransitions = KTWorkflowUtil::getTransitionsForDocumentUser($oDocument, $oUser);
-        $aWorkflows = KTWorkflow::getList();
+        $aWorkflows = KTWorkflow::getList('start_state_id IS NOT NULL');
  
         $fieldErrors = null;
  
@@ -18,16 +18,232 @@ require_once(KT_LIB_DIR . &#39;/search/savedsearch.inc.php&#39;);
  
 require_once(KT_LIB_DIR . '/actions/documentaction.inc.php');
  
+require_once(KT_LIB_DIR . '/widgets/portlet.inc.php');
+
+class WorkflowNavigationPortlet extends KTPortlet {   
+    var $oWorkflow;
+
+    function WorkflowNavigationPortlet($sTitle, $oWorkflow = null) {
+        $this->oWorkflow = $oWorkflow;
+        parent::KTPortlet($sTitle);
+    }
+
+    function render() {
+        if (is_null($this->oWorkflow)) { return _('No Workflow Selected.'); }
+    
+        $aAdminPages = array();
+        $aAdminPages[] = array('name' => _('Overview'), 'url' => $_SERVER['PHP_SELF'] . '?action=editWorkflow&fWorkflowId=' . $this->oWorkflow->getId());
+        $aAdminPages[] = array('name' => _('States'), 'url' => $_SERVER['PHP_SELF'] . '?action=manageStates&fWorkflowId=' . $this->oWorkflow->getId());
+        $aAdminPages[] = array('name' => _('Transitions'), 'url' => $_SERVER['PHP_SELF'] . '?action=manageTransitions&fWorkflowId=' . $this->oWorkflow->getId());
+        $aAdminPages[] = array('name' => _('Actions'), 'url' => $_SERVER['PHP_SELF'] . '?action=manageActions&fWorkflowId=' . $this->oWorkflow->getId());
+
+    
+        $oTemplating = new KTTemplating;        
+        $oTemplate = $oTemplating->loadTemplate("ktcore/workflow/admin_portlet");
+        $aTemplateData = array(
+            "context" => $this,
+            "aAdminPages" => $aAdminPages,
+        );
+
+        return $oTemplate->render($aTemplateData);     
+    }
+}
+
 class KTWorkflowDispatcher extends KTAdminDispatcher {
     var $bAutomaticTransaction = true;
+    var $sHelpPage = 'ktcore/admin/workflow/overview.html';
+    var $aWorkflowInfo;
+    var $oWorkflow;
  
-    // {{{ WORKFLOW HANDLING
-    // {{{ do_main
-    function do_main () {
+    function check() {
         $this->aBreadcrumbs[] = array(
             'url' => $_SERVER['PHP_SELF'],
             'name' => _('Workflows'),
         );
+        $this->oWorkflow =& KTWorkflow::get($_REQUEST['fWorkflowId']);
+        if (!PEAR::isError($this->oWorkflow)) {
+            $this->aBreadcrumbs[] = array(
+               'url' => $_SERVER['PHP_SELF'],
+               'query' => 'action=editWorkflow&fWorkflowId=' . $this->oWorkflow->getId(),
+               'name' => $this->oWorkflow->getName(),
+            );
+            $this->oPage->addPortlet(new WorkflowNavigationPortlet(_('Workflow'), $this->oWorkflow));        
+        }
+    
+        return true;
+    }
+    
+    // helper function to construct the set of workflow information
+    function buildWorkflowInfo($oWorkflow) {
+        if ($this->aWorkflowInfo != null) { return $this->aWorkflowInfo; }
+    
+        $aInfo = array();
+        $aInfo['workflow'] = $oWorkflow;
+        
+        // roles
+        $aRoles = Role::getList();
+        $aKeyRoles = array();
+        foreach ($aRoles as $oRole) { $aKeyRoles[$oRole->getId()] = $oRole; }        
+        $aInfo['roles'] = $aKeyRoles;
+        
+        // groups
+        $aGroups = Group::getList();
+        $aKeyGroups = array();
+        foreach ($aGroups as $oGroup) { $aKeyGroups[$oGroup->getId()] = $oGroup; }
+        $aInfo['groups'] = $aKeyGroups;
+        
+        // states.
+        $aStates = KTWorkflowState::getByWorkflow($oWorkflow);
+        $aKeyStates = array();
+        foreach ($aStates as $oState) { $aKeyStates[$oState->getId()] = $oState; }
+        $aInfo['states'] = $aKeyStates;
+        
+        // transitions
+        $aTransitions = KTWorkflowTransition::getByWorkflow($oWorkflow);
+        $aKeyTransitions = array();
+        foreach ($aTransitions as $oTransition) { $aKeyTransitions[$oTransition->getId()] = $oTransition; }
+        $aInfo['transitions'] = $aKeyTransitions;
+        
+        // permissions
+        $aPermissions = KTPermission::getList();
+        $aKeyPermissions = array();
+        foreach ($aPermissions as $oPermission) { $aKeyPermissions[$oPermission->getId()] = $oPermission; }
+        $aInfo['permissions'] = $aKeyPermissions;
+        
+        // actions
+        $aInfo['actions'] = KTDocumentActionUtil::getAllDocumentActions();
+        $aKeyActions = array();
+        foreach ($aInfo['actions'] as $oAction) { $aKeyActions[$oAction->getName()] = $oAction; }
+        $aInfo['actions_by_name'] = $aKeyActions;
+        
+        $aInfo['controlled_actions'] = KTWorkflowUtil::getControlledActionsForWorkflow($oWorkflow);
+        
+        /*
+         * now we need to do the crossmappings.
+         */
+        
+        $aActionsByState = array();
+        foreach ($aInfo['states'] as $oState) {
+            $aActionsByState[$oState->getId()] = KTWorkflowUtil::getEnabledActionsForState($oState);;
+        }
+        $aInfo['actions_by_state'] = $aActionsByState;
+        
+        // FIXME handle notified users and groups
+        $aTransitionsFromState = array();
+        foreach ($aInfo['states'] as $oState) {
+            $aTransitionsFromState[$oState->getId()] = KTWorkflowUtil::getTransitionsFrom($oState);
+        }
+        $aInfo['transitions_from_state'] = $aTransitionsFromState;
+        
+        $aTransitionsToState = array();
+        foreach ($aInfo['states'] as $oState) {
+            $aTransitionsToState[$oState->getId()] = KTWorkflowTransition::getByTargetState($oState);
+        }
+        $aInfo['transitions_to_state'] = $aTransitionsToState;
+        
+        $this->aWorkflowInfo = $aInfo;
+        
+        return $aInfo;
+    }
+    
+    
+    function getActionStringForState($oState) {
+        $aInfo = $this->aWorkflowInfo;
+        
+        // no controlled actions => all available
+        if (empty($aInfo['controlled_actions'])) { return _('All actions available.'); }
+        
+        
+        $aAlways = array();
+        foreach ($aInfo['actions'] as $iActionId => $aAction) {
+            if (!array_key_exists($iActionId, $aInfo['controlled_actions'])) {
+                $aAlways[$iActionId] = $aAction; 
+            }
+        }
+        
+        $aNamedActions = array();
+        foreach ($aInfo['actions_by_state'][$oState->getId()] as $sName) {
+            $aNamedActions[] = $aInfo['actions_by_name'][$sName];
+        }
+        
+        $aThese = array_merge($aAlways, $aNamedActions);
+        // some controlled.  we need to be careful here:  list actions that _are always_ available
+        if (empty($aThese)) { return _('No actions available.'); }
+    
+        // else
+        $aActions = array();
+        foreach ($aThese as $oAction) { $aActions[] = $oAction->getDisplayName(); }
+        return  implode(', ', $aActions);
+    }
+    
+    function getTransitionToStringForState($oState) {
+        $aInfo = $this->aWorkflowInfo;
+        //var_dump($aInfo['transitions_to_state'][$oState->getId()]);
+        if (($aInfo['workflow']->getStartStateId() != $oState->getId()) && (empty($aInfo['transitions_to_state'][$oState->getId()]))) {
+            return '<strong>' . _('This state is unreachable.') . '</strong>';
+        }
+        
+        
+        if ($aInfo['workflow']->getStartStateId() == $oState->getId() && (empty($aInfo['transitions_to_state'][$oState->getId()]))) {
+            return '<strong>' . _('Documents start in this state') . '</strong>';            
+        }
+        $aT = array();
+        if ($aInfo['workflow']->getStartStateId() == $oState->getId()) {
+            $aT[] = '<strong>' . _('Documents start in this state') . '</strong>';            
+        }
+        
+        foreach ($aInfo['transitions_to_state'][$oState->getId()] as $aTransition) { 
+            $aT[] = sprintf('<a href="%s?action=editTransition&fWorkflowId=%d&fTransitionId=%d">%s</a>', $_SERVER['PHP_SELF'], $aInfo['workflow']->getId(), $aTransition->getId() ,$aTransition->getName()); 
+        }
+        
+        return implode(', ',$aT);
+    }
+    
+    function getNotificationStringForState($oState) {
+        return _('No roles and groups notified.');
+    }
+  
+    function transitionAvailable($oTransition, $oState) {
+        $aInfo = $this->aWorkflowInfo;
+        
+        $val = false;
+        foreach ($aInfo['transitions_from_state'][$oState->getId()] as $oT) {
+            if ($oTransition->getId() == $oT->getId()) { $val = true; }
+        }
+        
+        return $val;
+    }
+    
+    function actionAvailable($oAction, $oState) {
+        $aInfo = $this->aWorkflowInfo;
+        
+        $val = false;
+        
+        foreach ($aInfo['actions_by_state'][$oState->getId()] as $oA) {
+            
+            if ($oAction->getName() == $oA) { $val = true; }
+        }
+        
+        return $val;
+    }
+    
+    function getTransitionFromStringForState($oState) {
+        $aInfo = $this->aWorkflowInfo;      
+        
+        if (empty($aInfo['transitions_from_state'][$oState->getId()])) {
+            return '<strong>' . _('No transitions available') . '</strong>';
+        }
+        
+        $aT = array();
+        foreach ($aInfo['transitions_from_state'][$oState->getId()] as $aTransition) { 
+            $aT[] = sprintf('<a href="%s?action=editTransition&fWorkflowId=%d&fTransitionId=%d">%s</a>', $_SERVER['PHP_SELF'], $aInfo['workflow']->getId(), $aTransition->getId() ,$aTransition->getName()); 
+        }
+        return implode(', ', $aT);
+    }
+    
+    // {{{ WORKFLOW HANDLING
+    // {{{ do_main
+    function do_main () {
  
         $add_fields = array();
         $add_fields[] = new KTStringWidget(_('Name'),_('A human-readable name for the workflow.'), 'fName', null, $this->oPage, true);
@@ -42,69 +258,57 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
         return $oTemplate;
     }
     // }}}
-
+    
     // {{{ do_editWorkflow
     function do_editWorkflow() {
  
         $oTemplate =& $this->oValidator->validateTemplate('ktcore/workflow/editWorkflow');
         $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
  
-        $aStates = KTWorkflowState::getByWorkflow($oWorkflow);
-        $aPermissions = KTPermission::getList();
+        
+        
+        $aInfo = $this->buildWorkflowInfo($oWorkflow);
+        
+        $aPermissions = $aInfo['permissions'];
+        $aStates = $aInfo['states'];
  
         $edit_fields = array();
         $edit_fields[] = new KTStringWidget(_('Name'), _('A human-readable name for the workflow.'), 'fName', $oWorkflow->getName(), $this->oPage, true);
         $aOptions = array();
         $vocab = array();
-        $vocab[0] = 'None';
+        $vocab[0] = 'None - documents cannot use this workflow.';
         foreach($aStates as $state) {
             $vocab[$state->getId()] = $state->getName();
         } 
-        $aOptions['vocab'] = $vocab;
-        $edit_fields[] = new KTLookupWidget(_('Starting State'), _('When a document has this workflow applied to it, to which state should it initially be set'), 'fStartStateId', $oWorkflow->getStartStateId(), $this->oPage, false, null, null, $aOptions);
+        $aOptions['vocab'] = $vocab;        
+        $edit_fields[] = new KTLookupWidget(_('Starting State'), _('When a document has this workflow applied to it, to which state should it initially be set.  <strong>Note that workflows without a starting state cannot be applied to documents.</strong>'), 'fStartStateId', $oWorkflow->getStartStateId(), $this->oPage, false, null, null, $aOptions);
+        if (is_null($oWorkflow->getStartStateId())) {
+            $this->oPage->addInfo(_('This workflow is currently disabled.  To enable it, please assign a starting state in the "Edit workflow properties" box.'));
+        }
  
+        /*
         $add_state_fields = array();
         $add_state_fields[] = new KTStringWidget(_('Name'), _('A human-readable name for the state.'), 'fName', null, $this->oPage, true);
  
  
-        $add_transition_fields = array();
-        $add_transition_fields[] = new KTStringWidget(_('Name'), _('A human-readable name for the transition.'), 'fName', null, $this->oPage, true);
-        $aOptions = array();
-        $vocab = array();
-        foreach($aStates as $state) {
-            $vocab[$state->getId()] = $state->getName();
-        } 
-        $aOptions['vocab'] = $vocab;
-        $add_transition_fields[] = new KTLookupWidget(_('Destination State'), _('Once this transition is complete, which state should the document be in?'), 'fTargetStateId', $oWorkflow->getStartStateId(), $this->oPage, true, null, null, $aOptions);
-        $aOptions = array();
-        $vocab = array();
-        foreach($aPermissions as $permission) {
-            $vocab[$permission->getId()] = $permission->getHumanName();
-        } 
-        $aOptions['vocab'] = $vocab;
-        $add_transition_fields[] = new KTLookupWidget(_('Guard Permission.'), _('Which permission must the user have in order to follow this transition?'), 'fPermissionId', $oWorkflow->getStartStateId(), $this->oPage, true, null, null, $aOptions);
+        */
+        
  
-        $this->aBreadcrumbs[] = array(
-            'url' => $_SERVER['PHP_SELF'],
-            'name' => _('Workflows'),
-        );
-        $this->aBreadcrumbs[] = array(
-            'url' => $_SERVER['PHP_SELF'],
-            'query' => 'action=editWorkflow&fWorkflowId=' . $oWorkflow->getId(),
-            'name' => $oWorkflow->getName(),
-        );
         $oTemplate->setData(array(
+            'context' => $this,
             'oWorkflow' => $oWorkflow,
+            
             'aStates' => $aStates,
-            'aTransitions' => KTWorkflowTransition::getByWorkflow($oWorkflow),
+            'aTransitions' => $aInfo['transitions'],
             'aPermissions' => $aPermissions,
-            'aActions' => KTDocumentActionUtil::getAllDocumentActions(),
-            'aActionsSelected' => KTWorkflowUtil::getControlledActionsForWorkflow($oWorkflow),
+            'aActions' => $aInfo['actions'],
+            'aActionsSelected' => $aInfo['controlled_actions'],
+            
+            // info
+            'workflow_info' => $aInfo,
  
-            // fields
+            // subform
             'edit_fields' => $edit_fields,
-            'add_state_fields' => $add_state_fields,
-            'add_transition_fields' => $add_transition_fields,
         ));
         return $oTemplate;
     }
@@ -168,6 +372,137 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
     }
     // }}}
  
+    function do_manageActions() {
+        $oTemplate =& $this->oValidator->validateTemplate('ktcore/workflow/manageActions');
+        $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);     
+        
+        $aInfo = $this->buildWorkflowInfo($oWorkflow);
+        
+        $oTemplate->setData(array(
+            'context' => $this,
+            'oWorkflow' => $oWorkflow,
+
+            'aActions' => $aInfo['actions'],
+            'aActionsSelected' => $aInfo['controlled_actions'],
+                       
+            // info
+            'workflow_info' => $aInfo,
+        ));
+        return $oTemplate;        
+        
+    }
+
+    function do_manageStates() {
+        $oTemplate =& $this->oValidator->validateTemplate('ktcore/workflow/manageStates');
+        $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);        
+        
+        $aInfo = $this->buildWorkflowInfo($oWorkflow);
+        
+        $add_fields = array();
+        $add_fields[] = new KTStringWidget(_('Name'), _('A human-readable name for the state.'), 'fName', null, $this->oPage, true);
+        
+        
+        
+        $oTemplate->setData(array(
+            'context' => $this,
+            'oWorkflow' => $oWorkflow,
+            
+            // info
+            'workflow_info' => $aInfo,
+            
+            // subform
+            'add_fields' => $add_fields,
+        ));
+        return $oTemplate;
+    }
+
+    function do_manageTransitions() {
+        $oTemplate =& $this->oValidator->validateTemplate('ktcore/workflow/manageTransitions');
+        $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);        
+        
+        $aInfo = $this->buildWorkflowInfo($oWorkflow);
+                
+        $add_transition_fields = array();
+        $add_transition_fields[] = new KTStringWidget(_('Name'), _('A human-readable name for the transition.'), 'fName', null, $this->oPage, true);
+        $aOptions = array();
+        $vocab = array();
+        foreach($aInfo['states'] as $state) {
+            $vocab[$state->getId()] = $state->getName();
+        } 
+        $aOptions['vocab'] = $vocab;
+        $add_transition_fields[] = new KTLookupWidget(_('Destination State'), _('Once this transition is complete, which state should the document be in?'), 'fTargetStateId', $oWorkflow->getStartStateId(), $this->oPage, true, null, null, $aOptions);
+        $aOptions = array();
+        $vocab = array();
+        foreach($aInfo['permissions'] as $permission) {
+            $vocab[$permission->getId()] = $permission->getHumanName();
+        } 
+        $aOptions['vocab'] = $vocab;
+        $add_transition_fields[] = new KTLookupWidget(_('Guard Permission.'), _('Which permission must the user have in order to follow this transition?'), 'fPermissionId', $oWorkflow->getStartStateId(), $this->oPage, true, null, null, $aOptions);
+        
+        $oTemplate->setData(array(
+            'context' => $this,
+            'oWorkflow' => $oWorkflow,
+                       
+            // info
+            'workflow_info' => $aInfo,
+            
+            // subform
+            'add_fields' => $add_transition_fields,
+        ));
+        return $oTemplate;
+    }
+
+    function do_setTransitionAvailability() {
+        $oTemplate =& $this->oValidator->validateTemplate('ktcore/workflow/editWorkflow');
+        $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
+        
+        $transitionMap = (array) KTUtil::arrayGet($_REQUEST, 'fTransitionAvailability');
+        
+        $aInfo = $this->buildWorkflowInfo($oWorkflow);
+        
+        $this->startTransaction();
+        foreach ($aInfo['states'] as $oState) {
+            
+            $a = (array) $transitionMap[$oState->getId()];
+            $transitions = array();
+            foreach ($a as $tid => $on) { $transitions[] = $tid; }
+            
+            $res = KTWorkflowUtil::saveTransitionsFrom($oState, $transitions);
+            if (PEAR::isError($res)) {
+                $this->errorRedirectTo('manageTransitions', _('Error updating transitions:') . $res->getMessage(), sprintf('fWorkflowId=%d', $oWorkflow->getId()));
+            }
+        }
+        $this->commitTransaction();
+        
+        $this->successRedirectTo('manageTransitions', _('Availability updated.'), sprintf('fWorkflowId=%d', $oWorkflow->getId()));
+    }
+    
+    
+    function do_updateActionAvailability() {
+        $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
+        
+        $actionMap = (array) KTUtil::arrayGet($_REQUEST, 'fAvailableActions');
+        
+        $aInfo = $this->buildWorkflowInfo($oWorkflow);
+        
+        $this->startTransaction();
+        foreach ($aInfo['states'] as $oState) {
+            
+            $a = (array) $actionMap[$oState->getId()];
+            $actions = array_keys($a);
+            
+            
+            
+            $res = KTWorkflowUtil::setEnabledActionsForState($oState, $actions);
+            if (PEAR::isError($res)) {
+                $this->errorRedirectTo('manageActions', _('Error updating actions:') . $res->getMessage(), sprintf('fWorkflowId=%d', $oWorkflow->getId()));
+            }
+        }
+        $this->commitTransaction();
+        
+        $this->successRedirectTo('manageActions', _('Action availability updated.'), sprintf('fWorkflowId=%d', $oWorkflow->getId()));
+    }
+    
     // {{{ do_setWorkflowActions
     function do_setWorkflowActions() {
         $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
@@ -247,9 +582,14 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
             'query' => 'action=editWorkflow&fWorkflowId=' . $oWorkflow->getId(),
             'name' => $oWorkflow->getName(),
         );
-        $this->oPage->setBreadcrumbDetails(_('state') . ': ' . $oState->getName());
+        $this->oPage->setBreadcrumbDetails(_('State') . ': ' . $oState->getName());
  
         $aInformed = KTWorkflowUtil::getInformedForState($oState);
+        
+        
+        $editForm = array();
+        $editForm[] = new KTStringWidget(_('Name'), _('A human-readable name for this state.  This is shown on the "Browse" page, as well as on the user\'s workflow page.'), 'fName', $oState->getName(), $this->oPage, true);
+        
         $oTemplate->setData(array(
             'oWorkflow' => $oWorkflow,
             'oState' => $oState,
@@ -263,6 +603,7 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
             'aRoles' => Role::getList(),
             'aUsers' => User::getList(),
             'aInformed' => $aInformed,
+            'editForm' => $editForm,
         ));
         return $oTemplate;
     }
@@ -402,7 +743,7 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
             'redirect_to' => array('editWorkflow', 'fWorkflowId=' .  $oWorkflow->getId()),
             'message' => _('Could not create workflow transition'),
         ));
-        $this->successRedirectTo('editWorkflow', _('Workflow transition created'), 'fWorkflowId=' . $oWorkflow->getId());
+        $this->successRedirectTo('editTransition', _('Workflow transition created'), sprintf('fWorkflowId=%d&fTransitionId=%d', $oWorkflow->getId(), $res->getId()));
         exit(0);
     }
     // }}}
@@ -103,6 +103,11 @@ body
 {
     border-bottom: 1px solid white;
 }
+
+.ktLoggedInUser {
+    font-weight: bold;
+}
+
 /*
 a.main_nav_item {
     background: transparent url(../../resources/graphics/home-navbar.gif) center left no-repeat;
@@ -580,9 +585,9 @@ a.main_nav_item {
 .ktInfo
 {
     padding: 0 1em;
-    border: 1px solid #ffc21e;
+    border: 1px solid #c5c5c5;
     margin: 0.5em 0;
-    background: #ffdd80;
+    background: #dedede;
 }
  
 .ktInfo p {
@@ -655,6 +660,8 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
  
 /* =========== standard listings. */
  
+
+
 .listing td {
    padding: 0.5em;
    vertical-align: top;
+#workflow-states-list {
+    list-style-type: none;
+    margin-left: 0;
+    padding-left: 0;
+}
+
+#workflow-states-list ul {
+    list-style-type: none;
+    margin-left: 0;
+    padding-left: 1em;
+    border-top: 1px solid #dedede;
+    margin-top: 0.5em;
+    margin-bottom: 1.5em;
+}
+
+.workflow_element { 
+    font-weight: bold;
+}
 \ No newline at end of file
@@ -64,9 +64,7 @@
  
       <!-- user menu -->
       <li class="pref">{if ($page->user)}
-        Logged in as <strong>{$page->user->getName()}</strong>
-        {else}
-        FIXME:  page does not set user.
+        <span class="ktLoggedInUser">{$page->user->getName()}</span>
         {/if}
         &middot;
  
-<p><a href="{$rootUrl}/admin.php/misc/helpmanagement?action=customise&name={$target_name}">Edit this help page.</a></p>
 {if (!$help_body)}
 <div class="ktError"><p>No content specified for this help file yet. <strong>Edit it first.</strong></p></div>
 {else}
 {$help_body}
-{/if}
 \ No newline at end of file
+{/if}
+
+<hr />
+<p><a href="{$rootUrl}/admin.php/misc/helpmanagement?action=customise&name={$target_name}" class="ktAction ktEdit" style="float:
+left; padding-right: 0.5em;">{i18n}Edit this help page.{/i18n}</a><a href="{$rootUrl}/admin.php/misc/helpmanagement?action=customise&name={$target_name}">{i18n}Edit this help page.{/i18n}</a></p>
 \ No newline at end of file
@@ -60,7 +60,7 @@
   {$oWidget->render()}
 {/foreach}
  
-<div class="form_actions"
+<div class="form_actions">
 <input type="submit" name="submit" value="{i18n}Create{/i18n}" />
 </div>
 </fieldset>
+<ul class="actionlist">
+{foreach from=$aAdminPages item=aAdminPage}
+   <li><a href="{$aAdminPage.url}">{$aAdminPage.name}</a></li>
+{/foreach}
+</ul>
 \ No newline at end of file
+<h2>{i18n}New State{/i18n}</h2>
+
+<p class="descriptiveText">As documents move through their lifecycle, they
+are placed in certain <strong>states</strong>.  For example, an invoice
+which has been mailed might be in the "Pending" <strong>state</strong> after
+the "sent" <strong>transition</strong> has been performed by a user.</p>
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<fieldset>
+<legend>{i18n}Edit state properties{/i18n}</legend>
+<input type="hidden" name="action" value="saveState" />
+<input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
+<input type="hidden" name="fStateId" value="{$oState->getId()}" />
+{foreach item=oWidget from=$editForm}
+  {$oWidget->render()}
+{/foreach}
+<div class="form_actions">
+    <input type="submit" name="submit" value="{i18n}Save{/i18n}" />
+</div>
+</fieldset>
+</form>
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="action" value="saveInform" />
+<input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
+<input type="hidden" name="fStateId" value="{$oState->getId()}" />
+
+<fieldset>
+<legend>{i18n}Inform Which Users?{/i18n}</legend>
+<p class="descriptiveText">{i18n}Please select which roles or groups should be
+informed when this state is reached.{/i18n}</p>
+
+
+{if $aRoles}
+<h3>{i18n}Roles{/i18n}</h3>
+{entity_checkboxes entities=$aRoles name="fRoleIds" multiple="true" selected=$aInformed.role assign=aBoxes}
+{foreach from=$aBoxes item=sBox}
+{$sBox}<br />
+{/foreach}
+{/if}
+
+<h3>{i18n}Groups{/i18n}</h3>
+{entity_checkboxes entities=$aGroups name="fGroupIds" multiple="true" selected=$aInformed.group assign=aBoxes}
+{foreach from=$aBoxes item=sBox}
+{$sBox}<br />
+{/foreach}
+
+{*
+<h3>{i18n}Users{/i18n}</h3>
+{entity_checkboxes entities=$aUsers name="fUserIds" multiple="true" selected=$aInformed.user assign=aBoxes}
+{foreach from=$aBoxes item=sBox}
+{$sBox}<br />
+{/foreach}
+<input type="submit" name="submit" value="{i18n}Save{/i18n}" />
+
+</form>
+*}
+
+</fieldset>
+
+
+{*
+<h3>{i18n}Assigned Permissions{/i18n}</h3>
+<p class="descriptiveText">{i18n}While in this workflow state, additional permissions
+may be given.  This is done either to expose the document to more users
+or to allow a particular role to be fulfilled before a workflow
+transition can be accomplished.{/i18n}</p>
+*}
+
+
+<fieldset>
+<legend>{i18n}Transitions{/i18n}</legend>
+
+<p class="descriptiveText">{i18n}Transitions are how documents move from one
+state to another.  Typically, most transitions can only be performed by people
+with a specific <strong>role</strong> (e.g. Manager) or part of a specific group
+(e.g. Marketing Department).{/i18n}</p>
+
+{if $aTransitionsTo}
+<h3>{i18n}Transitions to this state{/i18n}</h3>
+{if (!empty($aTransitionsTo))}
+<ul>
+{foreach from=$aTransitionsTo item=oTransition}
+  <li><a
+href="?action=editTransition&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}"
+title="Transition
+{$oTransition->getId()}">{$oTransition->getName()|escape}</a></li>
+{/foreach}
+</ul>
+
+{/if}
+{else}
+<div class="ktInfo"><p>{i18n}No transitions lead to this state.{/i18n}</p></div>
+{/if}
+
+<h3>{i18n}Transitions from this state{/i18n}</h3>
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="action" value="saveTransitions" />
+<input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
+<input type="hidden" name="fStateId" value="{$oState->getId()}" />
+
+{if (!empty($aTransitions))}
+{entity_checkboxes entities=$aTransitions name="fTransitionIds" multiple="true" selected=$aTransitionsSelected separator="<br />"}
+<div class="form_actions">
+<input type="submit" name="submit" value="{i18n}Save{/i18n}" />
+</div>
+{else}
+<div class="ktInfo"><p>{i18n}No transitions have been defined for this workflow.{/i18n}</p></div>
+{/if}
+</form>
+</fieldset>
+
+
+
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<fieldset>
+<legend>Actions allowed</legend>
+
+<input type="hidden" name="action" value="setStateActions" />
+<input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
+<input type="hidden" name="fStateId" value="{$oState->getId()}" />
+
+{if (!empty($aActions))}
+<ul>
+{entity_checkboxes name="fActions" entities=$aActions idmethod="getName" method="getDisplayName" assign="aCheckboxes" selected="$aActionsSelected"}
+{foreach from=$aCheckboxes item=sCheckbox}
+<li>{$sCheckbox}</li>
+{/foreach}
+</ul>
+<div class="form_actions">
+  <input type="submit" name="submit" value="Set allowed actions" />
+</div>
+{else}
+No actions defined.
+{/if}
+</fieldset>
+</form>
+
@@ -25,7 +25,7 @@ lifecycle of the document.{/i18n}
 </form>
 {else}
 <h3>{i18n}No defined workflows{/i18n}</h3>
-<div class="ktError">
+<div class="ktInfo">
 <p>{i18n}There are no defined workflows which can be started on this
 document.  An administrator can create workflows to map the lifecycle of
 a document.  Contact your administrator to discuss
 <h2>{i18n}State{/i18n}: {$oState->getName()|escape}</h2>
  
+<p class="descriptiveText">As documents move through their lifecycle, they
+are placed in certain <strong>states</strong>.  For example, an invoice
+which has been mailed might be in the "Pending" <strong>state</strong> after
+the "sent" <strong>transition</strong> has been performed by a user.</p>
+
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
 <legend>{i18n}Edit state properties{/i18n}</legend>
 <input type="hidden" name="action" value="saveState" />
 <input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
 <input type="hidden" name="fStateId" value="{$oState->getId()}" />
-<input type="textbox" name="fName" value="{$oState->getName()|escape}" />
+{foreach item=oWidget from=$editForm}
+  {$oWidget->render()}
+{/foreach}
 <div class="form_actions">
     <input type="submit" name="submit" value="{i18n}Save{/i18n}" />
 </div>
 </fieldset>
 </form>
-
+{*
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <input type="hidden" name="action" value="saveInform" />
 <input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
@@ -32,25 +39,20 @@ informed when this state is reached.{/i18n}&lt;/p&gt;
 {/foreach}
 {/if}
  
+{if $aGroups}
 <h3>{i18n}Groups{/i18n}</h3>
 {entity_checkboxes entities=$aGroups name="fGroupIds" multiple="true" selected=$aInformed.group assign=aBoxes}
 {foreach from=$aBoxes item=sBox}
 {$sBox}<br />
 {/foreach}
+{/if}
  
-{*
-<h3>{i18n}Users{/i18n}</h3>
-{entity_checkboxes entities=$aUsers name="fUserIds" multiple="true" selected=$aInformed.user assign=aBoxes}
-{foreach from=$aBoxes item=sBox}
-{$sBox}<br />
-{/foreach}
-<input type="submit" name="submit" value="{i18n}Save{/i18n}" />
-
-</form>
-*}
+{if (empty($aGroups) && empty($aRoles))}
+<div class="ktInfo"><p>{i18n}No groups or roles are defined in the DMS.{/i18n}</p></div>
+{/if}
  
 </fieldset>
-
+*}
  
 {*
 <h3>{i18n}Assigned Permissions{/i18n}</h3>
@@ -63,9 +65,13 @@ transition can be accomplished.{/i18n}&lt;/p&gt;
  
 <fieldset>
 <legend>{i18n}Transitions{/i18n}</legend>
-{if $aTransitionsTo}
  
+<p class="descriptiveText">{i18n}Transitions are how documents move from one
+state to another.  Typically, most transitions can only be performed by people
+with a specific <strong>role</strong> (e.g. Manager) or part of a specific group
+(e.g. Marketing Department).{/i18n}</p>
  
+{if $aTransitionsTo}
 <h3>{i18n}Transitions to this state{/i18n}</h3>
 {if (!empty($aTransitionsTo))}
 <ul>
@@ -76,11 +82,11 @@ title=&quot;Transition
 {$oTransition->getId()}">{$oTransition->getName()|escape}</a></li>
 {/foreach}
 </ul>
-{else}
-{i18n}No transitions lead to this state.{/i18n}
-{/if}
  
 {/if}
+{else}
+<div class="ktInfo"><p>{i18n}No transitions lead to this state.{/i18n}</p></div>
+{/if}
  
 <h3>{i18n}Transitions from this state{/i18n}</h3>
 <form action="{$smarty.server.PHP_SELF}" method="POST">
@@ -89,12 +95,12 @@ title=&quot;Transition
 <input type="hidden" name="fStateId" value="{$oState->getId()}" />
  
 {if (!empty($aTransitions))}
-{entity_checkboxes entities=$aTransitions name="fTransitionIds" multiple="true" selected=$aTransitionsSelected}
+{entity_checkboxes entities=$aTransitions name="fTransitionIds" multiple="true" selected=$aTransitionsSelected separator="<br />"}
 <div class="form_actions">
 <input type="submit" name="submit" value="{i18n}Save{/i18n}" />
 </div>
 {else}
-{i18n}No transitions defined.{/i18n}
+<div class="ktInfo"><p>{i18n}No transitions have been defined for this workflow.{/i18n}</p></div>
 {/if}
 </form>
 </fieldset>
@@ -102,6 +108,8 @@ title=&quot;Transition
  
  
  
+
+{if (!empty($aActions))}
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
 <legend>Actions allowed</legend>
@@ -110,7 +118,6 @@ title=&quot;Transition
 <input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
 <input type="hidden" name="fStateId" value="{$oState->getId()}" />
  
-{if (!empty($aActions))}
 <ul>
 {entity_checkboxes name="fActions" entities=$aActions idmethod="getName" method="getDisplayName" assign="aCheckboxes" selected="$aActionsSelected"}
 {foreach from=$aCheckboxes item=sCheckbox}
@@ -120,9 +127,11 @@ title=&quot;Transition
 <div class="form_actions">
   <input type="submit" name="submit" value="Set allowed actions" />
 </div>
-{else}
-No actions defined.
-{/if}
 </fieldset>
 </form>
+{else}
+<div class="ktInfo"><p>No actions are controlled by this workflow, so all actions are available when
+documents are in this state.</p></div>
+{/if}
+
  
-<h2>{i18n}Workflow{/i18n}: {$oWorkflow->getName()|escape}</h2>
-
+{$context->oPage->requireCSSResource('resources/css/workflow-admin.css')}
  
+<h2>{i18n}Workflow Overview{/i18n}: {$oWorkflow->getName()|escape}</h2>
  
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
@@ -18,98 +18,34 @@
 </fieldset>
 </form>
  
-<h3>States</h3>
-<p class="descriptiveText"><strong>FIXME</strong> insert intelligent help.</p>
-<form action="{$smarty.server.PHP_SELF}" method="POST">
-<fieldset>
-<legend>{i18n}Create a new state{/i18n}</legend>
-<input type="hidden" name="action" value="newState" />
-<input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
-
-
-{foreach item=oWidget from=$add_state_fields}
-  {$oWidget->render()}
-{/foreach}
-
-<div class="form_actions">
-<input type="submit" name="submit" value="{i18n}Create state{/i18n}" />
-</div>
-</fieldset>
-</form>
-
-{if $aStates}
-<h4>{i18n}Existing states{/i18n}</h4>
-<p class="descriptiveText">{i18n}Select a state to update its properties.{/i18n}</p>
-<ul>
-{foreach from=$aStates item=oState}
-  <li><a
-href="?action=editState&fWorkflowId={$oWorkflow->getId()}&fStateId={$oState->getId()}"
-title="State {$oState->getId()}">{$oState->getName()|escape}</a></li>
-{/foreach}
-</ul>
-{/if}
-
-
-
-
-{* check that there are states, and, if not, don't show transitions *}
-{if $aStates}
-
-<h3>{i18n}Transitions{/i18n}</h3>
-
-<p class="descriptiveText"><strong>FIXME</strong> insert intelligent help.</p>
-
-<form action="{$smarty.server.PHP_SELF}" method="POST">
-<fieldset>
-<legend>{i18n}Create a new transition{/i18n}</legend>
-<input type="hidden" name="action" value="newTransition" />
-<input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
-
-
-{foreach item=oWidget from=$add_transition_fields}
-  {$oWidget->render()}
-{/foreach}
-
-<div class="form_actions">
-<input type="submit" name="submit" value="{i18n}Create transition{/i18n}" />
-</div>
-</fieldset>
-</form>
-
-
-{if $aTransitions}
-<h3>{i18n}Existing transitions{/i18n}</h3>
-
-<ul>
-{foreach from=$aTransitions item=oTransition}
-  <li><a
-href="?action=editTransition&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}"
-title="Transition {$oTransition->getId()}">{$oTransition->getName()|escape}</a></li>
+<p class="descriptiveText">{i18n}This page allows you to get a quick overview of the
+workflow.  To modify items, either select them from the overview below,
+or use the "Workflow" menu on the left to create new ones.{/i18n}</p>
+
+{if (empty($aStates))}
+<div class="ktInfo"><p>This workflow does not define any states.  Please use the 
+Workflow menu (on the left) to create new states.</p></div>
+{else}
+<ul id="workflow-states-list">
+{foreach item=oState from=$aStates}
+    <li><span class="workflow_element">State:</span> <a href="{$smarty.server.PHP_SELF}?action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}" class="workflow_label">{$oState->getName()}</a>
+    <ul>
+        <li>{i18n}Notified groups &amp; roles:{/i18n}
+        {$context->getNotificationStringForState($oState)}
+        </li>
+        <li>{i18n}Actions available: {/i18n}
+        {$context->getActionStringForState($oState)}
+        </li>
+      
+        <li>{i18n}Transitions available: {/i18n}
+        {$context->getTransitionFromStringForState($oState)}
+        </li>
+      
+        <li>{i18n}Transitions to this state: {/i18n}
+        {$context->getTransitionToStringForState($oState)}
+        </li>
+    </ul>
+    </li>
 {/foreach}
 </ul>
-{/if}
-
-{/if}
-
-
-
-<form action="{$smarty.server.PHP_SELF}" method="POST">
-<fieldset>
-<legend>{i18n}Actions controlled{/i18n}</legend>
-
-<p class="descriptiveText"><strong>FIXME</strong> be helpful</p>
-
-<input type="hidden" name="action" value="setWorkflowActions" />
-<input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
-
-<ul>
-{entity_checkboxes name="fActions" entities=$aActions idmethod="getName" method="getDisplayName" assign="aCheckboxes" selected="$aActionsSelected"}
-{foreach from=$aCheckboxes item=sCheckbox}
-<li>{$sCheckbox}</li>
-{/foreach}
-</ul>
-<div class="form_actions">
-   <input type="submit" name="submit" value="{i18n}Set controlled actions{/i18n}" />
-</div>
-</fieldset>
-</form>
+{/if}
 \ No newline at end of file
-<h2>{i18n}Workflow{/i18n}</h2>
+<h2>{i18n}Workflows{/i18n}</h2>
+
+<p class="descriptiveText">{i18n}Workflow is a description of a document's lifecycle.  It is made up of
+workflow states, which describe where in the lifecycle the document is,
+and workflow transitions, which describe the next steps within the
+lifecycle of the document.{/i18n}</p>
  
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
+{$context->oPage->requireCSSResource('resources/css/workflow-admin.css')}
+<h2>{i18n}Manage Actions{/i18n}</h2>
+
+<p class="descriptiveText">{i18n}An important part of workflow is controlling which
+actions are available to users at various stages.  For example, it may be 
+necessary to prevent the "Edit Metadata" action from being used when a document
+is "published". Doing this is a two step process:  first, you need to specify
+that "Edit Metadata" is an action you wish to control within this workflow; second,
+you need to specify that the action is <strong>not</strong> to be made available
+when documents are in the "published" state.{/i18n}</p>
+
+<form>
+<fieldset><legend>{i18n}Specify Controlled Actions{/i18n}</legend>
+<p class="descriptiveText">{i18n}Select the actions you want this workflow
+to control from the list below.  Actions you do not specify will be available no 
+matter what the state of the document.{/i18n}</p>
+
+<input type="hidden" name="action" value="setWorkflowActions" />
+<input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
+
+
+{entity_checkboxes name="fActions" entities="$aActions" idmethod="getName" method="getDisplayName" assign="aCheckboxes" selected="$aActionsSelected" separator="<br />"}
+{foreach from=$aCheckboxes item=sCheckbox}
+{$sCheckbox}
+{/foreach}
+
+<div class="form_actions">
+   <input type="submit" name="submit" value="{i18n}Set controlled actions{/i18n}" />
+</div>
+
+</fieldset>
+</form>
+
+<h3>Assign Actions to States</h3>
+
+<p class="descriptiveText">The table below lists the actions you have specified 
+as controlled by this workflow, and all the states within the workflow.  From here 
+you can assign those actions to the various states in this workflow.</p>
+
+{if (empty($aActionsSelected))}
+<div class="ktInfo"><p>{i18n}No actions are controlled by this workflow.  All actions
+will be available at all states.{/i18n}</p></div>
+{else}
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="action" value="updateActionAvailability" />
+<input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
+<table class="kt_collection" style="width: auto;">
+<thead>
+  <tr>
+    <th>&nbsp;</th>
+    {foreach from=$aActions item=oAction}
+    <th>{$oAction->getDisplayName()}</th>
+    {/foreach}
+  </tr>
+</thead>
+<tbody>
+{foreach item=oState from=$workflow_info.states}
+  <tr class='{cycle values="odd,even"}'>
+    <td>{$oState->getName()}</td>
+    {foreach item=oAction from=$aActions}
+      <td><input type="checkbox" name="fAvailableActions[{$oState->getId()}][{$oAction->getName()}]" {if ($context->actionAvailable($oAction, $oState))}checked="true"{/if}/></td>
+    {/foreach}
+  </tr>
+{/foreach}
+</tbody>
+</table>
+
+<div class="form_actions">
+  <input type="submit" value="{i18n}Update Action Availability{/i18n}" />
+</div>
+</form>
+{/if}
+
+{$context->oPage->requireCSSResource('resources/css/workflow-admin.css')}
+<h2>{i18n}Manage States{/i18n}</h2>
+
+<p class="descriptiveText">As documents move through their lifecycle, they
+are placed in certain <strong>states</strong>.  For example, an invoice
+which has been mailed might be in the "Pending" <strong>state</strong> after
+the "sent" <strong>transition</strong> has been performed by a user.</p>
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<fieldset>
+<legend>{i18n}Create a new state{/i18n}</legend>
+
+<p class="descriptiveText">Please note that additional configuration is
+possible on states beyond what is specified here (e.g. which users to notify
+about the document, etc).  Please edit the state
+to access and modify these other properties.</p>
+
+<input type="hidden" name="action" value="newState" />
+<input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
+
+{* Standard Form *}
+
+{foreach item=oWidget from=$add_fields}
+  {$oWidget->render()}
+{/foreach}
+
+<div class="form_actions">
+<input type="submit" name="submit" value="{i18n}Create state{/i18n}" />
+</div>
+</fieldset>
+</form>
+
+{if (empty($workflow_info.states))}
+<div class="ktInfo"><p>This workflow does not define any states.</p></div>
+{else}
+<ul id="workflow-states-list">
+{foreach item=oState from=$workflow_info.states}
+    <li><span class="workflow_element">State:</span> <a href="{$smarty.server.PHP_SELF}?action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}" class="workflow_label">{$oState->getName()}</a>
+    <ul>
+        <li><a href="{$smarty.server.PHP_SELF}?action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}">{i18n}Notified groups & roles:{/i18n}</a>
+        {$context->getNotificationStringForState($oState)}
+        </li>
+        <li><a href="{$smarty.server.PHP_SELF}?action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}">{i18n}Actions available: {/i18n}</a>
+        {$context->getActionStringForState($oState)}
+        </li>
+      
+        <li><a href="{$smarty.server.PHP_SELF}?action=editTransitions&fWorkflowId={$oWorkflow->getId()}">{i18n}Transitions available: {/i18n}</a>
+        {$context->getTransitionFromStringForState($oState)}
+        </li>
+      
+        <li>{i18n}Transitions to this state: {/i18n}
+        {$context->getTransitionToStringForState($oState)}
+        </li>
+    </ul>
+    </li>
+{/foreach}
+</ul>
+{/if}
 \ No newline at end of file
+<h2>{i18n}Manage Transitions{/i18n}</h2>
+
+<p class="descriptiveText">{i18n}Transitions are what drive the workflow of documents.
+Each step that needs to be followed in the document's lifecycle could
+map to a transition, and can be allowed or denied by a combination
+of roles, permissions and groups.{/i18n}</p>
+
+<p class="descriptiveText">{i18n}Use the form below to create a new Transition, and
+assign or edit existing transitions using the table below.{/i18n}</p>
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<fieldset>
+<legend>{i18n}Create a new state{/i18n}</legend>
+
+<input type="hidden" name="action" value="newTransition" />
+<input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
+
+{* Standard Form *}
+
+{foreach item=oWidget from=$add_fields}
+  {$oWidget->render()}
+{/foreach}
+
+<div class="form_actions">
+<input type="submit" name="submit" value="{i18n}Create transition{/i18n}" />
+</div>
+</fieldset>
+</form>
+
+<h3>{i18n}Transition Availability{/i18n}</h3>
+
+<p class="descriptiveText">Click on any transition below to edit it directly,
+or use the checkboxes to assign which states the transition is available from.</p>
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="action" value="setTransitionAvailability">
+<input type="hidden" name="fWorkflowId" value="{$oWorkflow->getId()}" />
+
+<table class="kt_collection" style="width: auto">
+<thead>
+  <tr>
+    <th>
+      &nbsp;
+    </th>
+    {foreach item=oState from=$workflow_info.states}
+    <th>
+      {$oState->getName()}
+    </th>
+    {/foreach}
+  </tr>
+</thead>
+<tbody>
+  {foreach item=oTransition from=$workflow_info.transitions}
+  <tr class='{cycle values="odd,even"}'>
+    <td>
+      <a href="{$smarty.server.PHP_SELF}?action=editTransition&fWorkflowId={$oWorkflow->getId()}&fTransitionId={$oTransition->getId()}">{$oTransition->getName()}</a>
+    </td>
+    {foreach item=oState from=$workflow_info.states}
+      <td>
+        {if ($oState->getId() != $oTransition->getTargetStateId())}
+        <input type="checkbox" name="fTransitionAvailability[{$oState->getId()}][{$oTransition->getId()}]" {if ($context->transitionAvailable($oTransition, $oState))}checked="true"{/if}>
+        {else}&mdash;{/if}
+      </td>
+    {/foreach}
+  </tr>
+  {/foreach}
+</tbody>
+<table>
+
+<div class="form_actions">
+  <input type="submit" value="{i18n}Assign Transition Availability{/i18n}" />
+</div>
+
+</form>
 \ No newline at end of file