[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [11176] bkbooking: stavanger update
From: |
Kjell Arne Espedal |
Subject: |
[Fmsystem-commits] [11176] bkbooking: stavanger update |
Date: |
Fri, 14 Jun 2013 12:14:40 +0000 |
Revision: 11176
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=11176
Author: kjell
Date: 2013-06-14 12:14:37 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
bkbooking: stavanger update
Modified Paths:
--------------
branches/stavangerkommune/booking/setup/phpgw_no.lang
branches/stavangerkommune/booking/templates/base/metasettings.xsl
branches/stavangerkommune/bookingfrontend/inc/class.uisearch.inc.php
branches/stavangerkommune/bookingfrontend/templates/stavanger/search.xsl
branches/stavangerkommune/phpgwapi/templates/stavanger/css/frontend.css
Modified: branches/stavangerkommune/booking/setup/phpgw_no.lang
===================================================================
--- branches/stavangerkommune/booking/setup/phpgw_no.lang 2013-06-14
11:47:17 UTC (rev 11175)
+++ branches/stavangerkommune/booking/setup/phpgw_no.lang 2013-06-14
12:14:37 UTC (rev 11176)
@@ -613,3 +613,7 @@
Tilsynsvakt name booking no Tilsynsvakt navn
Tilsynsvakt email booking no Tilsynsvakt epost
Tilsynsvakt telephone booking no Tilsynsvakt telefon
+Metadata booking no Metadata
+Author booking no Forfatter
+Robots booking no Søkerobot parameter
+Frontpage text booking no Forside tekst
Modified: branches/stavangerkommune/booking/templates/base/metasettings.xsl
===================================================================
--- branches/stavangerkommune/booking/templates/base/metasettings.xsl
2013-06-14 11:47:17 UTC (rev 11175)
+++ branches/stavangerkommune/booking/templates/base/metasettings.xsl
2013-06-14 12:14:37 UTC (rev 11176)
@@ -23,6 +23,10 @@
<xsl:attribute
name="value"><xsl:value-of select="config_data/metatag_robots"/></xsl:attribute>
</input>
</dd>
+ <dt><label for="field_frontpagetext"><xsl:value-of
select="php:function('lang', 'Frontpage text')"/></label></dt>
+ <dd>
+ <textarea id="field_frontpagetext"
class="full-width" name="frontpagetext"><xsl:value-of
select="config_data/frontpagetext"/></textarea>
+ </dd>
</dl>
<div class="form-buttons">
Modified: branches/stavangerkommune/bookingfrontend/inc/class.uisearch.inc.php
===================================================================
--- branches/stavangerkommune/bookingfrontend/inc/class.uisearch.inc.php
2013-06-14 11:47:17 UTC (rev 11175)
+++ branches/stavangerkommune/bookingfrontend/inc/class.uisearch.inc.php
2013-06-14 12:14:37 UTC (rev 11176)
@@ -10,6 +10,7 @@
function __construct()
{
+
$this->bo = CreateObject('bookingfrontend.bosearch');
parent::__construct();
$old_top = array_pop($this->tmpl_search_path);
@@ -19,9 +20,17 @@
function index()
{
+ $config = CreateObject('phpgwapi.config','booking');
+ $config->read();
$searchterm = trim(phpgw::get_var('searchterm',
'string', null));
$type = phpgw::get_var('type', 'GET', null);
$search = null;
+ if ($config->config_data['frontpagetext'] != '')
+ {
+ $frontpagetext =
$config->config_data['frontpagetext'];
+ } else {
+ $frontpagetext = 'Velkommen til AktivBy.<br
/>Her finner du informasjon om idrettsanlegg som leies ut<br />av
idrettsavdelingen.';
+ }
if (strlen($searchterm) || $type)
{
@@ -31,7 +40,7 @@
);
}
- $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);
+ $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",
'frontpagetext' => $frontpagetext) : array('search' => $search);
self::render_template('search', $params);
}
Modified:
branches/stavangerkommune/bookingfrontend/templates/stavanger/search.xsl
===================================================================
--- branches/stavangerkommune/bookingfrontend/templates/stavanger/search.xsl
2013-06-14 11:47:17 UTC (rev 11175)
+++ branches/stavangerkommune/bookingfrontend/templates/stavanger/search.xsl
2013-06-14 12:14:37 UTC (rev 11176)
@@ -34,9 +34,7 @@
<xsl:if test="not(search)">
<div id="cloud">
- <div>Velkommen til Stavanger kommune og AktivBy.<br />
- Her finner du informasjon om idrettsanlegg som leies
ut<br />
- av idrettsavdelingen.</div>
+ <div class="frontpagetext"><xsl:value-of
select="frontpagetext"/></div>
</div>
<div style="text-align:center;">
Modified:
branches/stavangerkommune/phpgwapi/templates/stavanger/css/frontend.css
===================================================================
--- branches/stavangerkommune/phpgwapi/templates/stavanger/css/frontend.css
2013-06-14 11:47:17 UTC (rev 11175)
+++ branches/stavangerkommune/phpgwapi/templates/stavanger/css/frontend.css
2013-06-14 12:14:37 UTC (rev 11176)
@@ -368,4 +368,6 @@
text-align: center;
}
-
+.frontpagetext {
+ white-space: pre;
+}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [11176] bkbooking: stavanger update,
Kjell Arne Espedal <=