- add "add" icon

- improve workflow ui (to fix newly added bugs) - improve tree-edit - git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4700 c91229c3-7414-0410-bfa2-8a42b809f60b

- add "add" icon
- improve workflow ui (to fix newly added bugs) - improve tree-edit - git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4700 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 4ccac372
Showing 14 changed files with 279 additions and 183 deletions
plugins/ktcore/admin/documentFields.php
plugins/ktcore/admin/workflows.php
resources/css/kt-contenttypes.css
resources/css/kt-framing.css
resources/css/kt-ie-icons.css
templates/ktcore/edit_lookuptrees.smarty
templates/ktcore/workflow/createState.smarty
templates/ktcore/workflow/createTransition.smarty
templates/ktcore/workflow/editWorkflow.smarty
templates/ktcore/workflow/manageActions.smarty
templates/ktcore/workflow/manageStates.smarty
templates/ktcore/workflow/manageTransitions.smarty
thirdparty/icon-theme/16x16/actions/add.gif
thirdparty/icon-theme/16x16/actions/add.png
@@ -626,12 +626,19 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
         $this->oPage->setTitle(_('Edit Lookup Tree'));
         //$this->oPage->requireJSResource('thirdparty/js/MochiKit/Base.js');
-
+		
+		if ($current_node == 0) { $category_name = 'Root'; }
+		else {
+			$oNode = MDTreeNode::get($current_node);
+			$category_name = $oNode->getName();
+		}
+		
         $aTemplateData = array(
             "field" => $oField,
             "tree" => $fieldTree,
             "renderedTree" => $renderedTree,
             "currentNode" => $current_node,
+			'category_name' => $category_name,
             "freechildren" => $free_metadata,
             "context" => $this,
         );
@@ -752,7 +759,7 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
         }
         else
         {
-           $actionStr .= '<a href="?action=editTree&field_id='.$iFieldId.'&current_node='.$current_node.'">add items</a> ';
+           $actionStr .= '<a href="?action=editTree&field_id='.$iFieldId.'&current_node='.$current_node.'">attach keywords</a> ';
            $actionStr .= '| <a href="?action=editTree&field_id='.$iFieldId.'&current_node='.$current_node.'&subaction=deleteCategory">delete</a>';
         }
         $actionStr .= ")";
@@ -155,11 +155,13 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
         $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) {
@@ -214,14 +216,14 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
         return $val;
     }
-    function actionAvailable($oAction, $oState) {
+    function actionAvailable($sAction, $oState) {
         $aInfo = $this->aWorkflowInfo;
         $val = false;
         foreach ($aInfo['actions_by_state'][$oState->getId()] as $oA) {
-            if ($oAction->getName() == $oA) { $val = true; }
+            if ($sAction == $oA) { $val = true; }
         }
         return $val;
@@ -398,6 +400,23 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
         $aInfo = $this->buildWorkflowInfo($oWorkflow);
+        
+        $oTemplate->setData(array(
+            'context' => $this,
+            'oWorkflow' => $oWorkflow,
+            
+            // info
+            'workflow_info' => $aInfo,
+        ));
+        return $oTemplate;
+    }
+
+    function do_createState() {
+        $oTemplate =& $this->oValidator->validateTemplate('ktcore/workflow/createState');
+        $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);
@@ -409,6 +428,12 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
             // info
             'workflow_info' => $aInfo,
+
+            'aActions' => KTDocumentActionUtil::getDocumentActionsByNames(KTWorkflowUtil::getControlledActionsForWorkflow($oWorkflow)),
+            'aActionsSelected' => KTWorkflowUtil::getEnabledActionsForState($oState),
+            'aGroups' => Group::getList(),
+            'aRoles' => Role::getList(),
+            'aUsers' => User::getList(),            
             // subform
             'add_fields' => $add_fields,
@@ -421,7 +446,30 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
         $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);        
         $aInfo = $this->buildWorkflowInfo($oWorkflow);
-                
+            
+        $oTemplate->setData(array(
+            'context' => $this,
+            'oWorkflow' => $oWorkflow,
+                       
+            // info
+            'workflow_info' => $aInfo,
+            
+            // subform
+            'add_fields' => $add_transition_fields,
+        ));
+        return $oTemplate;
+    }
+
+    function do_createTransition() {
+        $oTemplate =& $this->oValidator->validateTemplate('ktcore/workflow/createTransition');
+        $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);        
+        
+        $aInfo = $this->buildWorkflowInfo($oWorkflow);
+        $aPermissions = $aInfo['permissions'];
+        $aGroups = $aInfo['groups'];
+        $aRoles = $aInfo['roles'];
+        $aConditions = KTSavedSearch::getConditions();
+        
         $add_transition_fields = array();
         $add_transition_fields[] = new KTStringWidget(_('Name'), _('A human-readable name for the transition.'), 'fName', null, $this->oPage, true);
         $aOptions = array();
@@ -437,7 +485,37 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
             $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);
+        $add_transition_fields[] = new KTLookupWidget(_('Guard Permission.'), _('Which permission must the user have in order to follow this transition?'), 'fPermissionId', NULL, $this->oPage, true, null, null, $aOptions);
+        
+        $aOptions = array();
+        $vocab = array();
+        $vocab[0] = 'None';
+        foreach($aGroups as $group) {
+            $vocab[$group->getId()] = $group->getName();
+        } 
+        $aOptions['vocab'] = $vocab;
+        $add_transition_fields[] = new KTLookupWidget(_('Guard Group.'), _('Which group must the user belong to in order to follow this transition?'), 'fGroupId', NULL, $this->oPage, false, null, null, $aOptions);
+        $aOptions = array();
+        $vocab = array();
+        $vocab[0] = 'None';
+        foreach($aRoles as $role) {
+            $vocab[$role->getId()] = $role->getName();
+        } 
+        $aOptions['vocab'] = $vocab;
+        $add_transition_fields[] = new KTLookupWidget(_('Guard Role.'), _('Which role must the user have in order to follow this transition?'), 'fRoleId', NULL, $this->oPage, false, null, null, $aOptions);
+        
+        if (!empty($aConditions)) {
+            $aOptions = array();
+            $vocab = array();
+            $vocab[0] = 'None';
+            foreach($aConditions as $condition) {
+                $vocab[$condition->getId()] = $condition->getName();
+            } 
+            $aOptions['vocab'] = $vocab;
+            $edit_fields[] = new KTLookupWidget(_('Guard Condition.'), _('Which condition (stored search) must be satisfied before the transition can take place?'), 'fConditionId', NULL, $this->oPage, false, null, null, $aOptions);
+        }
+        
+        
         $oTemplate->setData(array(
             'context' => $this,
@@ -474,7 +552,7 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
         }
         $this->commitTransaction();
-        $this->successRedirectTo('manageTransitions', _('Availability updated.'), sprintf('fWorkflowId=%d', $oWorkflow->getId()));
+        $this->successRedirectTo('manageTransitions', _('Transition Availability updated.'), sprintf('fWorkflowId=%d', $oWorkflow->getId()));
     }
@@ -511,7 +589,7 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
             'redirect_to' => array('editWorkflow', 'fWorkflowId=' . $oWorkflow->getId()),
             'message' => _('Error saving workflow controlled actions'),
         ));
-        $this->successRedirectTo('editWorkflow', _('Changes saved'), 'fWorkflowId=' . $oWorkflow->getId());
+        $this->successRedirectTo('manageActions', _('Controlled actions changed.'), 'fWorkflowId=' . $oWorkflow->getId());
         exit(0);
     }
     // }}}
@@ -546,10 +624,16 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
         ));
         $this->oValidator->notError($oState, array(
-            'redirect_to' => array('editWorkflow', 'fWorkflowId=' .  $oWorkflow->getId()),
+            'redirect_to' => array('createState', 'fWorkflowId=' .  $oWorkflow->getId()),
             'message' => _('Could not create workflow state'),
         ));
+        $res = KTWorkflowUtil::setEnabledActionsForState($oState, $_REQUEST['fActions']);
+        $this->oValidator->notErrorFalse($res, array(
+            'redirect_to' => array('editState', 'fWorkflowId=' . $oWorkflow->getId(), '&fStateId=' .  $oState->getId()),
+            'message' => _('Error saving state enabled actions'),
+        ));
+        
         $this->successRedirectTo('editState', _('Workflow state created'), 'fWorkflowId=' . $oWorkflow->getId() . '&fStateId=' .  $oState->getId());
         exit(0);
     }
@@ -573,15 +657,7 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
             }
         }
         $aTransitionsSelected = KTWorkflowUtil::getTransitionsFrom($oState, array('ids' => true));
-        $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(),
-        );
+
         $this->oPage->setBreadcrumbDetails(_('State') . ': ' . $oState->getName());
         $aInformed = KTWorkflowUtil::getInformedForState($oState);
@@ -648,7 +724,7 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
             'redirect_to' => array('editState', 'fWorkflowId=' . $oWorkflow->getId(), '&fStateId=' .  $oState->getId()),
             'message' => _('Error saving state enabled actions'),
         ));
-        $this->successRedirectTo('editState', _('Actions set'), 'fWorkflowId=' . $oWorkflow->getId() . '&fStateId=' .  $oState->getId());
+        $this->successRedirectTo('manageActions', _('Controlled Actions changed.'), 'fWorkflowId=' . $oWorkflow->getId() . '&fStateId=' .  $oState->getId());
         exit(0);
     }
     // }}}
@@ -699,6 +775,8 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
         $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
         $oState =& $this->oValidator->validateWorkflowState($_REQUEST['fTargetStateId']);
+        $aInfo = $this->buildWorkflowInfo($oWorkflow);
+        
         // setup error options for later
         $aErrorOptions = array(
             'redirect_to' => array('editWorkflow', sprintf('fWorkflowId=%d', $oWorkflow->getId())),
@@ -707,7 +785,8 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
         $iPermissionId = KTUtil::arrayGet($_REQUEST, 'fPermissionId');
         $iGroupId = KTUtil::arrayGet($_REQUEST, 'fGroupId');
         $iRoleId = KTUtil::arrayGet($_REQUEST, 'fRoleId');
-
+        $iConditionId = KTUtil::arrayGet($_REQUEST, 'fConditionId', null);
+        
         // validate name
         $sName = $this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'fName'), $aErrorOptions);
@@ -729,6 +808,9 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
         if ($iRoleId) {
             $this->oValidator->validateRole($_REQUEST['fRoleId']);
         }
+        if ($iConditionId) {
+            $this->oValidator->validateCondition($_REQUEST['fConditionId']);
+        }
         $res = KTWorkflowTransition::createFromArray(array(
             'workflowid' => $oWorkflow->getId(),
@@ -743,7 +825,30 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
             'redirect_to' => array('editWorkflow', 'fWorkflowId=' .  $oWorkflow->getId()),
             'message' => _('Could not create workflow transition'),
         ));
-        $this->successRedirectTo('editTransition', _('Workflow transition created'), sprintf('fWorkflowId=%d&fTransitionId=%d', $oWorkflow->getId(), $res->getId()));
+        
+        // now attach it to the appropriate states.
+        $aStateId = (array) KTUtil::arrayGet($_REQUEST, 'fStatesAvailableIn');
+        $aStateId = array_keys($aStateId);
+        $newTransition = $res;
+        
+        foreach ($aStateId as $iStateId) {
+            if ($iStateId == $res->getTargetStateId()) { continue; }
+            $oState = $aInfo['states'][$iStateId];
+            
+            $aTransitions = KTWorkflowTransition::getBySourceState($oState);
+            $aTransitions[] = $res;
+            $aTransitionIds = array();
+            foreach ($aTransitions as $oTransition) {
+                $aTransitionIds[] = $oTransition->getId();
+            }
+            $res = KTWorkflowUtil::saveTransitionsFrom($oState, $aTransitionIds);
+            if (PEAR::isError($res)) {
+                $this->errorRedirectTo('manageTransitions',sprintf(_('Unable to assign new transition to state %s'),$oState->getName()), sprintf('fWorkflowId=%d', $oWorkflow->getId()));
+            }
+        }
+        
+        
+        $this->successRedirectTo('editTransition', _('Workflow transition created'), sprintf('fWorkflowId=%d&fTransitionId=%d', $oWorkflow->getId(), $newTransition->getId()));
         exit(0);
     }
     // }}}
@@ -807,15 +912,6 @@ class KTWorkflowDispatcher extends KTAdminDispatcher {
         $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(),
-        );
-        $this->aBreadcrumbs[] = array(
-            'url' => $_SERVER['PHP_SELF'],
             'query' => 'action=editTransition&fWorkflowId=' . $oWorkflow->getId() . '&fTransitionId=' . $oTransition->getId(),
             'name' => $oTransition->getName(),
         );
@@ -20,7 +20,10 @@
 .contenttype.excel { background-image: url(../../resources/mimetypes/excel.png); }
 .contenttype.openoffice { background-image: url(../../resources/mimetypes/openoffice.png); }
 .contenttype.pdf { background-image: url(../../resources/mimetypes/pdf.png); }
+.contenttype.image { background-image: url(../../resources/mimetypes/image.png); }
+.contenttype.compressed { background-image: url(../../resources/mimetypes/compressed.png); }
 .contenttype.txt,
+.contenttype.text,
 .contenttype.unspecified_type { background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/text-x-generic.png); }
 .contenttype.folder { background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/x-directory-normal.png); }
@@ -637,6 +637,11 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
     cursor: pointer;
 }
+.ktAction.ktInline {
+    float: left; 
+    padding-right: 0.5em;
+}
+
 .ktHelp { 
     background: transparent url(../../thirdparty/icon-theme/16x16/apps/help-browser.png) top left no-repeat;
     float: right;
@@ -657,6 +662,7 @@ The text will be hidden for screen view.  The generic fahrner-ish approach comes
 .ktAction.ktEdit { background: transparent url(../../thirdparty/icon-theme/16x16/actions/document-properties.png) top left no-repeat; }
 .ktAction.ktAddUser { background: transparent url(../../thirdparty/icon-theme/16x16/actions/contact-new.png) top left no-repeat; }
 .ktAction.ktAddGroup { background: transparent url(../../thirdparty/icon-theme/16x16/actions/group-new.png) top left no-repeat; }
+.ktAction.ktAdd { background: transparent url(../../thirdparty/icon-theme/16x16/actions/add.png) top left no-repeat; }
 /* =========== standard listings. */
@@ -6,12 +6,18 @@
 .ktAction.ktEdit { background: transparent url(../../thirdparty/icon-theme/16x16/actions/document-properties.gif) top left no-repeat; }
 .ktAction.ktAddUser { background: transparent url(../../thirdparty/icon-theme/16x16/actions/contact-new.gif) top left no-repeat; }
 .ktAction.ktAddGroup { background: transparent url(../../thirdparty/icon-theme/16x16/actions/group-new.gif) top left no-repeat; }
+.ktAction.ktAdd { background: transparent url(../../thirdparty/icon-theme/16x16/actions/add.gif) top left no-repeat; }
+
 .contenttype.office { background-image: url(../../resources/mimetypes/office.gif); }
 .contenttype.word { background-image: url(../../resources/mimetypes/word.gif); }
+.contenttype.database { background-image: url(../../resources/mimetypes/database.gif); }
 .contenttype.excel { background-image: url(../../resources/mimetypes/excel.gif); }
 .contenttype.openoffice { background-image: url(../../resources/mimetypes/openoffice.gif); }
 .contenttype.pdf { background-image: url(../../resources/mimetypes/pdf.gif); }
+.contenttype.image { background-image: url(../../resources/mimetypes/image.gif); }
+.contenttype.compressed { background-image: url(../../resources/mimetypes/compressed.gif); }
 .contenttype.txt,
+.contenttype.text,
 .contenttype.unspecified_type { background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/text-x-generic.gif); }
 .contenttype.folder { background-image: url(../../thirdparty/icon-theme/16x16/mimetypes/x-directory-normal.gif); }
@@ -5,10 +5,28 @@
 <h2>{i18n}Edit Lookup Tree{/i18n}: {$field->getName()}</h2>
+<p class="descriptiveText">{i18n}Many "lookup" fields make sense in a hierachy:
+countries are part of continents and sub-continents, school classes are part of grades
+and programs, Powerbooks are Apple Macs, while Thinkpads are made by Lenovo.  This 
+page will allow you to arrange the lookups in the field in a hierachy.  All changes
+are immediately stored, so when you are done simply navigate back to the field menu.{/i18n}</p>
+
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-  <legend>{i18n}Add New Subcategory{/i18n}</legend>
+  <legend>{i18n arg_category="$category_name"}Add New Subcategory to <strong>#category#</strong>{/i18n}</legend>
+  
+  <p class="descriptiveText">{i18n}In order to organise the options into a "tree", you 
+  need to add subcategories at each level.  The "top" level is called the root, and 
+  holds all the toplevel items.  "Root" will not be shown to the final user, but 
+  provides a single "parent" to the toplevel items.{/i18n}</p>
+  
+  <p class="descriptiveText">{i18n}As an example, if you are creating a tree of the
+  countries in the world, the actual countries would be <strong>keywords</strong> 
+  (e.g. South Africa, England, Pakistan, India).  The highest group of categories 
+  would be continents &mdash; e.g. Africa, Europe, Asia, The Americas &mdash; followed by 
+  subcategories that contain actual countries &mdash; e.g. Western Europe, Sub-saharan Africa, 
+  Austalasia.{/i18n}</p>
@@ -20,24 +38,33 @@
 <input type="text" name="category_name"/>
 <div class="form_actions">
-  <input type="submit" name="submit" value="{i18n}add new category{/i18n}" />
+  <input type="submit" name="submit" value="{i18n}add new subcategory{/i18n}" />
 </div>
 </fieldset>
 </form>
+
 {if ($currentNode != 0)}
 {if (empty($freechildren))}
-<p>{i18n}No free keywords.  Use the "unlink" action on a keyword to 
-make it available.{/i18n}</p>
+<p class="descriptiveText">{i18n}Keywords which are directly below the 
+  <strong>Root</strong> are considered "free" &mdash; they are not attached to 
+  a subcategory.  Only free keywords can be associated with a subcategory.  To
+  free a keyword, click on the "unlink" command next to it in the preview tree below.  
+  Deleting a subcategory will automatically unlink all keywords below it (including
+  those in subcategories of the subcategory).
+  {/i18n}</p>
+
+<div class="ktInfo"><p>{i18n}No free keywords.  Use the "unlink" action on a keyword to 
+make it available.{/i18n}</p></div>
 {else}
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-  <legend>{i18n}Link free keywords.{/i18n}</legend>
-  
-<p>{i18n}Category{/i18n}: <strong>{if ($currentNode == 0)}
-Root
-{else}
-{$tree->mapnodes[$currentNode]->getName()}
-{/if}</strong></p>  
+  <legend>{i18n arg_category=$category_name}Attach keywords to <strong>#category#</strong>{/i18n}</legend>
+
+  <p class="descriptiveText">{i18n}Keywords which are directly below the 
+  <strong>Root</strong> are considered "free" &mdash; they are not attached to 
+  a subcategory.  Only free keywords can be associated with a subcategory.  To
+  free a keyword, click on the "unlink" command next to it in the preview tree below.
+  {/i18n}</p>
   <input type="hidden" name="field_id" value="{$field->getId()}" />
   <input type="hidden" name="action" value="editTree" /> 
@@ -62,9 +89,10 @@ Root
 <h2>{i18n}Preview{/i18n}</h2>
-<div class="helpText">
+<div><p class="descriptiveText">
     {i18n}Use the +/- arrows to open or close the tree.  Bold items are metadata keywords.
     To edit a category (including adding or removing keywords) click on the "edit" link.{/i18n}
+    </p>
 </div>
 {$renderedTree}
@@ -7,133 +7,69 @@ the &quot;sent&quot; &lt;strong&gt;transition&lt;/strong&gt; has been performed by a user.&lt;/p&gt;
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<legend>{i18n}Edit state properties{/i18n}</legend>
-<input type="hidden" name="action" value="saveState" />
+<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()}" />
-<input type="hidden" name="fStateId" value="{$oState->getId()}" />
-{foreach item=oWidget from=$editForm}
+
+{* Standard Form *}
+
+{foreach item=oWidget from=$add_fields}
   {$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>
+<div class="field">
+<label>Informed Users</label>
 <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>
+<p>{i18n}Roles{/i18n}</p>
 {entity_checkboxes entities=$aRoles name="fRoleIds" multiple="true" selected=$aInformed.role assign=aBoxes}
 {foreach from=$aBoxes item=sBox}
-{$sBox}<br />
+{$sBox}
 {/foreach}
 {/if}
-<h3>{i18n}Groups{/i18n}</h3>
+<p>{i18n}Groups{/i18n}</p>
 {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 />
+{$sBox}
 {/foreach}
-<input type="submit" name="submit" value="{i18n}Save{/i18n}" />
-
-</form>
-*}
-
-</fieldset>
-
+</div>
-{*
-<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>
 *}
+<div class="field">
+<label>Actions Allowed</label>
+<p class="descriptiveText">Workflows can control which actions (edit metadata,
+download, etc.) are available on a given document.  Please specify which of
+the actions controlled by this workflow are available when the document is in
+this state.</p>
+{if (!empty($aActions))}
-<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>
+{entity_checkboxes name="fActions" entities=$aActions idmethod="getName" method="getDisplayName" assign="aCheckboxes" selected="$aActionsSelected"}
+{foreach from=$aCheckboxes item=sCheckbox}
+{$sCheckbox}
 {/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>
+<div class="ktInfo"<p>{i18n}No actions are controlled by 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()}" />
+</div>
-{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" />
+<input type="submit" name="submit" value="{i18n}Create state{/i18n}" />
 </div>
-{else}
-No actions defined.
-{/if}
+
 </fieldset>
-</form>
+<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 transition{/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="field">
+<label>Source States</label>
+<p class="descriptiveText">{i18n}Please select which states this transition should be available from.  <strong>Note</strong>
+that transitions are never available from their target state, even if you specify it below.{/i18n}</p>
+
+{foreach item=oState from=$workflow_info.states}
+<label><input type="checkbox" name="fStatesAvailableIn[{$oState->getId()}]" />{$oState->getName()}</label>
+{/foreach}
+</div>
+<div class="form_actions">
+<input type="submit" name="submit" value="{i18n}Create transition{/i18n}" />
+</div>
+</fieldset>
+</form>
+
+</form>
 \ No newline at end of file
@@ -33,7 +33,7 @@ Workflow menu (on the left) to create new states.&lt;/p&gt;&lt;/div&gt;
         <li>{i18n}Notified groups &amp; roles:{/i18n}
         {$context->getNotificationStringForState($oState)}
         </li>
-        <li>{i18n}Actions available: {/i18n}
+        <li>{i18n}Controlled Actions available: {/i18n}
         {$context->getActionStringForState($oState)}
         </li>
@@ -48,8 +48,8 @@ will be available at all states.{/i18n}&lt;/p&gt;&lt;/div&gt;
 <thead>
   <tr>
     <th>&nbsp;</th>
-    {foreach from=$aActions item=oAction}
-    <th>{$oAction->getDisplayName()}</th>
+    {foreach from=$aActionsSelected item=sAction}
+    <th>{$workflow_info.actions_by_name.$sAction->getDisplayName()}</th>
     {/foreach}
   </tr>
 </thead>
@@ -57,8 +57,8 @@ will be available at all states.{/i18n}&lt;/p&gt;&lt;/div&gt;
 {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 item=sAction from=$aActionsSelected}
+      <td><input type="checkbox" name="fAvailableActions[{$oState->getId()}][{$sAction}]" {if ($context->actionAvailable($sAction, $oState))}checked="true"{/if}/></td>
     {/foreach}
   </tr>
 {/foreach}
@@ -6,29 +6,16 @@ are placed in certain &lt;strong&gt;states&lt;/strong&gt;.  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>
+<legend>Create a new state</legend>
+<p class="descriptiveText">A critical part of workflow is the creation of
+various different states for documents.</p>
+<a href="{$smarty.server.PHP_SELF}?action=createState&fWorkflowId={$oWorkflow->getId()}"
+   class="ktAction ktInline ktAdd">{i18n}Create a new state{/i18n}</a>
+<a href="{$smarty.server.PHP_SELF}?action=createState&fWorkflowId={$oWorkflow->getId()}">{i18n}Create a new state{/i18n}</a>
-<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>
@@ -40,7 +27,7 @@ to access and modify these other properties.&lt;/p&gt;
         <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>
+        <li><a href="{$smarty.server.PHP_SELF}?action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}">{i18n}Controlled Actions available: {/i18n}</a>
         {$context->getActionStringForState($oState)}
         </li>
@@ -5,27 +5,15 @@ Each step that needs to be followed in the document&#39;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()}" />
+<legend>{i18n}Create a new transition{/i18n}</legend>
-{* Standard Form *}
+<a href="{$smarty.server.PHP_SELF}?action=createTransition&fWorkflowId={$oWorkflow->getId()}"
+   class="ktAction ktAdd ktInline">{i18n}Create a new transition{/i18n}</a>
+<a href="{$smarty.server.PHP_SELF}?action=createTransition&fWorkflowId={$oWorkflow->getId()}"
+   >{i18n}Create a new transition{/i18n}</a>
-{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>