Changeset 2776:75004db1c37c for inc

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

Location:

inc/public

Files:

• class.dc.template.php (modified) (2 diffs)
• default-templates/currywurst/_simple-entry.html (modified) (1 diff)

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>