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

A few more cleanups, and link the admin and config primary menu icons to real pages so we can remove the (old) links

Browse Source
This commit is contained in:
james 2010-08-20 15:42:18 +00:00
parent 02998f98d6
commit 71b0489493
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common.inc.php
View File

@ -257,7 +257,9 @@ if(is_array($_SESSION['roles'])) {
$cl="class=\"selected\""; $cl="class=\"selected\"";
} }
echo "<li id=\"primary_nav_{$r->id}\" $cl>"; echo "<li id=\"primary_nav_{$r->id}\" $cl>";
echo "<a href=\"#\" onclick=\"return taskNavLevel($r->id,0,0,0)\">".i18n($r->task)."</a>"; if($r->link) $href=$config['SFIABDIRECTORY'].$r->link;
else $href="#";
echo "<a href=\"$href\" onclick=\"return taskNavLevel($r->id,0,0,0)\">".i18n($r->task)."</a>";
echo "</li>\n"; echo "</li>\n";
} }
} }
@ -266,12 +268,14 @@ if(is_array($_SESSION['roles'])) {
?> ?>
<? <?
if(array_key_exists('users_id', $_SESSION)) { if(array_key_exists('users_id', $_SESSION)) {
/*
if(in_array('admin', $_SESSION['roles'])) { if(in_array('admin', $_SESSION['roles'])) {
echo "<li><a href=\"{$config['SFIABDIRECTORY']}/admin/\">".i18n("Administration").' (old) </a></li>'; echo "<li><a href=\"{$config['SFIABDIRECTORY']}/admin/\">".i18n("Administration").' (old) </a></li>';
} }
if(in_array('config', $_SESSION['roles'])) { if(in_array('config', $_SESSION['roles'])) {
echo "<li><a href=\"{$config['SFIABDIRECTORY']}/config/\">".i18n("Configuration").' (old) </a></li>'; echo "<li><a href=\"{$config['SFIABDIRECTORY']}/config/\">".i18n("Configuration").' (old) </a></li>';
} }
*/
if($_SESSION['superuser'] == 'yes') { if($_SESSION['superuser'] == 'yes') {
echo "<li><a href=\"{$config['SFIABDIRECTORY']}/super/\">".i18n("System Setup").'</a></li>'; echo "<li><a href=\"{$config['SFIABDIRECTORY']}/super/\">".i18n("System Setup").'</a></li>';
} }

4
theme/default/sfiab.css
View File

@ -127,6 +127,10 @@ div#help-icon {
float: right; float: right;
} }
#main-title {
min-height: 45px;
}
div.link-icon { div.link-icon {
padding: 4px; padding: 4px;
} }