[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9812]
From: |
Torstein |
Subject: |
[Fmsystem-commits] [9812] |
Date: |
Fri, 20 Jul 2012 10:27:58 +0000 |
Revision: 9812
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9812
Author: vator
Date: 2012-07-20 10:27:57 +0000 (Fri, 20 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/inc/class.uicalendar.inc.php
trunk/controller/templates/base/calendar/view_calendar_month.xsl
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
Modified: trunk/controller/inc/class.uicalendar.inc.php
===================================================================
--- trunk/controller/inc/class.uicalendar.inc.php 2012-07-20 10:19:54 UTC
(rev 9811)
+++ trunk/controller/inc/class.uicalendar.inc.php 2012-07-20 10:27:57 UTC
(rev 9812)
@@ -608,8 +608,8 @@
'locations_with_calendar_array' =>
$locations_with_calendar_array,
'components_with_calendar_array' =>
$components_with_calendar_array,
'date_format'
=> $date_format,
- 'current_month_nr'
=> $month,
- 'current_year'
=> $year,
+ 'current_year'
=> $year,
+ 'current_month_nr'
=> $month,
);
self::render_template_xsl(
array('calendar/view_calendar_month_for_locations',
'calendar/check_list_status_manager',
Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-07-20 10:19:54 UTC (rev 9811)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-07-20 10:27:57 UTC (rev 9812)
@@ -1,7 +1,7 @@
<!-- $Id$ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl">
<xsl:variable name="date_format">d/m-Y</xsl:variable>
-
+<xsl:variable name="month_str">month <xsl:value-of select="current_month_nr"/>
capitalized</xsl:variable>
<script>
<xsl:text>
@@ -71,8 +71,6 @@
<h1>Kontrollplan for bygg:
<xsl:value-of select="current_location/loc2_name"/></h1>
</xsl:otherwise>
</xsl:choose>
-
- <xsl:variable name="month_str">month <xsl:value-of
select="current_month_nr"/> capitalized</xsl:variable>
<h3>Kalenderoversikt for <span
class="month"><xsl:value-of select="php:function('lang', $month_str)"
/></span><span class="year"><xsl:value-of select="current_year"/></span></h3>
<!-- ===================== SEARCH FOR LOCATION
================= -->
Modified:
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
===================================================================
---
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-07-20 10:19:54 UTC (rev 9811)
+++
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-07-20 10:27:57 UTC (rev 9812)
@@ -1,12 +1,13 @@
<!-- $Id: view_calendar_year.xsl 9206 2012-04-23 06:21:38Z vator $ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl">
<xsl:variable name="date_format">d/m-Y</xsl:variable>
+<xsl:variable name="month_str">month <xsl:value-of select="current_month_nr"/>
capitalized</xsl:variable>
<div id="main_content">
<div id="control_plan">
<div class="top">
<h1>Kontrollplan for <xsl:value-of
select="control/title"/></h1>
- <h3>Periode: <xsl:value-of select="current_year"/></h3>
+ <h3>Oversikt for <span class="month"><xsl:value-of
select="php:function('lang', $month_str)" /></span><span
class="year"><xsl:value-of select="current_year"/></span></h3>
</div>
<div class="middle">
<!-- ===================== ICON COLOR MAP
================= -->
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9812],
Torstein <=