[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8959] bkbooking: nsf updates and bugfixes
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [8959] bkbooking: nsf updates and bugfixes |
|
Date: |
Thu, 01 Mar 2012 11:49:50 +0000 |
Revision: 8959
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8959
Author: kjell
Date: 2012-03-01 11:49:49 +0000 (Thu, 01 Mar 2012)
Log Message:
-----------
bkbooking: nsf updates and bugfixes
Modified Paths:
--------------
branches/dev-thomasez/booking/js/booking/schedule.js
branches/dev-thomasez/booking/setup/phpgw_no.lang
branches/dev-thomasez/booking/templates/base/application.xsl
branches/dev-thomasez/booking/templates/base/application_edit.xsl
branches/dev-thomasez/booking/templates/base/application_new.xsl
branches/dev-thomasez/booking/templates/base/building_form.xsl
branches/dev-thomasez/booking/templates/base/event_edit.xsl
branches/dev-thomasez/booking/templates/base/event_new.xsl
branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang
branches/dev-thomasez/bookingfrontend/templates/base/building.xsl
branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
Modified: branches/dev-thomasez/booking/js/booking/schedule.js
===================================================================
--- branches/dev-thomasez/booking/js/booking/schedule.js 2012-02-27
14:10:40 UTC (rev 8958)
+++ branches/dev-thomasez/booking/js/booking/schedule.js 2012-03-01
11:49:49 UTC (rev 8959)
@@ -199,7 +199,8 @@
}
YAHOO.booking.newApplicationForm = function(date, _from, _to, elCell) {
- if(elCell)
+
+ if(elCell)
{
resource =
elCell.parentNode.parentNode.getAttribute('resource');
}
@@ -221,7 +222,10 @@
weekday[4]="thursday";
weekday[5]="friday";
weekday[6]="saturday";
- url += '&from_[]=' + state + _from + '&to_[]=' + state + _to +
'&resource=' + resource + '&weekday=' + weekday[day];
+ url += '&from_[]=' + state + _from + '&to_[]=' + state + _to +
'&weekday=' + weekday[day];
+ if (resource != null) {
+ url += '&resource=' + resource;
+ }
window.location.href = url;
}
Modified: branches/dev-thomasez/booking/setup/phpgw_no.lang
===================================================================
--- branches/dev-thomasez/booking/setup/phpgw_no.lang 2012-02-27 14:10:40 UTC
(rev 8958)
+++ branches/dev-thomasez/booking/setup/phpgw_no.lang 2012-03-01 11:49:49 UTC
(rev 8959)
@@ -109,7 +109,7 @@
last modified booking no Sist endret
loading... booking no Laster...
location booking no Møtelokale
-male booking no Mann
+male booking no Personer
mar booking no mars
may booking no mai
mo booking no ma.
@@ -120,10 +120,10 @@
new activity booking no Ny aktivitet
new age group booking no Ny aldersgruppe
new allocation booking no Ny tildeling
-new application booking no Ny søknad
+new application booking no Booking
new audience group booking no Ny målgruppe
new booking booking no Ny booking
-new booking application booking no Ny søknad
+new booking application booking no Gå til booking
new building booking no Nytt sted/utstyr
new building permission booking no Nye rettigheter sted/utstyr
New Resource Permission booking no Nye rettigheter objekt
@@ -520,6 +520,7 @@
Upload manual booking no Last opp dokumentasjon
Are you sure you want to delete? booking no Er du sikker på at
søknad skal avvises?
House booking no Hytte/hus
+Campsite booking no Teltplass
Campsites booking no Teltplass
Boat booking no Seilbåt
Bedspaces booking no Sengeplasser
Modified: branches/dev-thomasez/booking/templates/base/application.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/application.xsl
2012-02-27 14:10:40 UTC (rev 8958)
+++ branches/dev-thomasez/booking/templates/base/application.xsl
2012-03-01 11:49:49 UTC (rev 8959)
@@ -174,13 +174,13 @@
<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>
+ <!--<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><xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/></td>
- <td><xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/></td>
+ <!--<td><xsl:value-of
select="../application/agegroups/female[../agegroup_id = $id]"/></td>-->
</tr>
</xsl:for-each>
</table>
Modified: branches/dev-thomasez/booking/templates/base/application_edit.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/application_edit.xsl
2012-02-27 14:10:40 UTC (rev 8958)
+++ branches/dev-thomasez/booking/templates/base/application_edit.xsl
2012-03-01 11:49:49 UTC (rev 8959)
@@ -113,7 +113,7 @@
<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>
+ <!-- <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>
@@ -124,12 +124,12 @@
<xsl:attribute name="value"><xsl:value-of
select="../application/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
</input>
</td>
- <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>
+ </td>-->
</tr>
</xsl:for-each>
</table>
Modified: branches/dev-thomasez/booking/templates/base/application_new.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/application_new.xsl
2012-02-27 14:10:40 UTC (rev 8958)
+++ branches/dev-thomasez/booking/templates/base/application_new.xsl
2012-03-01 11:49:49 UTC (rev 8959)
@@ -80,7 +80,7 @@
<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>
+ <!--<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>
@@ -91,12 +91,14 @@
<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>
Modified: branches/dev-thomasez/booking/templates/base/building_form.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/building_form.xsl
2012-02-27 14:10:40 UTC (rev 8958)
+++ branches/dev-thomasez/booking/templates/base/building_form.xsl
2012-03-01 11:49:49 UTC (rev 8959)
@@ -95,7 +95,7 @@
<dd><input id="field_map_url" name="map_url"
type="text" value="{building/map_url}"/></dd>
</dl>
<dl class="form-col">
- <dt><label
for="field_weather_url"><xsl:value-of select="php:function('lang', 'Weather
ul')"/></label></dt>
+ <dt><label
for="field_weather_url"><xsl:value-of select="php:function('lang', 'Weather
url')"/></label></dt>
<dd><input type="text" name="weather_url"
id="field_weather_url" value="{building/weather_url}"/></dd>
</dl>
<div class="clr"/>
Modified: branches/dev-thomasez/booking/templates/base/event_edit.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/event_edit.xsl 2012-02-27
14:10:40 UTC (rev 8958)
+++ branches/dev-thomasez/booking/templates/base/event_edit.xsl 2012-03-01
11:49:49 UTC (rev 8959)
@@ -145,7 +145,7 @@
<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>
+ <!--<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>
@@ -156,12 +156,12 @@
<xsl:attribute name="value"><xsl:value-of
select="../event/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
</input>
</td>
- <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>
+ </td>-->
</tr>
</xsl:for-each>
</table>
Modified: branches/dev-thomasez/booking/templates/base/event_new.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/event_new.xsl 2012-02-27
14:10:40 UTC (rev 8958)
+++ branches/dev-thomasez/booking/templates/base/event_new.xsl 2012-03-01
11:49:49 UTC (rev 8959)
@@ -112,7 +112,7 @@
<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>
+ <!--<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>
@@ -123,12 +123,12 @@
<xsl:attribute name="value"><xsl:value-of
select="../event/agegroups/male[../agegroup_id = $id]"/></xsl:attribute>
</input>
</td>
- <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>
+ </td>-->
</tr>
</xsl:for-each>
</table>
Modified: branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
===================================================================
--- branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
2012-02-27 14:10:40 UTC (rev 8958)
+++ branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
2012-03-01 11:49:49 UTC (rev 8959)
@@ -208,14 +208,21 @@
YAHOO.util.Dom.setStyle('field_campsites', 'display', 'none');
ResetBeds();
}
- else if
(['Location','Campsite','Boat'].indexOf(val) >= 0)
+ else if (['Location','Campsite'].indexOf(val)
>= 0)
{
ResetBeds();
YAHOO.util.Dom.setStyle('field_bedspaces', 'display', 'none');
YAHOO.util.Dom.setStyle('field_campsites', 'display', 'inline');
- ResetCampsites();
+ if (['Location'].indexOf(val) >= 0) {
+
YAHOO.util.Dom.setStyle('field_campsites2', 'display', 'none');
+
YAHOO.util.Dom.setStyle('field_meetingroom', 'display', 'inline');
+ } else {
+
YAHOO.util.Dom.setStyle('field_campsites2', 'display', 'inline');
+
YAHOO.util.Dom.setStyle('field_meetingroom', 'display', 'none');
+ }
+ ResetCampsites();
}
- else if (['Equipment',''].indexOf(val) >= 0)
+ else if (['Equipment','Boat',''].indexOf(val)
>= 0)
{
ResetBeds();
ResetCampsites();
Modified: branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang 2012-02-27
14:10:40 UTC (rev 8958)
+++ branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang 2012-03-01
11:49:49 UTC (rev 8959)
@@ -110,7 +110,7 @@
location bookingfrontend no Møtelokale
log on bookingfrontend no Logg inn
log off bookingfrontend no Logg ut
-male bookingfrontend no Mann
+male bookingfrontend no Personer
mar bookingfrontend no mars
may bookingfrontend no mai
mo bookingfrontend no ma.
@@ -121,10 +121,10 @@
new activity bookingfrontend no Ny aktivitet
new age group bookingfrontend no Ny aldersgruppe
new allocation bookingfrontend no Ny tildeling
-new application bookingfrontend no Ny søknad
+new application bookingfrontend no Booking
new audience group bookingfrontend no Ny målgruppe
new booking bookingfrontend no Ny booking
-new booking application bookingfrontend no Ny søknad
+new booking application bookingfrontend no Gå til booking
new building bookingfrontend no Nytt sted/utstyr
new building permission bookingfrontend no Nye rettigheter
sted/utstyr
new contact bookingfrontend no Ny kontakt
Modified: branches/dev-thomasez/bookingfrontend/templates/base/building.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/base/building.xsl
2012-02-27 14:10:40 UTC (rev 8958)
+++ branches/dev-thomasez/bookingfrontend/templates/base/building.xsl
2012-03-01 11:49:49 UTC (rev 8959)
@@ -23,7 +23,7 @@
<dl class="proplist-col main">
<xsl:if test="normalize-space(description)">
<dl class="proplist description">
- <dt><xsl:value-of
select="php:function('lang', 'Description')" /></dt>
+ <h3><xsl:value-of
select="php:function('lang', 'Description')" /></h3>
<dd><xsl:value-of
select="description" disable-output-escaping="yes"/></dd>
</dl>
</xsl:if>
Modified: branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
2012-02-27 14:10:40 UTC (rev 8958)
+++ branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
2012-03-01 11:49:49 UTC (rev 8959)
@@ -68,7 +68,12 @@
</xsl:for-each>
</select>
<div id="field_campsites">
- Minimum antall plasser:
+ <span id="field_campsites2">
+ Minimum antall plasser:
+ </span>
+ <span id="field_meetingroom">
+ Antall deltakere:
+ </span>
<input type="text" size="3" id="campsites" name="campsites">
<xsl:if test="resource/campsite">
<xsl:attribute name="value"><xsl:value-of
select="resource/campsite"/></xsl:attribute>
Modified: branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
2012-02-27 14:10:40 UTC (rev 8958)
+++ branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
2012-03-01 11:49:49 UTC (rev 8959)
@@ -232,13 +232,17 @@
}
#frontend dl.proplist-col.main {
- width: 400px;
+ width: 550px;
}
#frontend dl.proplist-col.images {
float:right;
clear:right;
}
+#frontend dl.proplist-col.images dt {
+ margin-top: 0px;
+ margin-bottom: 10px;
+}
@@ -377,4 +381,8 @@
font-size: 0.9em;
}
+#schedule_container .freegreen {
+ cursor: pointer;
+}
+
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8959] bkbooking: nsf updates and bugfixes,
Kjell Arne Espedal <=