[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13861] fixing forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [13861] fixing forms |
|
Date: |
Tue, 08 Sep 2015 00:16:26 +0000 |
Revision: 13861
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13861
Author: psaul
Date: 2015-09-08 00:16:26 +0000 (Tue, 08 Sep 2015)
Log Message:
-----------
fixing forms
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
branches/dev-syncromind/booking/js/booking/applicationnew.js
branches/dev-syncromind/booking/templates/base/allocation_new.xsl
branches/dev-syncromind/booking/templates/base/application.xsl
branches/dev-syncromind/booking/templates/base/application_new.xsl
branches/dev-syncromind/booking/templates/base/customer_identifier.xsl
Modified: branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-09-08 00:13:04 UTC (rev 13860)
+++ branches/dev-syncromind/booking/inc/class.uiapplication.inc.php
2015-09-08 00:16:26 UTC (rev 13861)
@@ -763,31 +763,31 @@
$this->install_customer_identifier_ui($application);
$application['customer_identifier_types']['ssn'] =
'Date of birth or SSN';
- if ($orgnr) {
- $application['customer_identifier_type'] =
'organization_number';
- $application['customer_organization_number'] = $orgnr;
- $orgid = $this->organization_bo->so->get_orgid($orgnr);
- $organization = $this->organization_bo->read_single($orgid);
- if ($organization['contacts'][0]['name'] != '') {
- $application['contact_name'] =
$organization['contacts'][0]['name'];
- $application['contact_email'] =
$organization['contacts'][0]['email'];
- $application['contact_phone'] =
$organization['contacts'][0]['phone'];
- } else {
- $application['contact_name'] =
$organization['contacts'][1]['name'];
- $application['contact_email'] =
$organization['contacts'][1]['email'];
- $application['contact_phone'] =
$organization['contacts'][1]['phone'];
- }
- }
+ if ($orgnr) {
+ $application['customer_identifier_type'] =
'organization_number';
+ $application['customer_organization_number'] =
$orgnr;
+ $orgid =
$this->organization_bo->so->get_orgid($orgnr);
+ $organization =
$this->organization_bo->read_single($orgid);
+ if ($organization['contacts'][0]['name'] != '') {
+ $application['contact_name'] =
$organization['contacts'][0]['name'];
+ $application['contact_email'] =
$organization['contacts'][0]['email'];
+ $application['contact_phone'] =
$organization['contacts'][0]['phone'];
+ } else {
+ $application['contact_name'] =
$organization['contacts'][1]['name'];
+ $application['contact_email'] =
$organization['contacts'][1]['email'];
+ $application['contact_phone'] =
$organization['contacts'][1]['phone'];
+ }
+ }
$GLOBALS['phpgw']->jqcal->add_listener('start_date',
'datetime');
$GLOBALS['phpgw']->jqcal->add_listener('end_date',
'datetime');
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Application Add'),
'link' => '#application_add');
- $active_tab = 'generic';
-
- $application['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
- self::add_javascript('booking', 'booking', 'applicationnew.js');
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Application
Add'), 'link' => '#application_add');
+ $active_tab = 'generic';
+
+ $application['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
+ self::add_javascript('booking', 'booking',
'applicationnew.js');
self::render_template_xsl('application_new',
array('application' => $application, 'activities' => $activities, 'agegroups'
=> $agegroups, 'audience' => $audience,'config' => $application_text));
}
Modified: branches/dev-syncromind/booking/js/booking/applicationnew.js
===================================================================
--- branches/dev-syncromind/booking/js/booking/applicationnew.js
2015-09-08 00:13:04 UTC (rev 13860)
+++ branches/dev-syncromind/booking/js/booking/applicationnew.js
2015-09-08 00:16:26 UTC (rev 13861)
@@ -14,8 +14,8 @@
html = '<div class="date-container">'+
'<a class="close-btn btnclose"
href="javascript:void(0);">-</a>'+
'<div class="pure-control-group">'+
- '<label>!from</label>'+
- '<input class="time" id="start_date_'+this.counter+'"
name="start_date_'+this.counter+'" type="text">'+
+ '<label
for="start_date_'+this.counter+'"><h4>!from</h4></label>'+
+ '<input class="time pure-input-2-3"
id="start_date_'+this.counter+'" name="start_date_'+this.counter+'"
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))"/>'+
@@ -28,7 +28,7 @@
'</input>'+
'</div>'+
'<div class="pure-control-group">'+
- '<label>!to</label>'+
+ '<label
for="end_date_'+this.counter+'"><h4>!to</label></h4>'+
// <xsl:if test="activity/error_msg_array/end_date !=
''">
// <xsl:variable name="error_msg">
// <xsl:value-of
select="activity/error_msg_array/end_date" />
@@ -37,7 +37,7 @@
// <xsl:value-of
select="php:function('lang', $error_msg)" />
// </div>
// </xsl:if>
- '<input class="time" id="end_date_'+this.counter+'"
name="end_date_'+this.counter+'" type="text">'+
+ '<input class="time pure-input-2-3"
id="end_date_'+this.counter+'" name="end_date_'+this.counter+'" 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))"/>
Modified: branches/dev-syncromind/booking/templates/base/allocation_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation_new.xsl
2015-09-08 00:13:04 UTC (rev 13860)
+++ branches/dev-syncromind/booking/templates/base/allocation_new.xsl
2015-09-08 00:16:26 UTC (rev 13861)
@@ -1,193 +1,181 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <style type="text/css">
+ .pure-control-group h4 {margin: 0px;}
+ </style>
<!--div id="content"-->
- <!--dl class="form">
- <dt class="heading"><xsl:value-of select="php:function('lang', 'New
allocation')"/></dt>
- </dl-->
+ <!--dl class="form">
+ <dt class="heading"><xsl:value-of select="php:function('lang', 'New
allocation')"/></dt>
+ </dl-->
<xsl:call-template name="msgbox"/>
- <!--xsl:call-template name="yui_booking_i18n"/-->
+ <!--xsl:call-template name="yui_booking_i18n"/-->
<form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
<input type="hidden" name="tab" value=""/>
- <div id="tab-content">
- <xsl:value-of disable-output-escaping="yes"
select="allocation/tabs"/>
- <div id="allocation_new">
-
- <input type="hidden" name="application_id"
value="{allocation/application_id}"/>
-
- <div class="pure-control-group">
-
- <label for="field_building_name"><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="allocation/building_id"/></xsl:attribute>
- </input>
- <input id="field_building_name"
name="building_name" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="allocation/building_name"/></xsl:attribute>
- </input>
- <!--div id="building_container"/-->
- <!--/div-->
- </div>
- <div class="pure-control-group">
-
- <label for="field_org_name"><xsl:value-of
select="php:function('lang', 'Organization')" /></label>
- <!--div class="autocomplete"-->
- <input id="field_org_id"
name="organization_id" type="hidden">
- <xsl:attribute name="value"><xsl:value-of
select="allocation/organization_id"/></xsl:attribute>
- </input>
- <input id="field_org_name"
name="organization_name" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="allocation/organization_name"/></xsl:attribute>
- </input>
- <!--div id="org_container"/-->
- <!--/div-->
-
- </div>
- <div class="pure-control-group">
-
- <label for="field_weekday"><xsl:value-of
select="php:function('lang', 'Weekday')" /></label>
- <select name="weekday"
id="field_weekday">
- <option value="monday">
- <xsl:if
test="../allocation/weekday = 'monday'">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Monday')" />
- </option>
- <option value="tuesday">
- <xsl:if
test="weekday = 'tuesday'">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Tuesday')" />
- </option>
- <option value="wednesday">
- <xsl:if
test="weekday = 'wednesday'">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Wednesday')" />
- </option>
- <option value="thursday">
- <xsl:if
test="weekday = 'thursday'">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Thursday')" />
- </option>
- <option value="friday">
- <xsl:if
test="weekday = 'friday'">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Friday')" />
- </option>
- <option value="saturday">
- <xsl:if
test="weekday = 'saturday'">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Saturday')" />
- </option>
- <option value="sunday">
- <xsl:if
test="weekday = 'sunday'">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Sunday')" />
- </option>
- </select>
- </div>
- <div class="pure-control-group">
-
- <label for="field_from"><xsl:value-of
select="php:function('lang', 'From')" /></label>
- <!--div class="time-picker"-->
- <input id="field_from" name="from_" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="allocation/from_"/></xsl:attribute>
- </input>
- <!--/div-->
-
- </div>
- <div class="pure-control-group">
-
- <label for="field_to"><xsl:value-of
select="php:function('lang', 'To')" /></label>
- <!--div class="time-picker"-->
- <input id="field_to" name="to_" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="allocation/to_"/></xsl:attribute>
- </input>
- <!--/div-->
-
- </div>
- <div class="pure-control-group">
-
- <label for="outseason"><xsl:value-of
select="php:function('lang', 'Recurring allocation')" /></label>
-
- <input type="checkbox"
name="outseason" id="outseason">
- <xsl:if test="outseason='on'">
- <xsl:attribute
name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <label
style="text-align:left;margin-left:5px;" for="outseason"><xsl:value-of
select="php:function('lang', 'Out season')" /></label>
- </div>
- <div class="pure-control-group">
-
- <label for="field_interval">
- <xsl:value-of select="php:function('lang',
'Interval')" />
- </label>
- <xsl:value-of
select="../field_interval" />
- <select id="field_interval"
name="field_interval">
- <option value="1">
- <xsl:if
test="interval=1">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', '1 week')" />
- </option>
- <option value="2">
- <xsl:if
test="interval=2">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', '2 weeks')" />
- </option>
- <option value="3">
- <xsl:if
test="interval=3">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', '3 weeks')" />
- </option>
- <option value="4">
- <xsl:if
test="interval=4">
-
<xsl:attribute name="selected">selected</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', '4 weeks')" />
- </option>
- </select>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Season')" /></label>
-
- <!--div id="season_container"--><xsl:value-of
select="php:function('lang', 'Select a building first')" /><!--/div-->
- </div>
- <div class="pure-control-group">
-
- <label for="field_cost"><xsl:value-of
select="php:function('lang', 'Cost')" /></label>
- <input id="field_cost" name="cost" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="allocation/cost"/></xsl:attribute>
- </input>
-
- </div>
- <div class="pure-control-group">
-
- <label><xsl:value-of select="php:function('lang',
'Resources')" /></label>
- <!--div id="resources_container"--><xsl:value-of
select="php:function('lang', 'Select a building first')" /><!--/div-->
- </div>
+ <div id="tab-content">
+ <xsl:value-of disable-output-escaping="yes" select="allocation/tabs"/>
+ <div id="allocation_new">
+
+ <input type="hidden" name="application_id"
value="{allocation/application_id}"/>
+
+ <div class="pure-control-group">
+ <label for="field_building_name"><h4><xsl:value-of
select="php:function('lang', 'Building')" /></h4></label>
+ <!--div class="autocomplete"-->
+ <input id="field_building_id" name="building_id"
type="hidden">
+ <xsl:attribute name="value"><xsl:value-of
select="allocation/building_id"/></xsl:attribute>
+ </input>
+ <input id="field_building_name" name="building_name"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="allocation/building_name"/></xsl:attribute>
+ </input>
+ <!--div id="building_container"/-->
+ <!--/div-->
</div>
+ <div class="pure-control-group">
+ <label for="field_org_name"><h4><xsl:value-of
select="php:function('lang', 'Organization')" /></h4></label>
+ <!--div class="autocomplete"-->
+ <input id="field_org_id" name="organization_id"
type="hidden">
+ <xsl:attribute name="value"><xsl:value-of
select="allocation/organization_id"/></xsl:attribute>
+ </input>
+ <input id="field_org_name" name="organization_name"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="allocation/organization_name"/></xsl:attribute>
+ </input>
+ <!--div id="org_container"/-->
+ <!--/div-->
+ </div>
+ <div class="pure-control-group">
+ <label for="field_weekday"><h4><xsl:value-of
select="php:function('lang', 'Weekday')" /></h4></label>
+ <select name="weekday" id="field_weekday">
+ <option value="monday">
+ <xsl:if test="../allocation/weekday = 'monday'">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Monday')" />
+ </option>
+ <option value="tuesday">
+ <xsl:if test="weekday = 'tuesday'">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Tuesday')" />
+ </option>
+ <option value="wednesday">
+ <xsl:if test="weekday = 'wednesday'">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Wednesday')" />
+ </option>
+ <option value="thursday">
+ <xsl:if test="weekday = 'thursday'">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Thursday')" />
+ </option>
+ <option value="friday">
+ <xsl:if test="weekday = 'friday'">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Friday')" />
+ </option>
+ <option value="saturday">
+ <xsl:if test="weekday = 'saturday'">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Saturday')" />
+ </option>
+ <option value="sunday">
+ <xsl:if test="weekday = 'sunday'">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang',
'Sunday')" />
+ </option>
+ </select>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_from"><h4><xsl:value-of
select="php:function('lang', 'From')" /></h4></label>
+ <!--div class="time-picker"-->
+ <input id="field_from" name="from_" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="allocation/from_"/></xsl:attribute>
+ </input>
+ <!--/div-->
+ </div>
+ <div class="pure-control-group">
+ <label for="field_to"><h4><xsl:value-of
select="php:function('lang', 'To')" /></h4></label>
+ <!--div class="time-picker"-->
+ <input id="field_to" name="to_" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="allocation/to_"/></xsl:attribute>
+ </input>
+ <!--/div-->
+ </div>
+ <div class="pure-control-group">
+ <label for="outseason"><h4><xsl:value-of
select="php:function('lang', 'Recurring allocation')" /></h4></label>
+ <input type="checkbox" name="outseason" id="outseason">
+ <xsl:if test="outseason='on'">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <label style="text-align:left;margin-left:5px;"
for="outseason"><xsl:value-of select="php:function('lang', 'Out season')"
/></label>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_interval">
+ <h4><xsl:value-of select="php:function('lang',
'Interval')" /></h4>
+ </label>
+ <xsl:value-of select="../field_interval" />
+ <select id="field_interval" name="field_interval">
+ <option value="1">
+ <xsl:if test="interval=1">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang', '1
week')" />
+ </option>
+ <option value="2">
+ <xsl:if test="interval=2">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang', '2
weeks')" />
+ </option>
+ <option value="3">
+ <xsl:if test="interval=3">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang', '3
weeks')" />
+ </option>
+ <option value="4">
+ <xsl:if test="interval=4">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang', '4
weeks')" />
+ </option>
+ </select>
+ </div>
+ <div class="pure-control-group">
+ <label><h4><xsl:value-of select="php:function('lang',
'Season')" /></h4></label>
+ <!--div id="season_container"--><xsl:value-of
select="php:function('lang', 'Select a building first')" /><!--/div-->
+ </div>
+ <div class="pure-control-group">
+ <label for="field_cost"><h4><xsl:value-of
select="php:function('lang', 'Cost')" /></h4></label>
+ <input id="field_cost" name="cost" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="allocation/cost"/></xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label><h4><xsl:value-of select="php:function('lang',
'Resources')" /></h4></label>
+ <!--div id="resources_container"--><xsl:value-of
select="php:function('lang', 'Select a building first')" /><!--/div-->
+ </div>
</div>
- <div class="form-buttons">
- <input type="submit" class="button pure-button
pure-button-primary">
- <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Create')"/></xsl:attribute>
- </input>
- <a class="cancel">
- <xsl:attribute name="href"><xsl:value-of
select="allocation/cancel_link"/></xsl:attribute>
- <xsl:value-of select="php:function('lang', 'Cancel')" />
- </a>
- </div>
+ </div>
+ <div class="form-buttons">
+ <input type="submit" class="button pure-button
pure-button-primary">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Create')"/></xsl:attribute>
+ </input>
+ <a class="cancel">
+ <xsl:attribute name="href"><xsl:value-of
select="allocation/cancel_link"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Cancel')" />
+ </a>
+ </div>
</form>
<!--/div-->
<!--script type="text/javascript">
YAHOO.booking.season_id = '<xsl:value-of
select="allocation/season_id"/>';
YAHOO.booking.initialSelection = <xsl:value-of
select="allocation/resources_json"/>;
- var lang = <xsl:value-of select="php:function('js_lang',
'Resource Type')"/>;
+ var lang = <xsl:value-of select="php:function('js_lang', 'Resource
Type')"/>;
</script-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/application.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application.xsl
2015-09-08 00:13:04 UTC (rev 13860)
+++ branches/dev-syncromind/booking/templates/base/application.xsl
2015-09-08 00:16:26 UTC (rev 13861)
@@ -35,6 +35,10 @@
</xsl:if>
</li>
</ul-->
+
+ <style type="text/css">
+ .pure-form-contentTable {display: inline-block;}
+ </style>
<xsl:call-template name="msgbox"/>
<!--xsl:call-template name="yui_booking_i18n"/-->
@@ -44,265 +48,278 @@
<xsl:value-of disable-output-escaping="yes"
select="application/tabs"/>
<div id="application">
<fieldset>
-
- <h1>
- <xsl:value-of select="application/id"/>
- </h1>
-
- <div class="pure-control-group">
- <xsl:if test="frontend and
application/status='ACCEPTED'">
- <form method="POST">
- <input type="hidden" name="print"
value="ACCEPTED"/>
- <input type="submit"
value="{php:function('lang', 'Print as PDF')}" />
- </form>
- </xsl:if>
- </div>
-
- <div class="pure-control-group">
- <xsl:if test="not(frontend)">
- <div style="border: 3px solid red;
padding: 3px 4px 3px 4px">
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <h1>
+ <xsl:value-of
select="application/id"/>
+ </h1>
+
+ <div class="pure-control-group">
+ <xsl:if test="frontend and
application/status='ACCEPTED'">
+ <form method="POST">
+ <input type="hidden"
name="print" value="ACCEPTED"/>
+ <input type="submit"
value="{php:function('lang', 'Print as PDF')}" />
+ </form>
+ </xsl:if>
+ </div>
+
+ <div class="pure-control-group">
+ <xsl:if test="not(frontend)">
+ <div style="border: 3px solid
red; padding: 3px 4px 3px 4px">
<xsl:choose>
- <xsl:when
test="not(application/case_officer)">
-
<xsl:value-of select="php:function('lang', 'In order to work with this
application, you must first')"/>
- <xsl:text>
</xsl:text><a href="#assign"><xsl:value-of select="php:function('lang', 'assign
yourself')"/></a><xsl:text> </xsl:text>
-
<xsl:value-of select="php:function('lang', 'as the case officer responsible for
this application.')"/>
- </xsl:when>
- <xsl:when
test="application/case_officer and
not(application/case_officer/is_current_user)">
-
<xsl:value-of select="php:function('lang', 'The user currently assigned as the
responsible case officer for this application is')"/>'<xsl:text>
</xsl:text><xsl:value-of select="application/case_officer/name"/>'.
- <br/>
-
<xsl:value-of select="php:function('lang', 'In order to work with this
application, you must therefore first')"/>
- <xsl:text>
</xsl:text><a href="#assign"><xsl:value-of select="php:function('lang', 'assign
yourself')"/></a><xsl:text> </xsl:text>
-
<xsl:value-of select="php:function('lang', 'as the case officer responsible for
this application.')"/>
- </xsl:when>
- <xsl:otherwise>
-
<xsl:attribute name="style">display:none</xsl:attribute>
- </xsl:otherwise>
+ <xsl:when
test="not(application/case_officer)">
+ <xsl:value-of
select="php:function('lang', 'In order to work with this application, you must
first')"/>
+ <xsl:text>
</xsl:text><a href="#assign"><xsl:value-of select="php:function('lang', 'assign
yourself')"/></a><xsl:text> </xsl:text>
+ <xsl:value-of
select="php:function('lang', 'as the case officer responsible for this
application.')"/>
+ </xsl:when>
+ <xsl:when
test="application/case_officer and
not(application/case_officer/is_current_user)">
+ <xsl:value-of
select="php:function('lang', 'The user currently assigned as the responsible
case officer for this application is')"/>'<xsl:text> </xsl:text><xsl:value-of
select="application/case_officer/name"/>'.
+ <br/>
+ <xsl:value-of
select="php:function('lang', 'In order to work with this application, you must
therefore first')"/>
+ <xsl:text>
</xsl:text><a href="#assign"><xsl:value-of select="php:function('lang', 'assign
yourself')"/></a><xsl:text> </xsl:text>
+ <xsl:value-of
select="php:function('lang', 'as the case officer responsible for this
application.')"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:attribute
name="style">display:none</xsl:attribute>
+ </xsl:otherwise>
</xsl:choose>
+ </div>
+ </xsl:if>
+ </div>
+ <xsl:if test="not(frontend)">
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'Status')" /></h4>
+ </label>
+ <span><xsl:value-of
select="php:function('lang', string(application/status))"/></span>
</div>
- </xsl:if>
- </div>
- <xsl:if test="not(frontend)">
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'Status')" />
- </label>
- <xsl:value-of
select="php:function('lang', string(application/status))"/>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'Created')" />
- </label>
- <xsl:value-of
select="php:function('pretty_timestamp', application/created)"/>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'Modified')" />
- </label>
- <xsl:value-of
select="php:function('pretty_timestamp', application/modified)"/>
- </div>
- </xsl:if>
- <xsl:if test="frontend">
- <dl class="proplist">
- <span style="font-size: 110%;
font-weight: bold;">Din søknad har status <xsl:value-of
select="php:function('lang', string(application/status))"/></span><span
class="text">, opprettet <xsl:value-of select="php:function('pretty_timestamp',
application/created)"/>, sist endret <xsl:value-of
select="php:function('pretty_timestamp', application/modified)"/></span>
- <span class="text"><br />Melding fra
saksbehandler ligger under historikk, deretter vises kopi av din søknad.<br />
Skal du gi en melding til saksbehandler skriver du denne inn i feltet under
"Legg til en kommentar"</span>
- </dl>
- </xsl:if>
-
- <div class="pure-control-group">
- <label>
- <xsl:value-of
select="php:function('lang', 'Add a comment')" />
- </label>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'Created')" /></h4>
+ </label>
+ <span><xsl:value-of
select="php:function('pretty_timestamp', application/created)"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'Modified')" /></h4>
+ </label>
+ <span><xsl:value-of
select="php:function('pretty_timestamp', application/modified)"/></span>
+ </div>
+ </xsl:if>
+ <xsl:if test="frontend">
+ <dl class="proplist">
+ <span style="font-size: 110%;
font-weight: bold;">Din søknad har status <xsl:value-of
select="php:function('lang', string(application/status))"/></span><span
class="text">, opprettet <xsl:value-of select="php:function('pretty_timestamp',
application/created)"/>, sist endret <xsl:value-of
select="php:function('pretty_timestamp', application/modified)"/></span>
+ <span class="text"><br
/>Melding fra saksbehandler ligger under historikk, deretter vises kopi av din
søknad.<br /> Skal du gi en melding til saksbehandler skriver du denne inn i
feltet under "Legg til en kommentar"</span>
+ </dl>
+ </xsl:if>
+
<form method="POST">
- <textarea name="comment"
style="width: 60%; height: 7em"></textarea><br/>
+ <div class="pure-control-group">
+ <label for="comment">
+ <h4><xsl:value-of
select="php:function('lang', 'Add a comment')" /></h4>
+ </label>
+ <textarea name="comment"
id="comment" style="width: 60%; height: 7em"></textarea><br/>
+ </div>
+ <div class="pure-control-group">
+ <label> </label>
<input type="submit"
value="{php:function('lang', 'Add comment')}" />
+ </div>
</form>
+ </div>
</div>
- <div class="pure-control-group">
- <dt class="heading">
- <h3>1. <xsl:value-of
select="php:function('lang', 'History and comments (%1)',
count(application/comments/author))" /></h3>
- </dt>
- <div class="pure-control-group">
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3>1. <xsl:value-of
select="php:function('lang', 'History and comments (%1)',
count(application/comments/author))" /></h3></legend>
+ </div>
<xsl:for-each
select="application/comments[author]">
+ <div class="pure-control-group">
<label>
<h4>
<xsl:value-of
select="php:function('pretty_timestamp', time)"/>: <xsl:value-of
select="author"/>
</h4>
</label>
<xsl:choose>
- <xsl:when
test='contains(comment,"bookingfrontend.uidocument_building.download")'>
- <xsl:value-of
select="comment" disable-output-escaping="yes"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of
select="comment"/>
- </xsl:otherwise>
-
+ <xsl:when
test='contains(comment,"bookingfrontend.uidocument_building.download")'>
+ <span><xsl:value-of
select="comment" disable-output-escaping="yes"/></span>
+ </xsl:when>
+ <xsl:otherwise>
+ <span><xsl:value-of
select="comment"/></span>
+ </xsl:otherwise>
</xsl:choose>
- <br></br>
+ </div>
</xsl:for-each>
- </div>
+ </div>
</div>
- <div class="pure-control-group">
- <dt class="heading">
- <h3>2. <xsl:value-of
select="php:function('lang', 'Why?')" /></h3>
- </dt>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Activity')" /></h4>
- </label>
- <xsl:value-of
select="application/activity_name"/>
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3>2. <xsl:value-of
select="php:function('lang', 'Why?')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'Activity')" /></h4>
+ </label>
+ <span><xsl:value-of
select="application/activity_name"/></span>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'Description')" /></h4>
+ </label>
+ <span><xsl:value-of
select="application/description"/></span>
+ </div>
+ <!--<div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="config/application_equipment"/></h4>
+ </label>
+ <xsl:value-of
select="application/equipment"/>
+ </div>-->
</div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Description')" /></h4>
- </label>
- <xsl:value-of
select="application/description"/>
- </div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="config/application_equipment"/></h4>
- </label>
- <xsl:value-of
select="application/equipment"/>
- </div>
</div>
- <div class="pure-control-group">
- <dt class="heading">
- <h3>3. <xsl:value-of
select="php:function('lang', 'Where?')" /></h3>
- </dt>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Building')" /></h4>
- </label>
- <xsl:value-of
select="application/building_name"/>
- (<a href="javascript:
void(0)"
-
onclick="window.open('{application/schedule_link}',
- '',
-
'width=1048, height=600, scrollbars=yes');
-
return false;"><xsl:value-of select="php:function('lang', 'Building
schedule')" /></a>)
+
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3>3. <xsl:value-of
select="php:function('lang', 'Where?')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'Building')" /></h4>
+ </label>
+ <span>
+ <xsl:value-of
select="application/building_name"/>
+ (<a href="javascript: void(0)"
onclick="window.open('{application/schedule_link}', '', 'width=1048,
height=600, scrollbars=yes');return false;">
+ <xsl:value-of
select="php:function('lang', 'Building schedule')" />
+ </a>)
+ </span>
+ </div>
+ <!--Revizar esta linea luego-->
+ <div class="pure-control-group">
+ <label> </label>
+ <div id="resources_container"
class="pure-form-contentTable"></div>
+ </div>
</div>
- <!--Revizar esta linea luego-->
- <dd><div id="resources_container"/></dd>
</div>
- <div class="pure-control-group">
- <dt class="heading"><h3>4. <xsl:value-of
select="php:function('lang', 'When?')" /></h3></dt>
- <script type="text/javascript">
- var allocationParams =
{};
- var bookingParams = {};
- var eventParams = {};
- var applicationDate =
{};
- </script>
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading"><h3>4.
<xsl:value-of select="php:function('lang', 'When?')" /></h3></div>
+ <script type="text/javascript">
+ var allocationParams = {};
+ var bookingParams = {};
+ var eventParams = {};
+ var applicationDate = {};
+ </script>
+ <xsl:variable name='assocdata'>
+ <xsl:value-of
select="assoc/data" />
+ </xsl:variable>
+ <xsl:variable name='collisiondata'>
+ <xsl:value-of
select="collision/data" />
+ </xsl:variable>
- <xsl:variable name='assocdata'>
- <xsl:value-of
select="assoc/data" />
- </xsl:variable>
+ <script type="text/javascript">
+ building_id = <xsl:value-of
select="application/building_id"/>;
+ </script>
- <xsl:variable
name='collisiondata'>
- <xsl:value-of
select="collision/data" />
- </xsl:variable>
-
- <script type="text/javascript">
- building_id = <xsl:value-of
select="application/building_id"/>;
- </script>
-
- <xsl:for-each
select="application/dates">
- <div
class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'From')" />:</h4>
- </label>
- <xsl:value-of
select="php:function('pretty_timestamp', from_)"/>
- <xsl:if
test="../case_officer/is_current_user">
- <xsl:if
test="contains($collisiondata, from_)">
- <xsl:if
test="not(contains($assocdata, from_))">
- <script
type="text/javascript">
-
applicationDate[<xsl:value-of select="id"/>] = '<xsl:value-of
select="substring(from_,0,11)"/>';
- </script>
- <a
href="javascript: void(0)"
-
onclick="window.open('/bookingfrontend/index.php?menuaction=bookingfrontend.uibuilding.schedule&id='+building_id+'&backend=true&date='+applicationDate[{id}],
-
'',
-
'width=1048, height=600, scrollbars=yes');
-
return false;">
-
<i class="fa fa-exclamation-circle"></i>
- </a>
- </xsl:if>
- </xsl:if>
- </xsl:if>
- </div>
- <div
class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'To')" />:</h4>
- </label>
- <xsl:value-of
select="php:function('pretty_timestamp', to_)"/>
- </div>
-
-
- <xsl:if
test="../edit_link">
+ <xsl:for-each
select="application/dates">
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'From')" />:</h4>
+ </label>
+ <span><xsl:value-of
select="php:function('pretty_timestamp', from_)"/></span>
+ <xsl:if
test="../case_officer/is_current_user">
+ <xsl:if
test="contains($collisiondata, from_)">
+ <xsl:if
test="not(contains($assocdata, from_))">
<script
type="text/javascript">
-
allocationParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="allocation_params"/>;
-
bookingParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="booking_params"/>;
-
eventParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="event_params"/>;
+
applicationDate[<xsl:value-of select="id"/>] = '<xsl:value-of
select="substring(from_,0,11)"/>';
</script>
+ <a
href="javascript: void(0)"
+
onclick="window.open('/bookingfrontend/index.php?menuaction=bookingfrontend.uibuilding.schedule&id='+building_id+'&backend=true&date='+applicationDate[{id}],
'', 'width=1048, height=600, scrollbars=yes');return false;">
+ <i class="fa
fa-exclamation-circle"></i>
+ </a>
+ </xsl:if>
+ </xsl:if>
+ </xsl:if>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'To')" />:</h4>
+ </label>
+ <span><xsl:value-of
select="php:function('pretty_timestamp', to_)"/></span>
+ </div>
+ <xsl:if test="../edit_link">
+ <script type="text/javascript">
+
allocationParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="allocation_params"/>;
+
bookingParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="booking_params"/>;
+
eventParams[<xsl:value-of select="id"/>] = <xsl:value-of
select="event_params"/>;
+ </script>
<div
class="pure-control-group">
- <label></label>
+ <label> </label>
<select name="create"
onchange="if(this.selectedIndex==1)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uiallocation.add',
allocationParams[{id}]); if(this.selectedIndex==2)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uibooking.add',
eventParams[{id}]); if(this.selectedIndex==3)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{id}]);">
-
- <xsl:if
test="not(../case_officer/is_current_user)">
-
<xsl:attribute name="disabled">disabled</xsl:attribute>
- </xsl:if>
-
-
<xsl:if test="not(contains($assocdata, from_))">
-
<option><xsl:value-of select="php:function('lang', '- Actions -')" /></option>
-
<option><xsl:value-of select="php:function('lang', 'Create allocation')"
/></option>
-
<option><xsl:value-of select="php:function('lang', 'Create booking')"
/></option>
-
<option><xsl:value-of select="php:function('lang', 'Create event')" /></option>
-
</xsl:if>
-
<xsl:if test="contains($assocdata, from_)">
- <xsl:attribute
name="disabled">disabled</xsl:attribute>
- <option><xsl:value-of
select="php:function('lang', '- Created -')" /></option>
-
</xsl:if>
+ <xsl:if
test="not(../case_officer/is_current_user)">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
+ </xsl:if>
+ <xsl:if
test="not(contains($assocdata, from_))">
+
<option><xsl:value-of select="php:function('lang', '- Actions -')" /></option>
+
<option><xsl:value-of select="php:function('lang', 'Create allocation')"
/></option>
+
<option><xsl:value-of select="php:function('lang', 'Create booking')"
/></option>
+
<option><xsl:value-of select="php:function('lang', 'Create event')" /></option>
+ </xsl:if>
+ <xsl:if
test="contains($assocdata, from_)">
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
+
<option><xsl:value-of select="php:function('lang', '- Created -')" /></option>
+ </xsl:if>
</select>
</div>
- </xsl:if>
- </xsl:for-each>
+ </xsl:if>
+ </xsl:for-each>
+ </div>
</div>
- <div class="pure-control-group">
- <dt class="heading"><h3>5. <xsl:value-of
select="php:function('lang', 'Who?')" /></h3></dt>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Target audience')" /></h4>
- </label>
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading"><h3>5.
<xsl:value-of select="php:function('lang', 'Who?')" /></h3></div>
+ <div class="pure-control-group">
<label>
+ <h4><xsl:value-of
select="php:function('lang', 'Target audience')" /></h4>
+ </label>
+ <label>
<ul>
<xsl:for-each
select="audience">
- <xsl:if
test="../application/audience=id">
-
<li><xsl:value-of select="name"/></li>
- </xsl:if>
+ <xsl:if
test="../application/audience=id">
+ <li><xsl:value-of
select="name"/></li>
+ </xsl:if>
</xsl:for-each>
</ul>
</label>
+ </div>
+ <div class="pure-control-group">
+ <label style="vertical-align:
top;">
+ <h4><xsl:value-of
select="php:function('lang', 'Number of participants')" /></h4>
+ </label>
+ <div
class="pure-form-contentTable">
+ <table id="agegroup"
class="pure-table pure-table-striped">
+ <thead>
+ <tr>
+
<th><xsl:value-of select="php:function('lang', 'Name')" /></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>
+
<td><xsl:value-of select="name"/></td>
+
<td><xsl:value-of select="../application/agegroups/male[../agegroup_id =
$id]"/></td>
+
<td><xsl:value-of select="../application/agegroups/female[../agegroup_id =
$id]"/></td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+ </div>
</div>
- <div class="pure-control-group">
- <label>
- <h4><xsl:value-of
select="php:function('lang', 'Number of participants')" /></h4>
- </label>
-
- <table id="agegroup"
class="pure-table pure-table-striped">
- <thead>
-
<tr><th><xsl:value-of select="php:function('lang', 'Name')"
/></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>
-
<td><xsl:value-of select="name"/></td>
-
<td><xsl:value-of select="../application/agegroups/male[../agegroup_id =
$id]"/></td>
-
<td><xsl:value-of select="../application/agegroups/female[../agegroup_id =
$id]"/></td>
- </tr>
- </xsl:for-each>
- </tbody>
- </table>
-
- </div>
</div>
<div class="clr"/>
<div class="pure-control-group">
Modified: branches/dev-syncromind/booking/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application_new.xsl
2015-09-08 00:13:04 UTC (rev 13860)
+++ branches/dev-syncromind/booking/templates/base/application_new.xsl
2015-09-08 00:16:26 UTC (rev 13861)
@@ -1,20 +1,41 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
<style type="text/css">
+
.date-container {
- width: 31%;
+ // width: 31%;
+ position: relative;
}
+
+ #dates-container .date-container .pure-control-group input.datetime,
+ #dates-container .date-container .pure-control-group input.time {
+ display: inline-block;
+ }
+
.date-container .close-btn {
background: transparent
url("phpgwapi/js/yahoo/assets/skins/sam/sprite.png") no-repeat scroll 0 -300px;
border: medium none;
color: white;
cursor: pointer;
- display: block;
+ //display: block;
//float: right;
height: 15px;
text-decoration: none;
width: 25px;
- margin: 4px 0 0 296px;
+ //margin: 4px 0 0 296px;
+ position: absolute;
+ top: 0px;
+ right: 0px;
}
+
+
+ #agegroup td {padding: 0 0.3em;}
+ #agegroup thead th{text-align: center;}
+ #agegroup tbody th{text-align: right;}
+
+
+ #field_customer_ssn {display:none;}
+ #field_customer_organization_number {display:none;}
+
</style>
<!--div id="content">
<h3><xsl:value-of select="php:function('lang', 'New
application')"/></h3-->
@@ -31,243 +52,264 @@
</p>
</xsl:if>
<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">
+ <div class="pure-u-1 pure-u-md-10-24 pure-u-lg-14-24">
+ <fieldset>
+ <div class="heading"><legend><h3>1.
<xsl:value-of select="php:function('lang', 'Why?')" /></h3></legend></div>
+ <div class="pure-control-group">
+ <label
for="field_activity"><h4><xsl:value-of select="php:function('lang',
'Activity')" /></h4></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" class="pure-input-1">
+ <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
for="field_description"><h4><xsl:value-of select="php:function('lang',
'Information about the event')" /></h4></label>
+ <xsl:if
test="config/application_description">
+ <p>
+ <xsl:value-of
select="config/application_description"/>
+ </p>
+ </xsl:if>
+ <textarea rows="6" id="field_description"
class="full-width pure-input-1" name="description"><xsl:value-of
select="application/description"/></textarea>
+ </div>
+ </fieldset>
+ </div>
+ <div class="pure-u-1 pure-u-md-14-24 pure-u-lg-10-24">
+ <fieldset>
+ <div class="heading"><legend><h3>2.
<xsl:value-of select="php:function('lang', 'How many?')" /></h3></legend></div>
+ <xsl:if test="config/application_howmany">
<p>
- <xsl:value-of
select="config/application_activities"/>
+ <xsl:value-of
select="config/application_howmany"/>
</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>
+ <label><h4><xsl:value-of
select="php:function('lang', 'Estimated number of participants')"
/></h4></label>
+ <table id="agegroup" class="pure-table
pure-table-bordered">
+ <thead>
<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>
+ <th></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>
- </tbody>
- </table>
+ </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>
+ </fieldset>
</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>
- <!--/div-->
- <label><xsl:value-of select="php:function('lang',
'Resources')" /></label>
- <xsl:value-of select="php:function('lang', 'Select
a building first')" />
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <fieldset>
+ <div class="heading"><legend><h3>3.
<xsl:value-of select="php:function('lang', 'Where?')" /></h3></legend></div>
+ <xsl:if test="config/application_where">
+ <p>
+ <xsl:value-of
select="config/application_where"/>
+ </p>
+ </xsl:if>
+ <div class="pure-control-group">
+ <h4><label
for="field_building_id"><xsl:value-of select="php:function('lang', 'Building')"
/></label></h4>
+ <!--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"
class="pure-input-1" 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>
+ <div class="pure-control-group">
+ <label><h4><xsl:value-of
select="php:function('lang', 'Resources')" /></h4></label>
+ <xsl:value-of select="php:function('lang',
'Select a building first')" />
+ </div>
+ </fieldset>
</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>
- <div id="dates-container">
- <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 class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <fieldset>
+ <div class="heading"><legend><h3>4.
<xsl:value-of select="php:function('lang', 'When?')" /></h3></legend></div>
+ <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>
- <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))"/>
+ <div class="pure-control-group">
+ <label for="start_date">
+ <h4><xsl:value-of
select="php:function('lang', 'From')" /></h4>
+ </label>
+ <input class="datetime
pure-input-2-3" 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 for="end_date">
+ <h4><xsl:value-of
select="php:function('lang', 'To')" /></h4>
+ </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>
+ <input class="datetime
pure-input-2-3" 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>
- <!--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>
+ </xsl:for-each>
+ </div>
+ <dt><a href="javascript:;"
id="add-date-link"><xsl:value-of select="php:function('lang', 'Add another
date')" /></a></dt>
+ </fieldset>
</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 class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <fieldset>
+ <div class="heading"><legend><h3>5.
<xsl:value-of select="php:function('lang', 'Who?')" /></h3></legend></div>
+ <xsl:if test="config/application_who">
+ <p>
+ <xsl:value-of
select="config/application_who"/>
+ </p>
+ </xsl:if>
+ <label><h4><xsl:value-of
select="php:function('lang', 'Target audience')" /></h4></label>
+ <div id="audience_container"> </div>
+ </fieldset>
</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"/>
- </p>
- </xsl:if>
- <label><xsl:value-of
select="php:function('lang', 'Name')" /></label>
- <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-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <fieldset>
+ <div class="heading"><legend><h3>6.
<xsl:value-of select="php:function('lang', 'Contact information')"
/></h3></legend></div>
+ <div class="pure-control-group">
+ <xsl:if
test="config/application_contact_information">
+ <p>
+ <xsl:value-of
select="config/application_contact_information"/>
+ </p>
+ </xsl:if>
+ <label
for="field_contact_name"><h4><xsl:value-of select="php:function('lang',
'Name')" /></h4></label>
+ <input id="field_contact_name"
class="pure-input-1" 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
for="field_contact_email"><h4><xsl:value-of select="php:function('lang',
'E-mail address')" /></h4></label>
+ <input id="field_contact_email"
class="pure-input-1" 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
for="field_contact_email2"><h4><xsl:value-of select="php:function('lang',
'Confirm e-mail address')" /></h4></label>
+ <input id="field_contact_email2"
class="pure-input-1" 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
for="field_contact_phone"><h4><xsl:value-of select="php:function('lang',
'Phone')" /></h4></label>
+ <input id="field_contact_phone"
class="pure-input-1" name="contact_phone" type="text">
+ <xsl:attribute
name="value"><xsl:value-of select="application/contact_phone"/></xsl:attribute>
+ </input>
+ </div>
+ </fieldset>
</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="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">
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <fieldset>
+ <div class="pure-control-group">
+ <div class="heading"><legend><h3>7.x
<xsl:value-of select="php:function('lang', 'responsible applicant')" /> /
<xsl:value-of select="php:function('lang', 'invoice information')"
/></h3></legend></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_responsible_applicant"/>
+ <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>
- </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>
+
+ <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>
+ </fieldset>
</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 class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <fieldset>
+ <div class="heading"><legend><h3>8.
<xsl:value-of select="php:function('lang', 'Terms and conditions')"
/></h3></legend></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>
+ </fieldset>
</div>
</div>
Modified: branches/dev-syncromind/booking/templates/base/customer_identifier.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/customer_identifier.xsl
2015-09-08 00:13:04 UTC (rev 13860)
+++ branches/dev-syncromind/booking/templates/base/customer_identifier.xsl
2015-09-08 00:16:26 UTC (rev 13861)
@@ -3,14 +3,15 @@
<xsl:param name="label" select="string('Invoice information')"/>
<func:result>
+ <dl>
<dt>
- <xsl:if
test="not(normalize-space($label))"><xsl:attribute
name="style">visibility:hidden</xsl:attribute></xsl:if>
+ <xsl:if
test="not(normalize-space($label))"><xsl:attribute
name="style">display:none</xsl:attribute></xsl:if>
<xsl:value-of select="php:function('lang', $label)" />
</dt>
<dd>
- <select name='customer_identifier_type'
id='field_customer_identifier_type'>
+ <select name='customer_identifier_type'
id='field_customer_identifier_type' class="pure-input-1">
<option value=''><xsl:value-of
select="php:function('lang', 'None')" /></option>
<xsl:for-each
select="$entity/customer_identifier_types/*">
<option>
@@ -23,9 +24,10 @@
</option>
</xsl:for-each>
</select>
- <input name="customer_ssn" type="text"
id="field_customer_ssn" value="{$entity/customer_ssn}"/>
- <input name="customer_organization_number" type="text"
id="field_customer_organization_number"
value="{$entity/customer_organization_number}"/>
+ <input name="customer_ssn" type="text"
id="field_customer_ssn" class="pure-input-1" value="{$entity/customer_ssn}"/>
+ <input name="customer_organization_number" type="text"
id="field_customer_organization_number" class="pure-input-1"
value="{$entity/customer_organization_number}"/>
</dd>
+ </dl>
</func:result>
</func:function>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13861] fixing forms,
Saul <=