[Fmsystem-commits] [9364]

[Torstein]

Revision: 9364
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9364
Author:   vator
Date:     2012-05-10 14:21:12 +0000 (Thu, 10 May 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/templates/base/calendar/view_calendar_month.xsl
    trunk/controller/templates/base/css/base.css

Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2012-05-10 13:56:59 UTC (rev 9363)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2012-05-10 14:21:12 UTC (rev 9364)
@@ -42,7 +42,7 @@
                        
                        <xsl:call-template name="icon_color_map" />
                        
-                       <a style="display:block;font-weight: bold;font-size: 
14px;float:left;">
+                       <a id="showYear">
                                <xsl:attribute name="href">
                                        
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
                                        <xsl:text>&amp;year=</xsl:text>
@@ -52,30 +52,34 @@
                                </xsl:attribute>
                                Årsoversikt
                        </a>
-                       <a style="display:block;font-weight: bold;font-size: 
14px;float:left;">
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
-                                       <xsl:text>&amp;year=</xsl:text>
-                                       <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;month=</xsl:text>
-                                       <xsl:value-of select="current_month - 
1"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:value-of select="$location_code"/>
-                               </xsl:attribute>
-                               <xsl:value-of select="current_month"/>
-                       </a>
-                       <a style="display:block;font-weight: bold;font-size: 
14px;float:left;">
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
-                                       <xsl:text>&amp;year=</xsl:text>
-                                       <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;month=</xsl:text>
-                                       <xsl:value-of select="current_month + 
1"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:value-of select="$location_code"/>
-                               </xsl:attribute>
-                               <xsl:value-of select="current_month + 1"/>
-                       </a>
+                       <div id="monthNav">
+                               <a id="showPrevMonth">
+                                       <xsl:attribute name="href">
+                                               
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+                                               <xsl:text>&amp;year=</xsl:text>
+                                               <xsl:value-of 
select="current_year"/>
+                                               <xsl:text>&amp;month=</xsl:text>
+                                               <xsl:value-of 
select="current_month - 1"/>
+                                               
<xsl:text>&amp;location_code=</xsl:text>
+                                               <xsl:value-of 
select="$location_code"/>
+                                       </xsl:attribute>
+                                       <xsl:variable name="month_str">month 
<xsl:value-of select="current_month_nr - 1"/> capitalized</xsl:variable>
+                                       <xsl:value-of 
select="php:function('lang', $month_str)" />
+                               </a>
+                               <a id="showNextMonth">
+                                       <xsl:attribute name="href">
+                                               
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+                                               <xsl:text>&amp;year=</xsl:text>
+                                               <xsl:value-of 
select="current_year"/>
+                                               <xsl:text>&amp;month=</xsl:text>
+                                               <xsl:value-of 
select="current_month_nr + 1"/>
+                                               
<xsl:text>&amp;location_code=</xsl:text>
+                                               <xsl:value-of 
select="$location_code"/>
+                                       </xsl:attribute>
+                                       <xsl:variable name="month_str">month 
<xsl:value-of select="current_month_nr + 1"/> capitalized</xsl:variable>
+                                       <xsl:value-of 
select="php:function('lang', $month_str)" />
+                               </a>
+                       </div>
                        <!-- 
                                <select id="loc_1" class="choose_loc">
                                        <xsl:for-each select="property_array">

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-05-10 13:56:59 UTC 
(rev 9363)
+++ trunk/controller/templates/base/css/base.css        2012-05-10 14:21:12 UTC 
(rev 9364)
@@ -931,7 +931,7 @@
     clear: both;
     margin-top: 1em;
     overflow: hidden;
-    padding: 1em;
+    padding: 1em 1em 0;
 }
 /* ===  COLOR MAP === */
 
@@ -997,7 +997,28 @@
        font-size: 16px;
     padding: 40px 20px;        
 }
+#showYear{
+       display:block;
+       font-weight: bold;
+       font-size: 14px;
+       float:left;
+}
+#showNextMonth{
+    display: block;
+    float: right;
 
+}
+#showPrevMonth {
+    display: block;
+    float: left;
+}
+#monthNav {
+    clear: both;
+    font-size: 14px;
+    font-weight: bold;
+    padding-top: 1em;
+}
+
 /* ======================  CALENDAR INFO BOX ========================== */
 
 a.view_info_box {