arman/science-ation
1
1
Fork 0
forked from science-ation/science-ation
Code Pull Requests Activity

Final UI changes for the day....

Browse Source
This commit is contained in:
james 2010-07-09 20:35:05 +00:00
parent 39c8d90d1e
commit 5956a15754
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
common.inc.php
View File

@ -529,9 +529,9 @@ if(isset($_SESSION['users_type'])) {
'student'=>'Participant','committee'=>'Committee Member', 'student'=>'Participant','committee'=>'Committee Member',
'fair'=>'Science Fair'); 'fair'=>'Science Fair');
if($_SESSION['users_type'] != false) { if($_SESSION['users_type'] != false) {
echo i18n($types[$_SESSION['users_type']]); echo i18n($types[$_SESSION['users_type']])."<br />";
} }
echo " {$_SESSION['email']}: "; echo " {$_SESSION['email']} <br />";
if($_SESSION['multirole'] == true) { if($_SESSION['multirole'] == true) {
echo "<a href=\"{$config['SFIABDIRECTORY']}/user_multirole.php\">[".i18n('Switch Roles')."]</a> "; echo "<a href=\"{$config['SFIABDIRECTORY']}/user_multirole.php\">[".i18n('Switch Roles')."]</a> ";
} }
@ -591,6 +591,7 @@ if(is_array($nav)) {
?> ?>
<ul class="mainnav"> <ul class="mainnav">
<? <?
echo "<li><a href=\"{$config['SFIABDIRECTORY']}/index.php\">".i18n("Home").'</a></li>';
echo "<li><a href=\"{$config['SFIABDIRECTORY']}/important_dates.php\">".i18n("Important Dates").'</a></li>'; echo "<li><a href=\"{$config['SFIABDIRECTORY']}/important_dates.php\">".i18n("Important Dates").'</a></li>';
echo $registrationconfirmationlink; echo $registrationconfirmationlink;
/* /*
@ -602,10 +603,7 @@ if(is_array($nav)) {
*/ */
echo "<li><a href=\"{$config['SFIABDIRECTORY']}/committees.php\">".i18n("Committee").'</a></li>'; echo "<li><a href=\"{$config['SFIABDIRECTORY']}/committees.php\">".i18n("Committee").'</a></li>';
echo "<li><a href=\"{$config['SFIABDIRECTORY']}/winners.php\">".i18n("Winners").'</a></li>'; echo "<li><a href=\"{$config['SFIABDIRECTORY']}/winners.php\">".i18n("Winners").'</a></li>';
echo '</ul>';
?> ?>
<br />
<ul class="mainnav">
<? <?
if($_SESSION['users_type'] == 'committee') { if($_SESSION['users_type'] == 'committee') {
echo "<li><a href=\"{$config['SFIABDIRECTORY']}/user_personal.php\">".i18n("My Profile").'</a></li>'; echo "<li><a href=\"{$config['SFIABDIRECTORY']}/user_personal.php\">".i18n("My Profile").'</a></li>';
@ -619,7 +617,6 @@ if($_SESSION['users_type'] == 'committee') {
if(committee_auth_has_access("super")){ if(committee_auth_has_access("super")){
echo "<li><a href=\"{$config['SFIABDIRECTORY']}/super/\">".i18n("System Setup").'</a></li>'; echo "<li><a href=\"{$config['SFIABDIRECTORY']}/super/\">".i18n("System Setup").'</a></li>';
} }
echo "<li><a href=\"{$config['SFIABDIRECTORY']}/user_login.php?action=logout\">".i18n("Logout").'</a></li>';
} else if($_SESSION['users_type']=="judge") { } else if($_SESSION['users_type']=="judge") {
echo "<li><a href=\"{$config['SFIABDIRECTORY']}/user_personal.php\">".i18n("My Profile").'</a></li>'; echo "<li><a href=\"{$config['SFIABDIRECTORY']}/user_personal.php\">".i18n("My Profile").'</a></li>';
echo "<li><a href=\"{$config['SFIABDIRECTORY']}/judge_main.php\">".i18n("Judge Home").'</a></li>'; echo "<li><a href=\"{$config['SFIABDIRECTORY']}/judge_main.php\">".i18n("Judge Home").'</a></li>';
@ -665,7 +662,7 @@ else if($_SESSION['registration_number'] && $_SESSION['registration_id']) {
*/ */
?> ?>
<? <?
/*
if(is_array($nav)) { if(is_array($nav)) {
echo "<div id=\"mainwhere\">".i18n('You are here:').' '; echo "<div id=\"mainwhere\">".i18n('You are here:').' ';
foreach($nav as $t=>$l) { foreach($nav as $t=>$l) {
@ -677,11 +674,10 @@ if(is_array($nav)) {
echo $title; echo $title;
echo '</div>'; echo '</div>';
} }
*/
?> ?>
<div id="main"> <div id="main">
<div id="importantdatesbox">
</div>
<? <?
if(committee_auth_has_access("config") || committee_auth_has_access("admin")) if(committee_auth_has_access("config") || committee_auth_has_access("admin"))
@ -707,18 +703,23 @@ else if($title)
echo "<h2>".$title."</h2>"; echo "<h2>".$title."</h2>";
//if we're under /admin or /config then we want to show the ? help icon //if we're under /admin or /config then we want to show the ? help icon
if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config") if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config" || substr(getcwd(),-6)=="/super") {
{
if($_SERVER['REDIRECT_SCRIPT_URL']) if($_SERVER['REDIRECT_SCRIPT_URL'])
$fname=substr($_SERVER['REDIRECT_SCRIPT_URL'],strlen($config['SFIABDIRECTORY'])+1); $fname=substr($_SERVER['REDIRECT_SCRIPT_URL'],strlen($config['SFIABDIRECTORY'])+1);
else else
$fname=substr($_SERVER['PHP_SELF'],strlen($config['SFIABDIRECTORY'])+1); $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.".$config['icon_extension']."\"></a>";
} else {
?>
<div id="importantdatesbox">
</div>
<?
} }
"</td></tr>";
echo "</td></tr>";
echo "</table>"; echo "</table>";
display_messages(); display_messages();
} }
/* END OF send_header */ /* END OF send_header */