Remove remaining hardcoded theme names

11 files changed, 30 insertions, 30 deletions

diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php
index 1d1da9e..c2d31dd 100644
--- a/usr/local/www/diag_logs_filter_summary.php
+++ b/usr/local/www/diag_logs_filter_summary.php
@@ -79,7 +79,7 @@ function stat_block($summary, $stat, $num) {
 			$numentries++;
 			$outstr = $k[$i];
 			if (is_ipaddr($outstr)) {
-				$outstr = "<a href=\"diag_dns.php?host={$outstr}\" title=\"".gettext("Reverse Resolve with DNS")."\"><img border=\"0\" src=\"/themes/nervecenter/images/icons/icon_log.gif\"></a> {$outstr}";
+				$outstr = "<a href=\"diag_dns.php?host={$outstr}\" title=\"".gettext("Reverse Resolve with DNS")."\"><img border=\"0\" src=\"/themes/{$g['theme']}/images/icons/icon_log.gif\"></a> {$outstr}";
 			} elseif (substr_count($outstr, '/') == 1) {
 				list($proto, $port) = explode('/', $outstr);
 				$service = getservbyport($port, strtolower($proto));
diff --git a/usr/local/www/diag_nanobsd.php b/usr/local/www/diag_nanobsd.php
index df3a7e4..54b4bf1 100755
--- a/usr/local/www/diag_nanobsd.php
+++ b/usr/local/www/diag_nanobsd.php
@@ -69,7 +69,7 @@ if($_POST['bootslice']) {
 	$statusmsg = gettext("Setting slice information, please wait..."); 
 	echo <<<EOF
 	 	<div id="loading">
-			<img src="/themes/metallic/images/misc/loader.gif"> 
+			<img src="/themes/{$g['theme']}/images/misc/loader.gif"> 
 			$statusmsg
 			<p/>&nbsp;
 		</div>
@@ -85,7 +85,7 @@ if($_POST['destslice']) {
 	$statusmsg = gettext("Duplicating slice.  Please wait, this will take a moment...");
 echo <<<EOF
  	<div id="loading">
-		<img src="/themes/metallic/images/misc/loader.gif">
+		<img src="/themes/{$g['theme']}/images/misc/loader.gif">
 		$statusmsg
 		<p/>&nbsp;
 	</div>
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index bbea847..827d557 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -164,8 +164,8 @@ if (!is_array($config['widgets'])) {
 	<title>{$g['product_name']}.localdomain - {$g['product_name']} first time setup</title>
 	<meta http-equiv="Content-Type" content="text/html; charset=<?=system_get_language_codeset();?>" />
 	<link rel="stylesheet" type="text/css" href="/niftycssprintCode.css" media="print" />
-	<script type="text/javascript">var theme = "nervecenter"</script>
-	<script type="text/javascript" src="/themes/nervecenter/loader.js"></script>
+	<script type="text/javascript">var theme = "{$g['theme']}"</script>
+	<script type="text/javascript" src="/themes/{$g['theme']}/loader.js"></script>
 
 EOF;
 
diff --git a/usr/local/www/installer/installer.php b/usr/local/www/installer/installer.php
index 794034e..1110992 100644
--- a/usr/local/www/installer/installer.php
+++ b/usr/local/www/installer/installer.php
@@ -674,16 +674,16 @@ function installing_gui() {
 													<center>
 													<table id='pbtable' height='15' width='640' border='0' colspacing='0' cellpadding='0' cellspacing='0'>
 														<tr>
-															<td background="/themes/the_wall/images/misc/bar_left.gif" height='15' width='5'>
+															<td background="/themes/{$g['theme']}/images/misc/bar_left.gif" height='15' width='5'>
 															</td>
 															<td>
 																<table id="progholder" name="progholder" height='15' width='630' border='0' colspacing='0' cellpadding='0' cellspacing='0'>
-																	<td background="/themes/the_wall/images/misc/bar_gray.gif" valign="top" align="left">
-																		<img src='/themes/the_wall/images/misc/bar_blue.gif' width='0' height='15' name='progressbar' id='progressbar'>
+																	<td background="/themes/{$g['theme']}/images/misc/bar_gray.gif" valign="top" align="left">
+																		<img src='/themes/{$g['theme']}/images/misc/bar_blue.gif' width='0' height='15' name='progressbar' id='progressbar'>
 																	</td>
 																</table>
 															</td>
-															<td background="/themes/the_wall/images/misc/bar_right.gif" height='15' width='5'>
+															<td background="/themes/{$g['theme']}/images/misc/bar_right.gif" height='15' width='5'>
 															</td>
 														</tr>
 													</table>
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 9e888f3..ae5928e 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -3293,7 +3293,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 		}
 		function hide_add_gatewaysave() {
 			document.getElementById("addgateway").style.display = 'none';
-			jQuery('#status').html('<img src="/themes/metallic/images/misc/loader.gif" alt="loader" /> One moment please...');
+			jQuery('#status').html('<img src="/themes/<?=$g['theme'];?>/images/misc/loader.gif" alt="loader" /> One moment please...');
 			var iface = jQuery('#if').val();
 			name = jQuery('#name').val();
 			var descr = jQuery('#gatewaydescr').val();
@@ -3313,7 +3313,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 		}
 		function hide_add_gatewaysave_v6() {
 			document.getElementById("addgatewayv6").style.display = 'none';
-			jQuery('#statusv6').html('<img src="/themes/metallic/images/misc/loader.gif" alt="loader" /> One moment please...');
+			jQuery('#statusv6').html('<img src="/themes/<?=$g['theme'];?>/images/misc/loader.gif" alt="loader" /> One moment please...');
 			var iface = jQuery('#if').val();
 			name = jQuery('#namev6').val();
 			var descr = jQuery('#gatewaydescrv6').val();
@@ -3372,7 +3372,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 				addOption(jQuery('#gateway'), gwtext, name);
 				// Auto submit form?
 				//document.iform.submit();
-				//jQuery('#status').html('<img src="/themes/metallic/images/misc/loader.gif" alt="loader /">');
+				//jQuery('#status').html('<img src="/themes/<?=$g['theme'];?>/images/misc/loader.gif" alt="loader /">');
 			} else {
 				report_failure();
 			}
@@ -3390,7 +3390,7 @@ $types6 = array("none" => gettext("None"), "staticv6" => gettext("Static IPv6"),
 				addOption_v6(jQuery('#gatewayv6'), gwtext_v6, name);
 				// Auto submit form?
 				//document.iform.submit();
-				//jQuery('#statusv6').html('<img src="/themes/metallic/images/misc/loader.gif" alt="loader" />');
+				//jQuery('#statusv6').html('<img src="/themes/<?=$g['theme'];?>/images/misc/loader.gif" alt="loader" />');
 			} else {
 				report_failure_v6();
 			}
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index 45d5f42..7959b0a 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -80,15 +80,15 @@ include("head.inc");
 					<td class="tabcont" align="center">
 						<table style="height:15;colspacing:0" width="420" border="0" cellpadding="0" cellspacing="0" summary="images">
 							<tr>
-								<td style="background:url('./themes/the_wall/images/misc/bar_left.gif')" height="15" width="5"></td>
+								<td style="background:url('./themes/<?=$g['theme'];?>/images/misc/bar_left.gif')" height="15" width="5"></td>
 								<td>
 									<table id="progholder" style="height:15;colspacing:0" width="410" border="0" cellpadding="0" cellspacing="0" summary="progress bar">
-										<tr><td style="background:url('./themes/the_wall/images/misc/bar_gray.gif')" valign="top" align="left">
+										<tr><td style="background:url('./themes/<?=$g['theme'];?>/images/misc/bar_gray.gif')" valign="top" align="left">
 											<img src='./themes/<?= $g['theme']; ?>/images/misc/bar_blue.gif' width="0" height="15" name="progressbar" id="progressbar" alt="progress bar" />
 										</td></tr>
 									</table>
 								</td>
-								<td style="background:url('./themes/the_wall/images/misc/bar_right.gif')" height="15" width="5">
+								<td style="background:url('./themes/<?=$g['theme'];?>/images/misc/bar_right.gif')" height="15" width="5">
 								</td>
 							</tr>
 						</table>
diff --git a/usr/local/www/status_filter_reload.php b/usr/local/www/status_filter_reload.php
index dcb4aeb..8a64c86 100644
--- a/usr/local/www/status_filter_reload.php
+++ b/usr/local/www/status_filter_reload.php
@@ -102,12 +102,12 @@ function update_data(obj) {
 	result_text = result_text.replace("\n","");
 	result_text = result_text.replace("\r","");
 	if (result_text) {
-		jQuery('#status').html('<img src="/themes/metallic/images/misc/loader.gif"> ' + result_text + '...');
+		jQuery('#status').html('<img src="/themes/<?=$g['theme'];?>/images/misc/loader.gif"> ' + result_text + '...');
 	} else {
-		jQuery('#status').html('<img src="/themes/metallic/images/misc/loader.gif"> Obtaining filter status...');
+		jQuery('#status').html('<img src="/themes/<?=$g['theme'];?>/images/misc/loader.gif"> Obtaining filter status...');
 	}
 	if(result_text == "Initializing") {
-		jQuery('#status').html('<img src="/themes/metallic/images/misc/loader.gif"> Initializing...');
+		jQuery('#status').html('<img src="/themes/<?=$g['theme'];?>/images/misc/loader.gif"> Initializing...');
 	} else if(result_text == "Done") {
 		jQuery('#status').effect('highlight');
 		jQuery('#status').html('Done.  The filter rules have been reloaded.');
diff --git a/usr/local/www/system_firmware_auto.php b/usr/local/www/system_firmware_auto.php
index e77a97b..2f8928b 100755
--- a/usr/local/www/system_firmware_auto.php
+++ b/usr/local/www/system_firmware_auto.php
@@ -97,15 +97,15 @@ include("head.inc");
 									<table style="height:15;colspacing:0" width="420" border="0" cellpadding="0" cellspacing="0" summary="images">
 
 										<tr>
-											<td style="background:url('./themes/the_wall/images/misc/bar_left.gif')" height="15" width="5">	</td>
+											<td style="background:url('./themes/<?=$g['theme'];?>/images/misc/bar_left.gif')" height="15" width="5">	</td>
 											<td>
 											<table id="progholder" style="height:15;colspacing:0" width="410" border="0" cellpadding="0" cellspacing="0" summary="">
-												<tr><td style="background:url('./themes/the_wall/images/misc/bar_gray.gif')" valign="top" align="left">
-												<img src="./themes/the_wall/images/misc/bar_blue.gif" width="0" height="15" name="progressbar" id="progressbar" alt="" />
+												<tr><td style="background:url('./themes/<?=$g['theme'];?>/images/misc/bar_gray.gif')" valign="top" align="left">
+												<img src="./themes/<?=$g['theme'];?>/images/misc/bar_blue.gif" width="0" height="15" name="progressbar" id="progressbar" alt="" />
 												</td></tr>
 											</table>
 											</td>
-											<td style="background:url('./themes/the_wall/images/misc/bar_right.gif')" height="15" width="5"></td>
+											<td style="background:url('./themes/<?=$g['theme'];?>/images/misc/bar_right.gif')" height="15" width="5"></td>
 										</tr>
 									</table>
 									<br />
diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php
index 8272938..dbd87ff 100755
--- a/usr/local/www/system_firmware_check.php
+++ b/usr/local/www/system_firmware_check.php
@@ -79,15 +79,15 @@ include("head.inc");
 						<table style="height:15;colspacing:0" width="420" border="0" cellpadding="0" cellspacing="0" summary="images">
 
 							<tr>
-								<td style="background:url('./themes/the_wall/images/misc/bar_left.gif')" height="15" width="5"></td>
+								<td style="background:url('./themes/<?=$g['theme'];?>/images/misc/bar_left.gif')" height="15" width="5"></td>
 								<td>
 									<table id="progholder" style="height:15;colspacing:0" width="410" border="0" cellpadding="0" cellspacing="0" summary="">
-										<tr><td style="background:url('./themes/the_wall/images/misc/bar_gray.gif')" valign="top" align="left">
-										<img src="./themes/the_wall/images/misc/bar_blue.gif" width="0" height="15" name="progressbar" id="progressbar" alt="" />
+										<tr><td style="background:url('./themes/<?=$g['theme'];?>/images/misc/bar_gray.gif')" valign="top" align="left">
+										<img src="./themes/<?=$g['theme'];?>/images/misc/bar_blue.gif" width="0" height="15" name="progressbar" id="progressbar" alt="" />
 										</td></tr>
 									</table>
 								</td>
-								<td style="background:url('./themes/the_wall/images/misc/bar_right.gif')" height="15" width="5"></td>
+								<td style="background:url('./themes/<?=$g['theme'];?>/images/misc/bar_right.gif')" height="15" width="5"></td>
 							</tr>
 						</table>
 						<br />
diff --git a/usr/local/www/system_routes_edit.php b/usr/local/www/system_routes_edit.php
index ffdfae7..7b78e30 100755
--- a/usr/local/www/system_routes_edit.php
+++ b/usr/local/www/system_routes_edit.php
@@ -373,7 +373,7 @@ include("head.inc");
 	}
 	function hide_add_gatewaysave() {
 		document.getElementById("addgateway").style.display = 'none';
-		jQuery('#status').html('<img src="/themes/metallic/images/misc/loader.gif"> One moment please...');
+		jQuery('#status').html('<img src="/themes/<?=$g['theme'];?>/images/misc/loader.gif"> One moment please...');
 		var iface = jQuery('#addinterfacegw').val();
 		name = jQuery('#name').val();
 		var descr = jQuery('#gatewaydescr').val();
diff --git a/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php b/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php
index a7e7882..879abb5 100644
--- a/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php
+++ b/usr/local/www/widgets/widgets/deactivated/cpu_graphs.widget.php
@@ -35,7 +35,7 @@ require_once("guiconfig.inc");
 require_once("pfsense-utils.inc");
 require_once("functions.inc");
 ?>
-<link  href="/themes/nervecenter/graphlink.css"  rel="stylesheet"  type="text/css"  />  
+<link  href="/themes/<?=$g['theme'];?>/graphlink.css"  rel="stylesheet"  type="text/css"  />  
 <script src="/widgets/javascript/cpu_graphs.js" type="text/javascript"></script>
 <script type="text/javascript">
     /* initialize the graph */
@@ -69,4 +69,4 @@ require_once("functions.inc");
     GraphSetVMax(graph[0], 100);
     GraphDynamicScale(graph[0]);
 
-</script>
\ No newline at end of file
+</script>