[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10030] controller: more on use generated url
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10030] controller: more on use generated url |
|
Date: |
Tue, 25 Sep 2012 08:04:18 +0000 |
Revision: 10030
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10030
Author: sigurdne
Date: 2012-09-25 08:04:18 +0000 (Tue, 25 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/calendar/view_calendar_year.xsl
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
trunk/controller/templates/base/check_list/add_case.xsl
trunk/controller/templates/base/check_list/case_row.xsl
trunk/controller/templates/base/check_list/cases_tab_menu.xsl
trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
trunk/controller/templates/base/check_list/edit_check_list.xsl
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
trunk/controller/templates/base/check_list/view_check_list.xsl
trunk/controller/templates/base/check_list/view_check_lists.xsl
trunk/controller/templates/base/check_list/view_closed_cases.xsl
trunk/controller/templates/base/check_list/view_control_info.xsl
trunk/controller/templates/base/check_list/view_control_items.xsl
trunk/controller/templates/base/control_item/control_item.xsl
trunk/controller/templates/base/control_item/view_control_item_list.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-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/calendar/calendar_filters.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -2,14 +2,21 @@
<xsl:template name="calendar_filters" xmlns:php="http://php.net/xsl";>
<xsl:param name="view_period" />
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<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:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+ <xsl:value-of select="$session_url"/>
+ </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:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:value-of select="$session_url"/>
+ </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 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/calendar/check_list_status_manager.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,7 +1,8 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="check_list_status_manager" xmlns:php="http://php.net/xsl";>
-
+
<xsl:param name="location_code" />
+ <xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<xsl:choose>
<xsl:when test="status = 'CONTROL_REGISTERED'">
@@ -26,6 +27,7 @@
<xsl:value-of select="info/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_yellow_ring.png" />
</a>
@@ -36,6 +38,7 @@
<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:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_yellow.png" />
</a>
@@ -62,6 +65,7 @@
<xsl:value-of select="info/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_red_cross.png" />
</a>
@@ -72,6 +76,7 @@
<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:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_red_cross.png" />
</a>
@@ -82,6 +87,7 @@
<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:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_red_cross.png" />
</a>
@@ -92,6 +98,7 @@
<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:value-of select="$session_url"/>
</xsl:attribute>
<span class="ext_info">
<xsl:value-of select="info/id"/>
@@ -107,6 +114,7 @@
<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:value-of select="$session_url"/>
</xsl:attribute>
<span class="ext_info">
<xsl:value-of select="info/id"/>
@@ -123,6 +131,7 @@
<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:value-of select="$session_url"/>
</xsl:attribute>
<span class="ext_info">
<xsl:text>&check_list_id=</xsl:text>
@@ -157,6 +166,7 @@
<xsl:value-of select="//current_year"/>
<xsl:text>&month=</xsl:text>
<xsl:number />
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<span class="ext_info">
<xsl:text>&check_list_id=</xsl:text>
@@ -186,6 +196,7 @@
<xsl:value-of select="//current_year"/>
<xsl:text>&month=</xsl:text>
<xsl:number />
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="15" src="controller/images/status_icon_red_cross.png" />
</a>
@@ -209,6 +220,7 @@
<xsl:value-of select="info/month"/>
<xsl:text>&year=</xsl:text>
<xsl:value-of select="info/year"/>
+ <xsl:value-of select="$session_url"/>
</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 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/calendar/nav_calendar_month.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,8 +1,8 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="nav_calendar_month" xmlns:php="http://php.net/xsl";>
-
<xsl:param name="view" />
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="calNav">
<xsl:choose>
<xsl:when test="current_month_nr > 1">
@@ -24,6 +24,7 @@
<xsl:value-of select="current_year"/>
<xsl:text>&month=</xsl:text>
<xsl:value-of select="current_month_nr
- 1"/>
+ <xsl:value-of select="$session_url"/>
</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>
@@ -48,6 +49,7 @@
<xsl:text>&year=</xsl:text>
<xsl:value-of select="current_year -
1"/>
<xsl:text>&month=12</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="17"
src="controller/images/left_arrow_simple_light_blue.png" />
<xsl:variable name="month_str">month 12
capitalized</xsl:variable>
@@ -80,6 +82,7 @@
<xsl:value-of select="current_year"/>
<xsl:text>&month=</xsl:text>
<xsl:value-of select="current_month_nr
+ 1"/>
+ <xsl:value-of select="$session_url"/>
</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)" />
@@ -104,6 +107,7 @@
<xsl:text>&year=</xsl:text>
<xsl:value-of select="current_year +
1"/>
<xsl:text>&month=1</xsl:text>
+ <xsl:value-of select="$session_url"/>
</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 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/calendar/nav_calendar_year.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,8 +1,7 @@
<!-- $Id: view_calendar_month.xsl 9200 2012-04-21 20:05:34Z vator $ -->
<xsl:template name="nav_calendar_year" xmlns:php="http://php.net/xsl";>
-
<xsl:param name="view" />
-
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="calNav">
<a class="showPrev">
<xsl:attribute name="href">
@@ -20,6 +19,7 @@
</xsl:choose>
<xsl:text>&year=</xsl:text>
<xsl:value-of select="current_year - 1"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="17"
src="controller/images/left_arrow_simple_light_blue.png" />
<xsl:value-of select="current_year - 1"/>
@@ -43,6 +43,7 @@
</xsl:choose>
<xsl:text>&year=</xsl:text>
<xsl:value-of select="current_year + 1"/>
+ <xsl:value-of select="$session_url"/>
</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 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/calendar/view_calendar_month.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -2,6 +2,8 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
<xsl:variable name="month_str">month <xsl:value-of select="current_month_nr"/>
capitalized</xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
<script>
<xsl:text>
@@ -145,6 +147,7 @@
<xsl:value-of select="current_year"/>
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="current_location/location_code"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<img height="20"
src="controller/images/left_arrow_simple_light_blue.png" />Årsoversikt
</a>
@@ -159,6 +162,7 @@
<xsl:value-of
select="current_year"/>
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="current_location/loc1"/>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
Vis kontrollplan for eiendom
</a>
@@ -213,6 +217,7 @@
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:value-of select="control/title"/>
</a>
@@ -288,6 +293,7 @@
<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:value-of select="$session_url"/>
</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 06:20:20 UTC (rev 10029)
+++
trunk/controller/templates/base/calendar/view_calendar_month_for_locations.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -2,6 +2,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
<xsl:variable name="month_str">month <xsl:value-of select="current_month_nr"/>
capitalized</xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content">
<div id="control_plan">
@@ -22,6 +23,7 @@
<xsl:value-of
select="current_year"/>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of
select="control/id"/>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
Årsoversikt
</a>
Modified: trunk/controller/templates/base/calendar/view_calendar_year.xsl
===================================================================
--- trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/calendar/view_calendar_year.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,6 +1,7 @@
<!-- $Id$ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<script>
<xsl:text>
@@ -110,6 +111,7 @@
<xsl:value-of
select="current_year"/>
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="current_location/loc1"/>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
Vis kontrollplan for eiendom
</a>
@@ -152,6 +154,7 @@
<xsl:value-of select="//current_location/location_code"/>
<xsl:text>&month=</xsl:text>
<xsl:number/>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:variable
name="month_str">short_month <xsl:number/> capitalized</xsl:variable>
@@ -181,6 +184,7 @@
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:value-of select="control/title"/>
</a>
@@ -246,6 +250,7 @@
<xsl:value-of select="//current_location/location_code"/>
<xsl:text>&month=</xsl:text>
<xsl:number/>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:variable name="month_str">short_month <xsl:number/>
capitalized</xsl:variable>
@@ -274,6 +279,7 @@
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:value-of select="control/title"/>
</a>
Modified:
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
===================================================================
---
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++
trunk/controller/templates/base/calendar/view_calendar_year_for_locations.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,6 +1,7 @@
<!-- $Id: view_calendar_year.xsl 9206 2012-04-23 06:21:38Z vator $ -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content">
@@ -41,6 +42,7 @@
<xsl:number/>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="//control/id"/>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:variable
name="month_str">short_month <xsl:value-of select="."/>
capitalized</xsl:variable>
@@ -106,6 +108,7 @@
<xsl:number/>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="//control/id"/>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:variable
name="month_str">short_month <xsl:value-of select="."/>
capitalized</xsl:variable>
Modified: trunk/controller/templates/base/check_list/add_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_case.xsl 2012-09-25
06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/check_list/add_case.xsl 2012-09-25
08:04:18 UTC (rev 10030)
@@ -2,6 +2,8 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
<div id="main_content" class="medium">
<div id="check-list-heading">
@@ -38,6 +40,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (år)
</a>
@@ -57,6 +60,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (måned)
</a>
Modified: trunk/controller/templates/base/check_list/case_row.xsl
===================================================================
--- trunk/controller/templates/base/check_list/case_row.xsl 2012-09-25
06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/check_list/case_row.xsl 2012-09-25
08:04:18 UTC (rev 10030)
@@ -3,7 +3,7 @@
<xsl:template name="case_row" xmlns:php="http://php.net/xsl";>
<xsl:param name="control_item_type" />
-
+ <xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<li class="check_item_case">
<xsl:choose>
<xsl:when test="cases_array/child::node()">
@@ -75,6 +75,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="//check_list/id"/>
<xsl:text>&phpgw_return_as=json</xsl:text>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
lukk
</a>
@@ -88,6 +89,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="//check_list/id"/>
<xsl:text>&phpgw_return_as=json</xsl:text>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
slett
</a>
@@ -107,6 +109,7 @@
<xsl:text>&control_item_type=</xsl:text>
<xsl:value-of select="//control_item/type" />
<xsl:text>&phpgw_return_as=json</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<input type="hidden" name="control_item_type">
<xsl:attribute name="value"><xsl:value-of
select="//control_item/type" /></xsl:attribute>
@@ -200,6 +203,7 @@
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
<xsl:text>&id=</xsl:text>
<xsl:value-of select="location_item_id"/>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
Vis melding
</a>
Modified: trunk/controller/templates/base/check_list/cases_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/cases_tab_menu.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/check_list/cases_tab_menu.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -2,6 +2,8 @@
<xsl:param name="active_tab" />
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
<div class="tab_menu">
<a id="view_open_cases">
<xsl:if test="$active_tab = 'view_open_cases'">
@@ -12,6 +14,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Åpne saker
</a>
@@ -24,6 +27,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Lukkede saker
</a>
Modified: trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
===================================================================
--- trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/check_list/check_list_tab_menu.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -2,6 +2,7 @@
<xsl:param name="active_tab" />
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="check_list_menu">
<!-- ================== LOADS VIEW CHECKLIST DETAILS
===================== -->
<div class="left_btns">
@@ -13,6 +14,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Vis detaljer for sjekkliste
</a>
@@ -25,6 +27,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_cases_for_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Vis saker
</a>
@@ -37,6 +40,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_control_info</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Vis info om kontroll
</a>
@@ -49,6 +53,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.add_case</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Registrer sak
</a>
@@ -58,6 +63,7 @@
<xsl:text>index.php?menuaction=controller.uicase.create_case_message</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Registrer melding
</a>
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,6 +1,7 @@
<!-- $Id$ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
@@ -40,6 +41,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (år)
</a>
@@ -59,6 +61,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (måned)
</a>
Modified:
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,6 +1,7 @@
<!-- $Id: edit_check_list.xsl 8513 2012-01-07 10:38:09Z vator $ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
@@ -94,6 +95,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (år)
</a>
@@ -113,6 +115,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (måned)
</a>
@@ -130,6 +133,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
</a>
Modified: trunk/controller/templates/base/check_list/view_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_check_list.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/check_list/view_check_list.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,6 +1,7 @@
<!-- $Id$ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
@@ -57,6 +58,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.edit_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<div>Registrer sjekkliste</div>
</a>
Modified: trunk/controller/templates/base/check_list/view_check_lists.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_check_lists.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/check_list/view_check_lists.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,6 +1,7 @@
<!-- $Id$ -->
<xsl:template match="data" name="view_check_lists"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
@@ -54,6 +55,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.view_check_list</xsl:text>
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="id"/>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
<xsl:if
test="deadline != ''">
<xsl:value-of select="php:function('date', $date_format, number(deadline))"/>
@@ -84,6 +86,7 @@
<xsl:text>index.php?menuaction=controller.uicheck_list.control_calendar_status_overview</xsl:text>
<xsl:text>&control_id=</xsl:text>
<xsl:value-of
select="control_as_array/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
<div>
Se kalenderoversikt for kontroll
Modified: trunk/controller/templates/base/check_list/view_closed_cases.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_closed_cases.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/check_list/view_closed_cases.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,7 +1,9 @@
<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-<xsl:template match="data">
-
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
<div id="view_cases">
<xsl:call-template name="cases_tab_menu">
@@ -44,6 +46,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="//check_list/id"/>
<xsl:text>&phpgw_return_as=json</xsl:text>
+
<xsl:value-of select="$session_url"/>
</xsl:attribute>
åpne
</a>
@@ -57,6 +60,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of
select="//check_list/id"/>
<xsl:text>&phpgw_return_as=json</xsl:text>
+
<xsl:value-of
select="$session_url"/>
</xsl:attribute>
slett
</a>
@@ -74,6 +78,7 @@
<xsl:text>index.php?menuaction=property.uitts.view</xsl:text>
<xsl:text>&id=</xsl:text>
<xsl:value-of
select="location_item_id"/>
+
<xsl:value-of
select="$session_url"/>
</xsl:attribute>
Vis melding
</a>
@@ -100,4 +105,4 @@
</xsl:choose>
</div>
</div>
-</xsl:template>
\ No newline at end of file
+</xsl:template>
Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,6 +1,7 @@
<!-- $Id: edit_check_list.xsl 8478 2012-01-03 12:36:37Z vator $ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
<xsl:variable name="date_format"><xsl:value-of
select="php:function('get_phpgw_info', 'user|preferences|common|dateformat')"
/></xsl:variable>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content" class="medium">
@@ -101,6 +102,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (år)
</a>
@@ -120,6 +122,7 @@
<xsl:value-of
select="location_array/location_code"/>
</xsl:otherwise>
</xsl:choose>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolplan for bygg/eiendom (måned)
</a>
@@ -138,6 +141,7 @@
<xsl:text>&control_id=</xsl:text>
<xsl:value-of select="control/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrolldetaljer
</a>
@@ -147,6 +151,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Kontrollpunkter
</a>
@@ -158,6 +163,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="location_array/location_code"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Prosedyrer
</a>
Modified: trunk/controller/templates/base/check_list/view_control_items.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_items.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/check_list/view_control_items.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,7 +1,9 @@
<!-- $Id: choose_control_items.xsl 8267 2011-12-11 12:27:18Z sigurdne $ -->
-<xsl:template match="data">
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
<div id="control-items">
<h2>Kontrollpunkter</h2>
@@ -56,6 +58,7 @@
<xsl:text>&check_list_id=</xsl:text>
<xsl:value-of select="check_list/id"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Skriv ut
</a>
Modified: trunk/controller/templates/base/control_item/control_item.xsl
===================================================================
--- trunk/controller/templates/base/control_item/control_item.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/control_item/control_item.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -2,7 +2,7 @@
<!-- item -->
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
-
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<xsl:call-template name="yui_phpgw_i18n"/>
<div id="main_content">
@@ -324,6 +324,7 @@
<xsl:>index.php?menuaction=controller.uicontrol_item.edit</xsl:>
<xsl:>&id=</xsl:>
<xsl:value-of
select="control_item/id"/>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
<xsl:value-of
select="php:function('lang', 'edit')" />
</a>
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 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/control_item/view_control_item_list.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,6 +1,6 @@
<!-- $Id$ -->
<xsl:template match="data" name="view_check_list"
xmlns:php="http://php.net/xsl";>
-
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
<div id="main_content">
<!-- =========================== SHOWS CONTROL ITEMS RECEIPT
=============================== -->
@@ -53,7 +53,8 @@
<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:value-of
select="control_as_array/id"/>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Lag sjekkliste for kontroll
</a>
Modified:
trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
===================================================================
--- trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-09-25 06:20:20 UTC (rev 10029)
+++ trunk/controller/templates/base/procedure/view_procedures_for_control.xsl
2012-09-25 08:04:18 UTC (rev 10030)
@@ -1,10 +1,10 @@
<!-- $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";>
+<xsl:variable name="session_url">&<xsl:value-of
select="php:function('get_phpgw_session_url')" /></xsl:variable>
+
<div id="view-procedures">
<h2>Prosedyrer</h2>
-
<div class="box">
<h3>Prosedyre for kontroll</h3>
<h4><xsl:value-of select="control_procedure/title"/>
@@ -18,6 +18,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="location/location_code"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of select="$session_url"/>
</xsl:attribute>
Skriv ut
</a>
@@ -54,6 +55,7 @@
<xsl:text>&location_code=</xsl:text>
<xsl:value-of
select="//location/location_code"/>
<xsl:text>&phpgw_return_as=stripped_html</xsl:text>
+ <xsl:value-of
select="$session_url"/>
</xsl:attribute>
Skriv ut
</a>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10030] controller: more on use generated url,
Sigurd Nes <=