From ed20008cbb2feae3b08b887c7a417550d82f1b07 Mon Sep 17 00:00:00 2001 From: hickert Date: Wed, 17 Mar 2010 17:15:34 +0000 Subject: [PATCH] Updated setup templates git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16903 594d385d-05f5-0310-b6e9-bd551577e9d8 --- gosa-core/setup/setup_config1.tpl | 4 +- gosa-core/setup/setup_config2.tpl | 2 +- gosa-core/setup/setup_config3.tpl | 6 +- gosa-core/setup/setup_feedback.tpl | 32 ++++--- gosa-core/setup/setup_finish.tpl | 3 +- gosa-core/setup/setup_ldap.tpl | 11 ++- gosa-core/setup/setup_migrate.tpl | 144 +++++++++++++++++++---------- gosa-core/setup/setup_schema.tpl | 2 +- 8 files changed, 132 insertions(+), 72 deletions(-) diff --git a/gosa-core/setup/setup_config1.tpl b/gosa-core/setup/setup_config1.tpl index d3f1b844c..692623a06 100644 --- a/gosa-core/setup/setup_config1.tpl +++ b/gosa-core/setup/setup_config1.tpl @@ -6,7 +6,7 @@ {t}Theme{/t}
- {html_options options=$themes selected=$theme}
@@ -19,7 +19,7 @@ {t}Compress output send to browser{/t}
- {html_options options=$bool selected=$compressed}
diff --git a/gosa-core/setup/setup_config2.tpl b/gosa-core/setup/setup_config2.tpl index 1cf915a17..ab48a9531 100644 --- a/gosa-core/setup/setup_config2.tpl +++ b/gosa-core/setup/setup_config2.tpl @@ -71,7 +71,7 @@ {t}Timezone{/t}
- {foreach from=$timezones.TIMEZONES item=val key=key} {if $key == $timezone} {if isset($timezones.DST_ZONES.$key)} diff --git a/gosa-core/setup/setup_config3.tpl b/gosa-core/setup/setup_config3.tpl index 1dfa10d27..80e0af7fc 100644 --- a/gosa-core/setup/setup_config3.tpl +++ b/gosa-core/setup/setup_config3.tpl @@ -156,13 +156,13 @@ {if $optional.uniq_identifier_active == FALSE} - {html_options options=$uniq_identifiers selected=$optional.uniq_identifier} {else} - {html_options options=$uniq_identifiers selected=$optional.uniq_identifier} {/if} @@ -324,7 +324,7 @@ {t}Debug level{/t}
- {if $optional.debuglevel == 0} diff --git a/gosa-core/setup/setup_feedback.tpl b/gosa-core/setup/setup_feedback.tpl index eb326bad0..441782269 100644 --- a/gosa-core/setup/setup_feedback.tpl +++ b/gosa-core/setup/setup_feedback.tpl @@ -55,7 +55,8 @@ {t}Generic{/t} - - - - - -
+ + {t}Did the setup procedure help you to get started?{/t} @@ -65,7 +66,8 @@
+ + {t}If not, what problems did you encounter{/t}: @@ -73,7 +75,8 @@
+ + {t}Is this the first time you use GOsa?{/t} @@ -81,13 +84,14 @@
{t}No{/t}, {t}I use it since{/t} - {html_options options=$years}
+ + {t}What operating system / distribution do you use?{/t} @@ -95,7 +99,8 @@
+ + {t}What web server do you use?{/t} @@ -103,7 +108,8 @@
+ + {t}What PHP version do you use?{/t} @@ -115,7 +121,8 @@
{t}LDAP{/t} -
+ + {t}What kind of LDAP server(s) do you use?{/t} @@ -132,7 +139,8 @@
{t}Features{/t} - -
{t}What features of GOsa do you use?{/t} + {t}What features of GOsa do you use?{/t} + {foreach from=$features_used item=data key=key} @@ -142,13 +150,15 @@
{t}What features do you want to see in future versions of GOsa?{/t} + {t}What features do you want to see in future versions of GOsa?{/t} +
- + + {/if} diff --git a/gosa-core/setup/setup_finish.tpl b/gosa-core/setup/setup_finish.tpl index 0ac6e0381..7fd74cc5b 100644 --- a/gosa-core/setup/setup_finish.tpl +++ b/gosa-core/setup/setup_finish.tpl @@ -25,7 +25,8 @@ or {/if}

- + +

{if $err_msg != ""}
diff --git a/gosa-core/setup/setup_ldap.tpl b/gosa-core/setup/setup_ldap.tpl index 8e082d638..2aeadd2f3 100644 --- a/gosa-core/setup/setup_ldap.tpl +++ b/gosa-core/setup/setup_ldap.tpl @@ -10,11 +10,14 @@ {html_options options=$resolved_users selected=$admin} - + +

 

- - + + + +
@@ -56,7 +59,7 @@
{if $namingContextsCount >= 1} - {html_options values=$namingContexts output=$namingContexts selected=$base} {else} diff --git a/gosa-core/setup/setup_migrate.tpl b/gosa-core/setup/setup_migrate.tpl index 94b999b58..f7666dd75 100644 --- a/gosa-core/setup/setup_migrate.tpl +++ b/gosa-core/setup/setup_migrate.tpl @@ -30,7 +30,8 @@
{/foreach}
- + + {elseif $method == "rootOC_migrate_dialog"} @@ -51,13 +52,15 @@
- + +

- + +
{elseif $method == "outside_winstations"} @@ -93,18 +96,21 @@ {t}Select all{/t}

{t}Move selected windows workstations into the following GOsa department{/t} : - {html_options options=$ous}
- - + + + +

- + +
@@ -120,7 +126,7 @@

{t}Move selected groups into this group tree{/t}: - {html_options options=$ous}

@@ -150,17 +156,21 @@

{if $group_details} - + + {else} - + + {/if}

- + +   - + +
{elseif $method == "outside_users"} @@ -174,7 +184,7 @@

{t}Move selected users into this people tree{/t}: - {html_options options=$ous}

@@ -202,16 +212,20 @@
{if $user_details} - + + {else} - + + {/if}
- + +   - + +
@@ -234,7 +248,8 @@
{if !$details} - + + {else} @@ -251,14 +266,18 @@
- + + {/if} - + +
- - + + + +
{elseif $method == "create_acls"} @@ -269,8 +288,10 @@ {$what_will_be_done_now} - - + + + + {else}

{t}Create a new GOsa administrator account{/t}

@@ -322,8 +343,10 @@
- - + + + +
{/if} {elseif $method == "migrate_deps"} @@ -369,17 +392,21 @@ dn: {$deps_to_migrate.$key.dn}
{if $deps_details} - + + {else} - + + {/if}
- + +   - + +
{elseif $method == "migrate_users"} @@ -422,17 +449,21 @@ dn: {$users_to_migrate.$key.dn}
{if $user_details} - + + {else} - + + {/if}
- + +   - + +
@@ -466,18 +497,23 @@ dn: {$users_to_migrate.$key.dn}
{if $device_details} - - + + + + {else} - + + {/if}
- + +   - + +
{elseif $method == "services"} @@ -509,18 +545,23 @@ dn: {$users_to_migrate.$key.dn}
{if $service_details} - - + + + + {else} - + + {/if}
- + +   - + +
@@ -553,18 +594,23 @@ dn: {$users_to_migrate.$key.dn}
{if $menu_details} - - + + + + {else} - + + {/if}
- + +   - + +
{/if} diff --git a/gosa-core/setup/setup_schema.tpl b/gosa-core/setup/setup_schema.tpl index 908b989b7..8a2f69952 100644 --- a/gosa-core/setup/setup_schema.tpl +++ b/gosa-core/setup/setup_schema.tpl @@ -7,7 +7,7 @@ {t}Enable schema validation when logging in{/t}
- {html_options options=$bool selected=$enable_schema_check}
-- 2.30.2