[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [10710] bkbooking: hyttebooking update frontendsearch
From: |
Kjell Arne Espedal |
Subject: |
[Fmsystem-commits] [10710] bkbooking: hyttebooking update frontendsearch |
Date: |
Thu, 24 Jan 2013 08:12:45 +0000 |
Revision: 10710
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=10710
Author: kjell
Date: 2013-01-24 08:12:44 +0000 (Thu, 24 Jan 2013)
Log Message:
-----------
bkbooking: hyttebooking update frontendsearch
Modified Paths:
--------------
branches/dev-thomasez/bookingfrontend/inc/class.uisearch.inc.php
branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang
branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
Modified: branches/dev-thomasez/bookingfrontend/inc/class.uisearch.inc.php
===================================================================
--- branches/dev-thomasez/bookingfrontend/inc/class.uisearch.inc.php
2013-01-23 18:55:00 UTC (rev 10709)
+++ branches/dev-thomasez/bookingfrontend/inc/class.uisearch.inc.php
2013-01-24 08:12:44 UTC (rev 10710)
@@ -85,9 +85,10 @@
$resource['region'] = phpgw::get_var('regions', 'GET',
null);
$resource['from_'] = phpgw::get_var('from_', 'GET',
null);
$resource['to_'] = phpgw::get_var('to_', 'GET', null);
+ $resource['advsearch'] = phpgw::get_var('advsearch',
'GET', null);
$search = null;
+
-
if (strlen($searchterm) || $type || $resource['res'] ||
$resource['fylke'] || $resource['region'] || $resource['from_'] )
{
$search = array(
@@ -137,7 +138,7 @@
$params['frontimages'] = array_merge(
$params['frontimages'], $building_documents['results'] );
}
}
-// echo "<pre>";print_r($params);exit;
+# echo "<pre>";print_r($params);exit;
self::render_template('search', $params);
}
Modified: branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
===================================================================
--- branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
2013-01-23 18:55:00 UTC (rev 10709)
+++ branches/dev-thomasez/bookingfrontend/js/bookingfrontend/search.js
2013-01-24 08:12:44 UTC (rev 10710)
@@ -132,14 +132,13 @@
YAHOO.booking.initializeDataTable = function()
{
- var oFrom = YAHOO.util.Dom.get('field_from');
- if (oFrom.value == null || oFrom.value == '') {
+ var oAdv = YAHOO.util.Dom.get('field_advsearch');
+ if (oAdv.value == null || oAdv.value == '0') {
YAHOO.util.Dom.setStyle('field_freetime', 'display', 'none');
} else {
YAHOO.util.Dom.setStyle('field_freetime', 'display', 'block');
}
-
var val = YAHOO.util.Dom.get('field_type').value;
if(['House'].indexOf(val) >= 0) {
YAHOO.util.Dom.setStyle('field_bedspaces', 'display',
'inline');
@@ -276,13 +275,15 @@
});
YAHOO.util.Event.addListener('advanced', "click", function(e){
var val = YAHOO.util.Dom.getStyle('field_freetime' , 'display'
);
+ var oAdv = YAHOO.util.Dom.get('field_advsearch');
if (val != 'block') {
YAHOO.util.Dom.setStyle('field_freetime', 'display',
'block');
-
+ oAdv.value="1";
} else {
YAHOO.util.Dom.setStyle('field_freetime', 'display',
'none');
var oObj1 = YAHOO.util.Dom.get('field_from');
var oObj2 = YAHOO.util.Dom.get('field_to');
+ oAdv.value="0";
oObj1.value = '';
oObj2.value = '';
oObj1.innerHTML = '';
Modified: branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang 2013-01-23
18:55:00 UTC (rev 10709)
+++ branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang 2013-01-24
08:12:44 UTC (rev 10710)
@@ -376,6 +376,6 @@
Internett/phone bookingfrontend no Internett/telefon
Handicap bookingfrontend no Handikap
Home bookingfrontend no Forsiden
-Advanced search bookingfrontend no Søk på ledig tid
+Advanced search bookingfrontend no Avansert søk
Goto Schedule bookingfrontend no Gå direkte til kalender
Modified: branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
2013-01-23 18:55:00 UTC (rev 10709)
+++ branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
2013-01-24 08:12:44 UTC (rev 10710)
@@ -33,6 +33,8 @@
<div class="hint" id="hint">
F.eks. "<i>Solstølen</i>", "<i>Tredalen</i>", "<i>kano</i>" eller
"<i>leir</i>"
</div>
+ <div class="freetime" id="field_freetime">
+ <input type="hidden" name="advsearch" id="field_advsearch"
value="{resource/advsearch}" />
<div class="settings" id="regions">
<select name='regions' id='field_regions'>
<option value=''><xsl:value-of
select="php:function('lang', 'Select Area')" />...</option>
@@ -95,7 +97,7 @@
</xsl:for-each>
</select>
</div>
- <div class="freetime" id="field_freetime">
+ <div class="freetime2" id="field_freetime2">
<label for="field_from"><xsl:value-of
select="php:function('lang', 'From') "/></label><xsl:text> </xsl:text>
<span class="date-picker">
<input id="field_from" name="from_" type="text">
@@ -110,7 +112,7 @@
</span>
</div>
<div style="float: right; margin-right: 250px;"><input type="submit"
value="{php:function('lang', 'Search')}"/></div>
-
+ </div>
</form>
<xsl:if test="not(search)">
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [10710] bkbooking: hyttebooking update frontendsearch,
Kjell Arne Espedal <=