diff --git a/common.inc.php b/common.inc.php index d94e30f..b8c8649 100644 --- a/common.inc.php +++ b/common.inc.php @@ -435,10 +435,9 @@ function send_header($title="", $nav=null, $icon=null, $titletranslated=false) if($HEADER_SENT) return; else $HEADER_SENT=true; - echo "\n"; ?> - - + + <? if($title && !$titletranslated) echo i18n($title); else if($title) echo $title; else echo i18n($config['fairname']); ?> @@ -549,10 +548,10 @@ if(isset($_SESSION['users_type'])) { } else { ?> -
+ @@ -696,20 +695,18 @@ if(committee_auth_has_access("config")) if(committee_auth_has_access("admin")) admin_warnings(); -echo "
- : + :
:
"; +if(substr(getcwd(),-6)!="/admin" && substr(getcwd(),-7)!="/config" && substr(getcwd(),-6)!="/super") { +?> +
+
+"; - echo theme_icon($icon); - echo ""; -echo "
"; + echo "
"; + echo theme_icon($icon); + echo "
"; } -else - echo "		"; - -if($title && !$titletranslated) - echo "

".i18n($title)."

"; -else if($title) - echo "

".$title."

"; //if we're under /admin or /config then we want to show the ? help icon if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config" || substr(getcwd(),-6)=="/super") { @@ -717,16 +714,13 @@ if(substr(getcwd(),-6)=="/admin" || substr(getcwd(),-7)=="/config" || substr(get $fname=substr($_SERVER['REDIRECT_SCRIPT_URL'],strlen($config['SFIABDIRECTORY'])+1); else $fname=substr($_SERVER['PHP_SELF'],strlen($config['SFIABDIRECTORY'])+1); - echo "		"; -} else { - ?> -
-
- "; } -echo "
"; +if($title && !$titletranslated) + echo "

".i18n($title)."

"; +else if($title) + echo "

".$title."

"; display_messages(); } diff --git a/theme/default/sfiab.css b/theme/default/sfiab.css index 7f2e431..41f5aab 100644 --- a/theme/default/sfiab.css +++ b/theme/default/sfiab.css @@ -116,10 +116,7 @@ table tr.odd { } #importantdatesbox { - position: absolute; float: right; - right: 0px; - top: 141px; width: 280px; border: 2px solid silver; background-color: #E0E0FF; @@ -155,8 +152,8 @@ h1 { h2 { font-size: 1.6em; font-weight: bold; - margin-top: 0; - margin-bottom: .3em; + margin-top: 0.10em; + margin-bottom: 0.80em; } h3 { font-size: 1.4em;