Changeset 970:047d7b4a6ffd

Timestamp:

11/06/12 17:21:21 (13 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Children:

971:a891f8b86552, 980:308abbb4125b

Message:

Notes' title can be now enclosed in h4 (default), h3 or p HTML tag. Fixes #1246

Files:

• admin/blog_pref.php (modified) (3 diffs)
• inc/core/class.dc.blog.php (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)

admin/blog_pref.php

@@ -89 +89 @@
      $post_url_combo[html::escapeHTML($blog_settings->system->post_url_format)] = html::escapeHTML($blog_settings->system->post_url_format);
 }
+
+# Note title tag combo
+$note_title_tag_combo = array(
+     __('H4') => 0,
+     __('H3') => 1,
+     __('P') => 2
+);
 
 # Image title combo
@@ -209 +216 @@
           $blog_settings->system->put('wiki_comments',!empty($_POST['wiki_comments']));
           $blog_settings->system->put('enable_xmlrpc',!empty($_POST['enable_xmlrpc']));
+          $blog_settings->system->put('note_title_tag',$_POST['note_title_tag']);
           
           $blog_settings->system->put('nb_post_per_page',$nb_post_per_page);
@@ -331 +339 @@
      form::combo('blog_timezone',dt::getZones(true,true),html::escapeHTML($blog_settings->system->blog_timezone)).
      '</label></p>'.
-     '</div>'.
-     
-     '<div class="col">'.
+
      '<p><label for="copyright_notice">'.__('Copyright notice:').
      form::field('copyright_notice',30,255,html::escapeHTML($blog_settings->system->copyright_notice)).
      '</label></p>'.
-     
+     '</div>'.
+     
+     '<div class="col">'.
      '<p><label for="post_url_format">'.__('New post URL format:').
      form::combo('post_url_format',$post_url_combo,html::escapeHTML($blog_settings->system->post_url_format)).
      '</label></p>'.
-     
+
+     '<p><label for="note_title_tag">'.__('Note title HTML tag:').
+     form::combo('note_title_tag',$note_title_tag_combo,$blog_settings->system->note_title_tag).
+     '</label></p>'.
+          
      '<p><label for="enable_xmlrpc" class="classic">'.
      form::checkbox('enable_xmlrpc','1',$blog_settings->system->enable_xmlrpc).

inc/core/class.dc.blog.php

@@ -1598 +1598 @@
                $this->core->initWikiPost();
                $this->core->wiki2xhtml->setOpt('note_prefix','pnote-'.$post_id);
+               switch ($this->settings->system->note_title_tag) {
+                    case 1:
+                         $tag = 'h3';
+                         break;
+                    case 2:
+                         $tag = 'p';
+                         break;
+                    default:
+                         $tag = 'h4';
+                         break;
+               }
+               $this->core->wiki2xhtml->setOpt('note_str','<div class="footnotes"><'.$tag.' class="footnotes-title">'.
+                    __('Notes').'</'.$tag.'>%s</div>');
+               $this->core->wiki2xhtml->setOpt('note_str_single','<div class="footnotes"><'.$tag.' class="footnotes-title">'.
+                    __('Note').'</'.$tag.'>%s</div>');
                if (strpos($lang,'fr') === 0) {
                     $this->core->wiki2xhtml->setOpt('active_fr_syntax',1);

locales/fr/main.po

@@ -272 +272 @@
 msgstr "Format d'URL des nouveaux billets :"
 
+msgid "Note title HTML tag:"
+msgstr "Balise HTML pour le titre des notes :"
+
+msgid "Note"
+msgstr "Note"
+
+msgid "Notes"
+msgstr "Notes"
+
 msgid "Enable XML/RPC interface"
 msgstr "Activer l'interface XML/RPC"