Peter M. Groen / knowledgetree

Commit bc2f0be3279f1fb52d985d0b3facad170413d3a8

Authored by bshuttle
1 parent f43616d2

fix for KTS-1230 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5845 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 9 additions and 5 deletions
templates/ktcore/folder/roles.smarty
  View file @bc2f0be
@@ -36,7 +36,7 @@ role allocations may take a some time, depending on the number of folders below @@ -36,7 +36,7 @@ role allocations may take a some time, depending on the number of folders below
36 {/if} 36 {/if}
37 </td> 37 </td>
38 {if ($aRole.allocation_id === null)} 38 {if ($aRole.allocation_id === null)}
39 - <td colspan="2"><a href="{addQS}action=overrideParent&role_id={$role_id}&fFolderId={$context->oFolder->getId()}{/addQS}">{i18n}Override Parent Allocation{/i18n}</a></td> 39 + <td colspan="3"><a href="{addQS}action=overrideParent&role_id={$role_id}&fFolderId={$context->oFolder->getId()}{/addQS}">{i18n}Override Parent Allocation{/i18n}</a></td>
40 {else} 40 {else}
41 <td><a href="{addQS}action=editRoleUsers&alloc_id={$aRole.allocation_id}&fFolderId={$context->oFolder->getId()}{/addQS}" class="ktAction ktEdit" title="{i18n}Edit Users{/i18n}">{i18n}Edit Users{/i18n}</a></td> 41 <td><a href="{addQS}action=editRoleUsers&alloc_id={$aRole.allocation_id}&fFolderId={$context->oFolder->getId()}{/addQS}" class="ktAction ktEdit" title="{i18n}Edit Users{/i18n}">{i18n}Edit Users{/i18n}</a></td>
42 <td><a href="{addQS}action=editRoleGroups&alloc_id={$aRole.allocation_id}&fFolderId={$context->oFolder->getId()}{/addQS}" class="ktAction ktEdit" title="{i18n}Edit Groups{/i18n}">{i18n}Edit Groups{/i18n}</a></td> 42 <td><a href="{addQS}action=editRoleGroups&alloc_id={$aRole.allocation_id}&fFolderId={$context->oFolder->getId()}{/addQS}" class="ktAction ktEdit" title="{i18n}Edit Groups{/i18n}">{i18n}Edit Groups{/i18n}</a></td>
@@ -47,7 +47,7 @@ role allocations may take a some time, depending on the number of folders below @@ -47,7 +47,7 @@ role allocations may take a some time, depending on the number of folders below
47 </tr> 47 </tr>
48 {/foreach} 48 {/foreach}
49 {else} 49 {else}
50 -<tr><td colspan="4" class="ktInfo"><p>{i18n}No roles defined in the Role Administration area.{/i18n}</p></td></tr> 50 +<tr><td colspan="5" class="ktInfo"><p>{i18n}No roles defined in the Role Administration area.{/i18n}</p></td></tr>
51 {/if} 51 {/if}
52 </tbody> 52 </tbody>
53 </table> 53 </table>
templates/ktcore/folder/roles_manageusers.smarty
  View file @bc2f0be
@@ -5,7 +5,7 @@ @@ -5,7 +5,7 @@
5 {$context->oPage->requireJSResource('thirdpartyjs/MochiKit/Iter.js')} 5 {$context->oPage->requireJSResource('thirdpartyjs/MochiKit/Iter.js')}
6 {$context->oPage->requireJSResource('thirdpartyjs/MochiKit/DOM.js')} 6 {$context->oPage->requireJSResource('thirdpartyjs/MochiKit/DOM.js')}
7 7
8 -{* <p class="descriptiveText"><strong>FIXME</strong> help text for role-editing. </p> *} 8 +<p class="descriptiveText">{i18n}Add or remove users for this role. {/i18n}</p>
9 9
10 <form action="{$smarty.server.PHP_SELF}" method="POST" id="userroleform"> 10 <form action="{$smarty.server.PHP_SELF}" method="POST" id="userroleform">
11 <input type="hidden" name="action" value="setRoleUsers" /> 11 <input type="hidden" name="action" value="setRoleUsers" />
@@ -18,8 +18,12 @@ @@ -18,8 +18,12 @@
18 18
19 <fieldset> 19 <fieldset>
20 <legend>{i18n}Allocate User to Role{/i18n}</legend> 20 <legend>{i18n}Allocate User to Role{/i18n}</legend>
21 - <p class="descriptiveText">{i18n}Select the users which should be part of this role.{/i18n} {* <strong>FIXME</strong> this helptext  
22 - is v. awkward. *}</p> 21 + <p class="descriptiveText">{i18n}
  22 +To add users to this role, select one or more user names in the Available Users field; then, double click or use the right pointing arrow to populate the Member users field.
  23 +To remove users from this role, select one or more user names in the Member users field; then, double click, or use the left pointing arrow to move these names to Available Users.{/i18n}</p>
  24 +
  25 +<p>{i18n}Use the Filter fields to display names in order of specified criteria.
  26 +Use the Ctrl key to multi-select user names.{/i18n}</p>
23 27
24 <table border="0" width="600"> 28 <table border="0" width="600">
25 <thead> 29 <thead>