Changeset 783:0a2b554158d6

Timestamp:

12/06/11 14:01:15 (14 years ago)

Author:

Dsls <dsls@…>

Branch:

formfilters

Message:

fixed toggle css, and some errors.

Files:

• admin/comments.php (modified) (2 diffs)
• admin/js/filters.js (modified) (1 diff)
• admin/style/default.css (modified) (1 diff)
• inc/admin/class.dc.filter.php (modified) (1 diff)
• plugins/tags/_public.php (modified) (2 diffs)

admin/comments.php

@@ -23 +23 @@
      }
      public function applyFilter($params) {
-          $val = preg_split("/[\s,]+/",$this->values[0]);
+          $val = preg_split('/\s*,\s*/',$this->values[0]);
           $params[$this->request_param]=$val;
      }
@@ -84 +84 @@
 if (isset($_GET['author'])) {
      $authorFilter->add();
-     $authorFilter->setValue($_GET['author']);
+     $authorFilter->setValues($_GET['author']);
 }
 $with_spam=true;

admin/js/filters.js

@@ -2 +2 @@
      $('#toggle-filters').click(function(e) {
           $('#filters').toggleClass('hidden');
+          $('#toggle-filters').toggleClass('opened');
      });
 });

admin/style/default.css

@@ -1237 +1237 @@
      padding-left: 20px;
 }
+
+a#toggle-filters {
+     font-weight: bold;
+     background: url(../images/plus.png) no-repeat 0 0;
+     padding-left: 20px;
+}
+
+a#toggle-filters.opened {
+     background: url(../images/minus.png) no-repeat 0 0;
+}
+
 .constrained {
      margin: 0;

inc/admin/class.dc.filter.php

@@ -280 +280 @@
           if ($this->hideform) {
                $formclass = ' class="hidden"';
+               $toggleclass = '';
           } else {
                $formclass='';
+               $toggleclass = ' class="opened"';
           }
           
-          $ret .= '<p><img alt="" src="images/minus.png" /> '.
-               '<a href="#" id="toggle-filters">'.
+          $ret .= '<p>'.
+               '<a href="#" id="toggle-filters"'.$toggleclass.'>'.
                __('Toggle filters and display options').
                '</a></p>'.

plugins/tags/_public.php

@@ -55 +55 @@
                return
                "<?php\n".
-               "@\$params['from'] .= ', '.\$core->prefix.'meta META ';\n".
-               "@\$params['sql'] .= 'AND META.post_id = P.post_id ';\n".
+               "if (!isset(\$params['from'])) \$params['from']='';"."\n".
+               "if (!isset(\$params['sql'])) \$params['sql']='';"."\n".
+               "\$params['from'] .= ', '.\$core->prefix.'meta META ';\n".
+               "\$params['sql'] .= 'AND META.post_id = P.post_id ';\n".
                "\$params['sql'] .= \"AND META.meta_type = 'tag' \";\n".
                "\$params['sql'] .= \"AND META.meta_id = '".$core->con->escape($attr['tag'])."' \";\n".
@@ -65 +67 @@
                return
                '<?php if ($_ctx->exists("meta")) { '.
-                    "@\$params['from'] .= ', '.\$core->prefix.'meta META ';\n".
-                    "@\$params['sql'] .= 'AND META.post_id = P.post_id ';\n".
+                    "if (!isset(\$params['from'])) \$params['from']='';"."\n".
+                    "if (!isset(\$params['sql'])) \$params['sql']='';"."\n".
+                    "\$params['from'] .= ', '.\$core->prefix.'meta META ';\n".
+                    "\$params['sql'] .= 'AND META.post_id = P.post_id ';\n".
                     "\$params['sql'] .= \"AND META.meta_type = 'tag' \";\n".
                     "\$params['sql'] .= \"AND META.meta_id = '\".\$core->con->escape(\$_ctx->meta->meta_id).\"' \";\n".