11 files changed, 34 insertions, 15 deletions
diff --git a/template/yoga/default-colors.css b/template/yoga/default-colors.css
index ee8cdb6e6..cdcacb953 100644
--- a/template/yoga/default-colors.css
+++ b/template/yoga/default-colors.css
@@ -100,6 +100,20 @@ INPUT.rateButton, INPUT.rateButtonSelected, INPUT.rateButtonStarFull, INPUT.rate
   padding: 1px;
 }
 
+/**
+ * Header notes box in public/administration
+ */
+.header_notes {
+  border: 1px solid #aaaaaa; /* border color and style */
+  text-align: center;
+  background-image: url(icon/note.png);
+  background-repeat: no-repeat;
+  background-position: top left;
+  font-weight: bold;
+  margin: 14px;
+  padding: 5px 00px 0px 0px;
+}
+
 LEGEND {
   font-style: italic;
 }
diff --git a/template/yoga/header.tpl b/template/yoga/header.tpl
index 3e2b43634..5032a3f04 100644
--- a/template/yoga/header.tpl
+++ b/template/yoga/header.tpl
@@ -72,3 +72,10 @@ the "text/nonsense" prevents gecko based browsers to load it -->
 </div>
 <!-- END header_msgs -->
 <div id="theHeader">{PAGE_BANNER}</div>
+<!-- BEGIN header_notes -->
+<div class="header_notes">
+  <!-- BEGIN header_note -->
+  <P>{header_notes.header_note.HEADER_NOTE}</p>
+  <!-- END header_note -->
+</div>
+<!-- END header_notes -->
diff --git a/template/yoga/icon/flat_recent_cat.png b/template/yoga/icon/flat_recent_cat.png
new file mode 100644
index 000000000..43584e825
--- /dev/null
+++ b/template/yoga/icon/flat_recent_cat.png
diff --git a/template/yoga/icon/normal_mode.png b/template/yoga/icon/normal_mode.png
index 07318b568..92d27a234 100644
--- a/template/yoga/icon/normal_mode.png
+++ b/template/yoga/icon/normal_mode.png
diff --git a/template/yoga/icon/note.png b/template/yoga/icon/note.png
new file mode 100644
index 000000000..df1e0a926
--- /dev/null
+++ b/template/yoga/icon/note.png
diff --git a/template/yoga/icon/start_filter_mode.png b/template/yoga/icon/start_filter.png
index 3d81a4d2e..3d81a4d2e 100644
--- a/template/yoga/icon/start_filter_mode.png
+++ b/template/yoga/icon/start_filter.png
diff --git a/template/yoga/icon/stop_filter_mode.png b/template/yoga/icon/stop_filter.png
index 1ff012e96..1ff012e96 100644
--- a/template/yoga/icon/stop_filter_mode.png
+++ b/template/yoga/icon/stop_filter.png
diff --git a/template/yoga/index.tpl b/template/yoga/index.tpl
index 95c6e0051..b0c2e43dc 100644
--- a/template/yoga/index.tpl
+++ b/template/yoga/index.tpl
@@ -27,16 +27,14 @@
       <li><a href="{search_rules.URL}" style="border:none;" onclick="popuphelp(this.href); return false;" title="{lang:Search rules}"><img src="{pwg_root}{themeconf:icon_dir}/search_rules.png" class="button" alt="(?)"></a></li>
       <!-- END search_rules -->
 
-      <!-- BEGIN start_filter_local_mode -->
-      <li><a href="{start_filter_local_mode.URL}" title="{lang:start_filter_local_mode_hint}"><img src="{pwg_root}{themeconf:icon_dir}/start_filter_mode.png" class="button" alt="{lang:start_filter_local_mode_hint}"></a></li>
-      <!-- END start_filter_local_mode -->
-      <!-- BEGIN stop_filter_local_mode -->
-      <li><a href="{stop_filter_local_mode.URL}" title="{lang:stop_filter_local_mode_hint}"><img src="{pwg_root}{themeconf:icon_dir}/stop_filter_mode.png" class="button" alt="{lang:stop_filter_local_mode_hint}"></a></li>
-      <!-- END stop_filter_local_mode -->
-
       <!-- BEGIN mode_normal -->
       <li><a href="{mode_normal.URL}" title="{lang:mode_normal_hint}"><img src="{pwg_root}{themeconf:icon_dir}/normal_mode.png" class="button" alt="{lang:mode_normal_hint}"></a></li>
       <!-- END mode_normal -->
+
+      <!-- BEGIN flat_recent_cat -->
+      <li><a href="{flat_recent_cat.URL}" title="{lang:flat_recent_cat_hint}"><img src="{pwg_root}{themeconf:icon_dir}/flat_recent_cat.png" class="button" alt="{lang:flat_recent_cat_hint}"></a></li>
+      <!-- END flat_recent_cat -->
+
       <!-- BEGIN mode_posted -->
       <li><a href="{mode_posted.URL}" title="{lang:mode_posted_hint}" rel="nofollow"><img src="{pwg_root}{themeconf:icon_dir}/calendar.png" class="button" alt="{lang:mode_posted_hint}"></a></li>
       <!-- END mode_posted -->
diff --git a/template/yoga/menubar.tpl b/template/yoga/menubar.tpl
index eafec20a6..317a974d8 100644
--- a/template/yoga/menubar.tpl
+++ b/template/yoga/menubar.tpl
@@ -13,12 +13,12 @@
 </dl>
 <!-- END links -->
 <dl id="mbCategories">
-  <!-- BEGIN start_filter_global_mode -->
-  <a href="{start_filter_global_mode.URL}" title="{lang:start_filter_global_mode_hint}"><img src="{pwg_root}{themeconf:icon_dir}/start_filter_mode.png" class="buttonmenu" alt="{lang:start_filter_global_mode_hint}"></a>
-  <!-- END start_filter_global_mode -->
-  <!-- BEGIN stop_filter_global_mode -->
-  <a href="{stop_filter_global_mode.URL}" title="{lang:stop_filter_global_mode_hint}"><img src="{pwg_root}{themeconf:icon_dir}/stop_filter_mode.png" class="buttonmenu" alt="{lang:stop_filter_global_mode_hint}"></a>
-  <!-- END stop_filter_global_mode -->
+  <!-- BEGIN start_filter -->
+  <a href="{start_filter.URL}" title="{lang:start_filter_hint}"><img src="{pwg_root}{themeconf:icon_dir}/start_filter.png" class="buttonmenu" alt="{lang:start_filter_hint}"></a>
+  <!-- END start_filter -->
+  <!-- BEGIN stop_filter -->
+  <a href="{stop_filter.URL}" title="{lang:stop_filter_hint}"><img src="{pwg_root}{themeconf:icon_dir}/stop_filter.png" class="buttonmenu" alt="{lang:stop_filter_hint}"></a>
+  <!-- END stop_filter -->
   <dt><a href="{U_HOME}">{lang:Categories}</a></dt>
   <dd>
     {MENU_CATEGORIES_CONTENT}
diff --git a/template/yoga/theme/clear/theme.css b/template/yoga/theme/clear/theme.css
index d49ec0322..3a60fa8a5 100644
--- a/template/yoga/theme/clear/theme.css
+++ b/template/yoga/theme/clear/theme.css
@@ -15,7 +15,7 @@ H2, #menubar DT, #imageHeaderBar, #imageToolBar A:hover, .row1 {
   background-color: #d3d3d3;
 }
 
-#menubar DL, #content, #imageToolBar {
+#menubar DL, #content, #imageToolBar, .header_notes {
   background-color: #eeeeee;
 }
 
diff --git a/template/yoga/theme/dark/theme.css b/template/yoga/theme/dark/theme.css
index 7165bf6c3..5ca520099 100644
--- a/template/yoga/theme/dark/theme.css
+++ b/template/yoga/theme/dark/theme.css
@@ -26,7 +26,7 @@ H3, #the_page, #imageHeaderBar, #imageToolBar A:hover, .row1  {
   background-color: #3f3f3f;
 }
 
-#menubar DL, #content, #imageToolBar {
+#menubar DL, #content, #imageToolBar, .header_notes {
   background-color: #5f5f5f;
 }