From a33c86a64e5a6f4c4e399facdb73caf4ee77233f Mon Sep 17 00:00:00 2001
From: Pierre Habouzit <madcoder@debian.org>
Date: Wed, 10 Sep 2003 16:57:01 +0000
Subject: [PATCH] layout amelioration

---
 philter/philter/include/plugin_autoreply.inc.php |  2 +-
 philter/philter/index.php                        | 13 +++++++------
 philter/philter/locales/philter.en.inc.php       |  2 +-
 philter/philter/locales/philter.fr.inc.php       |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/philter/philter/include/plugin_autoreply.inc.php b/philter/philter/include/plugin_autoreply.inc.php
index c1924aa..3672022 100644
--- a/philter/philter/include/plugin_autoreply.inc.php
+++ b/philter/philter/include/plugin_autoreply.inc.php
@@ -17,7 +17,7 @@ class AutoReplyPlugin extends ActionPlugin {
             .   "    var i,j;\n"
             .   "    var ta = document.createElement('textarea');\n"
             .   "    ta.setAttribute('name', Node.name+'[1]');\n"
-            .   "    ta.setAttribute('cols', '74');\n"
+            .   "    ta.setAttribute('style', 'width:100%;');\n"
             .   "    ta.setAttribute('rows', '10');\n"
             .   "    if(data[1]) ta.value = data[1];\n"
             .   "\n"
diff --git a/philter/philter/index.php b/philter/philter/index.php
index f2a13d1..ae83eaf 100644
--- a/philter/philter/index.php
+++ b/philter/philter/index.php
@@ -105,14 +105,14 @@ echo $mail_pool->to_form();
     <td valign="top">
         <form action="<?php echo $_SERVER['REQUEST_URI']?>" method="post" id="rule" name="rule" onsubmit="return false;">
         <table width="100%" class="bicol" cellspacing="1" cellpadding="1">
-        <tr class="impair"><th><?php i18n('filter_rule_conf');?>
-        </th></tr><tr class="impair"><td>
-            <input type="hidden" value="0" id="ruleId" name="rule[id]" />
-            <?php i18n('rule_name'); ?>
-            <input type="text" size="60" value="" id="ruleName" name="rule[name]"
+        <tr><th><?php i18n('rule_name'); ?>
+        </th></tr><tr><td>
+            <input type="text" value="" id="ruleName" name="rule[name]" style="width: 100%;"
                 onfocus="text_onfocus(this,'<?php i18n('new_rule');?>')"
                 onblur="text_onblur(this,'<?php i18n('new_rule');?>')" />
-            <br />
+        </td></tr>
+        <tr class="impair"><th><?php i18n('filter_rule_conf');?>
+        </th></tr><tr class="impair"><td>
             <input type="radio" value="1" id="ruleAll1" name="rule[all]" /><?php i18n('all_matches');?>
             <input type="radio" value="0" id="ruleAll0" name="rule[all]" /><?php i18n('one_match');?>
             <br />
@@ -123,6 +123,7 @@ echo $mail_pool->to_form();
         </td></tr><tr class="impair"><th><?php i18n('filter_actions_list');?>
         </th></tr><tr class="impair"><td id="actionsRow">
         </td></tr><tr class="impair"><td>
+            <input type="hidden" value="0" id="ruleId" name="rule[id]" />
             <input type="submit" value="<?php i18n('new_match');?>" name="rule[new_match]" onclick="newMatch() "/>
             <input type="submit" value="<?php i18n('new_action');?>" name="rule[new_action]" onclick="newAction()" />
             <input type="submit" value="<?php i18n('submit');?>" name="rule[submit]" onclick="this.form.submit()" />
diff --git a/philter/philter/locales/philter.en.inc.php b/philter/philter/locales/philter.en.inc.php
index d58da15..184cf43 100644
--- a/philter/philter/locales/philter.en.inc.php
+++ b/philter/philter/locales/philter.en.inc.php
@@ -27,7 +27,7 @@ $philter->config['i18n'] = Array(
     'new_rule' => '[ new rule ]',
     
     'filter_rule_conf' => 'Global Options',
-    'rule_name' => 'Name of this rule : ',
+    'rule_name' => 'Name of this rule',
     'all_matches' => 'each match must be true',
     'one_match' => 'only one match need to be true',
     'blocking_rule' => 'stop after this rule if matched',
diff --git a/philter/philter/locales/philter.fr.inc.php b/philter/philter/locales/philter.fr.inc.php
index b65f60f..dbdda45 100644
--- a/philter/philter/locales/philter.fr.inc.php
+++ b/philter/philter/locales/philter.fr.inc.php
@@ -27,7 +27,7 @@ $philter->config['i18n'] = Array(
     'new_rule' => '[ nvlle règle ]',
     
     'filter_rule_conf' => 'Options globales',
-    'rule_name' => 'Nom pour cette règle : ',
+    'rule_name' => 'Nom pour cette règle',
     'all_matches' => 'chaque critère doit être validé',
     'one_match' => 'un unique critère vérifié suffit',
     'blocking_rule' => 'arrêter de filtrer après cette règle si applicable',
-- 
2.1.4