[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [15315] booking: display info
From: |
sigurdne |
Subject: |
[Fmsystem-commits] [15315] booking: display info |
Date: |
Wed, 22 Jun 2016 09:09:11 +0000 (UTC) |
Revision: 15315
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=15315
Author: sigurdne
Date: 2016-06-22 09:09:11 +0000 (Wed, 22 Jun 2016)
Log Message:
-----------
booking: display info
Modified Paths:
--------------
trunk/booking/setup/phpgw_no.lang
trunk/booking/templates/base/application.xsl
trunk/booking/templates/base/application_edit.xsl
Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang 2016-06-22 01:25:03 UTC (rev 15314)
+++ trunk/booking/setup/phpgw_no.lang 2016-06-22 09:09:11 UTC (rev 15315)
@@ -682,4 +682,5 @@
Mail text for comment added booking no Ekstra epost tekst for kommentar
organzations_ids_description booking no Her kan du legge inn en komma
separert liste med organisasjons IDer som vil få epost viss noen avbestiller
denne ressursen.
organzations_ids booking no Organisasjons IDer
-cost history booking no Prishistorikk
\ No newline at end of file
+cost history booking no Prishistorikk
+extra info booking no Tileggsinformasjon
\ No newline at end of file
Modified: trunk/booking/templates/base/application.xsl
===================================================================
--- trunk/booking/templates/base/application.xsl 2016-06-22 01:25:03 UTC
(rev 15314)
+++ trunk/booking/templates/base/application.xsl 2016-06-22 09:09:11 UTC
(rev 15315)
@@ -205,12 +205,14 @@
<xsl:value-of select="application/description"/>
</span>
</div>
- <!--<div
class="pure-control-group">
+ <div
class="pure-control-group">
<label>
-
<h4><xsl:value-of select="config/application_equipment"/></h4>
+ <h4>
+
<xsl:value-of select="php:function('lang', 'Extra info')" />
+ </h4>
</label>
<xsl:value-of
select="application/equipment"/>
- </div>-->
+ </div>
</div>
<div class="pure-u-1
pure-u-md-1-2 pure-u-lg-1-3">
Modified: trunk/booking/templates/base/application_edit.xsl
===================================================================
--- trunk/booking/templates/base/application_edit.xsl 2016-06-22 01:25:03 UTC
(rev 15314)
+++ trunk/booking/templates/base/application_edit.xsl 2016-06-22 09:09:11 UTC
(rev 15315)
@@ -95,8 +95,13 @@
</div>
<div
class="pure-control-group">
<label
for="field_equipment">
-
<xsl:value-of select="php:function('lang', 'Equipment')" />
+
<xsl:value-of select="php:function('lang', 'Extra info')" />
</label>
+ <xsl:if
test="config/application_equipment">
+ <p>
+
<xsl:value-of select="config/application_equipment"/>
+ </p>
+ </xsl:if>
<textarea
id="field_equipment" class="full-width pure-u-1 pure-u-sm-1-2 pure-u-lg-1-3"
name="equipment">
<xsl:value-of select="application/equipment"/>
</textarea>
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [15315] booking: display info,
sigurdne <=