[ljcom] r10681: LJSUP-8956: Calendar Minimalism

U   trunk/bin/upgrading/s2layers/sup/layout.s2

Modified: trunk/bin/upgrading/s2layers/sup/layout.s2
===================================================================
--- trunk/bin/upgrading/s2layers/sup/layout.s2	2011-06-22 08:34:16 UTC (rev 10680)
+++ trunk/bin/upgrading/s2layers/sup/layout.s2	2011-06-23 02:37:31 UTC (rev 10681)
@@ -441,7 +441,7 @@
 
 
 function _calendar(YearMonth mon, string place) { ### $place eq "sidebar" or "page"
-    var string month = $mon->month_format("%%mon%%");
+    var string month = $mon->month_format("%%month%%");
     var string year = $mon->month_format("%%yyyy%%");
     var int[] weekdays = weekdays();
     var int pre_empty = $mon.weeks[0].pre_empty;
@@ -474,6 +474,7 @@
     }
 
 if ($place == "sidebar") {
+    $month = $mon->month_format("%%mon%%");
     """<p class="sbar-cal-nav">""";
     """<span class="sbar-cal-nav-month"><i class="sbar-cal-nav-prev" title="$*text_month_prev"><i class="sbar-cal-nav-arr"></i></i><span class="sbar-cal-month"><a href="$mon.url" class="month">$month</a></span><i class="sbar-cal-nav-next" title="$*text_month_next"><i class="sbar-cal-nav-arr"></i></i></span>""";
     """<span class="sbar-cal-nav-year"><i class="sbar-cal-nav-prev" title="$*text_year_prev"><i class="sbar-cal-nav-arr"></i></i><span class="sbar-cal-year"><a href="$*base_url/$year/" class="year">$year</a></span><i class="sbar-cal-nav-next" title="$*text_year_next"><i class="sbar-cal-nav-arr"></i></i></span>""";