6 files changed, 29 insertions, 22 deletions
diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index 47d6ecf95..c95eb014e 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -15,7 +15,6 @@
     <dd>
       <ul>
         <li><a href="{U_CONFIG_GENERAL}">{lang:general}</a></li>
-        <li><a href="{U_CONFIG_COMMENTS}">{lang:comments}</a></li>
         <li><a href="{U_CONFIG_DISPLAY}">{lang:conf_default}</a></li>
       </ul>
     </dd>
@@ -60,13 +59,7 @@
     <dt>{lang:special_admin_menu}</dt>
     <dd>
       <ul>
-        <li>
-          {lang:history}
-          <ul>
-            <li><a href="{U_HISTORY_STAT}">{lang:Statistics}</a></li>
-            <li><a href="{U_HISTORY_SEARCH}">{lang:Search}</a></li>
-          </ul>
-        </li>
+        <li><a href="{U_HISTORY_STAT}">{lang:history}</a></li>
         <li><a href="{U_MAINTENANCE}">{lang:Maintenance}</a></li>
         <li><a href="{U_ADVANCED_FEATURE}">{lang:Advanced_features}</a></li>
         <!-- BEGIN web_services -->
diff --git a/template/yoga/admin/configuration.tpl b/template/yoga/admin/configuration.tpl
index a6b14e1e5..0cf53dcd3 100644
--- a/template/yoga/admin/configuration.tpl
+++ b/template/yoga/admin/configuration.tpl
@@ -3,15 +3,14 @@
   <ul class="categoryActions">
     <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
-  <h2>{lang:title_configuration}</h2>
+  <h2>{lang:title_configuration} {TABSHEET_TITLE}</h2>
+  {TABSHEET}
 </div>
 
 <form method="post" action="{F_ACTION}" class="properties">
 
 <!-- BEGIN general -->
 <fieldset id="generalConf">
-  <legend>{lang:conf_general_title}</legend>
-
   <ul>
     <li>
       <span class="property">
@@ -91,8 +90,6 @@
 
 <!-- BEGIN comments -->
 <fieldset id="commentsConf">
-  <legend>{lang:conf_comments_title}</legend>
-
   <ul>
     <li>
       <label>
@@ -135,8 +132,6 @@
 <!-- END comments -->
 <!-- BEGIN default -->
 <fieldset id="commentsConf">
-  <legend>{lang:conf_default_title}</legend>
-
   <ul>
     <li>
       <span class="property">
diff --git a/template/yoga/admin/default-layout.css b/template/yoga/admin/default-layout.css
index 7d6f50502..b2a012b1b 100644
--- a/template/yoga/admin/default-layout.css
+++ b/template/yoga/admin/default-layout.css
@@ -160,6 +160,7 @@ FIELDSET#generalConf TEXTAREA.description {
   margin-left: auto; margin-right: auto;
   text-decoration : none;
   background: transparent;
+  border-bottom: 1px solid #fff;
 }
 
 .tabsheet li {
@@ -167,10 +168,13 @@ FIELDSET#generalConf TEXTAREA.description {
   text-align: center;
   margin: 0 6px;
   color: white;
-  font-size: 120%;
+  font-size: 110%;
   font-weight: bold;
   padding: 4px 8px;
   border: 1px solid #fff;
+  border-radius: 6px 6px 0px 0px;	/* round corners with CSS3 compliant browsers */
+  -moz-border-radius: 6px 6px 0px 0px;	/* round corners with CSS3 compliant browsers */
+  padding: 5px 2em 2px 2em;
 }
 
 /* Tabsheet */
diff --git a/template/yoga/admin/history.tpl b/template/yoga/admin/history.tpl
index 43b1440ae..570118797 100644
--- a/template/yoga/admin/history.tpl
+++ b/template/yoga/admin/history.tpl
@@ -10,7 +10,8 @@
       </a>
     </li>
   </ul>
-  <h2>{lang:History}</h2>
+  <h2>{lang:History} {TABSHEET_TITLE}</h2>
+  {TABSHEET}
 </div>
 
 <form class="filter" method="post" name="filter" action="{F_ACTION}">
diff --git a/template/yoga/admin/stats.tpl b/template/yoga/admin/stats.tpl
index 3f1b90fe8..64bff0fa9 100644
--- a/template/yoga/admin/stats.tpl
+++ b/template/yoga/admin/stats.tpl
@@ -1,5 +1,19 @@
 <!-- $Id$ -->
-<h2>{lang:title_history}</h2>
+<div class="titrePage">
+  <ul class="categoryActions">
+    <li>
+      <a
+        href="{U_HELP}"
+        onclick="popuphelp(this.href); return false;"
+        title="{lang:Help}"
+      >
+        <img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)">
+      </a>
+    </li>
+  </ul>
+  <h2>{lang:History} {TABSHEET_TITLE}</h2>
+  {TABSHEET}
+</div>
 
 <h3>{L_STAT_TITLE}</h3>
 
diff --git a/template/yoga/theme/p0w0/theme.css b/template/yoga/theme/p0w0/theme.css
index a85ef6ed7..1b1f2efc3 100644
--- a/template/yoga/theme/p0w0/theme.css
+++ b/template/yoga/theme/p0w0/theme.css
@@ -277,14 +277,14 @@ input.submit:active {
 .qsearch { font-size: 80%; font-style: italic; }
 * { outline: none; }
 
-.tabsheet { border-bottom: 1px solid #369; }
+.tabsheet {
+  border-bottom: 1px solid #369;
+}
+
 .tabsheet li {
   background: #369;
   color: white;
   border: 1px solid #fff;
-  border-radius: 6px 6px 0px 0px;	/* round corners with CSS3 compliant browsers */
-  -moz-border-radius: 6px 6px 0px 0px;	/* round corners with CSS3 compliant browsers */
-  padding: 5px 2em 2px 2em;
 }
 
 .tabsheet a {