KTS-2076

"Character encoding issue with document titles" Fixed this issue which lead to several other XSS issue fixes and i18n issue fixes. Note: knowlegetree.pot needs an update due to i18n fixes. Committed By: Kevin Reviewed By: Conrad git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6738 c91229c3-7414-0410-bfa2-8a42b809f60b

KTS-2076
"Character encoding issue with document titles" Fixed this issue which lead to several other XSS issue fixes and i18n issue fixes. Note: knowlegetree.pot needs an update due to i18n fixes. Committed By: Kevin Reviewed By: Conrad git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/trunk@6738 c91229c3-7414-0410-bfa2-8a42b809f60b
kevin_fourie
1 parent 1c61df70
Showing 75 changed files with 174 additions and 164 deletions
i18n/knowledgeTree.pot
lib/documentmanagement/DocumentFieldLink.inc
lib/documentmanagement/documentmetadataversion.inc.php
lib/foldermanagement/Folder.inc
lib/validation/errorviewer.inc.php
plugins/ktcore/KTColumns.inc.php
plugins/ktcore/KTDocumentActions.php
plugins/ktcore/KTFolderActions.php
plugins/ktcore/KTPermissions.php
plugins/ktcore/admin/workflowsv2.php
plugins/ktcore/document/edit.php
plugins/ktcore/folder/BulkImport.php
plugins/ktcore/folder/BulkUpload.php
plugins/ktcore/folder/Permissions.php
plugins/ktcore/folder/Transactions.php
plugins/ktcore/folder/addDocument.php
plugins/ktstandard/KTDocumentLinks.php
plugins/ktstandard/KTEmail.php
plugins/rssplugin/RSSFolderLinkAction.php
plugins/rssplugin/templates/RSSPlugin/rssdocumentaction.smarty
@@ -1850,7 +1850,7 @@ msgid &quot;Control which users can log in, and are part of which groups and organisa
 msgstr ""
 #: i18n/templates.c:3494 i18n/templates.c:3608
-msgid "Controlled Actions available:"
+msgid "Controlled Actions available"
 msgstr ""
 #: plugins/ktcore/admin/workflowsv2.php:1022 i18n/templates.c:3314
@@ -2285,7 +2285,7 @@ msgid &quot;Dashboard&quot;
 msgstr ""
 #: lib/validation/errorviewer.inc.php:130
-msgid "Database error:"
+msgid "Database error"
 msgstr ""
 #: i18n/templates.c:146 i18n/templates.c:155 i18n/templates.c:242
@@ -4131,7 +4131,7 @@ msgstr &quot;&quot;
 #: i18n/templates.c:3326 i18n/templates.c:4043 i18n/templates.c:4415
 #: i18n/templates.c:4922
-msgid "Group:"
+msgid "Group"
 msgstr ""
 #: plugins/ktcore/admin/groupManagement.php:398
@@ -4159,7 +4159,7 @@ msgstr &quot;&quot;
 #: plugins/ktcore/admin/workflowsv2.php:1915 i18n/templates.c:4127
 #: i18n/templates.c:4586
-msgid "Groups:"
+msgid "Groups"
 msgstr ""
 #: plugins/ktcore/admin/workflowsv2.php:1418
@@ -5154,7 +5154,7 @@ msgid &quot;Master field has no values which are assigned to behaviours.&quot;
 msgstr ""
 #: i18n/templates.c:1331
-msgid "Match <b>#join#</b> of the following:"
+msgid "Match <b>#join#</b> of the following"
 msgstr ""
 #: plugins/ktcore/admin/userManagement.php:138
@@ -6044,7 +6044,7 @@ msgid &quot;Notifications updated.&quot;
 msgstr ""
 #: i18n/templates.c:3491 i18n/templates.c:3605
-msgid "Notified groups & roles:"
+msgid "Notified groups & roles"
 msgstr ""
 #: i18n/templates.c:5231
@@ -6126,7 +6126,7 @@ msgid &quot;Orphaned Folders Plugin&quot;
 msgstr ""
 #: i18n/templates.c:2081
-msgid "Over time, the lookup values which make sense will change and evolve as your organisation does. You may thus need to change the lookup values associated with a given field.  There are a number of different states that are possible for a given lookup:"
+msgid "Over time, the lookup values which make sense will change and evolve as your organisation does. You may thus need to change the lookup values associated with a given field.  There are a number of different states that are possible for a given lookup"
 msgstr ""
 #: i18n/templates.c:4130
@@ -6255,7 +6255,7 @@ msgid &quot;Permissions on folder updated&quot;
 msgstr ""
 #: i18n/templates.c:3497 i18n/templates.c:3611
-msgid "Permissions overridden:"
+msgid "Permissions overridden"
 msgstr ""
 #: plugins/ktcore/folder/Permissions.php:487
@@ -6926,7 +6926,7 @@ msgstr &quot;&quot;
 #: i18n/templates.c:3323 i18n/templates.c:4034 i18n/templates.c:4406
 #: i18n/templates.c:4913
-msgid "Role:"
+msgid "Role"
 msgstr ""
 #: plugins/ktcore/KTCorePlugin.php:218 i18n/templates.c:3230
@@ -6935,7 +6935,7 @@ msgid &quot;Roles&quot;
 msgstr ""
 #: plugins/ktcore/admin/workflowsv2.php:1921
-msgid "Roles:"
+msgid "Roles"
 msgstr ""
 #: plugins/ktcore/admin/fieldsets/basic.inc.php:707
@@ -7650,7 +7650,7 @@ msgid &quot;The action cannot be performed on any of the selected entities.&quot;
 msgstr ""
 #: i18n/templates.c:5729
-msgid "The action will be performed on the following documents and folders:"
+msgid "The action will be performed on the following documents and folders"
 msgstr ""
 #: plugins/ktcore/folder/BulkUpload.php:68
@@ -7682,7 +7682,7 @@ msgid &quot;The core of a workflow is the &lt;strong&gt;process&lt;/strong&gt; that documents in 
 msgstr ""
 #: plugins/ktcore/document/Rename.php:74
-msgid "The current file name is shown below:"
+msgid "The current file name is shown below"
 msgstr ""
 #: i18n/templates.c:974
@@ -7807,7 +7807,7 @@ msgid &quot;The following files are present in the repository, but do not exist in th
 msgstr ""
 #: i18n/templates.c:5708
-msgid "The following list shows documents and folders in your list which cannot be acted on by this bulk action:"
+msgid "The following list shows documents and folders in your list which cannot be acted on by this bulk action"
 msgstr ""
 #: plugins/ktcore/admin/fieldsets/basic.inc.php:377
@@ -7821,11 +7821,11 @@ msgid &quot;The following permissions are required: %s&quot;
 msgstr ""
 #: i18n/templates.c:1010
-msgid "The following upgrade is available:"
+msgid "The following upgrade is available"
 msgstr ""
 #: i18n/templates.c:1013
-msgid "The following upgrades are available:"
+msgid "The following upgrades are available"
 msgstr ""
 #: plugins/ktcore/admin/userManagement.php:131
@@ -8037,7 +8037,7 @@ msgid &quot;There are #closed# closed threads - use the \&quot;View All\&quot; option below to 
 msgstr ""
 #: i18n/templates.c:3962
-msgid "There are 3 different ways in which workflows interact with the system's security:"
+msgid "There are 3 different ways in which workflows interact with the system's security"
 msgstr ""
 #: i18n/templates.c:3086
@@ -8136,7 +8136,7 @@ msgid &quot;There was an error updating the thread with the new comment&quot;
 msgstr ""
 #: i18n/templates.c:5687
-msgid "These are the results of the bulk action:"
+msgid "These are the results of the bulk action"
 msgstr ""
 #: i18n/templates.c:1613
@@ -8418,11 +8418,11 @@ msgid &quot;To add users to this role, select one or more user names in the Available
 msgstr ""
 #: i18n/templates.c:704
-msgid "To connect to #appname# via a third-party WebDAV client, please use the following address:"
+msgid "To connect to #appname# via a third-party WebDAV client, please use the following address"
 msgstr ""
 #: i18n/templates.c:707
-msgid "To connect with the #appname# Tools for Windows package, use this address:"
+msgid "To connect with the #appname# Tools for Windows package, use this address"
 msgstr ""
 #: i18n/templates.c:5504
@@ -8583,7 +8583,7 @@ msgid &quot;Transitions are what drive the workflow of documents. Each step that need
 msgstr ""
 #: i18n/templates.c:3500 i18n/templates.c:3614
-msgid "Transitions available:"
+msgid "Transitions available"
 msgstr ""
 #: i18n/templates.c:3296
@@ -8595,7 +8595,7 @@ msgid &quot;Transitions to this state&quot;
 msgstr ""
 #: i18n/templates.c:3503 i18n/templates.c:3617
-msgid "Transitions to this state:"
+msgid "Transitions to this state"
 msgstr ""
 #: lib/documentmanagement/DocumentField.inc:168
@@ -9252,7 +9252,7 @@ msgstr &quot;&quot;
 #: i18n/templates.c:4052 i18n/templates.c:4355 i18n/templates.c:4424
 #: i18n/templates.c:4886 i18n/templates.c:4931
-msgid "User:"
+msgid "User"
 msgstr ""
 #: i18n/templates.c:443
@@ -9311,7 +9311,7 @@ msgstr &quot;&quot;
 #: plugins/ktcore/admin/workflowsv2.php:1909 i18n/templates.c:4124
 #: i18n/templates.c:4583
-msgid "Users:"
+msgid "Users"
 msgstr ""
 #: lib/documentmanagement/documentutil.inc.php:983
@@ -9452,7 +9452,7 @@ msgid &quot;Want to know who all has logged in the system over a period of time?  You
 msgstr ""
 #: i18n/templates.c:3083 i18n/templates.c:4100
-msgid "Warning:"
+msgid "Warning"
 msgstr ""
 #: i18n/templates.c:4838
@@ -121,7 +121,7 @@ class DocumentFieldLink extends KTEntity {
 	*
 	*/
 	function getValue() {
-		return $this->sValue;
+		return sanitizeForHTML($this->sValue);
 	}
 	/**
@@ -131,7 +131,7 @@ class DocumentFieldLink extends KTEntity {
 	*
 	*/
 	function setValue($sNewValue) {
-		$this->sValue = $sNewValue;
+		$this->sValue = sanitizeForSQL($sNewValue);
 	}
     function _table () {
@@ -97,8 +97,8 @@ class KTDocumentMetadataVersion extends KTEntity {
     function setDocumentTypeId($iNewValue) { $this->iDocumentTypeId = $iNewValue; }
     function getName() { return sanitizeForSQLtoHTML($this->sName); }
     function setName($sNewValue) { $this->sName = sanitizeForSQL($sNewValue); }
-    function getDescription() { return $this->sDescription; }
-    function setDescription($sNewValue) { $this->sDescription = $sNewValue; }
+    function getDescription() { return sanitizeForSQLtoHTML($this->sDescription); }
+    function setDescription($sNewValue) { $this->sDescription = sanitizeForSQL($sNewValue); }
     function getStatusId() { return $this->iStatusId; }
     function setStatusId($iNewValue) { $this->iStatusId = $iNewValue; }
     function getVersionCreated() { return $this->dVersionCreated; }
@@ -75,10 +75,10 @@ class Folder extends KTEntity {
     // }}}
 	function getID() { return $this->iId; }
-	function getName() { return $this->sName; }
-	function setName($sNewValue) { $this->sName = $sNewValue; }
-	function getDescription() { return $this->sDescription; } 
-	function setDescription($sNewValue) { $this->sDescription = $sNewValue; } 
+	function getName() { return sanitizeForSQLtoHTML($this->sName); }
+	function setName($sNewValue) { $this->sName = sanitizeForSQL($sNewValue); }
+	function getDescription() { return sanitizeForSQLtoHTML($this->sDescription); } 
+	function setDescription($sNewValue) { $this->sDescription = sanitizeForSQL($sNewValue); } 
 	function getParentID() { return $this->iParentID; }
 	function setParentID($iNewValue) { $this->iParentID = $iNewValue; }
 	function getCreatorID() { return $this->iCreatorID; }
@@ -132,7 +132,7 @@ $oEVRegistry-&gt;register(&quot;KTErrorViewer&quot;, &quot;PEAR_Error&quot;);
 class KTDBErrorViewer extends KTErrorViewer {
     function view() {
-        return _kt("Database error:") . " " . $this->oError->getMessage();
+        return _kt("Database error") . ": " . $this->oError->getMessage();
     }
     function page() {
@@ -72,7 +72,15 @@ class AdvancedTitleColumn extends AdvancedColumn {
     function renderFolderLink($aDataRow) {
-        $outStr = htmlentities($aDataRow["folder"]->getName(), ENT_NOQUOTES, 'UTF-8');
+        /* this check has to be done so that any titles longer than 40 characters is not displayed incorrectly.
+         as mozilla cannot wrap text without white spaces */
+        if (mb_strlen($aDataRow["folder"]->getName(), 'UTF-8') > 40) { 
+        	mb_internal_encoding("UTF-8");
+            $outStr = htmlentities(mb_substr($aDataRow["folder"]->getName(), 0, 40, 'UTF-8')."...", ENT_NOQUOTES, 'UTF-8');
+        }else{
+            $outStr = htmlentities($aDataRow["folder"]->getName(), ENT_NOQUOTES, 'UTF-8');
+        }
+
         if($this->link_folders) {
             $outStr = '<a href="' . $this->buildFolderLink($aDataRow) . '">' . $outStr . '</a>';
         }
@@ -80,7 +88,7 @@ class AdvancedTitleColumn extends AdvancedColumn {
     }
     function renderDocumentLink($aDataRow) {
-        /* this chack has to be done so that any titles longer than 40 characters is not displayed incorrectly.
+        /* this check has to be done so that any titles longer than 40 characters is not displayed incorrectly.
          as mozilla cannot wrap text without white spaces */
         if (mb_strlen($aDataRow["document"]->getName(), 'UTF-8') > 40) { 
         	mb_internal_encoding("UTF-8");
@@ -824,13 +824,13 @@ class KTDocumentMoveAction extends KTDocumentAction {
     function do_main() {
         $oForm = $this->form_move();
-        return $oForm->renderPage();
+        return $oForm->renderPage(_kt('Move Document') . ': ' . $this->oDocument->getName());
     }
     function form_move() {
         $oForm = new KTForm;
         $oForm->setOptions(array(
-            'label' => sprintf(_kt('Move Document "%s"'), $this->oDocument->getName()),
+            'label' => _kt('Move Document'),
             'submit_label' => _kt('Move'),
             'identifier' => 'ktcore.actions.movedoc',
             'action' => 'move',
@@ -1031,7 +1031,7 @@ class KTDocumentCopyAction extends KTDocumentAction {
     function form_copyselection() {
         $oForm = new KTForm;
         $oForm->setOptions(array(
-            'label' => sprintf(_kt('Copy Document "%s"'), $this->oDocument->getName()),
+            'label' => _kt('Copy Document'),
             'submit_label' => _kt('Copy'),
             'identifier' => 'ktcore.actions.copydoc',
             'action' => 'copy',
@@ -1118,7 +1118,7 @@ class KTDocumentCopyAction extends KTDocumentAction {
     function do_main() {
         $this->oPage->setBreadcrumbDetails(_kt('Copy'));
         $oForm = $this->form_copyselection();
-        return $oForm->renderPage();
+        return $oForm->renderPage(_kt('Copy Document') . ': ' . $this->oDocument->getName());
     }
     function do_copy() {   
@@ -1540,7 +1540,6 @@ class KTOwnershipChangeAction extends KTDocumentAction {
         $oTemplate->setData(array(
             'context' => $this,
-            'docname' => $this->oDocument->getName(),
             'form' => $change_form,
         ));     
         return $oTemplate->render();
@@ -109,7 +109,6 @@ class KTFolderAddFolderAction extends KTFolderAction {
         $oForm = $this->form_main();
-
         $oTemplate->setData(array(
             'context' => &$this,
             'form' => $oForm,
@@ -388,7 +388,6 @@ class KTRoleAllocationPlugin extends KTFolderAction {
         $aTemplateData = array(
             'context' => &$this,
             'roles' => $aRoles,
-            'foldername' => $this->oFolder->getName(),
             'is_root' => ($this->oFolder->getId() == 1),
         );
         return $oTemplate->render($aTemplateData);
@@ -2127,19 +2127,19 @@ class KTWorkflowAdminV2 extends KTAdminDispatcher {
         $sNotify = '';
         if (!empty($aUsers)) {
-            $sNotify .= '<em>' . _kt('Users:') . '</em> ';
+            $sNotify .= '<em>' . _kt('Users') . ':</em> ';
             $sNotify .= implode(', ', $aUsers);
         }
         if (!empty($aGroups)) {
             if (!empty($sNotify)) { $sNotify .= ' &mdash; '; }
-            $sNotify .= '<em>' . _kt('Groups:') . '</em> ';
+            $sNotify .= '<em>' . _kt('Groups') . ':</em> ';
             $sNotify .= implode(', ', $aGroups);
         }
         if (!empty($aRoles)) {
             if (!empty($sNotify)) { $sNotify .= ' &mdash; '; }
-            $sNotify .= '<em>' . _kt('Roles:') . '</em> ';
+            $sNotify .= '<em>' . _kt('Roles') . ':</em> ';
             $sNotify .= implode(', ', $aRoles);
         }
@@ -100,7 +100,7 @@ class KTDocumentEditAction extends KTDocumentAction {
             )),
         );
         $validators = array(
-            array('ktcore.validators.string',array(
+            array('ktcore.validators.string', array(
                 'test' => 'document_title',
                 'output' => 'document_title',
             )),
@@ -87,7 +87,6 @@ class KTBulkImportFolderAction extends KTFolderAction {
             'context' => &$this,
             'add_fields' => $add_fields,
             'generic_fieldsets' => $fieldsets,
-            'foldername' => $this->oFolder->getName(),
         ));
         return $oTemplate->render();
     }
@@ -93,7 +93,6 @@ class KTBulkUploadFolderAction extends KTFolderAction {
             'context' => &$this,
             'add_fields' => $add_fields,
             'generic_fieldsets' => $fieldsets,
-            'foldername' => $this->oFolder->getName(),            
         ));
         return $oTemplate->render();
     }
@@ -177,7 +177,6 @@ class KTFolderPermissionsAction extends KTFolderAction {
             'edit' => $bEdit,
             'inheritable' => $bInheritable,
             'inherited' => $sInherited,
-            'foldername' => $this->oFolder->getName(),
             'conditions' => $aConditions,             
         );
         return $oTemplate->render($aTemplateData);
@@ -411,14 +410,14 @@ class KTFolderPermissionsAction extends KTFolderAction {
 		if($bSelected) {
 		    if(count($aPerm))
 		    $aEntityList['g'.$oGroup->getId()] = array('type' => 'group',
-							       'display' => _kt('Group:') . ' ' . $oGroup->getName(),
+							       'display' => _kt('Group') . ': ' . $oGroup->getName(),
 							       'name' => $oGroup->getName(),
 							       'permissions' => $aPerm,
 							       'id' => $oGroup->getId(),
 							       'selected' => true);
 		} else {
 		    $aEntityList['g'.$oGroup->getId()] = array('type' => 'group',
-							       'display' => _kt('Group:') . ' ' . $oGroup->getName(),
+							       'display' => _kt('Group') . ': ' . $oGroup->getName(),
 							       'name' => $oGroup->getName(),
 							       'permissions' => $aPerm,
 							       'id' => $oGroup->getId());
@@ -435,14 +434,14 @@ class KTFolderPermissionsAction extends KTFolderAction {
 		if($bSelected) {
 		    if(count($aPerm)) 
 		    $aEntityList['r'.$oRole->getId()] = array('type' => 'role',
-							      'display' => _kt('Role:') . ' ' . $oRole->getName(),
+							      'display' => _kt('Role') . ': ' . $oRole->getName(),
 							      'name' => $oRole->getName(),
 							      'permissions' => $aPerm,
 							      'id' => $oRole->getId(),
 							      'selected' => true);
 		} else {
 		    $aEntityList['r'.$oRole->getId()] = array('type' => 'role',
-							      'display' => _kt('Role:') . ' ' . $oRole->getName(),
+							      'display' => _kt('Role') . ': ' . $oRole->getName(),
 							      'name' => $oRole->getName(),
 							      'permissions' => $aPerm,
 							      'id' => $oRole->getId());
@@ -50,8 +50,6 @@ class KTFolderTransactionsAction extends KTFolderAction {
         $this->oPage->setBreadcrumbDetails(_kt("transactions"));
         $this->oPage->setTitle(_kt('Folder transactions'));
-        // $oTemplate =& $this->oValidator->validateTemplate('ktcore/folder/transactions');
-
         $folder_data = array();
         $folder_data["folder_id"] = $this->oFolder->getId();
@@ -143,12 +143,8 @@ class KTFolderAddDocumentAction extends KTFolderAction {
     function do_main() {
         $this->oPage->setBreadcrumbDetails(_kt("Add a document"));
-        $this->oPage->setTitle(_kt('Add a document'));
-        
-        $oTemplate =& $this->oValidator->validateTemplate('ktcore/document/add');
-
         $oForm = $this->form_initialdata();
-        return $oForm->render();
+        return $oForm->renderPage(_kt('Add a document to: ') . $this->oFolder->getName());
     }    
     function do_processInitialData() {
@@ -150,7 +150,6 @@ class KTDocumentLinkAction extends KTDocumentAction {
         $oReadPermission =& KTPermission::getByName('ktcore.permissions.read');
         $oWritePermission =& KTPermission::getByName('ktcore.permissions.write');
-
         $aTemplateData = array(
               'context' => $this,
               'links_from' => DocumentLink::getLinksFromDocument($oDocument->getId()),
@@ -141,7 +141,7 @@ function sendEmailDocument($sDestEmailAddress, $sDestUserName, $iDocumentID, $sD
     $sMessage .= sprintf(_kt("Your colleague, %s, wishes you to view the attached document entitled '%s'."), $oSendingUser->getName(), $sDocumentName);
     $sMessage .= "\n\n";
 	if (strlen($sComment) > 0) {
-		$sMessage .= '<br><br>' . _kt('Comments:') . '<br>' . $sComment;
+		$sMessage .= '<br><br>' . _kt('Comments') . ':<br>' . $sComment;
 	}
     $sTitle = sprintf(_kt("Document: %s from %s"), $sDocumentName, $oSendingUser->getName());
@@ -202,7 +202,7 @@ function sendEmailHyperlink($sDestEmailAddress, $sDestUserName, $iDocumentID, $s
 	$sMessage .= '<br>' . generateControllerLink('viewDocument', "fDocumentID=$iDocumentID", $sDocumentName, true);
 	// add optional comment
 	if (strlen($sComment) > 0) {
-		$sMessage .= '<br><br>' . _kt('Comments:') . '<br>' . $sComment;
+		$sMessage .= '<br><br>' . _kt('Comments') . ':<br>' . $sComment;
 	}
 	$sMessage .= '</font>';
 	$sTitle = sprintf(_kt("Link: %s from %s"), $sDocumentName, $oSendingUser->getName());
@@ -68,6 +68,7 @@ class RSSFolderLinkAction extends KTFolderAction {
 			'context' => $this,
 			'link' => KTrss::getRssLink($iFId, 'folder'),
 			'linkIcon' => KTrss::getImageLink($iFId, 'folder'),
+			'folderName' => $this->oFolder->getName(),
 		);
         return $oTemplate->render($aTemplateData);
-<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>Document RSS</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}RSS for Document{/i18n}:<br />{$context->oDocument->getName()}</h2>
+
 <p>
 You can copy the following link into any RSS aggregator to create a feed to the selected document.
 <ul>
 	<li>{$link}</li>
 </ul>
-Another way of quickly accessing a RSS feed for a document of folder is by RSS icon {$linkIcon},
-which you will find in your actions portlet on the left.
+{i18n}Another way of quickly accessing a RSS feed for a document or folder is by RSS icon {$linkIcon},
+which you will find in your actions portlet on the left.{/i18n}
 </p>
 \ No newline at end of file
-<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>Folder RSS</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}RSS for folder{/i18n}: {$context->oFolder->getName()}</h2>
 <p>
 You can copy the following link into any RSS aggragator to create a feed to the selected folder.
 <ul>
@@ -13,7 +13,7 @@
 <div class="collapsiblebody">
 {assign var=mainjoin value=$joins.main}
-<p class="descriptiveText">{i18n arg_join=$mainjoin}Match <b>#join#</b> of the following:{/i18n}</p>
+<p class="descriptiveText">{i18n arg_join=$mainjoin}Match <b>#join#</b> of the following{/i18n}:</p>
 {foreach from=$params key=key item=group}
 {assign var=join value=$joins[$key]}
@@ -11,7 +11,7 @@
 {$context->oPage->requireCSSResource('resources/css/kt-treewidget.css')}
-<h2>{i18n}Editing{/i18n}: {$document->getName()}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Edit Metadata{/i18n}:<br />{$context->oDocument->getName()}</h2>
 {capture assign=link}{addQS}action=selectType&fDocumentId={$document->getId()}{/addQS}{/capture}
 <p class="descriptiveText">{i18n arg_link=$link}Change the <strong><a href="#link#">document type</a></strong>{/i18n}</p>
-<h2>{i18n}Transaction History{/i18n}: {$folder->getName()}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Folder Transaction History{/i18n}:<br />{$folder->getName()}</h2>
 <p class="descriptiveText">{i18n}This page provides details of all activities that have been carried out on the folder.{/i18n}</p>
-<h2>{i18n}Add a folder{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Add a folder to{/i18n}:<br />{$context->oFolder->getName()}</h2>
 <p class="descriptiveText">{i18n}Folders are one way of organising documents
 in the document management system.  Folders provide meaning in the
-<h2>{i18n arg_docname=$context->oDocument->getName()}Archive Document: #docname#{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Archive Document{/i18n}:<br />{$context->oDocument->getName()}</h2>
 <p class="descriptiveText">{i18n}Archiving a document changes the
 document's state to invisible to non-administrative users. Only an
-<h2>{i18n arg_docname=$context->oDocument->getName()}Request Assistance: #docname#{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Request Assistance{/i18n}:<br />{$context->oDocument->getName()}</h2>
+
 <p class="descriptiveText">{i18n}If you are unable to perform an action
 on this document that you think you should be able to, or wish to
-<h2>{i18n arg_docname=$context->oDocument->getName()}Cancel Checkout: #docname#{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Cancel Checkout{/i18n}:<br />{$context->oDocument->getName()}</h2>
 <p class="descriptiveText">{i18n}If you do not want to have this document be checked-out,
-<h2>{i18n arg_docname=$context->oDocument->getName()}Checkin Document: #docname#{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Checkin Document{/i18n}:<br />{$context->oDocument->getName()}</h2>
+
 <p class="descriptiveText">{i18n}Checking in a document updates the document
 and allows others to make changes to the document and its metadata.{/i18n}</p>
-<h2>{i18n arg_docname=$context->oDocument->getName()}Checkout Document: #docname#{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Checkout Document{/i18n}:<br />{$context->oDocument->getName()}</h2>
 <p class="descriptiveText">{i18n}Checking out a document reserves it for your
 exclusive use.  This ensures that you can edit the document without
@@ -16,6 +16,8 @@ addLoadEvent(scheduleCheckout);
 {/capture}
 {$context->oPage->requireJSStandalone($sJavascript)}
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Checkout Document{/i18n}:<br />{$context->oDocument->getName()}</h2>
+
 {capture assign=link}{$sLocation|addQSSelf}{/capture}
 <p class="descriptiveText">{i18n arg_link=$link}The document you wish to
 check out will begin to download soon.  If it does not automatically
-<h2>{i18n}Copy document{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Copy document{/i18n}: {$documentName}</h2>
 {assign var=iDocumentId value=$context->oDocument->getId()}
-<h2>{i18n}Copy document{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Copy document{/i18n}: {$documentName}</h2>
 {assign var=iDocumentId value=$context->oDocument->getId()}
-<h2>{i18n arg_docname=$context->oDocument->getName()}Delete Document: #docname#{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Delete Document{/i18n}:<br />{$context->oDocument->getName()}</h2>
 <p class="descriptiveText">{i18n}Deleting a document marks it as no longer
 being displayed.  The document management system does not remove the
-<h2>{i18n arg_docname=$context->oDocument->getName()}Checkin Document: #docname#{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Move Document{/i18n}:<br />{$context->oDocument->getName()}</h2>
-<p class="descriptiveText">{i18n}Moving a document relocates the document
-within the DMS.{/i18n}</p>
+<p class="descriptiveText">{i18n}Moving a document relocates the document within the DMS.{/i18n}</p>
 {$form->render()}
-<h2>{i18n}Rename document{/i18n}</h2>
+<h2>{i18n}Rename document{/i18n}: {$documentName}</h2>
 <p class="descriptiveText">{i18n}This page allows you to rename the file
 name (not the document title) for a document.{/i18n}</p>
-<h2>{i18n}View Roles{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}View Roles{/i18n}:<br />{$context->oDocument->getName()}</h2>
 <p class="descriptiveText">{i18n}
     In many cases, workflow actions will be assigned to certain <strong>roles</strong>
@@ -22,8 +22,8 @@
     <tr class="{cycle values=odd,even}">
         <td>{$aRole.name}</td>
         <td>
-           {if ($aRole.users != null)}<strong>{i18n}Users:{/i18n}</strong> {$aRole.users}<br />{/if} 
-           {if ($aRole.groups != null)}<strong>{i18n}Groups:{/i18n}</strong> {$aRole.groups}{/if}
+           {if ($aRole.users != null)}<strong>{i18n}Users{/i18n}:</strong> {$aRole.users}<br />{/if} 
+           {if ($aRole.groups != null)}<strong>{i18n}Groups{/i18n}:</strong> {$aRole.groups}{/if}
         </td>
     </tr>
 {/foreach}
-<h2>{$context->getDisplayName()}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{$context->getDisplayName()}</h2>
-<p class="descriptiveText">{i18n}These are the results of the bulk action:{/i18n}</p>
+<p class="descriptiveText">{i18n}These are the results of the bulk action{/i18n}:</p>
 {if count($list.folders)}
 <table class="kt_collection">
-<h2>{$context->getDisplayName()}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{$context->getDisplayName()}</h2>
-<p class="descriptiveText">{i18n}The following list shows documents and folders in your list which cannot be acted on by this bulk action:{/i18n}</p>
+<p class="descriptiveText">{i18n}The following list shows documents and folders in your list which cannot be acted on by this bulk action{/i18n}:</p>
 {if count($failed.folders)}
 <table class="kt_collection">
@@ -53,7 +53,7 @@
 {if (count($documents)  || count($folders))}
-<p class="descriptiveText">{i18n}The action will be performed on the following documents and folders:{/i18n}</p>
+<p class="descriptiveText">{i18n}The action will be performed on the following documents and folders{/i18n}:</p>
 {if (count($folders))}
 <h3>{i18n}Folders{/i18n}</h3>
@@ -2,7 +2,7 @@
 <div class="ktError">
 	<div class="error_dashlet_rightrepeat_bottom"></div>
 	<div class="error_dashlet_leftrepeat_bottom"></div>
-	<p><strong>{i18n}Warning:{/i18n}</strong>  {i18n}There are currently no active indexers registered.  No content indexing will occur.{/i18n}</p>
+	<p><strong>{i18n}Warning{/i18n}:</strong>  {i18n}There are currently no active indexers registered.  No content indexing will occur.{/i18n}</p>
 	<div class="error_dashlet_topleft_small"></div>
     <div class="error_dashlet_toprepeat_small"></div>
 	<div class="error_dashlet_topright_small"></div>
-<h2>{i18n}Version Comparison{/i18n}: {$document->getName()}</h2>
-
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Version Comparison{/i18n}:<br />{$context->oDocument->getName()}</h2>
 {capture assign=from}
 <strong>{$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}</strong> ({$document->getMetadataVersion()})
-<h2>{i18n}Select Document Version to compare against{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Select Document Version to compare against{/i18n}</h2>
 <p class="descriptiveText">{i18n}This page lists versions of document metadata and allows you to compare a metadata version with the current metadata content.{/i18n}</p>
-<h2>{i18n}Document permissions{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Document permissions{/i18n}:<br />{$context->oDocument->getName()}</h2>
 <p class="descriptiveText">{i18n}This page shows the permissions that apply to
 this specific document.  Where the folder view shows you information by role and group,
@@ -29,7 +29,7 @@ permissions are not shown.{/i18n}&lt;/p&gt;
 <tbody>
 { foreach item=oRole from=$roles }
-<td><span class="descriptiveText">{i18n}Role:{/i18n}</span> {$oRole->getName()}</td>
+<td><span class="descriptiveText">{i18n}Role{/i18n}:</span> {$oRole->getName()}</td>
   { assign var=iRoleId value=$oRole->getId() }
   { foreach item=oPerm from=$permissions }
     { assign var=iPermId value=$oPerm->getId() }
@@ -46,7 +46,7 @@ permissions are not shown.{/i18n}&lt;/p&gt;
 { foreach item=oGroup from=$groups }
-<td><span class="descriptiveText">{i18n}Group:{/i18n}</span> {$oGroup->getName()}</td>
+<td><span class="descriptiveText">{i18n}Group{/i18n}:</span> {$oGroup->getName()}</td>
   { assign var=iGroupId value=$oGroup->getId() }
   { foreach item=oPerm from=$permissions }
     { assign var=iPermId value=$oPerm->getId() }
@@ -11,7 +11,7 @@
 {$context->oPage->requireCSSResource('resources/css/kt-treewidget.css')}
-<h2>{i18n}Editing{/i18n}: {$document->getName()|mb_wordwrap:40:"<br />\n":true}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Edit Metadata{/i18n}:<br />{$context->oDocument->getName()}</h2>
 {capture assign=link}{addQS}action=selectType&fDocumentId={$document->getId()}{/addQS}{/capture}
 <p class="descriptiveText">{i18n arg_link=$link arg_name=$type_name}Change the <strong><a href="#link#">document type</a></strong>. The current type is "#name#"{/i18n}</p>
-<h2>{i18n}Version History{/i18n}: {$document->getName()}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Document Version History{/i18n}:<br />{$document->getName()}</h2>
 <p class="descriptiveText">{i18n}This page lists versions of document metadata and allows you to compare a metadata version with the current metadata content.{/i18n}</p>
-<h2>{i18n arg_docname=$docname}Change Ownership of "#docname#"{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Change Ownership{/i18n}:<br />{$context->oDocument->getName()}</h2>
 {$form->render()}
-<h2>{i18n}Resolved permissions per user{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Resolved permissions per user{/i18n}:<br />{$context->oDocument->getName()}</h2>
 <p class="descriptiveText">{i18n}This page shows the permissions that
 individual users have on this document.  Only the users which have permissions
-<h2>{i18n}Transaction History{/i18n}: {$document->getName()}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Document Transaction History{/i18n}:<br />{$document->getName()}</h2>
 <p class="descriptiveText">{i18n}This page provides details of all activities that have been carried out on the document.{/i18n}</p>
-<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{$document->getName()|mb_wordwrap:40:"<br />\n":true}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Document Details{/i18n}:<br />{$context->oDocument->getName()}</h2>
 {if ($document->getIsCheckedOut() == 1)}
 {capture assign=checkout_user}<strong>{$sCheckoutUser}</strong>{/capture}
-<h2>{i18n}Fieldset{/i18n}: {$oFieldset->getName()}</h2>
-
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Fieldset{/i18n}:<br />{$oFieldset->getName()}</h2>
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
@@ -54,7 +54,7 @@ addLoadEvent(startupMetadata);
 {/capture}
 {$context->oPage->requireJSStandalone($sJavascript)}
-<h2>{i18n arg_foldername=$foldername}Import files into "#foldername#"{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Import files into{/i18n}:<br />{$context->oFolder->getName()}</h2>
 <form method="POST" action="{$smarty.server.PHP_SELF}" enctype="multipart/form-data">
 <fieldset><legend>{i18n}Import from Server Location{/i18n}</legend>
@@ -54,7 +54,7 @@ addLoadEvent(startupMetadata);
 {/capture}
 {$context->oPage->requireJSStandalone($sJavascript)}
-<h2>{i18n arg_foldername=$foldername}Upload files into "#foldername#"{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Upload files into{/i18n}:<br />{$context->oFolder->getName()}</h2>
 <form method="POST" action="{$smarty.server.PHP_SELF|addQueryString:"postExpected=1&fFolderId="}{$context->oFolder->getId()}" enctype="multipart/form-data">
 <fieldset><legend>{i18n}Bulk upload{/i18n}</legend>
-<h2>{i18n arg_name=$sFolderName}Renaming folder: #name#{/i18n}</h2>
+<h2>{i18n}Rename Folder{/i18n}: {$folderName}</h2>
 </h2><p class="descriptiveText">{i18n}This page allows you to rename a
 folder.{/i18n}</p>
@@ -7,7 +7,7 @@ folder.{/i18n}&lt;/p&gt;
 {capture assign=link}{getUrlForFolder folder=$iFolderId}{/capture}
 <form method="POST" action="{$smarty.server.PHP_SELF}">
-<fieldset><legend>{i18n}Rename{/i18n}</legend>
+<fieldset><legend>{i18n}Rename Folder{/i18n}</legend>
 <input type="hidden" name="action" value="rename" />
 <input type="hidden" name="fFolderId" value="{$iFolderId}" />
 {foreach from=$fields item=oWidget }
@@ -23,7 +23,7 @@ assigned are shown.{/i18n}&lt;/p&gt;
 <tbody>
 { foreach item=oRole from=$roles }
-<td><span class="descriptiveText">{i18n}Role:{/i18n}</span> {$oRole->getName()}</td>
+<td><span class="descriptiveText">{i18n}Role{/i18n}:</span> {$oRole->getName()}</td>
   { assign var=iRoleId value=$oRole->getId() }
   { foreach item=oPerm from=$permissions }
     { assign var=iPermId value=$oPerm->getId() }
@@ -50,7 +50,7 @@ value=&quot;{$iRoleId}&quot;&gt;&lt;/td&gt;
 { foreach item=oGroup from=$groups }
-<td><span class="descriptiveText">{i18n}Group:{/i18n}</span> {$oGroup->getName()}</td>
+<td><span class="descriptiveText">{i18n}Group{/i18n}:</span> {$oGroup->getName()}</td>
   { assign var=iGroupId value=$oGroup->getId() }
   { foreach item=oPerm from=$permissions }
     { assign var=iPermId value=$oPerm->getId() }
-<h2>{i18n arg_foldername=$foldername}Resolved permissions per user for "#foldername#"{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Resolved permissions per user{/i18n}: {$context->oFolder->getName()}</h2>
 <p class="descriptiveText">{i18n}This page shows the permissions that
 individual users have on this folder.  Only the users which have permissions
-<h2>{i18n arg_foldername=$foldername}Allocate Roles for "#foldername#"{/i18n}</h2>
+<h2>{i18n}Allocate Roles for{/i18n}: {$folderName}</h2>
 <p class="descriptiveText">{i18n}
     In many cases, workflow actions will be assigned to certain <strong>roles</strong>
@@ -6,7 +6,7 @@
     to specific groups in particular areas of the document management system.
 {/i18n}</p>
-<div class='ktInfoMessage'><span><strong>{i18n}Warning:{/i18n}</strong> {i18n}Please note that changing
+<div class='ktInfoMessage'><span><strong>{i18n}Warning{/i18n}:</strong> {i18n}Please note that changing
 role allocations may take a some time, depending on the number of folders below this one.{/i18n}</span></div>
 <table class="kt_collection narrow" cellspacing="0">
@@ -29,8 +29,8 @@ role allocations may take a some time, depending on the number of folders below 
               <strong>{i18n}inherited from parent folder.{/i18n}</strong><br />
               <span class="descriptiveText">
            {/if}
-           {if ($aRole.users != null)}<strong>{i18n}Users:{/i18n}</strong> {$aRole.users}<br />{/if} 
-           {if ($aRole.groups != null)}<strong>{i18n}Groups:{/i18n}</strong> {$aRole.groups}{/if}
+           {if ($aRole.users != null)}<strong>{i18n}Users{/i18n}:</strong> {$aRole.users}<br />{/if} 
+           {if ($aRole.groups != null)}<strong>{i18n}Groups{/i18n}:</strong> {$aRole.groups}{/if}
            {if ($aRole.allocation_id === null)}
               </span class="descriptiveText">
            {/if}
-<h2>{i18n arg_foldername=$foldername}View Permissions for "#foldername#"{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}View Permissions for{/i18n}:<br />{$context->oFolder->getName()}</h2>
 <p class="descriptiveText">{i18n}This page shows the permissions that apply to
 this specific folder.  Only the roles or groups which have permissions
@@ -13,6 +13,7 @@ assigned are shown.{/i18n}&lt;/p&gt;
 {if $iFolderId != 1}
+<p>
 <div class="ktInfoMessage">
 { if $inherited }
 <span>{i18n arg_permission_source=$inherited}This folder <strong>inherits</strong> its permissions from #permission_source#.{/i18n}
@@ -26,6 +27,7 @@ assigned are shown.{/i18n}&lt;/p&gt;
 <p>{i18n}This folder defines its own permissions.{/i18n}</p>
 { /if }
 </div>
+</p>
 { /if }
 {if (empty($roles) && empty($groups) && empty($users)) }
@@ -44,7 +46,7 @@ assigned are shown.{/i18n}&lt;/p&gt;
 <tbody>
 { foreach item=oRole from=$roles }
-<td><span class="descriptiveText">{i18n}Role:{/i18n}</span> {$oRole->getName()}</td>
+<td><span class="descriptiveText">{i18n}Role{/i18n}:</span> {$oRole->getName()}</td>
   { assign var=iRoleId value=$oRole->getId() }
   { foreach item=oPerm from=$permissions }
     { assign var=iPermId value=$oPerm->getId() }
@@ -61,7 +63,7 @@ assigned are shown.{/i18n}&lt;/p&gt;
 { foreach item=oGroup from=$groups }
-<td><span class="descriptiveText">{i18n}Group:{/i18n}</span> {$oGroup->getName()}</td>
+<td><span class="descriptiveText">{i18n}Group{/i18n}:</span> {$oGroup->getName()}</td>
   { assign var=iGroupId value=$oGroup->getId() }
   { foreach item=oPerm from=$permissions }
     { assign var=iPermId value=$oPerm->getId() }
@@ -3,7 +3,7 @@
 {$context->oPage->requireJSResource("thirdpartyjs/MochiKit/Iter.js")}
 {$context->oPage->requireJSResource("thirdpartyjs/MochiKit/DOM.js")}
-<h2>{i18n}Edit Lookup Tree{/i18n}: {$field->getName()}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Edit Lookup Tree{/i18n}:<br />{$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
@@ -6,7 +6,7 @@
 <p class="descriptiveText">{i18n}Over time, the lookup values which make sense will 
 change and evolve as your organisation does. You may thus need to change the lookup
 values associated with a given field.  There are a number of different states 
-that are possible for a given lookup:{/i18n}</p>
+that are possible for a given lookup{/i18n}:</p>
 <ul class="descriptiveText">
     <li>{i18n}<strong>Enabled</strong>, which means that users cannot specify this
-<h2>{i18n}Fieldset{/i18n}: {$oFieldset->getName()}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Fieldset{/i18n}:<br />{$oFieldset->getName()}</h2>
 <h3>{i18n}Fieldset properties{/i18n}</h3>
 <form action="{$smarty.server.PHP_SELF}" method="POST">
-<h2>{i18n}Edit Field{/i18n}: {$oField->getName()}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Edit Field{/i18n}:<br />{$oField->getName()}</h2>
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
-<h2>{i18n}Fieldset{/i18n}: {$oFieldset->getName()}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Fieldset{/i18n}:<br />{$oFieldset->getName()}</h2>
 {if $sIncomplete}
 <div class="ktErrorMessage">
@@ -6,7 +6,7 @@ way to allocate permissions to a document, since it can override the permissions
 assigned at a folder level.{/i18n}</p>
 <p class="descriptiveText">{i18n}There are 3 different ways in which workflows interact
-with the system's security:{/i18n}</p>
+with the system's security{/i18n}:</p>
 <ol>
     <li><a href="{addQS context=$context}action=permissionsoverview{/addQS}">{i18n}Document Permissions{/i18n}</a> {i18n}(by state){/i18n}</li>
-<h2>{i18n}Document Workflow{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Workflow for{/i18n}:<br />{$oDocument->getName()}</h2>
 <p class="descriptiveText">
 {i18n}Workflow is a description of a document's lifecycle.  It is made up of
@@ -20,7 +20,7 @@ td.false { background-color: #ffaaaa; text-align: centre }
 {/literal}{/capture}
 {$context->oPage->requireCSSStandalone($sCSS)}
-<h2>{i18n}State{/i18n}: {$oState->getName()}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}State{/i18n}:<br />{$oState->getName()}</h2>
 <p class="descriptiveText">{i18n}As documents move through their lifecycle, they
 are placed in certain <strong>states</strong>.  For example, an invoice
@@ -198,7 +198,7 @@ documents are in this state.{/i18n}&lt;/span&gt;&lt;/div&gt;
 <tbody>
 { foreach item=oRole from=$aRoles }
 <tr>
-    <td><span class="descriptiveText">{i18n}Role:{/i18n} </span>{$oRole->getName()}</td>
+    <td><span class="descriptiveText">{i18n}Role{/i18n}: </span>{$oRole->getName()}</td>
     { foreach from=$state_permissions item=sPermName }
     <td><input type="checkbox" name="fPermissions[{$sPermName}][role][]" value="{$oRole->getId()}" {if ($context->getRoleHasPermissionInState($oRole, $sPermName, $oState))}checked="true"{/if}/></td>
     { /foreach }
@@ -206,7 +206,7 @@ documents are in this state.{/i18n}&lt;/span&gt;&lt;/div&gt;
 { /foreach }
 { foreach item=oGroup from=$aGroups }
 <tr>
-    <td><span class="descriptiveText">{i18n}Group:{/i18n} </span>{$oGroup->getName()}</td>
+    <td><span class="descriptiveText">{i18n}Group{/i18n}: </span>{$oGroup->getName()}</td>
     { foreach from=$state_permissions item=sPermName }
     <td><input type="checkbox" name="fPermissions[{$sPermName}][group][]" value="{$oGroup->getId()}"{if ($context->getGroupHasPermissionInState($oGroup, $sPermName, $oState))}checked="true"{/if}/></td>
     { /foreach }
-<h2>{i18n}Transition{/i18n}: {$oTransition->getName()}</h2>
-
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Transition{/i18n}:<br />{$oTransition->getName()}</h2>
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
 {$context->oPage->requireCSSResource('resources/css/workflow-admin.css')}
-<h2>{i18n}Workflow Overview{/i18n}: {$oWorkflow->getName()}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Workflow Overview{/i18n}:<br />{$oWorkflow->getName()}</h2>
+
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <fieldset>
@@ -30,21 +31,21 @@ or use the &quot;Workflow&quot; menu on the left to create new ones.{/i18n}&lt;/p&gt;
     <li><span class="workflow_element">{i18n}State{/i18n}:</span> <a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" class="workflow_label">{$oState->getName()}</a>
         {if ($workflow_info.can_delete)} | <span class="ktActionLink ktDelete"><a href="{addQS}action=deleteState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" >{i18n}Delete{/i18n}</a></span>{/if}
     <ul>
-        <li>{i18n}Notified groups & roles:{/i18n}
+        <li>{i18n}Notified groups & roles{/i18n}:
         {$context->getNotificationStringForState($oState)}
         </li>
-        <li>{i18n}Controlled Actions available: {/i18n}
+        <li>{i18n}Controlled Actions available{/i18n}:
         {$context->getActionStringForState($oState)}
         </li>
-        <li>{i18n}Permissions overridden:{/i18n} {$context->getPermissionStringForState($oState)}</li>
+        <li>{i18n}Permissions overridden{/i18n}: {$context->getPermissionStringForState($oState)}</li>
-        <li>{i18n}Transitions available: {/i18n}
+        <li>{i18n}Transitions available{/i18n}:
         {$context->getTransitionFromStringForState($oState)}
         </li>
-        <li>{i18n}Transitions to this state: {/i18n}
+        <li>{i18n}Transitions to this state{/i18n}:
         {$context->getTransitionToStringForState($oState)}
         </li>
     </ul>
@@ -27,21 +27,21 @@ various different states for documents.{/i18n}&lt;/p&gt;
     <li><span class="workflow_element">{i18n}State{/i18n}:</span> <a href="{addQS}action=editState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" class="workflow_label">{$oState->getName()}</a>
         {if ($workflow_info.can_delete)} | <span class="ktActionLink ktDelete"><a href="{addQS}action=deleteState&fStateId={$oState->getId()}&fWorkflowId={$oWorkflow->getId()}{/addQS}" >{i18n}Delete{/i18n}</a></span>{/if}
     <ul>
-        <li>{i18n}Notified groups & roles:{/i18n}
+        <li>{i18n}Notified groups & roles{/i18n}:
         {$context->getNotificationStringForState($oState)}
         </li>
-        <li>{i18n}Controlled Actions available: {/i18n}
+        <li>{i18n}Controlled Actions available{/i18n}:
         {$context->getActionStringForState($oState)}
         </li>
-        <li>{i18n}Permissions overridden:{/i18n} {$context->getPermissionStringForState($oState)}</li>
+        <li>{i18n}Permissions overridden{/i18n}: {$context->getPermissionStringForState($oState)}</li>
-        <li>{i18n}Transitions available: {/i18n}
+        <li>{i18n}Transitions available{/i18n}:
         {$context->getTransitionFromStringForState($oState)}
         </li>
-        <li>{i18n}Transitions to this state: {/i18n}
+        <li>{i18n}Transitions to this state{/i18n}:
         {$context->getTransitionToStringForState($oState)}
         </li>
     </ul>
-<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n arg_docname=$context->oDocument->getName()}Convert to PDF: #docname#{/i18n}</h2>
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Generate PDF of{/i18n}:<br />{$context->oDocument->getName()}</h2>
 {$form->render()}
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Discussion{/i18n}:<br />{$context->oDocument->getName()}</h2>
+
 {if $threads}
 <h3>{i18n}Existing threads{/i18n}</h3>
 <table class="kt_collection" cellspacing="0" cellpadding="0">
-<h2>{i18n}Document Links{/i18n}</h2>
-
+<h2><img src="{if $config->get("ui/morphEnabled") == '1'}{$rootUrl}/skins/kts_{$config->get("ui/morphTo")}/title_bullet.png{else}{$rootUrl}/resources/graphics/title_bullet.png{/if}"/>{i18n}Document Links{/i18n}:<br />{$context->oDocument->getName()}</h2>
 <p class="descriptiveText">{i18n}The current links to and from this document are displayed below.{/i18n}</p>
@@ -16,8 +16,8 @@
 <script type="text/javascript">var _KT_VERSIONS_URL = "{$kt_versions_url}";</script>
 <p>
-<span id="up_single">{i18n}The following upgrade is available:{/i18n}</span>
-<span id="up_multi">{i18n}The following upgrades are available:{/i18n}</span>
+<span id="up_single">{i18n}The following upgrade is available{/i18n}:</span>
+<span id="up_multi">{i18n}The following upgrades are available{/i18n}:</span>
 <span id="up_upgrades"></span>
 {i18n}Please visit <a href="http://www.knowledgetree.com">www.knowledgetree.com</a> to find out more.{/i18n}
 </p>
-<div>
-<p>{i18n arg_appname="$appname"}To connect to #appname# via a third-party WebDAV client, please use the following address:{/i18n}<br/>
+<div>
+<p>{i18n arg_appname="$appname"}To connect to #appname# via a third-party WebDAV client, please use the following address{/i18n}:<br/>
 <b><a href="{$url}ktwebdav/ktwebdav.php" target="_blank">{$url}ktwebdav/ktwebdav.php</a></b><br/><br/>
-{i18n arg_appname="$appname"}To connect with the #appname# Tools Suite, use this address:{/i18n}<br/>
-<b>{$url}</b><br/><br/>
-</p>
-</div>
-
+{i18n arg_appname="$appname"}To connect with the #appname# Tools Suite, use this address{/i18n}:<br/>
+<b>{$url}</b><br/><br/>
+</p>
+</div>
+
@@ -20,14 +20,22 @@
  */
 function smarty_modifier_mb_wordwrap($string,$length=80,$break="\n",$cut=false)
 {
-    
-	$newString = "";
-	$index = 0;
-	while(mb_strlen($newString) < mb_strlen($string)){
-		$newString .= mb_strcut($string, $index, $length, "UTF8") . $break;
-		$index += $length;
-	}
-	return $newString;
-	
+    if ($length == 0)
+    return '';
+
+    if (mb_strlen($string) > $length) {
+
+        //if (!$cut) $string = preg_replace('/\s+?(\S+)?$/', '', mb_substr($string, 0, $length+1));
+
+        $newString = "";
+        $index = 0;
+        $breakslen = 0;
+        while(mb_strlen($newString)-$breakslen < mb_strlen($string)){
+            $newString .= mb_strcut($string, $index, $length, "UTF-8") . $break;
+            $index += $length;
+            $breakslen += mb_strlen($break);
+        }
+        return $newString;
+    } else return $string;
 }
 ?>
 \ No newline at end of file
@@ -236,6 +236,7 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
               "canCheckin" => $bCanCheckin,
               "document_id" => $document_id,
               "document" => $oDocument,
+              "documentName" => $oDocument->getName(),
               "document_data" => $document_data,
               "fieldsets" => $fieldsets,
               'viewlet_data' => $viewlet_data,