[Fmsystem-commits] [10320] Controller: Changed url for calendar_for_year_url and calendar_for_month_url to declaring it in xsl file

[Torstein]

Revision: 10320
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10320
Author:   vator
Date:     2012-10-24 07:31:16 +0000 (Wed, 24 Oct 2012)
Log Message:
-----------
Controller: Changed url for calendar_for_year_url and calendar_for_month_url to 
declaring it in xsl file

Modified Paths:
--------------
    trunk/controller/inc/class.uicheck_list.inc.php
    trunk/controller/templates/base/check_list/add_check_list.xsl

Modified: trunk/controller/inc/class.uicheck_list.inc.php
===================================================================
--- trunk/controller/inc/class.uicheck_list.inc.php     2012-10-24 07:01:44 UTC 
(rev 10319)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2012-10-24 07:31:16 UTC 
(rev 10320)
@@ -258,8 +258,6 @@
                        
                        $data = array
                        (
-                               'calendar_for_year_url'         => 
self::link(array('menuaction' => 
'controller.uicalendar.view_calendar_for_year')),
-                               'calendar_for_month_url'        => 
self::link(array('menuaction' => 
'controller.uicalendar.view_calendar_for_month')),
                                'location_array'                                
        => $location_array,
                                'component_array'                               
        => $component_array,
                                'control'                                       
                                => $control->toArray(),

Modified: trunk/controller/templates/base/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl       
2012-10-24 07:01:44 UTC (rev 10319)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl       
2012-10-24 07:31:16 UTC (rev 10320)
@@ -47,9 +47,13 @@
                                </xsl:attribute>
                                Kontrollplan for bygg/eiendom (år)
                        </a>
+                               
+                       <xsl:variable name="calendar_for_year_url">
+                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uicalendar.view_calendar_for_month' )" />
+                       </xsl:variable>
                        <a class="last">
                                <xsl:attribute name="href">
-                                       <xsl:value-of 
select="calendar_for_month_url"/>
+                                       <xsl:value-of 
select="{$calendar_for_month_url}"/>
                                        <xsl:text>&amp;year=</xsl:text>
                                        <xsl:value-of select="current_year"/>
                                        <xsl:text>&amp;month=</xsl:text>