[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16946] booking: show linebreaks for text in applicat
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [16946] booking: show linebreaks for text in application |
Date: |
Wed, 2 Aug 2017 08:03:36 -0400 (EDT) |
Revision: 16946
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16946
Author: sigurdne
Date: 2017-08-02 08:03:35 -0400 (Wed, 02 Aug 2017)
Log Message:
-----------
booking: show linebreaks for text in application
Modified Paths:
--------------
trunk/booking/inc/class.uiapplication.inc.php
trunk/booking/templates/base/application.xsl
trunk/bookingfrontend/inc/class.uiapplication.inc.php
trunk/bookingfrontend/templates/base/application.xsl
Modified: trunk/booking/inc/class.uiapplication.inc.php
===================================================================
--- trunk/booking/inc/class.uiapplication.inc.php 2017-08-02 11:16:52 UTC
(rev 16945)
+++ trunk/booking/inc/class.uiapplication.inc.php 2017-08-02 12:03:35 UTC
(rev 16946)
@@ -1194,7 +1194,8 @@
$application['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
phpgwapi_jquery::formvalidator_generate(array('file'),
'file_form');
-
+ $application['description'] =
html_entity_decode(nl2br($application['description']));
+ $application['equipment'] =
html_entity_decode(nl2br($application['equipment']));
self::render_template_xsl('application',
array('application' => $application,
'audience' => $audience, 'agegroups' =>
$agegroups,
'num_associations' => $num_associations,
'assoc' => $from, 'collision' => $collision_dates,
Modified: trunk/booking/templates/base/application.xsl
===================================================================
--- trunk/booking/templates/base/application.xsl 2017-08-02 11:16:52 UTC
(rev 16945)
+++ trunk/booking/templates/base/application.xsl 2017-08-02 12:03:35 UTC
(rev 16946)
@@ -199,10 +199,10 @@
</div>
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'Description')" />
+
<xsl:value-of select="php:function('lang', 'Information about the event')" />
</label>
<span>
-
<xsl:value-of select="application/description"/>
+
<xsl:value-of disable-output-escaping="yes" select="application/description"/>
</span>
</div>
<div
class="pure-control-group">
@@ -211,7 +211,7 @@
<xsl:value-of select="php:function('lang', 'Extra info')" />
</h4>
</label>
- <xsl:value-of
select="application/equipment"/>
+ <xsl:value-of
disable-output-escaping="yes" select="application/equipment"/>
</div>
</div>
Modified: trunk/bookingfrontend/inc/class.uiapplication.inc.php
===================================================================
--- trunk/bookingfrontend/inc/class.uiapplication.inc.php 2017-08-02
11:16:52 UTC (rev 16945)
+++ trunk/bookingfrontend/inc/class.uiapplication.inc.php 2017-08-02
12:03:35 UTC (rev 16946)
@@ -122,6 +122,9 @@
$top_level_activity = $activity_path ?
$activity_path[0]['id'] : -1;
$application['resource_ids'] = $resource_ids;
+ $application['description'] =
html_entity_decode(nl2br($application['description']));
+ $application['equipment'] =
html_entity_decode(nl2br($application['equipment']));
+
$agegroups =
$this->agegroup_bo->fetch_age_groups($top_level_activity);
$agegroups = $agegroups['results'];
$audience =
$this->audience_bo->fetch_target_audience($top_level_activity);
Modified: trunk/bookingfrontend/templates/base/application.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/application.xsl 2017-08-02
11:16:52 UTC (rev 16945)
+++ trunk/bookingfrontend/templates/base/application.xsl 2017-08-02
12:03:35 UTC (rev 16946)
@@ -193,11 +193,11 @@
<xsl:value-of
select="application/activity_name"/>
</dd>
<dt>
- <xsl:value-of
select="php:function('lang', 'Description')" />
+ <xsl:value-of
select="php:function('lang', 'Information about the event')" />
</dt>
<dd>
<div style="width: 80%;">
- <xsl:value-of
select="application/description"/>
+ <xsl:value-of
disable-output-escaping="yes" select="application/description"/>
</div>
</dd>
</dl>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16946] booking: show linebreaks for text in application,
sigurdne <=