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")."
".i18n("Registration Fee Items Management")."
(".i18n("disabled").")"; echo ""; echo " \n"; + echo " "; echo " ".theme_icon("print/export_reports")."
".i18n("Print / Export Reports")."
"; echo " ".theme_icon("print_awards_ceremony_scripts")."
".i18n("Print Award Ceremony Scripts")."
"; echo " ".theme_icon("report_management")."
".i18n("Report Management")."
"; echo " ".theme_icon("translations_management")."
".i18n("Translations Management")."
"; - echo " "; + echo ""; echo " \n"; + echo " "; echo "\n"; echo " \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 " ".theme_icon("print/export_reports")."
".i18n("My Reports (View/Print/Edit)")."
"; } echo " \n"; + echo " \n"; echo " ".theme_icon("edit_profile")."
".i18n("Edit My Profile")."
"; echo " ".theme_icon("change_password")."
".i18n("Change My Password")."
"; 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 ""; + echo ""; } ""; echo ""; 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 " ".theme_icon("project_age_categories")."
".i18n("Project Age Categories")."
"; echo " ".theme_icon("project_divisions")."
".i18n("Project Divisions")."
"; echo " "; + echo "
"; echo " "; echo " ".theme_icon("cwsf_project_divisions")."
".i18n("CWSF Project Divisions")."
"; echo " ".theme_icon("project_sub_divisions")."
".i18n("Project Sub-Divisions")."
"; echo " ".theme_icon("page_texts")."
".i18n("Page Texts")."
"; echo " ".theme_icon("exhibitor_signature_page")."
".i18n("Exhibitor $participationform")."
"; echo " \n"; + echo "
"; echo " "; echo " ".theme_icon("judge_registration_questions")."
".i18n("Judge Registration Questions")."
"; echo " ".theme_icon("project_safety_questions")."
".i18n("Project Safety Questions")."
"; @@ -71,7 +73,7 @@ echo " ".theme_icon("rollover_fiscal_year")."
".i18n("Rollover Fiscal Year")."
"; echo " ".theme_icon("backup_restore")."
".i18n("Database Backup/Restore")."
"; echo " \n"; - echo " \n"; + echo " "; echo "\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 ""; if(in_array('committee', $u['types'])) { echo ""; - echo "\n"; + echo "\n"; echo "
".i18n("Email (Private)").":
".i18n("Email (Private)").":
".i18n("Display Emails").":"; if($u['displayemail']=="no") $checked="checked=\"checked\""; else $checked=""; echo "".i18n("No");