[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10554] property: More on condition survey
|
From: |
Sigurd Nes |
|
Subject: |
[Fmsystem-commits] [10554] property: More on condition survey |
|
Date: |
Thu, 29 Nov 2012 11:23:44 +0000 |
Revision: 10554
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10554
Author: sigurdne
Date: 2012-11-29 11:23:42 +0000 (Thu, 29 Nov 2012)
Log Message:
-----------
property: More on condition survey
Modified Paths:
--------------
trunk/property/inc/class.bolocation.inc.php
trunk/property/templates/base/condition_survey.xsl
trunk/property/templates/base/location_form.xsl
trunk/property/templates/base/location_form2.xsl
trunk/property/templates/base/location_view2.xsl
Property Changed:
----------------
trunk/property/templates/base/location_form2.xsl
trunk/property/templates/base/location_view2.xsl
Modified: trunk/property/inc/class.bolocation.inc.php
===================================================================
--- trunk/property/inc/class.bolocation.inc.php 2012-11-29 07:11:35 UTC (rev
10553)
+++ trunk/property/inc/class.bolocation.inc.php 2012-11-29 11:23:42 UTC (rev
10554)
@@ -611,7 +611,8 @@
if(isset($lookup_functions) &&
is_array($lookup_functions))
{
- $location['lookup_functions'] = '';
+ $_lookup_functions =
"self.name='first_Window'\n";
+
$filter_level = 0;
for ($j=0;$j<count($lookup_functions);$j++)
{
@@ -630,14 +631,14 @@
$lookup_functions[$j]['link']
.= ",location_code:'{$filter_location}',block_query:'{$block_query}'";
}
- $location['lookup_functions'] .= <<<JS
+ $_lookup_functions .= <<<JS
function
{$lookup_functions[$j]['name']}
{
JS;
if($filter_level)
{
- $location['lookup_functions']
.= <<<JS
+ $_lookup_functions .= <<<JS
var block = '';
var filter = '';
@@ -662,7 +663,7 @@
}
JS;
}
- $location['lookup_functions'] .= <<<JS
+ $_lookup_functions .= <<<JS
var oArgs =
{{$lookup_functions[$j]['link']}};
var strURL =
phpGWLink('index.php', oArgs);
@@ -672,6 +673,8 @@
}
}
+ $GLOBALS['phpgw']->js->add_code('', $_lookup_functions);
+
if(isset($location) && is_array($location))
{
for ($i=0;$i<count($location['location']);$i++)
Modified: trunk/property/templates/base/condition_survey.xsl
===================================================================
--- trunk/property/templates/base/condition_survey.xsl 2012-11-29 07:11:35 UTC
(rev 10553)
+++ trunk/property/templates/base/condition_survey.xsl 2012-11-29 11:23:42 UTC
(rev 10554)
@@ -2,14 +2,6 @@
<!-- add / edit -->
<xsl:template match="data" xmlns:formvalidator="http://www.w3.org/TR/html4/";
xmlns:php="http://php.net/xsl";>
- <xsl:choose>
- <xsl:when test="mode = 'edit'">
- <script type="text/javascript">
- self.name="first_Window";
- <xsl:value-of
select="lookup_functions"/>
- </script>
- </xsl:when>
- </xsl:choose>
<div class="yui-navset" id="survey_edit_tabview">
<h1>
@@ -358,63 +350,3 @@
</xsl:choose>
</xsl:template>
-
- <!-- New template-->
- <xsl:template match="location_data">
- <script type="text/javascript">
- self.name="first_Window";
- <xsl:value-of select="lookup_functions"/>
- </script>
- <xsl:for-each select="location">
- <tr>
- <td class="th_text" width="{with}"
align="{align}" title="{statustext}">
- <xsl:choose>
- <xsl:when test="lookup_link=1">
- <a
href="javascript:{lookup_function_call}" title="{statustext}">
- <xsl:value-of
select="name"/>
- </a>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="name"/>
- </xsl:otherwise>
- </xsl:choose>
- </td>
- <td>
- <xsl:choose>
- <xsl:when test="readonly=1">
- <input size="{size}"
type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
- <xsl:attribute
name="title">
-
<xsl:value-of select="statustext"/>
- </xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input size="{size}"
type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
- <xsl:attribute
name="title">
-
<xsl:value-of select="statustext"/>
- </xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
- <xsl:for-each select="extra">
- <xsl:choose>
- <xsl:when
test="readonly=1">
- <input
size="{size}" type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}" readonly="readonly">
-
<xsl:attribute name="title">
-
<xsl:value-of select="statustext"/>
-
</xsl:attribute>
- </input>
- </xsl:when>
- <xsl:otherwise>
- <input
size="{size}" type="{input_type}" name="{input_name}" value="{value}"
onClick="{lookup_function_call}">
-
<xsl:attribute name="title">
-
<xsl:value-of select="statustext"/>
-
</xsl:attribute>
- </input>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- </td>
- </tr>
- </xsl:for-each>
- </xsl:template>
Modified: trunk/property/templates/base/location_form.xsl
===================================================================
--- trunk/property/templates/base/location_form.xsl 2012-11-29 07:11:35 UTC
(rev 10553)
+++ trunk/property/templates/base/location_form.xsl 2012-11-29 11:23:42 UTC
(rev 10554)
@@ -5,10 +5,6 @@
<!-- New template-->
<xsl:template match="location_data">
- <script type="text/javascript">
- self.name="first_Window";
- <xsl:value-of select="lookup_functions"/>
- </script>
<xsl:for-each select="location">
<tr>
<td class="th_text" width="{with}"
align="{align}" title="{statustext}">
Modified: trunk/property/templates/base/location_form2.xsl
===================================================================
--- trunk/property/templates/base/location_form2.xsl 2012-11-29 07:11:35 UTC
(rev 10553)
+++ trunk/property/templates/base/location_form2.xsl 2012-11-29 11:23:42 UTC
(rev 10554)
@@ -1,14 +1,10 @@
- <!-- $Id: location_form.xsl 8437 2011-12-26 19:11:48Z sigurdne $ -->
+ <!-- $Id$ -->
<xsl:template name="location_form2">
<xsl:apply-templates select="location_data2"/>
</xsl:template>
<!-- New template-->
<xsl:template match="location_data2">
- <script type="text/javascript">
- self.name="first_Window";
- <xsl:value-of select="lookup_functions"/>
- </script>
<xsl:for-each select="location">
<dt>
<label title="{statustext}">
Property changes on: trunk/property/templates/base/location_form2.xsl
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
Modified: trunk/property/templates/base/location_view2.xsl
===================================================================
--- trunk/property/templates/base/location_view2.xsl 2012-11-29 07:11:35 UTC
(rev 10553)
+++ trunk/property/templates/base/location_view2.xsl 2012-11-29 11:23:42 UTC
(rev 10554)
@@ -1,4 +1,4 @@
- <!-- $Id: location_view.xsl 8437 2011-12-26 19:11:48Z sigurdne $ -->
+ <!-- $Id$ -->
<xsl:template name="location_view2">
<xsl:apply-templates select="location_data2"/>
</xsl:template>
Property changes on: trunk/property/templates/base/location_view2.xsl
___________________________________________________________________
Added: svn:keywords
+ Revision Author Id
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10554] property: More on condition survey,
Sigurd Nes <=