forked from science-ation/science-ation
More UI changes
This commit is contained in:
james
parent
5321de365f
commit
39c8d90d1e
@ -452,6 +452,7 @@ function send_header($title="", $nav=null, $icon=null, $titletranslated=false)
|
||||
<script type="text/javascript">
|
||||
$(document).ready(function(){
|
||||
$('.tableview').tablesorter();
|
||||
$("#importantdatesbox").load("important_dates.php?display=box");
|
||||
});
|
||||
</script>
|
||||
<?
|
||||
@ -523,7 +524,6 @@ if(!$_SESSION['conferenceid']) {
|
||||
</div>
|
||||
<div id="header_login">
|
||||
<?
|
||||
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',
|
||||
@ -551,10 +551,10 @@ if(isset($_SESSION['users_type'])) {
|
||||
?>
|
||||
<form method="post" action="user_login.php">
|
||||
<input type="hidden" name="action" value="login" />
|
||||
<table><tr><td>
|
||||
<?=i18n("Username")?>:</td><td><input type="text" size="20" name="user" />
|
||||
<table cellspacing=1 cellpadding=1><tr><td>
|
||||
<?=i18n("Username")?>:</td><td><input type="text" size="14" name="user" />
|
||||
</td></tr><tr><td>
|
||||
<?=i18n("Password")?>:</td><td><input type="password" size="20" name="pass" />
|
||||
<?=i18n("Password")?>:</td><td><input type="password" size="14" name="pass" />
|
||||
</td></tr>
|
||||
<tr><td align="center" colspan="2">
|
||||
<a href="register.php"><?=i18n("Register")?></a>
|
||||
@ -565,29 +565,11 @@ if(isset($_SESSION['users_type'])) {
|
||||
</form>
|
||||
<?
|
||||
}
|
||||
echo "</div>";
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="primarymenu">
|
||||
<?
|
||||
//if the date is greater than the date/time that the confirmed participants gets posted,
|
||||
//then we will show the registration confirmation page as a link in the menu,
|
||||
$registrationconfirmationlink="";
|
||||
|
||||
//only display it if a date is set to begin with.
|
||||
if($config['dates']['postparticipants'] && $config['dates']['postparticipants']!="0000-00-00 00:00:00") {
|
||||
$q=mysql_query("SELECT (NOW()>'".$config['dates']['regclose']."') AS test");
|
||||
$r=mysql_fetch_object($q);
|
||||
if($r->test==1) {
|
||||
$registrationconfirmationlink="<li><a href=\"".$config['SFIABDIRECTORY']."/confirmed_participants.php\">".i18n("Confirmed Participants")."</a></li>";
|
||||
}
|
||||
}
|
||||
?>
|
||||
|
||||
<div id="left">
|
||||
<?
|
||||
|
||||
if(is_array($nav)) {
|
||||
$navkeys=array_keys($nav);
|
||||
switch($navkeys[2]) {
|
||||
@ -660,12 +642,28 @@ else if($_SESSION['registration_number'] && $_SESSION['registration_id']) {
|
||||
} else {
|
||||
}
|
||||
?></ul>
|
||||
<div class="aligncenter">
|
||||
<?
|
||||
?>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<?
|
||||
//if the date is greater than the date/time that the confirmed participants gets posted,
|
||||
//then we will show the registration confirmation page as a link in the menu,
|
||||
$registrationconfirmationlink="";
|
||||
|
||||
//only display it if a date is set to begin with.
|
||||
if($config['dates']['postparticipants'] && $config['dates']['postparticipants']!="0000-00-00 00:00:00") {
|
||||
$q=mysql_query("SELECT (NOW()>'".$config['dates']['regclose']."') AS test");
|
||||
$r=mysql_fetch_object($q);
|
||||
if($r->test==1) {
|
||||
$registrationconfirmationlink="<li><a href=\"".$config['SFIABDIRECTORY']."/confirmed_participants.php\">".i18n("Confirmed Participants")."</a></li>";
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
<div id="left">
|
||||
</div>
|
||||
*/
|
||||
?>
|
||||
<?
|
||||
|
||||
if(is_array($nav)) {
|
||||
@ -682,6 +680,8 @@ if(is_array($nav)) {
|
||||
?>
|
||||
|
||||
<div id="main">
|
||||
<div id="importantdatesbox">
|
||||
</div>
|
||||
<?
|
||||
|
||||
if(committee_auth_has_access("config") || committee_auth_has_access("admin"))
|
||||
|
||||
@ -23,16 +23,35 @@
|
||||
?>
|
||||
<?
|
||||
include "common.inc.php";
|
||||
send_header("Important Dates",null,"important_dates");
|
||||
|
||||
echo "<table>";
|
||||
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 "<h3>".i18n("Important Dates")."</h3>\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 "<br />";
|
||||
echo "<span style=\"font-style: italic\">";
|
||||
echo $d;
|
||||
echo "</span>\n";
|
||||
echo "<br />";
|
||||
echo "<br />";
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
else {
|
||||
send_header("Important Dates",null,"important_dates");
|
||||
|
||||
echo "<table>";
|
||||
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 "</table>";
|
||||
|
||||
send_footer();
|
||||
}
|
||||
?>
|
||||
|
||||
@ -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;
|
||||
|
||||
Loading…
Reference in New Issue
Block a user