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

Add new div's as directed by UI guys

Browse Source
This commit is contained in:
james 2010-08-19 18:55:34 +00:00
parent de52f85ec3
commit f0907a5d47
2 changed files with 46 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
common.inc.php
View File

@ -47,11 +47,13 @@ function send_header($title="", $nav=null, $icon=null, $titletranslated=false) {
<link rel="stylesheet" href="<?=$config['SFIABDIRECTORY']?>/theme/<?=$config['theme']?>/jquery-ui-1.7.2.custom.css" type="text/css" media="all" /> <link rel="stylesheet" href="<?=$config['SFIABDIRECTORY']?>/theme/<?=$config['theme']?>/jquery-ui-1.7.2.custom.css" type="text/css" media="all" />
<link rel="stylesheet" href="<?=$config['SFIABDIRECTORY']?>/theme/<?=$config['theme']?>/sfiab.css" type="text/css" media="all" /> <link rel="stylesheet" href="<?=$config['SFIABDIRECTORY']?>/theme/<?=$config['theme']?>/sfiab.css" type="text/css" media="all" />
<link rel="stylesheet" href="<?=$config['SFIABDIRECTORY']?>/tableeditor.css" type="text/css" media="all" /> <link rel="stylesheet" href="<?=$config['SFIABDIRECTORY']?>/tableeditor.css" type="text/css" media="all" />
<meta charset="UTF-8">
</head> </head>
<body> <body>
<script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/jquery/1.3.2/jquery.min.js"></script> <script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/jquery/1.3.2/jquery.min.js"></script>
<script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/jqueryui/1.7.2/jquery-ui.min.js"></script> <script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/jqueryui/1.7.2/jquery-ui.min.js"></script>
<script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/sfiab.js"></script> <script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/sfiab.js"></script>
<script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/nav.js"></script>
<script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/tablesorter/jquery.tablesorter.min.js"></script> <script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/tablesorter/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/validate/jquery.validate.pack.js"></script> <script type="text/javascript" src="<?=$config['SFIABDIRECTORY']?>/js/validate/jquery.validate.pack.js"></script>
<script type="text/javascript"> <script type="text/javascript">
@ -60,53 +62,6 @@ $(document).ready(function(){
if($("#importantdatesbox").length) if($("#importantdatesbox").length)
$("#importantdatesbox").load("important_dates.php?display=box"); $("#importantdatesbox").load("important_dates.php?display=box");
}); });
function taskNavLevel(l1,l2,l3,l4) {
if(l2) {
//we have a secondary click, which implies we also have a primary nav selected
//we may or may not have l3 or l4 though, so they are handled separately below
$("#secondarymenu").load("<?=$config['SFIABDIRECTORY']?>/nav.php?level=1&id="+l1,null,function() {
$("#secondarymenu").show();
$("#tertiarymenu_accordion").accordion("destroy");
$("#tertiarymenu_accordion").load("<?=$config['SFIABDIRECTORY']?>/nav.php?level=2&id="+l2,null,function() {
$("#tertiarymenu_accordion").accordion({clearStyle: true, collapsible: true, active: false}); //"option", "collapsible", true);
$("#tertiarymenu").show();
$(".primarynav-selected").removeClass("primarynav-selected");
$("#primary_nav_"+l1).addClass("primarynav-selected");
$(".secondarynav-selected").removeClass("secondarynav-selected");
$("#secondary_nav_"+l2).addClass("secondarynav-selected");
//if we have a 3rd level nav, open up the accordion to the appropriate place
if(l3) {
$("#tertiarymenu_accordion").accordion("activate",$("#tertiary_nav_"+l3));
}
//if we have a 4th level nav, set the selected class on the appropriate item in the list
if(l4) {
$(".tertiarylinknav-selected").removeClass("tertiarylinknav-selected");
$("#tertiarylink_nav_"+l4).addClass("tertiarylinknav-selected");
}
});
});
}
else {
//only the primary link clicked, so show the secondary, and thats it.
$("#secondarymenu").load("<?=$config['SFIABDIRECTORY']?>/nav.php?level=1&id="+l1,null,function() {
$(".primarynav-selected").removeClass("primarynav-selected");
$("#primary_nav_"+l1).addClass("primarynav-selected");
//show the secondary
$("#secondarymenu").show();
//and hide the tertiary
$("#tertiarymenu").hide();
});
}
}
</script> </script>
<? <?
//if we're under /admin or /config we also want the translation editor //if we're under /admin or /config we also want the translation editor
@ -114,8 +69,12 @@ if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config")
require_once("../translationseditor.inc.php"); require_once("../translationseditor.inc.php");
?> ?>
<div id="notice_area" class="notice_area"></div> <div id="page-wrapper">
<div id="topnav"> <div id="page">
<div id="page-inner">
<div id="upper-section" class="clear">
<div id="notice_area" class="notice_area"></div>
<div id="topnav" class="clear">
<? <?
echo "<form name=\"languageselect\" method=\"get\" action=\"".$_SERVER['PHP_SELF']."\">"; echo "<form name=\"languageselect\" method=\"get\" action=\"".$_SERVER['PHP_SELF']."\">";
echo "<a href=\"{$config["SFIABDIRECTORY"]}/contact.php\">".i18n("Contact Us")."</a> &nbsp; | &nbsp; \n"; echo "<a href=\"{$config["SFIABDIRECTORY"]}/contact.php\">".i18n("Contact Us")."</a> &nbsp; | &nbsp; \n";
@ -131,9 +90,9 @@ if(count($config['languages'])>1) {
} }
echo "</form>"; echo "</form>";
?> ?>
</div> </div>
<div id="header"> <div id="header" class="clear">
<div id="header_logo"> <div id="header-logo">
<? <?
echo "<a href=\"{$config['SFIABDIRECTORY']}/index.php\">"; echo "<a href=\"{$config['SFIABDIRECTORY']}/index.php\">";
if(file_exists($prependdir."data/{$conference['id']}-logo-100.gif")) { if(file_exists($prependdir."data/{$conference['id']}-logo-100.gif")) {
@ -145,8 +104,8 @@ if(file_exists($prependdir."data/{$conference['id']}-logo-100.gif")) {
} }
echo "</a>"; echo "</a>";
?> ?>
</div> </div>
<div id="header_title"> <div id="header-title">
<? <?
if(!$_SESSION['conferences_id']) { if(!$_SESSION['conferences_id']) {
@ -157,8 +116,8 @@ if(!$_SESSION['conferences_id']) {
} }
?> ?>
</div> </div>
<div id="header_conferences"> <div id="header-conferences">
<? <?
$q=mysql_query("SELECT * FROM conferences WHERE status='running' ORDER BY name"); $q=mysql_query("SELECT * FROM conferences WHERE status='running' ORDER BY name");
if(mysql_num_rows($q)) { if(mysql_num_rows($q)) {
@ -168,14 +127,14 @@ if(!$_SESSION['conferences_id']) {
$cl="class=\"selected\""; $cl="class=\"selected\"";
else else
$cl=""; $cl="";
echo "<li $cl><a $cl href=\"{$config['SFIABDIRECTORY']}/user_login.php?action=switchconference&switchconference=$r->id\">$r->name</a></li>\n"; echo "<li $cl><a $cl href=\"{$config['SFIABDIRECTORY']}/user_login.php?action=switchconference&amp;switchconference=$r->id\">$r->name</a></li>\n";
} }
echo "</ul>\n"; echo "</ul>\n";
} }
?> ?>
</div> </div>
<div id="header_login"> <div id="header-login">
<? <?
if(isset($_SESSION['roles']) && $_SESSION['username']) { if(isset($_SESSION['roles']) && $_SESSION['username']) {
echo i18n("Logged in as %1",array($_SESSION['username']))."<br />"; echo i18n("Logged in as %1",array($_SESSION['username']))."<br />";
@ -204,12 +163,12 @@ if(isset($_SESSION['roles']) && $_SESSION['username']) {
?> ?>
<form method="post" action="user_login.php"> <form method="post" action="user_login.php">
<input type="hidden" name="action" value="login" /> <input type="hidden" name="action" value="login" />
<table cellspacing=1 cellpadding=1><tr><td> <table><tr><td>
<?=i18n("Username")?>:</td><td><input type="text" size="14" name="username" /> <?=i18n("Username")?>:</td><td><input type="text" size="14" name="username" />
</td></tr><tr><td> </td></tr><tr><td>
<?=i18n("Password")?>:</td><td><input type="password" size="14" name="password" /> <?=i18n("Password")?>:</td><td><input type="password" size="14" name="password" />
</td></tr> </td></tr>
<tr><td align="center" colspan="2"> <tr><td style="text-align: center;" colspan="2">
<a href="register.php"><?=i18n("Register")?></a> <a href="register.php"><?=i18n("Register")?></a>
&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
<input type="submit" value=<?=i18n("Login")?> /> <input type="submit" value=<?=i18n("Login")?> />
@ -219,9 +178,11 @@ if(isset($_SESSION['roles']) && $_SESSION['username']) {
<? <?
} }
?> ?>
</div> </div>
</div> </div>
<div id="primarymenu"> </div>
<div id="navigation-section" class="clear">
<div id="primarymenu">
<? <?
if(is_array($nav)) { if(is_array($nav)) {
$navkeys=array_keys($nav); $navkeys=array_keys($nav);
@ -332,13 +293,14 @@ if(array_key_exists('users_id', $_SESSION)) {
} }
?> ?>
</ul> </ul>
</div> </div>
<div id="secondarymenu"> <div id="secondarymenu">
</div> </div>
<div id="tertiarymenu"> <div id="tertiarymenu">
<div id="tertiarymenu_accordion"> <div id="tertiarymenu_accordion">
</div> </div>
</div> </div>
</div>
<? <?
@ -399,7 +361,7 @@ if(is_array($nav)) {
*/ */
?> ?>
<div id="main"> <div id="main" class="clear">
<? <?
if(is_array($_SESSION['roles'])) { if(is_array($_SESSION['roles'])) {
@ -414,14 +376,12 @@ if(is_array($_SESSION['roles'])) {
admin_warnings(); admin_warnings();
} }
/*
if(substr(getcwd(),-6)!="/admin" && substr(getcwd(),-7)!="/config" && substr(getcwd(),-6)!="/super") { if(substr(getcwd(),-6)!="/admin" && substr(getcwd(),-7)!="/config" && substr(getcwd(),-6)!="/super") {
?> ?>
<div id="importantdatesbox"> <div id="importantdatesbox">
</div> </div>
<? <?
} }
*/
if($icon && theme_icon($icon)) { if($icon && theme_icon($icon)) {
echo "<div style=\"float: left; margin-right: 5px;\">"; echo "<div style=\"float: left; margin-right: 5px;\">";
@ -452,7 +412,8 @@ function send_footer() {
global $config; global $config;
?> ?>
</div> </div>
<div id="footer"> <div id="lower-section" class="clear">
<div id="footer">
<? <?
//we only show the debug session variables if we have an ODD numbered version. //we only show the debug session variables if we have an ODD numbered version.
if(substr($config['version'], -1) % 2 != 0) if(substr($config['version'], -1) % 2 != 0)
@ -464,9 +425,13 @@ if(substr($config['version'], -1) % 2 != 0)
} }
echo "<a target=\"blank\" href=\"http://www.sfiab.ca\">SFIAB Version ".$config['version']."{$extra}</a>"; echo "<a target=\"blank\" href=\"http://www.sfiab.ca\">SFIAB Version ".$config['version']."{$extra}</a>";
?> ?>
</div> </div><!--footer-->
<div id="debug" style="display:<?=($_SESSION['debug']=='true')?'block':'none'?>; font-family:monospace; white-space:pre; " >Debug...</div> <div id="debug" style="display:<?=($_SESSION['debug']=='true')?'block':'none'?>; font-family:monospace; white-space:pre; " >Debug...</div>
<iframe id="content" src="" style="visibility:hidden; width:0px; height:0px"></iframe> <iframe id="content" src="" style="visibility:hidden; width:0px; height:0px"></iframe>
</div><!--lower-section-->
</div><!--page-inner-->
</div><!--page-->
</div><!--page-wrapper-->
</body> </body>
</html> </html>

8
theme/default/sfiab.css
View File

@ -46,19 +46,19 @@ table tr.odd {
height: 70px; height: 70px;
} }
#header_logo { #header-logo {
position: absolute; position: absolute;
width: 170px; width: 170px;
text-align: center; text-align: center;
} }
#header_title { #header-title {
position: absolute; position: absolute;
left: 200px; left: 200px;
margin-right: 380px; margin-right: 380px;
} }
#header_conferences { #header-conferences {
border: 1px solid #777777; border: 1px solid #777777;
position: absolute; position: absolute;
right: 210px; right: 210px;
@ -66,7 +66,7 @@ table tr.odd {
background-color: #DDDDDD; background-color: #DDDDDD;
} }
#header_login { #header-login {
border: 1px solid #777777; border: 1px solid #777777;
background-color: #DDDDDD; background-color: #DDDDDD;
position: absolute; position: absolute;