From: yellowled <yellowled>
Date: Mon, 10 Sep 2007 09:56:04 +0000 (+0000)
Subject: Updated Bulletproof and it's lang files. Added theme options to use default icons... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=d75b60116b7add61c0c5c0655b39bf907c7539cc;p=s9y.git

Updated Bulletproof and it's lang files. Added theme options to use default icons regardless of colorset chosen as a fallback option in case a colorset stylesheet doesn't have these icons.
---

diff --git a/templates/bulletproof/UTF-8/lang_de.inc.php b/templates/bulletproof/UTF-8/lang_de.inc.php
index 1d88b2d..52b2e27 100644
--- 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 d86dc7f..11d2324 100644
--- 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 c1fbb5f..e25af91 100644
--- a/templates/bulletproof/config.inc.php
+++ b/templates/bulletproof/config.inc.php
@@ -38,6 +38,14 @@ $template_config = array(
         'default'       => 'purple',
         'select_values' => $colorsets
     ),
+    array(
+        'var'           => 'deficons',
+        'name'          => DEF_ICONS,
+        'type'          => 'radio',
+        'default'       => 'false',
+        'radio'         => array('value' => array('true', 'false'),
+                                 'desc'  => array(YES,NO))
+    ),
     array(
         'var'           => 'layouttype',
         'name'          => LAYOUT_TYPE,
diff --git a/templates/bulletproof/entries.tpl b/templates/bulletproof/entries.tpl
index 922121d..db5b68e 100644
--- 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 3be2e73..50ff75b 100644
--- a/templates/bulletproof/entries_archives.tpl
+++ b/templates/bulletproof/entries_archives.tpl
@@ -7,6 +7,8 @@
       <ul class="archives_row">
          {if $template_option.colorset == 'blank'}
          <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>
+         {elseif $template_option.deficons == 'true'}
+         <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>
          {else}
          <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>
          {/if}
diff --git a/templates/bulletproof/lang_de.inc.php b/templates/bulletproof/lang_de.inc.php
index 7a53206..7cd75c0 100644
--- a/templates/bulletproof/lang_de.inc.php
+++ b/templates/bulletproof/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/lang_en.inc.php b/templates/bulletproof/lang_en.inc.php
index 8738121..9607608 100644
--- a/templates/bulletproof/lang_en.inc.php
+++ b/templates/bulletproof/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/plugin_calendar.tpl b/templates/bulletproof/plugin_calendar.tpl
index 3f419ab..e19bb95 100644
--- 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}
            {if $template_option.colorset == 'blank'}
            <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>
+           {elseif $template_option.deficons == 'true'}
+           <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>
            {else}
            <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>
            {/if}
@@ -21,6 +23,8 @@
         {if $plugin_calendar_head.maxScroll ge $plugin_calendar_head.month_date}
             {if $template_option.colorset == 'blank'}
             <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>
+            {elseif $template_option.deficons == 'true'}
+            <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>
             {else}
             <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>
             {/if}