Commit eae87e8ffa935c78f0b7369c76167d37ce0c57ca
1 parent
89eb449f
Merged in from DEV trunk...
KTS-3323 "CLONE - Breaks the pattern graph (SUP-780)" Fixed. Added scrolling to stop user interface from displaying incorrectly. Committed By: Jonathan Byrne Reviewed By: Megan Watson git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.2c-Release-Branch@8432 c91229c3-7414-0410-bfa2-8a42b809f60b
Showing
5 changed files
with
22 additions
and
3 deletions
resources/css/kt-framing.css
| @@ -2130,4 +2130,10 @@ body #content #add_dashlet | @@ -2130,4 +2130,10 @@ body #content #add_dashlet | ||
| 2130 | { | 2130 | { |
| 2131 | overflow:scroll; | 2131 | overflow:scroll; |
| 2132 | 2132 | ||
| 2133 | +} | ||
| 2134 | + | ||
| 2135 | +.role_allocation | ||
| 2136 | +{ | ||
| 2137 | + overflow:auto; | ||
| 2138 | + | ||
| 2133 | } | 2139 | } |
| 2134 | \ No newline at end of file | 2140 | \ No newline at end of file |
resources/css/kt-ie-7.css
resources/css/kt-ie-icons.css
templates/ktcore/folder/roles.smarty
| 1 | <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}Allocate Roles for{/i18n}:<br />{$folderName|sanitize}</h2> | 1 | <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}Allocate Roles for{/i18n}:<br />{$folderName|sanitize}</h2> |
| 2 | 2 | ||
| 3 | -<p class="descriptiveText">{i18n} | 3 | +<p class="descriptiveText role_allocation">{i18n} |
| 4 | In many cases, workflow actions will be assigned to certain <strong>roles</strong> | 4 | In many cases, workflow actions will be assigned to certain <strong>roles</strong> |
| 5 | (e.g. Manager, Interviewer, Researcher, Journalist). You can assign these roles | 5 | (e.g. Manager, Interviewer, Researcher, Journalist). You can assign these roles |
| 6 | to specific groups in particular areas of the document management system. | 6 | to specific groups in particular areas of the document management system. |
| @@ -8,8 +8,9 @@ | @@ -8,8 +8,9 @@ | ||
| 8 | 8 | ||
| 9 | <div class='ktInfoMessage'><span><strong>{i18n}Warning{/i18n}:</strong> {i18n}Please note that changing | 9 | <div class='ktInfoMessage'><span><strong>{i18n}Warning{/i18n}:</strong> {i18n}Please note that changing |
| 10 | role allocations may take a some time, depending on the number of folders below this one.{/i18n}</span></div> | 10 | role allocations may take a some time, depending on the number of folders below this one.{/i18n}</span></div> |
| 11 | - | 11 | +<div class="role_allocation"> |
| 12 | <table class="kt_collection narrow" cellspacing="0"> | 12 | <table class="kt_collection narrow" cellspacing="0"> |
| 13 | + | ||
| 13 | <thead> | 14 | <thead> |
| 14 | <tr> | 15 | <tr> |
| 15 | <th>{i18n}Role{/i18n}</th> | 16 | <th>{i18n}Role{/i18n}</th> |
| @@ -52,4 +53,6 @@ role allocations may take a some time, depending on the number of folders below | @@ -52,4 +53,6 @@ role allocations may take a some time, depending on the number of folders below | ||
| 52 | <tr><td colspan="5" class="ktInfoMessage"><span>{i18n}No roles defined in the Role Administration area.{/i18n}</span></td></tr> | 53 | <tr><td colspan="5" class="ktInfoMessage"><span>{i18n}No roles defined in the Role Administration area.{/i18n}</span></td></tr> |
| 53 | {/if} | 54 | {/if} |
| 54 | </tbody> | 55 | </tbody> |
| 56 | + | ||
| 55 | </table> | 57 | </table> |
| 58 | +</div> |
templates/ktcore/login.smarty
| @@ -50,7 +50,7 @@ | @@ -50,7 +50,7 @@ | ||
| 50 | {/foreach} | 50 | {/foreach} |
| 51 | </select> | 51 | </select> |
| 52 | <div class="form_actions"> | 52 | <div class="form_actions"> |
| 53 | - <input type="submit" value="{i18n}login{/i18n}" /> | 53 | + <input type="submit" value="{i18n}Login{/i18n}" /> |
| 54 | </div> | 54 | </div> |
| 55 | </form> | 55 | </form> |
| 56 | </div> | 56 | </div> |