From deee339342e43d33018cc458a5380ed67209b796 Mon Sep 17 00:00:00 2001 From: hickert Date: Thu, 21 Jul 2005 12:45:19 +0000 Subject: [PATCH] added lable tags git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@990 594d385d-05f5-0310-b6e9-bd551577e9d8 --- plugins/addons/ldapmanager/contentimport.tpl | 12 ++-- plugins/admin/applications/generic.tpl | 4 +- plugins/admin/departments/generic.tpl | 2 +- plugins/admin/departments/headpage.tpl | 2 +- plugins/admin/ogroups/generic.tpl | 2 +- plugins/gofax/blocklists/generic.tpl | 18 +++--- plugins/gofax/faxaccount/generic.tpl | 16 ++--- plugins/gofon/macro/generic.tpl | 16 ++--- plugins/gofon/phoneaccount/generic.tpl | 7 ++- plugins/personal/generic/generic.tpl | 63 ++++++++++---------- plugins/personal/generic/generic_picture.tpl | 2 +- plugins/personal/generic/password.tpl | 8 +-- plugins/personal/password/password.tpl | 2 +- 13 files changed, 78 insertions(+), 76 deletions(-) diff --git a/plugins/addons/ldapmanager/contentimport.tpl b/plugins/addons/ldapmanager/contentimport.tpl index f1f457e05..663666e09 100644 --- a/plugins/addons/ldapmanager/contentimport.tpl +++ b/plugins/addons/ldapmanager/contentimport.tpl @@ -7,12 +7,12 @@ @@ -20,8 +20,8 @@   @@ -29,8 +29,8 @@  
- {t}Import LDIF File{/t} + - +
- - {t}Modify existing attributes{/t} + +
- - {t}Overwrite existing entry{/t} + +
diff --git a/plugins/admin/applications/generic.tpl b/plugins/admin/applications/generic.tpl index 42bf5e390..9ddedb263 100644 --- a/plugins/admin/applications/generic.tpl +++ b/plugins/admin/applications/generic.tpl @@ -43,11 +43,11 @@   - {t}Icon{/t} +
- + diff --git a/plugins/admin/departments/generic.tpl b/plugins/admin/departments/generic.tpl index 20b575fda..a82ac8eba 100644 --- a/plugins/admin/departments/generic.tpl +++ b/plugins/admin/departments/generic.tpl @@ -44,7 +44,7 @@ - + diff --git a/plugins/admin/departments/headpage.tpl b/plugins/admin/departments/headpage.tpl index d39f627a9..ab204cc16 100644 --- a/plugins/admin/departments/headpage.tpl +++ b/plugins/admin/departments/headpage.tpl @@ -55,7 +55,7 @@ diff --git a/plugins/admin/ogroups/generic.tpl b/plugins/admin/ogroups/generic.tpl index 1898d3019..8c6cf883b 100644 --- a/plugins/admin/ogroups/generic.tpl +++ b/plugins/admin/ogroups/generic.tpl @@ -11,7 +11,7 @@ - diff --git a/plugins/gofax/blocklists/generic.tpl b/plugins/gofax/blocklists/generic.tpl index f94f2f128..0af55a1ba 100644 --- a/plugins/gofax/blocklists/generic.tpl +++ b/plugins/gofax/blocklists/generic.tpl @@ -5,15 +5,15 @@
 {t}Display departments matching{/t} -
+
- + - + diff --git a/plugins/gofax/faxaccount/generic.tpl b/plugins/gofax/faxaccount/generic.tpl index fd08c9ac7..297d522b9 100644 --- a/plugins/gofax/faxaccount/generic.tpl +++ b/plugins/gofax/faxaccount/generic.tpl @@ -7,23 +7,23 @@
{t}List name{/t}{$must}{$must} - +
{t}Base{/t}{$must}{$must} - {html_options options=$bases selected=$base_select} @@ -29,18 +29,18 @@ - + - +
{t}Type{/t} - {html_options options=$types selected=$type}
{t}Description{/t} - +
@@ -59,7 +59,7 @@
-   +    
- + - + - + @@ -42,8 +42,8 @@ {if $has_mailaccount eq "false"} - {t}Deliver fax as mail to{/t}  - +   + {else} {t}Deliver fax as mail{/t} diff --git a/plugins/gofon/macro/generic.tpl b/plugins/gofon/macro/generic.tpl index e886735a0..e093e8056 100755 --- a/plugins/gofon/macro/generic.tpl +++ b/plugins/gofon/macro/generic.tpl @@ -3,13 +3,13 @@ - @@ -322,19 +322,19 @@ @@ -346,13 +346,13 @@
{t}Fax{/t}{$must}{$must} - +
{t}Language{/t} - {html_options values=$languages output=$languages selected=$goFaxLanguage}
{t}Delivery format{/t} - {html_options values=$formats output=$formats selected=$goFaxFormat} - - + + - + @@ -17,9 +17,9 @@ - +
{t}Macro name{/t}{$must}{$must}
{t}Display name{/t}{$must}{$must} - +
{t}Base{/t}{$must}{$must} - {html_options options=$bases selected=$base_select} @@ -33,9 +33,9 @@ - + diff --git a/plugins/gofon/phoneaccount/generic.tpl b/plugins/gofon/phoneaccount/generic.tpl index 56054412c..178df24f6 100644 --- a/plugins/gofon/phoneaccount/generic.tpl +++ b/plugins/gofon/phoneaccount/generic.tpl @@ -72,10 +72,10 @@
{t}Description{/t} - +
- {t}Phone PIN{/t} + - +
@@ -83,3 +83,6 @@
+ + + diff --git a/plugins/personal/generic/generic.tpl b/plugins/personal/generic/generic.tpl index 98396ba5c..279d2f189 100644 --- a/plugins/personal/generic/generic.tpl +++ b/plugins/personal/generic/generic.tpl @@ -171,28 +171,28 @@ - + - +
- +
- +
- +
@@ -207,29 +207,29 @@ - + {if $has_phoneaccount ne "true"} {/if} - + - @@ -245,16 +245,16 @@
- +
- +
- + - +
- +
@@ -267,35 +267,35 @@ - +
-
-
-
- +
@@ -307,14 +307,14 @@
-
- +
- +
-
- + diff --git a/plugins/personal/generic/generic_picture.tpl b/plugins/personal/generic/generic_picture.tpl index 878db78d2..cb76dc282 100644 --- a/plugins/personal/generic/generic_picture.tpl +++ b/plugins/personal/generic/generic_picture.tpl @@ -18,7 +18,7 @@ diff --git a/plugins/personal/generic/password.tpl b/plugins/personal/generic/password.tpl index 4f4fdf857..3d532f581 100644 --- a/plugins/personal/generic/password.tpl +++ b/plugins/personal/generic/password.tpl @@ -4,12 +4,12 @@
{if $has_phoneaccount ne "true"} - + {else} {t}Please use the phone tab{/t} {/if} @@ -361,23 +361,22 @@
-
-
- {html_options values=$ivbbmodes output=$ivbbmodes selected=$publicVisible} - +  
- - + + - - + +
{t}New password{/t}
{t}Repeat new password{/t}

diff --git a/plugins/personal/password/password.tpl b/plugins/personal/password/password.tpl index 9dadcbf77..ff6ef92d2 100644 --- a/plugins/personal/password/password.tpl +++ b/plugins/personal/password/password.tpl @@ -33,7 +33,7 @@

  - +

-- 2.30.2