From 39c8d90d1eff618676fe199f524ec8117e78e5e2 Mon Sep 17 00:00:00 2001 From: james Date: Fri, 9 Jul 2010 20:25:31 +0000 Subject: [PATCH] More UI changes --- common.inc.php | 54 ++++++++++++++++----------------- important_dates.php | 28 ++++++++++++++--- theme/default/sfiab.css | 66 +++++++++++++++++++++++++++-------------- 3 files changed, 95 insertions(+), 53 deletions(-) diff --git a/common.inc.php b/common.inc.php index f1870c3..4599698 100644 --- a/common.inc.php +++ b/common.inc.php @@ -452,6 +452,7 @@ function send_header($title="", $nav=null, $icon=null, $titletranslated=false)
"; if(isset($_SESSION['users_type'])) { $types = array('volunteer' => 'Volunteer', 'judge' => 'Judge', 'student'=>'Participant','committee'=>'Committee Member', @@ -551,10 +551,10 @@ if(isset($_SESSION['users_type'])) { ?>
-
- : +
+ :
- : + :
@@ -565,29 +565,11 @@ if(isset($_SESSION['users_type'])) { "; ?> - +
'".$config['dates']['regclose']."') AS test"); - $r=mysql_fetch_object($q); - if($r->test==1) { - $registrationconfirmationlink="
  • ".i18n("Confirmed Participants")."
    • "; - } - } -?> - -
    - -
    - -
    +
    +'".$config['dates']['regclose']."') AS test"); + $r=mysql_fetch_object($q); + if($r->test==1) { + $registrationconfirmationlink="
  • ".i18n("Confirmed Participants")."
    • "; + } + } + +/* +
    +
    +*/ +?>
    +
    +
    "; if($conference['id']) { $q=mysql_query("SELECT *,UNIX_TIMESTAMP(date) AS udate FROM dates WHERE conferences_id='{$conference['id']}' ORDER BY date"); } else { $q=mysql_query("SELECT *,UNIX_TIMESTAMP(date) AS udate FROM dates WHERE year='{$config['FAIRYEAR']}' ORDER BY date"); } - while($r=mysql_fetch_object($q)) - { + + if($_GET['display']=="box") { + echo "

    ".i18n("Important Dates")."

    \n"; + + while($r=mysql_fetch_object($q)) { + if($r->date != '0000-00-00 00:00:00') { + $d = format_datetime($r->udate); + echo i18n($r->description); + echo "
    "; + echo ""; + echo $d; + echo "\n"; + echo "
    "; + echo "
    "; + } + } + + } + else { + send_header("Important Dates",null,"important_dates"); + + echo ""; + while($r=mysql_fetch_object($q)) { $trclass = ($trclass == 'odd') ? 'even' : 'odd'; if($r->date != '0000-00-00 00:00:00') { $d = format_datetime($r->udate); @@ -42,4 +61,5 @@ echo "
    "; send_footer(); + } ?> diff --git a/theme/default/sfiab.css b/theme/default/sfiab.css index cb19e19..7f2e431 100644 --- a/theme/default/sfiab.css +++ b/theme/default/sfiab.css @@ -32,6 +32,8 @@ table tr.odd { font-size: 0.95em; background-color: white; text-align: right; + background: #E0E0FF; + border-bottom: 1px solid silver; } #header { @@ -39,7 +41,7 @@ table tr.odd { text-align: center; background: #E0E0FF; padding: 5px; - border-bottom: 2px solid grey; + border-bottom: 2px solid silver; margin-bottom: 5px; height: 70px; } @@ -65,7 +67,6 @@ table tr.odd { } #header_login { - font-size: 1.1em; border: 1px solid #777777; background-color: #DDDDDD; position: absolute; @@ -74,18 +75,14 @@ table tr.odd { width: 200px; } -#footer { - width: 100%; - margin-top: 5px; +#primarymenu { text-align: center; - background-color : #5C6F90; - font-size: 0.8em; -} - -#footer a { - text-decoration: none; - font-size: 1em; - color: #FFFFFF; + background: #E0E0FF; + padding: 2px; + border-bottom: 1px solid silver; + margin-top: 0px; + margin-bottom: 5px; + height: 24px; } #left { @@ -100,12 +97,11 @@ table tr.odd { #main { - margin-right: 3px; - margin-left: 185px; background: #FFFFFF; padding: 3px; border: 2px solid Silver; min-height: 600px; + margin: auto; } #mainwhere { @@ -119,6 +115,31 @@ table tr.odd { font-size: 0.85em; } +#importantdatesbox { + position: absolute; + float: right; + right: 0px; + top: 141px; + width: 280px; + border: 2px solid silver; + background-color: #E0E0FF; + padding: 5px; +} + +#footer { + width: 100%; + margin-top: 5px; + text-align: center; + background-color : #5C6F90; + font-size: 0.8em; +} + +#footer a { + text-decoration: none; + font-size: 1em; + color: #FFFFFF; +} + #emptypopup { padding: 30px; @@ -154,26 +175,27 @@ ul.mainnav { list-style : none; margin : 0; padding : 0; - background-color : #d6d6d6; - width: 165px; + border: 0px; } ul.mainnav li { - display : block; - border-top : 1px solid #a5b5c6; + display: block; + float: left; + border: 1px solid black; + margin-right: 5px; } ul.mainnav li a { display : block; - margin : 0; - padding : 6px; + padding : 3px; background-color : #5C6F90; - font : bold 0.9em/1.5em Arial, sans-serif; + font-weight: bold; color : #fff; text-decoration : none; } ul.mainnav li a:hover { + display : block; background-color : #63616b; color : #eee; text-decoration: none;