Changeset 2776:75004db1c37c

Timestamp:

11/10/14 16:31:35 (11 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Comment mandatory preview before submit may be disabled, using new <tpl:IfCommentPreviewOptional> instead of <tpl:IfCommentPreview> for displaying submit button. Applied only in currywurst templateset in order to insure backward compatibility. Fixes #1963

Files:

• admin/blog_pref.php (modified) (2 diffs)
• inc/public/class.dc.template.php (modified) (2 diffs)
• inc/public/default-templates/currywurst/_simple-entry.html (modified) (1 diff)
• locales/fr/main.po (modified) (1 diff)

admin/blog_pref.php

@@ -231 +231 @@
           $blog_settings->system->put('comments_nofollow',!empty($_POST['comments_nofollow']));
           $blog_settings->system->put('wiki_comments',!empty($_POST['wiki_comments']));
+          $blog_settings->system->put('comment_preview_optional',!empty($_POST['comment_preview_optional']));
           $blog_settings->system->put('enable_xmlrpc',!empty($_POST['enable_xmlrpc']));
           $blog_settings->system->put('note_title_tag',$_POST['note_title_tag']);
@@ -473 +474 @@
      form::checkbox('wiki_comments','1',$blog_settings->system->wiki_comments).
      __('Wiki syntax for comments').'</label></p>'.
+     '<p><label for="comment_preview_optional" class="classic">'.
+     form::checkbox('comment_preview_optional','1',$blog_settings->system->comment_preview_optional).
+     __('Preview of comment before submit is not mandatory').'</label></p>'.
      '</div>'.
 

inc/public/class.dc.template.php

@@ -118 +118 @@
           # Comment preview
           $this->addBlock('IfCommentPreview',array($this,'IfCommentPreview'));
+          $this->addBlock('IfCommentPreviewOptional',array($this,'IfCommentPreviewOptional'));
           $this->addValue('CommentPreviewName',array($this,'CommentPreviewName'));
           $this->addValue('CommentPreviewEmail',array($this,'CommentPreviewEmail'));
@@ -2409 +2410 @@
      /* Comment preview -------------------------------- */
      /*dtd
+     <!ELEMENT tpl:IfCommentPreviewOptional - - -- Container displayed if comment preview is optional or currently previewed -->
+     */
+     public function IfCommentPreviewOptional($attr,$content)
+     {
+          return
+          '<?php if ($core->blog->settings->system->comment_preview_optional || ($_ctx->comment_preview !== null && $_ctx->comment_preview["preview"])) : ?>'.
+          $content.
+          '<?php endif; ?>';
+     }
+
+     /*dtd
      <!ELEMENT tpl:IfCommentPreview - - -- Container displayed if comment is being previewed -->
      */

inc/public/default-templates/currywurst/_simple-entry.html

@@ -164 +164 @@
                <p class="buttons">
                     <button type="submit" class="preview" name="preview" value="{{tpl:lang Preview}}">{{tpl:lang Preview}}</button>
-                  <tpl:IfCommentPreview>
+                  <tpl:IfCommentPreviewOptional>
                     <button type="submit" class="submit" value="{{tpl:lang Send}}">{{tpl:lang Send}}</button>
-                  </tpl:IfCommentPreview>
+                  </tpl:IfCommentPreviewOptional>
                </p>
      </form>

locales/fr/main.po

@@ -364 +364 @@
 msgstr "Syntaxe wiki pour les commentaires"
 
+msgid "Preview of comment before submit is not mandatory"
+msgstr "La prévisualisation des commentaires est optionnelle avant leur envoi"
+
 msgid "Accept trackbacks"
 msgstr "Accepter les rétroliens"