From 7b2e8ac95805a93d99ab3459ee01a7c05647f9fa Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 20 May 2010 15:03:48 +0000
Subject: [PATCH] Updated feeedback formular

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@18607 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/setup/setup_feedback.tpl | 136 +++++++++--------------------
 1 file changed, 39 insertions(+), 97 deletions(-)

diff --git a/gosa-core/setup/setup_feedback.tpl b/gosa-core/setup/setup_feedback.tpl
index 441782269..daadc73b9 100644
--- a/gosa-core/setup/setup_feedback.tpl
+++ b/gosa-core/setup/setup_feedback.tpl
@@ -1,84 +1,51 @@
-
 {if $feedback_send}
-
-	<div class='default' style='margin:12px; '>  
-		<font color='green'>{t}Feedback sucessfully send{/t}</font>
-	</div>	
-
+	<font color='green'>{t}Feedback sucessfully send{/t}</font>
 {else}
 	
-<div class='default' style='margin:12px; '>  
+    <input {if $subscribe} checked {/if} type='checkbox' name='subscribe' value='1' class='center'>
+    {t}Subscribe to the gosa-announce mailinglist{/t}
 
-	<h2>{$additional_info}</h2>
+    <p>{t}When checking this option, GOsa will try to connect http://oss.gonicus.de in order to subscribe you to the gosa-announce mailing list. You've to confirm this by mail.{/t}</p>
 
-	<h2>
-		<input {if $subscribe} checked {/if} type='checkbox' name='subscribe' value='1' class='center'>&nbsp;{t}Subscribe to the gosa-announce mailinglist{/t}
-	</h2>
-	<p>
-	{t}When checking this option, GOsa will try to connect http://oss.gonicus.de in order to subscribe you to the gosa-announce mailing list. You've to confirm this by mail.{/t}
-	</p>
 	<table>	
 		<tr>
-			<td>
-				{t}Organization{/t}
-			</td>
-			<td>
-				<input name='organization' type='text' value='{$organization}' style='width:300px;'>
-			</td>
+			<td>{t}Organization{/t}</td>
+			<td><input name='organization' type='text' value='{$organization}' style='width:300px;'></td>
 		</tr>
 		<tr>
-			<td>
-				{t}Name{/t}
-			</td>
-			<td>
-				<input name='name' type='text' value='{$name}' style='width:300px;'>
-			</td>
+			<td>{t}Name{/t}</td>
+			<td><input name='name' type='text' value='{$name}' style='width:300px;'></td>
 		</tr>
 		<tr>
-			<td>
-				{t}Mail address{/t}{$must}
-			</td>
-			<td>
-				<input name='eMail' type='text' value='{$eMail}' style='width:300px;'>	
-			</td>
+			<td>{t}Mail address{/t}{$must}</td>
+			<td><input name='eMail' type='text' value='{$eMail}' style='width:300px;'></td>
 		</tr>
 	</table>
 
+    <hr>
+
+	<input {if $use_gosa_announce} checked {/if} type='checkbox' name='use_gosa_announce' value='1' class='center'>
+    {t}Send feedback to the GOsa project team{/t}
 
-	<p>&nbsp;</p>
-	<h2>
-  		<input {if $use_gosa_announce} checked {/if} type='checkbox' name='use_gosa_announce' value='1' class='center'>&nbsp;{t}Send feedback to the GOsa project team{/t}
-	</h2>
 	<p>
 	{t}When checking this option, GOsa will try to connect http://oss.gonicus.de in order to submit your form anonymously.{/t}
 	</p>
+
+    <hr>
 	<b>{t}Generic{/t}</b>
 	<table>	
 		<tr>
-			<td>
-
-				{t}Did the setup procedure help you to get started?{/t}   
-			</td>
-			<td>
-				<input {if $get_started} checked {/if} type='radio' name='get_started' value='1'>{t}Yes{/t}
+			<td>{t}Did the setup procedure help you to get started?{/t}</td>
+			<td><input {if $get_started} checked {/if} type='radio' name='get_started' value='1'>{t}Yes{/t}
 				<br>
-				<input {if !$get_started} checked {/if} type='radio' name='get_started' value='0'>{t}No{/t}
-			</td>
+				<input {if !$get_started} checked {/if} type='radio' name='get_started' value='0'>{t}No{/t}</td>
 		</tr>
 		<tr>
-			<td>
-
-				{t}If not, what problems did you encounter{/t}:
-			</td>
-			<td>
-				<textarea name='problems_encountered' rows='4' cols='50' style='width:100%'>{$problems_encountered}</textarea>
-			</td>
+			<td>{t}If not, what problems did you encounter{/t}:</td>
+			<td><textarea name='problems_encountered' rows='4' cols='50' style='width:100%'>{$problems_encountered}</textarea></td>
 		</tr>
 		<tr>
-			<td>
-
-				{t}Is this the first time you use GOsa?{/t}
-			</td>
+			<td>{t}Is this the first time you use GOsa?{/t}</td>
 			<td>
 				<input {if $first_use} checked {/if} type='radio' name='first_use' value='1'>{t}Yes{/t}
 				<br>
@@ -90,58 +57,37 @@
 			</td>	
 		</tr>
 		<tr>
-			<td>
-
-				{t}What operating system / distribution do you use?{/t}
-			</td>
-			<td>
-				<input type='text' name='distribution' size=50 value='{$distribution}'>
-			</td>
+			<td>{t}What operating system / distribution do you use?{/t}</td>
+			<td><input type='text' name='distribution' size=50 value='{$distribution}'></td>
 		</tr>
 		<tr>
-			<td>
-
-				{t}What web server do you use?{/t}
-			</td>
-			<td>
-				<input type='text' size=50 name='web_server' value='{$web_server}'>
-			</td>
+			<td>{t}What web server do you use?{/t}</td>
+			<td><input type='text' size=50 name='web_server' value='{$web_server}'></td>
 		</tr>
 		<tr>
-			<td>
-
-				{t}What PHP version do you use?{/t}
-			</td>
-			<td>
-				<input type='text' size=50 name='php_version' value='{$php_version}'>
-			</td>
+			<td>{t}What PHP version do you use?{/t}</td>
+			<td><input type='text' size=50 name='php_version' value='{$php_version}'></td>
 		</tr>
 	</table>
 
-	<br><b>{t}LDAP{/t}</b>
+	<hr>
+    <b>{t}LDAP{/t}</b>
 	<table>
 		<tr>
-			<td>
-
-			{t}What kind of LDAP server(s) do you use?{/t}
-			</td>
-			<td><input type='text' name='ldap_server' size=50 value='{$ldap_server}'>
-			</td>
+			<td>{t}What kind of LDAP server(s) do you use?{/t}</td>
+			<td><input type='text' name='ldap_server' size=50 value='{$ldap_server}'></td>
 		</tr>
 		<tr>
-			<td>{t}How many objects are in your LDAP?{/t}
-			</td>
-			<td><input type='text' name='object_count' size=50 value='{$object_count}'>
-			</td>
+			<td>{t}How many objects are in your LDAP?{/t}</td>
+			<td><input type='text' name='object_count' size=50 value='{$object_count}'></td>
 		</tr>
 	</table>
 
-	<br><b>{t}Features{/t}</b>
+	<hr>
+    <b>{t}Features{/t}</b>
 	<table>
 		<tr>
-			<td>{t}What features of GOsa do you use?{/t}
-
-			</td>
+			<td>{t}What features of GOsa do you use?{/t}</td>
 			<td>
 				{foreach from=$features_used item=data key=key}
 					<input type='checkbox' name='feature_{$key}' {if $data.USED} checked {/if}>
@@ -150,14 +96,10 @@
 			</td>
 		</tr>
 		<tr>
-			<td>{t}What features do you want to see in future versions of GOsa?{/t}
-
-			</td>
-			<td><textarea name='want_to_see_next' cols=50 rows=3>{$want_to_see_next}</textarea>
-			</td>
+			<td>{t}What features do you want to see in future versions of GOsa?{/t}</td>
+			<td><textarea name='want_to_see_next' cols=50 rows=3>{$want_to_see_next}</textarea></td>
 		</tr>
 	</table>
-</div>
 <button type='submit' name='send_feedback'>{t}Send feedback{/t}</button>
 
 {/if}
-- 
2.30.2