[Fmsystem-commits] [8321]

[Torstein]

Revision: 8321
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8321
Author:   vator
Date:     2011-12-15 12:08:23 +0000 (Thu, 15 Dec 2011)
Log Message:
-----------


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

Modified: trunk/controller/templates/base/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/view_calendar_month.xsl     2011-12-15 
12:08:02 UTC (rev 8320)
+++ trunk/controller/templates/base/view_calendar_month.xsl     2011-12-15 
12:08:23 UTC (rev 8321)
@@ -11,7 +11,7 @@
                </fieldset>
                                
                <h2 style="float:left;">Sjekklister</h2>
-               <div style="float:left;margin-top: 30px;margin-left: 585px;"><a 
class="move_cal_right" href="#">&lt;&lt;</a></div>
+               <div style="float:left;margin-top: 30px;margin-left: 760px;"><a 
class="move_cal_right" href="#">&lt;&lt;</a></div>
                <div style="float:left;margin-top: 30px;margin-left: 95px;"><a 
class="move_cal_left" href="#">&gt;&gt;</a></div>
                
                <script>
@@ -62,6 +62,8 @@
                                <li class="heading">
                                        <div class="id">ID</div>
                                        <div class="title">Tittel</div>
+                                       <div class="date">Start dato</div>
+                                       <div class="date">Slutt dato</div>
                                        <div 
class="frequency">Frekvenstype</div>
                                        <div 
class="frequency">Frekvensintervall</div>
                                </li>
@@ -74,6 +76,19 @@
                                                <div class="title">
                                                <xsl:value-of 
select="control/title"/>
                                                </div>
+                                               <div class="date">
+                                               <xsl:value-of 
select="php:function('date', $date_format, number(control/start_date))"/>
+                                               </div>
+                                               <div class="date">
+                                                       <xsl:choose>
+                                                               <xsl:when 
test="control/end_date != 0">
+                                                               <xsl:value-of 
select="php:function('date', $date_format, number(control/end_date))"/>
+                                                       </xsl:when>
+                                                       <xsl:otherwise>
+                                                               Løpende
+                                                       </xsl:otherwise>
+                                               </xsl:choose>
+                                               </div>
                                                <div class="frequency">
                                                <xsl:value-of 
select="control/repeat_type"/>
                                                </div>