|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [14680] more on bookingfrontend |
| Date: | Wed, 27 Jan 2016 07:43:32 +0000 |
Revision: 14680
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14680
Author: sigurdne
Date: 2016-01-27 07:43:30 +0000 (Wed, 27 Jan 2016)
Log Message:
-----------
more on bookingfrontend
Modified Paths:
--------------
branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
Modified: branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
===================================================================
--- branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
2016-01-25 15:07:40 UTC (rev 14679)
+++ branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php
2016-01-27 07:43:30 UTC (rev 14680)
@@ -27,6 +27,11 @@
}
}
+ if(!$types)
+ {
+ $types = array('building', 'resource');//default
+ }
+
if($type= phpgw::get_var('type', 'string', 'REQUEST',
null))
{
$types[] = $type;
Modified: branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
2016-01-25 15:07:40 UTC (rev 14679)
+++ branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
2016-01-27 07:43:30 UTC (rev 14680)
@@ -21,37 +21,6 @@
<div id = "total_records_top"></div>
<div class="pure-u-1">
<div class="heading">
- <xsl:value-of
select="php:function('lang', 'type')" />
- </div>
- <ul id="search_type">
- <li>
- <label>
- <input
type="checkbox" name="search_type[]" value="building" checked="checked="/>
- <xsl:value-of
select="php:function('lang', 'building')" />
- </label>
- </li>
- <li>
- <label>
- <input
type="checkbox" name="search_type[]" value="resource" checked="checked="/>
- <xsl:value-of
select="php:function('lang', 'resource')" />
- </label>
- </li>
- <!--li>
- <label>
- <input
type="checkbox" name="search_type[]" value="organization"/>
- <xsl:value-of
select="php:function('lang', 'organization')" />
- </label>
- </li>
- <li>
- <label>
- <input
type="checkbox" name="search_type[]" value="event"/>
- <xsl:value-of
select="php:function('lang', 'event')" />
- </label>
- </li-->
- </ul>
- </div>
- <div class="pure-u-1">
- <div class="heading">
<xsl:value-of
select="php:function('lang', 'Activity')" />
</div>
<ul id="top_level">
@@ -131,6 +100,37 @@
</div>
<div class="pure-u-1">
<div class="heading">
+ <xsl:value-of
select="php:function('lang', 'type')" />
+ </div>
+ <ul id="search_type">
+ <li>
+ <label>
+ <input
type="checkbox" name="search_type[]" value="building"/>
+ <xsl:value-of
select="php:function('lang', 'building')" />
+ </label>
+ </li>
+ <li>
+ <label>
+ <input
type="checkbox" name="search_type[]" value="resource"/>
+ <xsl:value-of
select="php:function('lang', 'resource')" />
+ </label>
+ </li>
+ <!--li>
+ <label>
+ <input
type="checkbox" name="search_type[]" value="organization"/>
+ <xsl:value-of
select="php:function('lang', 'organization')" />
+ </label>
+ </li>
+ <li>
+ <label>
+ <input
type="checkbox" name="search_type[]" value="event"/>
+ <xsl:value-of
select="php:function('lang', 'event')" />
+ </label>
+ </li-->
+ </ul>
+ </div>
+ <div class="pure-u-1">
+ <div class="heading">
<xsl:value-of
select="php:function('lang', 'building')" />
</div>
<div id="building_container">
| [Prev in Thread] | Current Thread | [Next in Thread] |