From 9b65c44b54064351489af1d04ccf42637f205076 Mon Sep 17 00:00:00 2001 From: cajus Date: Wed, 10 Mar 2010 19:25:53 +0000 Subject: [PATCH] Updated a couple of templates git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16401 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../plugins/personal/generic/class_user.inc | 2 +- .../plugins/personal/generic/generic.tpl | 26 +++++++++---------- .../personal/generic/generic_certs.tpl | 18 ++++++------- .../plugins/personal/generic/password.tpl | 2 +- .../personal/generic/paste_generic.tpl | 6 ++--- gosa-core/plugins/personal/posix/generic.tpl | 8 +++--- .../personal/posix/groupSelect/group-list.tpl | 6 ++--- .../plugins/personal/posix/paste_generic.tpl | 6 ++--- .../personal/posix/trustSelect/trust-list.tpl | 6 ++--- 9 files changed, 40 insertions(+), 40 deletions(-) diff --git a/gosa-core/plugins/personal/generic/class_user.inc b/gosa-core/plugins/personal/generic/class_user.inc index 1eb1cc7a8..4c99d76df 100644 --- a/gosa-core/plugins/personal/generic/class_user.inc +++ b/gosa-core/plugins/personal/generic/class_user.inc @@ -568,7 +568,7 @@ class user extends plugin $str = " - +
CNCN ".preg_replace("/ /", " ", $certificate->getname())."

". diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl index 7d8ec7f7b..35c6682f8 100644 --- a/gosa-core/plugins/personal/generic/generic.tpl +++ b/gosa-core/plugins/personal/generic/generic.tpl @@ -5,7 +5,7 @@ -
+ @@ -21,7 +21,7 @@ @@ -29,7 +29,7 @@ - -
{render acl=$userPictureACL checkbox=$multiple_support checked=$use_edit_picture} - + {/render}
+ {if $is_template ne "true"} @@ -183,10 +183,10 @@   + - + -
{render acl=$homePostalAddressACL checkbox=$multiple_support checked=$use_homePostalAddress} @@ -242,7 +242,7 @@
+ {if !$multiple_support} {render acl=$gosaLoginRestrictionACL} @@ -296,7 +296,7 @@ {if $governmentmode ne "true"} - + @@ -384,7 +384,7 @@ -
+ @@ -436,7 +436,7 @@ -
+ @@ -455,7 +455,7 @@ - +
{render acl=$postalAddressACL checkbox=$multiple_support checked=$use_postalAddress} @@ -468,7 +468,7 @@ {else} - + @@ -517,7 +517,7 @@ -
+ @@ -566,7 +566,7 @@ -
+ diff --git a/gosa-core/plugins/personal/generic/generic_certs.tpl b/gosa-core/plugins/personal/generic/generic_certs.tpl index 0a6c44363..366a6ef73 100644 --- a/gosa-core/plugins/personal/generic/generic_certs.tpl +++ b/gosa-core/plugins/personal/generic/generic_certs.tpl @@ -4,14 +4,14 @@
- - -
+ {t}Standard certificate{/t} + + {if $userCertificate_state ne "true"} {render acl=$CertificateACL} @@ -30,14 +30,14 @@ - - -
+ {t}S/MIME certificate{/t} + + {if $userSMIMECertificate_state ne "true"} {render acl=$CertificateACL} @@ -56,14 +56,14 @@ - - -
+ {t}PKCS12 certificate{/t} + + {if $userPKCS12_state ne "true"} {render acl=$CertificateACL} diff --git a/gosa-core/plugins/personal/generic/password.tpl b/gosa-core/plugins/personal/generic/password.tpl index ed5faa6e7..7ec439601 100644 --- a/gosa-core/plugins/personal/generic/password.tpl +++ b/gosa-core/plugins/personal/generic/password.tpl @@ -2,7 +2,7 @@ {t}You have changed the method your password is stored in the ldap database. For that reason you've to enter your password at this point again. GOsa will then encode it with the selected method.{/t}

- +
diff --git a/gosa-core/plugins/personal/generic/paste_generic.tpl b/gosa-core/plugins/personal/generic/paste_generic.tpl index 6248fa5ae..31d730959 100644 --- a/gosa-core/plugins/personal/generic/paste_generic.tpl +++ b/gosa-core/plugins/personal/generic/paste_generic.tpl @@ -2,7 +2,7 @@
- -
+ @@ -17,7 +17,7 @@ -
+ {t}Password{/t} @@ -27,7 +27,7 @@
+
diff --git a/gosa-core/plugins/personal/posix/generic.tpl b/gosa-core/plugins/personal/posix/generic.tpl index 895a4b23a..0e853089c 100644 --- a/gosa-core/plugins/personal/posix/generic.tpl +++ b/gosa-core/plugins/personal/posix/generic.tpl @@ -1,6 +1,6 @@ -
+

{t}Generic{/t}

@@ -86,7 +86,7 @@ -
  +

{t}Group membership{/t}

{if $groups eq "too_many_for_nfs"} @@ -125,7 +125,7 @@ - -
+ {if $sshPublicKey == 1} {render acl=$sshPublicKeyACL}

{t}SSH keys{/t}

@@ -139,7 +139,7 @@ 		  +

{t}System trust{/t}

{if !$multiple_support} diff --git a/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl b/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl index a71413023..2b15a4e2b 100644 --- a/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl +++ b/gosa-core/plugins/personal/posix/groupSelect/group-list.tpl @@ -1,9 +1,9 @@ {image path="images/empty.png" action="no_action_posted" value="do_nothing"} + style="width:100%;height:100%" cellpadding=2> - - diff --git a/gosa-core/plugins/personal/posix/paste_generic.tpl b/gosa-core/plugins/personal/posix/paste_generic.tpl index e355855ca..b270f45b4 100644 --- a/gosa-core/plugins/personal/posix/paste_generic.tpl +++ b/gosa-core/plugins/personal/posix/paste_generic.tpl @@ -1,6 +1,6 @@
+

 {$HEADLINE} {$SIZELIMIT}

@@ -21,7 +21,7 @@ {$LIST} 		+ {$FILTER}
-
+

{t}Posix settings{/t}

@@ -53,13 +53,13 @@
- -
+

{t}Group membership{/t}

+ {if $groups eq "too_many_for_nfs"} {t}(Warning: more than 16 groups are not supported by NFS!){/t} diff --git a/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl b/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl index be1839373..95f62923d 100644 --- a/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl +++ b/gosa-core/plugins/personal/posix/trustSelect/trust-list.tpl @@ -1,9 +1,9 @@ {image path="images/empty.png" action="no_action_posted" value="do_nothing"} - - - -- 2.30.2
+

 {$HEADLINE} {$SIZELIMIT}

@@ -23,7 +23,7 @@ {$LIST} 		+ {$FILTER}