Bulletproof: Added theme option for alternate display of number of comments and track...

diff --git a/templates/bulletproof/UTF-8/lang_de.inc.php b/templates/bulletproof/UTF-8/lang_de.inc.php
index 2d5dba6c0a94f0d50c9a697b79c083e8a09f95c4..53c9598aa763ac2a8e4e8c5666ad787f3a8a1a9c 100644 (file)
--- a/templates/bulletproof/UTF-8/lang_de.inc.php
+++ b/templates/bulletproof/UTF-8/lang_de.inc.php
@@ -39,6 +39,7 @@
 @define('FOOTER_TIMESTAMP','Zeitstempel im Eintragsfuß anzeigen');
 @define('FOOTER_COMMENTS','Anzahl der Kommentare im Eintragsfuß anzeigen');
 @define('FOOTER_TRACKBACKS','Anzahl der Trackbacks im Eintragsfuß anzeigen');
+@define('ALT_COMMTRACK','Alternative Darstellung der Anzahl der Kommentare und Trackbacks benutzen (z.B. "Keine Kommentare" bzw. "1 Kommentar" statt "Kommentare (0)" bzw. "Kommentare(1)")');
 @define('SHOW_STICKY_ENTRY_FOOTER','Eintragsfuß für klebrige Einträge anzeigen (benötigt das Plugin "Erweiterte Eigenschaften von Artikeln")');
 @define('SHOW_STICKY_ENTRY_HEADING','Eintragstitel für klebrige Einträge anzeigen (benötigt das Plugin "Erweiterte Eigenschaften von Artikeln")');
 // Page footer next page  and previous page links

diff --git a/templates/bulletproof/UTF-8/lang_en.inc.php b/templates/bulletproof/UTF-8/lang_en.inc.php
index d894c4732cf190fb3cadaefdb4562cb3feb181e8..228d09dca3074fbfa9277b4fe42182313b9291d9 100644 (file)
--- a/templates/bulletproof/UTF-8/lang_en.inc.php
+++ b/templates/bulletproof/UTF-8/lang_en.inc.php
@@ -39,6 +39,7 @@
 @define('FOOTER_TIMESTAMP','Show timestamp in the entry footer');
 @define('FOOTER_COMMENTS','Show number of comments in the entry footer');
 @define('FOOTER_TRACKBACKS','Show number of trackback in the entry footer');
+@define('ALT_COMMTRACK','Use alternate display for number of comments and trackbacks (i.e. "No comments" or "1 comment" instead of "Comments (0)" or "Comments (1)")');
 @define('SHOW_STICKY_ENTRY_FOOTER','Show entry footer for sticky postings (requires plugin "Extended properties for entries")');
 @define('SHOW_STICKY_ENTRY_HEADING','Show entry heading for sticky postings (requires plugin "Extended properties for entries")');
 // Page footer next page  and previous page links

diff --git a/templates/bulletproof/config.inc.php b/templates/bulletproof/config.inc.php
index 6add3a29ddd5388bc7d28c9f059de161836a180c..45efbd3a5b83622a80abad203da23a7d3f0127c9 100644 (file)
--- a/templates/bulletproof/config.inc.php
+++ b/templates/bulletproof/config.inc.php
@@ -180,7 +180,15 @@ $template_config = array(
                                  'desc'  => array(YES, NO)),\r
         'default'       => 'true',\r
     ),\r
-        array(\r
+    array(\r
+        'var'           => 'altcommtrack',\r
+        'name'          => ALT_COMMTRACK,\r
+        'type'          => 'radio',\r
+        'radio'         => array('value' => array('true', 'false'),\r
+                                 'desc'  => array(YES, NO)),\r
+        'default'       => 'false',\r
+    ),\r
+    array(\r
         'var'           => 'show_sticky_entry_footer',\r
         'name'          => SHOW_STICKY_ENTRY_FOOTER,\r
         'type'          => 'radio',\r
@@ -188,7 +196,7 @@ $template_config = array(
                                  'desc'  => array(YES, NO)),\r
         'default'       => 'true',\r
     ),\r
-        array(\r
+    array(\r
         'var'           => 'show_sticky_entry_heading',\r
         'name'          => SHOW_STICKY_ENTRY_HEADING,\r
         'type'          => 'radio',\r
@@ -204,7 +212,7 @@ $template_config = array(
                                  'desc'  => array(YES, NO)),\r
         'default'       => 'inactive',\r
     ),\r
-        array(\r
+    array(\r
         'var'           => 'prev_next_style',\r
         'name'          => PREV_NEXT_STYLE,\r
         'type'          => 'select',\r

diff --git a/templates/bulletproof/entries.tpl b/templates/bulletproof/entries.tpl
index db5b68e9fa715f2fe97fb2fb6e27a8e5d0fcab3e..0f328ec63c02ab9a3becc0a8c03ffb75c2f91263 100644 (file)
--- a/templates/bulletproof/entries.tpl
+++ b/templates/bulletproof/entries.tpl
@@ -41,9 +41,17 @@
                         {if $template_option.footercomments == 'true'}
                             {if $entry.has_comments}
                                 {if $use_popups}
-                                    | <a href="{$entry.link_popup_comments}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{$entry.label_comments} ({$entry.comments})</a>
+                                    {if $template_option.altcommtrack == 'true'}
+                                        | <a href="{$entry.link_popup_comments}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{if $entry.comments == 0}{$CONST.NO_COMMENTS}{else}{$entry.comments} {$entry.label_comments}{/if}</a>
+                                    {else}
+                                        | <a href="{$entry.link_popup_comments}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{$entry.label_comments} ({$entry.comments})</a>
+                                    {/if}
                                 {else}
-                                    | <a href="{$entry.link}#comments">{$entry.label_comments} ({$entry.comments})</a>
+                                    {if $template_option.altcommtrack == 'true'}
+                                        | <a href="{$entry.link}#comments">{if $entry.comments == 0}{$CONST.NO_COMMENTS}{else}{$entry.comments} {$entry.label_comments}{/if}</a>
+                                    {else}
+                                        | <a href="{$entry.link}#comments">{$entry.label_comments} ({$entry.comments})</a>
+                                    {/if}
                                 {/if}
                             {/if}
                         {/if}
@@ -51,9 +59,17 @@
                         {if $template_option.footertrackbacks == 'true'}
                             {if $entry.has_trackbacks}
                                 {if $use_popups}
-                                    | <a href="{$entry.link_popup_trackbacks}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                                    {if $template_option.altcommtrack == 'true'}
+                                        | <a href="{$entry.link_popup_trackbacks}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{if $entry.trackbacks == 0}{$CONST.NO_TRACKBACKS}{else}{$entry.trackbacks} {$entry.label_trackbacks}{/if}</a>
+                                    {else}
+                                        | <a href="{$entry.link_popup_trackbacks}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                                    {/if}
                                 {else}
-                                    | <a href="{$entry.link}#trackbacks">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                                    {if $template_option.altcommtrack == 'true'}
+                                        | <a href="{$entry.link}#trackbacks">{if $entry.trackbacks == 0}{$CONST.NO_TRACKBACKS}{else}{$entry.trackbacks} {$entry.label_trackbacks}{/if}</a>
+                                    {else}
+                                        | <a href="{$entry.link}#trackbacks">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                                    {/if}
                                 {/if}
                             {/if}
                         {/if}
@@ -136,9 +152,17 @@
                         {if $template_option.footercomments == 'true'}
                             {if $entry.has_comments}
                                 {if $use_popups}
-                                    | <a href="{$entry.link_popup_comments}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{$entry.label_comments} ({$entry.comments})</a>
+                                    {if $template_option.altcommtrack == 'true'}
+                                        | <a href="{$entry.link_popup_comments}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{if $entry.comments == 0}{$CONST.NO_COMMENTS}{else}{$entry.comments} {$entry.label_comments}{/if}</a>
+                                    {else}
+                                        | <a href="{$entry.link_popup_comments}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{$entry.label_comments} ({$entry.comments})</a>
+                                    {/if}
                                 {else}
-                                    | <a href="{$entry.link}#comments">{$entry.label_comments} ({$entry.comments})</a>
+                                    {if $template_option.altcommtrack == 'true'}
+                                        | <a href="{$entry.link}#comments">{if $entry.comments == 0}{$CONST.NO_COMMENTS}{else}{$entry.comments} {$entry.label_comments}{/if}</a>
+                                    {else}
+                                        | <a href="{$entry.link}#comments">{$entry.label_comments} ({$entry.comments})</a>
+                                    {/if}
                                 {/if}
                             {/if}
                         {/if}
@@ -146,9 +170,17 @@
                         {if $template_option.footertrackbacks == 'true'}
                             {if $entry.has_trackbacks}
                                 {if $use_popups}
-                                    | <a href="{$entry.link_popup_trackbacks}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                                    {if $template_option.altcommtrack == 'true'}
+                                        | <a href="{$entry.link_popup_trackbacks}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{if $entry.trackbacks == 0}{$CONST.NO_TRACKBACKS}{else}{$entry.trackbacks} {$entry.label_trackbacks}{/if}</a>
+                                    {else}
+                                        | <a href="{$entry.link_popup_trackbacks}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                                    {/if}
                                 {else}
-                                    | <a href="{$entry.link}#trackbacks">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                                    {if $template_option.altcommtrack == 'true'}
+                                        | <a href="{$entry.link}#trackbacks">{if $entry.trackbacks == 0}{$CONST.NO_TRACKBACKS}{else}{$entry.trackbacks} {$entry.label_trackbacks}{/if}</a>
+                                    {else}
+                                        | <a href="{$entry.link}#trackbacks">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                                    {/if}
                                 {/if}
                             {/if}
                         {/if}
@@ -166,9 +198,17 @@
                         {if $template_option.footercomments == 'true'}
                             {if $entry.has_comments}
                                 {if $use_popups}
-                                    <a href="{$entry.link_popup_comments}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{$entry.label_comments} ({$entry.comments})</a>
+                                    {if $template_option.altcommtrack == 'true'}
+                                        <a href="{$entry.link_popup_comments}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{if $entry.comments == 0}{$CONST.NO_COMMENTS}{else}{$entry.comments} {$entry.label_comments}{/if}</a>
+                                    {else}
+                                        <a href="{$entry.link_popup_comments}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{$entry.label_comments} ({$entry.comments})</a>
+                                    {/if}
                                 {else}
-                                    <a href="{$entry.link}#comments">{$entry.label_comments} ({$entry.comments})</a>
+                                    {if $template_option.altcommtrack == 'true'}
+                                        <a href="{$entry.link}#comments">{if $entry.comments == 0}{$CONST.NO_COMMENTS}{else}{$entry.comments} {$entry.label_comments}{/if}</a>
+                                    {else}
+                                        <a href="{$entry.link}#comments">{$entry.label_comments} ({$entry.comments})</a>
+                                    {/if}
                                 {/if}
                             {/if}
                         {/if}
@@ -176,9 +216,17 @@
                         {if $template_option.footertrackbacks == 'true'}
                             {if $entry.has_trackbacks}
                                 {if $use_popups}
-                                    | <a href="{$entry.link_popup_trackbacks}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                                    {if $template_option.altcommtrack == 'true'}
+                                        | <a href="{$entry.link_popup_trackbacks}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{if $entry.trackbacks == 0}{$CONST.NO_TRACKBACKS}{else}{$entry.trackbacks} {$entry.label_trackbacks}{/if}</a>
+                                    {else}
+                                        | <a href="{$entry.link_popup_trackbacks}" onclick="window.open(this.href, 'comments', 'width=600,height=600,scrollbars=yes,resizable=yes'); return false;">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                                    {/if}
                                 {else}
-                                    | <a href="{$entry.link}#trackbacks">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                                    {if $template_option.altcommtrack == 'true'}
+                                        | <a href="{$entry.link}#trackbacks">{if $entry.trackbacks == 0}{$CONST.NO_TRACKBACKS}{else}{$entry.trackbacks} {$entry.label_trackbacks}{/if}</a>
+                                    {else}
+                                        | <a href="{$entry.link}#trackbacks">{$entry.label_trackbacks} ({$entry.trackbacks})</a>
+                                    {/if}
                                 {/if}
                             {/if}
                         {/if}

diff --git a/templates/bulletproof/lang_de.inc.php b/templates/bulletproof/lang_de.inc.php
index 607a163385016aafb4b37651b20c3fd380aa0bec..d836df4e975292f04d77ad20c3872205f537d205 100644 (file)
--- a/templates/bulletproof/lang_de.inc.php
+++ b/templates/bulletproof/lang_de.inc.php
@@ -39,6 +39,7 @@
 @define('FOOTER_TIMESTAMP','Zeitstempel im Eintragsfuß anzeigen');\r
 @define('FOOTER_COMMENTS','Anzahl der Kommentare im Eintragsfuß anzeigen');\r
 @define('FOOTER_TRACKBACKS','Anzahl der Trackbacks im Eintragsfuß anzeigen');\r
+@define('ALT_COMMTRACK','Alternative Darstellung der Anzahl der Kommentare und Trackbacks benutzen (z.B. "Keine Kommentare" bzw. "1 Kommentar" statt "Kommentare (0)" bzw. "Kommentare(1)")');\r
 @define('SHOW_STICKY_ENTRY_FOOTER','Eintragsfuß für klebrige Einträge anzeigen (benötigt das Plugin "Erweiterte Eigenschaften von Artikeln")');\r
 @define('SHOW_STICKY_ENTRY_HEADING','Eintragstitel für klebrige Einträge anzeigen (benötigt das Plugin "Erweiterte Eigenschaften von Artikeln")');\r
 // Page footer next page  and previous page links\r

diff --git a/templates/bulletproof/lang_en.inc.php b/templates/bulletproof/lang_en.inc.php
index 6d84da7751f04b758fddcd67b3268ba3c39883e5..1f478b13946fffbec488695249cd88860989fa34 100644 (file)
--- a/templates/bulletproof/lang_en.inc.php
+++ b/templates/bulletproof/lang_en.inc.php
@@ -39,6 +39,7 @@
 @define('FOOTER_TIMESTAMP','Show timestamp in the entry footer');\r
 @define('FOOTER_COMMENTS','Show number of comments in the entry footer');\r
 @define('FOOTER_TRACKBACKS','Show number of trackback in the entry footer');\r
+@define('ALT_COMMTRACK','Use alternate display for number of comments and trackbacks (i.e. "No comments" or "1 comment" instead of "Comments (0)" or "Comments (1)")');\r
 @define('SHOW_STICKY_ENTRY_FOOTER','Show entry footer for sticky postings (requires plugin "Extended properties for entries")');\r
 @define('SHOW_STICKY_ENTRY_HEADING','Show entry heading for sticky postings (requires plugin "Extended properties for entries")');\r
 // Page footer next page  and previous page links\r