diff --git a/admin/index.php b/admin/index.php
index aeaa6441..2c60abe7 100644
--- a/admin/index.php
+++ b/admin/index.php
@@ -65,14 +65,16 @@
echo theme_icon("registration_fee_items_management")."<br />".i18n("Registration Fee Items Management")."<br /><i>(".i18n("disabled").")</i>";
echo "</td>";
echo " </tr>\n";
+
echo " <tr>";
echo " <td><a href=\"reports.php\">".theme_icon("print/export_reports")."<br />".i18n("Print / Export Reports")."</a></td>";
echo " <td><a href=\"reports_ceremony.php\">".theme_icon("print_awards_ceremony_scripts")."<br />".i18n("Print Award Ceremony Scripts")."</a></td>";
echo " <td><a href=\"reports_editor.php\">".theme_icon("report_management")."<br />".i18n("Report Management")."</a></td>";
echo " <td><a href=\"translations.php\">".theme_icon("translations_management")."<br />".i18n("Translations Management")."</a></td>";
- echo " <td>";
+
echo "</td>";
echo " </tr>\n";
+
echo " <tr>";
echo "<td></td><td></td>\n";
echo " </tr>\n";
diff --git a/committee_main.php b/committee_main.php
index 4fa38ee9..820a101c 100644
--- a/committee_main.php
+++ b/committee_main.php
@@ -47,6 +47,7 @@
echo " <td><a href=\"admin/reports.php\">".theme_icon("print/export_reports")."<br />".i18n("My Reports (View/Print/Edit)")."</a></td>";
}
echo " </tr>\n";
+
echo " <tr>\n";
echo " <td><a href=\"user_personal.php\">".theme_icon("edit_profile")."<br />".i18n("Edit My Profile")."</a></td>";
echo " <td><a href=\"user_password.php\">".theme_icon("change_password")."<br />".i18n("Change My Password")."</a></td>";
diff --git a/common.inc.php b/common.inc.php
index 393c3567..764e4bb6 100644
--- a/common.inc.php
+++ b/common.inc.php
@@ -208,7 +208,7 @@ session_start();
//detect the browser first, so we know what icons to use - we store this in the config array as well
//even though its not configurable by the fair
-if(stristr($_SERVER['HTTP_USER_AGENT'],"MSIE"))
+if(stristr(get_value_from_array($_SERVER, 'HTTP_USER_AGENT', ""),"MSIE"))
$config['icon_extension']="gif";
else
$config['icon_extension']="png";
@@ -375,7 +375,7 @@ function happy($str,$type="normal")
function display_messages()
{
/* Dump any messages in the queue */
- if(is_array($_SESSION['messages'])) {
+ if(is_array(get_value_from_array($_SESSION, 'messages'))) {
foreach($_SESSION['messages'] as $m) echo $m;
}
$_SESSION['messages'] = array();
@@ -630,7 +630,7 @@ if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config" || substr(get
$fname=substr($_SERVER['REDIRECT_SCRIPT_URL'],strlen($config['SFIABDIRECTORY'])+1);
else
$fname=substr($_SERVER['PHP_SELF'],strlen($config['SFIABDIRECTORY'])+1);
- echo "</td><td align=\"right\"><a target=\"_sfiabhelp\" href=\"http://www.sfiab.ca/wiki/index.php/Help_$fname\"><img border=\"0\" src=\"".$config['SFIABDIRECTORY']."/images/32/help.".$config['icon_extension']."\"></a>";
+ echo "</td><td align=\"right\"><a target=\"_sfiabhelp\" href=\"http://www.sfiab.ca/wiki/index.php/Help_$fname\"><img border=\"0\" src=\"".$config['SFIABDIRECTORY']."/images/32/help_science_ation.".$config['icon_extension']."\"></a>";
}
"</td></tr>";
echo "</table>";
diff --git a/config/index.php b/config/index.php
index 7b1e93c9..5475615b 100644
--- a/config/index.php
+++ b/config/index.php
@@ -42,12 +42,14 @@
echo " <td><a href=\"categories.php\">".theme_icon("project_age_categories")."<br />".i18n("Project Age Categories")."</a></td>";
echo " <td><a href=\"divisions.php\">".theme_icon("project_divisions")."<br />".i18n("Project Divisions")."</a></td>";
echo " </tr>";
+ echo "<hr class='thematic-break'/>";
echo " <tr>";
echo " <td><a href=\"divisions_cwsf.php\">".theme_icon("cwsf_project_divisions")."<br />".i18n("CWSF Project Divisions")."</a></td>";
echo " <td><a href=\"subdivisions.php\">".theme_icon("project_sub_divisions")."<br />".i18n("Project Sub-Divisions")."</a></td>";
echo " <td><a href=\"pagetexts.php\">".theme_icon("page_texts")."<br />".i18n("Page Texts")."</a></td>";
echo " <td><a href=\"signaturepage.php\">".theme_icon("exhibitor_signature_page")."<br />".i18n("Exhibitor $participationform")."</a></td>";
echo " </tr>\n";
+ echo "<hr class='thematic-break'/>";
echo " <tr>";
echo " <td><a href=\"judges_questions.php\">".theme_icon("judge_registration_questions")."<br />".i18n("Judge Registration Questions")."</a></td>";
echo " <td><a href=\"safetyquestions.php\">".theme_icon("project_safety_questions")."<br />".i18n("Project Safety Questions")."</a></td>";
@@ -71,7 +73,7 @@
echo " <td><a href=\"rolloverfiscal.php\">".theme_icon("rollover_fiscal_year")."<br />".i18n("Rollover Fiscal Year")."</a></td>";
echo " <td><a href=\"backuprestore.php\">".theme_icon("backup_restore")."<br />".i18n("Database Backup/Restore")."</a></td>";
echo " <td></td>\n";
- echo " <td></td>\n";
+
echo " </tr>";
echo "</table>\n";
diff --git a/images/32/help_science_ation.png b/images/32/help_science_ation.png
new file mode 100644
index 00000000..77dda96c
Binary files /dev/null and b/images/32/help_science_ation.png differ
diff --git a/theme/new_default/sfiab.css b/theme/new_default/sfiab.css
index 0dff4d0a..05ce5f64 100644
--- a/theme/new_default/sfiab.css
+++ b/theme/new_default/sfiab.css
@@ -62,17 +62,19 @@ table tr.odd {
border: 2px solid Silver;
padding: 5px;
font-size: 1.0em;
+ box-shadow: 2px 2px 2px black;
}
#main {
- margin-right: 10px;
+
background:#f1eeff;
padding: 3px;
border: 2px solid Silver;
min-height: 600px;
width: 99%;
+
}
#mainwhere {
@@ -161,6 +163,9 @@ a {
color: #5C6F90;
}
+
+
+
a:hover {
text-decoration: underline;
}
@@ -264,13 +269,10 @@ tr.externalaward {
color: #0000AA;
}
-.adminconfigtable {
- border-collapse: collapse;
-}
.adminconfigtable td {
text-align: center;
- padding: 5px;
+ /* padding: 5px; */
width: 128px;
color: #999999;
}
@@ -501,8 +503,32 @@ div.ui-tabs ul.ui-tabs-nav {
display: block;
}
+ .adminconfigtable tr{
+ display: grid;
+ grid-template-columns: 1fr 1fr 1fr;
+ }
}
+.thematic-break{
+ display: none;
+}
+
+@media screen and (max-width: 410px){
+
+ .adminconfigtable{
+ margin: auto;
+ }
+
+
+ .adminconfigtable tr{
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ }
+ adminconfigtable
+ .thematic-break{
+ display: block;
+ }
+}
\ No newline at end of file
diff --git a/user_personal.php b/user_personal.php
index 7475f969..cba570b2 100644
--- a/user_personal.php
+++ b/user_personal.php
@@ -352,7 +352,7 @@ echo "</table>";
if(in_array('committee', $u['types'])) {
echo "<table class='user-info-table'>";
- echo "<tr><td>".i18n("Email (Private)").":</td><td><input size=\"25\" type=\"text\" name=\"emailprivate\" value=\"{$u['emailprivate']}\" /></td></tr>\n";
+ echo "<tr><td>".i18n("Email (Private)").":</td><td><input type=\"text\" name=\"emailprivate\" value=\"{$u['emailprivate']}\" /></td></tr>\n";
echo "<tr><td>".i18n("Display Emails").":</td><td>";
if($u['displayemail']=="no") $checked="checked=\"checked\""; else $checked="";
echo "<input type=\"radio\" name=\"displayemail\" value=\"no\" $checked />".i18n("No");