From e9d17e7f7263d1498199affda1db8702daaaab13 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 4 Mar 2010 14:33:26 +0000 Subject: [PATCH] replaced

seperator style by

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16174 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-plugins/mail/personal/mail/generic.tpl | 473 +++++++++--------- .../mail/sieve/templates/create_script.tpl | 2 +- 2 files changed, 237 insertions(+), 238 deletions(-) diff --git a/gosa-plugins/mail/personal/mail/generic.tpl b/gosa-plugins/mail/personal/mail/generic.tpl index 75db94466..2131f7b55 100644 --- a/gosa-plugins/mail/personal/mail/generic.tpl +++ b/gosa-plugins/mail/personal/mail/generic.tpl @@ -1,301 +1,300 @@ - - - - - - - - + + + + + + + +
+ +

{t}Generic{/t}

-

{t}Generic{/t} -

- -{if !$multiple_support} +
+ {if !$multiple_support} -{/if} - - - + -{if $quotaEnabled} - - + {if $quotaEnabled} + + - - - - - -{/if} + + + + + + {/if}
{$must} - {if !$isModifyableMail && $initially_was_account} - - {else} - {if $domainSelectionEnabled} - {render acl=$mailACL} - - {/render} - @ - {else} - {render acl=$mailACL} - - {/render} - {/if} - {/if} + {if !$isModifyableMail && $initially_was_account} + + {else} + {if $domainSelectionEnabled} + {render acl=$mailACL} + + {/render} + @ + {else} + {render acl=$mailACL} + + {/render} + {/if} + {/if}
- {if !$isModifyableServer && $initially_was_account} - - {else} - -{render acl=$gosaMailServerACL} + {if !$isModifyableServer && $initially_was_account} + + {else} + + {render acl=$gosaMailServerACL} -{/render} - {/if} + {/render} + {/if}
  + {/if} + +
 
{t}Quota usage{/t}
{t}Quota usage{/t} {$quotaUsage}
-{render acl=$gosaMailQuotaACL checkbox=$multiple_support checked=$use_gosaMailQuota} - MB - {/render} -
+ {render acl=$gosaMailQuotaACL checkbox=$multiple_support checked=$use_gosaMailQuota} + MB + {/render} +
-   +   -{if !$multiple_support} + {if !$multiple_support}

-

-{render acl=$gosaMailAlternateAddressACL} + + {render acl=$gosaMailAlternateAddressACL} -
+ title="{t}List of alternative mail addresses{/t}"> + {html_options values=$gosaMailAlternateAddress output=$gosaMailAlternateAddress} + + {/render} + +
{render acl=$gosaMailAlternateAddressACL} - + {/render} {render acl=$gosaMailAlternateAddressACL} - + {/render} {render acl=$gosaMailAlternateAddressACL} - - -{/render} -{/if} -
-

 

- - - - -{if $allowSieveManagement} - - - {/if} -
-{render acl=$gosaMailDeliveryModeCACL} - {t}Use custom sieve script{/t} ({t}disables all Mail options!{/t}) -{/render} -
-{render acl=$sieveManagementACL} - + {/render} -
-
-

 

-
+
+ + + + + {if $allowSieveManagement} + + + + {/if} +
+ {render acl=$gosaMailDeliveryModeCACL} + {t}Use custom sieve script{/t} ({t}disables all Mail options!{/t}) + {/render} +
+ {render acl=$sieveManagementACL} + + + {/render} +
+
+
+
+ +
-{render acl=$gosaMailDeliveryModeIACL checkbox=$multiple_support checked=$use_drop_own_mails} + {render acl=$gosaMailDeliveryModeIACL checkbox=$multiple_support checked=$use_drop_own_mails} {t}No delivery to own mailbox{/t} -{/render} + type=checkbox name="drop_own_mails" value="1" {$drop_own_mails} + title="{t}Select if you want to forward mails without getting own copies of them{/t}"> {t}No delivery to own mailbox{/t} + {/render}
- -{render acl=$gosaMailDeliveryModeVACL checkbox=$multiple_support checked=$use_use_vacation} + + {render acl=$gosaMailDeliveryModeVACL checkbox=$multiple_support checked=$use_use_vacation} {t}Activate vacation message{/t} -{/render} - + id="use_vacation" {if $own_script != ""} disabled {/if} + title="{t}Select to automatically response with the vacation message defined below{/t}" class="center" + onclick="changeStates()"> {t}Activate vacation message{/t} + {/render} +
- -{if $rangeEnabled} + + {if $rangeEnabled} - - -
{t}from{/t} -{render acl=$gosaVacationMessageACL} - - {if $gosaVacationMessageACL|regex_replace:"/[cdmr]/":"" == "w"} - - {/if} -{/render} + {render acl=$gosaVacationMessageACL} + + {if $gosaVacationMessageACL|regex_replace:"/[cdmr]/":"" == "w"} + + {/if} + {/render} {t}till{/t} -{render acl=$gosaVacationMessageACL} -
- {if $gosaVacationMessageACL|regex_replace:"/[cdmr]/":"" == "w"} - - {/if} -{/render} -
-{/if} + 		+ {render acl=$gosaVacationMessageACL} +
+ {if $gosaVacationMessageACL|regex_replace:"/[cdmr]/":"" == "w"} + + {/if} + {/render} +
+ {/if}   -{render acl=$gosaMailDeliveryModeSACL checkbox=$multiple_support checked=$use_use_spam_filter} + {render acl=$gosaMailDeliveryModeSACL checkbox=$multiple_support checked=$use_use_spam_filter} -{/render} + value="1" {$use_spam_filter} title="{t}Select if you want to filter this mails through spamassassin{/t}" class="center"> + {/render} -{render acl=$gosaSpamSortLevelACL checkbox=$multiple_support checked=$use_gosaSpamSortLevel} + {render acl=$gosaSpamSortLevelACL checkbox=$multiple_support checked=$use_gosaSpamSortLevel} + title="{t}Choose spam level - smaller values are more sensitive{/t}"> + {html_options values=$spamlevel output=$spamlevel selected=$gosaSpamSortLevel} + {/render} - + {render acl=$gosaSpamMailboxACL checkbox=$multiple_support checked=$use_gosaSpamMailbox} - + {/render} -
+
{render acl=$gosaMailDeliveryModeRACL checkbox=$multiple_support checked=$use_use_mailsize_limit} - + {/render} - + {render acl=$gosaMailMaxSizeACL checkbox=$multiple_support checked=$use_gosaMailMaxSize} - {t}MB{/t} + {t}MB{/t} {/render} - - - - -

- -

-{render acl=$gosaVacationMessageACL checkbox=$multiple_support checked=$use_gosaVacationMessage} - + + + + +

+ +

+ {render acl=$gosaVacationMessageACL checkbox=$multiple_support checked=$use_gosaVacationMessage} + {/render} -
+
{if $show_templates eq "true"} - {render acl=$gosaVacationMessageACL} - - {/render} - {render acl=$gosaVacationMessageACL} - - {/render} -{/if} - - -

- -

- -{if $multiple_support} - +{/render} {/if} - -{render acl=$gosaMailForwardingAddressACL} - + + +

+ +

+ + {if $multiple_support} + + {/if} + + {render acl=$gosaMailForwardingAddressACL} + {/render} -
+
{render acl=$gosaMailForwardingAddressACL} - + {/render} {render acl=$gosaMailForwardingAddressACL} -   +  {/render} {render acl=$gosaMailForwardingAddressACL} -   +  {/render} {render acl=$gosaMailForwardingAddressACL} - + {/render} - - - -

 

+ + + +

{t}Advanced mail options{/t}

@@ -306,32 +305,32 @@ diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/create_script.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/create_script.tpl index ed2f15627..33411434b 100644 --- a/gosa-plugins/mail/personal/mail/sieve/templates/create_script.tpl +++ b/gosa-plugins/mail/personal/mail/sieve/templates/create_script.tpl @@ -3,7 +3,7 @@

-

 

+

{t}Script name{/t}
-- 2.39.5
-{render acl=$gosaMailDeliveryModeLACL checkbox=$multiple_support checked=$use_only_local} + {render acl=$gosaMailDeliveryModeLACL checkbox=$multiple_support checked=$use_only_local} -{/render} + value="1" {$only_local} title="{t}Select if user can only send and receive inside his own domain{/t}" class="center"> + {/render} {t}User is only allowed to send and receive local mails{/t}