Code

Updated styles
authorhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 20 Mar 2007 11:34:14 +0000 (11:34 +0000)
committerhickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Tue, 20 Mar 2007 11:34:14 +0000 (11:34 +0000)
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@5836 594d385d-05f5-0310-b6e9-bd551577e9d8

html/themes/default/style.css
include/sieve/class_sieveElement_Require.inc
include/sieve/templates/block_indent_start.tpl [new file with mode: 0644]
include/sieve/templates/block_indent_stop.tpl [new file with mode: 0644]
include/sieve/templates/edit_frame_base.tpl
include/sieve/templates/element_comment.tpl
include/sieve/templates/element_fileinto.tpl
include/sieve/templates/element_require.tpl
include/sieve/templates/object_container.tpl
include/sieve/templates/object_test_container.tpl

index d9bc643b387a1b0bf1d7c0d93ca62c5e8773a30a..a9bcbc647e94b02b8155d4ffc5e17db70e0a6c39 100644 (file)
@@ -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;
+}
+
+
+
+
+
+
+
+
+
+
index fac16e2969e38c12667bae0b95dc9b7ec72eab89..ee7f12a2d66f59d2ae050a0b814f5c48f0d9ecca 100644 (file)
@@ -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 (file)
index 0000000..017a104
--- /dev/null
@@ -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 (file)
index 0000000..470449e
--- /dev/null
@@ -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>
index 67c47b4af2255d03ffe0659e593f21c30499676b..83d62a0261120a3b1b9ad2532220e3850aca50df 100644 (file)
@@ -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}">
                </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>
index c08743922f28b35c9f9404fc354dc17e62bfba8f..5baf64e8e357a05a906ebb949fd82699ec0d574b 100644 (file)
@@ -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>
index 977fa37b90b8cdf3f97a528a184ef780684ceb53..65db0481f89bb4d11bf229ca702ed61d10ff8e40 100644 (file)
@@ -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}
                </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>
index b6561615fdfecfa8e76bc94553eeb015f922de78..3a3f261f3244e0968f4c25c353586e3a5f95c25a 100644 (file)
@@ -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>
 
        </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}
-
index 2cb8227851cf5a94b7ecc2c55c98db0d066f5869..71b68806a671793cba1932155f5c2345307bd7ba 100644 (file)
@@ -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%%
index 83e11183cf9b43f6811f40177cda501fde3af2f6..8ec4fd668e3a0f0af819efe849b5f37ba98dcc44 100644 (file)
@@ -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'>