![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5f681c4)
raw | patch | inline | side by side (parent: 5f681c4)
| author | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 8 Apr 2010 09:20:13 +0000 (09:20 +0000) | ||
| committer | hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 8 Apr 2010 09:20:13 +0000 (09:20 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@17542 594d385d-05f5-0310-b6e9-bd551577e9d8
27 files changed:
diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieveElement_If.inc
index 19dc0fb4fcde584ec4c4e06c3919127203454c1f..f0802aefd050d54c23b35b65b1035e13f8b7f229 100644 (file)
$element_id = $this->object_id."_".$id."_".$obj_id;
foreach($_POST as $name => $value){
- if(preg_match("/Remove_Test_Object_".$element_id."_(x|y)/",$name)) {
+ if(preg_match("/Remove_Test_Object_".$element_id."/",$name)) {
return(false);
}
}
diff --git a/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc b/gosa-plugins/mail/personal/mail/sieve/class_sieveManagement.inc
index c4455b2a8a276b813f6000bac20620a11be84131..1c1da4e2f8b73cadc0c4c0aadad6cdc2c02d3306 100644 (file)
foreach($_POST as $name => $value){
if(preg_match("/^Add_Test_Object_/",$name)) {
$name = preg_replace("/^Add_Test_Object_/","",$name);
- $name = preg_replace("/_(x|y)$/","",$name);
$test_types_to_add = array(
"address" =>_("Address"),
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/block_indent_start.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/block_indent_start.tpl
index b6df92bb9320a0a2d588e804329eecacdd5812d7..c2b45678e45bcd919554f53cfc5910ec746de631 100644 (file)
-<table class='object_container_container' summary="{t}Sieve element{/t}">
+<table width='100%' class='object_container_container' summary="{t}Sieve element{/t}">
<tr>
<td class='object_container_cell_top_left'>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/edit_frame_base.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/edit_frame_base.tpl
index 7aed3c13ed0fdcbbe977b0172e7fd3f8379354b9..44a306410f5c200422b9b911f2ec2b2361854f95 100644 (file)
-<table class='editing_surface' summary="{t}Sieve editor{/t}" width="100%">
+<table width='100%' class='editing_surface' summary="{t}Sieve editor{/t}">
<tr>
<td class='editing_surface_menu'>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_address.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_address.tpl
index 621cb1f01d85ccf3054bacdda9935097f4220864..645d48f5323fd0418a9d25c1a13a9c6218a12c31 100644 (file)
{if $Expert}
{if $LastError != ""}
- <table class='sieve_test_case' summary="{t}Sieve element{/t}">
+ <table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
<tr>
<td colspan=2>
<font color='red'><b>{$LastError}</b></font>
</table>
{/if}
-<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
<tr>
<td >
<b>{t}Address{/t}</b>
</td>
- <td style='text-align:right; vertical-align:top;'>
- <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
+ <td style='text-align:right; '>
+
+ <button type='submit' name='Toggle_Expert_{$ID}'>{t}Normal view{/t}</button>
+
</td>
</tr>
</table>
-<table summary="{t}Sieve element{/t}">
+<table width='100%' summary="{t}Sieve element{/t}">
<tr>
<td >
{t}Match type{/t}
</td>
<td>
- <select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+ <select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
{html_options options=$match_types selected=$match_type}
</select>
</td>
<td>
{if $Inverse}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}Yes{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}'>{t}Yes{/t}</button>
+
{else}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}No{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}'>{t}No{/t}</button>
+
{/if}
</td>
</tr>
{t}Part of address that should be used{/t}
</td>
<td>
- <select name='address_part_{$ID}' title='{t}Boolean value{/t}'>
+ <select name='address_part_{$ID}' title='{t}Boolean value{/t}' size=1>
{html_options options=$address_parts selected=$address_part}
</select>
</td>
{t}Comparator{/t}
</td>
<td>
- <select name='comparator_{$ID}' title='{t}Boolean value{/t}'>
+ <select name='comparator_{$ID}' title='{t}Boolean value{/t}' size=1>
{html_options options=$comparators selected=$comparator}
</select>
</td>
{t}Operator{/t}
</td>
<td>
- <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+ <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
{html_options options=$operators selected=$operator}
</select>
</td>
{else}
{if $LastError != ""}
- <table class='sieve_test_case' summary="{t}Sieve element{/t}">
+ <table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
<tr>
<td colspan=2>
<font color='red'><b>{$LastError}</b></font>
</table>
{/if}
-<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
<tr>
{if $match_type == ":count" || $match_type == ":value"}
- <td style='vertical-align:top; width:350px;'>
+ <td style='width:350px;'>
+
{else}
- <td style='vertical-align:top; width:200px;'>
+ <td style='width:200px;'>
+
{/if}
<b>{t}Address{/t}</b>
{if $Inverse}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}'>{t}Not{/t}</button>
+
{else}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}'>{t}-{/t}</button>
+
{/if}
- <select onChange='document.mainform.submit();' name='matchtype_{$ID}' title='{t}Boolean value{/t}'>
+ <select onChange='document.mainform.submit();' name='matchtype_{$ID}' title='{t}Boolean value{/t}' size=1>
{html_options options=$match_types selected=$match_type}
</select>
{if $match_type == ":count" || $match_type == ":value"}
- <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+ <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
{html_options options=$operators selected=$operator}
</select>
{/if}
<td>
<textarea style='width:100%;height:40px;' name='values_{$ID}'>{$values}</textarea>
</td>
- <td style='text-align:right; vertical-align:top; width:120px;'>
- <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
+ <td style='text-align:right; width:120px;'>
+
+ <button type='submit' name='Toggle_Expert_{$ID}'>{t}Expert view{/t}</button>
+
</td>
</tr>
</table>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_allof.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_allof.tpl
index 2620f818218bf872fe6ceb3655a6d791d0636581..c23bb27045a51da49e9c161c3bafdead10c01544 100644 (file)
-<table class='sieve_allof_container' summary="{t}Sieve filter{/t}">
+<table width='100%' class='sieve_allof_container' summary="{t}Sieve filter{/t}">
<tr>
<td class='sieve_allof_left'>
{if $Inverse}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}' title='{t}Inverse match{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}Not{/t}</button>
+
{else}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}' title='{t}Inverse match{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}-{/t}</button>
+
{/if}
<br>
<b>{t}All of{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_anyof.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_anyof.tpl
index a2b977c56b5692d5333ed9f23f9bbb0ef52a5877..cf4e9ee4951428012055147408cb806373ddd582 100644 (file)
-<table class='sieve_anyof_container' summary="{t}Sieve filter{/t}">
+<table width='100%' class='sieve_anyof_container' summary="{t}Sieve filter{/t}">
<tr>
<td class='sieve_anyof_left'>
{if $Inverse}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}' title='{t}Inverse match{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}Not{/t}</button>
+
{else}
- <input type='submit' name='toggle_inverse_{$ID}' value='-' title='{t}Inverse match{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">-</button>
+
{/if}
<br>
<b>{t}Any of{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_boolean.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_boolean.tpl
index c457b00c6c3231ace9f9c95ef793e4cf34f91eee..d2a819a18e7271e645fabd2bdb7b0a759f54d918 100644 (file)
-<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
<tr>
<td>
<b>{t}Bool{/t}</b>
- <select name='boolean_{$ID}' title='{t}Boolean value{/t}'>
+ <select name='boolean_{$ID}' title='{t}Boolean value{/t}' size=1>
{html_options options=$values selected=$selected}
</select>
- <input type='submit' value='{t}update{/t}'>
+ <button type='submit' name=''>{t}update{/t}</button>
+
<br>
</td>
</tr>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_comment.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_comment.tpl
index 20e5846778e5e0b200cd35f43ff002e53e057631..a886ffb18ed50552ba5e48a1c72c880e8e2ab980 100644 (file)
-<table class='sieve_comment_container' summary="{t}Sieve comment{/t}">
+<table width='100%' class='sieve_comment_container' summary="{t}Sieve comment{/t}">
<tr>
<td>
<b>{t}Comment{/t}</b>
</td>
<td style='text-align: right;'>
{if $Small}
- <input type='submit' name='toggle_small_{$ID}' value='{t}Edit{/t}'>
+ <button type='submit' name='toggle_small_{$ID}'>{t}Edit{/t}</button>
+
{else}
- <input type='submit' name='toggle_small_{$ID}' value='{msgPool type=cancelButton}'>
+ <button type='submit' name='toggle_small_{$ID}'>{msgPool type=cancelButton}</button>
+
{/if}
</td>
</tr>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_discard.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_discard.tpl
index b9d09dad3a9d060d672af8cd8121ef9f74e0eb5b..062d59bbe2f179cdab2d10b27005e4e0b2b258a8 100644 (file)
-<table class='sieve_discard_container' summary="{t}Sieve element discard{/t}">
+<table width='100%' class='sieve_discard_container' summary="{t}Sieve element discard{/t}">
<tr>
<td>
<b>{t}Discard{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_else.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_else.tpl
index 988f6f69e0bd29ae662ce9ba282acff6c62a1455..75ca6529655095e9d00b462a20163926efc17665 100644 (file)
-<table class='sieve_default_table' summary="{t}Sieve envelope{/t}">
+<table width='100%' class='sieve_default_table' summary="{t}Sieve envelope{/t}">
<tr>
<td>
<b>{t}Else{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_elsif.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_elsif.tpl
index 04de874a6cb41cba212ff48242b23c43869b0449..8c7020cb2f579212cea6452a33cca0574ddff450 100644 (file)
-<table class='sieve_default_table' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_default_table' summary="{t}Sieve element{/t}">
<tr>
<td>
<b>{t}Else If{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_envelope.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_envelope.tpl
index 4cbb63d47ad59d50887ac19c620a26b5ce17d75c..2cfedc0aa87b81de13581f034ca7c9adcfd2a722 100644 (file)
{if $Expert}
{if $LastError != ""}
- <table class='sieve_test_case' summary="{t}Sieve envelope{/t}">
+ <table width='100%' class='sieve_test_case' summary="{t}Sieve envelope{/t}">
<tr>
<td colspan=2>
<font color='red'><b>{$LastError}</b></font>
</table>
{/if}
-<table class='sieve_test_case' summary="{t}Sieve envelope{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve envelope{/t}">
<tr>
<td style='width:50%;'>
<b>{t}Envelope{/t}</b>
</td>
- <td style='text-align:right; vertical-align:top;'>
- <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
+ <td style='text-align:right; '>
+
+ <button type='submit' name='Toggle_Expert_{$ID}'>{t}Normal view{/t}</button>
+
</td>
</tr>
</table>
-<table summary="{t}Sieve element{/t}">
+<table width='100%' summary="{t}Sieve element{/t}">
<tr>
<td style='width:50%;'>
{t}Match type{/t}
</td>
<td>
- <select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+ <select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
{html_options options=$match_types selected=$match_type}
</select>
</td>
<td>
{if $Inverse}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}Yes{/t}' title='{t}Inverse match{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}Yes{/t}</button>
+
{else}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}No{/t}' title='{t}Inverse match{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}No{/t}</button>
+
{/if}
</td>
</tr>
{t}Comparator{/t}
</td>
<td>
- <select name='comparator_{$ID}' title='{t}Boolean value{/t}'>
+ <select name='comparator_{$ID}' title='{t}Boolean value{/t}' size=1>
{html_options options=$comparators selected=$comparator}
</select>
</td>
{t}Operator{/t}
</td>
<td>
- <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+ <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
{html_options options=$operators selected=$operator}
</select>
</td>
{else}
{if $LastError != ""}
- <table class='sieve_test_case' summary="{t}Sieve envelope{/t}">
+ <table width='100%' class='sieve_test_case' summary="{t}Sieve envelope{/t}">
<tr>
<td colspan=4>
<font color='red'><b>{$LastError}</b></font>
</tr>
</table>
{/if}
-<table class='sieve_test_case' summary="{t}Sieve envelope{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve envelope{/t}">
<tr>
{if $match_type == ":count" || $match_type == ":value"}
- <td style='vertical-align:top; width:350px;'>
+ <td style='width:350px;'>
+
{else}
- <td style='vertical-align:top; width:200px;'>
+ <td style='width:200px;'>
+
{/if}
<b>{t}Envelope{/t}</b>
{if $Inverse}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}'>{t}Not{/t}</button>
+
{else}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}'>{t}-{/t}</button>
+
{/if}
- <select onChange='document.mainform.submit();' name='matchtype_{$ID}' title='{t}Boolean value{/t}'>
+ <select onChange='document.mainform.submit();' name='matchtype_{$ID}' title='{t}Boolean value{/t}' size=1>
{html_options options=$match_types selected=$match_type}
</select>
{if $match_type == ":count" || $match_type == ":value"}
- <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+ <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
{html_options options=$operators selected=$operator}
</select>
{/if}
<td>
<textarea style='width:100%;height:40px;' name='values_{$ID}'>{$values}</textarea>
</td>
- <td style='text-align:right; vertical-align:top; width:120px;'>
- <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
+ <td style='text-align:right; width:120px;'>
+
+ <button type='submit' name='Toggle_Expert_{$ID}'>{t}Expert view{/t}</button>
+
</td>
</tr>
</table>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_exists.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_exists.tpl
index 69267b8260cd549b9450b6b53d302b593e16e65f..183ee90697387d1419eda267b7be1c426d1aafdd 100644 (file)
-<table class='sieve_test_case' summary="{t}Sieve filter{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve filter{/t}">
<tr>
- <td style='vertical-align:top; width:200px;'>
+ <td style='width:200px;'>
+
{if $LastError != ""}
<font color='red'>{$LastError}</font>
<br>
{/if}
<b>{t}Exists{/t}</b>
{if $Inverse}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}' title='{t}Inverse match{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}Not{/t}</button>
+
{else}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}' title='{t}Inverse match{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}-{/t}</button>
+
{/if}
</td>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_fileinto.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_fileinto.tpl
index 80824606426f47c13dfdc975b12654dc4eb0c55d..20bb61d63d97d35532e5834154eb998a7f3a3c36 100644 (file)
-<table class='sieve_fileinto_container' summary="{t}Sieve: File into{/t}">
+<table width='100%' class='sieve_fileinto_container' summary="{t}Sieve: File into{/t}">
<tr>
<td colspan=2>
<b>{t}Move mail into folder{/t}</b>
</td>
<td style='text-align:right;'>
{if $User_Mode}
- <input type='submit' name='user_mode_{$ID}' value='{t}Select from list{/t}'>
+ <button type='submit' name='user_mode_{$ID}'>{t}Select from list{/t}</button>
{else}
- <input type='submit' name='user_mode_{$ID}' value='{t}Manual selection{/t}'>
+ <button type='submit' name='user_mode_{$ID}'>{t}Manual selection{/t}</button>
+
{/if}
</td>
</tr>
{if $User_Mode}
<input class='sieve_fileinto_input' type='text' value="{$Selected}" name='fileinto_{$ID}'>
{else}
- <select name='fileinto_{$ID}' class='sieve_fileinto_input'>
+ <select name='fileinto_{$ID}' class='sieve_fileinto_input' size=1>
{html_options values=$Boxes output=$Boxes selected=$Selected}
</select>
{/if}
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_header.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_header.tpl
index 79a664c823692c36691f39c21b78c37836ddd98c..ff184c9da0d16031adf39db50b62a5bba7c9f114 100644 (file)
{if $Expert}
{if $LastError != ""}
- <table class='sieve_test_case' summary="{t}Sieve header{/t}">
+ <table width='100%' class='sieve_test_case' summary="{t}Sieve header{/t}">
<tr>
<td colspan=4>
<font color='red'><b>{$LastError}</b></font>
{/if}
-<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
<tr>
<td>
<b>{t}Header{/t}</b>
</td>
- <td style='text-align:right; vertical-align:top;'>
- <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
+ <td style='text-align:right; '>
+
+ <button type='submit' name='Toggle_Expert_{$ID}'>{t}Normal view{/t}</button>
+
</td>
</tr>
</table>
-<table summary="{t}Sieve element{/t}">
+<table width='100%' summary="{t}Sieve element{/t}">
<tr>
<td>
{t}Match type{/t}
</td>
<td>
- <select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+ <select name='matchtype_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
{html_options options=$match_types selected=$match_type}
</select>
</td>
<td>
{if $Inverse}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}Yes{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}'>{t}Yes{/t}</button>
+
{else}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}No{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}'>{t}No{/t}</button>
+
{/if}
</td>
</tr>
{t}Comparator{/t}
</td>
<td>
- <select name='comparator_{$ID}' title='{t}Boolean value{/t}'>
+ <select name='comparator_{$ID}' title='{t}Boolean value{/t}' size=1>
{html_options options=$comparators selected=$comparator}
</select>
</td>
{t}operator{/t}
</td>
<td>
- <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+ <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
{html_options options=$operators selected=$operator}
</select>
</td>
<td colspan=2> </td>
</tr>
</table>
- <table class='sieve_test_case' summary="{t}Sieve element{/t}">
+ <table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
<tr>
<td >
{t}Address fields to include{/t}<br>
{else}
{if $LastError != ""}
- <table class='sieve_test_case' summary="{t}Sieve element{/t}">
+ <table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
<tr>
<td colspan=4>
<font color='red'><b>{$LastError}</b></font>
{/if}
-<table class='sieve_test_case' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve element{/t}">
<tr>
{if $match_type == ":count" || $match_type == ":value"}
- <td style='vertical-align:top; width:350px;'>
+ <td style='width:350px;'>
+
{else}
- <td style='vertical-align:top; width:200px;'>
+ <td style='width:200px;'>
+
{/if}
<b>{t}Header{/t}</b>
{if $Inverse}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}'>{t}Not{/t}</button>
+
{else}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}'>{t}-{/t}</button>
+
{/if}
- <select onChange='document.mainform.submit();' name='matchtype_{$ID}' title='{t}Boolean value{/t}'>
+ <select onChange='document.mainform.submit();' name='matchtype_{$ID}' title='{t}Boolean value{/t}' size=1>
{html_options options=$match_types selected=$match_type}
</select>
{if $match_type == ":count" || $match_type == ":value"}
- <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();'>
+ <select name='operator_{$ID}' title='{t}Boolean value{/t}' onChange='document.mainform.submit();' size=1>
{html_options options=$operators selected=$operator}
</select>
{/if}
<td>
<textarea style='width:100%;height:40px;' name='values_{$ID}'>{$values}</textarea>
</td>
- <td style='text-align:right; vertical-align:top; width:120px;'>
- <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
+ <td style='text-align:right; width:120px;'>
+
+ <button type='submit' name='Toggle_Expert_{$ID}'>{t}Expert view{/t}</button>
+
</td>
</tr>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_if.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_if.tpl
index a9e9e0e458dfe3973dd755387807132ffa7c00aa..0b294427a5cb938a01913737759ce3bcf6fb327f 100644 (file)
-<table class='sieve_default_table' summary="{t}Sieve filter{/t}">
+<table width='100%' class='sieve_default_table' summary="{t}Sieve filter{/t}">
<tr>
<td>
<b>{t}Condition{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_keep.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_keep.tpl
index 1dfc36d4fee4815ebd8662137b2922ce35710923..4631555e818ffbe0cb879ef690fc77fcff8c58cc 100644 (file)
-<table class='sieve_keep_container' summary="{t}Sieve element keep{/t}">
+<table width='100%' class='sieve_keep_container' summary="{t}Sieve element keep{/t}">
<tr>
<td>
<b>{t}Keep{/t}</b>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_redirect.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_redirect.tpl
index 4df479ae14d066f9116fb6d33014d2dd150dabcb..84a1d0ce0b1991bde2140338175c835c49350a4c 100644 (file)
-<table class='sieve_redirect_container' summary="{t}Sieve element redirect{/t}">
+<table width='100%' class='sieve_redirect_container' summary="{t}Sieve element redirect{/t}">
{foreach from=$LastError item=val key=key}
<tr>
<td colspan=4>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_reject.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_reject.tpl
index 20186d56a479c86570374f2b080ec0bb5fe6b7ee..8c17b295cc8cc7763b2b3e459caef6bc31711282 100644 (file)
-<table class='sieve_reject_container' summary="{t}Sieve: reject{/t}">
+<table width='100%' class='sieve_reject_container' summary="{t}Sieve: reject{/t}">
{foreach from=$LastError item=val key=key}
<tr>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_require.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_require.tpl
index 57d532bd22206489da77d78cb242e742117f7a37..8fb58595cde110a59ee9b5f1d7b7ffe6aeb0e45f 100644 (file)
-<table class='sieve_require_container' summary="{t}Sieve: require{/t}">
+<table width='100%' class='sieve_require_container' summary="{t}Sieve: require{/t}">
{foreach from=$LastError item=val key=key}
<tr>
<td colspan=4>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_size.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_size.tpl
index 6221da6d91c44c76e752bde0ac19e788b69dc50f..b43d162bbba25826835554924881ec4484fffce6 100644 (file)
-<table class='sieve_test_case' summary="{t}Sieve test case: size{/t}">
+<table width='100%' class='sieve_test_case' summary="{t}Sieve test case: size{/t}">
<tr>
<td>
<b>{t}Size{/t}</b>
{/if}
{if $Inverse}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}Not{/t}' title='{t}Inverse match{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}Not{/t}</button>
+
{else}
- <input type='submit' name='toggle_inverse_{$ID}' value='{t}-{/t}' title='{t}Inverse match{/t}'>
+ <button type='submit' name='toggle_inverse_{$ID}' title="{t}Inverse match{/t}">{t}-{/t}</button>
+
{/if}
- <select name='Match_type_{$ID}' title='{t}Select match type{/t}'>
+ <select name='Match_type_{$ID}' title='{t}Select match type{/t}' size=1>
{html_options options=$Match_types selected=$Match_type}
</select>
<input type='text' name='Value_{$ID}' value='{$Value}'>
- <select name='Value_Unit_{$ID}' title='{t}Select value unit{/t}'>
+ <select name='Value_Unit_{$ID}' title='{t}Select value unit{/t}' size=1>
{html_options options=$Units selected=$Value_Unit}
</select>
</td>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_stop.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_stop.tpl
index 2aed603180982f6dd92c49979fe8c829cdb1a0a9..483bcde76334c6fc52d7447073eb6d8a2489038b 100644 (file)
-<table class='sieve_stop_container' summary="{t}Sieve element stop{/t}">
+<table width='100%' class='sieve_stop_container' summary="{t}Sieve element stop{/t}">
<tr>
<td>
<b>{t}Stop{/t}</b><br>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/element_vacation.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/element_vacation.tpl
index 56d869b3bd0df7ee3ec2c995dad8a9d993709110..88cd34af7f33865637996ec35426e5c589102db0 100644 (file)
-<table class='sieve_vacation_container' summary="{t}Sieve element{/t}">
+<table width='100%' class='sieve_vacation_container' summary="{t}Sieve element{/t}">
{foreach from=$LastError item=val key=key}
<tr>
<td style='width:20%'>
<b>{t}Vacation Message{/t}</b>
</td>
- <td style='text-align:right; vertical-align:top;'>
- <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Normal view{/t}'>
+ <td style='text-align:right; '>
+
+ <button type='submit' name='Toggle_Expert_{$ID}'>{t}Normal view{/t}</button>
+
</td>
</tr>
<tr>
<td>
<b>{t}Vacation message{/t}</b>
</td>
- <td width='10%' style='vertical-align:top;'>
- <input type='submit' name='Toggle_Expert_{$ID}' value='{t}Expert view{/t}'>
+ <td>
+
+ <button type='submit' name='Toggle_Expert_{$ID}'>{t}Expert view{/t}</button>
+
</td>
</tr>
<tr>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/object_container.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/object_container.tpl
index 098051fcae49ceaf3315d9703f850c528031b3df..f6d4636031abdbb8f7fdea1e9c0baa75cded424b 100644 (file)
-<table class='object_container_container' summary="{t}Sieve element{/t}">
+<table width='100%' class='object_container_container' summary="{t}Sieve element{/t}">
<tr>
- <td class='object_container_cell_top_left'>
+ <td style='width:20px;background-color: #B8B8B8'>
</td>
- <td style='width:200px;' >
+ <td style='width:200px; background-color: #B8B8B8; vertical-align:middle;' >
{image path='plugins/mail/images/sieve_move_object_up.png'
action="Move_Up_Object_{$ID}" title="{t}Move object up one position{/t}"}
title="{t}Remove object{/t}"}
</td>
- <td>
-
+ <td style=' background-color: #B8B8B8'>
<select name='element_type_{$ID}' size=1>
<option value=''><{t}choose element{/t}></option>
<option value='sieve_keep'>{t}Keep{/t}</option>
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/object_container_clear.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/object_container_clear.tpl
index bb4e660127f289a8a60b40a0deb4c07dc9bc3be6..b633d4512a7c08fc6a26f210b48341f60e55b57a 100644 (file)
-<table class='object_container_container' summary="{t}Sieve element clear{/t}">
+<table width='100%' summary="{t}Sieve element clear{/t}">
<tr>
- <td class='object_container_cell_top_left'>
+ <td style='width:20px; background-color: #B8B8B8; vertical-align:middle;' >
</td>
- <td class='object_container_cell_top_right'>
- <input type='image' src='plugins/mail/images/sieve_move_object_up.png' name='Move_Up_Object_{$ID}'
- title='{t}Move this object up one position{/t}' alt='{t}Up{/t}' class='center'>
- <a href='{$plug}&Move_Up_Object_ID={$ID}'>{t}Move up{/t}</a>
+ <td style='width:200px; background-color: #B8B8B8; vertical-align:middle;' >
+ {image path='plugins/mail/images/sieve_move_object_up.png'
+ action="Move_Up_Object_{$ID}" title="{t}Move object up one position{/t}"}
- <input type='image' src='plugins/mail/images/sieve_move_object_down.png' name='Move_Down_Object_{$ID}'
- title='{t}Move this object down one position{/t}' alt='{t}Down{/t}' class='center'>
- <a href='{$plug}&Move_Down_Object_ID={$ID}'>{t}Move down{/t}</a>
-
- <input type='image' src='plugins/mail/images/sieve_del_object.png' name='Remove_Object_{$ID}'
- title='{t}Remove this object{/t}' alt='R' class='center'>
- <a href='{$plug}&Remove_Object_ID={$ID}'>{t}Remove element{/t}</a>
+ {image path='plugins/mail/images/sieve_move_object_down.png'
+ action="Move_Down_Object_{$ID}" title="{t}Move object down one position{/t}"}
+ {image path='images/lists/trash.png' action="Remove_Object_{$ID}"
+ title="{t}Remove object{/t}"}
</td>
</tr>
<tr>
- <td class='object_container_cell_bottom_left'>
+ <td>
</td>
<td>
%%OBJECT_CONTENT%%
diff --git a/gosa-plugins/mail/personal/mail/sieve/templates/object_test_container.tpl b/gosa-plugins/mail/personal/mail/sieve/templates/object_test_container.tpl
index 52611849592d41363a95ddb9526fd3bfbaf906d7..97147eb6b512644477396fece76359cfb294d19d 100644 (file)
-<table class='sieve_test_container' summary="{t}Sieve test case{/t}">
+<table width='100%' class='sieve_test_container' summary="{t}Sieve test case{/t}">
<tr>
- <td style='width:20px; ; text-align:center; vertical-align:top;'>
+ <td style='width:20px; ; text-align:center; '>
+
{if $DisplayAdd}
- <input type='image' src='plugins/mail/images/sieve_add_test.png' name='Add_Test_Object_{$ID}'
- title='{t}Add object{/t}' alt='R' class='center'>
+ {image path="plugins/mail/images/sieve_add_test.png" action="Add_Test_Object_{$ID}"
+ title="{t}Add object{/t}"}
{/if}
{if $DisplayDel}
- <input type='image' src='plugins/mail/images/sieve_del_object.png' name='Remove_Test_Object_{$ID}'
- title='{t}Remove object{/t}' alt='R' class='center'>
+ {image path="plugins/mail/images/sieve_del_object.png" action="Remove_Test_Object_{$ID}"
+ title="{t}Remove object{/t}"}
{/if}
</td>
<td>