Bulletproof: Removed deficons theme option.

diff --git a/templates/bulletproof/config.inc.php b/templates/bulletproof/config.inc.php
index 45efbd3a5b83622a80abad203da23a7d3f0127c9..804312710422134db63177d3bdc883edcfeb666e 100644 (file)
--- a/templates/bulletproof/config.inc.php
+++ b/templates/bulletproof/config.inc.php
@@ -31,14 +31,6 @@ $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 0f328ec63c02ab9a3becc0a8c03ffb75c2f91263..95fe196362d2034c7fb4a083944086903ee12bfe 100644 (file)
--- a/templates/bulletproof/entries.tpl
+++ b/templates/bulletproof/entries.tpl
@@ -365,16 +365,12 @@
         {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 50ff75b8f2c29fc74022805631146cacb777e94e..2eae4ca009bb5eb6fec4029316d5fa11af43681b 100644 (file)
--- a/templates/bulletproof/entries_archives.tpl
+++ b/templates/bulletproof/entries_archives.tpl
@@ -6,11 +6,9 @@
       {foreach from=$archive.months item="month"}\r
       <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
+             <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
+             <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
          <li class="archives_date">{$month.date|@formatTime:"%B"}</li>\r
          <li class="archives_count">{$month.entry_count} {$CONST.ENTRIES}</li>\r

diff --git a/templates/bulletproof/plugin_calendar.tpl b/templates/bulletproof/plugin_calendar.tpl
index e19bb95072fed7ed5ac7680ab0cd2f1fea7f4e75..3f419abf86f3a217b834528c95c598c2f532bad7 100644 (file)
--- a/templates/bulletproof/plugin_calendar.tpl
+++ b/templates/bulletproof/plugin_calendar.tpl
@@ -5,8 +5,6 @@
         {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
@@ -23,8 +21,6 @@
         {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