2 files changed, 13 insertions, 13 deletions
diff --git a/template/yoga/category.tpl b/template/yoga/category.tpl
index 11acfa853..0942a0f2d 100644
--- a/template/yoga/category.tpl
+++ b/template/yoga/category.tpl
@@ -138,19 +138,23 @@
       <!-- END normal_view -->
     </ul>
     
-  <h2>{TITLE}</h2>
-    
+  <h2>{TITLE}
+  <!-- BEGIN calendar -->
+  <br/>{calendar.TITLE}
+  <!-- END calendar --></h2>
   </div> <!-- content -->
     
 <!-- BEGIN calendar -->
-<!-- BEGIN styles -->
-<div class="calendarStyles">Style: {calendar.styles.BAR}</div>
-<!-- END styles -->
-
 <!-- BEGIN views -->
-<div class="calendarViews">{calendar.views.BAR}</div>
+<div class="calendarViews">
+<select onchange="document.location = this.options[this.selectedIndex].value;">
+<!-- BEGIN view -->
+  <option value="{calendar.views.view.VALUE}" {calendar.views.view.SELECTED}>{calendar.views.view.CONTENT}</option>
+<!-- END view -->
+</select>
+</div><br/>
 <!-- END views -->
-<br/>
+
 <!-- BEGIN navbar -->
 <div class="navigationBar">{calendar.navbar.BAR}</div>
 <!-- END navbar -->
diff --git a/template/yoga/content.css b/template/yoga/content.css
index cc85cbc1e..fa45ab676 100644
--- a/template/yoga/content.css
+++ b/template/yoga/content.css
@@ -179,12 +179,8 @@ SPAN.filename:after {
 }
 
 
-#content DIV.calendarStyles {
-  float: left;
-}
-
 #content DIV.calendarViews {
-  float: right;
+  float: left;
 }
 
 SPAN.cal {