add options to control themes_use_msie_js_fix - which version of IE to support, if at all

3 files changed, 23 insertions, 12 deletions

diff --git a/admin/admin_themes_inc.php b/admin/admin_themes_inc.php
index 849510e..3129774 100644
--- a/admin/admin_themes_inc.php
+++ b/admin/admin_themes_inc.php
@@ -4,10 +4,6 @@ $themeSettings = array(
 		'label' => 'Enable JSCalendar',
 		'note' => 'If checked, a calendar popup allows for easily selecting a date using an appealing interface.',
 	),
-	'themes_use_msie_png_hack' => array(
-		'label' => 'IE7-js',
-		'note' => 'A Javascript library to make Microsoft\'s Internet Explorer behave like a standards-compliant browser. It fixes many HTML and CSS issues and makes transparent PNG work correctly under IE5 and IE6. It is also needed for CSS driven dropdown menus.',
-	),
 	'themes_collapsible_modules' => array(
 		'label' => 'Collapsible modules',
 		'note' => 'This allows users to collapse modules by clicking on their titles. Can be useful if you use many modules.',
@@ -51,6 +47,7 @@ if( !empty( $_REQUEST['change_prefs'] )) {
 	$pref_simple_values = array(
 		"site_biticon_display_style",
 		"site_icon_size",
+		"themes_use_msie_js_fix",
 	);
 
 	foreach( $pref_simple_values as $svitem ) {
@@ -79,4 +76,12 @@ $biticon_sizes = array(
 	'large' => tra( 'Large' ),
 );
 $gBitSmarty->assign( "biticon_sizes", $biticon_sizes );
+
+// These numbers are intentionally off by 1 due to the way IE fixes name their js
+$ieFixOptions = array(
+	'' => tra( 'Off' ),
+	'8' => tra( 'IE7 or older' ),
+	'7' => tra( 'IE6 or older' ),
+);
+$gBitSmarty->assign( "ieFixOptions", $ieFixOptions );
 ?>
diff --git a/templates/admin_themes.tpl b/templates/admin_themes.tpl
index 24c22c4..8479e5b 100644
--- a/templates/admin_themes.tpl
+++ b/templates/admin_themes.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_themes/templates/admin_themes.tpl,v 1.3 2007/06/25 07:53:39 squareing Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_themes/templates/admin_themes.tpl,v 1.4 2009/07/04 03:14:23 spiderr Exp $ *}
 {strip}
 {form legend="Theme Settings"}
 	<input type="hidden" name="page" value="{$page}" />
@@ -11,10 +11,18 @@
 	</div>
 
 	<div class="row">
-		{formlabel label="Set default Icon size" for="site_icon_size"}
+		{formlabel label="Default Icon Size" for="site_icon_size"}
 		{forminput}
 			{html_options name="site_icon_size" id="site_icon_size" options=$biticon_sizes selected=$gBitSystem->getConfig('site_icon_size')}
-			{formhelp note="Pick the icon size you wish to use on your site. Please note that if the icon does not exist in the requested size, it will use the small one instead."}
+			{formhelp note="pick the icon size you wish to use on your site. please note that if the icon does not exist in the requested size, it will use the small one instead."}
+		{/forminput}
+	</div>
+
+	<div class="row">
+		{formlabel label="Use IE js fix" for="themes_use_msie_js_fix"}
+		{forminput}
+			{html_options name="themes_use_msie_js_fix" id="themes_use_msie_js_fix" options=$ieFixOptions selected=$gBitSystem->getConfig('themes_use_msie_js_fix')}
+			{formhelp note="A Javascript library to make Microsoft's Internet Explorer behave like a standards-compliant browser. It fixes many HTML and CSS issues and makes transparent PNG work correctly under IE7 and older. It is also needed for CSS driven dropdown menus. It does cause some delay on every page load."}
 		{/forminput}
 	</div>
 
diff --git a/templates/header_inc.tpl b/templates/header_inc.tpl
index b17ce01..9d9a3b4 100644
--- a/templates/header_inc.tpl
+++ b/templates/header_inc.tpl
@@ -1,4 +1,4 @@
-{* $Header: /cvsroot/bitweaver/_bit_themes/templates/header_inc.tpl,v 1.53 2009/05/29 06:55:06 lsces Exp $ *}
+{* $Header: /cvsroot/bitweaver/_bit_themes/templates/header_inc.tpl,v 1.54 2009/07/04 03:14:23 spiderr Exp $ *}
 {strip}
 {foreach from=$gBitThemes->mRawFiles.css item=cssFile}
 	<link rel="stylesheet" title="{$style}" type="text/css" href="{$cssFile}" media="all" />
@@ -8,8 +8,6 @@
 {/if}
 {/strip}
 
-{if $gBrowserInfo.browser eq 'ie'}
-       {if $gBrowserInfo.maj_ver lt '8'}
-			<script type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/fixes/ie7/IE8.js"></script>
-       {/if}
+{if $gBrowserInfo.browser eq 'ie' && $gBitSystem->getConfig('themes_use_msie_js_fix') && $gBrowserInfo.maj_ver lt '8'}
+		<script type="text/javascript" src="{$smarty.const.UTIL_PKG_URL}javascript/fixes/ie7/IE{$gBitSystem->getConfig('themes_use_msie_js_fix')}.js"></script>
 {/if}