Changed the name of "Default" theme folder to "Classic"

2025-01-30 18:03:49 +00:00 · 2025-01-30 18:03:49 +00:00 · a98df7ac09
commit a98df7ac09
parent 0c9a22d898
21 changed files with 1033 additions and 1011 deletions
--- a/common.inc.php
+++ b/common.inc.php
@ -276,7 +276,7 @@ function i18n($str, $args = array(), $argsdesc = array(), $forcelang = '')
 				if (count($argsdesc)) {
 					$argsdescstring = '';
 					$n = 1;
-					foreach ($argsdesc AS $ad) {
+					foreach ($argsdesc as $ad) {
 						$argsdescstring .= "%$n=$ad, ";
 						$n++;
 					}
@ -353,10 +353,13 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated =
 ?>
 	<!DOCTYPE html>
 	<html>
+
 	<head>
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
-<title><? if ($title && !$titletranslated) echo i18n($title); else if ($title) echo $title; else echo i18n($config['fairname']); ?></title>
+		<title><? if ($title && !$titletranslated) echo i18n($title);
+				else if ($title) echo $title;
+				else echo i18n($config['fairname']); ?></title>

 		<link rel="stylesheet" href="https://code.jquery.com/ui/1.14.1/themes/base/jquery-ui.css">
 		<link rel="stylesheet" href="<?= $config['SFIABDIRECTORY'] ?>/theme/<?= $config['theme'] ?>/sfiab.css" type="text/css" media="all" />
@ -364,8 +367,11 @@ function send_header($title = '', $nav = null, $icon = null, $titletranslated =
 		<link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined" rel="stylesheet" />

 	</head>
+
 	<body>
-<!-- <? if ($title && !$titletranslated) echo i18n($title); else if ($title) echo $title; else echo i18n($config['fairname']); ?> -->
+		<!-- <? if ($title && !$titletranslated) echo i18n($title);
+				else if ($title) echo $title;
+				else echo i18n($config['fairname']); ?> -->
 		<script src="https://code.jquery.com/jquery-3.7.1.js"></script>
 		<script src="https://code.jquery.com/jquery-migrate-3.5.2.js"></script>

@ -394,6 +400,7 @@ $(document).ready(function(){

 			echo '<h1>' . i18n($config['fairname']) . '</h1>';

+			
 			if ($config['theme'] == 'science_ation')
 				echo "<span id='menu-toggle-button' onClick='toggle_sidebar()' class='material-symbols-outlined'>
 					  menu
@ -405,9 +412,13 @@ menu
 		<?
 		echo '<div align="right" style="font-size: 0.75em;">';
 		if (isset($_SESSION['users_type'])) {
-		$types = array('volunteer' => 'Volunteer', 'judge' => 'Judge',
-			'student' => 'Participant', 'committee' => 'Committee Member',
-			'fair' => 'Science Fair');
+			$types = array(
+				'volunteer' => 'Volunteer',
+				'judge' => 'Judge',
+				'student' => 'Participant',
+				'committee' => 'Committee Member',
+				'fair' => 'Science Fair'
+			);
 			if ($_SESSION['users_type'] != false) {
 				echo i18n($types[$_SESSION['users_type']]);
 			}
@ -432,7 +443,8 @@ menu
 		?>

 		<table id='content' cellpadding="5" width="100%">
-<tr><td id='sidebar' width="175">
+			<tr>
+				<td id='sidebar' width="175">
 					<?
 					global $pdo;
 					// if the date is greater than the date/time that the confirmed participants gets posted,
@ -525,7 +537,7 @@ menu
 									echo '<br />';
 									echo '<form name="languageselect" method="get" action="' . $_SERVER['PHP_SELF'] . '">';
 									echo "<select name=\"switchlanguage\" onchange=\"document.forms.languageselect.submit()\">\n";
-		foreach ($config['languages'] AS $key => $val) {
+									foreach ($config['languages'] as $key => $val) {
 										if ($_SESSION['lang'] == $key)
 											$selected = 'selected="selected"';
 										else
@ -546,7 +558,8 @@ menu
 							?>

 					</div>
-</td><td id='main-content'>
+				</td>
+				<td id='main-content'>
 					<?

 					if (is_array($nav)) {
@ -606,7 +619,9 @@ function send_footer()
 					{
 						global $config;
 						?>
-</td></tr></table>
+				</td>
+			</tr>
+		</table>
 		</div>
 		<div id="footer">
 			<?
@ -633,6 +648,7 @@ function send_footer()
 		<iframe id="content" src="" style="visibility:hidden; width:0px; height:0px"></iframe>

 	</body>
+
 	</html>

 <?
@ -653,6 +669,7 @@ function send_popup_header($title = '')
 ?>
 	<!DOCTYPE html>
 	<html>
+
 	<head>
 		<meta charset="utf-8" />
 		<meta name="viewport" content="width=device-width, initial-scale=1" />
@ -664,6 +681,7 @@ function send_popup_header($title = '')
 		<link href="https://fonts.googleapis.com/icon?family=Material+Icons"
 			rel="stylesheet">
 	</head>
+
 	<body onLoad="window.focus()">
 		<script src="https://code.jquery.com/jquery-3.7.1.js"></script>
 		<script src="https://code.jquery.com/jquery-migrate-3.5.2.js"></script>
@ -698,6 +716,7 @@ function send_popup_footer()
 		<iframe id="content" src="" style="visibility:hidden; width:0px; height:0px"></iframe>

 	</body>
+
 	</html>
 <?
 					}
@ -901,7 +920,7 @@ function communication_replace_vars($text, &$u, $otherrep = array())
 						}

 						$rep = array_merge($userrep, $otherrep);
-	foreach ($rep AS $k => $v) {
+						foreach ($rep as $k => $v) {
 							$text = preg_replace("\[$k\]", $v, $text);
 						}
 						return $text;
@ -941,18 +960,18 @@ function email_send($val, $to, $sub_subject = array(), $sub_body = array())

 							/* Eventually we should just do this with communication_replace_vars() */
 							if (count($sub_subject)) {
-			foreach ($sub_subject AS $sub_k => $sub_v) {
+								foreach ($sub_subject as $sub_k => $sub_v) {
 									$subject = preg_replace("\[$sub_k\]", "$sub_v", $subject);
 								}
 							}
 							if (count($sub_body)) {
-			foreach ($sub_body AS $sub_k => $sub_v) {
+								foreach ($sub_body as $sub_k => $sub_v) {
 									$body = preg_replace("\[$sub_k\]", "$sub_v", $body);
 								}
 							}

 							if (count($sub_body)) {
-			foreach ($sub_body AS $sub_k => $sub_v) {
+								foreach ($sub_body as $sub_k => $sub_v) {
 									$bodyhtml = preg_replace("\[$sub_k\]", "$sub_v", $bodyhtml);
 								}
 							}
@ -1312,14 +1331,12 @@ function colour_to_percent($percent)
 						if ($percent <= 50)
 							$red = 255;
 						else
-		$red = (100 - $percent) * 2 / 100 * 255;
-	;
+							$red = (100 - $percent) * 2 / 100 * 255;;

 						if ($percent > 50)
 							$green = 255;
 						else
-		$green = ($percent) * 2 / 100 * 255;
-	;
+							$green = ($percent) * 2 / 100 * 255;;

 						//    echo "red=$red";
 						//    echo "green=$green";
@ -1444,7 +1461,12 @@ function wordify($val, $monetize = false)
 						}
 						$val = intval($val);
 						$powerofthousand = array(
-		'', 'Thousand', 'Million', 'Billion', 'trillion', 'quadrillion'
+							'',
+							'Thousand',
+							'Million',
+							'Billion',
+							'trillion',
+							'quadrillion'
 						);
 						$n = 0;
 						if (!$val) {
--- a/theme/classic/images/ui-bg_flat_55_999999_40x100.png
+++ b/theme/classic/images/ui-bg_flat_55_999999_40x100.png
--- a/theme/classic/images/ui-bg_flat_75_aaaaaa_40x100.png
+++ b/theme/classic/images/ui-bg_flat_75_aaaaaa_40x100.png
--- a/theme/classic/images/ui-bg_glass_45_0078ae_1x400.png
+++ b/theme/classic/images/ui-bg_glass_45_0078ae_1x400.png
--- a/theme/classic/images/ui-bg_glass_55_f8da4e_1x400.png
+++ b/theme/classic/images/ui-bg_glass_55_f8da4e_1x400.png
--- a/theme/classic/images/ui-bg_glass_75_79c9ec_1x400.png
+++ b/theme/classic/images/ui-bg_glass_75_79c9ec_1x400.png
--- a/theme/classic/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
+++ b/theme/classic/images/ui-bg_gloss-wave_45_e14f1c_500x100.png
--- a/theme/classic/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
+++ b/theme/classic/images/ui-bg_gloss-wave_50_6eac2c_500x100.png
--- a/theme/classic/images/ui-bg_gloss-wave_75_2191c0_500x100.png
+++ b/theme/classic/images/ui-bg_gloss-wave_75_2191c0_500x100.png
--- a/theme/classic/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
+++ b/theme/classic/images/ui-bg_inset-hard_100_fcfdfd_1x100.png
--- a/theme/classic/images/ui-icons_0078ae_256x240.png
+++ b/theme/classic/images/ui-icons_0078ae_256x240.png
--- a/theme/classic/images/ui-icons_056b93_256x240.png
+++ b/theme/classic/images/ui-icons_056b93_256x240.png
--- a/theme/classic/images/ui-icons_d8e7f3_256x240.png
+++ b/theme/classic/images/ui-icons_d8e7f3_256x240.png
--- a/theme/classic/images/ui-icons_e0fdff_256x240.png
+++ b/theme/classic/images/ui-icons_e0fdff_256x240.png
--- a/theme/classic/images/ui-icons_f5e175_256x240.png
+++ b/theme/classic/images/ui-icons_f5e175_256x240.png
--- a/theme/classic/images/ui-icons_f7a50d_256x240.png
+++ b/theme/classic/images/ui-icons_f7a50d_256x240.png
--- a/theme/classic/images/ui-icons_fcd113_256x240.png
+++ b/theme/classic/images/ui-icons_fcd113_256x240.png
--- a/theme/classic/jquery-ui-1.7.2.custom.css
+++ b/theme/classic/jquery-ui-1.7.2.custom.css
--- a/theme/classic/sfiab.css
+++ b/theme/classic/sfiab.css
--- a/theme/classic/theme.php
+++ b/theme/classic/theme.php
@ -20,8 +20,8 @@
   Boston, MA 02111-1307, USA.
 */

-	$theme['name']="Default";
-	$theme['description']="The default theme";
+	$theme['name']="Classic";
+	$theme['description']="The classic theme";
 	$theme['author']="James Grant <james@lightbox.org>";

 ?>
--- a/theme/icons_default/icons.php
+++ b/theme/icons_default/icons.php
@ -20,7 +20,7 @@
   Boston, MA 02111-1307, USA.
 */

-	$theme_icons['name']="Default Icons";
+	$theme_icons['name']="Classic Theme Icons";
 	$theme_icons['description']="KDE4 icons";
 	$theme_icons['author']="James Grant <james@lightbox.org>";