From c090b85aec5294de328a371b42c1a81f9160b345 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 11 Apr 2007 07:49:59 +0000
Subject: [PATCH] Updated layout

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6001 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 include/sieve/class_sieveManagement.inc      |  4 ++--
 include/sieve/templates/create_script.tpl    | 18 ++++++++++--------
 include/sieve/templates/management.tpl       | 11 +++++------
 include/sieve/templates/object_container.tpl |  6 +++---
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/include/sieve/class_sieveManagement.inc b/include/sieve/class_sieveManagement.inc
index 90e87bf23..412423288 100644
--- a/include/sieve/class_sieveManagement.inc
+++ b/include/sieve/class_sieveManagement.inc
@@ -641,7 +641,7 @@ class sieveManagement extends plugin
       }
       $field2 = array("string" => $script['NAME']);  
       $field3 = array("string" => $script['MSG']);
-      $field4 = array("string" => _("Script length")."&nbsp;:&nbsp;".strlen($script['SCRIPT']));
+      $field4 = array("string" => _("Script length").":&nbsp;".strlen($script['SCRIPT']));
 
       if($this->parent->acl_is_writeable("sieveManagement")){
         $del = "<input type='image' name='delscript_".$key."' src='images/edittrash.png'
@@ -660,7 +660,7 @@ class sieveManagement extends plugin
       $field6 = array("string" => $activate."<input type='image' name='editscript_".$key."' src='images/edit.png'
                         title='"._("Edit script")."'>".$del,
                       "attach" => "style='border-right:0px; width:70px;'");
-      $List ->AddEntry(array($field1,$field2,$field3,$field4,$field6)); 
+      $List->AddEntry(array($field1,$field2,$field3,$field4,$field6)); 
     }
  
     /* If the uattrib is empty   (Attribute to use for authentification with sieve)
diff --git a/include/sieve/templates/create_script.tpl b/include/sieve/templates/create_script.tpl
index 240cdba59..e5e97c9dc 100644
--- a/include/sieve/templates/create_script.tpl
+++ b/include/sieve/templates/create_script.tpl
@@ -1,21 +1,23 @@
 <h2>Create a new sieve script</h2>
-{t}Please enter the name for yout new script below.{/t}<br>
-{t}Script names must be lower case and only characters are allowed.{/t}
+{t}Please enter the name for yout new script below. Script names must be lower case and only characters are allowed.{/t}
 
 <br>
 <br>
 {if $Error != ""}
 	<font color='red'>{$Error}</font>
 	<br>
+	<br>
 {/if}
-<b>{t}Script name{/t}&nbsp;:&nbsp;</b><input type='text' name='NewScriptName' value='{$NewScriptName}'>
-
+<p class="seperator">&nbsp;</p>
+<br>
+<b>{t}Script name{/t}</b> <input type='text' name='NewScriptName' value='{$NewScriptName}'>
+<br>
 <br>
 
-<div class='seperator' style='text-align:right; width:100%;'>
-    <input type='submit' name='create_script_cancel' value='{t}Cancel{/t}'>
-        &nbsp;
-    <input type='submit' name='create_script_save' value='{t}Next{/t}' id='create_script_save'>
+<div class='seperator' style='border-top:1px solid #999; text-align:right; width:100%; padding-top:10px;'>
+   <input type='submit' name='create_script_save' value='{t}Save{/t}' id='create_script_save'>
+   &nbsp;
+   <input type='submit' name='create_script_cancel' value='{t}Cancel{/t}'>
 </div>
 <script language="JavaScript" type="text/javascript">
 	document.mainform.NewScriptName.focus();
diff --git a/include/sieve/templates/management.tpl b/include/sieve/templates/management.tpl
index ce287351c..10b600ba6 100644
--- a/include/sieve/templates/management.tpl
+++ b/include/sieve/templates/management.tpl
@@ -2,26 +2,25 @@
 <!--
 {if $uattrib_empty}
 		
-	<font color='red'><b>{t}Connection to sieve could not be established, the authentification attribute is empty.{/t}</b></font><br>
+	<font color='red'><b>{t}Connection to the sieve server could not be established, the authentification attribute is empty.{/t}</b></font><br>
 	{t}Please verfiy that the attributes uid and mail are not empty and try again.{/t}
 	<br>
 	<br>
 
 {elseif $Sieve_Error != ""}
 
-	<font color='red'><b>{t}Connection to sieve could not be established.{/t}</b></font><br>
+	<font color='red'><b>{t}Connection to the sieve server could not be established.{/t}</b></font><br>
 	{$Sieve_Error}
 	<br>
-	{t}Possibly the sieve account was not created yet.{/t}
+	{t}Possibly the sieve account has not been created yet.{/t}
 	<br>
 	<br>
 {/if}
 	{t}Be careful. All your changes will be saved directly to sieve, if you use the save button below.{/t}
 -->
-	<br>
-	<input type='submit' name='create_new_script' value='{t}Create new script{/t}'>
 	{$List}
-	<p style="text-align:right">
+	<input type='submit' name='create_new_script' value='{t}Create new script{/t}'>
+	<p style="text-align:right;border-top:1px solid #999; padding-top:10px;">
 		<input type=submit name="sieve_finish" style="width:80px" value="{t}Ok{/t}">
 		&nbsp;
 		<input type=submit name="sieve_cancel" value="{t}Cancel{/t}">
diff --git a/include/sieve/templates/object_container.tpl b/include/sieve/templates/object_container.tpl
index 7662b67f7..6de06f7d1 100644
--- a/include/sieve/templates/object_container.tpl
+++ b/include/sieve/templates/object_container.tpl
@@ -7,15 +7,15 @@
 			<input type='image' src='images/sieve_move_object_up.png' name='Move_Up_Object_{$ID}' 
 				title='{t}Move this object one position up{/t}' alt='{t}Up{/t}' class='center'>
 			<a href='{$plug}&amp;Move_Up_Object_ID={$ID}'>{t}Move up{/t}</a>
-
+			&nbsp;&nbsp;&nbsp;
 			<input type='image' src='images/sieve_move_object_down.png' name='Move_Down_Object_{$ID}' 
 				title='{t}Move this object one position down{/t}' alt='{t}Down{/t}' class='center'>
 			<a href='{$plug}&amp;Move_Down_Object_ID={$ID}'>{t}Move down{/t}</a>
-
+			&nbsp;&nbsp;&nbsp;
 			<input type='image' src='images/sieve_del_object.png' name='Remove_Object_{$ID}' 
 				title='{t}Remove this object{/t}' alt='R' class='center'>
 			<a href='{$plug}&amp;Remove_Object_ID={$ID}'>{t}Remove this element{/t}</a>
-
+			&nbsp;&nbsp;&nbsp;
 	
 			<select name='element_type_{$ID}'>
 				<option value=''>&nbsp;</option>
-- 
2.30.2