[Fmsystem-commits] [9857] controller: use generated urls

[Sigurd Nes]

Revision: 9857
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9857
Author:   sigurdne
Date:     2012-08-15 09:11:54 +0000 (Wed, 15 Aug 2012)
Log Message:
-----------
controller:  use generated urls

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-08-15 07:25:40 UTC 
(rev 9856)
+++ trunk/controller/inc/class.uicheck_list.inc.php     2012-08-15 09:11:54 UTC 
(rev 9857)
@@ -249,6 +249,9 @@
                        
                        $data = array
                        (
+                               'action_url'                            => 
self::link(array('menuaction' => 'controller.uicheck_list.save_check_list')),
+                               '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-08-15 07:25:40 UTC (rev 9856)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl       
2012-08-15 09:11:54 UTC (rev 9857)
@@ -47,7 +47,7 @@
                <div class="box-2 select-box">
                        <a>
                                <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+                                       <xsl:value-of 
select="calendar_for_year_url"/>
                                        <xsl:text>&amp;year=</xsl:text>
                                        <xsl:value-of select="current_year"/>
                                        <xsl:text>&amp;location_code=</xsl:text>
@@ -64,7 +64,7 @@
                        </a>
                        <a class="last">
                                <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+                                       <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>
@@ -99,7 +99,7 @@
        <!-- ==================  CHECKLIST DETAILS  ===================== -->
        <div id="check_list_details">
                <h3 class="box_header">Sjekklistedetaljer</h3>
-               <form id="frm_add_check_list" 
action="index.php?menuaction=controller.uicheck_list.save_check_list" 
method="post">
+               <form id="frm_add_check_list" action="{action_url}" 
method="post">
                        <xsl:variable name="control_id"><xsl:value-of 
select="control/id"/></xsl:variable>
                        <input type="hidden" name="control_id" 
value="{$control_id}" />
                        <xsl:variable name="type"><xsl:value-of 
select="type"/></xsl:variable>