[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [13869] fixing forms
|
From: |
Saul |
|
Subject: |
[Fmsystem-commits] [13869] fixing forms |
|
Date: |
Wed, 09 Sep 2015 23:38:00 +0000 |
Revision: 13869
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=13869
Author: psaul
Date: 2015-09-09 23:38:00 +0000 (Wed, 09 Sep 2015)
Log Message:
-----------
fixing forms
Modified Paths:
--------------
branches/dev-syncromind/booking/inc/class.uibooking.inc.php
branches/dev-syncromind/booking/inc/class.uievent.inc.php
branches/dev-syncromind/booking/templates/base/allocation.xsl
branches/dev-syncromind/booking/templates/base/application.xsl
branches/dev-syncromind/booking/templates/base/application_new.xsl
branches/dev-syncromind/booking/templates/base/booking.xsl
branches/dev-syncromind/booking/templates/base/booking_new.xsl
branches/dev-syncromind/booking/templates/base/event_edit.xsl
branches/dev-syncromind/booking/templates/base/event_new.xsl
branches/dev-syncromind/booking/templates/base/resource.xsl
branches/dev-syncromind/booking/templates/base/system_message.xsl
Modified: branches/dev-syncromind/booking/inc/class.uibooking.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-09-09
23:37:15 UTC (rev 13868)
+++ branches/dev-syncromind/booking/inc/class.uibooking.inc.php 2015-09-09
23:38:00 UTC (rev 13869)
@@ -818,7 +818,7 @@
$booking['delete_link'] = self::link(array('menuaction'
=> 'booking.uibooking.delete', 'id' => $booking['id']));
$resource_ids = '';
- $tabs = array();
+ $tabs = array();
$tabs['generic'] = array('label' =>
lang('Booking'), 'link' => '#booking');
$active_tab = 'generic';
@@ -827,7 +827,7 @@
$resource_ids = $resource_ids . '&filter_id[]='
. $res;
}
$booking['resource_ids'] = $resource_ids;
- $booking['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+ $booking['tabs'] =
phpgwapi_jquery::tabview_generate($tabs, $active_tab);
self::render_template_xsl('booking', array('booking' =>
$booking));
}
Modified: branches/dev-syncromind/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-09-09
23:37:15 UTC (rev 13868)
+++ branches/dev-syncromind/booking/inc/class.uievent.inc.php 2015-09-09
23:38:00 UTC (rev 13869)
@@ -571,9 +571,9 @@
$config = CreateObject('phpgwapi.config','booking');
$config->read();
- $tabs = array();
- $tabs['generic'] = array('label' => lang('Event Edit'), 'link'
=> '#event_edit');
- $active_tab = 'generic';
+ $tabs = array();
+ $tabs['generic'] = array('label' => lang('Event Edit'),
'link' => '#event_edit');
+ $active_tab = 'generic';
$external_site_address =
isset($config->config_data['external_site_address']) &&
$config->config_data['external_site_address'] ?
$config->config_data['external_site_address'] :
$GLOBALS['phpgw_info']['server']['webserver_url'];
$link =
$external_site_address.'/bookingfrontend/?menuaction=bookingfrontend.uibuilding.schedule&id='.$event['building_id']."&date=".substr($event['from_'],0,-9);
@@ -855,16 +855,16 @@
$event['customer_internal'] =
$customer['customer_internal'];
}
- $GLOBALS['phpgw']->jqcal->add_listener('from_', 'datetime');
- $GLOBALS['phpgw']->jqcal->add_listener('to_', 'datetime');
- phpgwapi_jquery::load_widget('datepicker');
+ $GLOBALS['phpgw']->jqcal->add_listener('from_', 'datetime');
+ $GLOBALS['phpgw']->jqcal->add_listener('to_',
'datetime');
+ phpgwapi_jquery::load_widget('datepicker');
self::add_javascript('booking', 'booking', 'event.js');
$event['resources_json'] = json_encode(array_map('intval',
$event['resources']));
$event['application_link'] = self::link(array('menuaction' =>
'booking.uiapplication.show', 'id'=> $event['application_id']));
$event['cancel_link'] = self::link(array('menuaction' =>
'booking.uievent.index'));
- $event['editable'] = true;
+ $event['editable'] = true;
$activities = $this->activity_bo->fetch_activities();
$activities = $activities['results'];
# $comments = array_reverse($event['comments']);
@@ -876,10 +876,10 @@
$this->install_customer_identifier_ui($event);
$this->add_template_helpers();
-// phpgwapi_jquery::formvalidator_generate(array('location', 'date',
'security', 'file'),'activity_form');
+// phpgwapi_jquery::formvalidator_generate(array('location',
'date', 'security', 'file'),'activity_form');
- $event['tabs'] = phpgwapi_jquery::tabview_generate($tabs, $active_tab);
-// echo '<pre>'; print_r($event);echo '</pre>';
+ $event['tabs'] = phpgwapi_jquery::tabview_generate($tabs,
$active_tab);
+// echo '<pre>'; print_r($event);echo '</pre>';
self::render_template_xsl('event_edit', array('event' =>
$event, 'activities' => $activities, 'agegroups' => $agegroups, 'audience' =>
$audience, 'comments' => $comments));
}
public function delete()
Modified: branches/dev-syncromind/booking/templates/base/allocation.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/allocation.xsl
2015-09-09 23:37:15 UTC (rev 13868)
+++ branches/dev-syncromind/booking/templates/base/allocation.xsl
2015-09-09 23:38:00 UTC (rev 13869)
@@ -17,44 +17,43 @@
<div id="tab-content">
<xsl:value-of disable-output-escaping="yes"
select="allocation/tabs"/>
<div id="allocations">
- <div class="pure-control-group">
+ <h1>
+ <xsl:value-of select="allocation/organization_name"/>
+ </h1>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'From')" />
+ <h4><xsl:value-of select="php:function('lang',
'From')" /></h4>
</label>
- <xsl:value-of
select="php:function('pretty_timestamp', allocation/from_)"/>
+ <xsl:value-of
select="php:function('pretty_timestamp', allocation/from_)"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'To')" />
+ <h4><xsl:value-of select="php:function('lang',
'To')" /></h4>
</label>
- <xsl:value-of
select="php:function('pretty_timestamp', allocation/to_)"/>
+ <xsl:value-of
select="php:function('pretty_timestamp', allocation/to_)"/>
</div>
- </div>
- <div class="pure-control-group">
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Season')" />
+ <h4><xsl:value-of select="php:function('lang',
'Season')" /></h4>
</label>
- <xsl:value-of select="allocation/season_name"/>
+ <xsl:value-of select="allocation/season_name"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Organization')" />
+ <h4><xsl:value-of select="php:function('lang',
'Organization')" /></h4>
</label>
- <xsl:value-of
select="allocation/organization_name"/>
+ <xsl:value-of
select="allocation/organization_name"/>
</div>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Resources')" />
- </label>
- <div id="resources_container"/>
- </div>
+ <div class="pure-control-group">
+ <label style="vertical-align:top;">
+ <h4><xsl:value-of select="php:function('lang',
'Resources')" /></h4>
+ </label>
+ <div id="resources_container"
style="display:inline-block;"></div>
+ </div>
</div>
</div>
</form>
- <div class="proplist-col">
+ <div class="pure-control-group">
<xsl:if test="allocation/permission/write">
<button>
<xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="allocation/edit_link"/>"</xsl:attribute>
@@ -68,7 +67,31 @@
</xsl:if>
</div>
<!--/div-->
-
+<script type="text/javascript">
+ var resourceIds = '<xsl:value-of select="allocation/resource_ids"/>';
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name', 'Resource
Type')"/>;
+ <![CDATA[
+ var resourcesURL =
'index.php?menuaction=booking.uiresource.index&sort=name&phpgw_return_as=json&'
+ resourceIds;
+ ]]>
+ $.get(resourcesURL, function(resourcesData){
+ var resourcesBody = '';
+ var resourcesTableClass = "pure-table";
+ if (resourcesData.data.length === 0){
+ resourcesBody = '<tr><td colspan="2">'+lang['No records
found']+'</td></tr>';
+ }else{
+ resourcesTableClass = "pure-table pure-table-striped";
+ $.each(resourcesData.data , function(index,value){
+ <![CDATA[
+ resourcesBody += '<tr><td><a
href='+value.link+'>'+value.name+'</a></td><td>'+value.type+'</td></tr>';
+ ]]>
+ });
+ }
+ <![CDATA[
+ var resourcesTable = '<table
class="'+resourcesTableClass+'"><thead><tr><th>'+lang['Name']+'</th><th>'+lang['Resource
Type']+'</th></tr></thead><tbody>'+resourcesBody+'</tbody></table>';
+ ]]>
+ $('#resources_container').html(resourcesTable);
+ });
+</script>
<!--script type="text/javascript">
var resourceIds = '<xsl:value-of select="allocation/resource_ids"/>';
var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Resource Type')"/>;
@@ -80,14 +103,11 @@
});
]]>
</script-->
-<script type="text/javascript">
-
+<script type="text/javascript">
function square()
{
location.href = "<xsl:value-of select="allocation/edit_link"/>";
}
-
-
</script>
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/application.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application.xsl
2015-09-09 23:37:15 UTC (rev 13868)
+++ branches/dev-syncromind/booking/templates/base/application.xsl
2015-09-09 23:38:00 UTC (rev 13869)
@@ -1,19 +1,19 @@
<func:function name="phpgw:conditional">
- <xsl:param name="test"/>
- <xsl:param name="true"/>
- <xsl:param name="false"/>
+ <xsl:param name="test"/>
+ <xsl:param name="true"/>
+ <xsl:param name="false"/>
- <func:result>
- <xsl:choose>
- <xsl:when test="$test">
- <xsl:value-of select="$true"/>
- </xsl:when>
- <xsl:otherwise>
- <xsl:value-of select="$false"/>
- </xsl:otherwise>
- </xsl:choose>
- </func:result>
+ <func:result>
+ <xsl:choose>
+ <xsl:when test="$test">
+ <xsl:value-of select="$true"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="$false"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </func:result>
</func:function>
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
Modified: branches/dev-syncromind/booking/templates/base/application_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/application_new.xsl
2015-09-09 23:37:15 UTC (rev 13868)
+++ branches/dev-syncromind/booking/templates/base/application_new.xsl
2015-09-09 23:38:00 UTC (rev 13869)
@@ -28,11 +28,8 @@
}
- #agegroup td {padding: 0 0.3em;}
- #agegroup thead th{text-align: center;}
- #agegroup tbody th{text-align: right;}
+ #agegroup td {padding: 0 0.3em;}
-
#field_customer_ssn {display:none;}
#field_customer_organization_number {display:none;}
@@ -113,13 +110,13 @@
<tr>
<th><xsl:value-of
select="name"/></th>
<td>
- <input type="text">
+ <input class="input50"
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">
+ <input class="input50"
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>
Modified: branches/dev-syncromind/booking/templates/base/booking.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking.xsl 2015-09-09
23:37:15 UTC (rev 13868)
+++ branches/dev-syncromind/booking/templates/base/booking.xsl 2015-09-09
23:38:00 UTC (rev 13869)
@@ -20,60 +20,84 @@
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'From')" />
+ <h4><xsl:value-of select="php:function('lang',
'From')" /></h4>
</label>
<xsl:value-of
select="php:function('pretty_timestamp', booking/from_)"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'To')" />
+ <h4><xsl:value-of select="php:function('lang',
'To')" /></h4>
</label>
<xsl:value-of
select="php:function('pretty_timestamp', booking/to_)"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Cost')" />
+ <h4><xsl:value-of select="php:function('lang',
'Cost')" /></h4>
</label>
<xsl:value-of select="booking/cost"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Season')" />
+ <h4><xsl:value-of select="php:function('lang',
'Season')" /></h4>
</label>
<xsl:value-of select="booking/season_name"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Group')" />
+ <h4><xsl:value-of select="php:function('lang',
'Group')" /></h4>
</label>
<xsl:value-of select="booking/group_name"/>
</div>
<div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Resources')" />
+ <label style="vertical-align:top;">
+ <h4><xsl:value-of select="php:function('lang',
'Resources')" /></h4>
</label>
- <div id="resources_container"/>
+ <div id="resources_container"
style="display:inline-block;"></div>
</div>
</fieldset>
</div>
</div>
</form>
<div class="form-buttons">
- <xsl:if test="booking/permission/write">
- <button>
+ <xsl:if test="booking/permission/write">
+ <button>
<xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="booking/edit_link"/>"</xsl:attribute>
<xsl:value-of select="php:function('lang', 'Edit')" />
</button>
- <button>
+ <button>
<xsl:attribute
name="onclick">window.location.href="<xsl:value-of
select="booking/delete_link"/>"</xsl:attribute>
<xsl:value-of select="php:function('lang', 'Delete
booking')" />
</button>
- </xsl:if>
+ </xsl:if>
</div>
<!--/div-->
-
<script type="text/javascript">
var resourceIds = '<xsl:value-of select="booking/resource_ids"/>';
+ var lang = <xsl:value-of select="php:function('js_lang', 'Name', 'Resource
Type')"/>;
+ <![CDATA[
+ var resourcesURL =
'index.php?menuaction=booking.uiresource.index&sort=name&phpgw_return_as=json&'
+ resourceIds;
+ ]]>
+ $.get(resourcesURL, function(resourcesData){
+ var resourcesBody = '';
+ var resourcesTableClass = "pure-table";
+ if (resourcesData.data.length === 0){
+ resourcesBody = '<tr><td colspan="2">'+lang['No records
found']+'</td></tr>';
+ }else{
+ resourcesTableClass = "pure-table pure-table-striped";
+ $.each(resourcesData.data , function(index,value){
+ <![CDATA[
+ resourcesBody += '<tr><td><a
href='+value.link+'>'+value.name+'</a></td><td>'+value.type+'</td></tr>';
+ ]]>
+ });
+ }
+ <![CDATA[
+ var resourcesTable = '<table
class="'+resourcesTableClass+'"><thead><tr><th>'+lang['Name']+'</th><th>'+lang['Resource
Type']+'</th></tr></thead><tbody>'+resourcesBody+'</tbody></table>';
+ ]]>
+ $('#resources_container').html(resourcesTable);
+ });
+</script>
+<!--script type="text/javascript">
+ var resourceIds = '<xsl:value-of select="booking/resource_ids"/>';
var lang = <xsl:value-of select="php:function('js_lang', 'Name',
'Resource Type')"/>;
<![CDATA[
YAHOO.util.Event.addListener(window, "load", function() {
@@ -82,6 +106,6 @@
YAHOO.booking.inlineTableHelper('resources_container', url, colDefs);
});
]]>
-</script>
+</script-->
</xsl:template>
Modified: branches/dev-syncromind/booking/templates/base/booking_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/booking_new.xsl
2015-09-09 23:37:15 UTC (rev 13868)
+++ branches/dev-syncromind/booking/templates/base/booking_new.xsl
2015-09-09 23:38:00 UTC (rev 13869)
@@ -1,4 +1,7 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <style type="text/css">
+ #agegroup td {padding: 0 0.3em;}
+ </style>
<!--div id="content"-->
<!--dl class="form">
@@ -7,228 +10,270 @@
<xsl:call-template name="msgbox"/>
<!--xsl:call-template name="yui_booking_i18n"/-->
- <form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
+ <form action="" method="POST" id='form' class="pure-form
pure-form-stacked" name="form">
<input type="hidden" name="tab" value=""/>
- <div id="tab-content">
+ <div id="tab-content">
<xsl:value-of disable-output-escaping="yes" select="booking/tabs"/>
- <div id="booking_new">
- <input type="hidden" name="application_id"
value="{booking/application_id}"/>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Activity')" /></label>
- <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="../booking/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_building"><xsl:value-of
select="php:function('lang', 'Building')"/></label>
- <!--div class="autocomplete"-->
+ <div id="booking_new">
+ <fieldset>
+ <input type="hidden" name="application_id"
value="{booking/application_id}"/>
+ <div class="pure-g pure-form pure-form-aligned">
+ <div class="pure-u-1">
+ <div class="pure-control-group">
+ <label style="width:auto;"
for="field_activity"><h4><xsl:value-of select="php:function('lang',
'Activity')" /></h4></label>
+ <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="../booking/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>
+ </div>
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <legend></legend>
+ <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="booking/building_id"/></xsl:attribute>
</input>
- <input id="field_building_name"
name="building_name" type="text">
+ <input id="field_building_name"
name="building_name" type="text" class="pure-u-1 pure-u-sm-1-2 pure-u-md-1">
<xsl:attribute name="value"><xsl:value-of
select="booking/building_name"/></xsl:attribute>
</input>
<!--div id="building_container"/>
- </div-->
- </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><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 class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Organization')"/></label>
- <!--div class="autocomplete"-->
+ </div-->
+ </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>
+ <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="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <legend></legend>
+ <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="booking/organization_id"/></xsl:attribute>
</input>
- <input id="field_org_name"
name="organization_name" type="text">
+ <input id="field_org_name"
name="organization_name" type="text" class="pure-u-1 pure-u-sm-1-2 pure-u-md-1">
<xsl:attribute name="value"><xsl:value-of
select="booking/organization_name"/></xsl:attribute>
</input>
<!--div id="org_container"/>
- </div-->
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Group')"/></label>
- <!--div id="group_container"--><xsl:value-of
select="php:function('lang', 'Select an organization first')"/><!--/div-->
- </div>
- <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">
+ </div-->
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'Group')"/></h4>
+ </label>
+ <!--div id="group_container"--><xsl:value-of
select="php:function('lang', 'Select an organization first')"/><!--/div-->
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <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" style="display:inline-block;">
<xsl:attribute name="data-validation">
- <xsl:text>required</xsl:text>
+ <xsl:text>required</xsl:text>
</xsl:attribute>
- </input>
- <!--div class="datetime-picker"-->
- <!--input id="field_from" name="from_" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="booking/from_"/></xsl:attribute>
- </input-->
- <!--/div-->
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'To')"/></label>
-
- <input class="datetime" id="end_date"
name="end_date" type="text"></input>
- <!--div class="datetime-picker"-->
- <!--input id="field_to" name="to_" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="booking/to_"/></xsl:attribute>
- </input-->
- <!--/div-->
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of select="php:function('lang',
'Cost')" /></label>
- <input id="field_cost" name="cost" type="text"
value="{booking/cost}"/>
- </div>
- <div class="pure-control-group">
- <label
for="field_repeat_until"><xsl:value-of select="php:function('lang', 'Recurring
booking')" /></label>
- </div>
- <div class="pure-control-group">
- <label></label>
- <input type="checkbox"
name="outseason" id="outseason">
- <xsl:if
test="outseason='on'">
-
<xsl:attribute name="checked">checked</xsl:attribute>
- </xsl:if>
+ </input>
+ <!--div class="datetime-picker"-->
+ <!--input id="field_from" name="from_"
type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="booking/from_"/></xsl:attribute>
+ </input-->
+ <!--/div-->
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'To')"/></h4>
+ </label>
+ <input class="datetime pure-input-2-3"
id="end_date" name="end_date" type="text" style="display:inline-block;"></input>
+ <!--div class="datetime-picker"-->
+ <!--input id="field_to" name="to_" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="booking/to_"/></xsl:attribute>
+ </input-->
+ <!--/div-->
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'Cost')" /></h4>
+ </label>
+ <input id="field_cost" name="cost" type="text"
value="{booking/cost}"/>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_repeat_until">
+ <h4><xsl:value-of
select="php:function('lang', 'Recurring booking')" /></h4>
+ </label>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <input type="checkbox" name="outseason"
id="outseason">
+ <xsl:if test="outseason='on'">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <xsl:value-of select="php:function('lang',
'Out season')" />
+ </label>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <input type="checkbox" name="recurring"
id="recurring">
+ <xsl:if test="recurring='on'">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <xsl:value-of select="php:function('lang',
'Repeat until')" />
+ </label>
+ </div>
+ <div class="pure-control-group">
+ <!--input id="field_repeat_until"
name="repeat_until" type="text">
+ <xsl:attribute name="value"><xsl:value-of
select="repeat_until"/></xsl:attribute>
+ </input-->
+ <input class="datetime pure-input-2-3"
id="start" name="start" type="text" style="display:inline-block;">
+ <xsl:attribute name="data-validation">
+ <xsl:text>required</xsl:text>
+ </xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <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>
+ <div class="pure-u-1 pure-u-md-1 pure-u-lg-1-3">
+ <legend></legend>
+ <div class="pure-g">
+ <div class="pure-control-group pure-u-1
pure-u-md-1-2 pure-u-lg-1">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'Target audience')" /></h4>
+ </label>
+ <ul
style="list-style:none;padding-left:10px;">
+ <xsl:for-each select="audience">
+ <li>
+ <label>
+ <input type="checkbox"
name="audience[]">
+ <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
+ <xsl:if
test="../booking/audience=id">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
</input>
- <xsl:value-of
select="php:function('lang', 'Out season')" />
-
- </div>
- <div class="pure-control-group">
- <label></label>
-
- <input type="checkbox"
name="recurring" id="recurring">
- <xsl:if
test="recurring='on'">
-
<xsl:attribute name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <xsl:value-of
select="php:function('lang', 'Repeat until')" />
-
- </div>
- <div class="pure-control-group">
- <label></label>
- <!--input id="field_repeat_until"
name="repeat_until" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="repeat_until"/></xsl:attribute>
- </input-->
- <input class="datetime" id="start"
name="start" type="text">
- <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', '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', 'Target audience')" /></label>
- <dd>
- <ul>
- <xsl:for-each
select="audience">
- <li>
- <input
type="checkbox" name="audience[]">
-
<xsl:attribute name="value"><xsl:value-of select="id"/></xsl:attribute>
-
<xsl:if test="../booking/audience=id">
-
<xsl:attribute name="checked">checked</xsl:attribute>
-
</xsl:if>
- </input>
-
<label><xsl:value-of select="name"/></label>
- </li>
- </xsl:for-each>
- </ul>
- </dd>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', '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="../booking/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="../booking/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
-
</input>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </dd>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'send reminder for participants statistics')"
/></label>
- <select name="reminder"
id="field_reminder">
- <xsl:choose>
- <xsl:when
test="booking/reminder = 1">
- <option
value="1" selected="selected"><xsl:value-of select="php:function('lang', 'Send
reminder')" /></option>
- <option
value="0"><xsl:value-of select="php:function('lang', 'Do not send reminder')"
/></option>
- </xsl:when>
- <xsl:otherwise
test="booking/reminder = 0">
- <option
value="1"><xsl:value-of select="php:function('lang', 'Send reminder')"
/></option>
- <option
value="0" selected="selected"><xsl:value-of select="php:function('lang', 'Do
not send reminder')" /></option>
- </xsl:otherwise>
- </xsl:choose>
- </select>
- </div>
- </div>
+ <xsl:value-of
select="name"/>
+ </label>
+ </li>
+ </xsl:for-each>
+ </ul>
+ </div>
+ <div class="pure-control-group pure-u-1
pure-u-md-1-2 pure-u-lg-1">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'Number of participants')" /></h4>
+ </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"
class="input50">
+ <xsl:attribute
name="name">male[<xsl:value-of select="id"/>]</xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of select="../booking/agegroups/male[../agegroup_id =
$id]"/></xsl:attribute>
+ </input>
+ </td>
+ <td>
+ <input type="text"
class="input50">
+ <xsl:attribute
name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of select="../booking/agegroups/female[../agegroup_id =
$id]"/></xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'send reminder for participants statistics')"
/></h4>
+ </label>
+ <select name="reminder"
id="field_reminder">
+ <xsl:choose>
+ <xsl:when test="booking/reminder =
1">
+ <option value="1"
selected="selected"><xsl:value-of select="php:function('lang', 'Send
reminder')" /></option>
+ <option
value="0"><xsl:value-of select="php:function('lang', 'Do not send reminder')"
/></option>
+ </xsl:when>
+ <xsl:otherwise
test="booking/reminder = 0">
+ <option
value="1"><xsl:value-of select="php:function('lang', 'Send reminder')"
/></option>
+ <option value="0"
selected="selected"><xsl:value-of select="php:function('lang', 'Do not send
reminder')" /></option>
+ </xsl:otherwise>
+ </xsl:choose>
+ </select>
+ </div>
+ </div>
+ </div>
+ </div>
+ </fieldset>
</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="booking/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="booking/cancel_link"/></xsl:attribute>
+ <xsl:value-of select="php:function('lang', 'Cancel')"/>
+ </a>
+ </div>
</form>
<!--/div-->
<!--script type="text/javascript">
Modified: branches/dev-syncromind/booking/templates/base/event_edit.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/event_edit.xsl
2015-09-09 23:37:15 UTC (rev 13868)
+++ branches/dev-syncromind/booking/templates/base/event_edit.xsl
2015-09-09 23:38:00 UTC (rev 13869)
@@ -1,4 +1,9 @@
<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <style type="text/css">
+ #agegroup td {padding: 0 0.3em;}
+ input.datetime,
+ input.time {display: inline-block !important;}
+ </style>
<!--div id="content"-->
<!--ul class="pathway">
<li><xsl:value-of select="php:function('lang', 'Events')" /></li>
@@ -7,316 +12,405 @@
<xsl:call-template name="msgbox"/>
<!--xsl:call-template name="yui_booking_i18n"/-->
- <form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
+ <form action="" method="POST" id='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="event/tabs"/>
<div id="event_edit">
<fieldset>
+ <div class="pure-g pure-form pure-form-aligned">
+ <div class="pure-u-1">
+ <h1>
+ #<xsl:value-of select="event/id"/>
+ </h1>
+ <div class="pure-control-group">
+ <label for="field_active">
+ <h4><xsl:value-of
select="php:function('lang', 'Active')"/></h4>
+ </label>
+ <select id="field_active" name="active">
+ <option value="1">
+ <xsl:if test="event/active=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Active')"/>
+ </option>
+ <option value="0">
+ <xsl:if test="event/active=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Inactive')"/>
+ </option>
+ </select>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <h4><xsl:value-of
select="php:function('lang', 'Application')"/></h4>
+ </label>
+ <xsl:if test="event/application_id != ''">
+ <a
href="{event/application_link}">#<xsl:value-of
select="event/application_id"/></a>
+ </xsl:if>
+ </div>
+ </div>
+ </div>
- <h1>
- #<xsl:value-of select="event/id"/>
- </h1>
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'History and comments (%1)',
count(comments/author))" /></h3></legend>
+ </div>
+ <xsl:for-each select="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>
+ <span><xsl:value-of select="comment"
disable-output-escaping="yes"/></span>
+ </div>
+ </xsl:for-each>
+ </div>
+ </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang', 'Active')"/>
- </label>
- <select id="field_active" name="active">
- <option value="1">
- <xsl:if test="event/active=1">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang',
'Active')"/>
- </option>
- <option value="0">
- <xsl:if test="event/active=0">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of select="php:function('lang',
'Inactive')"/>
- </option>
- </select>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Application')"/>
- </label>
- <xsl:if test="event/application_id !=
''">
- <a
href="{event/application_link}">#<xsl:value-of
select="event/application_id"/></a>
- </xsl:if>
- </div>
- <div class="clr"/>
- <dl class="proplist">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'History and comments (%1)',
count(comments/author))" /></dt>
- <xsl:for-each select="comments[author]">
- <dt>
- <xsl:value-of
select="php:function('pretty_timestamp', time)"/>: <xsl:value-of
select="author"/>
- </dt>
- <dd><xsl:value-of select="comment"
disable-output-escaping="yes"/></dd>
- </xsl:for-each>
- </dl>
- <div class="clr"/>
- <div class="pure-control-group">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'Why')" /></dt>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Activity')" />
- </label>
- <select name="activity_id" id="field_activity">
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3><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>
+ <select name="activity_id" id="field_activity"
class="pure-u-1 pure-u-sm-1-2 pure-u-lg-1-3">
<option value=""><xsl:value-of
select="php:function('lang', '-- select an activity --')" /></option>
<xsl:for-each select="activities">
- <option>
- <xsl:if
test="../event/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>
+ <option>
+ <xsl:if test="../event/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',
'Description')" />
- </label>
- <textarea id="field_description"
class="full-width" name="description"><xsl:value-of
select="event/description"/></textarea>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang', 'Event
type')"/>
- </label>
- <select id="field_public" name="is_public">
- <option value="1">
- <xsl:if test="event/is_public=1">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Public event')"/>
- </option>
- <option value="0">
- <xsl:if test="event/is_public=0">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Private event')"/>
- </option>
- </select>
- </div>
- <div class="pure-control-group">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'Where')" /></dt>
- </div>
- <div class="pure-control-group">
- <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="event/building_id"/></xsl:attribute>
- </input>
- <input id="field_building_name"
name="building_name" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="event/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">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'When')" /></dt>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang','Start
date')" />
- </label>
- <input class="datetime" id="from_" name="from_"
type="text">
- <xsl:if test="event/from_ != ''">
+ </select>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_description">
+ <h4><xsl:value-of
select="php:function('lang', 'Description')" /></h4>
+ </label>
+ <textarea id="field_description"
class="full-width pure-u-1 pure-u-sm-1-2 pure-u-lg-1-3"
name="description"><xsl:value-of select="event/description"/></textarea>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_public">
+ <h4><xsl:value-of
select="php:function('lang', 'Event type')"/></h4>
+ </label>
+ <select id="field_public" name="is_public"
class="pure-u-1 pure-u-sm-1-2 pure-u-lg-1-3">
+ <option value="1">
+ <xsl:if test="event/is_public=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Public event')"/>
+ </option>
+ <option value="0">
+ <xsl:if test="event/is_public=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Private event')"/>
+ </option>
+ </select>
+ </div>
+ </div>
+ </div>
+
+ <div class="pure-g">
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'Where')" /></h3></legend>
+ </div>
+ <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="event/building_id"/></xsl:attribute>
+ </input>
+ <input id="field_building_name"
name="building_name" type="text" class="pure-u-1 pure-u-sm-1-2 pure-u-md-1">
+ <xsl:attribute name="value"><xsl:value-of
select="event/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>
+ </div>
+
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'When')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <label for="from_">
+ <h4><xsl:value-of
select="php:function('lang','Start date')" /></h4>
+ </label>
+ <input class="datetime pure-input-2-3"
id="from_" name="from_" type="text">
+ <xsl:if test="event/from_ != ''">
<xsl:attribute name="value">
- <!--xsl:value-of
select="php:function('date', $datetime_format, number(event/from_))"/-->
- <xsl:value-of
select="event/from_"/>
+ <!--xsl:value-of
select="php:function('date', $datetime_format, number(event/from_))"/-->
+ <xsl:value-of
select="event/from_"/>
</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="data-validation">
+ </xsl:if>
+ <xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
- </xsl:attribute>
- </input>
- <!--dd>
- <div class="datetime-picker">
- <input id="field_from" name="from_" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="event/from_"/></xsl:attribute>
- </input>
- </div>
- </dd-->
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang', 'End
date')" />
- </label>
- <!--dd>
- <div class="datetime-picker">
- <input id="field_to" name="to_" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="event/to_"/></xsl:attribute>
- </input>
- </div>
- </dd-->
- <input class="datetime" id="to_" name="to_"
type="text">
- <xsl:if test="event/to_ != ''">
+ </xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label for="to_">
+ <h4><xsl:value-of
select="php:function('lang', 'End date')" /></h4>
+ </label>
+ <input class="datetime pure-input-2-3"
id="to_" name="to_" type="text">
+ <xsl:if test="event/to_ != ''">
<xsl:attribute name="value">
- <!--xsl:value-of
select="php:function('date', $datetime_format, number(event/from_))"/-->
- <xsl:value-of
select="event/to_"/>
+ <!--xsl:value-of
select="php:function('date', $datetime_format, number(event/from_))"/-->
+ <xsl:value-of select="event/to_"/>
</xsl:attribute>
- </xsl:if>
- <xsl:attribute name="data-validation">
+ </xsl:if>
+ <xsl:attribute name="data-validation">
<xsl:text>required</xsl:text>
- </xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'Who')" /></dt>
- <dt><label><xsl:value-of select="php:function('lang',
'Target audience')" /></label></dt>
- <dd>
- <ul>
- <xsl:for-each select="audience">
- <li>
- <input type="checkbox"
name="audience[]">
- <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
- <xsl:if
test="../event/audience=id">
-
<xsl:attribute name="checked">checked</xsl:attribute>
- </xsl:if>
- </input>
- <label><xsl:value-of
select="name"/></label>
- </li>
- </xsl:for-each>
- </ul>
- </dd>
- <dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Number of participants')" /></label></dt>
- <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="../event/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="../event/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
- </input>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </dd>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang', 'SMS
total')" />
- </label>
- <input type="text" name="sms_total">
- <xsl:attribute
name="value"><xsl:value-of select="event/sms_total"/></xsl:attribute>
- </input>
- </div>
- <div class="clr"/>
- <div class="pure-control-group">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'Contact information')" /></dt>
- </div>
- <div class="pure-control-group">
+ </xsl:attribute>
+ </input>
+ </div>
+ </div>
+
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'Who')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Name')" />
+ <h4><xsl:value-of
select="php:function('lang', 'Target audience')" /></h4>
</label>
- <input id="field_contact_name"
name="contact_name" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="event/contact_name"/></xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
+ <ul style="list-style:none;padding: 0 0 0
10px;">
+ <xsl:for-each select="audience">
+ <li>
+ <input type="checkbox"
name="audience[]">
+ <xsl:attribute
name="value"><xsl:value-of select="id"/></xsl:attribute>
+ <xsl:if
test="../event/audience=id">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ </xsl:if>
+ </input>
+ <span><xsl:value-of
select="name"/></span>
+ </li>
+ </xsl:for-each>
+ </ul>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_from">
+ <h4><xsl:value-of
select="php:function('lang', 'Number of participants')" /></h4>
+ </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 class="input50"
type="text">
+ <xsl:attribute
name="name">male[<xsl:value-of select="id"/>]</xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of select="../event/agegroups/male[../agegroup_id =
$id]"/></xsl:attribute>
+ </input>
+ </td>
+ <td>
+ <input class="input50"
type="text">
+ <xsl:attribute
name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
+ <xsl:attribute
name="value"><xsl:value-of select="../event/agegroups/female[../agegroup_id =
$id]"/></xsl:attribute>
+ </input>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </tbody>
+ </table>
+ </div>
+ <div class="pure-control-group">
+ <label for="sms_total">
+ <h4><xsl:value-of
select="php:function('lang', 'SMS total')" /></h4>
+ </label>
+ <input type="text" id="sms_total"
name="sms_total">
+ <xsl:attribute name="value"><xsl:value-of
select="event/sms_total"/></xsl:attribute>
+ </input>
+ </div>
+ </div>
+
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'Contact information')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_contact_name">
+ <h4><xsl:value-of
select="php:function('lang', 'Name')" /></h4>
+ </label>
+ <input id="field_contact_name"
name="contact_name" type="text" class="pure-u-1 pure-u-sm-1-2 pure-u-md-1">
+ <xsl:attribute name="value"><xsl:value-of
select="event/contact_name"/></xsl:attribute>
+ </input>
+ </div>
+ <div class="pure-control-group">
+ <label for="field_contact_mail">
+ <h4><xsl:value-of
select="php:function('lang', 'Email')" /></h4>
+ </label>
+ <input id="field_contact_mail"
name="contact_email" type="text" class="pure-u-1 pure-u-sm-1-2 pure-u-md-1">
+ <xsl:attribute name="value"><xsl:value-of
select="event/contact_email"/></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"
name="contact_phone" type="text" class="pure-u-1 pure-u-sm-1-2 pure-u-md-1">
+ <xsl:attribute name="value"><xsl:value-of
select="event/contact_phone"/></xsl:attribute>
+ </input>
+ </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"
class="pure-u-1 pure-u-sm-1-2 pure-u-md-1">
+ <xsl:attribute name="value"><xsl:value-of
select="event/cost"/></xsl:attribute>
+ </input>
+ </div>
+ </div>
+
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'Invoice information')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <xsl:copy-of
select="phpgw:booking_customer_identifier(event, '')"/>
+ </div>
+ <div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Email')" />
+ <h4><xsl:value-of
select="php:function('lang', 'Internal Customer')"/></h4>
</label>
- <input id="field_contact_mail"
name="contact_email" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="event/contact_email"/></xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
+ <xsl:copy-of
select="phpgw:option_checkbox(event/customer_internal, 'customer_internal')"/>
+ </div>
+ </div>
+
+ <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-1-3">
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'send reminder for participants statistics')"
/></h3></legend>
+ </div>
+ <div class="pure-control-group">
+ <label style="display:none;">!</label>
+ <select name="reminder" id="field_reminder"
class="pure-u-1 pure-u-sm-1-2 pure-u-md-1">
+ <xsl:choose>
+ <xsl:when test="event/reminder = 1">
+ <option value="1"
selected="selected"><xsl:value-of select="php:function('lang', 'Send
reminder')" /></option>
+ <option value="0"><xsl:value-of
select="php:function('lang', 'Do not send reminder')" /></option>
+ <option value="2"><xsl:value-of
select="php:function('lang', 'User has responded to the reminder')" /></option>
+ <option value="3"><xsl:value-of
select="php:function('lang', 'Reminder sent. Not responded to')" /></option>
+ </xsl:when>
+ <xsl:when test="event/reminder = 0">
+ <option value="1"><xsl:value-of
select="php:function('lang', 'Send reminder')" /></option>
+ <option value="0"
selected="selected"><xsl:value-of select="php:function('lang', 'Do not send
reminder')" /></option>
+ <option value="2"><xsl:value-of
select="php:function('lang', 'User has responded to the reminder')" /></option>
+ <option value="3"><xsl:value-of
select="php:function('lang', 'Reminder sent. Not responded to')" /></option>
+ </xsl:when>
+ <xsl:when test="event/reminder = 2">
+ <option value="1"><xsl:value-of
select="php:function('lang', 'Send reminder')" /></option>
+ <option value="0"><xsl:value-of
select="php:function('lang', 'Do not send reminder')" /></option>
+ <option value="2"
selected="selected"><xsl:value-of select="php:function('lang', 'User has
responded to the reminder')" /></option>
+ <option value="3"><xsl:value-of
select="php:function('lang', 'Reminder sent. Not responded to')" /></option>
+ </xsl:when>
+ <xsl:when test="event/reminder = 3">
+ <option value="1"><xsl:value-of
select="php:function('lang', 'Send reminder')" /></option>
+ <option value="0"><xsl:value-of
select="php:function('lang', 'Do not send reminder')" /></option>
+ <option value="2"><xsl:value-of
select="php:function('lang', 'User has responded to the reminder')" /></option>
+ <option value="3"
selected="selected"><xsl:value-of select="php:function('lang', 'Reminder sent.
Not responded to')" /></option>
+ </xsl:when>
+ </xsl:choose>
+ <!--
+ <xsl:if test="event/reminder = 0">
+ <option value="1"><xsl:value-of
select="php:function('lang', 'Send reminder')" /></option>
+ <option value="0"
selected="selected"><xsl:value-of select="php:function('lang', 'Do not send
reminder')" /></option>
+ <option value="2"><xsl:value-of
select="php:function('lang', 'User has responded to the reminder')" /></option>
+ <option value="3"><xsl:value-of
select="php:function('lang', 'Reminder sent. Not responded to')" /></option>
+ </xsl:if>
+ <xsl:if test="event/reminder = 1">
+ <option value="1"
selected="selected"><xsl:value-of select="php:function('lang', 'Send
reminder')" /></option>
+ <option value="0"><xsl:value-of
select="php:function('lang', 'Do not send reminder')" /></option>
+ <option value="2"><xsl:value-of
select="php:function('lang', 'User has responded to the reminder')" /></option>
+ <option value="3"><xsl:value-of
select="php:function('lang', 'Reminder sent. Not responded to')" /></option>
+ </xsl:if>
+ <xsl:if test="event/reminder = 2">
+ <option value="1"><xsl:value-of
select="php:function('lang', 'Send reminder')" /></option>
+ <option value="0"><xsl:value-of
select="php:function('lang', 'Do not send reminder')" /></option>
+ <option value="2"
selected="selected"><xsl:value-of select="php:function('lang', 'User has
responded to the reminder')" /></option>
+ <option value="3"><xsl:value-of
select="php:function('lang', 'Reminder sent. Not responded to')" /></option>
+ </xsl:if>
+ <xsl:if test="event/reminder = 3">
+ <option value="1"><xsl:value-of
select="php:function('lang', 'Send reminder')" /></option>
+ <option value="0"><xsl:value-of
select="php:function('lang', 'Do not send reminder')" /></option>
+ <option value="2"><xsl:value-of
select="php:function('lang', 'User has responded to the reminder')" /></option>
+ <option value="3"
selected="selected"><xsl:value-of select="php:function('lang', 'Reminder sent.
Not responded to')" /></option>
+ </xsl:if>
+ -->
+ </select>
+ </div>
+ </div>
+ </div>
+
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><label
for="field_mail"><h3><xsl:value-of select="php:function('lang', 'Inform contact
persons')" /></h3></label></legend>
+ </div>
+ <div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Phone')" />
+ <h4><xsl:value-of
select="php:function('lang', 'Text written in the text area below will be sent
as an email to all registered contact persons.')" /></h4>
</label>
- <input id="field_contact_phone"
name="contact_phone" type="text">
- <xsl:attribute
name="value"><xsl:value-of select="event/contact_phone"/></xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <label>
- <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="event/cost"/></xsl:attribute>
- </input>
- </div>
- <div class="pure-control-group">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'Invoice information')" /></dt>
-
- <xsl:copy-of
select="phpgw:booking_customer_identifier(event, '')"/>
- </div>
- <div class="pure-control-group">
- <label>
- <xsl:value-of select="php:function('lang',
'Internal Customer')"/>
- </label>
-
- <xsl:copy-of
select="phpgw:option_checkbox(event/customer_internal, 'customer_internal')"/>
- </div>
- <div class="pure-control-group">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'send reminder for participants statistics')"
/></dt>
- </div>
- <div class="pure-control-group">
- <label>!</label>
- <select name="reminder" id="field_reminder">
- <xsl:if test="event/reminder = 0">
- <option value="1"><xsl:value-of
select="php:function('lang', 'Send reminder')" /></option>
- <option value="0"
selected="selected"><xsl:value-of select="php:function('lang', 'Do not send
reminder')" /></option>
- <option value="2"><xsl:value-of
select="php:function('lang', 'User has responded to the reminder')" /></option>
- <option value="3"><xsl:value-of
select="php:function('lang', 'Reminder sent. Not responded to')" /></option>
- </xsl:if>
- <xsl:if test="event/reminder = 1">
- <option value="1"
selected="selected"><xsl:value-of select="php:function('lang', 'Send
reminder')" /></option>
- <option value="0"><xsl:value-of
select="php:function('lang', 'Do not send reminder')" /></option>
- <option value="2"><xsl:value-of
select="php:function('lang', 'User has responded to the reminder')" /></option>
- <option value="3"><xsl:value-of
select="php:function('lang', 'Reminder sent. Not responded to')" /></option>
- </xsl:if>
- <xsl:if test="event/reminder = 2">
- <option value="1"><xsl:value-of
select="php:function('lang', 'Send reminder')" /></option>
- <option value="0"><xsl:value-of
select="php:function('lang', 'Do not send reminder')" /></option>
- <option value="2"
selected="selected"><xsl:value-of select="php:function('lang', 'User has
responded to the reminder')" /></option>
- <option value="3"><xsl:value-of
select="php:function('lang', 'Reminder sent. Not responded to')" /></option>
- </xsl:if>
- <xsl:if test="event/reminder = 3">
- <option value="1"><xsl:value-of
select="php:function('lang', 'Send reminder')" /></option>
- <option value="0"><xsl:value-of
select="php:function('lang', 'Do not send reminder')" /></option>
- <option value="2"><xsl:value-of
select="php:function('lang', 'User has responded to the reminder')" /></option>
- <option value="3"
selected="selected"><xsl:value-of select="php:function('lang', 'Reminder sent.
Not responded to')" /></option>
- </xsl:if>
- </select>
- </div>
- <div class="clr"/>
- <div class="pure-control-group">
- <dt><label for="field_mail"><xsl:value-of
select="php:function('lang', 'Inform contact persons')" /></label></dt>
- <dd>
- <label><xsl:value-of select="php:function('lang',
'Text written in the text area below will be sent as an email to all registered
contact persons.')" /></label><br />
- <textarea id="field_mail" name="mail"
class="full-width"></textarea><br />
- <label><input type="checkbox" value="1"
name="sendtocontact" /> <xsl:value-of select="php:function('lang', 'Send to
contact')" /></label><br />
- <label><input type="checkbox" value="1"
name="sendtocollision" /> <xsl:value-of select="php:function('lang', 'Send to
contact for overlaping allocations/bookings')" /></label><br />
- <label><input type="checkbox" value="1"
name="sendtorbuilding" /> <xsl:value-of select="php:function('lang', 'Send
warning to building responsible')" /></label><br />
- <label><input type="text" name="sendtorbuilding_email1"
/> <xsl:value-of select="php:function('lang', 'Optional e-mail adress')"
/></label><br />
- <label><input type="text" name="sendtorbuilding_email2"
/> <xsl:value-of select="php:function('lang', 'Optional e-mail adress')"
/></label><br /></dd>
- </div>
+ <textarea rows="4" id="field_mail" name="mail"
class="full-width pure-u-1 pure-u-sm-1-2 pure-u-lg-1-3"></textarea>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <input type="checkbox" value="1"
name="sendtocontact" />
+ <xsl:value-of select="php:function('lang',
'Send to contact')" />
+ </label>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <input type="checkbox" value="1"
name="sendtocollision" />
+ <xsl:value-of select="php:function('lang',
'Send to contact for overlaping allocations/bookings')" />
+ </label>
+ </div>
+ <div class="pure-control-group">
+ <label>
+ <input type="checkbox" value="1"
name="sendtorbuilding" />
+ <xsl:value-of select="php:function('lang',
'Send warning to building responsible')" />
+ </label>
+ </div>
+ <div class="pure-control-group">
+ <label for="sendtorbuilding_email1">
+ <h4><xsl:value-of
select="php:function('lang', 'Optional e-mail adress')" /></h4>
+ </label>
+ <input type="text" id="sendtorbuilding_email1"
class="pure-u-1 pure-u-sm-1-2 pure-u-lg-1-3" name="sendtorbuilding_email1" />
+ </div>
+ <div class="pure-control-group">
+ <label for="sendtorbuilding_email2">
+ <h4><xsl:value-of
select="php:function('lang', 'Optional e-mail adress')" /></h4>
+ </label>
+ <input type="text" id="sendtorbuilding_email2"
class="pure-u-1 pure-u-sm-1-2 pure-u-lg-1-3" name="sendtorbuilding_email2" />
+ </div>
+
+ </div>
+ </div>
</fieldset>
</div>
</div>
@@ -330,6 +424,9 @@
</a>
</div>
</form>
+ <script type="text/javascript">
+
$('#field_customer_identifier_type,#field_customer_ssn,#field_customer_organization_number').removeClass('pure-input-1').addClass('pure-u-1
pure-u-sm-1-2 pure-u-md-1');
+ </script>
<!--/div-->
<!--script type="text/javascript">
YAHOO.booking.initialSelection = <xsl:value-of
select="event/resources_json"/>;
Modified: branches/dev-syncromind/booking/templates/base/event_new.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/event_new.xsl
2015-09-09 23:37:15 UTC (rev 13868)
+++ branches/dev-syncromind/booking/templates/base/event_new.xsl
2015-09-09 23:38:00 UTC (rev 13869)
@@ -27,100 +27,128 @@
<xsl:call-template name="msgbox"/>
<!--xsl:call-template name="yui_booking_i18n"/-->
- <form action="" method="POST" id='form' class="pure-form
pure-form-aligned" name="form">
+ <form action="" method="POST" id='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="event/tabs"/>
<div id="event_new">
- <input type="hidden" name="application_id"
value="{event/application_id}"/>
- <div class="pure-control-group">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'Why')" /></dt>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Activity')" /></label>
- <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="../event/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', 'Description')" /></label>
+ <fieldset>
+ <input type="hidden" name="application_id"
value="{event/application_id}"/>
+
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3><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>
+ <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="../event/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', 'Description')" /></h4>
+ </label>
<textarea id="field_description"
class="full-width" name="description"><xsl:value-of
select="event/description"/></textarea>
- </div>
- <div class="pure-control-group">
- <label><xsl:value-of
select="php:function('lang', 'Event type')"/></label>
- <select id="field_public"
name="is_public">
- <option value="1">
- <xsl:if
test="event/is_public=1">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Public event')"/>
- </option>
- <option value="0">
- <xsl:if
test="event/is_public=0">
- <xsl:attribute
name="selected">checked</xsl:attribute>
- </xsl:if>
- <xsl:value-of
select="php:function('lang', 'Private event')"/>
- </option>
- </select>
- </div>
- <div class="pure-control-group">
- <dt class="heading"><xsl:value-of
select="php:function('lang', 'Where')" /></dt>
- </div>
- <div class="pure-control-group">
- <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="event/building_id"/></xsl:attribute>
- </input>
- <input id="field_building_name"
name="building_name" type="text">
- <xsl:attribute name="value"><xsl:value-of
select="event/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>
- <!--div id="resources_container"--><xsl:value-of
select="php:function('lang', 'Select a building first')" /><!--/div-->
- </div>
- <div class="pure-control-group">
- <div class="heading"><xsl:value-of
select="php:function('lang', 'When?')" /></div>
- </div>
- <div class="pure-control-group">
+ </div>
+ <div class="pure-control-group">
+ <label for="field_public">
+ <h4><xsl:value-of
select="php:function('lang', 'Event type')"/></h4>
+ </label>
+ <select id="field_public" name="is_public">
+ <option value="1">
+ <xsl:if
test="event/is_public=1">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Public event')"/>
+ </option>
+ <option value="0">
+ <xsl:if
test="event/is_public=0">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="php:function('lang', 'Private event')"/>
+ </option>
+ </select>
+ </div>
+ </div>
+ </div>
+
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3><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>
+ <!--div class="autocomplete"-->
+ <input id="field_building_id"
name="building_id" type="hidden">
+ <xsl:attribute
name="value"><xsl:value-of select="event/building_id"/></xsl:attribute>
+ </input>
+ <input id="field_building_name"
name="building_name" type="text">
+ <xsl:attribute
name="value"><xsl:value-of select="event/building_name"/></xsl:attribute>
+ </input>
+ <!--div id="building_container"/>
+ </div-->
+ </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>
+
+ <div class="pure-g">
+ <div class="pure-u-1">
+ <div class="heading">
+ <legend><h3><xsl:value-of
select="php:function('lang', 'When?')" /></h3></legend>
+ </div>
+ <div class="pure-control-group">
<div id="dates-container">
- <xsl:for-each select="event/dates">
- <div
class="date-container">
- <a href="#"
class="close-btn">-</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">
- </input>
- </div>
- <div
class="pure-control-group">
- <label>
-
<xsl:value-of select="php:function('lang', 'To')" />
- </label>
- <input
class="datetime" id="end_date" name="end_date" type="text">
- </input>
- </div>
- </div>
- </xsl:for-each>
+ <xsl:for-each select="event/dates">
+ <div class="date-container">
+ <a href="#"
class="close-btn">-</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">
+ </input>
+ </div>
+ <div
class="pure-control-group">
+ <label>
+ <xsl:value-of
select="php:function('lang', 'To')" />
+ </label>
+ <input class="datetime"
id="end_date" name="end_date" type="text">
+ </input>
+ </div>
+ </div>
+ </xsl:for-each>
</div>
- </div>
- <div class="pure-control-group">
- <label></label>
+ </div>
+ <div class="pure-control-group">
<a href="#"
id="add-date-link"><xsl:value-of select="php:function('lang', 'Add another
date')" /></a>
- </div>
+ </div>
+ </div>
+ </div>
+
+
+
<dl class="form-col">
<dt class="heading"><xsl:value-of
select="php:function('lang', 'Who')" /></dt>
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Target audience')" /></label></dt>
@@ -248,6 +276,7 @@
<label><xsl:value-of select="php:function('lang',
'Internal Customer')"/></label>
<xsl:copy-of
select="phpgw:option_checkbox(event/customer_internal, 'customer_internal')"/>
</div>
+ </fieldset>
</div>
</div>
<div class="form-buttons">
Modified: branches/dev-syncromind/booking/templates/base/resource.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/resource.xsl 2015-09-09
23:37:15 UTC (rev 13868)
+++ branches/dev-syncromind/booking/templates/base/resource.xsl 2015-09-09
23:38:00 UTC (rev 13869)
@@ -54,7 +54,7 @@
</div>
</div>
<div class="pure-g">
- <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-5-12">
+ <div class="pure-u-1">
<h3><xsl:value-of select="php:function('lang',
'Documents')" /></h3>
<div id="documents_container"></div>
<a class='button'>
@@ -64,7 +64,9 @@
</xsl:if>
</a>
</div>
- <div class="pure-u-1 pure-u-md-1-2 pure-u-lg-5-12">
+ </div>
+ <div class="pure-g">
+ <div class="pure-u-1">
<h3><xsl:value-of select="php:function('lang',
'Permissions')" /></h3>
<div id="permissions_container"></div>
</div>
Modified: branches/dev-syncromind/booking/templates/base/system_message.xsl
===================================================================
--- branches/dev-syncromind/booking/templates/base/system_message.xsl
2015-09-09 23:37:15 UTC (rev 13868)
+++ branches/dev-syncromind/booking/templates/base/system_message.xsl
2015-09-09 23:38:00 UTC (rev 13869)
@@ -32,43 +32,43 @@
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Created')" />
+ <h4><xsl:value-of select="php:function('lang',
'Created')" /></h4>
</label>
<xsl:value-of select="system_message/created"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Message')" />
+ <h4><xsl:value-of select="php:function('lang',
'Message')" /></h4>
</label>
<xsl:value-of select="system_message/message"
disable-output-escaping="yes"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Name')" />
+ <h4><xsl:value-of select="php:function('lang',
'Name')" /></h4>
</label>
<xsl:value-of select="system_message/name"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Phone')" />
+ <h4><xsl:value-of select="php:function('lang',
'Phone')" /></h4>
</label>
<xsl:value-of select="system_message/phone"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Email')" />
+ <h4><xsl:value-of select="php:function('lang',
'Email')" /></h4>
</label>
<xsl:value-of select="system_message/email"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Type')" />
+ <h4><xsl:value-of select="php:function('lang',
'Type')" /></h4>
</label>
<xsl:value-of select="system_message/type"/>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of select="php:function('lang',
'Status')" />
+ <h4><xsl:value-of select="php:function('lang',
'Status')" /></h4>
</label>
<xsl:value-of select="system_message/status" />
</div>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [13869] fixing forms,
Saul <=