fmsystem-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Fmsystem-commits] [17395] updated templates under aalesund.


From: roger . kolseth
Subject: [Fmsystem-commits] [17395] updated templates under aalesund.
Date: Tue, 5 Dec 2017 06:32:50 -0500 (EST)

Revision: 17395
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17395
Author:   rogkol
Date:     2017-12-05 06:32:50 -0500 (Tue, 05 Dec 2017)
Log Message:
-----------
updated templates under aalesund. also added bootstrap and ion icons css

Modified Paths:
--------------
    trunk/bookingfrontend/templates/aalesund/building.xsl
    trunk/bookingfrontend/templates/aalesund/search.xsl
    trunk/bookingfrontend/templates/aalesund/search_details.xsl

Modified: trunk/bookingfrontend/templates/aalesund/building.xsl
===================================================================
--- trunk/bookingfrontend/templates/aalesund/building.xsl       2017-12-04 
15:22:53 UTC (rev 17394)
+++ trunk/bookingfrontend/templates/aalesund/building.xsl       2017-12-05 
11:32:50 UTC (rev 17395)
@@ -1,151 +1,162 @@
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-       <xsl:call-template name="jquery_phpgw_i18n"/>
+    <xsl:call-template name="jquery_phpgw_i18n"/>
        
-       <div class="content">
-               <ul class="pathway">
-                       <li>
-                               <a>
-                                       <xsl:attribute name="href">
-                                               <xsl:value-of 
select="php:function('get_phpgw_link', '/bookingfrontend/index.php', 
'menuaction:bookingfrontend.uisearch.index')"/>
-                                       </xsl:attribute>
-                                       <xsl:value-of 
select="php:function('lang', 'Home')" />
-                               </a>
-                       </li>
-                       <li>
-                               <a href="{resource/building_link}">
-                                       <xsl:value-of select="building/name"/>
-                               </a>
-                       </li>
-               </ul>
+    <div class="container">
+              
+         
+        <ul class="pathway">
+            <li>
+                <a>
+                    <xsl:attribute name="href">
+                        <xsl:value-of select="php:function('get_phpgw_link', 
'/bookingfrontend/index.php', 'menuaction:bookingfrontend.uisearch.index')"/>
+                    </xsl:attribute>
+                    <xsl:value-of select="php:function('lang', 'Home')" />
+                </a>
+            </li>
+            <li>
+                <a href="{resource/building_link}">
+                    <xsl:value-of select="building/name"/>
+                </a>
+            </li>
+        </ul>
+         
+        
+        <xsl:for-each select="building">       
+           
+            <xsl:if test="deactivate_calendar=0">
+                <div>
+                    <button class="btn btn-default btn-md" 
onclick="window.location.href='{schedule_link}'">
+                        <xsl:value-of select="php:function('lang', 'Building 
schedule')" />
+                    </button>
+                    - Søk ledig tid/informasjon om hva som skjer
+                </div>
+            </xsl:if>
+                    
 
-               <xsl:for-each select="building">        
-                       <xsl:if test="deactivate_calendar=0">
-                               <div>
-                                       <button class="resource-button" 
onclick="window.location.href='{schedule_link}'">
-                                               <xsl:value-of 
select="php:function('lang', 'Building schedule')" />
-                                       </button>
-                                       - Søk ledig tid/informasjon om hva som 
skjer
-                               </div>
-                       </xsl:if>
-                       <div class="pure-g">
-                               <div class="pure-u-1 pure-u-md-1-2">
-                                       <dl class="proplist-col main">
-                                               <xsl:if 
test="normalize-space(description)">
-                                                       <dl class="proplist 
description">
-                                                               <dt>
-                                                                       <h2>
-                                                                               
<xsl:value-of select="php:function('lang', 'Description')" />
-                                                                       </h2>
-                                                               </dt>
+            <div class="row details-wrapper">    
+                    
+                <div class="col-lg-7">
+                    <dl>
+                        <xsl:if test="normalize-space(description)">
+                            <dl>
+                                <dt>
+                                    <h2>
+                                        <xsl:value-of 
select="php:function('lang', 'Description')" />
+                                    </h2>
+                                </dt>
                                                                 
-                                                               <dd>
-                                                                       
<xsl:value-of select="description" disable-output-escaping="yes"/>
-                                                               </dd>
-                                                       </dl>
-                                               </xsl:if>
+                                <dd>
+                                    <xsl:value-of select="description" 
disable-output-escaping="yes"/>
+                                </dd>
+                            </dl>
+                        </xsl:if>
                                
-                                               <xsl:if 
test="normalize-space(homepage) or normalize-space(email) or 
normalize-space(phone) or normalize-space(street)">
-                                                       <h3>
-                                                               <xsl:value-of 
select="php:function('lang', 'Contact information')" />
-                                                       </h3>
-                                                       <xsl:if 
test="deactivate_sendmessage=0">
-                                                               <div>
-                                                                       <button 
class="resource-button" onclick="window.location.href='{message_link}'">
-                                                                               
<xsl:value-of select="php:function('lang', 'Send message')" />
-                                                                       
</button>
-                                                                       - 
Meldig til saksbehandler for bygg
-                                                               </div>
-                                                       </xsl:if>
+                        <xsl:if test="normalize-space(homepage) or 
normalize-space(email) or normalize-space(phone) or normalize-space(street)">
+                            <h3>
+                                <xsl:value-of select="php:function('lang', 
'Contact information')" />
+                            </h3>
+                            <xsl:if test="deactivate_sendmessage=0">
+                                <div>
+                                    <button class="resource-button" 
onclick="window.location.href='{message_link}'">
+                                        <xsl:value-of 
select="php:function('lang', 'Send message')" />
+                                    </button>
+                                    - Meldig til saksbehandler for bygg
+                                </div>
+                            </xsl:if>
 
-                                                       <dl class="contactinfo">
-                                                               <xsl:if 
test="homepage and normalize-space(homepage)">
-                                                                       <dt>
-                                                                               
<xsl:value-of select="php:function('lang', 'Homepage')" />
-                                                                       </dt>
-                                                                       <dd>
-                                                                               
<a href="{homepage}">
-                                                                               
        <xsl:value-of select="homepage"/>
-                                                                               
</a>
-                                                                       </dd>
-                                                               </xsl:if>
+                            <dl class="contactinfo">
+                                <xsl:if test="homepage and 
normalize-space(homepage)">
+                                    <dt>
+                                        <xsl:value-of 
select="php:function('lang', 'Homepage')" />
+                                    </dt>
+                                    <dd>
+                                        <a href="{homepage}">
+                                            <xsl:value-of select="homepage"/>
+                                        </a>
+                                    </dd>
+                                </xsl:if>
                                        
-                                                               <xsl:if 
test="email and normalize-space(email)">
-                                                                       <dt>
-                                                                               
<xsl:value-of select="php:function('lang', 'Email')" />
-                                                                       </dt>
-                                                                       <dd>
-                                                                               
<a href='mailto:{email}'>
-                                                                               
        <xsl:value-of select="email"/>
-                                                                               
</a>
-                                                                       </dd>
-                                                               </xsl:if>
+                                <xsl:if test="email and 
normalize-space(email)">
+                                    <dt>
+                                        <xsl:value-of 
select="php:function('lang', 'Email')" />
+                                    </dt>
+                                    <dd>
+                                        <a href='mailto:{email}'>
+                                            <xsl:value-of select="email"/>
+                                        </a>
+                                    </dd>
+                                </xsl:if>
                                        
-                                                               <xsl:if 
test="phone and normalize-space(phone)">
-                                                                       <dt>
-                                                                               
<xsl:value-of select="php:function('lang', 'Telephone')" />
-                                                                       </dt>
-                                                                       <dd>
-                                                                               
<xsl:value-of select="phone"/>
-                                                                       </dd>
-                                                               </xsl:if>
+                                <xsl:if test="phone and 
normalize-space(phone)">
+                                    <dt>
+                                        <xsl:value-of 
select="php:function('lang', 'Telephone')" />
+                                    </dt>
+                                    <dd>
+                                        <xsl:value-of select="phone"/>
+                                    </dd>
+                                </xsl:if>
                                        
-                                                               <xsl:if 
test="street and normalize-space(street)">
-                                                                       <dt>
-                                                                               
<xsl:value-of select="php:function('lang', 'Address')" />
-                                                                       </dt>
-                                                                       <dd>
-                                                                               
<xsl:value-of select="street"/>
-                                                                               
<br/>
-                                                                               
<xsl:value-of select="zip_code"/>
-                                                                               
<span>&nbsp; </span>
-                                                                               
<xsl:value-of select="city"/>
-                                                                               
<br/>
-                                                                               
<xsl:value-of select="district"/>
-                                                                       </dd>
-                                                               </xsl:if>
-                                                       </dl>
-                                               </xsl:if>
+                                <xsl:if test="street and 
normalize-space(street)">
+                                    <dt>
+                                        <xsl:value-of 
select="php:function('lang', 'Address')" />
+                                    </dt>
+                                    <dd>
+                                        <xsl:value-of select="street"/>
+                                        <br/>
+                                        <xsl:value-of select="zip_code"/>
+                                        <span>&nbsp; </span>
+                                        <xsl:value-of select="city"/>
+                                        <br/>
+                                        <xsl:value-of select="district"/>
+                                    </dd>
+                                </xsl:if>
+                            </dl>
+                        </xsl:if>
                                
-                                               <h3>
-                                                       <xsl:value-of 
select="php:function('lang', 'Bookable resources')" />
-                                               </h3>
-                                               <div id="resources_container"/>
+                        <h3>
+                            <xsl:value-of select="php:function('lang', 
'Bookable resources')" />
+                        </h3>
+                        <div id="resources_container"/>
 
-                                               <h3>
-                                                       <xsl:value-of 
select="php:function('lang', 'Building users')" />
-                                               </h3>
-                                               <div 
id="building_users_container"/>
+                        <h3>
+                            <xsl:value-of select="php:function('lang', 
'Building users')" />
+                        </h3>
+                        <div id="building_users_container"/>
 
-                                               <h3>
-                                                       <xsl:value-of 
select="php:function('lang', 'Documents')" />
-                                               </h3>
-                                               <div id="documents_container"/>
-                                       </dl>
-                               </div>
-                               <div class="pure-u-1 pure-u-lg-1-2 img-desc">
-                                       <dl class="proplist-col images">
-                                               <div id="images_container">
+                        <h3>
+                            <xsl:value-of select="php:function('lang', 
'Documents')" />
+                        </h3>
+                        <div id="documents_container"/>
+                    </dl>
+                    
+                </div>    
+                    
+                <div class="col-lg-5">
+                                    <dl class="images">
+                    <div id="images_container">
                                                     
                                                     
-                                               </div>
-                                       </dl>
-                                       <dl class="proplist-col images map">
-                                               <!--div 
id="images_container"></div-->
-                                               <xsl:if test="street and 
normalize-space(street)">
-                                                       <div 
class="gmap-container">
-                                                               <iframe 
width="500" height="300" frameborder="0" scrolling="no" marginheight="0" 
marginwidth="0" id="googlemapiframe" src=""></iframe>
-                                                       </div>
-                                                       <small>
-                                                               <a href="" 
id="googlemaplink" style="color:#0000FF;text-align:left" target="_new">Vis 
større kart</a>
-                                                       </small>
-                                               </xsl:if>
-                                       </dl>
-                               </div>
-                       </div>
-                       <script type="text/javascript">
-                               var building_id = <xsl:value-of select="id"/>;
-                               var lang = <xsl:value-of 
select="php:function('js_lang', 'Name', 'Category', 'Activity', 'Resource 
Type')"/>;
-                               var address = '<xsl:value-of select="street"/>, 
<xsl:value-of select="zip_code"/>, <xsl:value-of select="city"/>';
+                    </div>
+                </dl>
+                <dl class="images map">
+                    <!--div id="images_container"></div-->
+                    <xsl:if test="street and normalize-space(street)">
+                        <div class="gmap-container">
+                            <iframe width="500" height="300" frameborder="0" 
scrolling="no" marginheight="0" marginwidth="0" id="googlemapiframe" 
src=""></iframe>
+                        </div>
+                        <small>
+                            <a href="" id="googlemaplink" 
style="color:#0000FF;text-align:left" target="_new">Vis større kart</a>
+                        </small>
+                    </xsl:if>
+                </dl>
+
+                </div>
+            </div>   
+                    
+                    <script type="text/javascript">
+                var building_id = <xsl:value-of select="id"/>;
+                var lang = <xsl:value-of select="php:function('js_lang', 
'Name', 'Category', 'Activity', 'Resource Type')"/>;
+                var address = '<xsl:value-of select="street"/>, <xsl:value-of 
select="zip_code"/>, <xsl:value-of select="city"/>';
                                <![CDATA[
                 var resourcesURL = phpGWLink('bookingfrontend/index.php', 
{menuaction:'bookingfrontend.uiresource.index_json',sort:'name', 
filter_building_id:building_id}, true);
                 var documentURL = phpGWLink('bookingfrontend/index.php', 
{menuaction:'bookingfrontend.uidocument_building.index', sort:'name', 
no_images:1, filter_owner_id:building_id}, true);
@@ -155,33 +166,35 @@
                                var linkurl = 
'https://maps.google.com/maps?f=q&source=s_q&hl=no&geocode=&q=' + address;
                 ]]>
 
-                               var rResources = 'results';
-                               var rBuilding_users = [{n: 'ResultSet'},{n: 
'Result'}];
+                var rResources = 'results';
+                var rBuilding_users = [{n: 'ResultSet'},{n: 'Result'}];
 
-                               var colDefsResources = [{key: 'name', label: 
lang['Name'], formatter: genericLink}, {key: 'type', label: lang['Resource 
Type']}, {key: 'activity_name', label: lang['Activity']}];
-                               var colDefsDocument = [{key: 'description', 
label: lang['Name'], formatter: genericLink}];
-                               var colDefsBuilding_users = [{key: 'name', 
label: lang['Name'], formatter: genericLink}, {key: 'activity_name', label: 
lang['Activity']}];
+                var colDefsResources = [{key: 'name', label: lang['Name'], 
formatter: genericLink}, {key: 'type', label: lang['Resource Type']}, {key: 
'activity_name', label: lang['Activity']}];
+                var colDefsDocument = [{key: 'description', label: 
lang['Name'], formatter: genericLink}];
+                var colDefsBuilding_users = [{key: 'name', label: 
lang['Name'], formatter: genericLink}, {key: 'activity_name', label: 
lang['Activity']}];
 
-                               var paginatorTableBuilding_users = new Array();
-                               paginatorTableBuilding_users.limit = 10;
-                               
createPaginatorTable('building_users_container', paginatorTableBuilding_users);
+                var paginatorTableBuilding_users = new Array();
+                paginatorTableBuilding_users.limit = 10;
+                createPaginatorTable('building_users_container', 
paginatorTableBuilding_users);
 
-                               createTable('resources_container', 
resourcesURL, colDefsResources, rResources);
-                               createTable('documents_container', documentURL, 
colDefsDocument);
-                               createTable('building_users_container', 
building_usersURL, colDefsBuilding_users, rBuilding_users, '', 
paginatorTableBuilding_users);
+                createTable('resources_container', resourcesURL, 
colDefsResources, rResources);
+                createTable('documents_container', documentURL, 
colDefsDocument);
+                createTable('building_users_container', building_usersURL, 
colDefsBuilding_users, rBuilding_users, '', paginatorTableBuilding_users);
 
-                               $(window).on('load', function(){
-                               // Load image
-                               
JqueryPortico.booking.inlineImages('images_container', document_buildingURL);
+                $(window).on('load', function(){
+                // Load image
+                JqueryPortico.booking.inlineImages('images_container', 
document_buildingURL);
 
-                               // Load Google map
-                               if( iurl.length > 0 ) {
-                               $("#googlemapiframe").attr("src", iurl);
-                               $("#googlemaplink").attr("href", linkurl);
-                               }
-                               });
+                // Load Google map
+                if( iurl.length > 0 ) {
+                $("#googlemapiframe").attr("src", iurl);
+                $("#googlemaplink").attr("href", linkurl);
+                }
+                });
                                
-                       </script>
-               </xsl:for-each>
-       </div>
+            </script>
+        </xsl:for-each>
+         
+            
+    </div>
 </xsl:template>

Modified: trunk/bookingfrontend/templates/aalesund/search.xsl
===================================================================
--- trunk/bookingfrontend/templates/aalesund/search.xsl 2017-12-04 15:22:53 UTC 
(rev 17394)
+++ trunk/bookingfrontend/templates/aalesund/search.xsl 2017-12-05 11:32:50 UTC 
(rev 17395)
@@ -1,195 +1,204 @@
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-       <script type="text/javascript">
-               //              var selected_part_of_towns = "<xsl:value-of 
select="selected_part_of_towns"/>";
-       </script>
-       <div id="loading">
-               <xsl:attribute name="title">
-                       <xsl:value-of select="php:function('lang', 'fetching 
data')" />
-               </xsl:attribute>
-               <p>
-                       <xsl:value-of select="php:function('lang', 'please 
wait')" />
-               </p>
-       </div>
+    <script type="text/javascript">
+        //             var selected_part_of_towns = "<xsl:value-of 
select="selected_part_of_towns"/>";
+    </script>
 
-       <div class="content">
-               <a href="#" class="scrollup">
-                       <xsl:value-of select="php:function('lang', 'scroll to 
top')" />
-               </a>
 
-               <form method="GET" id="search">
-                       <input type="hidden" id="menuaction" name="menuaction" 
value="bookingfrontend.uisearch.index" />
-                       <!--input type="hidden" id="activity_top_level" 
name="activity_top_level" value="{activity_top_level}" /-->
-               </form>
-               <div class="pure-g">
-                       <div class="pure-u-1 pure-u-lg-1-2 search-line 
search-left-field">
+    <a href="#" class="scrollup">
+        <xsl:value-of select="php:function('lang', 'scroll to top')" />
+    </a>
+    
+    <div class="container-fluid">
 
-                               <div class="pure-u-1">
-                                       <div class="heading">
-                                               <!--<xsl:value-of 
select="php:function('lang', 'building')" /> /-->
-                                               <b>Finn lokale</b>
-                                       </div>
-                                       <div id="building_container" 
class="search-building">
-                                               <input id="field_building_id" 
name="building_id" type="hidden">
-                                                       <xsl:attribute 
name="value">
-                                                               <xsl:value-of 
select="building_id"/>
-                                                       </xsl:attribute>
-                                               </input>
-                                               <input id="field_building_name" 
name="building_name" type="text">
-                                                       <xsl:attribute 
name="value">
-                                                               <xsl:value-of 
select="building_name"/>
-                                                       </xsl:attribute>
-                                                       <xsl:attribute 
name="placeholder">
-                                                               <xsl:text> Søk 
etter lokale/bygning/anlegg</xsl:text>
-                                                       </xsl:attribute>
+        <section class="bg-light text-center">
+            <div class="container-fluid">
+                <p class="lead">Søk etter anlegg eller ressurs som du ønsker å 
reservere</p>
+                <p>Bruk søkefeltene under, eller trykk avansert søk for 
filtrering</p>
+            </div>
+        </section>
+        <!-- Insert margins here instead of <br>-->
+        <br/>
+        <br/>
+    </div>
+    
 
-                                               </input>
-                                               <input id="submit_building" 
type="button"/>
-                                               <xsl:text> </xsl:text>
+    <div class="container">
+        <form method="GET" id="search">
+            <input type="hidden" id="menuaction" name="menuaction" 
value="bookingfrontend.uisearch.index" />
+        </form>
+      
+             
+        <div id="building_container" class="search-container main-search">
+            <div class="form-group">
+                <input id="field_building_name" name="building_name" 
class="form-control form-control-lg text-center" type="text">
+                    <xsl:attribute name="value">
+                        <xsl:value-of select="building_name"/>
+                    </xsl:attribute>
+                    <xsl:attribute name="placeholder">
+                        <xsl:text> Søk etter lokale/bygning/anlegg</xsl:text>
+                    </xsl:attribute>
+                </input>
+                
+                <input id="field_building_id" name="building_id" 
class="form-control" type="hidden">
+                    <xsl:attribute name="value">
+                        <xsl:value-of select="building_id"/>
+                    </xsl:attribute>
+                </input>
+                    
+            </div>
+        </div>
+        
+    </div> 
 
-                                               <a id="reset" title="Reset" 
href="#">
-                                                       <xsl:value-of 
select="php:function('lang', 'reset')"/>
-                                               </a>
-                                       </div>
+  
+   
+    <div class="container text-center text-primary">  
+        <h5>Avansert søk</h5>
+        <div class="iconwrapper">
+        <button type="button" id="adv-search-toggler" class="btn btn-circle">
+            <i class="ion-chevron-down"/>
+        </button>
+        </div>
+    </div>                                 
+                
+          
+    <div class="container-fluid advance-search">
+        <div class="container">
+            <div class="search-container">
+                <div class="input-group">
+                
+                    <input id="field_searchterm"  class="form-control" 
name="searchterm" type="text">
+                        <xsl:attribute name="value">
+                            <xsl:value-of select="searchterm"/>
+                        </xsl:attribute>
+                        <xsl:attribute name="placeholder">
+                            <xsl:text> Søk i fritekst</xsl:text>
+                        </xsl:attribute>
+                    </input>
+                    <span class="input-group-btn">
+                        <button class="btn btn-default" type="submit">
+                            <i class="icon ion-search text-primary"/>
+                        </button>
+                    </span>
 
-                               </div>
-                               <div class="pure-u-1">
-
-                                       <div class="search-searchterm">
-                                               <input id="field_searchterm"  
name="searchterm" type="text">
-                                                       <xsl:attribute 
name="value">
-                                                               <xsl:value-of 
select="searchterm"/>
-                                                       </xsl:attribute>
-                                                       <xsl:attribute 
name="placeholder">
-                                                               <xsl:text> Søk 
i fritekst</xsl:text>
-                                                       </xsl:attribute>
-                                               </input>
-
-                                               <input id="submit_searchterm" 
type="button"/>
-                                       </div>
-                               </div>
-                               <div class="pure-u-1 select-box">
-                                       <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 
class="control control--checkbox">
-                                                                       <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"/>
-                                                                       <div 
class="control__indicator"></div>
-                                                               </label>
-                                                       </li>
-                                               </xsl:for-each>
-                                       </ul>
-                               </div>
-                               <div class="pure-u-1 select-box">
-                                       <div class="heading">
-                                               <!--xsl:value-of 
select="php:function('lang', 'Activity')" /-->
-                                               Velg hovedkategori/avdeling
-                                       </div>
-                                       <ul id="top_level">
-                                               <xsl:for-each 
select="top_levels">
-                                                       <li>
-                                                               <label 
class="control control--checkbox">
-                                                                       <input 
type="checkbox" name="top_levels[]">
-                                                                               
<xsl:attribute name="value">
-                                                                               
        <xsl:value-of select="id"/>
-                                                                               
</xsl:attribute>
-                                                                               
<xsl:attribute name="id">
-                                                                               
        <xsl:value-of select="location"/>
-                                                                               
</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"/>
-                                                                       <div 
class="control__indicator"></div>
-                                                               </label>
-                                                       </li>
-                                               </xsl:for-each>
-                                       </ul>
-                               </div>
-
-                               <!--div class="pure-u-1" id="activity_tree">
-                                       <div class="heading">
-                                               Velg type lokale/anlegg/utstyr.
-                                       </div>
-                                       <style>
-                                               #expandcontractdiv {border:1px 
dotted #dedede; margin:0 0 .5em 0; padding:0.4em;}
-                                               #treeDiv1 { background: #fff; 
padding:1em; margin-top:1em; }
-                                               .no_checkbox>i.jstree-checkbox{ 
display:none}
-                                       </style>
-                                       <script type="text/javascript">
-                                               filter_tree = <xsl:value-of 
select="filter_tree"/>;
-                                       </script>
-                                       <div id="treecontrol">
-                                               <a id="collapse1" 
title="Collapse the entire tree below" href="#">
-                                                       <xsl:value-of 
select="php:function('lang', 'collapse all')"/>
-                                               </a>
-                                               <xsl:text> | </xsl:text>
-                                               <a id="expand1" title="Expand 
the entire tree below" href="#">
-                                                       <xsl:value-of 
select="php:function('lang', 'expand all')"/>
-                                               </a>
-                                       </div>
-                                       <div id="treeDiv1"></div>
-                               </div-->
-
-                               <div class="pure-u-1 select-box">
-                                       <div class="heading">
-                                               <!--xsl:value-of 
select="php:function('lang', 'type')" /-->
-                                               Vis kun treff som er:
-                                       </div>
-                                       <ul id="search_type">
-                                               <li>
-                                                       <label class="control 
control--checkbox">
-                                                               <input 
type="checkbox" name="search_type[]" value="building"/>
-                                                               <xsl:value-of 
select="php:function('lang', 'building')" />
-                                                               <div 
class="control__indicator"></div>
-                                                       </label>
-                                               </li>
-                                               <li>
-                                                       <label class="control 
control--checkbox">
-                                                               <input 
type="checkbox" name="search_type[]" value="resource"/>
-                                                               <xsl:value-of 
select="php:function('lang', 'resource')" />
-                                                               <div 
class="control__indicator"></div>
-                                                       </label>
-                                               </li>
-                                               <li>
-                                                       <label class="control 
control--checkbox">
-                                                               <input 
type="checkbox" name="search_type[]" value="organization"/>
-                                                               <xsl:value-of 
select="php:function('lang', 'organization')" />
-                                                               <div 
class="control__indicator"></div>
-                                                       </label>
-                                               </li>
-                                               <li>
-                                                       <label class="control 
control--checkbox">
-                                                               <input 
type="checkbox" name="search_type[]" value="event"/>
-                                                               <xsl:value-of 
select="php:function('lang', 'event')" />
-                                                               <div 
class="control__indicator"></div>
-                                                       </label>
-                                               </li>
-                                       </ul>
-                               </div>
-
-                       </div>
-                       <div class="pure-u-1 pure-u-lg-1-2 search-right-field">
-                               <div id = "total_records_top"></div>
-                               <div id="result"></div>
-                       </div>
-
-               </div>
-
-       </div>
+  
+                </div>
+            </div>
+            <div class="row">
+                <div class="col-lg-4">
+                    <div class="pure-u-1 select-box">
+                        <p class="lead">
+                            <xsl:value-of select="php:function('lang', 'part 
of town')" />
+                        </p>
+                        <ul id="part_of_town">
+                            <xsl:for-each select="part_of_towns">
+                                <li>
+                                    <label class="control control--checkbox">
+                                        <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"/>
+                                        <div class="control__indicator"></div>
+                                    </label>
+                                </li>
+                            </xsl:for-each>
+                        </ul>
+                    </div>
+                </div>    
+            
+                <div class="col-lg-4">
+                    <div class="pure-u-1 select-box">
+                        <p class="lead">
+                            <!--xsl:value-of select="php:function('lang', 
'Activity')" /-->
+                            Velg hovedkategori/avdeling
+                        </p>
+                        <ul id="top_level">
+                            <xsl:for-each select="top_levels">
+                                <li>
+                                    <label class="control control--checkbox">
+                                        <input type="checkbox" 
name="top_levels[]">
+                                            <xsl:attribute name="value">
+                                                <xsl:value-of select="id"/>
+                                            </xsl:attribute>
+                                            <xsl:attribute name="id">
+                                                <xsl:value-of 
select="location"/>
+                                            </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"/>
+                                        <div class="control__indicator"></div>
+                                    </label>
+                                </li>
+                            </xsl:for-each>
+                        </ul>
+                    </div>
+                
+                </div>  
+            
+                <div class="col-lg-4">
+                    <div class="pure-u-1 select-box">
+                        <p class="lead">
+                            <!--xsl:value-of select="php:function('lang', 
'type')" /-->
+                            Vis kun treff som er:
+                        </p>
+                        <ul id="search_type">
+                            <li>
+                                <label class="control control--checkbox">
+                                    <input type="checkbox" 
name="search_type[]" value="building"/>
+                                    <xsl:value-of select="php:function('lang', 
'building')" />
+                                    <div class="control__indicator"></div>
+                                </label>
+                            </li>
+                            <li>
+                                <label class="control control--checkbox">
+                                    <input type="checkbox" 
name="search_type[]" value="resource"/>
+                                    <xsl:value-of select="php:function('lang', 
'resource')" />
+                                    <div class="control__indicator"></div>
+                                </label>
+                            </li>
+                            <li>
+                                <label class="control control--checkbox">
+                                    <input type="checkbox" 
name="search_type[]" value="organization"/>
+                                    <xsl:value-of select="php:function('lang', 
'organization')" />
+                                    <div class="control__indicator"></div>
+                                </label>
+                            </li>
+                            <li>
+                                <label class="control control--checkbox">
+                                    <input type="checkbox" 
name="search_type[]" value="event"/>
+                                    <xsl:value-of select="php:function('lang', 
'event')" />
+                                    <div class="control__indicator"></div>
+                                </label>
+                            </li>
+                        </ul>
+                    </div>
+                </div>  
+            </div>   
+        </div> 
+    </div>                      
+                
+                                                  
+    <!-- GAMMEL KODE  -->                                                      
         
+                                                                               
      
+                                                                               
     
+    <div class="container-fluid result">                                       
                                                                  
+                                                                               
                                          
+        <div class="container">                                                
                                                                                
             
+            
+           <!--  <div id = "total_records_top"></div> -->
+            <div id="result"></div>
+        </div>
+    </div>
+       
 </xsl:template>

Modified: trunk/bookingfrontend/templates/aalesund/search_details.xsl
===================================================================
--- trunk/bookingfrontend/templates/aalesund/search_details.xsl 2017-12-04 
15:22:53 UTC (rev 17394)
+++ trunk/bookingfrontend/templates/aalesund/search_details.xsl 2017-12-05 
11:32:50 UTC (rev 17395)
@@ -1,111 +1,177 @@
 <xsl:template name="strip-tags" xmlns:php="http://php.net/xsl";>
-       <xsl:param name="text"/>
-       <xsl:choose>
-               <xsl:when test="contains($text, '&lt;')">
-                       <xsl:value-of select="substring-before($text, '&lt;')"/>
-                       <xsl:call-template name="strip-tags">
-                               <xsl:with-param name="text" select="concat(' ', 
substring-after($text, '&gt;'))"/>
-                       </xsl:call-template>
-               </xsl:when>
-               <xsl:otherwise>
-                       <xsl:value-of select="$text"/>
-               </xsl:otherwise>
-       </xsl:choose>
+    <xsl:param name="text"/>
+    <xsl:choose>
+        <xsl:when test="contains($text, '&lt;')">
+            <xsl:value-of select="substring-before($text, '&lt;')"/>
+            <xsl:call-template name="strip-tags">
+                <xsl:with-param name="text" select="concat(' ', 
substring-after($text, '&gt;'))"/>
+            </xsl:call-template>
+        </xsl:when>
+        <xsl:otherwise>
+            <xsl:value-of select="$text"/>
+        </xsl:otherwise>
+    </xsl:choose>
 </xsl:template>
 
 <xsl:template match="data" xmlns:php="http://php.net/xsl";>
-       <xsl:choose>
-               <xsl:when test="results/total_records_sum &gt; 0">
-                       <div id = "total_records" style="display: none;">
-                               <h5>
-                                       <u>
-                                               <strong>
-                                                       <xsl:value-of 
select="php:function('lang', 'Found %1 results', results/total_records_sum)" />
-                                               </strong>
-                                       </u>
-                               </h5>
-                       </div>
-                       <br />
-                       <br />
-                       <ol id="result">
-                               <xsl:for-each select="results/results">
-                                       <li>
-                                               <div class="header">
-                                                       <b>
-                                                               <a 
class="bui_single_view_link">
-                                                                       
<xsl:attribute name="href">
-                                                                               
<xsl:value-of select="link"/>
-                                                                       
</xsl:attribute>
-                                                                       
<xsl:value-of select="name"/>
-                                                               </a>
-                                                               (<xsl:value-of 
select="php:function('lang', string(type))"/>)</b>
-                                               </div>
-                                               <div class="details">
-                                                       <div>
-                                                               <dl>
+    <xsl:choose>
+        <xsl:when test="results/total_records_sum &gt; 0">
+            <div id = "total_records" style="display: none;">
+                <h5>
+                    <u>
+                        <strong>
+                            <xsl:value-of select="php:function('lang', 'Found 
%1 results', results/total_records_sum)" />
+                        </strong>
+                    </u>
+                </h5>
+            </div>
+            <br />
+            <br />
+            <ol id="result">
+                <div class="row">
+                    <xsl:for-each select="results/results">
+                        <div class="col-lg-4 col-md-6 col-sm-12">
+                            <div class="card bg-light">
+                                    <div id="{img_container}"/>
+                                                <script type="text/javascript">
+                                                    $(document).ready(function 
() {
+                                                    
JqueryPortico.booking.inlineImages('<xsl:value-of select="img_container"/>', 
'<xsl:value-of select="img_url"/>');
+                                                    });
+                                                </script>         
+                                            
+                                
+                                
+                                <div class="card-body">
+                                    
+                                    <h5 class="card-title">
+                                        <a class="bui_single_view_link">
+                                            <xsl:attribute name="href">
+                                                <xsl:value-of select="link"/>
+                                            </xsl:attribute>
+                                            <xsl:value-of select="name"/>
+                                        </a> (<xsl:value-of 
select="php:function('lang', string(type))"/>) </h5>
+                                    <p class="card-text">
+                                        <xsl:variable 
name="tag_stripped_description">
+                                            <xsl:call-template 
name="strip-tags">
+                                                <xsl:with-param name="text" 
select="description"/>
+                                            </xsl:call-template>
+                                        </xsl:variable>
+                                        <xsl:choose>
+                                            <xsl:when 
test="string-length($tag_stripped_description) &gt; 1">
+                                                <xsl:choose>
+                                                    <xsl:when 
test="string-length($tag_stripped_description) &gt; 100">
+                                                        <xsl:value-of 
select="substring($tag_stripped_description, 0, 97)"/>...
+                                                    </xsl:when>
+                                                    <xsl:otherwise>
+                                                        <xsl:value-of 
select="$tag_stripped_description"/>
+                                                    </xsl:otherwise>
+                                                </xsl:choose>
+                                            </xsl:when>
+                                            <xsl:otherwise>
+                                                <xsl:value-of 
select="php:function('lang', 'No description yet')" />
+                                            </xsl:otherwise>
+                                        </xsl:choose>
+                                    </p> 
+                                    <xsl:if test="string-length(homepage) &gt; 
1">
+                                                    <p class="lead">
+                                                        <xsl:value-of 
select="php:function('lang', 'Homepage')" />
+                                                    </p>
+                                      
+                                                    <a class="card-link">
+                                                        <xsl:attribute 
name="href">
+                                                            <xsl:value-of 
select="homepage"/>
+                                                        </xsl:attribute>
+                                                        <xsl:value-of 
select="homepage"/>
+                                                    </a>
+                                           
+                                            </xsl:if>   
+                                </div>    
+                                            
+                                            
+                                            
+                                            
+                                            
+                                 <!--           
+                                
+                                <div class="header">
+                                    <b>
+                                        <a class="bui_single_view_link">
+                                            <xsl:attribute name="href">
+                                                <xsl:value-of select="link"/>
+                                            </xsl:attribute>
+                                            <xsl:value-of select="name"/>
+                                        </a>
+                                        (<xsl:value-of 
select="php:function('lang', string(type))"/>)</b>
+                                </div>
+                                <div class="details">
+                                    <div>
+                                        <dl>
                                                                        
-                                                                       <dd 
class="description">
-                                                                               
<xsl:variable name="tag_stripped_description">
-                                                                               
        <xsl:call-template name="strip-tags">
-                                                                               
                <xsl:with-param name="text" select="description"/>
-                                                                               
        </xsl:call-template>
-                                                                               
</xsl:variable>
-                                                                               
<xsl:choose>
-                                                                               
        <xsl:when test="string-length($tag_stripped_description) &gt; 1">
-                                                                               
                <xsl:choose>
-                                                                               
                        <xsl:when 
test="string-length($tag_stripped_description) &gt; 100">
-                                                                               
                                <xsl:value-of 
select="substring($tag_stripped_description, 0, 97)"/>...
-                                                                               
                        </xsl:when>
-                                                                               
                        <xsl:otherwise>
-                                                                               
                                <xsl:value-of 
select="$tag_stripped_description"/>
-                                                                               
                        </xsl:otherwise>
-                                                                               
                </xsl:choose>
-                                                                               
        </xsl:when>
-                                                                               
        <xsl:otherwise>
-                                                                               
                <xsl:value-of select="php:function('lang', 'No description 
yet')" />
-                                                                               
        </xsl:otherwise>
-                                                                               
</xsl:choose>
-                                                                               
<div id="{img_container}"/>
-                                                                               
<script type="text/javascript">
-                                                                               
        $(document).ready(function () {
-                                                                               
        JqueryPortico.booking.inlineImages('<xsl:value-of 
select="img_container"/>', '<xsl:value-of select="img_url"/>');
-                                                                               
        });
-                                                                               
</script>
-                                                                       </dd>
-                                                                       <xsl:if 
test="string-length(homepage) &gt; 1">
-                                                                               
<dt>
-                                                                               
        <h4>
-                                                                               
                <xsl:value-of select="php:function('lang', 'Homepage')" />
-                                                                               
        </h4>
-                                                                               
</dt>
-                                                                               
<dd class="description">
-                                                                               
        <a>
-                                                                               
                <xsl:attribute name="href">
-                                                                               
                        <xsl:value-of select="homepage"/>
-                                                                               
                </xsl:attribute>
-                                                                               
                <xsl:value-of select="homepage"/>
-                                                                               
        </a>
-                                                                               
</dd>
-                                                                       
</xsl:if>
-                                                               </dl>
-                                                       </div>
-                                                       <div class="clr"></div>
-                                               </div>
-                                       </li>
-                               </xsl:for-each>
-                       </ol>
-               </xsl:when>
-               <xsl:otherwise>
-                       <div id = "total_records" style="display: none;">
-                               <h5>
-                                       <u>
-                                               <strong>
-                                                       <xsl:value-of 
select="php:function('lang', 'Found %1 results', 0)" />
-                                               </strong>
-                                       </u>
-                               </h5>
-                       </div>
+                                            <dd class="description">
+                                                <xsl:variable 
name="tag_stripped_description">
+                                                    <xsl:call-template 
name="strip-tags">
+                                                        <xsl:with-param 
name="text" select="description"/>
+                                                    </xsl:call-template>
+                                                </xsl:variable>
+                                                <xsl:choose>
+                                                    <xsl:when 
test="string-length($tag_stripped_description) &gt; 1">
+                                                        <xsl:choose>
+                                                            <xsl:when 
test="string-length($tag_stripped_description) &gt; 100">
+                                                                <xsl:value-of 
select="substring($tag_stripped_description, 0, 97)"/>...
+                                                            </xsl:when>
+                                                            <xsl:otherwise>
+                                                                <xsl:value-of 
select="$tag_stripped_description"/>
+                                                            </xsl:otherwise>
+                                                        </xsl:choose>
+                                                    </xsl:when>
+                                                    <xsl:otherwise>
+                                                        <xsl:value-of 
select="php:function('lang', 'No description yet')" />
+                                                    </xsl:otherwise>
+                                                </xsl:choose>
+                                                <div id="{img_container}"/>
+                                                <script type="text/javascript">
+                                                    $(document).ready(function 
() {
+                                                    
JqueryPortico.booking.inlineImages('<xsl:value-of select="img_container"/>', 
'<xsl:value-of select="img_url"/>');
+                                                    });
+                                                </script> 
+                                            </dd>
+                                            <xsl:if 
test="string-length(homepage) &gt; 1">
+                                                <dt>
+                                                    <h4>
+                                                        <xsl:value-of 
select="php:function('lang', 'Homepage')" />
+                                                    </h4>
+                                                </dt>
+                                                <dd class="description">
+                                                    <a>
+                                                        <xsl:attribute 
name="href">
+                                                            <xsl:value-of 
select="homepage"/>
+                                                        </xsl:attribute>
+                                                        <xsl:value-of 
select="homepage"/>
+                                                    </a>
+                                                </dd>
+                                            </xsl:if>
+                                        </dl>
+                                    </div>
+                                    <div class="clr"></div>                    
       
+                                </div>
+                                -->
+                            </div>
+                        </div>   
+                    </xsl:for-each>
+                </div>
+            </ol>
+        </xsl:when>
+        <xsl:otherwise>
+            <div id = "total_records" style="display: none;">
+                <h5>
+                    <u>
+                        <strong>
+                            <xsl:value-of select="php:function('lang', 'Found 
%1 results', 0)" />
+                        </strong>
+                    </u>
+                </h5>
+            </div>
 
-               </xsl:otherwise>
-       </xsl:choose>
+        </xsl:otherwise>
+    </xsl:choose>
 </xsl:template>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]