From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 1 Mar 2010 09:38:38 +0000 (+0000)
Subject: Updated style
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e6549ef71b8ea8dce60446b4b004874787aca759;p=gosa.git

Updated style


git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@15789 594d385d-05f5-0310-b6e9-bd551577e9d8
---

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index 18c03e975..f9e19fa34 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -283,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'));
diff --git a/gosa-core/html/themes/modern/style.css b/gosa-core/html/themes/modern/style.css
index 28c41064b..339627b6d 100644
--- a/gosa-core/html/themes/modern/style.css
+++ b/gosa-core/html/themes/modern/style.css
@@ -115,8 +115,8 @@ div.title-bar ul, div.title-bar ul li{
   padding:0;
 }
 
-span.logged-in-user{
-  font-style:italic;
+div.logged-in-label span{
+  font-weight:bold;
 }
 
 li.table-wrapper {
diff --git a/gosa-core/ihtml/themes/modern/framework.tpl b/gosa-core/ihtml/themes/modern/framework.tpl
index aee92c0f3..ad40fc5be 100644
--- a/gosa-core/ihtml/themes/modern/framework.tpl
+++ b/gosa-core/ihtml/themes/modern/framework.tpl
@@ -16,8 +16,7 @@
       </div>
     </li>
     <li class='right table-wrapper'>
-      <div class='logged-in-label'>You're logged in as <span class='logged-in-user'>{$username}</span>
-      </div>
+      <div class='logged-in-label'>{$loggedin}</div>
     </li>
    </ul>
   </div>