[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10029] controller: revert url-changes 10025:10024
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10029] controller: revert url-changes 10025:10024 |
|
Date: |
Tue, 25 Sep 2012 06:20:21 +0000 |
Revision: 10029
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10029
Author: sigurdne
Date: 2012-09-25 06:20:20 +0000 (Tue, 25 Sep 2012)
Log Message:
-----------
controller: revert url-changes 10025:10024
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
Property Changed:
----------------
trunk/property/inc/cron/cron.php
trunk/property/inc/cron/default/Import_fra_basware_X205.php
trunk/property/inc/cron/default/export_info_as_files.php
trunk/property/inc/cron/default/forward_mail_as_sms.php
trunk/property/inc/cron/default/import_files.php
trunk/property/inc/cron/default/import_from_scanner.php
trunk/property/inc/cron/default/lag_lang_filer.php
trunk/property/inc/cron/default/oppdater_antall_leieobjekt.php
trunk/property/inc/cron/default/oppdater_namssakstatus_pr_leietaker.php
trunk/property/inc/cron/default/oppdater_utgaatt_objekt.php
trunk/property/inc/cron/default/organize_drawing.php
trunk/property/inc/cron/default/synkroniser_med_boei.php
trunk/property/inc/cron/default/update_googlemap.php
trunk/property/inc/cron/default/update_phpgw.php
trunk/property/inc/cron/default/update_workorder_status.php
trunk/property/inc/custom/default/estimert_ferdigdato_til_leieobjekt_BBB.php
trunk/property/inc/custom/default/hent_maaler_nr_til_besikt_rapport.php
trunk/property/inc/custom/default/innflyttetdato_entity_2_11_BBB.php
trunk/property/inc/custom/default/kalkuler_risiko_for_ros.php
trunk/property/inc/export/default/Agresso
trunk/property/inc/export/default/Ecolink
trunk/property/inc/export/default/GABNr
trunk/property/inc/export/default/Kemner_kvittering
trunk/property/inc/import/default/Import_fra_BKK
trunk/property/inc/import/default/Import_fra_BKK_csv
trunk/property/inc/import/default/Import_fra_Kemner
trunk/property/inc/import/default/Import_fra_Kemner_xml
trunk/property/inc/import/default/Import_fra_Service
trunk/property/inc/import/default/Import_fra_Service_xml
trunk/property/inc/import/default/import_fra_Service_xls
trunk/sms/bin/default/config_BR
trunk/sms/bin/default/config_BR_log
trunk/sms/bin/default/config_SD
trunk/sms/bin/default/config_SD_log
trunk/sms/bin/default/config_ST
trunk/sms/bin/default/config_STATUS_log
trunk/sms/bin/default/config_ST_log
trunk/sms/bin/default/config_VASK
trunk/sms/bin/default/config_VASK_log
trunk/sms/bin/default/log_firealarm.php
trunk/sms/bin/default/receipt_service_agreement.php
trunk/sms/bin/default/set_workorder_status.php
Modified: trunk/controller/templates/base/calendar/calendar_filters.xsl
===================================================================
--- trunk/controller/templates/base/calendar/calendar_filters.xsl
2012-09-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/calendar/calendar_filters.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -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"><xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:uicalendar.view_calendar_for_month')" /></xsl:attribute>
+ <xsl:attribute
name="action">index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:attribute>
</xsl:when>
<xsl:otherwise>
- <xsl:attribute name="action"><xsl:value-of
select="php:function('get_phpgw_link', '/index.php',
'menuaction:uicalendar.view_calendar_for_year')" /></xsl:attribute>
+ <xsl:attribute
name="action">index.php?menuaction=controller.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-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/calendar/check_list_status_manager.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -5,112 +5,93 @@
<xsl:choose>
<xsl:when test="status = 'CONTROL_REGISTERED'">
- <xsl:variable name="url_argument_registered">
-
<xsl:text>menuaction:controller.uicheck_list.add_check_list</xsl:text>
- <xsl:text>,deadline_ts:</xsl:text>
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?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>,control_id:</xsl:text>
+ <xsl:text>&control_id=</xsl:text>
<xsl:value-of select="info/control_id"/>
- <xsl:text>,type:</xsl:text>
+ <xsl:text>&type=</xsl:text>
<xsl:value-of select="info/type"/>
<xsl:choose>
<xsl:when test="info/type = 'component'">
- <xsl:text>,location_id:</xsl:text>
+ <xsl:text>&location_id=</xsl:text>
<xsl:value-of select="info/location_id"/>
- <xsl:text>,component_id:</xsl:text>
+ <xsl:text>&component_id=</xsl:text>
<xsl:value-of select="info/component_id"/>
</xsl:when>
<xsl:otherwise>
- <xsl:text>,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:value-of select="php:function('get_phpgw_link',
'/index.php', $url_argument_planned)" />
+
<xsl:text>index.php?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:attribute>
<img height="15" src="controller/images/status_icon_yellow.png" />
</a>
</xsl:when>
<xsl:when test="status = 'CONTROL_NOT_DONE'">
- <xsl:variable name="url_argument_not_done">
-
<xsl:text>menuaction:controller.uicheck_list.add_check_list</xsl:text>
- <xsl:text>,deadline_ts:</xsl:text>
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?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>,control_id:</xsl:text>
+ <xsl:text>&control_id=</xsl:text>
<xsl:value-of select="info/control_id"/>
- <xsl:text>,type:</xsl:text>
+ <xsl:text>&type=</xsl:text>
<xsl:value-of select="info/type"/>
<xsl:choose>
<xsl:when test="info/type = 'component'">
- <xsl:text>,location_id:</xsl:text>
+ <xsl:text>&location_id=</xsl:text>
<xsl:value-of select="info/location_id"/>
- <xsl:text>,component_id:</xsl:text>
+ <xsl:text>&component_id=</xsl:text>
<xsl:value-of select="info/component_id"/>
</xsl:when>
<xsl:otherwise>
- <xsl:text>,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_not_done)" />
- </xsl:attribute>
+ </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:value-of select="php:function('get_phpgw_link',
'/index.php', $url_argument_not_done_with_checklist)" />
+
<xsl:text>index.php?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: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'">
- <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>
+ <a>
<xsl:attribute name="href">
- <xsl:value-of select="php:function('get_phpgw_link',
'/index.php', $url_argument_not_done_with_planned_date)" />
+
<xsl:text>index.php?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: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:value-of select="php:function('get_phpgw_link',
'/index.php', $url_argument_done_in_time_without_errors)" />
+
<xsl:text>index.php?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:attribute>
<span class="ext_info">
<xsl:value-of select="info/id"/>
@@ -121,14 +102,11 @@
<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:value-of select="php:function('get_phpgw_link',
'/index.php', $url_argument_done_over_time_without_errors)" />
+
<xsl:text>index.php?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:attribute>
<span class="ext_info">
<xsl:value-of select="info/id"/>
@@ -140,14 +118,11 @@
<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:value-of select="php:function('get_phpgw_link',
'/index.php', $url_argument_done_with_errors)" />
+
<xsl:text>index.php?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:attribute>
<span class="ext_info">
<xsl:text>&check_list_id=</xsl:text>
@@ -164,27 +139,24 @@
<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:value-of select="php:function('get_phpgw_link',
'/index.php', $url_argument_controls_done_with_errors)" />
+ <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>&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>&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:attribute>
<span class="ext_info">
<xsl:text>&check_list_id=</xsl:text>
@@ -196,54 +168,47 @@
</div>
</xsl:when>
<xsl:when test="status = 'CONTROLS_NOT_DONE'">
- <xsl:variable name="url_argument_controls_not_done">
+ <a>
+ <xsl:attribute name="href">
<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:text>index.php?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>menuaction:controller.uicalendar.view_calendar_for_month</xsl:text>
- <xsl:text>,location_code:</xsl:text>
+
<xsl:text>index.php?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>,year:</xsl:text>
+ <xsl:text>&year=</xsl:text>
<xsl:value-of select="//current_year"/>
- <xsl:text>,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'">
- <xsl:variable name="url_argument_controls_registered">
+ <a>
+ <xsl:attribute name="href">
<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:text>index.php?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>menuaction:controller.uicalendar.view_calendar_for_month</xsl:text>
- <xsl:text>location_code:</xsl:text>
+
<xsl:text>index.php?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>,month:</xsl:text>
+ <xsl:text>&month=</xsl:text>
<xsl:value-of select="info/month"/>
- <xsl:text>,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-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/calendar/nav_calendar_month.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -6,28 +6,24 @@
<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:value-of
select="php:function('get_phpgw_link', '/index.php', $url_argument_1)" />
+ <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>&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>&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: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>
@@ -35,28 +31,23 @@
</a>
</xsl:when>
<xsl:otherwise>
-
- <xsl:variable name="url_argument_2">
+ <a class="showPrev month">
+ <xsl:attribute name="href">
<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:text>index.php?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:text>index.php?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:text>&year=</xsl:text>
<xsl:value-of select="current_year -
1"/>
- <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:text>&month=12</xsl:text>
</xsl:attribute>
<img height="17"
src="controller/images/left_arrow_simple_light_blue.png" />
<xsl:variable name="month_str">month 12
capitalized</xsl:variable>
@@ -71,28 +62,24 @@
</span>
<xsl:choose>
<xsl:when test="12 > current_month_nr">
- <xsl:variable name="url_argument_3">
+ <a class="showNext">
+ <xsl:attribute name="href">
<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:text>index.php?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:text>index.php?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:text>&year=</xsl:text>
<xsl:value-of select="current_year"/>
- <xsl:text>,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)" />
@@ -100,27 +87,23 @@
</a>
</xsl:when>
<xsl:otherwise>
- <xsl:variable name="url_argument_4">
+ <a class="showNext">
+ <xsl:attribute name="href">
<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:text>index.php?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:text>index.php?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:text>&year=</xsl:text>
<xsl:value-of select="current_year +
1"/>
- <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:text>&month=1</xsl:text>
</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-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/calendar/nav_calendar_year.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -4,27 +4,22 @@
<xsl:param name="view" />
<div id="calNav">
-
- <xsl:variable name="url_argument_showPrev">
+ <a class="showPrev">
+ <xsl:attribute name="href">
<xsl:choose>
<xsl:when test="$view =
'VIEW_LOCATIONS_FOR_CONTROL'">
-
<xsl:text>menuaction:controller.uicalendar.view_calendar_year_for_locations</xsl:text>
-
<xsl:text>,control_id:</xsl:text>
+
<xsl:text>index.php?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>menuaction:controller.uicalendar.view_calendar_for_year</xsl:text>
- <xsl:text>,location_code:</xsl:text>
+
<xsl:text>index.php?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>,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"/>
@@ -32,27 +27,22 @@
<span class="current">
<xsl:value-of select="current_year"/>
</span>
-
- <xsl:variable name="url_argument_showNext">
+ <a class="showNext">
+ <xsl:attribute name="href">
<xsl:choose>
<xsl:when test="$view =
'VIEW_LOCATIONS_FOR_CONTROL'">
-
<xsl:text>menuaction:controller.uicalendar.view_calendar_year_for_locations</xsl:text>
-
<xsl:text>,control_id:</xsl:text>
+
<xsl:text>index.php?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>menuaction:controller.uicalendar.view_calendar_for_year</xsl:text>
- <xsl:text>,location_code:</xsl:text>
+
<xsl:text>index.php?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>,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-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -138,18 +138,13 @@
<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:value-of
select="php:function('get_phpgw_link', '/index.php', $url_argument_showYear)" />
+
<xsl:text>index.php?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:attribute>
<img height="20"
src="controller/images/left_arrow_simple_light_blue.png" />Årsoversikt
</a>
@@ -157,16 +152,13 @@
<!-- ===================== 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:value-of
select="php:function('get_phpgw_link', '/index.php', $url_argument_showYears)"
/>
+
<xsl:text>index.php?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:attribute>
Vis kontrollplan for eiendom
</a>
@@ -215,16 +207,12 @@
</xsl:otherwise>
</xsl:choose>
<td
class="title">
- <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">
+ <a class="show-control-details">
<xsl:attribute name="href">
-
<xsl:value-of select="php:function('get_phpgw_link', '/index.php',
$url_argument_control_details)" />
+
<xsl:text>index.php?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:attribute>
<xsl:value-of select="control/title"/>
</a>
@@ -295,15 +283,11 @@
</xsl:otherwise>
</xsl:choose>
<td
class="title">
-
<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">
+ <a id="showControlDetails">
<xsl:attribute name="href">
-
<xsl:value-of select="php:function('get_phpgw_link', '/index.php',
$url_argument_showControlDetails)" />
+
<xsl:text>index.php?menuaction=controller.uicontrol.get_control_details</xsl:text>
+
<xsl:text>&control_id=</xsl:text>
+
<xsl:value-of select="control/id"/>
</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-25 05:15:42 UTC (rev 10028)
+++
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -15,17 +15,13 @@
<!-- ===================== 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:value-of
select="php:function('get_phpgw_link', '/index.php', $url_argument)" />
+
<xsl:text>index.php?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:attribute>
Årsoversikt
</a>
Modified: trunk/controller/templates/base/check_list/add_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_case.xsl 2012-09-25
05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/check_list/add_case.xsl 2012-09-25
06:20:20 UTC (rev 10029)
@@ -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-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -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-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/control_group/control_groups.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -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-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/control_item/choose_control_items.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -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-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/control_item/control_item.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -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,15 +319,12 @@
<input type="submit"
name="cancel_control_item" value="{$lang_cancel}" title = "{$lang_cancel}" />
</xsl:when>
<xsl:otherwise>
- <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}">
+ <a class="btn">
+ <xsl:attribute
name="href">
+
<xsl:>index.php?menuaction=controller.uicontrol_item.edit</xsl:>
+
<xsl:>&id=</xsl:>
+ <xsl:value-of
select="control_item/id"/>
+ </xsl:attribute>
<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-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/control_item/control_item_option.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -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-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/control_item/view_control_item_list.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -49,15 +49,12 @@
</xsl:for-each>
</ul>
<div>
- <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}">
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicheck_list.save_check_list</xsl:text>
+ <xsl:text>&control_id=</xsl:text>
+ <xsl:value-of
select="control_as_array/id"/>
+ </xsl:attribute>
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-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/procedure/procedure_documents.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -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-25 05:15:42 UTC (rev 10028)
+++ trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-09-25 06:20:20 UTC (rev 10029)
@@ -1,27 +1,24 @@
<!-- $Id: procedure_item.xsl 8485 2012-01-05 08:21:03Z erikhl $ -->
-<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:template match="data">
<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" href="{$action_url}">
+ <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>&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:attribute>
Skriv ut
</a>
</h4>
@@ -45,22 +42,19 @@
<li>
<h4><xsl:value-of
select="control_group/group_name"/>: <xsl:value-of select="procedure/title"/>
- <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}">
+ <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>&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:attribute>
Skriv ut
</a>
</h4>
Property changes on: trunk/property/inc/cron/cron.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/cron/default/Import_fra_basware_X205.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/cron/default/export_info_as_files.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/cron/default/forward_mail_as_sms.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/cron/default/import_files.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/cron/default/import_from_scanner.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/cron/default/lag_lang_filer.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
trunk/property/inc/cron/default/oppdater_antall_leieobjekt.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
trunk/property/inc/cron/default/oppdater_namssakstatus_pr_leietaker.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/cron/default/oppdater_utgaatt_objekt.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/cron/default/organize_drawing.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/cron/default/synkroniser_med_boei.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/cron/default/update_googlemap.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/cron/default/update_phpgw.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/cron/default/update_workorder_status.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
trunk/property/inc/custom/default/estimert_ferdigdato_til_leieobjekt_BBB.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
trunk/property/inc/custom/default/hent_maaler_nr_til_besikt_rapport.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
trunk/property/inc/custom/default/innflyttetdato_entity_2_11_BBB.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on:
trunk/property/inc/custom/default/kalkuler_risiko_for_ros.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/export/default/Agresso
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/export/default/Ecolink
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/export/default/GABNr
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/export/default/Kemner_kvittering
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/import/default/Import_fra_BKK
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/import/default/Import_fra_BKK_csv
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/import/default/Import_fra_Kemner
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/import/default/Import_fra_Kemner_xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/import/default/Import_fra_Service
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/import/default/Import_fra_Service_xml
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/property/inc/import/default/import_fra_Service_xls
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/sms/bin/default/config_BR
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/sms/bin/default/config_BR_log
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/sms/bin/default/config_SD
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/sms/bin/default/config_SD_log
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/sms/bin/default/config_ST
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/sms/bin/default/config_STATUS_log
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/sms/bin/default/config_ST_log
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/sms/bin/default/config_VASK
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/sms/bin/default/config_VASK_log
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/sms/bin/default/log_firealarm.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/sms/bin/default/receipt_service_agreement.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
Property changes on: trunk/sms/bin/default/set_workorder_status.php
___________________________________________________________________
Deleted: svn:mergeinfo
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10029] controller: revert url-changes 10025:10024,
Sigurd Nes <=