Changeset 1510:ab817708736f

Timestamp:

08/12/13 15:31:45 (12 years ago)

Author:

Pascal Chevrel <pascal.chevrel@…>

Branch:

ticket1515

Message:

Ticket 1515: move hardcoded css from antispam filters to css file

Files:

• admin/style/default.css (modified) (1 diff)
• plugins/antispam/filters/class.dc.filter.ip.php (modified) (3 diffs)
• plugins/antispam/filters/class.dc.filter.words.php (modified) (3 diffs)

admin/style/default.css

@@ -819 +819 @@
 option.avail10n {
      background: transparent url(../images/check-on.png) no-repeat 0 50%;
+}
+/* ----------------------------------------------------------  Antispam extensions */
+.antispam {
+     height: 200px;
+     overflow: auto;
+     margin-bottom: 1em;
+}
+.antispam p {
+     margin: 1px 0 0 0;
+     padding: 0.2em 0.5em;
+}
+.antispam p.global {
+     background: #ccff99;
 }
 /* ------------------------------------------------------------------ contextual help */

plugins/antispam/filters/class.dc.filter.ip.php

@@ -17 +17 @@
      public $has_gui = true;
 
-     private $style_list = 'height: 200px; overflow: auto; margin-bottom: 1em; ';
-     private $style_p = 'margin: 1px 0 0 0; padding: 0.2em 0.5em; ';
-     private $style_global = 'background: #ccff99; ';
-
      private $con;
      private $table;
@@ -150 +146 @@
                '<form action="'.html::escapeURL($url).'" method="post">'.
                '<h3>' . __('IP list') . '</h3>'.
-               '<div style="'.$this->style_list.'">';
+               '<div class="antispam">';
 
                $res_global = '';
@@ -162 +158 @@
 
                     $disabled_ip = false;
-                    $p_style = $this->style_p;
+                    $p_style = '';
                     if (!$rs->blog_id) {
                          $disabled_ip = !$core->auth->isSuperAdmin();
-                         $p_style .= $this->style_global;
+                         $p_style .= ' global';
                     }
 
                     $item =
-                    '<p style="'.$p_style.'"><label class="classic" for="'.$type.'-ip-'.$rs->rule_id.'">'.
+                    '<p class="'.$p_style.'"><label class="classic" for="'.$type.'-ip-'.$rs->rule_id.'">'.
                     form::checkbox(array('delip[]',$type.'-ip-'.$rs->rule_id),$rs->rule_id,false,'','',$disabled_ip).' '.
                     html::escapeHTML($pattern).

plugins/antispam/filters/class.dc.filter.words.php

@@ -17 +17 @@
      public $name = 'Bad Words';
 
-     private $style_list = 'height: 200px; overflow: auto; margin-bottom: 1em; ';
-     private $style_p = 'margin: 1px 0 0 0; padding: 0.2em 0.5em; ';
-     private $style_global = 'background: #ccff99; ';
-
      private $con;
      private $table;
@@ -143 +139 @@
                '<form action="'.html::escapeURL($url).'" method="post" class="fieldset">'.
                '<h3>' . __('List of bad words') . '</h3>'.
-               '<div style="'.$this->style_list.'">';
+               '<div class="antispam">';
 
                $res_global = '';
@@ -150 +146 @@
                {
                     $disabled_word = false;
-                    $p_style = $this->style_p;
+
+                    $p_style = '';
+
                     if (!$rs->blog_id) {
                          $disabled_word = !$core->auth->isSuperAdmin();
-                         $p_style .= $this->style_global;
+                         $p_style .= ' global';
                     }
 
-                    $item = '<p style="'.$p_style.'"><label class="classic" for="word-'.$rs->rule_id.'">'.
+                    $item = '<p class="'.$p_style.'"><label class="classic" for="word-'.$rs->rule_id.'">'.
                          form::checkbox(array('swd[]', 'word-'.$rs->rule_id),$rs->rule_id,false,'','',$disabled_word).' '.
                          html::escapeHTML($rs->rule_content).