Added blank element. Removed old "new" pic.

[gosa.git] / gosa-core / html / main.php

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 7ff1ba336c8ff93d6480a6f31ce6c5ba3659d817..f9e19fa341a9299e1d01dd558d2d8b7b107829e3 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -265,6 +265,7 @@ if (isset($_GET['reset'])){
 }
 
 /* show web frontend */
+$smarty->assign ("logo", "<div style='float:left'>".image("themes/modern/images/logo.png")."</div>");
 $smarty->assign ("date", date("l, dS F Y H:i:s O"));
 $smarty->assign ("lang", preg_replace('/_.*$/', '', $lang));
 $smarty->assign ("must", "<font class=\"must\">*</font>");
@@ -282,9 +283,9 @@ if (session::global_get('js')==FALSE){
 }
 
 if($ui->ignore_acl_for_current_user()){
-  $smarty->assign ("username", "<font color='#FF0000';>"._("User ACL checks disabled")."</font>&nbsp;".$ui->username);
+  $smarty->assign ("loggedin", "<font color='red';>"._("ACLs are disabled")."</font>&nbsp;".sprintf("You're logged in as <span>%s [%s]</span>", $ui->cn, $ui->username));
 }else{
-  $smarty->assign ("username", $ui->username);
+  $smarty->assign ("loggedin", sprintf("You're logged in as <span>%s [%s]</span>", $ui->cn, $ui->username));
 }
 $smarty->assign ("go_logo", get_template_path('images/go_logo.png'));
 $smarty->assign ("go_base", get_template_path('images/dtree.png'));
@@ -299,8 +300,8 @@ $smarty->assign ("go_help", get_template_path('images/help.png'));
 if($reload_navigation){
   $plist->menu="";
 }
-$plist->gen_menu();
-$smarty->assign ("menu", $plist->menu);
+$smarty->assign ("menu", $plist->gen_menu());
+$smarty->assign ("pathMenu", $plist->genPathMenu());
 $smarty->assign ("plug", "$plug");
 
 $smarty->assign("iePngWorkaround", $config->get_cfg_value("iePngWorkaround","false" ) == "true");