From: hickert Date: Wed, 3 Mar 2010 16:34:32 +0000 (+0000) Subject: reverted template design X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=dd8c275fcb2b74a2a49b2b2aeec531489b72ea71;p=gosa.git reverted template design git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15999 594d385d-05f5-0310-b6e9-bd551577e9d8 --- diff --git a/gosa-core/plugins/personal/generic/generic.tpl b/gosa-core/plugins/personal/generic/generic.tpl index 625872ffd..06bcfca5c 100644 --- a/gosa-core/plugins/personal/generic/generic.tpl +++ b/gosa-core/plugins/personal/generic/generic.tpl @@ -1,9 +1,18 @@ -
-
-
- + + + + + + + + + + + + + + + + + + + +

{t}Personal information{/t}

- +
@@ -22,22 +31,20 @@
- - - -
-
- +
{if $is_template ne "true"} @@ -45,7 +52,7 @@ {else} - + {/if} @@ -55,10 +62,10 @@ @@ -68,10 +75,10 @@ @@ -85,7 +92,7 @@ @@ -93,7 +100,7 @@ @@ -124,7 +131,7 @@
{if $multiple_support} - + {else} {render acl=$snACL} - + {/render} {/if}
{render acl=$snACL}{/render}{render acl=$snACL}{/render}
{if $multiple_support} - + {else} {render acl=$givenNameACL} - + {/render} {/if} {if !$multiple_support} {render acl=$uidACL} - + {/render} {else} - + {/if}
{render acl=$personalTitleACL checkbox=$multiple_support checked=$use_personalTitle} - + {/render}
{render acl=$academicTitleACL checkbox=$multiple_support checked=$use_academicTitle} - + {/render}
{render acl=$genderACL} - {html_options options=$gender_list selected=$gender} {/render} @@ -137,7 +144,7 @@ {render acl=$preferredLanguageACL checkbox=$multiple_support checked=$use_preferredLanguage} - {html_options options=$preferredLanguage_list selected=$preferredLanguage} {/render} @@ -156,18 +163,19 @@
- - - -
-
- +
+   + + + @@ -175,7 +183,7 @@ @@ -183,7 +191,7 @@ @@ -196,7 +204,7 @@
{render acl=$homePostalAddressACL checkbox=$multiple_support checked=$use_homePostalAddress} - + {/render}
{render acl=$homePhoneACL checkbox=$multiple_support checked=$use_homePhone} - + {/render}
{render acl=$labeledURIACL checkbox=$multiple_support checked=$use_labeledURI} - + {/render}
{render acl=$passwordStorageACL checkbox=$multiple_support checked=$use_pw_storage} - {foreach from=$pwmode key=value item=desc} {/foreach} @@ -232,7 +240,7 @@ {$gosaLoginRestrictionWidget} {/render} {render acl=$gosaLoginRestrictionACL} - {/render} {render acl=$gosaLoginRestrictionACL} @@ -252,7 +260,7 @@ {$gosaLoginRestrictionWidget} {/render} {render acl=$gosaLoginRestrictionACL} - {/render} {render acl=$gosaLoginRestrictionACL} @@ -263,40 +271,32 @@
- - - - - -
- -
+
-
-
-
+ + + + + + - - - - -
- -
-
-
- - {if $governmentmode eq "true"} - + +
+ + {if $governmentmode ne "true"} + +

{t}Organizational information{/t}

- +
@@ -304,7 +304,7 @@ @@ -312,7 +312,7 @@ @@ -320,7 +320,7 @@ @@ -328,7 +328,7 @@ @@ -368,21 +368,23 @@ {/if} -
{render acl=$oACL checkbox=$multiple_support checked=$use_o} - + {/render}
{render acl=$ouACL checkbox=$multiple_support checked=$use_ou} - + {/render}
{render acl=$departmentNumberACL checkbox=$multiple_support checked=$use_departmentNumber} - + {/render}
{render acl=$employeeNumberACL checkbox=$multiple_support checked=$use_employeeNumber} - + {/render}
{render acl=$employeeTypeACL checkbox=$multiple_support checked=$use_employeeType} - + {/render}
- + {/if} - - - -
-
- +
+ + + +   + + + + @@ -391,7 +393,7 @@ @@ -400,7 +402,7 @@ @@ -408,7 +410,7 @@ @@ -416,23 +418,25 @@
{render acl=$roomNumberACL checkbox=$multiple_support checked=$use_roomNumber} - + {/render}
{render acl=$telephoneNumberACL checkbox=$multiple_support checked=$use_telephoneNumber} - + {/render}
{render acl=$mobileACL checkbox=$multiple_support checked=$use_mobile} - + {/render}
{render acl=$pagerACL checkbox=$multiple_support checked=$use_pager} - + {/render}
{render acl=$facsimileTelephoneNumberACL checkbox=$multiple_support checked=$use_facsimileTelephoneNumber} - + {/render}
- -
-
-
-
- + + + +   + + + + @@ -440,7 +444,7 @@ @@ -453,15 +457,18 @@
{render acl=$lACL checkbox=$multiple_support checked=$use_l} - + {/render}
{render acl=$stACL checkbox=$multiple_support checked=$use_st} - + {/render}
+ {else} + + @@ -469,7 +476,7 @@ @@ -478,7 +485,7 @@ @@ -487,7 +494,7 @@ @@ -496,23 +503,21 @@
{render acl=$vocationACL checkbox=$multiple_support checked=$use_vocation} - + {/render}
{render acl=$gouvernmentOrganizationalUnitDescriptionACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalUnitDescription} - {/render} {render acl=$gouvernmentOrganizationalUnitSubjectAreaACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalUnitSubjectArea} - {/render} {render acl=$functionalTitleACL checkbox=$multiple_support checked=$use_functionalTitle} - {/render} {render acl=$roleACL checkbox=$multiple_support checked=$use_role} - + {/render}
- -
-
-
-
- + + + + @@ -521,7 +526,7 @@ @@ -530,7 +535,7 @@ @@ -538,7 +543,7 @@ @@ -546,24 +551,22 @@
{render acl=$gouvernmentOrganizationalPersonLocalityACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalPersonLocality} - {/render} {render acl=$gouvernmentOrganizationalUnitACL checkbox=$multiple_support checked=$use_gouvernmentOrganizationalUnit} - {/render} {render acl=$streetACL checkbox=$multiple_support checked=$use_street} - + {/render}
{render acl=$postalCodeACL checkbox=$multiple_support checked=$use_postalCode} - + {/render}
{render acl=$houseIdentifierACL checkbox=$multiple_support checked=$use_houseIdentifier} - {/render}
- -
-
-
-
- + + + + @@ -572,7 +575,7 @@ @@ -592,7 +595,7 @@ @@ -601,19 +604,17 @@
{render acl=$roomNumberACL checkbox=$multiple_support checked=$use_roomNumber} - + {/render}
{render acl=$telephoneNumberACL checkbox=$multiple_support checked=$use_telephoneNumber} {if $has_phoneaccount ne "true"} - + {else} {t}Please use the phone tab{/t} {/if} @@ -583,7 +586,7 @@ {render acl=$facsimileTelephoneNumberACL checkbox=$multiple_support checked=$use_facsimileTelephoneNumber} - {/render} {render acl=$ivbbLastDeliveryCollectiveACL checkbox=$multiple_support checked=$use_ivbbLastDeliveryCollective} - {/render} {render acl=$publicVisibleACL checkbox=$multiple_support checked=$use_publicVisible} - {html_options values=$ivbbmodes output=$ivbbmodes selected=$publicVisible} {/render}
+ {/if} - -
-
-
-
+ + {if $multiple_support}