Updated Bulletproof and it's lang files. Added theme options to use default icons...

diff --git a/templates/bulletproof/UTF-8/lang_de.inc.php b/templates/bulletproof/UTF-8/lang_de.inc.php
index 1d88b2d510e4de73594ee1e9a17329c5e0eefc72..52b2e2700d614ac243a28512e97fd6cbb8e8eae7 100644 (file)
--- a/templates/bulletproof/UTF-8/lang_de.inc.php
+++ b/templates/bulletproof/UTF-8/lang_de.inc.php
@@ -1,6 +1,7 @@
 <?php
 // Colorsets
 @define('THEME_COLORSET', 'Farbwahl');
+@define('DEF_ICONS', 'Unabhängig vom gewählten Farbset immer Standardicons verwenden');
 @define('BP_COLORSET_DEF', 'leer');
 @define('BP_COLORSET_OPT1', 'violett');
 @define('BP_COLORSET_OPT2', 'blau');

diff --git a/templates/bulletproof/UTF-8/lang_en.inc.php b/templates/bulletproof/UTF-8/lang_en.inc.php
index d86dc7fb739c2f52e32fd3eab8acfafd3ba55c94..11d2324830acc123f947ff17e6cc4f6191741fc2 100644 (file)
--- a/templates/bulletproof/UTF-8/lang_en.inc.php
+++ b/templates/bulletproof/UTF-8/lang_en.inc.php
@@ -1,6 +1,7 @@
 <?php
 // Colorsets
 @define('THEME_COLORSET', 'Colorset');
+@define('DEF_ICONS', 'Always use default icons regardless of colorset chosen');
 @define('BP_COLORSET_DEF', 'blank');
 @define('BP_COLORSET_OPT1', 'purple');
 @define('BP_COLORSET_OPT2', 'blue');

diff --git a/templates/bulletproof/config.inc.php b/templates/bulletproof/config.inc.php
index c1fbb5f5cfeb2fe434558780477b25bf9ff43d3e..e25af912a16c257312f8030b020313a7d1d36152 100644 (file)
--- a/templates/bulletproof/config.inc.php
+++ b/templates/bulletproof/config.inc.php
@@ -38,6 +38,14 @@ $template_config = array(
         'default'       => 'purple',\r
         'select_values' => $colorsets\r
     ),\r
+    array(\r
+        'var'           => 'deficons',\r
+        'name'          => DEF_ICONS,\r
+        'type'          => 'radio',\r
+        'default'       => 'false',\r
+        'radio'         => array('value' => array('true', 'false'),\r
+                                 'desc'  => array(YES,NO))\r
+    ),\r
     array(\r
         'var'           => 'layouttype',\r
         'name'          => LAYOUT_TYPE,\r

diff --git a/templates/bulletproof/entries.tpl b/templates/bulletproof/entries.tpl
index 922121d4cae11f3eac3a3883b6bf61c724f3a4b7..db5b68e9fa715f2fe97fb2fb6e27a8e5d0fcab3e 100644 (file)
--- a/templates/bulletproof/entries.tpl
+++ b/templates/bulletproof/entries.tpl
@@ -317,12 +317,16 @@
         {if $template_option.prev_next_style == 'texticon'}
             {if $template_option.colorset == 'blank'}
                 <a title="{$CONST.NEXT_PAGE}" href="{$footer_next_page}">{$CONST.NEXT_PAGE}<img alt="{$CONST.NEXT_PAGE}" title="{$CONST.NEXT_PAGE}" src="{serendipity_getFile file="img/forward.png"}" /></a>
+            {elseif $template_option.deficons == 'true'}
+                <a title="{$CONST.NEXT_PAGE}" href="{$footer_next_page}">{$CONST.NEXT_PAGE}<img alt="{$CONST.NEXT_PAGE}" title="{$CONST.NEXT_PAGE}" src="{serendipity_getFile file="img/forward.png"}" /></a>
             {else}
                 <a title="{$CONST.NEXT_PAGE}" href="{$footer_next_page}">{$CONST.NEXT_PAGE}<img alt="{$CONST.NEXT_PAGE}" title="{$CONST.NEXT_PAGE}" src="{$serendipityHTTPPath}templates/{$template}/img/{$template_option.colorset}_forward.png" /></a>
             {/if}
         {elseif $template_option.prev_next_style == 'icon'}
             {if $template_option.colorset == 'blank'}
                 <a title="{$CONST.NEXT_PAGE}" href="{$footer_next_page}"><img alt="{$CONST.NEXT_PAGE}" src="{serendipity_getFile file="img/forward.png"}" /></a>
+            {elseif $template_option.deficons == 'true'}
+                <a title="{$CONST.NEXT_PAGE}" href="{$footer_next_page}"><img alt="{$CONST.NEXT_PAGE}" src="{serendipity_getFile file="img/forward.png"}" /></a>
             {else}
                 <a title="{$CONST.NEXT_PAGE}" href="{$footer_next_page}"><img alt="{$CONST.NEXT_PAGE}" src="{$serendipityHTTPPath}templates/{$template}/img/{$template_option.colorset}_forward.png" /></a>
             {/if}

diff --git a/templates/bulletproof/entries_archives.tpl b/templates/bulletproof/entries_archives.tpl
index 3be2e7315a97b62847034d0644c4493f6e49098a..50ff75b8f2c29fc74022805631146cacb777e94e 100644 (file)
--- a/templates/bulletproof/entries_archives.tpl
+++ b/templates/bulletproof/entries_archives.tpl
@@ -7,6 +7,8 @@
       <ul class="archives_row">\r
          {if $template_option.colorset == 'blank'}\r
          <li class="archives_graph"><img src="{serendipity_getFile file="img/graph_bar_horisontal.png"}" alt="bar graph" height="10" width="{math width=100 equation="count * width / max" count=$month.entry_count max=$max_entries format="%d"}" style="border: 1px solid #000000" /></li>\r
+         {elseif $template_option.deficons == 'true'}\r
+         <li class="archives_graph"><img src="{serendipity_getFile file="img/graph_bar_horisontal.png"}" alt="bar graph" height="10" width="{math width=100 equation="count * width / max" count=$month.entry_count max=$max_entries format="%d"}" style="border: 1px solid #000000" /></li>\r
          {else}\r
          <li class="archives_graph"><img src="{$serendipityHTTPPath}templates/{$template}/img/{$template_option.colorset}_graph_bar.png" alt="bar graph" height="10" width="{math width=100 equation="count * width / max" count=$month.entry_count max=$max_entries format="%d"}" style="border: 1px solid #000000" /></li>\r
          {/if}\r

diff --git a/templates/bulletproof/lang_de.inc.php b/templates/bulletproof/lang_de.inc.php
index 7a53206bd2fb983731a6ef0d632c4a7b0f27f347..7cd75c07eabbf93a44cd93a45f6ed3cda15f5353 100644 (file)
--- a/templates/bulletproof/lang_de.inc.php
+++ b/templates/bulletproof/lang_de.inc.php
@@ -1,6 +1,7 @@
 <?php\r
 // Colorsets\r
 @define('THEME_COLORSET', 'Farbwahl');\r
+@define('DEF_ICONS', 'Unabhängig vom gewählten Farbset immer Standardicons verwenden');\r
 @define('BP_COLORSET_DEF', 'leer');\r
 @define('BP_COLORSET_OPT1', 'violett');\r
 @define('BP_COLORSET_OPT2', 'blau');\r

diff --git a/templates/bulletproof/lang_en.inc.php b/templates/bulletproof/lang_en.inc.php
index 87381214c2b982d37ef917ec5c486204f976e933..960760867b11ccb85af6afe82671a9c81d531e2d 100644 (file)
--- a/templates/bulletproof/lang_en.inc.php
+++ b/templates/bulletproof/lang_en.inc.php
@@ -1,6 +1,7 @@
 <?php\r
 // Colorsets\r
 @define('THEME_COLORSET', 'Colorset');\r
+@define('DEF_ICONS', 'Always use default icons regardless of colorset chosen');\r
 @define('BP_COLORSET_DEF', 'blank');\r
 @define('BP_COLORSET_OPT1', 'purple');\r
 @define('BP_COLORSET_OPT2', 'blue');\r

diff --git a/templates/bulletproof/plugin_calendar.tpl b/templates/bulletproof/plugin_calendar.tpl
index 3f419abf86f3a217b834528c95c598c2f532bad7..e19bb95072fed7ed5ac7680ab0cd2f1fea7f4e75 100644 (file)
--- a/templates/bulletproof/plugin_calendar.tpl
+++ b/templates/bulletproof/plugin_calendar.tpl
@@ -5,6 +5,8 @@
         {if $plugin_calendar_head.minScroll le $plugin_calendar_head.month_date}\r
            {if $template_option.colorset == 'blank'}\r
            <a title="{$CONST.BACK}" href="{$plugin_calendar_head.uri_previous}"><img alt="{$CONST.BACK}" src="{serendipity_getFile file="img/back.png"}" width="12" height="12" /></a>\r
+           {elseif $template_option.deficons == 'true'}\r
+           <a title="{$CONST.BACK}" href="{$plugin_calendar_head.uri_previous}"><img alt="{$CONST.BACK}" src="{serendipity_getFile file="img/back.png"}" width="12" height="12" /></a>\r
            {else}\r
            <a title="{$CONST.BACK}" href="{$plugin_calendar_head.uri_previous}"><img alt="{$CONST.BACK}" src="{$serendipityHTTPPath}templates/{$template}/img/{$template_option.colorset}_back.png" width="12" height="12" /></a>\r
            {/if}\r
@@ -21,6 +23,8 @@
         {if $plugin_calendar_head.maxScroll ge $plugin_calendar_head.month_date}\r
             {if $template_option.colorset == 'blank'}\r
             <a title="{$CONST.FORWARD}" href="{$plugin_calendar_head.uri_next}"><img alt="{$CONST.FORWARD}" src="{serendipity_getFile file="img/forward.png"}" width="12" height="12" /></a>\r
+            {elseif $template_option.deficons == 'true'}\r
+            <a title="{$CONST.FORWARD}" href="{$plugin_calendar_head.uri_next}"><img alt="{$CONST.FORWARD}" src="{serendipity_getFile file="img/forward.png"}" width="12" height="12" /></a>\r
             {else}\r
             <a title="{$CONST.FORWARD}" href="{$plugin_calendar_head.uri_next}"><img alt="{$CONST.FORWARD}" src="{$serendipityHTTPPath}templates/{$template}/img/{$template_option.colorset}_forward.png" width="12" height="12" /></a>\r
             {/if}\r