3 files changed, 68 insertions, 12 deletions
diff --git a/template/yoga/category.tpl b/template/yoga/category.tpl
index 906db4dfa..fc7d2a651 100644
--- a/template/yoga/category.tpl
+++ b/template/yoga/category.tpl
@@ -107,6 +107,16 @@
   <div class="titrePage">
     <ul class="categoryActions">
       <li>&nbsp;</li>
+      <!-- BEGIN preferred_image_order -->
+      <li>
+      {lang:Sort order}:
+      <select onchange="document.location = this.options[this.selectedIndex].value;">
+        <!-- BEGIN order -->
+        <option value="{preferred_image_order.order.URL}" {preferred_image_order.order.SELECTED_OPTION}>{preferred_image_order.order.DISPLAY}</option>
+        <!-- END order -->
+      </select>
+      </li>
+      <!-- END preferred_image_order -->
       
       <!-- BEGIN caddie -->
       <li><a href="{caddie.URL}" title="{lang:add to caddie}"><img src="{themeconf:icon_dir}/caddie_add.png" class="button" alt="{lang:caddie}"/></a></li>
@@ -119,18 +129,13 @@
       <!-- BEGIN search_rules -->
       <li><a href="{search_rules.URL}" style="border:none;" onclick="popuphelp(this.href); return false;" title="{lang:Search rules}"><img src="{themeconf:icon_dir}/search_rules.png" class="button" alt="(?)"></a></li>
       <!-- END search_rules -->
-
-      <!-- BEGIN preferred_image_order -->
-      <li>
-      {lang:Sort order}:
-      <select onchange="document.location = this.options[this.selectedIndex].value;">
-        <!-- BEGIN order -->
-        <option value="{preferred_image_order.order.URL}" {preferred_image_order.order.SELECTED_OPTION}>{preferred_image_order.order.DISPLAY}</option>
-        <!-- END order -->
-      </select>
-      </li>
-      <!-- END preferred_image_order -->
-      <a href="{U_CALENDAR}">Toggle calendar</a>
+      
+      <!-- BEGIN calendar_view -->
+      <li><a href="{calendar_view.URL}" title="{lang:calendar}"><img src="{themeconf:icon_dir}/calendar.png" class="button" alt="{lang:calendar}"></a></li>
+      <!-- END calendar_view -->
+      <!-- BEGIN normal_view -->
+      <li><a href="{normal_view.URL}" title="{lang:calendar}"><img src="{themeconf:icon_dir}/calendar.png" class="button" alt="{lang:calendar}"></a></li>
+      <!-- END normal_view -->
     </ul>
     
   <h2>{TITLE}</h2>
@@ -143,9 +148,22 @@
 <!-- END calendar -->
 
 <!-- BEGIN calendar -->
+
+<!-- BEGIN styles -->
+<div class="calendarStyles">Style: {calendar.styles.BAR}</div>
+<!-- END styles -->
+
+<!-- BEGIN views -->
+<div class="calendarViews">{calendar.views.BAR}</div>
+<!-- END views -->
+<br/>
 <!-- BEGIN navbar -->
 <div class="navigationBar">{calendar.navbar.BAR}</div>
 <!-- END navbar -->
+
+<!-- BEGIN calbar -->
+<div class="calendarBar">{calendar.calbar.BAR}</div>
+<!-- END calbar -->
 <!-- END calendar -->
 
 <!-- BEGIN thumbnails -->
diff --git a/template/yoga/content.css b/template/yoga/content.css
index 8bb5df33d..cc85cbc1e 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -177,3 +177,41 @@ SPAN.filename:before {
 SPAN.filename:after {
   content: "]";
 }
+
+
+#content DIV.calendarStyles {
+  float: left;
+}
+
+#content DIV.calendarViews {
+  float: right;
+}
+
+SPAN.cal {
+  font-weight: bold;
+  border: 1px solid gray;
+  margin: 0 2px;
+}
+
+SPAN.calSel {
+  font-weight: bold;
+  color: dark-gray;
+  border: 1px solid gray;
+  margin: 0 2px;
+}
+
+#content .calendarBar {
+  margin: 8px 5px;
+  text-align: left;
+}
+
+SPAN.calCalHead {
+  font-weight: bold;
+  font-size: 110%;
+  margin: 0 2px;
+}
+
+SPAN.calCal {
+  margin: 0 2px;
+}
+
diff --git a/template/yoga/icon/calendar.png b/template/yoga/icon/calendar.png
new file mode 100644
index 000000000..e0a44a13d
--- /dev/null
+++ b/template/yoga/icon/calendar.png