From 11aa320c3b85793a9be557ba1aa8937bd282d9bb Mon Sep 17 00:00:00 2001 From: Neil Blakey-Milner Date: Thu, 2 Feb 2006 13:47:17 +0000 Subject: [PATCH] Use addQS to generate correct URLs. --- templates/kt3/document/edit.smarty | 2 +- templates/kt3/document/metadata_history.smarty | 4 ++-- templates/kt3/fieldsets/generic.smarty | 4 ++-- templates/ktcore/document/admin/linktypesadmin.smarty | 4 ++-- templates/ktcore/document/comparison_version_select.smarty | 2 +- templates/ktcore/document/document_permissions.smarty | 6 ++---- templates/ktcore/folder/permissions.smarty | 6 ++---- templates/ktcore/folder/roles.smarty | 8 ++++---- templates/ktcore/help_with_edit.smarty | 4 ++-- templates/ktcore/manage_fieldsets.smarty | 6 ++---- templates/ktcore/manage_help.smarty | 4 ++-- templates/ktcore/metadata/editFieldset.smarty | 3 +-- templates/ktcore/search/administration/savedsearches.smarty | 4 ++-- templates/ktcore/workflow/editWorkflow.smarty | 4 ++-- templates/ktcore/workflow/manageStates.smarty | 16 ++++++++-------- templates/ktcore/workflow/manageTransitions.smarty | 10 +++++----- 16 files changed, 40 insertions(+), 47 deletions(-) diff --git a/templates/kt3/document/edit.smarty b/templates/kt3/document/edit.smarty index a69f280..538600a 100644 --- a/templates/kt3/document/edit.smarty +++ b/templates/kt3/document/edit.smarty @@ -13,7 +13,7 @@

{i18n}Editing{/i18n}: {$document->getName()}

-

{i18n}Change the document type{/i18n}

+

{i18n}Change the document type{/i18n}

{i18n}The following document metadata is available for editing.{/i18n}

diff --git a/templates/kt3/document/metadata_history.smarty b/templates/kt3/document/metadata_history.smarty index 85764b4..96fb5a6 100644 --- a/templates/kt3/document/metadata_history.smarty +++ b/templates/kt3/document/metadata_history.smarty @@ -27,10 +27,10 @@ {if ($document->getMetadataVersion() == $oVersion->getMetadataVersion())} {i18n}current version{/i18n} {else} - {i18n}compare with current{/i18n} + {i18n}compare with current{/i18n} {/if} - {i18n}compare with other version{/i18n} + {i18n}compare with other version{/i18n} {/foreach} diff --git a/templates/kt3/fieldsets/generic.smarty b/templates/kt3/fieldsets/generic.smarty index 4bbca71..73073e8 100644 --- a/templates/kt3/fieldsets/generic.smarty +++ b/templates/kt3/fieldsets/generic.smarty @@ -27,8 +27,8 @@ {else} {i18n}No workflow{/i18n} {/if} -({i18n}manage workflow{/i18n}) +{assign var=iDocumentId value=$document->getId()} + ({i18n}manage workflow{/i18n})
diff --git a/templates/ktcore/document/admin/linktypesadmin.smarty b/templates/ktcore/document/admin/linktypesadmin.smarty index ae52ab9..3c2556e 100644 --- a/templates/ktcore/document/admin/linktypesadmin.smarty +++ b/templates/ktcore/document/admin/linktypesadmin.smarty @@ -74,8 +74,8 @@ links of that type within the system.{/i18n}

{$oLinkType->getName()} {$oLinkType->getDescription()} - {i18n}edit link type{/i18n} - {i18n}edit link type{/i18n} + {i18n}edit link type{/i18n} + {i18n}edit link type{/i18n} {/foreach} diff --git a/templates/ktcore/document/comparison_version_select.smarty b/templates/ktcore/document/comparison_version_select.smarty index 3dc1cd3..926a298 100644 --- a/templates/ktcore/document/comparison_version_select.smarty +++ b/templates/ktcore/document/comparison_version_select.smarty @@ -20,7 +20,7 @@ {if ($document->getCurrentMetadataVersionId() == $oVersion->getCurrentMetadataVersionId())} {i18n}comparing against this version{/i18n} {else} - {i18n}compare{/i18n} + {i18n}compare{/i18n} {/if} diff --git a/templates/ktcore/document/document_permissions.smarty b/templates/ktcore/document/document_permissions.smarty index 21a1ceb..92923d6 100644 --- a/templates/ktcore/document/document_permissions.smarty +++ b/templates/ktcore/document/document_permissions.smarty @@ -97,12 +97,10 @@ td.false { background-color: #ffaaaa; text-align: centre } padding: 2px; padding-right: 1em; padding-left: 1em"> { if $inherited } {i18n}Inherited from{/i18n}: {$inherited} -{* [{i18n}Copy{/i18n}] -*} +{* [{i18n}Copy{/i18n}] *} { else } [{i18n}Use +href="{addQS}action=inheritPermissions&fDocumentID={$iDocumentID}{/addQS}">{i18n}Use parent's permissions{/i18n}] { /if } diff --git a/templates/ktcore/folder/permissions.smarty b/templates/ktcore/folder/permissions.smarty index 20288ea..06d49fa 100644 --- a/templates/ktcore/folder/permissions.smarty +++ b/templates/ktcore/folder/permissions.smarty @@ -174,11 +174,9 @@ value="{$iRoleId}"> padding: 2px; padding-right: 1em; padding-left: 1em"> { if $inherited } {i18n}Inherited from:{/i18n} {$inherited} -[{i18n}Copy{/i18n}] +[{i18n}Copy{/i18n}] { else } -[{i18n}Use +[{i18n}Use parent's permissions{/i18n}] { /if } diff --git a/templates/ktcore/folder/roles.smarty b/templates/ktcore/folder/roles.smarty index 85633f4..ddc040d 100644 --- a/templates/ktcore/folder/roles.smarty +++ b/templates/ktcore/folder/roles.smarty @@ -36,11 +36,11 @@ role allocations may take a some time, depending on the number of folders below {/if} {if ($aRole.allocation_id === null)} - {i18n}Override Parent Allocation{/i18n} + {i18n}Override Parent Allocation{/i18n} {else} - - Edit - {i18n}Use parent's allocation{/i18n} + + Edit + {i18n}Use parent's allocation{/i18n} {/if} {/foreach} diff --git a/templates/ktcore/help_with_edit.smarty b/templates/ktcore/help_with_edit.smarty index 470be8a..8814501 100644 --- a/templates/ktcore/help_with_edit.smarty +++ b/templates/ktcore/help_with_edit.smarty @@ -5,5 +5,5 @@ {/if}
-

{i18n}Edit this help page.{/i18n}{i18n}Edit this help page.{/i18n}

\ No newline at end of file +

{i18n}Edit this help page.{/i18n}{i18n}Edit this help page.{/i18n}

diff --git a/templates/ktcore/manage_fieldsets.smarty b/templates/ktcore/manage_fieldsets.smarty index 33463f8..7bc35e9 100644 --- a/templates/ktcore/manage_fieldsets.smarty +++ b/templates/ktcore/manage_fieldsets.smarty @@ -17,13 +17,11 @@ - {i18n}Edit{/i18n} + {i18n}Edit{/i18n} {if $oFieldSet->bMandatory == false} - {i18n}Delete{/i18n} + {i18n}Delete{/i18n} {else} {i18n}Built-in set.{/i18n} {/if} diff --git a/templates/ktcore/manage_help.smarty b/templates/ktcore/manage_help.smarty index 6e638f9..8c95adb 100644 --- a/templates/ktcore/manage_help.smarty +++ b/templates/ktcore/manage_help.smarty @@ -16,10 +16,10 @@ via the help system and click on customise this help file.{/i18 { foreach item=oHelpReplacement from=$helpreplacements } -{ $oHelpReplacement->sName } +{ $oHelpReplacement->sName } -Delete +Delete { /foreach } diff --git a/templates/ktcore/metadata/editFieldset.smarty b/templates/ktcore/metadata/editFieldset.smarty index f435987..076b853 100644 --- a/templates/ktcore/metadata/editFieldset.smarty +++ b/templates/ktcore/metadata/editFieldset.smarty @@ -126,8 +126,7 @@ field can depend on the user's selections for the others.{/i18n}
  • {$oField->getName()|escape} -({i18n}edit{/i18n}) +({i18n}edit{/i18n})
  • {/foreach} diff --git a/templates/ktcore/search/administration/savedsearches.smarty b/templates/ktcore/search/administration/savedsearches.smarty index a48639b..df06a2a 100644 --- a/templates/ktcore/search/administration/savedsearches.smarty +++ b/templates/ktcore/search/administration/savedsearches.smarty @@ -31,8 +31,8 @@ newsletters, etc.) based on a category or fieldset value.{/i18n}

    {foreach item=oSearch from=$saved_searches} {$oSearch->getName()} - Edit - Edit + Edit + Edit getId()}">Run Search {/foreach} diff --git a/templates/ktcore/workflow/editWorkflow.smarty b/templates/ktcore/workflow/editWorkflow.smarty index 9678bb6..062ee4f 100644 --- a/templates/ktcore/workflow/editWorkflow.smarty +++ b/templates/ktcore/workflow/editWorkflow.smarty @@ -28,7 +28,7 @@ Workflow menu (on the left) to create new states.

    {else}