Changeset 2662:87748fd865ef for plugins/widgets

Timestamp:

02/14/14 14:49:43 (12 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

New rendering method (renderTitle) for widget title, fixes #1827

Location:

plugins/widgets

Files:

• _define.php (modified) (1 diff)
• _widgets_functions.php (modified) (10 diffs)
• class.widgets.php (modified) (1 diff)

plugins/widgets/_define.php

@@ -16 +16 @@
      /* Description*/         "Widgets for your blog sidebars",
      /* Author */             "Olivier Meunier & Dotclear Team",
-     /* Version */            '3.1',
+     /* Version */            '3.2',
      array(
           'permissions' =>    'admin',

plugins/widgets/_widgets_functions.php

@@ -28 +28 @@
           return
           ($w->content_only ? '' : '<div id="search"'.($w->class ? ' class="'.html::escapeHTML($w->class).'"' : '').'>').
-          ($w->title ? '<h2><label for="q">'.html::escapeHTML($w->title).'</label></h2>' : '').
+          ($w->title ? $w->renderTitle('<label for="q">'.html::escapeHTML($w->title).'</label>') : '').
           '<form action="'.$core->blog->url.'" method="get" role="search">'.
           '<fieldset>'.
@@ -49 +49 @@
           $res =
           ($w->content_only ? '' : '<div id="topnav"'.($w->class ? ' class="'.html::escapeHTML($w->class).'"' : '').'>').
-          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
+          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul role="navigation">';
 
@@ -85 +85 @@
           $res =
           ($w->content_only ? '' : '<div class="categories'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
-          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '');
+          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '');
 
           $ref_level = $level = $rs->level-1;
@@ -146 +146 @@
           $res =
           ($w->content_only ? '' : '<div class="selected'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
-          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
+          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul>';
 
@@ -180 +180 @@
           $res =
           ($w->content_only ? '' : '<div class="langs'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
-          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
+          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul>';
 
@@ -220 +220 @@
           $res =
           ($w->content_only ? '' : '<div class="syndicate'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
-          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
+          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul>';
 
@@ -269 +269 @@
           $res =
           ($w->content_only ? '' : '<div class="feed'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
-          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
+          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul>';
 
@@ -309 +309 @@
           $res =
           ($w->content_only ? '' : '<div class="text'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
-          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
+          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           $w->text.
           ($w->content_only ? '' : '</div>');
@@ -356 +356 @@
           $res =
           ($w->content_only ? '' : '<div class="lastposts'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
-          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
+          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul>';
 
@@ -391 +391 @@
 
           $res = ($w->content_only ? '' : '<div class="lastcomments'.($w->class ? ' '.html::escapeHTML($w->class) : '').'">').
-          ($w->title ? '<h2>'.html::escapeHTML($w->title).'</h2>' : '').
+          ($w->title ? $w->renderTitle(html::escapeHTML($w->title)) : '').
           '<ul>';
 

plugins/widgets/class.widgets.php

@@ -185 +185 @@
      }
 
+     /* Widget rendering tool
+     --------------------------------------------------- */
+     public function renderTitle($title)
+     {
+          global $core;
+
+          if (!$title) {
+               return '';
+          }
+
+          $wtscheme = $core->themes->moduleInfo($core->blog->settings->system->theme,'widgettitleformat');
+          if (empty($wtscheme)) {
+               $tplset = $core->themes->moduleInfo($core->blog->settings->system->theme,'tplset');
+               if (empty($tplset) || $tplset == DC_DEFAULT_TPLSET) {
+                    // Use H2 for mustek based themes
+                    $wtscheme = '<h2>%s</h2>';
+               } else {
+                    // Use H3 for currywurst based themes
+                    $wtscheme = '<h3>%s</h3>';
+               }
+          }
+          $ret = sprintf($wtscheme,$title);
+
+          return $ret;
+     }
+
      /* Widget settings
      --------------------------------------------------- */