From d3fda96803c4a982acec3044a9b603425928395e Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 20 Mar 2007 11:34:14 +0000
Subject: [PATCH] Updated styles

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5836 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 html/themes/default/style.css                 | 169 ++++++++++++++++++
 include/sieve/class_sieveElement_Require.inc  |   4 +
 .../sieve/templates/block_indent_start.tpl    |  13 ++
 include/sieve/templates/block_indent_stop.tpl |  12 ++
 include/sieve/templates/edit_frame_base.tpl   |  18 +-
 include/sieve/templates/element_comment.tpl   |   4 +-
 include/sieve/templates/element_fileinto.tpl  |  18 +-
 include/sieve/templates/element_require.tpl   |  23 +--
 include/sieve/templates/object_container.tpl  |   9 +-
 .../sieve/templates/object_test_container.tpl |   4 +-
 10 files changed, 227 insertions(+), 47 deletions(-)
 create mode 100644 include/sieve/templates/block_indent_start.tpl
 create mode 100644 include/sieve/templates/block_indent_stop.tpl

diff --git a/html/themes/default/style.css b/html/themes/default/style.css
index d9bc643b3..a9bcbc647 100644
--- a/html/themes/default/style.css
+++ b/html/themes/default/style.css
@@ -1067,3 +1067,172 @@ ul.step4_container, div.step4_container {
 	margin-right:2px;
 	float:left;
 }
+
+
+
+
+
+
+
+
+/************************
+ * Sieve 
+ *  The following styles are 
+ *  used to display the sieve 
+ *  management user interface  
+ ************************/
+
+/* Editing dialog styles 
+ */
+
+table.sieve_default_table {
+	width:100%;
+	margin: 0px;
+	border-spacing: 0px ;
+	padding:0px;
+}
+
+
+/* Editing surface */
+table.editing_surface {
+	width:100%;
+	margin: 0px;
+	padding:0px;
+}
+
+/* Editing surface menu */
+td.editing_surface_menu {
+	background-color: #CCCCCC; 
+	border: 1px solid #AAAAAA;
+	padding:5px;
+}
+
+/* Editing surface content */
+td.editing_surface_content {
+	background-color: #FFFFFF; 
+	margin: 0px;
+	padding:0px;
+}
+
+/* Error message will be displayed as follows */
+div.sieve_error_msgs { 
+	background-color: #ff8d00;
+	color: #000000;
+	padding:5px;
+	background-image: url("images/warning.png"); 
+	background-repeat: no-repeat;     
+	font-weight: bold;
+}
+
+/* Source editing area */
+textarea.editing_source {
+	width:100%;
+	height:330px;
+}
+
+
+/*************
+ * Object container  
+ *************/
+
+/* The container itself */
+table.object_container_container { 
+	width:100%;
+	border-spacing: 0px ;
+	background-color:#EEEEEE;
+	border: solid 1px #AAAAAA;
+}
+
+/* Container cell top left */
+td.object_container_cell_top_left {
+	background-color: #DDDDDD; 
+	text-align:center; 
+}
+
+/* Container cell top right */
+td.object_container_cell_top_right {
+	background-color: #DDDDDD; 
+	text-align:left; 
+	padding:2px;  
+	border-bottom: solid 1px #AAAAAA;
+}
+
+/* Container cell bottom left */
+td.object_container_cell_bottom_left {
+	width:5px; 
+	background-color: #DDDDDD; 
+	text-align:center; 
+	border-right: solid 1px #AAAAAA;
+}
+
+
+/*************
+ * Sieve comment 
+ *************/
+
+/* Container */
+table.sieve_comment_container {
+	margin:0px;
+	padding:0px;
+	border-spacing: 0px ;
+	width:100%;
+	background-color: #EEEEEE;
+}
+
+/* Editing area */
+textarea.sieve_comment_area {
+	width:100%;
+	height:80px;
+}
+
+
+/*************
+ * Sieve require 
+ *************/
+
+/* Container */
+table.sieve_require_container {
+	margin:0px;
+	padding:0px;
+	border-spacing: 0px ;
+	width:100%;
+	background-color: #EEEEEE;
+}
+
+/* Editing area */
+input.sieve_require_input {
+	width:100%;
+	border-spacing: 0px ;
+}
+
+
+/*************
+ * Sieve fileinto 
+ *************/
+
+/* Container */
+table.sieve_fileinto_container {
+	margin:0px;
+	padding:0px;
+	border-spacing: 0px ;
+	width:100%;
+	background-color: #EEEEEE;
+}
+
+/* Editing area */
+input.sieve_fileinto_input {
+	width:300px;
+}
+select.sieve_fileinto_input {
+	width:300px;
+}
+
+
+
+
+
+
+
+
+
+
diff --git a/include/sieve/class_sieveElement_Require.inc b/include/sieve/class_sieveElement_Require.inc
index fac16e296..ee7f12a2d 100644
--- a/include/sieve/class_sieveElement_Require.inc
+++ b/include/sieve/class_sieveElement_Require.inc
@@ -68,8 +68,12 @@ class sieve_require
 
   function get_sieve_script_part()
   {
+    if(count($this->data)){
     $tmp = sieve_create_strings($this->data);
     return("require ".$tmp.";\n");
+    }else{
+      return("");
+    }
   } 
     
   function execute()
diff --git a/include/sieve/templates/block_indent_start.tpl b/include/sieve/templates/block_indent_start.tpl
new file mode 100644
index 000000000..017a104c0
--- /dev/null
+++ b/include/sieve/templates/block_indent_start.tpl
@@ -0,0 +1,13 @@
+<table style='width:100%; padding:4px;'>
+	<tr>
+		<td>
+			<table cellspacing=0 cellpadding=0 style="width:100%">
+				<tr>
+					<td style='height:4px; background-color: #999999;'>
+					</td>
+					<td style='height:4px; background-color: #999999; border-bottom: 1px solid #EEEEEE'>
+					</td>
+				</tr>
+				<tr>
+					<td style='width:4px; background-color: #999999; border-right: 1px solid #EEEEEE'>
+					<td>
diff --git a/include/sieve/templates/block_indent_stop.tpl b/include/sieve/templates/block_indent_stop.tpl
new file mode 100644
index 000000000..470449e21
--- /dev/null
+++ b/include/sieve/templates/block_indent_stop.tpl
@@ -0,0 +1,12 @@
+					</td>
+				</tr>
+				<tr>
+					<td style='height:4px; background-color: #999999;'>
+					</td>
+					<td style='height:4px; background-color: #999999; border-top: 1px solid #EEEEEE'>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+</table>
diff --git a/include/sieve/templates/edit_frame_base.tpl b/include/sieve/templates/edit_frame_base.tpl
index 67c47b4af..83d62a026 100644
--- a/include/sieve/templates/edit_frame_base.tpl
+++ b/include/sieve/templates/edit_frame_base.tpl
@@ -1,7 +1,7 @@
 
-<table style='width:100%;' cellspacing=0 cellpadding=0>
+<table class='editing_surface'>
 	<tr>
-		<td style='background-color: #DDDDDD; padding:5px;'>
+		<td class='editing_surface_menu'>
 			
 			<input type='submit' name='Save_Copy' value="{t}Export{/t}">
 			<input type='submit' name='Import_Script' value="{t}Import{/t}">
@@ -17,23 +17,19 @@
 		</td>
 	</tr>
 	<tr>
-		<td style='background-color: #FFFFFF; border: solid 2px #CCCCCC; '>
+		<td class='editing_surface_content'>
 
 			{if $Script_Error != ""}
-			<table style='width:100%;' cellspacing=0 cellpadding=0>	
-				<tr>	
-					<td style='background-color: orange;padding:5px;'>
-						<b>{$Script_Error}</b>
-					</td>
-				</tr>
-			</table>
+						<div  class='sieve_error_msgs'>
+							{$Script_Error}
+						</div>
 			{/if}
 
 
 			{if $Mode == "Structured"}
 				{$Contents}
 			{else}
-				<textarea name='script_contents' style='width:100%;height:350px;'>{$Contents}</textarea>
+				<textarea class='editing_source' name='script_contents'>{$Contents}</textarea>
 			{/if}
 
 		</td>
diff --git a/include/sieve/templates/element_comment.tpl b/include/sieve/templates/element_comment.tpl
index c08743922..5baf64e8e 100644
--- a/include/sieve/templates/element_comment.tpl
+++ b/include/sieve/templates/element_comment.tpl
@@ -1,4 +1,4 @@
-<table cellspacing=0 style='width:100%;background-color:d8d8ff;'>
+<table class='sieve_comment_container'> 
 	<tr>
 		<td>
 			<b>{t}Comment{/t}</b>
@@ -16,7 +16,7 @@
 		{if $Small}
 			{$Comment}
 		{else}
-			<textarea  name='comment_{$ID}' style='width:100%;height:80px'>{$Comment}</textarea>
+			<textarea  name='comment_{$ID}' class='sieve_comment_area'>{$Comment}</textarea>
 		{/if}
 		</td>
 	</tr>
diff --git a/include/sieve/templates/element_fileinto.tpl b/include/sieve/templates/element_fileinto.tpl
index 977fa37b9..65db0481f 100644
--- a/include/sieve/templates/element_fileinto.tpl
+++ b/include/sieve/templates/element_fileinto.tpl
@@ -1,7 +1,7 @@
-<table cellspacing=0 width='100%' style='width:100%;background-color: #d8e1f2; '>
+<table class='sieve_fileinto_container'>
 	<tr>
-		<td>
-			{t}Move mail into folder{/t}
+		<td colspan=2>
+			<b>{t}Move mail into folder{/t}</b>
 		</td>
 		<td style='text-align:right;'>
 			{if $User_Mode}
@@ -12,15 +12,19 @@
 		</td>
 	</tr>
 	<tr>
-		<td colspan=2>
-			<b>{t}Folder{/t}</b>
+		<td style='width:20px;'>
+		</td>
+		<td>
+			{t}Folder{/t}
 			{if $User_Mode}
-				<input type='text' value='{$Selected}' name='fileinto_{$ID}' style='width:300px;'>
+				<input class='sieve_fileinto_input' type='text' value='{$Selected}' name='fileinto_{$ID}'>
 			{else}
-				<select name='fileinto_{$ID}'>
+				<select name='fileinto_{$ID}' class='sieve_fileinto_input'>
 					{html_options values=$Boxes output=$Boxes selected=$Selected}
 				</select>
 			{/if}
 		</td>
+		<td >
+		</td>
 	</tr>
 </table>
diff --git a/include/sieve/templates/element_require.tpl b/include/sieve/templates/element_require.tpl
index b6561615f..3a3f261f3 100644
--- a/include/sieve/templates/element_require.tpl
+++ b/include/sieve/templates/element_require.tpl
@@ -1,18 +1,8 @@
-{if $LastErrorCnt != 0}
-    <table style='width:100%;'>
-        <tr>
-            <td style='width:40px; background-color: #FF0000; text-align:center; border: dotted 3px #ff7c1c'>
-                <img src='images/warning.png' alt='{t}Error{/t}'>
-            </td>
-            <td>
-{/if}
-
-<table cellspacing=0 style='width:100%;background-color:#e4ffc9;'>
-	
+<table class='sieve_require_container'>
 	{foreach from=$LastError item=val key=key}
 		<tr>
 			<td colspan=4>
-				<font color='red'><b>{$LastError[$key]}</b></font>
+				<div class='sieve_error_msgs'>{$LastError[$key]}</div>
 			</td>
 		</tr>
 
@@ -24,15 +14,8 @@
 	</tr>
 	<tr>
 		<td style='padding-left:20px;;'>
-			<input type='text'  name='require_{$ID}' style='width:100%' value='{$Require}'>
+			<input type='text'  name='require_{$ID}' class='sieve_require_input' value='{$Require}'>
 		</td>
 	</tr>
 </table>
 
-{if $LastErrorCnt != 0}
-
-            </td>
-        </tr>
-    </table>
-{/if}
-
diff --git a/include/sieve/templates/object_container.tpl b/include/sieve/templates/object_container.tpl
index 2cb822785..71b68806a 100644
--- a/include/sieve/templates/object_container.tpl
+++ b/include/sieve/templates/object_container.tpl
@@ -1,10 +1,9 @@
-<table cellspacing=0 style='width:100%;background-color:#EEEEEE;border: solid 1px #AAAAAA;'>
+<table class='object_container_container'> 
 	<tr>
-		<td  style='background-color: #CCCCCC; text-align:center; '>
+		<td class='object_container_cell_top_left'>
 			&nbsp;	
 		</td>
-		<td  style='background-color: #CCCCCC; text-align:left; padding:2px;  border-bottom: solid 1px #AAAAAA;'>
-
+		<td class='object_container_cell_top_right'>
 			<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'>
 			{t}Move down{/t}
@@ -23,7 +22,7 @@
 		</td>
 	</tr>
 	<tr>
-		<td style='width:5px; background-color: #CCCCCC; text-align:center; border-right: solid 1px #AAAAAA;'>	
+		<td class='object_container_cell_bottom_left'>
 		</td>
 		<td>
 			%%OBJECT_CONTENT%%
diff --git a/include/sieve/templates/object_test_container.tpl b/include/sieve/templates/object_test_container.tpl
index 83e11183c..8ec4fd668 100644
--- a/include/sieve/templates/object_test_container.tpl
+++ b/include/sieve/templates/object_test_container.tpl
@@ -1,6 +1,6 @@
-<table cellspacing=0 style='width:100%;background-color:#EEEEEE;border: solid 1px #BBB;346575;'>
+<table cellspacing=0 style='width:100%;background-color:#EEEEEE;border: solid 1px #BBB;'>
 	<tr>
-		<td style='width:20px; background-color: #235464; text-align:center;'>	
+		<td style='width:20px; ; text-align:center;'>	
 			{if $DisplayAdd}
 				<input type='image' src='images/sieve_add_test.png' name='Add_Test_Object_{$ID}' 
 					title='{t}Add this object{/t}' alt='R' class='center'>
-- 
2.30.2