clean up jquery to allow for google hosted or local option

3 files changed, 10 insertions, 16 deletions

diff --git a/templates/admin_themes.tpl b/templates/admin_themes.tpl
index cfd982d..a63dd9d 100644
--- a/templates/admin_themes.tpl
+++ b/templates/admin_themes.tpl
@@ -27,20 +27,20 @@
 	</div>
 
 	<div class="form-group">
-		{formlabel label="Use IE js fix" for="themes_use_msie_js_fix"}
+		{formlabel label="jQuery Hosting" for="themes_jquery_hosting"}
 		{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')}
+			{html_options name="themes_jquery_hosting" id="themes_jquery_hosting" options=$jqueryOptions selected=$gBitSystem->getConfig('themes_jquery_hosting','jquery')}
 			{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>
 
 	{foreach from=$themeSettings key=feature item=output}
 		<div class="form-group">
-			{formlabel label=$output.label for=$feature}
-			{forminput}
-				{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) labels=false id=$feature}
-				{formhelp note=$output.note page=$output.page}
+			{forminput class="checkbox"}
+				{html_checkboxes name="$feature" values="y" checked=$gBitSystem->getConfig($feature) label=$output.label id=$feature}
+				{$output.label}
 			{/forminput}
+			{formhelp note=$output.note page=$output.page}
 		</div>
 	{/foreach}
 
diff --git a/templates/html_head_inc.tpl b/templates/html_head_inc.tpl
index c9bd88a..9d07953 100644
--- a/templates/html_head_inc.tpl
+++ b/templates/html_head_inc.tpl
@@ -1,18 +1,12 @@
-{* $Header$ *}
 {strip}
 {foreach from=$gBitThemes->mRawFiles.css item=cssFile}
 	<link rel="stylesheet" title="{$style}" type="text/css" href="{$cssFile}" media="all" />
 {/foreach}
-{*
+
 {foreach from=$gBitThemes->mRawFiles.js item=jsFile}
 	<script src="{$jsFile}" type="text/javascript"></script>
-{/foreach} *}
+{/foreach} 
 {if $gBitThemes->mStyles.joined_css}
 	<link rel="stylesheet" title="{$style}" type="text/css" href="{$gBitThemes->mStyles.joined_css}" media="all" />
 {/if}
-<link rel="stylesheet" type="text/css" href="{$smarty.const.CONFIG_PKG_URL}css/cookieconsent.dark.min.css"/>
 {/strip}
-
-{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}
diff --git a/templates/menu_themes_admin.tpl b/templates/menu_themes_admin.tpl
index 80f8ce4..82d8853 100644
--- a/templates/menu_themes_admin.tpl
+++ b/templates/menu_themes_admin.tpl
@@ -4,8 +4,8 @@
 	<li><a class="item" href="{$smarty.const.THEMES_PKG_URL}admin/admin_themes_manager.php">{tr}Change Site Theme{/tr}</a></li>
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=columns" >{tr}Column{/tr}</a></li>
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=layout" >{tr}Module Layouts{/tr}</a></li>
-	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=layout_overview" >{tr}Module{/tr}</a></li>
-	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=themes" >{tr}Theme{/tr}</a></li>
+	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=layout_overview" >{tr}Module Options{/tr}</a></li>
+	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=themes" >{tr}Theme Settings{/tr}</a></li>
 	<li><a class="item" href="{$smarty.const.KERNEL_PKG_URL}admin/index.php?page=custom_modules">{tr}Custom Modules{/tr}</a></li>
 	<li><a class="item" href="{$smarty.const.THEMES_PKG_URL}admin/menus.php">{tr}Top Menu{/tr}</a></li>
 	<li><a class="item" href="{$smarty.const.THEMES_PKG_URL}icon_browser.php">{tr}Icon Browser{/tr}</a></li>