|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [10547] property: more on condition survey |
| Date: | Wed, 28 Nov 2012 08:40:31 +0000 |
Revision: 10547
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10547
Author: sigurdne
Date: 2012-11-28 08:40:29 +0000 (Wed, 28 Nov 2012)
Log Message:
-----------
property: more on condition survey
Modified Paths:
--------------
trunk/property/inc/class.uicondition_survey.inc.php
trunk/property/templates/base/condition_survey.xsl
Modified: trunk/property/inc/class.uicondition_survey.inc.php
===================================================================
--- trunk/property/inc/class.uicondition_survey.inc.php 2012-11-27 19:48:41 UTC
(rev 10546)
+++ trunk/property/inc/class.uicondition_survey.inc.php 2012-11-28 08:40:29 UTC
(rev 10547)
@@ -362,6 +362,8 @@
$GLOBALS['phpgw']->css->add_external_file('phpgwapi/js/tinybox2/style.css');
}
+ $GLOBALS['phpgw_info']['server']['no_jscombine'] = true;
+
self::render_template_xsl(array('condition_survey','files'), $data);
}
Modified: trunk/property/templates/base/condition_survey.xsl
===================================================================
--- trunk/property/templates/base/condition_survey.xsl 2012-11-27 19:48:41 UTC
(rev 10546)
+++ trunk/property/templates/base/condition_survey.xsl 2012-11-28 08:40:29 UTC
(rev 10547)
@@ -206,8 +206,8 @@
</td>
</tr>
- </table>
- </div>
+ </table>
+ </div>
<div id="documents">
<script type="text/javascript">
@@ -256,58 +256,6 @@
</div>
</xsl:when>
</xsl:choose>
-
- <xsl:choose>
- <xsl:when test="documents !=
''">
- <div id="document">
- <!-- Some style
for the expand/contract section-->
- <style>
-
#expandcontractdiv {border:1px dotted #dedede; margin:0 0 .5em 0;
padding:0.4em;}
-
#treeDiv1 { background: #fff; padding:1em; margin-top:1em; }
- </style>
- <script
type="text/javascript">
- var
documents = <xsl:value-of select="documents"/>;
- </script>
- <!-- markup for
expand/contract links -->
- <div
id="expandcontractdiv">
- <a
id="expand" href="#">
-
<xsl:value-of select="php:function('lang', 'expand all')"/>
- </a>
-
<xsl:text> </xsl:text>
- <a
id="collapse" href="#">
-
<xsl:value-of select="php:function('lang', 'collapse all')"/>
- </a>
- </div>
- <div
id="treeDiv1"/>
- </div>
- </xsl:when>
- </xsl:choose>
-
- <xsl:choose>
- <xsl:when test="value_id !=''">
- <div id="related">
- <table
cellpadding="2" cellspacing="2" width="80%" align="center">
- <tr>
-
<td valign='top'>
-
<xsl:value-of select="php:function('lang', 'started from')"/>
-
</td>
-
<td>
-
<div id="datatable-container_1"/>
-
</td>
- </tr>
- <tr>
-
<td valign='top'>
-
<xsl:value-of select="php:function('lang', 'used in')"/>
-
</td>
-
<td>
-
<div id="datatable-container_2"/>
-
</td>
- </tr>
- </table>
- </div>
- </xsl:when>
- </xsl:choose>
-
</div>
<table>
@@ -336,16 +284,8 @@
</tr>
</table>
-
-
</form>
</div>
- <div id="lightbox-placeholder"
style="background-color:#000000;color:#FFFFFF;display:none">
- <div class="hd"
style="background-color:#000000;color:#000000; border:0; text-align:center">
- <xsl:value-of select="php:function('lang',
'fileuploader')"/>
- </div>
- <div class="bd" style="text-align:center;"> </div>
- </div>
<xsl:variable name="cancel_url">
<xsl:value-of select="php:function('get_phpgw_link',
'/index.php', 'menuaction:property.uicondition_survey.index')" />
| [Prev in Thread] | Current Thread | [Next in Thread] |