[Fmsystem-commits] [9922] Nye framsidebilder til stavanger

[Alexander Stevenson]

Revision: 9922
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9922
Author:   andvare
Date:     2012-08-28 08:27:59 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
Nye framsidebilder til stavanger

Modified Paths:
--------------
    branches/stavangerkommune/bookingfrontend/inc/class.uisearch.inc.php
    branches/stavangerkommune/bookingfrontend/templates/stavanger/search.xsl

Modified: branches/stavangerkommune/bookingfrontend/inc/class.uisearch.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.uisearch.inc.php        
2012-08-28 08:20:28 UTC (rev 9921)
+++ branches/stavangerkommune/bookingfrontend/inc/class.uisearch.inc.php        
2012-08-28 08:27:59 UTC (rev 9922)
@@ -31,7 +31,7 @@
                                );
                        }
                        
-                       $params = is_null($search) ? array('frontimage' => 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/bkbooking/images/newlayout/forsidebilde.jpg")
 : array('search' => $search);
+                       $params = is_null($search) ? array('baseurl' => 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}", 'frontimage' => 
"{$GLOBALS['phpgw_info']['server']['webserver_url']}/phpgwapi/templates/bkbooking/images/newlayout/forsidebilde.jpg")
 : array('search' => $search);
 
                        self::render_template('search', $params);
                }

Modified: 
branches/stavangerkommune/bookingfrontend/templates/stavanger/search.xsl
===================================================================
--- branches/stavangerkommune/bookingfrontend/templates/stavanger/search.xsl    
2012-08-28 08:20:28 UTC (rev 9921)
+++ branches/stavangerkommune/bookingfrontend/templates/stavanger/search.xsl    
2012-08-28 08:27:59 UTC (rev 9922)
@@ -42,7 +42,8 @@
                <div style="text-align:center;">
                        <img alt="" >
                                <xsl:attribute name="src">
-                                       <xsl:value-of select="frontimage"/> 
+                                       <xsl:value-of select="baseurl"/> 
+                                       
/phpgwapi/templates/stavanger/images/newlayout/forsidebilde.jpg
                                </xsl:attribute>
                        </img>
                </div>