[Fmsystem-commits] [14638] more on bookingfrontend

[Sigurd Nes]

Revision: 14638
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=14638
Author:   sigurdne
Date:     2016-01-13 11:49:27 +0000 (Wed, 13 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-13 10:28:53 UTC (rev 14637)
+++ branches/dev-syncromind/bookingfrontend/inc/class.bosearch.inc.php  
2016-01-13 11:49:27 UTC (rev 14638)
@@ -59,7 +59,7 @@
                                $_filter_building['id'] = $building_id;
                        }
 
-                       if(in_array('building', $types))
+//                     if(in_array('building', $types))
                        {
 
                                $bui_result = 
$this->sobuilding->read(array("query" => $searchterm, "sort" => "name",
@@ -99,7 +99,7 @@
                                }
                        }
 
-                       if(in_array('resource', $types))
+//                     if(in_array('resource', $types))
                        {
                                $_filter_resource = array("active" => "1");
 
@@ -157,7 +157,7 @@
                                        );
                                        foreach($bui_result['results'] as $bui)
                                        {
-                                               
if(in_array($bui['id'],$_resource_buildings ))
+                                               
if(isset($_resource_buildings[$bui['id']] ))
                                                {
                                                        
$_bui_result['results'][] = $bui;
                                                }
@@ -165,7 +165,16 @@
                                        $bui_result = $_bui_result;
                                }
                        }
-//                     _debug_array($res_result);
+                       if(!in_array('building', $types))
+                       {
+                               $bui_result = array();
+                       }
+                       if(!in_array('resource', $types))
+                       {
+                               $res_result = array();
+                       }
+//                     _debug_array($_resource_buildings);
+//                     _debug_array($bui_result);
                        if(in_array('event', $types))
                        {
                                $now                             = 
date('Y-m-d');

Modified: branches/dev-syncromind/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/dev-syncromind/bookingfrontend/templates/base/search.xsl   
2016-01-13 10:28:53 UTC (rev 14637)
+++ branches/dev-syncromind/bookingfrontend/templates/base/search.xsl   
2016-01-13 11:49:27 UTC (rev 14638)
@@ -27,32 +27,9 @@
                                F.eks. "<i>Haukelandshallen</i>", "<i>Nordnes 
bydelshus</i>", "<i>idrett</i>" eller "<i>kor</i>".
                        </div>
                </form>
-               <div>
+               <div class="pure-g">
+               <div class="pure-u-1-3">
                        <div class="heading">
-                               <xsl:value-of select="php:function('lang', 
'part of town')" />
-                       </div>
-                       <ul id="part_of_town">
-                               <xsl:for-each select="part_of_towns">
-                                       <li>
-                                               <label>
-                                                       <input type="checkbox" 
name="part_of_town[]">
-                                                               <xsl:attribute 
name="value">
-                                                                       
<xsl:value-of select="id"/>
-                                                               </xsl:attribute>
-                                                               <xsl:if 
test="checked = 1">
-                                                                       
<xsl:attribute name="checked">
-                                                                               
<xsl:text>checked</xsl:text>
-                                                                       
</xsl:attribute>
-                                                               </xsl:if>
-                                                       </input>
-                                                       <xsl:value-of 
select="name"/>
-                                               </label>
-                                       </li>
-                               </xsl:for-each>
-                       </ul>
-               </div>
-               <div>
-                       <div class="heading">
                                <xsl:value-of select="php:function('lang', 
'type')" />
                        </div>
                        <ul id="search_type">
@@ -82,8 +59,35 @@
                                </li-->
                        </ul>
                </div>
+               <div class="pure-u-1-3">
+                       <div class="heading">
+                               <xsl:value-of select="php:function('lang', 
'part of town')" />
+                       </div>
+                       <ul id="part_of_town">
+                               <xsl:for-each select="part_of_towns">
+                                       <li>
+                                               <label>
+                                                       <input type="checkbox" 
name="part_of_town[]">
+                                                               <xsl:attribute 
name="value">
+                                                                       
<xsl:value-of select="id"/>
+                                                               </xsl:attribute>
+                                                               <xsl:if 
test="checked = 1">
+                                                                       
<xsl:attribute name="checked">
+                                                                               
<xsl:text>checked</xsl:text>
+                                                                       
</xsl:attribute>
+                                                               </xsl:if>
+                                                       </input>
+                                                       <xsl:value-of 
select="name"/>
+                                               </label>
+                                       </li>
+                               </xsl:for-each>
+                       </ul>
+               </div>
 
-               <div id="activity_tree">
+               <div class="pure-u-1-3" id="activity_tree">
+                       <div class="heading">
+                               <xsl:value-of select="php:function('lang', 
'tema')" />
+                       </div>
                        <fieldset>
                                <!-- Some style for the expand/contract 
section-->
                                <style>
@@ -107,6 +111,7 @@
                                <div id="treeDiv1"></div>
                        </fieldset>
                </div>
+               </div>
 
                <div id="no_result">
                        <xsl:if test="not(search)">