Changeset 2667:ef63c4e390be for plugins/widgets/_widgets_functions.php

Timestamp:

02/22/14 10:04:16 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Add widget class on every widget, fixes #1901

File:

• plugins/widgets/_widgets_functions.php (modified) (18 diffs)

plugins/widgets/_widgets_functions.php

@@ -26 +26 @@
           $value = isset($GLOBALS['_search']) ? html::escapeHTML($GLOBALS['_search']) : '';
 
-          return
-          ($w->content_only ? '' : '<div id="search"'.($w->class ? ' class="'.html::escapeHTML($w->class).'"' : '').'>').
-          ($w->title ? $w->renderTitle('<label for="q">'.html::escapeHTML($w->title).'</label>') : '').
-          '<form action="'.$core->blog->url.'" method="get" role="search">'.
-          '<fieldset>'.
-          '<p><input type="text" size="10" maxlength="255" id="q" name="q" value="'.$value.'" /> '.
-          '<input type="submit" class="submit" value="ok" /></p>'.
-          '</fieldset>'.
-          '</form>'.
-          ($w->content_only ? '' : '</div>');
+          return $w->renderDiv($w->content_only,$w->class,'id="search"',
+               ($w->title ? $w->renderTitle('<label for="q">'.html::escapeHTML($w->title).'</label>') : '').
+               '<form action="'.$core->blog->url.'" method="get" role="search">'.
+               '<fieldset>'.
+               '<p><input type="text" size="10" maxlength="255" id="q" name="q" value="'.$value.'" /> '.
+               '<input type="submit" class="submit" value="ok" /></p>'.
+               '</fieldset>'.
+               '</form>');
      }
 
@@ -48 +46 @@
 
           $res =
-          ($w->content_only ? '' : '<div id="topnav"'.($w->class ? ' class="'.html::escapeHTML($w->class).'"' : '').'>').
           ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul role="navigation">';
@@ -63 +60 @@
           '<a href="'.$core->blog->url.$core->url->getURLFor("archive").'">'.
           __('Archives').'</a></li>'.
-          '</ul>'.
-          ($w->content_only ? '' : '</div>');
-
-          return $res;
+          '</ul>';
+
+          return $w->renderDiv($w->content_only,$w->class,'id="topnav"',$res);
      }
 
@@ -84 +80 @@
 
           $res =
-          ($w->content_only ? '' : '<div class="categories'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
           ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '');
 
@@ -118 +113 @@
                $res .= str_repeat('</li></ul>',-($ref_level - $level));
           }
-          $res .= ($w->content_only ? '' : '</div>');
-
-          return $res;
+
+          return $w->renderDiv($w->content_only,'categories '.$w->class,'',$res);
      }
 
@@ -145 +139 @@
 
           $res =
-          ($w->content_only ? '' : '<div class="selected'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
           ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul>';
@@ -157 +150 @@
           }
 
-          $res .= '</ul>'.($w->content_only ? '' : '</div>');
-
-          return $res;
+          $res .= '</ul>';
+
+          return $w->renderDiv($w->content_only,'selected '.$w->class,'',$res);
      }
 
@@ -179 +172 @@
           $langs = l10n::getISOcodes();
           $res =
-          ($w->content_only ? '' : '<div class="langs'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
           ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul>';
@@ -198 +190 @@
           }
 
-          $res .= '</ul>'.($w->content_only ? '' : '</div>');
-
-          return $res;
+          $res .= '</ul>';
+
+          return $w->renderDiv($w->content_only,'langs '.$w->class,'',$res);
      }
 
@@ -219 +211 @@
 
           $res =
-          ($w->content_only ? '' : '<div class="syndicate'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
           ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul>';
@@ -238 +229 @@
           }
 
-          $res .= '</ul>'.($w->content_only ? '' : '</div>');
-
-          return $res;
+          $res .= '</ul>';
+
+          return $w->renderDiv($w->content_only,'syndicate '.$w->class,'',$res);
      }
 
@@ -268 +259 @@
 
           $res =
-          ($w->content_only ? '' : '<div class="feed'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
           ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul>';
@@ -293 +283 @@
           }
 
-          $res .= '</ul>'.($w->content_only ? '' : '</div>');
-
-          return $res;
+          $res .= '</ul>';
+
+          return $w->renderDiv($w->content_only,'feed '.$w->class,'',$res);
      }
 
@@ -307 +297 @@
           }
 
-          $res =
-          ($w->content_only ? '' : '<div class="text'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
-          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
-          $w->text.
-          ($w->content_only ? '' : '</div>');
-
-          return $res;
+          $res = ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').$w->text;
+
+          return $w->renderDiv($w->content_only,'text '.$w->class,'',$res);
      }
 
@@ -355 +341 @@
 
           $res =
-          ($w->content_only ? '' : '<div class="lastposts'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
           ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul>';
@@ -368 +353 @@
           }
 
-          $res .= '</ul>'.($w->content_only ? '' : '</div>');
-
-          return $res;
+          $res .= '</ul>';
+
+          return $w->renderDiv($w->content_only,'lastposts '.$w->class,'',$res);
      }
 
@@ -390 +375 @@
           }
 
-          $res = ($w->content_only ? '' : '<div class="lastcomments'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
-          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
-          '<ul>';
+          $res = ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').'<ul>';
 
           while ($rs->fetch())
@@ -404 +387 @@
           }
 
-          $res .= '</ul>'.($w->content_only ? '' : '</div>');
-
-          return $res;
+          $res .= '</ul>';
+
+          return $w->renderDiv($w->content_only,'lastcomments '.$w->class,'',$res);
      }
 }