From 462453465b59675706e4bb305fc9a82977dbb5a9 Mon Sep 17 00:00:00 2001
From: vdigital <vdigital@piwigo.org>
Date: Sun, 6 Jul 2008 20:55:57 +0000
Subject: Transparent .png for IE6 / Help icon fixed / Tabsheet fixed / and CSS
 review (still on going)

git-svn-id: http://piwigo.org/svn/trunk@2426 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/template/yoga/admin.tpl                      | 33 +++++++++++---------
 admin/template/yoga/admin/advanced_feature.tpl     |  3 --
 admin/template/yoga/admin/cat_modify.tpl           |  3 --
 admin/template/yoga/admin/cat_move.tpl             |  3 --
 admin/template/yoga/admin/cat_options.tpl          |  3 --
 admin/template/yoga/admin/cat_perm.tpl             |  3 --
 admin/template/yoga/admin/configuration.tpl        |  3 --
 admin/template/yoga/admin/group_list.tpl           |  3 --
 admin/template/yoga/admin/history.tpl              | 11 -------
 admin/template/yoga/admin/maintenance.tpl          |  3 --
 admin/template/yoga/admin/notification_by_mail.tpl |  3 --
 admin/template/yoga/admin/permalinks.tpl           |  3 --
 admin/template/yoga/admin/site_manager.tpl         |  3 --
 admin/template/yoga/admin/site_update.tpl          |  3 --
 admin/template/yoga/admin/stats.tpl                | 11 -------
 admin/template/yoga/admin/tabsheet.tpl             |  4 ++-
 admin/template/yoga/admin/thumbnail.tpl            |  3 --
 admin/template/yoga/admin/user_list.tpl            |  3 --
 admin/template/yoga/admin/ws_checker.tpl           |  3 --
 admin/template/yoga/content.css                    |  6 ++--
 admin/template/yoga/footer.tpl                     |  2 +-
 admin/template/yoga/header.tpl                     | 36 +++++++++++-----------
 admin/template/yoga/theme/admin/theme.css          | 25 +++++++--------
 template-common/pngfix.js                          |  2 +-
 24 files changed, 56 insertions(+), 119 deletions(-)

diff --git a/admin/template/yoga/admin.tpl b/admin/template/yoga/admin.tpl
index 5f45c6c38..1c5c13035 100644
--- a/admin/template/yoga/admin.tpl
+++ b/admin/template/yoga/admin.tpl
@@ -1,8 +1,8 @@
 {* $Id$ *}
-<div id="menubar">
-  <dl class="first">
+<div id="menubar" class="png">
+  <dl class="first png">
     <dt class="rdion"><span>{'Links'|@translate}&nbsp;</span></dt>
-    <dd>
+    <dd class="png">
       <ul>
         <li><a href="{$U_RETURN}">{'home'|@translate}</a></li>
         <li><a href="{$U_FAQ}">{'instructions'|@translate}</a></li>
@@ -17,18 +17,18 @@
       </ul>
     </dd>
   </dl>
-  <dl>
+  <dl class="png">
     <dt class="rdion"><span>{'config'|@translate}&nbsp;</span></dt>
-    <dd>
+    <dd class="png">
       <ul>
         <li><a href="{$U_CONFIG_GENERAL}">{'conf_general'|@translate}</a></li>
         <li><a href="{$U_CONFIG_DISPLAY}">{'conf_display'|@translate}</a></li>
       </ul>
     </dd>
   </dl>
-  <dl>
+  <dl class="png">
     <dt class="rdion"><span>{'Categories'|@translate}&nbsp;</span></dt>
-    <dd>
+    <dd class="png">
       <ul>
         <li><a href="{$U_SITE_MANAGER}">{'Site manager'|@translate}</a></li>
         <li><a href="{$U_CAT_UPDATE}">{'update'|@translate}</a><br />&nbsp;</li>
@@ -39,9 +39,9 @@
       </ul>
     </dd>
   </dl>
-  <dl>
+  <dl class="png">
     <dt class="rdion"><span>{'Pictures'|@translate}&nbsp;</span></dt>
-    <dd>
+    <dd class="png">
       <ul>
         <li><a href="{$U_WAITING}">{'waiting'|@translate}</a></li>
         <li><a href="{$U_THUMBNAILS}">{'thumbnails'|@translate}</a></li>
@@ -51,9 +51,9 @@
       </ul>
     </dd>
   </dl>
-  <dl>
+  <dl class="png">
     <dt class="rdion"><span>{'identification'|@translate}&nbsp;</span></dt>
-    <dd>
+    <dd class="png">
       <ul>
         <li><a href="{$U_USERS}">{'users'|@translate}</a></li>
         <li><a href="{$U_GROUPS}">{'groups'|@translate}</a></li>
@@ -61,9 +61,9 @@
       </ul>
     </dd>
   </dl>
-  <dl>
+  <dl class="png">
     <dt class="rdion"><span>{'special_admin_menu'|@translate}&nbsp;</span></dt>
-    <dd>
+    <dd class="png">
       <ul>
         <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
         <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
@@ -84,7 +84,7 @@
   </dl>
 </div> <!-- menubar -->
 
-<div id="content" class="content">
+<div id="content" class="content png">
   {if isset($errors)}
   <div class="errors">
     <ul>
@@ -107,5 +107,10 @@
   {if isset($TABSHEET)}
   {$TABSHEET}
   {/if}
+  {if isset($U_HELP)}
+  <ul class="HelpActions">
+    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
+  </ul>
+  {/if}
   {$ADMIN_CONTENT}
 </div>
diff --git a/admin/template/yoga/admin/advanced_feature.tpl b/admin/template/yoga/admin/advanced_feature.tpl
index 128428ba1..4b9035d27 100644
--- a/admin/template/yoga/admin/advanced_feature.tpl
+++ b/admin/template/yoga/admin/advanced_feature.tpl
@@ -1,8 +1,5 @@
 {* $Id$ *}
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'Advanced_features'|@translate}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/cat_modify.tpl b/admin/template/yoga/admin/cat_modify.tpl
index 88e07e329..02880832d 100644
--- a/admin/template/yoga/admin/cat_modify.tpl
+++ b/admin/template/yoga/admin/cat_modify.tpl
@@ -1,8 +1,5 @@
 {* $Id$ *}
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'title_edit_cat'|@translate}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/cat_move.tpl b/admin/template/yoga/admin/cat_move.tpl
index 318a025ab..2ca670e20 100644
--- a/admin/template/yoga/admin/cat_move.tpl
+++ b/admin/template/yoga/admin/cat_move.tpl
@@ -1,9 +1,6 @@
 {* $Id$ *}
 
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'Move categories'|@translate}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/cat_options.tpl b/admin/template/yoga/admin/cat_options.tpl
index b4623acf4..2cad2afed 100644
--- a/admin/template/yoga/admin/cat_options.tpl
+++ b/admin/template/yoga/admin/cat_options.tpl
@@ -1,8 +1,5 @@
 {* $Id$ *}
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'cat_options_title'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/cat_perm.tpl b/admin/template/yoga/admin/cat_perm.tpl
index 857448112..858ff3723 100644
--- a/admin/template/yoga/admin/cat_perm.tpl
+++ b/admin/template/yoga/admin/cat_perm.tpl
@@ -1,8 +1,5 @@
 {* $Id$ *}
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'Manage permissions for a category'|@translate}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/configuration.tpl b/admin/template/yoga/admin/configuration.tpl
index 89321731f..633693ec2 100644
--- a/admin/template/yoga/admin/configuration.tpl
+++ b/admin/template/yoga/admin/configuration.tpl
@@ -1,8 +1,5 @@
 {* $Id$ *}
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'title_configuration'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/group_list.tpl b/admin/template/yoga/admin/group_list.tpl
index 274445f4b..a1d9f74f6 100644
--- a/admin/template/yoga/admin/group_list.tpl
+++ b/admin/template/yoga/admin/group_list.tpl
@@ -1,8 +1,5 @@
 {* $Id$ *}
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'title_groups'|@translate}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/history.tpl b/admin/template/yoga/admin/history.tpl
index 7092cebdb..aeb99ea56 100644
--- a/admin/template/yoga/admin/history.tpl
+++ b/admin/template/yoga/admin/history.tpl
@@ -1,16 +1,5 @@
 {* $Id$ *}
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li>
-      <a
-        href="{$U_HELP}"
-        onclick="popuphelp(this.href); return false;"
-        title="{'Help'|@translate}"
-      >
-        <img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)">
-      </a>
-    </li>
-  </ul>
   <h2>{'History'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/maintenance.tpl b/admin/template/yoga/admin/maintenance.tpl
index 59cf4ff82..b37ec864e 100644
--- a/admin/template/yoga/admin/maintenance.tpl
+++ b/admin/template/yoga/admin/maintenance.tpl
@@ -1,8 +1,5 @@
 {* $Id$ *}
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'Maintenance'|@translate}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/notification_by_mail.tpl b/admin/template/yoga/admin/notification_by_mail.tpl
index 7a491463f..ef11e52d1 100644
--- a/admin/template/yoga/admin/notification_by_mail.tpl
+++ b/admin/template/yoga/admin/notification_by_mail.tpl
@@ -1,9 +1,6 @@
 {* $Id$ *}
 
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'nbm_send_mail_to_users'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/permalinks.tpl b/admin/template/yoga/admin/permalinks.tpl
index f6a1d72ac..2e28fe538 100644
--- a/admin/template/yoga/admin/permalinks.tpl
+++ b/admin/template/yoga/admin/permalinks.tpl
@@ -1,8 +1,5 @@
 {* $Id$ *}
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'Permalinks'|@translate}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/site_manager.tpl b/admin/template/yoga/admin/site_manager.tpl
index 627181c5a..eec993b63 100644
--- a/admin/template/yoga/admin/site_manager.tpl
+++ b/admin/template/yoga/admin/site_manager.tpl
@@ -1,8 +1,5 @@
 {* $Id$ *}
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'Site manager'|@translate}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/site_update.tpl b/admin/template/yoga/admin/site_update.tpl
index fc0899a90..e3016c68b 100644
--- a/admin/template/yoga/admin/site_update.tpl
+++ b/admin/template/yoga/admin/site_update.tpl
@@ -1,9 +1,6 @@
 {* $Id$ *}
 
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'title_update'|@translate}: <a href="{$SITE_URL}">{$SITE_URL}</a></h2>
 </div>
 
diff --git a/admin/template/yoga/admin/stats.tpl b/admin/template/yoga/admin/stats.tpl
index 872f19193..f7556bc2f 100644
--- a/admin/template/yoga/admin/stats.tpl
+++ b/admin/template/yoga/admin/stats.tpl
@@ -1,17 +1,6 @@
 {* $Id$ *}
 
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li>
-      <a
-        href="{$U_HELP}"
-        onclick="popuphelp(this.href); return false;"
-        title="{'Help'|@translate}"
-      >
-        <img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)">
-      </a>
-    </li>
-  </ul>
   <h2>{'History'|@translate} {$TABSHEET_TITLE}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/tabsheet.tpl b/admin/template/yoga/admin/tabsheet.tpl
index 0d0f1084a..d9968f0b9 100644
--- a/admin/template/yoga/admin/tabsheet.tpl
+++ b/admin/template/yoga/admin/tabsheet.tpl
@@ -2,7 +2,9 @@
 {if isset($tabsheet) and count($tabsheet)}
 <ul class="tabsheet">
 {foreach from=$tabsheet key=name item=sheet}
-  <li class="{if ($name == $tabsheet_selected)}selected_tab{else}normal_tab{/if}"><a href="{$sheet.url}"><span>{$sheet.caption}</span></a></li>
+  <li class="{if ($name == $tabsheet_selected)}selected_tab{else}normal_tab{/if} png">
+    <a href="{$sheet.url}"><span class="png">{$sheet.caption}</span></a>
+  </li>
 {/foreach}
 </ul>
 {/if}
\ No newline at end of file
diff --git a/admin/template/yoga/admin/thumbnail.tpl b/admin/template/yoga/admin/thumbnail.tpl
index 6bb652caa..fff7b3dff 100644
--- a/admin/template/yoga/admin/thumbnail.tpl
+++ b/admin/template/yoga/admin/thumbnail.tpl
@@ -1,8 +1,5 @@
 {* $Id$ *}
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'title_thumbnails'|@translate}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/user_list.tpl b/admin/template/yoga/admin/user_list.tpl
index db67093f6..602576ef9 100644
--- a/admin/template/yoga/admin/user_list.tpl
+++ b/admin/template/yoga/admin/user_list.tpl
@@ -1,8 +1,5 @@
 {* $Id$ *}
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'title_liste_users'|@translate}</h2>
 </div>
 
diff --git a/admin/template/yoga/admin/ws_checker.tpl b/admin/template/yoga/admin/ws_checker.tpl
index cce3c7f49..51782da15 100644
--- a/admin/template/yoga/admin/ws_checker.tpl
+++ b/admin/template/yoga/admin/ws_checker.tpl
@@ -1,9 +1,6 @@
 {* $Id$ *}
 
 <div class="titrePage">
-  <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-  </ul>
   <h2>{'title_wscheck'|@translate} - {'web_services'|@translate}</h2>
 </div>
 
diff --git a/admin/template/yoga/content.css b/admin/template/yoga/content.css
index 80a3eb4f4..d9bfedb3a 100644
--- a/admin/template/yoga/content.css
+++ b/admin/template/yoga/content.css
@@ -6,13 +6,13 @@
 .content form { text-align: left; }
 .content dt { margin-bottom: 5px; font-style: italic;
   font-size: 110%; }
-ul.categoryActions { margin: 0 2px; width: auto;
+.content ul.categoryActions a img, ul.categoryActions a { 
+border:0; margin-bottom:-5px; }  
+ul.categoryActions { margin: 0 2px; width: auto; list-style-position:outside;
   padding: 0; text-indent: 0; list-style: none; text-align: center; }
 .content div.titrePage ul.categoryActions { float: right; }
 .content div.titrePage { padding: 0 0 3px; }
 .content ul.categoryActions li { display: inline; }
-.content ul.categoryActions a img, ul.categoryActions a {
-  border: none; margin-bottom: -5px; }
 .content div.comment { margin: 0 0 0.5em 0; padding: 0; 
   overflow: hidden; width: 100%;	/* don't ask why. It's a very usefull trick  */ }
 .content div.comment a.illustration {
diff --git a/admin/template/yoga/footer.tpl b/admin/template/yoga/footer.tpl
index 0ae5dde2c..715540d32 100644
--- a/admin/template/yoga/footer.tpl
+++ b/admin/template/yoga/footer.tpl
@@ -6,7 +6,7 @@
           don't be confusing with the public page footer
 
 *}
-<div id="copyright">
+<div id="copyright" class="png">
  <a name="EoP"></a> <!-- End of ADMIN Page -->
  {if isset($debug.TIME) }
  {'generation_time'|@translate} {$debug.TIME} ({$debug.NB_QUERIES} {'sql_queries_in'|@translate} {$debug.SQL_TIME}) -
diff --git a/admin/template/yoga/header.tpl b/admin/template/yoga/header.tpl
index 4143d0ff9..8399509f1 100644
--- a/admin/template/yoga/header.tpl
+++ b/admin/template/yoga/header.tpl
@@ -17,7 +17,7 @@
 
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/layout.css">
 <!--[if lt IE 7]>
-	<link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/fix-ie5-ie6.css">
+  <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/fix-ie5-ie6.css">
 <![endif]-->
 <link rel="stylesheet" type="text/css" media="print" href="{$ROOT_URL}template/{$themeconf.template}/print.css">
 <link rel="stylesheet" type="text/css" href="{$ROOT_URL}admin/template/{$themeconf.template}/default-colors.css">
@@ -26,39 +26,39 @@
 <script type="text/javascript" src="{$ROOT_URL}template-common/scripts.js"></script>
 <!--[if lt IE 7]>
 <style>
-	{* only because we need {$ROOT_URL} otherwise use fix-ie5-ie6.css *}
-	BODY {ldelim} behavior:url("{$ROOT_URL}template-common/csshover.htc"); }
-	A IMG, .button, .icon {ldelim}
-		behavior:url("{$ROOT_URL}template-common/tooltipfix.htc");
-	}
-	FORM {ldelim} behavior: url("{$ROOT_URL}template-common/inputfix.htc"); }
+  {* only because we need {$ROOT_URL} otherwise use fix-ie5-ie6.css *}
+  BODY {ldelim} behavior:url("{$ROOT_URL}template-common/csshover.htc"); }
+  A IMG, .button, .icon {ldelim}
+    behavior:url("{$ROOT_URL}template-common/tooltipfix.htc");
+  }
+  FORM {ldelim} behavior: url("{$ROOT_URL}template-common/inputfix.htc"); }
 </style>
 <script type="text/javascript" src="{$ROOT_URL}template-common/pngfix.js"></script>
 <![endif]-->
 
 {if not empty($head_elements)}
-	{foreach from=$head_elements item=elt}{$elt}{/foreach}
+  {foreach from=$head_elements item=elt}{$elt}{/foreach}
 {/if}
 
 </head>
 
-<body id="{$BODY_ID}">
-<div id="headbranch"></div> {* Dummy block for double background management *}
+<body id="{$BODY_ID}" class="png">
+<div id="headbranch" class="png"></div> {* Dummy block for double background management *}
 <div id="the_page">
 
 {if not empty($header_msgs)}
 <div class="header_msgs">
-	{foreach from=$header_msgs item=elt}
-	<p>{$elt}</p>
-	{/foreach}
+  {foreach from=$header_msgs item=elt}
+  {$elt}
+  {/foreach}
 </div>
 {/if}
 
-<div id="theHeader">{*$PAGE_BANNER*}</div>
+<div id="theHeader" class="png">{*$PAGE_BANNER*}</div>
 {if not empty($header_notes)}
 <div class="header_notes">
-	{foreach from=$header_notes item=elt}
-	<p>{$elt}</p>
-  	{/foreach}
+  {foreach from=$header_notes item=elt}
+  {$elt}
+  {/foreach}
 </div>
-{/if}
+{/if}
\ No newline at end of file
diff --git a/admin/template/yoga/theme/admin/theme.css b/admin/template/yoga/theme/admin/theme.css
index 587a75d75..77d867a70 100644
--- a/admin/template/yoga/theme/admin/theme.css
+++ b/admin/template/yoga/theme/admin/theme.css
@@ -19,12 +19,12 @@ input.rateButton, legend, #theAdminPage h3 { color: #777; }
   text-align:left; top:110px; width:550px; z-index: 3; }
 #copyright { color:#777; margin:60px auto 0px 240px; text-align:center; 
 padding-bottom: 15px;
-background:transparent url(images/tuft_of_grass-bg.png) no-repeat scroll left bottom; }
+/* background:transparent url(images/tuft_of_grass-bg.png) no-repeat scroll left bottom;  */}
 .header_notes {
 background: transparent url(../../../../../template/yoga/icon/note.png) no-repeat right top;
-border:0; font-weight:bold;
-padding:5px 60px 0 0; position:absolute; right:0;
-text-align:right; top:90px; width:550px; }
+border:0; font-weight:bold; min-height: 48px;
+padding:15px 60px 0 0; position:absolute; right:0;
+text-align:right; top:90px; width:550px;  }
 
 /* backgrounds */
 html, body { min-height: 100%; }
@@ -35,10 +35,6 @@ body {
 #the_page { 
 border:0; display:block; margin: 0; padding-bottom: 0; z-index: 1; top:0px;
 padding-top: 0; min-height: 100%; width:100%; position:absolute; left:0px; }
-#tuft { /* to be removed */
-border:0; display:block; margin: 0; padding: 0; z-index: 99; bottom:0px;
-min-height: 31px; width:87px; position:absolute; right:0px;
-background:transparent url(images/tuft_of_grass-bg.png) no-repeat fixed right bottom; }
 #headbranch { 
 background:transparent url(images/top-left-bg.png) no-repeat scroll left top; 
 border:0; display:block; margin: 0; padding: 0; width: 233px;
@@ -49,8 +45,8 @@ height: 240px; position:absolute; left:0px; top:0px; z-index: 0; }
   min-height:105px; }
 h3, #imageToolBar a:hover, .row1, .content { background-color: #222; }
 .row2 { background-color:#111; }
-#content { background: #222 url(images/fillet.png) repeat-x top left; }
-.content { min-height: 466px; padding:0px 5px 5px 5px; margin: 0 10px 0 248px; z-index:99; }
+#content { background: #222 url(images/fillet.png) repeat-x top left; min-height: 466px; }
+.content { padding:0px 5px 5px 5px; margin: 0 10px 0 248px; z-index:99; }
 .content h3 { font-size:20px; letter-spacing:-0.4px; margin:0 20px 12px 0;
  text-align:right; background:none; border: 0; }
 .content h4 { font-size:14px; text-align:left; padding:3px; margin: 2px;}
@@ -89,20 +85,21 @@ a:hover { color: #f33; border-color: #FF3363; }
 margin:0 20px; height:95px; overflow:hidden; padding:0; position:absolute; 
 right:0; text-align:right; top:0; width:770px; }
 
-
+.HelpActions a { border:0; margin:4px 14px 0 0; position:absolute; right:0; }
+.HelpActions li {list-style-image:none; list-style-position:outside; 
+list-style-type:none; text-align:center; text-indent:0pt; }
 fieldset#uploadConf input { margin-left:5%; width:160px; }
 table.table2 th { padding:3px 30px; }
 table.table2 tr.throw { text-align: center; }
 table.table2 { margin:0pt auto; }
 .sort { display:block; padding:8px 5px 0px 1px; }
-
 /* tabsheets are often used in admin  pages => No specific css files */
 .tabsheet { 
 background-color:transparent; border:0; display:table; 
 float:right; font-family:verdana,arial,helvetica,sans-serif;
 font-size:8px; line-height:14px; list-style-image:none;
 margin: 0; padding: 0; position:relative; text-decoration:none;
-top:-2px; white-space:nowrap; width:710px; }
+top:-2px; white-space:nowrap; margin: 0 22px 0 0;}
 .tabsheet li {
 float:left; margin: 0; padding: 0; text-align:right; overflow: hidden;
 width:136px !important; border: 0; }
@@ -125,7 +122,7 @@ background:transparent url(images/menuBoxBottom_new.png) no-repeat scroll left b
 border:0; display:inline; float:left; left:0; margin: 0 0 0 35px; min-height:468px;
 padding:0; width:207px; z-index:99; text-align: left; /*  "be nice to IE5" rule */ }
 #menubar .selected a { color: #f70; border-color: #f36; }
-#menubar .selected a:hover { color: #f33; border-bottom: 1px solid #f33;}
+#menubar .selected a:hover { color: #f36; border-bottom: 1px solid #f36;}
 #menubar dd { 
 background: transparent url(images/menubar-detail.png) repeat-y top left; 
 margin: 0; padding: 0; height:232px; display:block; }
diff --git a/template-common/pngfix.js b/template-common/pngfix.js
index 549761a1d..31db8bdd6 100644
--- a/template-common/pngfix.js
+++ b/template-common/pngfix.js
@@ -10,7 +10,7 @@ function correctPNG()
    for(var i=0; i<document.images.length; i++)
       {
       var img = document.images[i]
-      if (img.className == "button" || img.className == "icon")
+      if (img.className == "button" || img.className == "icon"  || img.className == "png")
           {
 	  var imgName = img.src.toUpperCase()
 	  if (imgName.substring(imgName.length-3, imgName.length) == "PNG")
-- 
cgit v1.2.3