[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7485] property: configurable height at integration i
From: |
Sigurd Nes |
Subject: |
[Fmsystem-commits] [7485] property: configurable height at integration iframes |
Date: |
Wed, 10 Aug 2011 06:10:12 +0000 |
Revision: 7485
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7485
Author: sigurdne
Date: 2011-08-10 06:10:11 +0000 (Wed, 10 Aug 2011)
Log Message:
-----------
property: configurable height at integration iframes
Modified Paths:
--------------
trunk/property/inc/class.uientity.inc.php
trunk/property/inc/class.uilocation.inc.php
trunk/property/templates/base/entity.xsl
trunk/property/templates/base/location.xsl
Modified: trunk/property/inc/class.uientity.inc.php
===================================================================
--- trunk/property/inc/class.uientity.inc.php 2011-08-08 12:44:31 UTC (rev
7484)
+++ trunk/property/inc/class.uientity.inc.php 2011-08-10 06:10:11 UTC (rev
7485)
@@ -1654,6 +1654,7 @@
// required settings:
/*
integration_tab
+ integration_height
integration_url
integration_parametres
integration_action
@@ -1698,7 +1699,12 @@
$cxContext =
stream_context_create($aContext);
$response =
trim(file_get_contents($request, False, $cxContext));
- $integration[] = array('section' =>
$_config_section);
+ $integration[] = array
+ (
+ 'section' => $_config_section,
+ 'height' =>
isset($_config_section_data['height']) && $_config_section_data['height'] ?
$_config_section_data['height'] : 500
+ );
+
$_config_section_data['url']
= htmlspecialchars_decode($_config_section_data['url']);
$_config_section_data['parametres']
= htmlspecialchars_decode($_config_section_data['parametres']);
Modified: trunk/property/inc/class.uilocation.inc.php
===================================================================
--- trunk/property/inc/class.uilocation.inc.php 2011-08-08 12:44:31 UTC (rev
7484)
+++ trunk/property/inc/class.uilocation.inc.php 2011-08-10 06:10:11 UTC (rev
7485)
@@ -2274,6 +2274,7 @@
// required settings:
/*
integration_tab
+ integration_height
integration_url
integration_parametres
integration_action
@@ -2319,7 +2320,11 @@
$_config_section_name =
str_replace(' ', '_',$_config_section);
- $integration[] =
array('section' => $_config_section_name);
+ $integration[] = array
+ (
+ 'section' =>
$_config_section_name,
+ 'height' =>
isset($_config_section_data['height']) && $_config_section_data['height'] ?
$_config_section_data['height'] : 500
+ );
$_config_section_data['url']
= htmlspecialchars_decode($_config_section_data['url']);
$_config_section_data['parametres'] =
htmlspecialchars_decode($_config_section_data['parametres']);
Modified: trunk/property/templates/base/entity.xsl
===================================================================
--- trunk/property/templates/base/entity.xsl 2011-08-08 12:44:31 UTC (rev
7484)
+++ trunk/property/templates/base/entity.xsl 2011-08-10 06:10:11 UTC (rev
7485)
@@ -249,7 +249,7 @@
<xsl:for-each select="integration">
<div id="{section}">
- <iframe id =
"{section}_content" width="100%" height="500">
+ <iframe id =
"{section}_content" width="100%" height="{height}">
<p>Your browser
does not support iframes.</p>
</iframe>
</div>
Modified: trunk/property/templates/base/location.xsl
===================================================================
--- trunk/property/templates/base/location.xsl 2011-08-08 12:44:31 UTC (rev
7484)
+++ trunk/property/templates/base/location.xsl 2011-08-10 06:10:11 UTC (rev
7485)
@@ -559,7 +559,7 @@
</xsl:choose>
<xsl:for-each select="integration">
<div id="{section}">
- <iframe id =
"{section}_content" width="100%" height="500">
+ <iframe id =
"{section}_content" width="100%" height="{height}">
<p>Your browser
does not support iframes.</p>
</iframe>
</div>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7485] property: configurable height at integration iframes,
Sigurd Nes <=