[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13790] Modifying UI
From: |
Alejandro |
Subject: |
[Fmsystem-commits] [13790] Modifying UI |
Date: |
Thu, 27 Aug 2015 00:12:16 +0000 |
Revision: 13790
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13790
Author: nudrick
Date: 2015-08-27 00:12:15 +0000 (Thu, 27 Aug 2015)
Log Message:
-----------
Modifying UI
Modified Paths:
--------------
branches/dev-syncromind/booking/templates/base/application_new.xsl
Modified: branches/dev-syncromind/booking/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application_new.xsl
2015-08-27 00:09:49 UTC (rev 13789)
+++ branches/dev-syncromind/booking/templates/base/application_new.xsl
2015-08-27 00:12:15 UTC (rev 13790)
@@ -24,7 +24,7 @@
<xsl:call-template name="msgbox"/>
<!--xsl:call-template name="yui_booking_i18n"/-->
- <form action="" method="POST" id='application_form' class="pure-form
pure-form-aligned" name="form">
+ <form action="" method="POST" id='application_form' class="pure-form
pure-form-stacked" name="form">
<input type="hidden" name="tab" value=""/>
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="application/tabs"/>
@@ -35,182 +35,177 @@
</p>
</xsl:if>
- <div class="pure-control-group">
- <div class="heading">1. <xsl:value-of
select="php:function('lang', 'Why?')" /></div>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Activity')" /></label>
- <xsl:if
test="config/application_activities">
- <p>
- <xsl:value-of
select="config/application_activities"/>
- </p>
- </xsl:if>
- <select name="activity_id"
id="field_activity">
- <option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
- <xsl:for-each select="activities">
- <option>
- <xsl:if
test="../application/activity_id = id">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
- <xsl:value-of
select="name"/>
- </option>
- </xsl:for-each>
- </select>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Information about the event')" /></label>
- <xsl:if test="config/application_description">
- <p>
- <xsl:value-of
select="config/application_description"/>
- </p>
- </xsl:if>
- <textarea id="field_description"
class="full-width" name="description"><xsl:value-of
select="application/description"/></textarea>
- </div>
- <div class="pure-control-group">
- <label></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"
name="equipment"><xsl:value-of select="application/equipment"/></textarea>
- </div>
- <div class="pure-control-group">
- <div class="heading">2. <xsl:value-of
select="php:function('lang', 'How many?')" /></div>
- </div>
- <div class="pure-control-group">
- <xsl:if test="config/application_howmany">
- <p>
- <xsl:value-of
select="config/application_howmany"/>
- </p>
- </xsl:if>
- <label><xsl:value-of select="php:function('lang',
'Estimated number of participants')" /></label>
- <dd>
- <table id="agegroup">
- <tr><th/><th><xsl:value-of
select="php:function('lang', 'Male')" /></th>
- <th><xsl:value-of
select="php:function('lang', 'Female')" /></th></tr>
- <xsl:for-each select="agegroups">
- <xsl:variable
name="id"><xsl:value-of select="id"/></xsl:variable>
- <tr>
- <th><xsl:value-of
select="name"/></th>
- <td>
- <input
type="text">
-
<xsl:attribute name="name">male[<xsl:value-of select="id"/>]</xsl:attribute>
-
<xsl:attribute name="value"><xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
- </input>
- </td>
- <td>
- <input
type="text">
-
<xsl:attribute name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
-
<xsl:attribute name="value"><xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
- </input>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </dd>
- </div>
- <div class="clr"/>
- <div class="pure-control-group">
- <div class="heading">3. <xsl:value-of
select="php:function('lang', 'Where?')" /></div>
- </div>
- <div class="pure-control-group">
- <xsl:if test="config/application_where">
- <p>
- <xsl:value-of
select="config/application_where"/>
- </p>
+ <div class="pure-g">
+ <div class="pure-u-1-2">
+ <div class="heading">1.
<xsl:value-of select="php:function('lang', 'Why?')" /></div>
+ <div
class="pure-control-group">
+
<label><xsl:value-of select="php:function('lang', 'Activity')" /></label>
+ <xsl:if
test="config/application_activities">
+ <p>
+
<xsl:value-of select="config/application_activities"/>
+ </p>
+ </xsl:if>
+ <select
name="activity_id" id="field_activity">
+
<option value=""><xsl:value-of select="php:function('lang', '-- select an
activity --')" /></option>
+
<xsl:for-each select="activities">
+
<option>
+
<xsl:if test="../application/activity_id = id">
+
<xsl:attribute
name="selected">selected</xsl:attribute>
+
</xsl:if>
+
<xsl:attribute name="value"><xsl:value-of
select="id"/></xsl:attribute>
+
<xsl:value-of select="name"/>
+
</option>
+
</xsl:for-each>
+ </select>
+ </div>
+ <div
class="pure-control-group">
+
<label><xsl:value-of select="php:function('lang', 'Information about the
event')" /></label>
+ <xsl:if
test="config/application_description">
+ <p>
+
<xsl:value-of select="config/application_description"/>
+ </p>
+ </xsl:if>
+ <textarea
id="field_description" class="full-width" name="description"><xsl:value-of
select="application/description"/></textarea>
+ </div>
+ </div>
+ <div class="pure-u-1-2">
+ <div class="heading">2.
<xsl:value-of select="php:function('lang', 'How many?')" /></div>
+ <xsl:if
test="config/application_howmany">
+ <p>
+
<xsl:value-of select="config/application_howmany"/>
+ </p>
+ </xsl:if>
+ <label><xsl:value-of
select="php:function('lang', 'Estimated number of participants')" /></label>
+ <table id="agegroup"
class="pure-table pure-table-bordered">
+ <thead>
+ <tr>
+
<th></th>
+
<th>
+
<xsl:value-of select="php:function('lang', 'Male')" />
+
</th>
+
<th>
+
<xsl:value-of select="php:function('lang', 'Female')" />
+
</th>
+ </tr>
+ </thead>
+ <tbody>
+
<xsl:for-each select="agegroups">
+
<xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
+
<tr>
+
<th><xsl:value-of select="name"/></th>
+
<td>
+
<input type="text">
+
<xsl:attribute name="name">male[<xsl:value-of
select="id"/>]</xsl:attribute>
+
<xsl:attribute name="value"><xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
+
</input>
+
</td>
+
<td>
+
<input type="text">
+
<xsl:attribute name="name">female[<xsl:value-of
select="id"/>]</xsl:attribute>
+
<xsl:attribute name="value"><xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
+
</input>
+
</td>
+
</tr>
+
</xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+ </div>
+
+ <div class="pure-g">
+ <div class="pure-u-1-3">
+ <div class="heading">3.
<xsl:value-of select="php:function('lang', 'Where?')" /></div>
+ <xsl:if
test="config/application_where">
+ <p>
+
<xsl:value-of select="config/application_where"/>
+ </p>
+ </xsl:if>
+ <label><xsl:value-of
select="php:function('lang', 'Building')" /></label>
+ <!--div
class="autocomplete"-->
+ <input
id="field_building_id" name="building_id" type="hidden">
+
<xsl:attribute name="value"><xsl:value-of
select="application/building_id"/></xsl:attribute>
+ </input>
+ <input
id="field_building_name" name="building_name" type="text">
+
<xsl:attribute name="value"><xsl:value-of
select="application/building_name"/></xsl:attribute>
+ </input>
+ <div
id="building_container"/>
+ <!--/div-->
+ <label><xsl:value-of
select="php:function('lang', 'Resources')" /></label>
+ <xsl:value-of
select="php:function('lang', 'Select a building first')" />
+ </div>
+ <div class="pure-u-1-3">
+ <div class="heading">4.
<xsl:value-of select="php:function('lang', 'When?')" /></div>
+ <xsl:if
test="config/application_when">
+ <p>
+
<xsl:value-of select="config/application_when"/>
+ </p>
</xsl:if>
- <label><xsl:value-of
select="php:function('lang', 'Building')" /></label>
- <!--div class="autocomplete"-->
- <input id="field_building_id"
name="building_id" type="hidden">
- <xsl:attribute
name="value"><xsl:value-of select="application/building_id"/></xsl:attribute>
- </input>
- <input
id="field_building_name" name="building_name" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="application/building_name"/></xsl:attribute>
- </input>
- <div id="building_container"/>
- <!--/div-->
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Resources')" /></label>
- <xsl:value-of select="php:function('lang',
'Select a building first')" />
- </div>
- <div class="pure-control-group">
- <div class="heading">4. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
- </div>
- <div class="pure-control-group">
- <xsl:if test="config/application_when">
- <p>
- <xsl:value-of
select="config/application_when"/>
- </p>
- </xsl:if>
<div id="dates-container">
- <xsl:for-each
select="application/dates">
- <div class="date-container">
- <a
href="javascript:void(0);" class="close-btn btnclose">-</a>
- <div
class="pure-control-group">
- <label>
-
<xsl:value-of select="php:function('lang', 'From')" />
- </label>
- <input
class="datetime" id="start_date" name="start_date" type="text">
-
<xsl:if test="activity/start_date != ''">
-
<xsl:attribute name="value">
-
<xsl:value-of select="php:function('date', $datetime_format,
number(activity/start_date))"/>
-
</xsl:attribute>
-
</xsl:if>
+
<xsl:for-each select="application/dates">
+
<div class="date-container">
+
<div class="pure-control-group">
+
<label>
+
<xsl:value-of select="php:function('lang', 'From')" />
+
</label>
+
<input class="datetime" id="start_date" name="start_date"
type="text">
+
<xsl:if test="activity/start_date != ''">
+
<xsl:attribute name="value">
+
<xsl:value-of
select="php:function('date', $datetime_format, number(activity/start_date))"/>
+
</xsl:attribute>
+
</xsl:if>
-
<xsl:attribute name="data-validation">
-
<xsl:text>required</xsl:text>
-
</xsl:attribute>
- </input>
- </div>
- <div
class="pure-control-group">
- <label>
-
<xsl:value-of select="php:function('lang', 'To')" />
- </label>
- <xsl:if
test="activity/error_msg_array/end_date != ''">
-
<xsl:variable name="error_msg">
-
<xsl:value-of select="activity/error_msg_array/end_date" />
-
</xsl:variable>
- <div
class='input_error_msg'>
-
<xsl:value-of select="php:function('lang', $error_msg)" />
- </div>
- </xsl:if>
-
- <input
class="datetime" id="end_date" name="end_date" type="text">
-
<xsl:if test="activity/end_date != ''">
-
<xsl:attribute name="value">
-
<xsl:value-of select="php:function('date', $datetime_format,
number(activity/end_date))"/>
-
</xsl:attribute>
-
</xsl:if>
- </input>
- </div>
- <!--div
class="help_text">
- <xsl:value-of
select="php:function('lang','Give end date to activity')" />
- </div-->
- </div>
- </xsl:for-each>
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
</input>
+
<a href="javascript:void(0);" class="close-btn btnclose">-</a>
+
+
</div>
+
<div class="pure-control-group">
+
<label>
+
<xsl:value-of select="php:function('lang', 'To')" />
+
</label>
+
<xsl:if test="activity/error_msg_array/end_date != ''">
+
<xsl:variable name="error_msg">
+
<xsl:value-of
select="activity/error_msg_array/end_date" />
+
</xsl:variable>
+
<div class='input_error_msg'>
+
<xsl:value-of
select="php:function('lang', $error_msg)" />
+
</div>
+
</xsl:if>
+
+
<input class="datetime" id="end_date" name="end_date"
type="text">
+
<xsl:if test="activity/end_date != ''">
+
<xsl:attribute name="value">
+
<xsl:value-of
select="php:function('date', $datetime_format, number(activity/end_date))"/>
+
</xsl:attribute>
+
</xsl:if>
+
</input>
+
</div>
+
<!--div class="help_text">
+
<xsl:value-of select="php:function('lang','Give end
date to activity')" />
+
</div-->
+
</div>
+
</xsl:for-each>
</div>
<dt><a href="javascript:;"
id="add-date-link"><xsl:value-of select="php:function('lang', 'Add another
date')" /></a></dt>
- </div>
- <div class="pure-control-group">
- <div class="heading">5. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
- </div>
- <div class="pure-control-group">
- <xsl:if test="config/application_who">
- <p>
- <xsl:value-of
select="config/application_who"/>
- </p>
- </xsl:if>
- <label><xsl:value-of
select="php:function('lang', 'Target audience')" /></label>
- <div
id="audience_container"> </div>
- </div>
- <div class="clr"/>
- <div class="pure-control-group">
- <div class="heading"><br />6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></div>
- </div>
- <div class="pure-control-group">
+ </div>
+ <div class="pure-u-1-3">
+ <div class="heading">5.
<xsl:value-of select="php:function('lang', 'Who?')" /></div>
+ <xsl:if
test="config/application_who">
+ <p>
+
<xsl:value-of select="config/application_who"/>
+ </p>
+ </xsl:if>
+ <label><xsl:value-of
select="php:function('lang', 'Target audience')" /></label>
+ <div
id="audience_container"> </div>
+ </div>
+ </div>
+
+ <div class="pure-g">
+ <div class="pure-u-1-3">
+ <div
class="heading"><br />6. <xsl:value-of select="php:function('lang', 'Contact
information')" /></div>
+ <div
class="pure-control-group">
<xsl:if
test="config/application_contact_information">
<p>
<xsl:value-of
select="config/application_contact_information"/>
@@ -220,67 +215,80 @@
<input id="field_contact_name"
name="contact_name" type="text">
<xsl:attribute
name="value"><xsl:value-of select="application/contact_name"/></xsl:attribute>
</input>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'E-mail address')" /></label>
- <input id="field_contact_email"
name="contact_email" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="application/contact_email"/></xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Confirm e-mail address')" /></label>
- <input id="field_contact_email2"
name="contact_email2" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="application/contact_email2"/></xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Phone')" /></label>
- <input id="field_contact_phone"
name="contact_phone" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="application/contact_phone"/></xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <div class="heading">7.x
<xsl:value-of select="php:function('lang', 'responsible applicant')" /> /
<xsl:value-of select="php:function('lang', 'invoice information')" /></div>
- <p>Ut fra reglementet i pkt. 8
finner du kriterier for fakturering. Når du som privatperson skal låne noe som
det ikke skal faktureres for oppgir du kun fødselsdato, men skal du leie noe
som koster noe, da må vi ha hele personnummeret. Alle lag og organisasjoner
skal oppgi organisasjonsnr.</p>
- <xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/>
- <p>
- <xsl:value-of
select="php:function('lang', 'In order to send the invoice we need information
about either customer organization number or norwegian social security
number')" />
- </p>
- </div>
- <div class="pure-control-group">
- <xsl:if
test="config/application_responsible_applicant">
- <p>
- <xsl:value-of
select="config/application_responsible_applicant"/>
- </p>
- </xsl:if>
- <!--xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/-->
- <br />
- <xsl:if
test="config/application_invoice_information">
- <p>
- <xsl:value-of
select="config/application_invoice_information"/>
- </p>
- </xsl:if>
- </div>
- <div class="pure-control-group">
- <div class="heading"><br />8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
- <p>Alle som leier lokaler hos
Bergen kommune må bekrefte at de har lest betingelsene, dette gjelder som regel
brannforskrifter og husreglement.</p>
- </div>
- <div class="pure-control-group">
- <xsl:if
test="config/application_terms">
+ </div>
+ <div
class="pure-control-group">
+
<label><xsl:value-of select="php:function('lang', 'E-mail address')" /></label>
+
<input id="field_contact_email" name="contact_email"
type="text">
+
<xsl:attribute name="value"><xsl:value-of
select="application/contact_email"/></xsl:attribute>
+
</input>
+ </div>
+ <div
class="pure-control-group">
+
<label><xsl:value-of select="php:function('lang', 'Confirm e-mail address')"
/></label>
+
<input id="field_contact_email2" name="contact_email2"
type="text">
+
<xsl:attribute name="value"><xsl:value-of
select="application/contact_email2"/></xsl:attribute>
+
</input>
+ </div>
+ <div
class="pure-control-group">
+
<label><xsl:value-of select="php:function('lang', 'Phone')" /></label>
+
<input id="field_contact_phone" name="contact_phone"
type="text">
+
<xsl:attribute name="value"><xsl:value-of
select="application/contact_phone"/></xsl:attribute>
+
</input>
+ </div>
+ </div>
+ <div class="pure-u-1-3">
+ <div
class="heading">7.x <xsl:value-of select="php:function('lang', 'responsible
applicant')" /> / <xsl:value-of select="php:function('lang', 'invoice
information')" /></div>
+ <p>Ut fra reglementet i
pkt. 8 finner du kriterier for fakturering. Når du som privatperson skal låne
noe som det ikke skal faktureres for oppgir du kun fødselsdato, men skal du
leie noe som koster noe, da må vi ha hele personnummeret. Alle lag og
organisasjoner skal oppgi organisasjonsnr.</p>
+ <xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/>
<p>
-
<xsl:value-of select="config/application_terms"/>
- </p>
- </xsl:if>
- <br />
- <div
id='regulation_documents'> </div>
- <br />
- <xsl:if
test="config/application_terms2">
- <p>
-
<xsl:value-of select="config/application_terms2"/>
- </p>
- </xsl:if>
- <p><xsl:value-of
select="php:function('lang', 'To borrow premises you must verify that you have
read terms and conditions')" /></p>
- </div>
+ <xsl:value-of
select="php:function('lang', 'In order to send the invoice we need information
about either customer organization number or norwegian social security
number')" />
+ </p>
+ <div
class="pure-control-group">
+ <xsl:if
test="config/application_responsible_applicant">
+
<p>
+
<xsl:value-of
select="config/application_responsible_applicant"/>
+
</p>
+ </xsl:if>
+ <!--xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/-->
+ <br />
+ <xsl:if
test="config/application_invoice_information">
+
<p>
+
<xsl:value-of select="config/application_invoice_information"/>
+
</p>
+ </xsl:if>
+ </div>
+ </div>
+ <div class="pure-u-1-3">
+ <div
class="heading"><br />8. <xsl:value-of select="php:function('lang', 'Terms and
conditions')" /></div>
+ <p>Alle som leier
lokaler hos Bergen kommune må bekrefte at de har lest betingelsene, dette
gjelder som regel brannforskrifter og husreglement.</p>
+ <div
class="pure-control-group">
+ <xsl:if
test="config/application_terms">
+ <p>
+
<xsl:value-of select="config/application_terms"/>
+ </p>
+ </xsl:if>
+ <br />
+ <div
id='regulation_documents'> </div>
+ <br />
+ <xsl:if
test="config/application_terms2">
+ <p>
+
<xsl:value-of select="config/application_terms2"/>
+ </p>
+ </xsl:if>
+
<p><xsl:value-of select="php:function('lang', 'To borrow premises you must
verify that you have read terms and conditions')" /></p>
+ </div>
+ </div>
+ </div>
+
+ <!--div class="pure-control-group">
+ <label></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"
name="equipment"><xsl:value-of select="application/equipment"/></textarea>
+ </div-->
+
</div>
</div>
<div class="form-buttons">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13790] Modifying UI,
Alejandro <=