fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [10025] controller: more on use generated url


From: Sigurd Nes
Subject: [Fmsystem-commits] [10025] controller: more on use generated url
Date: Mon, 24 Sep 2012 14:21:43 +0000

Revision: 10025
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10025
Author:   sigurdne
Date:     2012-09-24 14:21:42 +0000 (Mon, 24 Sep 2012)
Log Message:
-----------
controller: more on use generated url

Modified Paths:
--------------
    trunk/controller/templates/base/calendar/calendar_filters.xsl
    trunk/controller/templates/base/calendar/check_list_status_manager.xsl
    trunk/controller/templates/base/calendar/nav_calendar_month.xsl
    trunk/controller/templates/base/calendar/nav_calendar_year.xsl
    trunk/controller/templates/base/calendar/view_calendar_month.xsl
    
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
    trunk/controller/templates/base/check_list/add_case.xsl
    trunk/controller/templates/base/check_list/edit_check_list.xsl
    trunk/controller/templates/base/control_group/control_groups.xsl
    trunk/controller/templates/base/control_item/choose_control_items.xsl
    trunk/controller/templates/base/control_item/control_item.xsl
    trunk/controller/templates/base/control_item/control_item_option.xsl
    trunk/controller/templates/base/control_item/view_control_item_list.xsl
    trunk/controller/templates/base/procedure/procedure_documents.xsl
    trunk/controller/templates/base/procedure/view_procedures_for_control.xsl

Modified: trunk/controller/templates/base/calendar/calendar_filters.xsl
===================================================================
--- trunk/controller/templates/base/calendar/calendar_filters.xsl       
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/calendar/calendar_filters.xsl       
2012-09-24 14:21:42 UTC (rev 10025)
@@ -6,10 +6,10 @@
   <form id="cal-filters" class="select-box" method="post">
     <xsl:choose>
       <xsl:when test="$view_period = 'month'">
-        <xsl:attribute 
name="action">index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:attribute>
+        <xsl:attribute name="action"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:uicalendar.view_calendar_for_month')" /></xsl:attribute>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:attribute 
name="action">index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:attribute>
+        <xsl:attribute name="action"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:uicalendar.view_calendar_for_year')" /></xsl:attribute>
       </xsl:otherwise> 
     </xsl:choose>
 

Modified: trunk/controller/templates/base/calendar/check_list_status_manager.xsl
===================================================================
--- trunk/controller/templates/base/calendar/check_list_status_manager.xsl      
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/calendar/check_list_status_manager.xsl      
2012-09-24 14:21:42 UTC (rev 10025)
@@ -5,93 +5,112 @@
  
   <xsl:choose>
     <xsl:when test="status = 'CONTROL_REGISTERED'">
-      <a>
-        <xsl:attribute name="href">
-          
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
-          <xsl:text>&amp;deadline_ts=</xsl:text>
+               <xsl:variable name="url_argument_registered">
+          
<xsl:text>menuaction:controller.uicheck_list.add_check_list</xsl:text>
+          <xsl:text>,deadline_ts:</xsl:text>
           <xsl:value-of select="info/deadline_date_ts"/>
-          <xsl:text>&amp;control_id=</xsl:text>
+          <xsl:text>,control_id:</xsl:text>
           <xsl:value-of select="info/control_id"/>
-          <xsl:text>&amp;type=</xsl:text>
+          <xsl:text>,type:</xsl:text>
           <xsl:value-of select="info/type"/>
           <xsl:choose>
             <xsl:when test="info/type = 'component'">
-              <xsl:text>&amp;location_id=</xsl:text>
+              <xsl:text>,location_id:</xsl:text>
               <xsl:value-of select="info/location_id"/>
-              <xsl:text>&amp;component_id=</xsl:text>
+              <xsl:text>,component_id:</xsl:text>
               <xsl:value-of select="info/component_id"/>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:text>&amp;location_code=</xsl:text>
+              <xsl:text>,location_code:</xsl:text>
               <xsl:value-of select="info/location_code"/>  
             </xsl:otherwise>
           </xsl:choose>
+               </xsl:variable>
+      <a>
+        <xsl:attribute name="href">
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_registered)" />
         </xsl:attribute>
         <img height="15" src="controller/images/status_icon_yellow_ring.png" />
       </a>
     </xsl:when>
     <xsl:when test="status = 'CONTROL_PLANNED'">
+        <xsl:variable name="url_argument_planned">
+          
<xsl:text>menuaction:controller.uicheck_list.edit_check_list</xsl:text>
+          <xsl:text>,check_list_id:</xsl:text>
+          <xsl:value-of select="info/check_list_id"/>
+        </xsl:variable>
       <a>
         <xsl:attribute name="href">
-          
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-          <xsl:text>&amp;check_list_id=</xsl:text>
-          <xsl:value-of select="info/check_list_id"/>
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_planned)" />
         </xsl:attribute>
         <img height="15" src="controller/images/status_icon_yellow.png" />
       </a>
     </xsl:when>
     <xsl:when test="status = 'CONTROL_NOT_DONE'">
-      <a>
-        <xsl:attribute name="href">
-          
<xsl:text>index.php?menuaction=controller.uicheck_list.add_check_list</xsl:text>
-          <xsl:text>&amp;deadline_ts=</xsl:text>
+        <xsl:variable name="url_argument_not_done">
+          
<xsl:text>menuaction:controller.uicheck_list.add_check_list</xsl:text>
+          <xsl:text>,deadline_ts:</xsl:text>
           <xsl:value-of select="info/deadline_date_ts"/>
-          <xsl:text>&amp;control_id=</xsl:text>
+          <xsl:text>,control_id:</xsl:text>
           <xsl:value-of select="info/control_id"/>
-          <xsl:text>&amp;type=</xsl:text>
+          <xsl:text>,type:</xsl:text>
           <xsl:value-of select="info/type"/>
           <xsl:choose>
             <xsl:when test="info/type = 'component'">
-              <xsl:text>&amp;location_id=</xsl:text>
+              <xsl:text>,location_id:</xsl:text>
               <xsl:value-of select="info/location_id"/>
-              <xsl:text>&amp;component_id=</xsl:text>
+              <xsl:text>,component_id:</xsl:text>
               <xsl:value-of select="info/component_id"/>
             </xsl:when>
             <xsl:otherwise>
-              <xsl:text>&amp;location_code=</xsl:text>
+              <xsl:text>,location_code:</xsl:text>
               <xsl:value-of select="info/location_code"/>  
             </xsl:otherwise>
           </xsl:choose>
-        </xsl:attribute>
+        </xsl:variable>
+      <a>
+        <xsl:attribute name="href">
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_not_done)" />
+               </xsl:attribute>
         <img height="15" src="controller/images/status_icon_red_cross.png" />
       </a>
     </xsl:when>
     <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_CHECKLIST'">
+
+        <xsl:variable name="url_argument_not_done_with_checklist">
+          
<xsl:text>menuaction:controller.uicheck_list.edit_check_list</xsl:text>
+          <xsl:text>,check_list_id:</xsl:text>
+          <xsl:value-of select="info/check_list_id"/>
+        </xsl:variable>
       <a>
         <xsl:attribute name="href">
-          
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-          <xsl:text>&amp;check_list_id=</xsl:text>
-          <xsl:value-of select="info/check_list_id"/>
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_not_done_with_checklist)" />
         </xsl:attribute>
         <img height="15" src="controller/images/status_icon_red_cross.png" />
       </a>
     </xsl:when>
     <xsl:when test="status = 'CONTROL_NOT_DONE_WITH_PLANNED_DATE'">
-      <a>
+         <xsl:variable name="url_argument_not_done_with_planned_date">
+          
<xsl:text>menuaction:controller.uicheck_list.edit_check_list</xsl:text>
+          <xsl:text>,check_list_id:</xsl:text>
+          <xsl:value-of select="info/check_list_id"/>
+        </xsl:variable>
+       <a>
         <xsl:attribute name="href">
-          
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-          <xsl:text>&amp;check_list_id=</xsl:text>
-          <xsl:value-of select="info/check_list_id"/>
+                       <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_not_done_with_planned_date)" />
         </xsl:attribute>
         <img height="15" src="controller/images/status_icon_red_cross.png" />
       </a>
     </xsl:when>
     <xsl:when test="status = 'CONTROL_DONE_IN_TIME_WITHOUT_ERRORS'">
+        <xsl:variable name="url_argument_done_in_time_without_errors">
+          
<xsl:text>menuaction:controller.uicheck_list.edit_check_list</xsl:text>
+          <xsl:text>,check_list_id:</xsl:text>
+          <xsl:value-of select="info/check_list_id"/>
+        </xsl:variable>
       <a>
         <xsl:attribute name="href">
-          
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-          <xsl:text>&amp;check_list_id=</xsl:text>
-          <xsl:value-of select="info/check_list_id"/>
+                 <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_done_in_time_without_errors)" />
         </xsl:attribute>
         <span class="ext_info">
           <xsl:value-of select="info/id"/>
@@ -102,11 +121,14 @@
     <xsl:when test="status = 'CONTROL_DONE_OVER_TIME_WITHOUT_ERRORS'">
       <div class="info_box_wrp">
         <div id="info_box"></div>
+          <xsl:variable name="url_argument_done_over_time_without_errors">
+            
<xsl:text>menuaction:controller.uicheck_list.edit_check_list</xsl:text>
+            <xsl:text>,check_list_id:</xsl:text>
+            <xsl:value-of select="info/check_list_id"/>
+          </xsl:variable>
         <a>
           <xsl:attribute name="href">
-            
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-            <xsl:text>&amp;check_list_id=</xsl:text>
-            <xsl:value-of select="info/check_list_id"/>
+                         <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_done_over_time_without_errors)" />
           </xsl:attribute>
           <span class="ext_info">
             <xsl:value-of select="info/id"/>
@@ -118,11 +140,14 @@
     <xsl:when test="status = 'CONTROL_DONE_WITH_ERRORS'">
       <div class="info_box_wrp">
         <div id="info_box"></div>
+           <xsl:variable name="url_argument_done_with_errors">
+            
<xsl:text>menuaction:controller.uicheck_list.edit_check_list</xsl:text>
+            <xsl:text>,check_list_id:</xsl:text>
+            <xsl:value-of select="info/check_list_id"/>
+          </xsl:variable>
         <a class="view_info_box">
           <xsl:attribute name="href">
-            
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
-            <xsl:text>&amp;check_list_id=</xsl:text>
-            <xsl:value-of select="info/check_list_id"/>
+                         <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_done_with_errors)" />
           </xsl:attribute>
           <span class="ext_info">
             <xsl:text>&amp;check_list_id=</xsl:text>
@@ -139,24 +164,27 @@
     <xsl:when test="status = 'CONTROLS_DONE_WITH_ERRORS'">
       <div class="info_box_wrp">
         <div id="info_box"></div>
+          <xsl:variable name="url_argument_controls_done_with_errors">
+            <xsl:choose> 
+              <xsl:when test="info/view = 'VIEW_LOCATIONS_FOR_CONTROL'"> 
+                
<xsl:text>menuaction:controller.uicalendar.view_calendar_month_for_locations</xsl:text>
 
+                <xsl:text>,control_id:</xsl:text> 
+                <xsl:value-of select="info/control_id"/> 
+              </xsl:when> 
+              <xsl:otherwise> 
+                
<xsl:text>menuaction:controller.uicalendar.view_calendar_for_month</xsl:text> 
+                <xsl:text>,location_code:</xsl:text> 
+                <xsl:value-of select="info/location_code"/> 
+              </xsl:otherwise> 
+            </xsl:choose> 
+            <xsl:text>,year:</xsl:text> 
+            <xsl:value-of select="//current_year"/> 
+            <xsl:text>,month;</xsl:text> 
+            <xsl:number /> 
+           </xsl:variable>
         <a class="view_info_box">
           <xsl:attribute name="href">
-            <xsl:choose>
-              <xsl:when test="info/view = 'VIEW_LOCATIONS_FOR_CONTROL'">
-                
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
-                <xsl:text>&amp;control_id=</xsl:text>
-                <xsl:value-of select="info/control_id"/>
-              </xsl:when>
-              <xsl:otherwise>
-                
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-                <xsl:text>&amp;location_code=</xsl:text>
-                <xsl:value-of select="info/location_code"/>
-              </xsl:otherwise>
-            </xsl:choose>
-            <xsl:text>&amp;year=</xsl:text>
-            <xsl:value-of select="//current_year"/>
-            <xsl:text>&amp;month=</xsl:text>
-            <xsl:number />
+                         <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_controls_done_with_errors)" />
           </xsl:attribute>
           <span class="ext_info">
             <xsl:text>&amp;check_list_id=</xsl:text>
@@ -168,47 +196,54 @@
       </div>
     </xsl:when>
     <xsl:when test="status = 'CONTROLS_NOT_DONE'">
-      <a>
-        <xsl:attribute name="href">
+        <xsl:variable name="url_argument_controls_not_done">
           <xsl:choose>
             <xsl:when test="info/view = 'VIEW_LOCATIONS_FOR_CONTROL'">
-              
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
-              <xsl:text>&amp;control_id=</xsl:text>
+              
<xsl:text>menuaction:controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+              <xsl:text>,control_id:</xsl:text>
               <xsl:value-of select="info/control_id"/>
             </xsl:when>
             <xsl:when test="info/view = 'VIEW_CONTROLS_FOR_LOCATION'">
-              
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-              <xsl:text>&amp;location_code=</xsl:text>
+              
<xsl:text>menuaction:controller.uicalendar.view_calendar_for_month</xsl:text>
+              <xsl:text>,location_code:</xsl:text>
               <xsl:value-of select="info/location_code"/>
             </xsl:when>
           </xsl:choose>
-          <xsl:text>&amp;year=</xsl:text>
+          <xsl:text>,year:</xsl:text>
           <xsl:value-of select="//current_year"/>
-          <xsl:text>&amp;month=</xsl:text>
+          <xsl:text>,month:</xsl:text>
           <xsl:number />
+        </xsl:variable>
+      <a>
+        <xsl:attribute name="href">
+                         <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_controls_not_done)" />
         </xsl:attribute>
         <img height="15" src="controller/images/status_icon_red_cross.png" />
       </a>
     </xsl:when>
     <xsl:when test="status = 'CONTROLS_REGISTERED'">
-      <a>
-        <xsl:attribute name="href">
+        <xsl:variable name="url_argument_controls_registered">
           <xsl:choose>
             <xsl:when test="info/view = 'VIEW_LOCATIONS_FOR_CONTROL'">
-              
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
-              <xsl:text>&amp;control_id=</xsl:text>
+              
<xsl:text>menuaction:controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+              <xsl:text>,control_id:</xsl:text>
               <xsl:value-of select="info/control_id"/>
             </xsl:when>
             <xsl:when test="info/view = 'VIEW_CONTROLS_FOR_LOCATION'">
-              
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-              <xsl:text>&amp;location_code=</xsl:text>
+              
<xsl:text>menuaction:controller.uicalendar.view_calendar_for_month</xsl:text>
+              <xsl:text>location_code:</xsl:text>
               <xsl:value-of select="info/location_code"/>
             </xsl:when> 
           </xsl:choose>
-          <xsl:text>&amp;month=</xsl:text>
+          <xsl:text>,month:</xsl:text>
           <xsl:value-of select="info/month"/>
-          <xsl:text>&amp;year=</xsl:text>
+          <xsl:text>,year:</xsl:text>
           <xsl:value-of select="info/year"/>
+        </xsl:variable>
+
+      <a>
+        <xsl:attribute name="href">
+                         <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_controls_registered)" />
         </xsl:attribute>
         <img height="15" src="controller/images/status_icon_yellow_ring.png" />
       </a>

Modified: trunk/controller/templates/base/calendar/nav_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/nav_calendar_month.xsl     
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/calendar/nav_calendar_month.xsl     
2012-09-24 14:21:42 UTC (rev 10025)
@@ -6,24 +6,28 @@
 <div id="calNav">
        <xsl:choose>
                <xsl:when test="current_month_nr > 1">
+                       <xsl:variable name="url_argument_1">
+                               <xsl:choose>
+                                               <xsl:when test="$view = 
'VIEW_LOCATIONS_FOR_CONTROL'">
+                                                       
<xsl:text>menuaction:controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+                                                               
<xsl:text>,control_id:</xsl:text>
+                                                               <xsl:value-of 
select="control/id" />
+                                               </xsl:when>
+                                               <xsl:when test="$view = 
'VIEW_CONTROLS_FOR_LOCATION'">
+                                                       
<xsl:text>menuaction:controller.uicalendar.view_calendar_for_month</xsl:text>
+                                                       
<xsl:text>,location_code:</xsl:text>
+                                                       <xsl:value-of 
select="//current_location/location_code"/>
+                                         </xsl:when>
+                                 </xsl:choose>
+                               <xsl:text>,year:</xsl:text>
+                               <xsl:value-of select="current_year"/>
+                               <xsl:text>,month:</xsl:text>
+                               <xsl:value-of select="current_month_nr - 1"/>
+                       </xsl:variable>
+
                        <a class="showPrev month">
                                <xsl:attribute name="href">
-                                       <xsl:choose>
-                                                       <xsl:when test="$view = 
'VIEW_LOCATIONS_FOR_CONTROL'">
-                                                               
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
-                                                                       
<xsl:text>&amp;control_id=</xsl:text>
-                                                                       
<xsl:value-of select="control/id" />
-                                                       </xsl:when>
-                                                       <xsl:when test="$view = 
'VIEW_CONTROLS_FOR_LOCATION'">
-                                                               
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-                                                               
<xsl:text>&amp;location_code=</xsl:text>
-                                                               <xsl:value-of 
select="//current_location/location_code"/>
-                                                 </xsl:when>
-                                         </xsl:choose>
-                                       <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:value-of 
select="php:function('get_phpgw_link', '/index.php', $url_argument_1)" />
                                </xsl:attribute>
                                <img height="17" 
src="controller/images/left_arrow_simple_light_blue.png" />
                                <xsl:variable name="month_str">month 
<xsl:value-of select="current_month_nr - 1"/> capitalized</xsl:variable>
@@ -31,23 +35,28 @@
                        </a>
                </xsl:when>
                <xsl:otherwise>
-                       <a class="showPrev month">
-                               <xsl:attribute name="href">
+
+                               <xsl:variable name="url_argument_2">
                                        <xsl:choose>
                                                        <xsl:when test="$view = 
'VIEW_LOCATIONS_FOR_CONTROL'">
-                                                               
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
-                                                                       
<xsl:text>&amp;control_id=</xsl:text>
+                                                               
<xsl:text>menuaction:controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+                                                                       
<xsl:text>,control_id:</xsl:text>
                                                                        
<xsl:value-of select="control/id" />
                                                        </xsl:when>
                                                        <xsl:when test="$view = 
'VIEW_CONTROLS_FOR_LOCATION'">
-                                                               
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-                                                               
<xsl:text>&amp;location_code=</xsl:text>
+                                                               
<xsl:text>menuaction:controller.uicalendar.view_calendar_for_month</xsl:text>
+                                                               
<xsl:text>,location_code:</xsl:text>
                                                                <xsl:value-of 
select="//current_location/location_code"/>
                                                  </xsl:when>
                                          </xsl:choose>
-                                       <xsl:text>&amp;year=</xsl:text>
+                                       <xsl:text>,year:</xsl:text>
                                        <xsl:value-of select="current_year - 
1"/>
-                                       <xsl:text>&amp;month=12</xsl:text>
+                                       <xsl:text>,month:12</xsl:text>
+                               </xsl:variable>
+
+                       <a class="showPrev month">
+                               <xsl:attribute name="href">
+                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $url_argument_2)" />
                                </xsl:attribute>
                                <img height="17" 
src="controller/images/left_arrow_simple_light_blue.png" />
                                <xsl:variable name="month_str">month 12 
capitalized</xsl:variable>
@@ -62,24 +71,28 @@
        </span>
        <xsl:choose>
                <xsl:when test="12 > current_month_nr">
-                       <a class="showNext">
-                               <xsl:attribute name="href">
+                               <xsl:variable name="url_argument_3">
                                        <xsl:choose>
                                                        <xsl:when test="$view = 
'VIEW_LOCATIONS_FOR_CONTROL'">
-                                                               
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
-                                                                       
<xsl:text>&amp;control_id=</xsl:text>
+                                                               
<xsl:text>menuaction:controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+                                                                       
<xsl:text>,control_id:</xsl:text>
                                                                        
<xsl:value-of select="control/id" />
                                                        </xsl:when>
                                                        <xsl:when test="$view = 
'VIEW_CONTROLS_FOR_LOCATION'">
-                                                               
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-                                                               
<xsl:text>&amp;location_code=</xsl:text>
+                                                               
<xsl:text>menuaction:controller.uicalendar.view_calendar_for_month</xsl:text>
+                                                               
<xsl:text>,location_code:</xsl:text>
                                                                <xsl:value-of 
select="//current_location/location_code"/>
                                                  </xsl:when>
                                          </xsl:choose>
-                                       <xsl:text>&amp;year=</xsl:text>
+                                       <xsl:text>,year:</xsl:text>
                                        <xsl:value-of select="current_year"/>
-                                       <xsl:text>&amp;month=</xsl:text>
+                                       <xsl:text>,month:</xsl:text>
                                        <xsl:value-of select="current_month_nr 
+ 1"/>
+                               </xsl:variable>
+
+                       <a class="showNext">
+                               <xsl:attribute name="href">
+                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $url_argument_3)" />
                                </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)" />
@@ -87,23 +100,27 @@
                        </a>
                </xsl:when>
                <xsl:otherwise>
-                       <a class="showNext">
-                               <xsl:attribute name="href">
+                               <xsl:variable name="url_argument_4">
                                        <xsl:choose>
                                                        <xsl:when test="$view = 
'VIEW_LOCATIONS_FOR_CONTROL'">
-                                                               
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_month_for_locations</xsl:text>
-                                                                       
<xsl:text>&amp;control_id=</xsl:text>
+                                                               
<xsl:text>menuaction:controller.uicalendar.view_calendar_month_for_locations</xsl:text>
+                                                                       
<xsl:text>,control_id:</xsl:text>
                                                                        
<xsl:value-of select="control/id" />
                                                        </xsl:when>
                                                        <xsl:when test="$view = 
'VIEW_CONTROLS_FOR_LOCATION'">
-                                                               
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
-                                                               
<xsl:text>&amp;location_code=</xsl:text>
+                                                               
<xsl:text>menuaction:controller.uicalendar.view_calendar_for_month</xsl:text>
+                                                               
<xsl:text>,location_code:</xsl:text>
                                                                <xsl:value-of 
select="//current_location/location_code"/>
                                                  </xsl:when>
                                          </xsl:choose>
-                                       <xsl:text>&amp;year=</xsl:text>
+                                       <xsl:text>,year:</xsl:text>
                                        <xsl:value-of select="current_year + 
1"/>
-                                       <xsl:text>&amp;month=1</xsl:text>
+                                       <xsl:text>,month:1</xsl:text>
+                               </xsl:variable>
+
+                       <a class="showNext">
+                               <xsl:attribute name="href">
+                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $url_argument_4)" />
                                </xsl:attribute>
                                <xsl:variable name="month_str">month 1 
capitalized</xsl:variable>
                                <xsl:value-of select="php:function('lang', 
$month_str)" />

Modified: trunk/controller/templates/base/calendar/nav_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/nav_calendar_year.xsl      
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/calendar/nav_calendar_year.xsl      
2012-09-24 14:21:42 UTC (rev 10025)
@@ -4,22 +4,27 @@
 <xsl:param name="view" />
 
 <div id="calNav">
-       <a class="showPrev">
-               <xsl:attribute name="href">
+
+               <xsl:variable name="url_argument_showPrev">
                        <xsl:choose>
                                <xsl:when test="$view = 
'VIEW_LOCATIONS_FOR_CONTROL'">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_year_for_locations</xsl:text>
-                                               
<xsl:text>&amp;control_id=</xsl:text>
+                                       
<xsl:text>menuaction:controller.uicalendar.view_calendar_year_for_locations</xsl:text>
+                                               
<xsl:text>,control_id:</xsl:text>
                                                <xsl:value-of 
select="control/id" />
                                </xsl:when>
                                <xsl:when test="$view = 
'VIEW_CONTROLS_FOR_LOCATION'">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
-                                       <xsl:text>&amp;location_code=</xsl:text>
+                                       
<xsl:text>menuaction:controller.uicalendar.view_calendar_for_year</xsl:text>
+                                       <xsl:text>,location_code:</xsl:text>
                                        <xsl:value-of 
select="//current_location/location_code"/>
                          </xsl:when>
                        </xsl:choose>
-                       <xsl:text>&amp;year=</xsl:text>
+                       <xsl:text>,year:</xsl:text>
                        <xsl:value-of select="current_year - 1"/>
+               </xsl:variable>
+
+       <a class="showPrev">
+               <xsl:attribute name="href">
+                         <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_showPrev)" />
                </xsl:attribute>
                <img height="17" 
src="controller/images/left_arrow_simple_light_blue.png" />
                <xsl:value-of select="current_year - 1"/>
@@ -27,22 +32,27 @@
        <span class="current">
                        <xsl:value-of select="current_year"/>
        </span>
-       <a class="showNext">
-                       <xsl:attribute name="href">
+
+               <xsl:variable name="url_argument_showNext">
                        <xsl:choose>
                                <xsl:when test="$view = 
'VIEW_LOCATIONS_FOR_CONTROL'">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_year_for_locations</xsl:text>
-                                               
<xsl:text>&amp;control_id=</xsl:text>
+                                       
<xsl:text>menuaction:controller.uicalendar.view_calendar_year_for_locations</xsl:text>
+                                               
<xsl:text>,control_id:</xsl:text>
                                                <xsl:value-of 
select="control/id" />
                                </xsl:when>
                                <xsl:when test="$view = 
'VIEW_CONTROLS_FOR_LOCATION'">
-                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
-                                       <xsl:text>&amp;location_code=</xsl:text>
+                                       
<xsl:text>menuaction:controller.uicalendar.view_calendar_for_year</xsl:text>
+                                       <xsl:text>,location_code:</xsl:text>
                                        <xsl:value-of 
select="//current_location/location_code"/>
                          </xsl:when>
                        </xsl:choose>
-                       <xsl:text>&amp;year=</xsl:text>
+                       <xsl:text>,year:</xsl:text>
                        <xsl:value-of select="current_year + 1"/>
+               </xsl:variable>
+
+       <a class="showNext">
+                       <xsl:attribute name="href">
+                         <xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument_showNext)" />
                </xsl:attribute>
                <xsl:value-of select="current_year + 1"/>
                <img height="17" 
src="controller/images/right_arrow_simple_light_blue.png" />

Modified: trunk/controller/templates/base/calendar/view_calendar_month.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl    
2012-09-24 14:21:42 UTC (rev 10025)
@@ -138,13 +138,18 @@
                <div class="middle">
                
                <!-- =====================  SHOW CALENDAR FOR YEAR  
================= -->
+
+          <xsl:variable name="url_argument_showYear">
+                               
<xsl:text>menuaction:controller.uicalendar.view_calendar_for_year</xsl:text>
+                               <xsl:text>,year:</xsl:text>
+                               <xsl:value-of select="current_year"/>
+                               <xsl:text>,location_code:</xsl:text>
+                               <xsl:value-of 
select="current_location/location_code"/>
+          </xsl:variable>
+
                <a id="showYear">
                        <xsl:attribute name="href">
-                               
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
-                               <xsl:text>&amp;year=</xsl:text>
-                               <xsl:value-of select="current_year"/>
-                               <xsl:text>&amp;location_code=</xsl:text>
-                               <xsl:value-of 
select="current_location/location_code"/>
+                               <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $url_argument_showYear)" />
                        </xsl:attribute>
                        <img height="20" 
src="controller/images/left_arrow_simple_light_blue.png" />Ã…rsoversikt
                </a>
@@ -152,13 +157,16 @@
                <!-- =====================  CHOOSE ANOTHER BUILDING ON PROPERTY 
 ================= -->
                        <div id="choose-building" class="select-box">
                                <xsl:if test="location_level > 1">
+                                       <xsl:variable 
name="url_argument_showYears">
+                                               
<xsl:text>menuaction:controller.uicalendar.view_calendar_for_year</xsl:text>
+                                               <xsl:text>,year:</xsl:text>
+                                               <xsl:value-of 
select="current_year"/>
+                                               
<xsl:text>,location_code:</xsl:text>
+                                               <xsl:value-of 
select="current_location/loc1"/>
+                                       </xsl:variable>
                                        <a>
                                                <xsl:attribute name="href">
-                                                       
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
-                                                       
<xsl:text>&amp;year=</xsl:text>
-                                                       <xsl:value-of 
select="current_year"/>
-                                                       
<xsl:text>&amp;location_code=</xsl:text>
-                                                       <xsl:value-of 
select="current_location/loc1"/>
+                                                       <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $url_argument_showYears)" 
/>
                                                </xsl:attribute>
                                                Vis kontrollplan for eiendom
                                        </a> 
@@ -207,12 +215,16 @@
                                                        </xsl:otherwise>
                                                    </xsl:choose>
                                                                <td 
class="title">
-                                               <a class="show-control-details">
+                                                               <xsl:variable 
name="url_argument_control_details">
+                                                                       
<xsl:text>menuaction:controller.uicontrol.get_control_details</xsl:text>
+                                                                       
<xsl:text>,control_id:</xsl:text>
+                                                                               
<xsl:value-of select="control/id"/>
+                                                                       
<xsl:text>,phpgw_return_as:stripped_html</xsl:text>
+                                                               </xsl:variable>
+
+                                                               <a 
class="show-control-details">
                                                                                
<xsl:attribute name="href">
-                                                                               
        
<xsl:text>index.php?menuaction=controller.uicontrol.get_control_details</xsl:text>
-                                                                               
        <xsl:text>&amp;control_id=</xsl:text>
-                                                                               
        <xsl:value-of select="control/id"/>
-                                                                               
        <xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
+                                                                               
        <xsl:value-of select="php:function('get_phpgw_link', '/index.php', 
$url_argument_control_details)" />
                                                                                
</xsl:attribute>
                                                                                
<xsl:value-of select="control/title"/>
                                                                        </a> 
@@ -283,11 +295,15 @@
                                        </xsl:otherwise>
                                                    </xsl:choose>
                                                                <td 
class="title">
-                                               <a id="showControlDetails">
+                                                                       
<xsl:variable name="url_argument_showControlDetails">
+                                                                               
<xsl:text>menuaction:controller.uicontrol.get_control_details</xsl:text>
+                                                                               
<xsl:text>,control_id:</xsl:text>
+                                                                               
<xsl:value-of select="control/id"/>
+                                                                       
</xsl:variable>
+               
+                                                               <a 
id="showControlDetails">
                                                                                
<xsl:attribute name="href">
-                                                                               
        
<xsl:text>index.php?menuaction=controller.uicontrol.get_control_details</xsl:text>
-                                                                               
        <xsl:text>&amp;control_id=</xsl:text>
-                                                                               
        <xsl:value-of select="control/id"/>
+                                                                               
        <xsl:value-of select="php:function('get_phpgw_link', '/index.php', 
$url_argument_showControlDetails)" />
                                                                                
</xsl:attribute>
                                                                                
<xsl:value-of select="control/title"/>
                                                                        </a> 

Modified: 
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
===================================================================
--- 
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl  
    2012-09-23 15:03:43 UTC (rev 10024)
+++ 
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl  
    2012-09-24 14:21:42 UTC (rev 10025)
@@ -15,13 +15,17 @@
                                        
                        <!-- =====================  VIEW OVERVIEW FOR YEAR  
================= -->
                        <div id="calNav">
+                               <xsl:variable name="url_argument">
+                                               
<xsl:text>menuaction:controller.uicalendar.view_calendar_year_for_locations</xsl:text>
+                                               <xsl:text>,year:</xsl:text>
+                                               <xsl:value-of 
select="current_year"/>
+                                               
<xsl:text>,control_id:</xsl:text>
+                                               <xsl:value-of 
select="control/id"/>
+                               </xsl:variable>
+
                                <a class="showPrev month">
                                        <xsl:attribute name="href">
-                                               
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_year_for_locations</xsl:text>
-                                               <xsl:text>&amp;year=</xsl:text>
-                                               <xsl:value-of 
select="current_year"/>
-                                               
<xsl:text>&amp;control_id=</xsl:text>
-                                               <xsl:value-of 
select="control/id"/>
+                                         <xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $url_argument)" />
                                        </xsl:attribute>
                                        Ã…rsoversikt
                                </a>

Modified: trunk/controller/templates/base/check_list/add_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_case.xsl     2012-09-23 
15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/check_list/add_case.xsl     2012-09-24 
14:21:42 UTC (rev 10025)
@@ -75,7 +75,7 @@
                
                <div class="expand_menu"><div class="expand_all">Vis 
alle</div><div class="collapse_all focus">Skjul alle</div></div>
                
-               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uicase.add_case,phpgw_return_as:json')" /></xsl:variable>
+               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uicase.add_case,phpgw_return_as:json')" /></xsl:variable>
 
                <ul class="control_groups">
                        <xsl:for-each select="control_groups_with_items_array">

Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl      
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl      
2012-09-24 14:21:42 UTC (rev 10025)
@@ -73,7 +73,7 @@
        <!-- ==================  CHECKLIST DETAILS  ===================== -->
        <div id="check_list_details">
                <h3 class="box_header">Sjekklistedetaljer</h3>
-                       <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uicheck_list.save_check_list')" /></xsl:variable>
+                       <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uicheck_list.save_check_list')" /></xsl:variable>
                        <form id="frm_update_check_list" action="{$action_url}" 
method="post">  
                        <xsl:variable name="check_list_id"><xsl:value-of 
select="check_list/id"/></xsl:variable>
                        <input id="check_list_id" type="hidden" 
name="check_list_id" value="{$check_list_id}" />

Modified: trunk/controller/templates/base/control_group/control_groups.xsl
===================================================================
--- trunk/controller/templates/base/control_group/control_groups.xsl    
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/control_group/control_groups.xsl    
2012-09-24 14:21:42 UTC (rev 10025)
@@ -6,7 +6,7 @@
        
                <h2><xsl:value-of select="control_area/title"/></h2>
                
-               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uicontrol.save_control_groups')" /></xsl:variable>
+               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uicontrol.save_control_groups')" /></xsl:variable>
 
                <form id="frm_save_control_groups" action="{$action_url}" 
method="post">
                        <xsl:variable name="control_area_id"><xsl:value-of 
select="control_area/id"/></xsl:variable>

Modified: trunk/controller/templates/base/control_item/choose_control_items.xsl
===================================================================
--- trunk/controller/templates/base/control_item/choose_control_items.xsl       
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/control_item/choose_control_items.xsl       
2012-09-24 14:21:42 UTC (rev 10025)
@@ -9,7 +9,7 @@
           <!-- ==== CHOOSE NONE/ALL ===== -->
                <div class="expand_menu"><div class="expand_all">Vis 
alle</div><div class="collapse_all focus">Skjul alle</div></div>
                
-               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uicontrol.save_control_items')" /></xsl:variable>
+               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uicontrol.save_control_items')" /></xsl:variable>
                <form id="frm_control_items" 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}" />

Modified: trunk/controller/templates/base/control_item/control_item.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_item.xsl       
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/control_item/control_item.xsl       
2012-09-24 14:21:42 UTC (rev 10025)
@@ -17,7 +17,7 @@
 </xsl:choose>
        
        <div id="control_item_details">
-               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uicontrol_item.save')" /></xsl:variable>
+               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uicontrol_item.save')" /></xsl:variable>
                <form action="{$action_url}" method="post">
                        <input type="hidden" name="id" 
value="{control_item/id}" />
                        <dl class="proplist">
@@ -319,12 +319,15 @@
                                                <input type="submit" 
name="cancel_control_item" value="{$lang_cancel}" title = "{$lang_cancel}" />
                                        </xsl:when>
                                        <xsl:otherwise>
-                                               <a class="btn">
-                                                       <xsl:attribute 
name="href">
-                                                               
<xsl:>index.php?menuaction=controller.uicontrol_item.edit</xsl:>
-                                                               
<xsl:>&amp;id=</xsl:>
-                                                               <xsl:value-of 
select="control_item/id"/>
-                                                       </xsl:attribute>
+                                               <xsl:variable 
name="url_argument">
+                                                       
<xsl:text>menuaction:controller.uicontrol_item.edit</xsl:text>
+                                                       
<xsl:text>,id:</xsl:text>
+                                                       <xsl:value-of 
select="control_item/id"/>
+                                               </xsl:variable>
+
+                                               <xsl:variable 
name="action_url2"><xsl:value-of select="php:function('get_phpgw_link', 
'/index.php', $url_argument)" /></xsl:variable>
+
+                                               <a class="btn" 
href="{$action_url2}">
                                                        <xsl:value-of 
select="php:function('lang', 'edit')" />
                                                </a>
                                        </xsl:otherwise>

Modified: trunk/controller/templates/base/control_item/control_item_option.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_item_option.xsl        
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/control_item/control_item_option.xsl        
2012-09-24 14:21:42 UTC (rev 10025)
@@ -13,7 +13,7 @@
        
 <div class="yui-content">
        <div id="details">
-               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uicontrol_item_option.save')" /></xsl:variable>
+               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uicontrol_item_option.save')" /></xsl:variable>
                <form id="frm_add_control_item_option" action="{$action_url}" 
method="post">
                        <input type="hidden" name="control_item_id">
                                <xsl:attribute name="value"><xsl:value-of 
select="control_item/id"/></xsl:attribute>

Modified: 
trunk/controller/templates/base/control_item/view_control_item_list.xsl
===================================================================
--- trunk/controller/templates/base/control_item/view_control_item_list.xsl     
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/control_item/view_control_item_list.xsl     
2012-09-24 14:21:42 UTC (rev 10025)
@@ -49,12 +49,15 @@
                        </xsl:for-each>
                </ul>
                <div>
-                       <a>
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uicheck_list.save_check_list</xsl:text>
-                                       <xsl:text>&amp;control_id=</xsl:text>
-                                               <xsl:value-of 
select="control_as_array/id"/>
-                               </xsl:attribute>
+                       <xsl:variable name="url_argument">
+                               
<xsl:text>menuaction:controller.uicheck_list.save_check_list</xsl:text>
+                               <xsl:text>,control_id:</xsl:text>
+                               <xsl:value-of select="control_as_array/id"/>
+                       </xsl:variable>
+
+                       <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $url_argument)" 
/></xsl:variable>
+
+                       <a href="{$action_url}">
                                Lag sjekkliste for kontroll
                        </a>            
                </div>

Modified: trunk/controller/templates/base/procedure/procedure_documents.xsl
===================================================================
--- trunk/controller/templates/base/procedure/procedure_documents.xsl   
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/procedure/procedure_documents.xsl   
2012-09-24 14:21:42 UTC (rev 10025)
@@ -7,7 +7,7 @@
 
 <div class="yui-content">
                <div id="details">
-                       <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', 'index.php', 
'menuaction:controller.uidocument.add')" /></xsl:variable>
+                       <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', 
'menuaction:controller.uidocument.add')" /></xsl:variable>
                        <form enctype="multipart/form-data" 
action="{$action_url}" method="POST">
                                <xsl:variable name="lang_upload"><xsl:value-of 
select="php:function('lang', 'upload')" /></xsl:variable>
                                <input type="hidden" name="procedure_id" value 
= "{procedure_id}" />

Modified: 
trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
===================================================================
--- trunk/controller/templates/base/procedure/view_procedures_for_control.xsl   
2012-09-23 15:03:43 UTC (rev 10024)
+++ trunk/controller/templates/base/procedure/view_procedures_for_control.xsl   
2012-09-24 14:21:42 UTC (rev 10025)
@@ -1,24 +1,27 @@
 <!-- $Id: procedure_item.xsl 8485 2012-01-05 08:21:03Z erikhl $ -->
 
-<xsl:template match="data">
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
        
 <div id="view-procedures">
        <h2>Prosedyrer</h2>
-       
+
+               <xsl:variable name="url_argument">
+                       
<xsl:text>menuaction:controller.uiprocedure.print_procedure</xsl:text>
+                       <xsl:text>,procedure_id:</xsl:text>
+                       <xsl:value-of select="control_procedure/id"/>
+                       <xsl:text>,control_id:</xsl:text>
+                       <xsl:value-of select="control/id"/>
+                       <xsl:text>,location_code:</xsl:text>
+                       <xsl:value-of select="location/location_code"/>
+                       <xsl:text>,phpgw_return_as:stripped_html</xsl:text>
+               </xsl:variable>
+
+               <xsl:variable name="action_url"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $url_argument)" 
/></xsl:variable>
+
        <div class="box">
                <h3>Prosedyre for kontroll</h3>
                <h4><xsl:value-of select="control_procedure/title"/>
-                       <a class="btn-sm" id="print-control-items" 
target="_blank">
-                               <xsl:attribute name="href">
-                                       
<xsl:text>index.php?menuaction=controller.uiprocedure.print_procedure</xsl:text>
-                                       <xsl:text>&amp;procedure_id=</xsl:text>
-                                       <xsl:value-of 
select="control_procedure/id"/>
-                                       <xsl:text>&amp;control_id=</xsl:text>
-                                       <xsl:value-of select="control/id"/>
-                                       <xsl:text>&amp;location_code=</xsl:text>
-                                       <xsl:value-of 
select="location/location_code"/>
-                                       
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
-                               </xsl:attribute>
+                       <a class="btn-sm" id="print-control-items" 
target="_blank" href="{$action_url}">
                                Skriv ut
                        </a>
                </h4>
@@ -42,19 +45,22 @@
                        <li>
                                <h4><xsl:value-of 
select="control_group/group_name"/>: <xsl:value-of select="procedure/title"/>
                                
-                               <a class="btn-sm" id="print-control-items" 
target="_blank">
-                                               <xsl:attribute name="href">
-                                                       
<xsl:text>index.php?menuaction=controller.uiprocedure.print_procedure</xsl:text>
-                                                       
<xsl:text>&amp;procedure_id=</xsl:text>
-                                                       <xsl:value-of 
select="procedure/id"/>
-                                                       
<xsl:text>&amp;control_id=</xsl:text>
-                                                       <xsl:value-of 
select="//control/id"/>
-                                                       
<xsl:text>&amp;control_group_id=</xsl:text>
-                                                       <xsl:value-of 
select="control_group/id"/>
-                                                       
<xsl:text>&amp;location_code=</xsl:text>
-                                                       <xsl:value-of 
select="//location/location_code"/>
-                                                       
<xsl:text>&amp;phpgw_return_as=stripped_html</xsl:text>
-                                               </xsl:attribute>
+                               <xsl:variable name="url_argument2">
+                                       
<xsl:text>menuaction:controller.uiprocedure.print_procedure</xsl:text>
+                                       <xsl:text>,procedure_id:</xsl:text>
+                                       <xsl:value-of select="procedure/id"/>
+                                       <xsl:text>,control_id:</xsl:text>
+                                       <xsl:value-of select="//control/id"/>
+                                       <xsl:text>,control_group_id:</xsl:text>
+                                       <xsl:value-of 
select="control_group/id"/>
+                                       <xsl:text>,location_code:</xsl:text>
+                                       <xsl:value-of 
select="//location/location_code"/>
+                                       
<xsl:text>,phpgw_return_as:stripped_html</xsl:text>
+                               </xsl:variable>
+
+                               <xsl:variable name="action_url2"><xsl:value-of 
select="php:function('get_phpgw_link', '/index.php', $url_argument2)" 
/></xsl:variable>
+
+                               <a class="btn-sm" id="print-control-items" 
target="_blank" href="{$action_url2}">
                                                Skriv ut
                                        </a>
                                </h4>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]