Updated styles

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

diff --git a/gosa-core/html/main.php b/gosa-core/html/main.php
index a00d2b924c9700805ec72598fa673f20060bc8c5..5d8a3a0ad7ceb55b5ae6de01f6e2e77596904eae 100644 (file)
--- 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 (file)
index 3896b7e..0000000
Binary files a/gosa-core/html/themes/modern/images/btn-logout-hover.png and /dev/null differ

diff --git a/gosa-core/html/themes/modern/style.css b/gosa-core/html/themes/modern/style.css
index 06b1ba101e12b63eee7b0cb0e9a69636c072f303..78cff011d6a978a28972c2acae91f2425881a768 100644 (file)
--- 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 ce0edc45cdac10d4d0350132760237eb577bffb7..7e2b8d5e7841889916b9ee3b83aacb73aca562ef 100644 (file)
--- 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 791633b9f5eccffe33246d223e63b2406e062752..4aea387d4d765956d3a4e3a407e32b016c8679df 100644 (file)
--- 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%";