[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8968] bkbooking: nsf update and bugfix
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [8968] bkbooking: nsf update and bugfix |
|
Date: |
Tue, 06 Mar 2012 14:48:22 +0000 |
Revision: 8968
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8968
Author: kjell
Date: 2012-03-06 14:48:21 +0000 (Tue, 06 Mar 2012)
Log Message:
-----------
bkbooking: nsf update and bugfix
Modified Paths:
--------------
branches/dev-thomasez/booking/inc/class.bobuilding.inc.php
branches/dev-thomasez/booking/inc/class.boresource.inc.php
branches/dev-thomasez/booking/inc/class.sobuilding.inc.php
branches/dev-thomasez/booking/inc/class.soresource.inc.php
branches/dev-thomasez/booking/inc/class.uibuilding.inc.php
branches/dev-thomasez/booking/inc/class.uiresource.inc.php
branches/dev-thomasez/booking/js/booking/schedule.js
branches/dev-thomasez/booking/setup/phpgw_no.lang
branches/dev-thomasez/booking/setup/setup.inc.php
branches/dev-thomasez/booking/setup/tables_current.inc.php
branches/dev-thomasez/booking/setup/tables_update.inc.php
branches/dev-thomasez/booking/templates/base/application_new.xsl
branches/dev-thomasez/booking/templates/base/building.xsl
branches/dev-thomasez/booking/templates/base/building_form.xsl
branches/dev-thomasez/booking/templates/base/resource.xsl
branches/dev-thomasez/booking/templates/base/resource_form.xsl
branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang
branches/dev-thomasez/bookingfrontend/setup/setup.inc.php
branches/dev-thomasez/bookingfrontend/templates/base/building.xsl
branches/dev-thomasez/bookingfrontend/templates/base/resource.xsl
branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
Modified: branches/dev-thomasez/booking/inc/class.bobuilding.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.bobuilding.inc.php 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/inc/class.bobuilding.inc.php 2012-03-06
14:48:21 UTC (rev 8968)
@@ -21,7 +21,7 @@
booking_sopermission::ROLE_CASE_OFFICER
=> array
(
'write' =>
array_fill_keys(array('name', 'homepage', 'description', 'email', 'phone',
'street', 'zip_code', 'city',
'district','deactivate_application','deactivate_calendar','deactivate_sendmessage','internal_cost','external_cost','cost_type','campsites','bedspaces',
-'heating','kitchen','water','location','communication','usage_time','weather_url','map_url'),
true),
+'heating','kitchen','water','location','communication','usage_time','weather_url','map_url','swiming','sanitation_facilities','animals','internett_phone','handicap'),
true),
),
'global' => array
(
Modified: branches/dev-thomasez/booking/inc/class.boresource.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.boresource.inc.php 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/inc/class.boresource.inc.php 2012-03-06
14:48:21 UTC (rev 8968)
@@ -58,7 +58,7 @@
),
booking_sopermission::ROLE_CASE_OFFICER
=> array
(
- 'write' =>
array_fill_keys(array('name', 'description', 'activity_id',
'type','internal_cost','external_cost','cost_type','campsites','bedspaces','heating','kitchen','water','location','communication','usage_time'),
true),
+ 'write' =>
array_fill_keys(array('name', 'description', 'activity_id',
'type','internal_cost','external_cost','cost_type','campsites','bedspaces','heating','kitchen','water','location','communication','usage_time','swiming','sanitation_facilities','animals','internett_phone','handicap'),
true),
),
'parent_role_permissions' => array
(
Modified: branches/dev-thomasez/booking/inc/class.sobuilding.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.sobuilding.inc.php 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/inc/class.sobuilding.inc.php 2012-03-06
14:48:21 UTC (rev 8968)
@@ -38,7 +38,12 @@
'communication' => array('type' =>
'string', 'query' => true),
'usage_time' => array('type' =>
'string', 'query' => true),
'weather_url' => array('type'
=> 'string'),
- 'map_url' => array('type'
=> 'string')
+ 'map_url' => array('type'
=> 'string'),
+ 'swiming' => array('type'
=> 'string', 'query' => true),
+ 'sanitation_facilities'
=> array('type' => 'string', 'query' => true),
+ 'animals' => array('type'
=> 'string', 'query' => true),
+ 'internett_phone' =>
array('type' => 'string', 'query' => true),
+ 'handicap' => array('type'
=> 'string', 'query' => true)
)
);
}
Modified: branches/dev-thomasez/booking/inc/class.soresource.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.soresource.inc.php 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/inc/class.soresource.inc.php 2012-03-06
14:48:21 UTC (rev 8968)
@@ -33,6 +33,11 @@
'location' => array('type'
=> 'string', 'query' => true),
'communication' => array('type' =>
'string', 'query' => true),
'usage_time' => array('type' =>
'string', 'query' => true),
+ 'swiming' => array('type'
=> 'string', 'query' => true),
+ 'sanitation_facilities'
=> array('type' => 'string', 'query' => true),
+ 'animals' => array('type'
=> 'string', 'query' => true),
+ 'internett_phone' =>
array('type' => 'string', 'query' => true),
+ 'handicap' => array('type'
=> 'string', 'query' => true),
'internal_cost' => array('type'
=> 'int'),
'external_cost' => array('type'
=> 'int'),
'cost_type' => array('type'
=> 'string'),
@@ -118,6 +123,11 @@
'internal_cost' => $GLOBALS['phpgw']->db->f('internal_cost', false),
'external_cost' => $GLOBALS['phpgw']->db->f('external_cost', false),
'cost_type' => $GLOBALS['phpgw']->db->f('cost_type', false),
+
'swiming' => $GLOBALS['phpgw']->db->f('swiming', false),
+
'sanitation_facilities' => $GLOBALS['phpgw']->db->f('sanitation_facilities',
false),
+
'animals' => $GLOBALS['phpgw']->db->f('animals', false),
+
'internett_phone' => $GLOBALS['phpgw']->db->f('internett_phone', false),
+
'handicap' => $GLOBALS['phpgw']->db->f('handicap', false),
'building_name' => $GLOBALS['phpgw']->db->f('building_name', false),
'building_street' => $GLOBALS['phpgw']->db->f('building_street', false),
'building_city ' => $GLOBALS['phpgw']->db->f('building_city', false),
Modified: branches/dev-thomasez/booking/inc/class.uibuilding.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.uibuilding.inc.php 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/inc/class.uibuilding.inc.php 2012-03-06
14:48:21 UTC (rev 8968)
@@ -27,7 +27,7 @@
$this->bo = CreateObject('booking.bobuilding');
self::set_active_menu('booking::buildings');
$this->fields = array('name', 'homepage',
'description', 'email', 'street', 'zip_code', 'city', 'district', 'phone',
'active',
'location_code','deactivate_application','deactivate_calendar','deactivate_sendmessage','internal_cost','external_cost','cost_type','campsites','bedspaces',
-'heating','kitchen','water','location','communication','usage_time','weather_url','map_url');
+'heating','kitchen','water','location','communication','usage_time','weather_url','map_url','swiming','sanitation_facilities','animals','internett_phone','handicap');
}
protected function building_cost_types()
@@ -161,7 +161,7 @@
$building = extract_values($_POST,
$this->fields);
$building['active'] = '1';
$errors = $this->bo->validate($building);
- if (strlen($_POST['heating']) > 50 ||
strlen($_POST['kitchen']) > 50 || strlen($_POST['water']) > 50 ||
strlen($_POST['location']) > 50 || strlen($_POST['communication']) > 50 ||
strlen($_POST['usage_time']) > 50)
+ if (strlen($_POST['heating']) > 50 ||
strlen($_POST['kitchen']) > 50 || strlen($_POST['water']) > 50 ||
strlen($_POST['location']) > 50 || strlen($_POST['communication']) > 50 ||
strlen($_POST['usage_time']) > 50 || strlen($_POST['swiming']) > 50 ||
strlen($_POST['sanitation_facilities']) > 50 || strlen($_POST['animals']) > 50
|| strlen($_POST['internett_phone']) > 50 || strlen($_POST['handicap']) > 50)
{
$errors['extrafields'] = lang('Max 50
characters in text fields');
}
@@ -203,7 +203,7 @@
$building = array_merge($building,
extract_values($_POST, $this->fields));
$errors = $this->bo->validate($building);
- if (strlen($_POST['heating']) > 50 ||
strlen($_POST['kitchen']) > 50 || strlen($_POST['water']) > 50 ||
strlen($_POST['location']) > 50 || strlen($_POST['communication']) > 50 ||
strlen($_POST['usage_time']) > 50)
+ if (strlen($_POST['heating']) > 50 ||
strlen($_POST['kitchen']) > 50 || strlen($_POST['water']) > 50 ||
strlen($_POST['location']) > 50 || strlen($_POST['communication']) > 50 ||
strlen($_POST['usage_time']) > 50 || strlen($_POST['swiming']) > 50 ||
strlen($_POST['sanitation_facilities']) > 50 || strlen($_POST['animals']) > 50
|| strlen($_POST['internett_phone']) > 50 || strlen($_POST['handicap']) > 50)
{
$errors['extrafields'] = lang('Max 50
characters in text fields');
}
Modified: branches/dev-thomasez/booking/inc/class.uiresource.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.uiresource.inc.php 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/inc/class.uiresource.inc.php 2012-03-06
14:48:21 UTC (rev 8968)
@@ -23,7 +23,8 @@
$this->bo = CreateObject('booking.boresource');
$this->activity_bo = CreateObject('booking.boactivity');
- $this->fields = array('name', 'building_id',
'building_name','description','activity_id', 'active', 'type',
'sort','internal_cost','external_cost','cost_type','campsites','bedspaces','heating','kitchen','water','location','communication','usage_time');
+ $this->fields = array('name', 'building_id',
'building_name','description','activity_id', 'active', 'type',
'sort','internal_cost','external_cost','cost_type','campsites','bedspaces','heating','kitchen','water','location','communication','usage_time',
+'swiming','sanitation_facilities','animals','internett_phone','handicap');
self::set_active_menu('booking::resources');
}
@@ -183,7 +184,7 @@
$resource = array_merge($resource,
extract_values($_POST, $this->fields));
$errors = $this->bo->validate($building);
- if (strlen($_POST['heating']) > 50 ||
strlen($_POST['kitchen']) > 50 || strlen($_POST['water']) > 50 ||
strlen($_POST['location']) > 50 || strlen($_POST['communication']) > 50 ||
strlen($_POST['usage_time']) > 50)
+ if (strlen($_POST['heating']) > 50 ||
strlen($_POST['kitchen']) > 50 || strlen($_POST['water']) > 50 ||
strlen($_POST['location']) > 50 || strlen($_POST['communication']) > 50 ||
strlen($_POST['usage_time']) > 50 || strlen($_POST['swiming']) > 50 ||
strlen($_POST['sanitation_facilities']) > 50 || strlen($_POST['animals']) > 50
|| strlen($_POST['internett_phone']) > 50 || strlen($_POST['handicap']) > 50)
{
$errors['extrafields'] = lang('Max 50
characters in text fields');
}
Modified: branches/dev-thomasez/booking/js/booking/schedule.js
===================================================================
--- branches/dev-thomasez/booking/js/booking/schedule.js 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/js/booking/schedule.js 2012-03-06
14:48:21 UTC (rev 8968)
@@ -47,6 +47,8 @@
if (booking.name == 'Ledig tid' || booking.name == 'Ledig' ||
booking.name == 'Åpen' || booking.name == 'Åpent') {
var data = oRecord.getData();
YAHOO.util.Dom.addClass(elCell, 'freegreen');
+ YAHOO.util.Dom.setStyle(elCell, 'cursor', 'pointer');
+ YAHOO.util.Dom.addClass(elCell, 'selector');
elCell.onclick = function()
{YAHOO.booking.newApplicationForm(YAHOO.booking.dates[oColumn.field],
data._from, data._to, elCell); return false; };
} else {
elCell.onclick = function()
{YAHOO.booking.showBookingInfo(booking,elCell); return false; };
@@ -54,7 +56,8 @@
}
else {
-// YAHOO.util.Dom.addClass(elCell, 'freegreen');
+ YAHOO.util.Dom.addClass(elCell, 'selector');
+ YAHOO.util.Dom.setStyle(elCell, 'cursor', 'pointer');
elCell.innerHTML = '...';
var data = oRecord.getData();
elCell.ondblclick = function()
{YAHOO.booking.newApplicationForm(YAHOO.booking.dates[oColumn.field],
data._from, data._to, elCell); return false; };
Modified: branches/dev-thomasez/booking/setup/phpgw_no.lang
===================================================================
--- branches/dev-thomasez/booking/setup/phpgw_no.lang 2012-03-06 13:03:46 UTC
(rev 8967)
+++ branches/dev-thomasez/booking/setup/phpgw_no.lang 2012-03-06 14:48:21 UTC
(rev 8968)
@@ -563,3 +563,8 @@
ostfold booking no Østfold
You must choose a county booking no Du må velge et fylke
Address booking no Adresse
+Swiming booking no Bading
+Sanitation facilities booking no Sanitære fasiliteter
+Animals booking no Tillatt med dyr?
+Internett/phone booking no Internett/telefon
+Handicap booking no Handikap
Modified: branches/dev-thomasez/booking/setup/setup.inc.php
===================================================================
--- branches/dev-thomasez/booking/setup/setup.inc.php 2012-03-06 13:03:46 UTC
(rev 8967)
+++ branches/dev-thomasez/booking/setup/setup.inc.php 2012-03-06 14:48:21 UTC
(rev 8968)
@@ -1,5 +1,5 @@
<?php
- $setup_info['booking']['version'] = '0.2.12';
+ $setup_info['booking']['version'] = '0.2.13';
$setup_info['booking']['name'] = 'booking';
$setup_info['booking']['app_order'] = 9;
$setup_info['booking']['enable'] = 1;
Modified: branches/dev-thomasez/booking/setup/tables_current.inc.php
===================================================================
--- branches/dev-thomasez/booking/setup/tables_current.inc.php 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/setup/tables_current.inc.php 2012-03-06
14:48:21 UTC (rev 8968)
@@ -45,6 +45,11 @@
'cost_type' => array('type' =>
'varchar','precision' => '50','nullable' => True, 'default' => NULL),
'map_url' => array('type' =>
'varchar','precision' => '250','nullable' => True, 'default' => NULL),
'weather_url' => array('type' =>
'varchar','precision' => '250','nullable' => True, 'default' => NULL),
+ 'swiming' => array('type' =>
'varchar','precision' => '50','nullable' => True, 'default' => NULL),
+ 'sanitation_facilities' => array('type' =>
'varchar','precision' => '50','nullable' => True, 'default' => NULL),
+ 'animals' => array('type' =>
'varchar','precision' => '50','nullable' => True, 'default' => NULL),
+ 'internett_phone' => array('type' =>
'varchar','precision' => '50','nullable' => True, 'default' => NULL),
+ 'handicap' => array('type' =>
'varchar','precision' => '50','nullable' => True, 'default' => NULL),
),
'pk' => array('id'),
'fk' => array(),
@@ -137,6 +142,11 @@
'internal_cost' => array('type' => 'int',
'nullable' => True,'precision' => '4', 'default' => NULL),
'external_cost' => array('type' => 'int',
'nullable' => True,'precision' => '4', 'default' => NULL),
'cost_type' => array('type' =>
'varchar','precision' => '50','nullable' => True, 'default' => NULL),
+ 'swiming' => array('type' =>
'varchar','precision' => '50','nullable' => True, 'default' => NULL),
+ 'sanitation_facilities' => array('type' =>
'varchar','precision' => '50','nullable' => True, 'default' => NULL),
+ 'animals' => array('type' =>
'varchar','precision' => '50','nullable' => True, 'default' => NULL),
+ 'internett_phone' => array('type' =>
'varchar','precision' => '50','nullable' => True, 'default' => NULL),
+ 'handicap' => array('type' =>
'varchar','precision' => '50','nullable' => True, 'default' => NULL),
),
'pk' => array('id'),
'fk' => array(
Modified: branches/dev-thomasez/booking/setup/tables_update.inc.php
===================================================================
--- branches/dev-thomasez/booking/setup/tables_update.inc.php 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/setup/tables_update.inc.php 2012-03-06
14:48:21 UTC (rev 8968)
@@ -2718,4 +2718,31 @@
return $GLOBALS['setup_info']['booking']['currentver'];
}
}
+ /**
+ * Update booking version from 0.2.10 to 0.2.11
+ * Update bb_building with som new fields.
+ *
+ */
+ $test[] = '0.2.12';
+ function booking_upgrade0_2_12()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_resource ADD COLUMN swiming varchar(50) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_resource ADD COLUMN sanitation_facilities varchar(50) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_resource ADD COLUMN animals varchar(50) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_resource ADD COLUMN internett_phone varchar(50) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_resource ADD COLUMN handicap varchar(50) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN swiming varchar(50) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN sanitation_facilities varchar(50) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN animals varchar(50) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN internett_phone varchar(50) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN handicap varchar(50) DEFAULT NULL");
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.13';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
+
Modified: branches/dev-thomasez/booking/templates/base/application_new.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/application_new.xsl
2012-03-06 13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/templates/base/application_new.xsl
2012-03-06 14:48:21 UTC (rev 8968)
@@ -66,47 +66,9 @@
<textarea id="field_description"
class="full-width" name="description"><xsl:value-of
select="application/description"/></textarea>
</dd>
</dl>
- <dl class="form-col">
- <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>
-<!-- <xsl:if test="not (config/application_howmany)">-->
-<!-- <p>Oppgi forventet/estimert antall deltakere.
Vi vil ha det fordelt på aldersgruppeog kjønn. Dette er viktig ift. å kartlegge
hvem som bruker anleggene.</p>-->
-<!-- </xsl:if>-->
- <dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Estimated 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="../application/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
- </input>
- </td>
-<!--
- <td>
- <input
type="text">
-
<xsl:attribute name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
-
<xsl:attribute name="value"><xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
- </input>
- </td>
--->
- </tr>
- </xsl:for-each>
- </table>
- </dd>
- </dl>
<div class="clr"/>
<dl class="form-col">
- <div class="heading">3. <xsl:value-of
select="php:function('lang', 'Where?')" /></div>
+ <div class="heading">2. <xsl:value-of
select="php:function('lang', 'Where?')" /></div>
<xsl:if test="config/application_where">
<p>
<xsl:value-of
select="config/application_where"/>
@@ -134,7 +96,7 @@
</dl>
<div class="clr"/>
<dl class="form-col">
- <div class="heading">4. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
+ <div class="heading">3. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
<xsl:if test="config/application_when">
<p>
<xsl:value-of
select="config/application_when"/>
@@ -168,7 +130,7 @@
</dl>
<div class="clr"/>
<dl class="form-col">
- <div class="heading">5. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
+ <div class="heading">4. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
<xsl:if test="config/application_who">
<p>
<xsl:value-of
select="config/application_who"/>
@@ -182,6 +144,44 @@
<div id="audience_container"> </div>
</dd>
</dl>
+ <dl class="form-col">
+ <div class="heading">5. <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>
+<!-- <xsl:if test="not (config/application_howmany)">-->
+<!-- <p>Oppgi forventet/estimert antall deltakere.
Vi vil ha det fordelt på aldersgruppeog kjønn. Dette er viktig ift. å kartlegge
hvem som bruker anleggene.</p>-->
+<!-- </xsl:if>-->
+ <dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Estimated 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="../application/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
+ </input>
+ </td>
+<!--
+ <td>
+ <input
type="text">
+
<xsl:attribute name="name">female[<xsl:value-of select="id"/>]</xsl:attribute>
+
<xsl:attribute name="value"><xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/></xsl:attribute>
+ </input>
+ </td>
+-->
+ </tr>
+ </xsl:for-each>
+ </table>
+ </dd>
+ </dl>
<div class="clr"/>
<dl class="form-col">
<div class="heading"><br />6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></div>
Modified: branches/dev-thomasez/booking/templates/base/building.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/building.xsl 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/templates/base/building.xsl 2012-03-06
14:48:21 UTC (rev 8968)
@@ -75,6 +75,18 @@
<dt><label for='field_kitchen'><xsl:value-of
select="php:function('lang', 'Kitchen')"/></label></dt>
<dd><xsl:value-of
select="building/kitchen"/></dd>
</xsl:if>
+ <xsl:if test="not(building/swiming='')">
+ <dt><label for='field_swiming'><xsl:value-of
select="php:function('lang', 'Swiming')"/></label></dt>
+ <dd><xsl:value-of
select="building/swiming"/></dd>
+ </xsl:if>
+ <xsl:if test="not(building/sanitation_facilities='')">
+ <dt><label
for='field_sanitation_facilities'><xsl:value-of select="php:function('lang',
'Sanitation facilities')"/></label></dt>
+ <dd><xsl:value-of
select="building/sanitation_facilities"/></dd>
+ </xsl:if>
+ <xsl:if test="not(building/handicap='')">
+ <dt><label for='field_handicap'><xsl:value-of
select="php:function('lang', 'Handicap')"/></label></dt>
+ <dd><xsl:value-of
select="building/handicap"/></dd>
+ </xsl:if>
</dl>
<dl class="form-col">
<xsl:if test="not(building/water='')">
@@ -93,6 +105,14 @@
<dt><label for='field_usage_time'><xsl:value-of
select="php:function('lang', 'Usage time')"/></label></dt>
<dd><xsl:value-of
select="building/usage_time"/></dd>
</xsl:if>
+ <xsl:if test="not(building/internett_phone='')">
+ <dt><label
for='field_internett_phone'><xsl:value-of select="php:function('lang',
'Internett/phone')"/></label></dt>
+ <dd><xsl:value-of
select="building/internett_phone"/></dd>
+ </xsl:if>
+ <xsl:if test="not(building/animals='')">
+ <dt><label for='field_animals'><xsl:value-of
select="php:function('lang', 'Animals')"/></label></dt>
+ <dd><xsl:value-of
select="building/animals"/></dd>
+ </xsl:if>
</dl>
<div class="clr"/>
<xsl:if test="not (building/map_url='')">
Modified: branches/dev-thomasez/booking/templates/base/building_form.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/building_form.xsl
2012-03-06 13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/templates/base/building_form.xsl
2012-03-06 14:48:21 UTC (rev 8968)
@@ -115,6 +115,16 @@
<dt><label for='field_kitchen'><xsl:value-of
select="php:function('lang', 'Kitchen')"/></label></dt>
<dd><input type="text" name="kitchen"
id="field_kitchen" value="{building/kitchen}"/></dd>
+ <dt><label for='field_swiming'><xsl:value-of
select="php:function('lang', 'Swiming')"/></label></dt>
+ <dd><input type="text" name="swiming"
id="field_swiming" value="{building/swiming}"/></dd>
+
+ <dt><label
for='field_sanitation_facilities'><xsl:value-of select="php:function('lang',
'Sanitation facilities')"/></label></dt>
+ <dd><input type="text"
name="sanitation_facilities" id="field_sanitation_facilities"
value="{building/sanitation_facilities}"/></dd>
+
+ <dt><label for='field_handicap'><xsl:value-of
select="php:function('lang', 'Handicap')"/></label></dt>
+ <dd><input type="text" name="handicap"
id="field_handicap" value="{building/handicap}"/></dd>
+
+
</dl>
<dl class="form-col">
<dt><label for="field_water"><xsl:value-of
select="php:function('lang', 'Water')"/></label></dt>
@@ -128,6 +138,12 @@
<dt><label for='field_usage_time'><xsl:value-of
select="php:function('lang', 'Usage time')"/></label></dt>
<dd><input type="text" name="usage_time"
id="field_usage_time" value="{building/usage_time}"/></dd>
+
+ <dt><label
for='field_internett_phone'><xsl:value-of select="php:function('lang',
'Internett/phone')"/></label></dt>
+ <dd><input type="text" name="internett_phone"
id="field_internett_phone" value="{building/internett_phone}"/></dd>
+
+ <dt><label for='field_animals'><xsl:value-of
select="php:function('lang', 'Animals')"/></label></dt>
+ <dd><input type="text" name="animals"
id="field_animals" value="{building/animals}"/></dd>
</dl>
<div class="clr"/>
Modified: branches/dev-thomasez/booking/templates/base/resource.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/resource.xsl 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/templates/base/resource.xsl 2012-03-06
14:48:21 UTC (rev 8968)
@@ -51,6 +51,18 @@
<dt><label for='field_kitchen'><xsl:value-of
select="php:function('lang', 'Kitchen')"/></label></dt>
<dd><xsl:value-of
select="resource/kitchen"/></dd>
</xsl:if>
+ <xsl:if test="not(resource/swiming='')">
+ <dt><label for='field_swiming'><xsl:value-of
select="php:function('lang', 'Swiming')"/></label></dt>
+ <dd><xsl:value-of
select="resource/swiming"/></dd>
+ </xsl:if>
+ <xsl:if test="not(resource/sanitation_facilities='')">
+ <dt><label
for='field_sanitation_facilities'><xsl:value-of select="php:function('lang',
'Sanitation facilities')"/></label></dt>
+ <dd><xsl:value-of
select="resource/sanitation_facilities"/></dd>
+ </xsl:if>
+ <xsl:if test="not(resource/handicap='')">
+ <dt><label for='field_handicap'><xsl:value-of
select="php:function('lang', 'Handicap')"/></label></dt>
+ <dd><xsl:value-of
select="resource/handicap"/></dd>
+ </xsl:if>
</dl>
<dl class="form-col">
<xsl:if test="not(resource/water='')">
@@ -69,6 +81,14 @@
<dt><label for='field_usage_time'><xsl:value-of
select="php:function('lang', 'Usage time')"/></label></dt>
<dd><xsl:value-of
select="resource/usage_time"/></dd>
</xsl:if>
+ <xsl:if test="not(resource/internett_phone='')">
+ <dt><label
for='field_internett_phone'><xsl:value-of select="php:function('lang',
'Internett/phone')"/></label></dt>
+ <dd><xsl:value-of
select="resource/internett_phone"/></dd>
+ </xsl:if>
+ <xsl:if test="not(resource/animals='')">
+ <dt><label for='field_animals'><xsl:value-of
select="php:function('lang', 'Animals')"/></label></dt>
+ <dd><xsl:value-of
select="resource/animals"/></dd>
+ </xsl:if>
</dl>
<div class='clr'/>
Modified: branches/dev-thomasez/booking/templates/base/resource_form.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/resource_form.xsl
2012-03-06 13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/booking/templates/base/resource_form.xsl
2012-03-06 14:48:21 UTC (rev 8968)
@@ -103,6 +103,14 @@
<dt><label for='field_kitchen'><xsl:value-of
select="php:function('lang', 'Kitchen')"/></label></dt>
<dd><input type="text" name="kitchen"
id="field_kitchen" value="{resource/kitchen}"/></dd>
+
+ <dt><label for='field_swiming'><xsl:value-of
select="php:function('lang', 'Swiming')"/></label></dt>
+ <dd><input type="text" name="swiming"
id="field_swiming" value="{resource/swiming}"/></dd>
+
+ <dt><label
for='field_sanitation_facilities'><xsl:value-of select="php:function('lang',
'Sanitation facilities')"/></label></dt>
+ <dd><input type="text"
name="sanitation_facilities" id="field_sanitation_facilities"
value="{resource/sanitation_facilities}"/></dd>
+ <dt><label for='field_handicap'><xsl:value-of
select="php:function('lang', 'Handicap')"/></label></dt>
+ <dd><input type="text" name="handicap"
id="field_handicap" value="{resource/handicap}"/></dd>
</dl>
<dl class="form-col">
@@ -117,6 +125,12 @@
<dt><label for='field_usage_time'><xsl:value-of
select="php:function('lang', 'Usage time')"/></label></dt>
<dd><input type="text" name="usage_time"
id="field_usage_time" value="{resource/usage_time}"/></dd>
+
+ <dt><label
for='field_internett_phone'><xsl:value-of select="php:function('lang',
'Internett/phone')"/></label></dt>
+ <dd><input type="text" name="internett_phone"
id="field_internett_phone" value="{resource/internett_phone}"/></dd>
+
+ <dt><label for='field_animals'><xsl:value-of
select="php:function('lang', 'Animals')"/></label></dt>
+ <dd><input type="text" name="animals"
id="field_animals" value="{resource/animals}"/></dd>
</dl>
<div class="clr"/>
Modified: branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang 2012-03-06
14:48:21 UTC (rev 8968)
@@ -352,21 +352,26 @@
Middle bookingfrontend no Midt-Norge
North bookingfrontend no Nord-Norge
Select bedspaces bookingfrontend no Velg antall sengeplasser
-akerhus booking no Akershus
-austagder booking no Aust-Agder
-buskerud booking no Buskerud
-finnmark booking no Finnmark
-hedemark booking no Hedmark
-hordaland booking no Hordaland
-moreogromsdal booking no Møre og Romsdal
-nordland booking no Nordland
-nordtrodelag booking no Nord-Trøndelag
-oppland booking no Oppland
-rogaland booking no Rogaland
-songogfjordane booking no Sogn og Fjordane
-sortrondelag booking no Sør-Trøndelag
-telemark booking no Telemark
-troms booking no Troms
-vestagder booking no Vest-Agder
-vestfold booking no Vestfold
-ostfold booking no Østfold
+akerhus bookingfrontend no Akershus
+austagder bookingfrontend no Aust-Agder
+buskerud bookingfrontend no Buskerud
+finnmark bookingfrontend no Finnmark
+hedemark bookingfrontend no Hedmark
+hordaland bookingfrontend no Hordaland
+moreogromsdal bookingfrontend no Møre og Romsdal
+nordland bookingfrontend no Nordland
+nordtrodelag bookingfrontend no Nord-Trøndelag
+oppland bookingfrontend no Oppland
+rogaland bookingfrontend no Rogaland
+songogfjordane bookingfrontend no Sogn og Fjordane
+sortrondelag bookingfrontend no Sør-Trøndelag
+telemark bookingfrontend no Telemark
+troms bookingfrontend no Troms
+vestagder bookingfrontend no Vest-Agder
+vestfold bookingfrontend no Vestfold
+ostfold bookingfrontend no Østfold
+Swiming bookingfrontend no Bading
+Sanitation facilities bookingfrontend no Sanitære fasiliteter
+Animals bookingfrontend no Tillatt med dyr?
+Internett/phone bookingfrontend no Internett/telefon
+Handicap bookingfrontend no Handikap
Modified: branches/dev-thomasez/bookingfrontend/setup/setup.inc.php
===================================================================
--- branches/dev-thomasez/bookingfrontend/setup/setup.inc.php 2012-03-06
13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/bookingfrontend/setup/setup.inc.php 2012-03-06
14:48:21 UTC (rev 8968)
@@ -21,7 +21,7 @@
$setup_info['bookingfrontend']['depends'][] = array(
'appname' => 'booking',
- 'versions' => Array('0.2.00',
'0.2.01','0.2.02','0.2.03','0.2.04','0.2.05','0.2.06','0.2.07','0.2.08','0.2.09','0.2.10','0.2.11','0.2.12')
+ 'versions' => Array('0.2.00',
'0.2.01','0.2.02','0.2.03','0.2.04','0.2.05','0.2.06','0.2.07','0.2.08','0.2.09','0.2.10','0.2.11','0.2.12','0.2.13')
);
$setup_info['bookingfrontend']['depends'][] = array(
Modified: branches/dev-thomasez/bookingfrontend/templates/base/building.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/base/building.xsl
2012-03-06 13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/bookingfrontend/templates/base/building.xsl
2012-03-06 14:48:21 UTC (rev 8968)
@@ -94,7 +94,6 @@
<div id="documents_container"/>
</dl>
<dl class="proplist-col images">
-
<xsl:if test="not(campsites='')">
<dt><label for="field_campsites"><xsl:value-of
select="php:function('lang', 'Campsites')"/></label></dt>
<dd><xsl:value-of select="campsites"/></dd>
@@ -127,6 +126,26 @@
<dt><label for='field_usage_time'><xsl:value-of
select="php:function('lang', 'Usage time')"/></label></dt>
<dd><xsl:value-of select="usage_time"/></dd>
</xsl:if>
+ <xsl:if test="not(swiming='')">
+ <dt><label for='field_swiming'><xsl:value-of
select="php:function('lang', 'Swiming')"/></label></dt>
+ <dd><xsl:value-of select="swiming"/></dd>
+ </xsl:if>
+ <xsl:if test="not(sanitation_facilities='')">
+ <dt><label
for='field_sanitation_facilities'><xsl:value-of select="php:function('lang',
'Sanitation facilities')"/></label></dt>
+ <dd><xsl:value-of
select="sanitation_facilities"/></dd>
+ </xsl:if>
+ <xsl:if test="not(animals='')">
+ <dt><label for='field_animals'><xsl:value-of
select="php:function('lang', 'Animals')"/></label></dt>
+ <dd><xsl:value-of select="animals"/></dd>
+ </xsl:if>
+ <xsl:if test="not(internett_phone='')">
+ <dt><label
for='field_internett_phone'><xsl:value-of select="php:function('lang',
'Internett/phone')"/></label></dt>
+ <dd><xsl:value-of
select="internett_phone"/></dd>
+ </xsl:if>
+ <xsl:if test="not(handicap='')">
+ <dt><label for='field_handicap'><xsl:value-of
select="php:function('lang', 'Handicap')"/></label></dt>
+ <dd><xsl:value-of select="handicap"/></dd>
+ </xsl:if>
<div id="images_container"></div>
Modified: branches/dev-thomasez/bookingfrontend/templates/base/resource.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/base/resource.xsl
2012-03-06 13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/bookingfrontend/templates/base/resource.xsl
2012-03-06 14:48:21 UTC (rev 8968)
@@ -50,8 +50,6 @@
<div id="documents_container"/>
</dl>
<dl class="proplist-col images">
- <div id="images_container"></div>
-
<xsl:if test="not(resource/campsites='')">
<dt><label for="field_campsites"><xsl:value-of
select="php:function('lang', 'Campsites')"/></label></dt>
<dd><xsl:value-of
select="resource/campsites"/></dd>
@@ -84,7 +82,27 @@
<dt><label for='field_usage_time'><xsl:value-of
select="php:function('lang', 'Usage time')"/></label></dt>
<dd><xsl:value-of
select="resource/usage_time"/></dd>
</xsl:if>
-
+ <xsl:if test="not(resource/swiming='')">
+ <dt><label for='field_swiming'><xsl:value-of
select="php:function('lang', 'Swiming')"/></label></dt>
+ <dd><xsl:value-of
select="resource/swiming"/></dd>
+ </xsl:if>
+ <xsl:if test="not(resource/sanitation_facilities='')">
+ <dt><label
for='field_sanitation_facilities'><xsl:value-of select="php:function('lang',
'Sanitation facilities')"/></label></dt>
+ <dd><xsl:value-of
select="resource/sanitation_facilities"/></dd>
+ </xsl:if>
+ <xsl:if test="not(resource/animals='')">
+ <dt><label for='field_animals'><xsl:value-of
select="php:function('lang', 'Animals')"/></label></dt>
+ <dd><xsl:value-of
select="resource/animals"/></dd>
+ </xsl:if>
+ <xsl:if test="not(resource/internett_phone='')">
+ <dt><label
for='field_internett_phone'><xsl:value-of select="php:function('lang',
'Internett/phone')"/></label></dt>
+ <dd><xsl:value-of
select="resource/internett_phone"/></dd>
+ </xsl:if>
+ <xsl:if test="not(resource/handicap='')">
+ <dt><label for='field_handicap'><xsl:value-of
select="php:function('lang', 'Handicap')"/></label></dt>
+ <dd><xsl:value-of
select="resource/handicap"/></dd>
+ </xsl:if>
+ <div id="images_container"></div>
</dl>
</div>
Modified: branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
2012-03-06 13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
2012-03-06 14:48:21 UTC (rev 8968)
@@ -145,7 +145,7 @@
<xsl:value-of
select="substring($tag_stripped_description, 0, 97)"/>...
</xsl:when>
<xsl:when
test="string-length($tag_stripped_description) > 280 and $layout='nsf'">
- <xsl:value-of
select="substring($tag_stripped_description, 0, 277)"/>...
+ <xsl:value-of
select="substring($tag_stripped_description, 0, 277)"/>aaa...
</xsl:when>
<xsl:otherwise>
<xsl:value-of
select="$tag_stripped_description"/>
Modified: branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
2012-03-06 13:03:46 UTC (rev 8967)
+++ branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
2012-03-06 14:48:21 UTC (rev 8968)
@@ -241,11 +241,13 @@
}
#frontend dl.proplist-col.images dt {
margin-top: 0px;
- margin-bottom: 10px;
+ margin-bottom: 2px;
}
+#frontend dl.proplist-col.images dd {
+ margin-bottom: 3px;
+}
-
#frontend h2 { margin-bottom: 0.1em;}
#frontend dl.proplist.images dd img { width: 300px; border:1px solid #777;
padding: 1px;}
#frontend dl.proplist.images dl { margin-bottom: 1.5em; }
@@ -380,9 +382,8 @@
padding-top: 1.5em;
font-size: 0.9em;
}
-
-#schedule_container .freegreen {
- cursor: pointer;
+.selector {
+ cursor: pointer!important;
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8968] bkbooking: nsf update and bugfix,
Kjell Arne Espedal <=