From 160232869ffa4e81290d44a21237724edd95545a Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Mon, 22 Mar 2010 07:23:20 +0000
Subject: [PATCH] Updated styles

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16973 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-core/html/main.php                       |   3 ++-
 .../themes/modern/images/btn-logout-hover.png | Bin 463 -> 0 bytes
 gosa-core/html/themes/modern/style.css        |  21 +-----------------
 gosa-core/ihtml/themes/modern/framework.tpl   |   2 +-
 gosa-core/include/class_pluglist.inc          |   2 +-
 5 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 gosa-core/html/themes/modern/images/btn-logout-hover.png

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index a00d2b924..5d8a3a0ad 100644
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
@@ -267,7 +267,8 @@ if (isset($_GET['reset'])){
 }
 
 /* show web frontend */
-$smarty->assign ("logo", image("themes/modern/images/logo.png"));
+$smarty->assign ("logo", image(get_template_path("images/logo.png")));
+$smarty->assign ("logout", image(get_template_path("images/btn-logout.png"), "log-out", _("Log out")));
 $smarty->assign ("date", date("l, dS F Y H:i:s O"));
 $smarty->assign ("lang", preg_replace('/_.*$/', '', $lang));
 $smarty->assign ("must", "<span class='required'>*</span>");
diff --git a/gosa-core/html/themes/modern/images/btn-logout-hover.png b/gosa-core/html/themes/modern/images/btn-logout-hover.png
deleted file mode 100644
index 3896b7ee5156584d0c6b9d38d88a499e8c73beaf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 463
zcmV;=0WkiFP)<h;3K|Lk000e1NJLTq000mG000mO1ONa4wfZ;e00001b5ch_0Itp)
z=>Px#0%A)?L;(MXkIcUS000SaNLh0L02{9W02{9XUK)`c00007bV*G`2igJ#4m2g&
zYLo8(001I%MObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakAa8CUVIWOmV~41BLjV8)
zB}qg<R4C6q(7%h%0UXEi$LFK#5(82O?v%x#45ZGFK{42j{sE;}Op?hU3cJN(rP!20
z*UgMvN)}0y6Y4_lo`&z2*YbY$e!qLw>xD-GZ#)MLho_qcJe}atHk;7K={(f-=?mSh
zmYZ$1#lClvu2swJoSZK-(WZ`6b&DQX_3Y}P9eu3o3LR^;x=#E1R@E7ut!fcE&`Na~
zx>(iH=rDKye*1%8;GR_+8O?xqU@%~$VfgANHjLK6B;1Svn;F7@_0d~!0=&0|*U*A3
zc&mk~zO)CLZ*Mcu!>Vqe`&GSY-hXwwsvpgvxmK$B)Xh$Js`D*Pt2>8A+BYq$YVAK=
z`e%o>c4z7{(UXqD2g8bO8i#e-?Vw#Y_~O;@l1A&F{RNZy=JeQ%SEB#`002ovPDHLk
FV1l=f&T;?%

diff --git a/gosa-core/html/themes/modern/style.css b/gosa-core/html/themes/modern/style.css
index 06b1ba101..78cff011d 100644
--- a/gosa-core/html/themes/modern/style.css
+++ b/gosa-core/html/themes/modern/style.css
@@ -150,6 +150,7 @@ div.title-bar{
   height:40px;
   border-top:1px solid #111;
   border-bottom:1px solid #222;
+  background-color:#000;
   background:url('images/title-bar.png') repeat-x;
   color:#FFF;
   cursor:default;
@@ -184,19 +185,6 @@ div.logout-label {
   padding:0 5px 0 5px;
 }
 
-#log-out{
-  width:16px;
-  height:16px;
-  border:0;
-  background-color:transparent;
-  background-image:url('images/btn-logout.png');
-  cursor:pointer;
-}
-
-#log-out:hover{
-  background-image:url('images/btn-logout-hover.png')
-}
-
 
 /* Screen areas */
 
@@ -298,13 +286,6 @@ ul.path-navigation li:hover {
   background: -moz-linear-gradient(top, #EEE, #E0E0E0);
 }
 
-div.nav-home {
-  height:14px;
-  width:20px;
-  margin-top:-1px;
-  background-image:url(images/home.png);
-}
-
 .right-border {
   border-right:1px solid #C2C2C2;
 }
diff --git a/gosa-core/ihtml/themes/modern/framework.tpl b/gosa-core/ihtml/themes/modern/framework.tpl
index ce0edc45c..7e2b8d5e7 100644
--- a/gosa-core/ihtml/themes/modern/framework.tpl
+++ b/gosa-core/ihtml/themes/modern/framework.tpl
@@ -6,7 +6,7 @@
      <li class='right table-wrapper'>
        <div class='logout-label'>
          <form action='logout.php' name='logoutframe' method='post' enctype='multipart/form-data'>
-          <input type='submit' name='log-out' id='log-out' title='Log out' value=''>
+          {$logout}
           <input type='hidden' name='forcedlogout' value='1'>
           <input type="hidden" name="php_c_check" value="1">
          </form>
diff --git a/gosa-core/include/class_pluglist.inc b/gosa-core/include/class_pluglist.inc
index 791633b9f..4aea387d4 100644
--- a/gosa-core/include/class_pluglist.inc
+++ b/gosa-core/include/class_pluglist.inc
@@ -321,7 +321,7 @@ class pluglist
         "\n        <div class='plugin-path'>".
         "\n          <ul class='path-navigation'>".
         "\n            <li class='left' onClick=\"openPlugin('');\">".
-        "\n              <div class='nav-home'></div>".
+        "\n              ".image(get_template_path("images/home.png")).
         "\n            </li>".
         "\n            %navigator%";
 
-- 
2.30.2