[Fmsystem-commits] [9368]

[Torstein]

Revision: 9368
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9368
Author:   vator
Date:     2012-05-11 08:40:27 +0000 (Fri, 11 May 2012)
Log Message:
-----------


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

Added Paths:
-----------
    trunk/controller/images/back_arrow.png
    trunk/controller/images/left_arrow.png
    trunk/controller/images/left_arrow.psd
    trunk/controller/images/right_arrow.png
    trunk/controller/images/right_arrow.psd
    trunk/controller/images/up_arrow.png
    trunk/controller/images/up_arrow.psd

Added: trunk/controller/images/back_arrow.png
===================================================================
(Binary files differ)


Property changes on: trunk/controller/images/back_arrow.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/controller/images/left_arrow.png
===================================================================
(Binary files differ)


Property changes on: trunk/controller/images/left_arrow.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/controller/images/left_arrow.psd
===================================================================
(Binary files differ)


Property changes on: trunk/controller/images/left_arrow.psd
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/controller/images/right_arrow.png
===================================================================
(Binary files differ)


Property changes on: trunk/controller/images/right_arrow.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/controller/images/right_arrow.psd
===================================================================
(Binary files differ)


Property changes on: trunk/controller/images/right_arrow.psd
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/controller/images/up_arrow.png
===================================================================
(Binary files differ)


Property changes on: trunk/controller/images/up_arrow.png
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Added: trunk/controller/images/up_arrow.psd
===================================================================
(Binary files differ)


Property changes on: trunk/controller/images/up_arrow.psd
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2012-05-11 07:51:05 UTC (rev 9367)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2012-05-11 08:40:27 UTC (rev 9368)
@@ -8,7 +8,8 @@
        <div id="control_plan">
                <div class="top">
                        <h1>Kontrollplan for bygg/eiendom: <xsl:value-of 
select="current_location/loc1_name"/></h1>
-                       <h3>Kalenderoversikt for <xsl:value-of 
select="current_month"/><span class="year"><xsl:value-of 
select="current_year"/></span></h3>
+                       <xsl:variable name="month_str">month <xsl:value-of 
select="current_month_nr"/> capitalized</xsl:variable>
+                       <h3>Kalenderoversikt for <xsl:value-of 
select="php:function('lang', $month_str)" /><span class="year"><xsl:value-of 
select="current_year"/></span></h3>
                
                        <form action="#">
                                <input type="hidden" name="period_type" 
value="view_year" />
@@ -50,35 +51,80 @@
                                        <xsl:text>&amp;location_code=</xsl:text>
                                        <xsl:value-of 
select="current_location/location_code"/>
                                </xsl:attribute>
-                               Årsoversikt
+                               <img height="25" 
src="controller/images/up_arrow.png" />Årsoversikt
                        </a>
                        <div id="calNav">
-                               <a class="showPrev month">
-                                       <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:choose>
+                                       <xsl:when test="current_month_nr > 1">
+                                               <a class="showPrev month">
+                                                       <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="//current_location/location_code"/>
+                                                       </xsl:attribute>
+                                                       <img height="20" 
src="controller/images/left_arrow.png" />
+                                                       <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>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <a class="showPrev month">
+                                                       <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 - 1"/>
+                                                               
<xsl:text>&amp;month=12</xsl:text>
+                                                               
<xsl:text>&amp;location_code=</xsl:text>
+                                                               <xsl:value-of 
select="//current_location/location_code"/>
+                                                       </xsl:attribute>
+                                                       <img height="20" 
src="controller/images/left_arrow.png" />
+                                                       <xsl:variable 
name="month_str">month 12 capitalized</xsl:variable>
+                                                       <xsl:value-of 
select="php:function('lang', $month_str)" />
+                                               </a>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                               
+                               <span class="current">
+                                       <xsl:variable name="month_str">month 
<xsl:value-of select="current_month_nr"/> capitalized</xsl:variable>
                                        <xsl:value-of 
select="php:function('lang', $month_str)" />
-                               </a>
-                               <a class="showNext">
-                                       <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>
+                               </span>
+                               <xsl:choose>
+                                       <xsl:when test="12 > current_month_nr">
+                                               <a class="showNext">
+                                                       <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="//current_location/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)" />
+                                                       <img height="20" 
src="controller/images/right_arrow.png" />
+                                               </a>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                               <a class="showNext">
+                                                       <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 + 1"/>
+                                                               
<xsl:text>&amp;month=1</xsl:text>
+                                                               
<xsl:text>&amp;location_code=</xsl:text>
+                                                               <xsl:value-of 
select="//current_location/location_code"/>
+                                                       </xsl:attribute>
+                                                       <xsl:variable 
name="month_str">month 1 capitalized</xsl:variable>
+                                                       <xsl:value-of 
select="php:function('lang', $month_str)" />
+                                                       <img height="20" 
src="controller/images/right_arrow.png" />
+                                               </a>
+                                       </xsl:otherwise>
+                               </xsl:choose>
                        </div>
                        <!-- 
                                <select id="loc_1" class="choose_loc">

Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2012-05-11 07:51:05 UTC (rev 9367)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl     
2012-05-11 08:40:27 UTC (rev 9368)
@@ -51,7 +51,6 @@
                                                
<xsl:text>&amp;location_code=</xsl:text>
                                                <xsl:value-of 
select="current_location/location_code"/>
                                        </xsl:attribute>
-                                       
                                        <xsl:value-of select="current_year - 
1"/>
                                </a>
                                <a class="showNext">
@@ -62,7 +61,6 @@
                                                
<xsl:text>&amp;location_code=</xsl:text>
                                                <xsl:value-of 
select="current_location/location_code"/>
                                        </xsl:attribute>
-                                       
                                        <xsl:value-of select="current_year + 
1"/>
                                </a>
                        </div>

Modified: trunk/controller/templates/base/css/base.css
===================================================================
--- trunk/controller/templates/base/css/base.css        2012-05-11 07:51:05 UTC 
(rev 9367)
+++ trunk/controller/templates/base/css/base.css        2012-05-11 08:40:27 UTC 
(rev 9368)
@@ -909,9 +909,7 @@
 
 /* ======================  CALENDAR ========================== */
 
-#control_plan .top h1{
-   
-}
+
 #control_plan .top h3{
    margin:0;
    font-size:19px;
@@ -962,7 +960,7 @@
     text-align: center;
 }
 #calendar.month th, #calendar.month td {
-    padding: 5px;
+    padding: 5px 3px;
 }
 #calendar .even {
     background: none repeat scroll 0 0 #DEEAF8;
@@ -980,9 +978,12 @@
     padding: 0 10px;
     width: 100px;
 }
+#calendar .title, #calendar .assigned {
+       width: 150px;
+}
 #calendar .frequency {
     margin-right: 10px;
-    width: 65px;
+    width: 100px;
 }
 #calendar .frequency, #calendar .title, #calendar .assigned, #calendar 
.location_name {
     text-align: left;
@@ -1003,25 +1004,43 @@
        font-size: 14px;
        float:left;
 }
+#showYear img {
+    margin-right: 5px;
+    vertical-align: bottom;
+}
 #calNav {
     clear: both;
-    font-size: 14px;
+    font-size: 16px;
     font-weight: bold;
     padding-top: 1em;
 }
+#calNav img{
+    vertical-align:bottom;
+}
+
 #calNav a.showNext{
     display: block;
     float: right;
-
 }
+#calNav a.showNext img{
+    margin-left:5px;
+}
 #calNav a.showPrev {
     display: block;
     float: left;
     margin-left: 547px;
+    padding-left:3px;
 }
+#calNav a.showPrev img{
+    margin-right:5px;
+}
 #calNav a.showPrev.month {
-    margin-left: 446px;
+    margin-left: 437px;
 }
+#calNav .current {
+    font-size: 21px;
+    padding-left: 230px;
+}
 /* ======================  CALENDAR INFO BOX ========================== */
 
 a.view_info_box {