[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [7282] bkbooking: update layout + bugfixes
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [7282] bkbooking: update layout + bugfixes |
|
Date: |
Wed, 18 May 2011 08:51:06 +0000 |
Revision: 7282
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7282
Author: kjell
Date: 2011-05-18 08:51:05 +0000 (Wed, 18 May 2011)
Log Message:
-----------
bkbooking: update layout + bugfixes
Modified Paths:
--------------
trunk/booking/inc/class.soallocation.inc.php
trunk/booking/inc/class.soapplication.inc.php
trunk/booking/inc/class.soseason.inc.php
trunk/booking/inc/class.uiallocation.inc.php
trunk/booking/inc/class.uiapplication.inc.php
trunk/booking/inc/class.uibooking.inc.php
trunk/booking/inc/class.uiseason.inc.php
trunk/booking/js/booking/schedule.js
trunk/booking/setup/phpgw_no.lang
trunk/booking/templates/base/application.xsl
trunk/bookingfrontend/setup/phpgw_no.lang
trunk/bookingfrontend/templates/base/booking_cancel.xsl
trunk/bookingfrontend/templates/base/search.xsl
trunk/phpgwapi/templates/bkbooking/css/frontend.css
trunk/phpgwapi/templates/bkbooking/footer.tpl
trunk/phpgwapi/templates/bkbooking/head.inc.php
trunk/phpgwapi/templates/bkbooking/head.tpl
Added Paths:
-----------
trunk/phpgwapi/templates/bkbooking/images/newlayout/
trunk/phpgwapi/templates/bkbooking/images/newlayout/Thumbs.db
trunk/phpgwapi/templates/bkbooking/images/newlayout/aktivby_logo.jpg
trunk/phpgwapi/templates/bkbooking/images/newlayout/bodyBg.gif
trunk/phpgwapi/templates/bkbooking/images/newlayout/footerFjell_inkl_bunnlinje.gif
trunk/phpgwapi/templates/bkbooking/images/newlayout/forsidebilde.jpg
trunk/phpgwapi/templates/bkbooking/images/newlayout/logo.png
trunk/phpgwapi/templates/bkbooking/images/newlayout/pageContainerBg.gif
Modified: trunk/booking/inc/class.soallocation.inc.php
===================================================================
--- trunk/booking/inc/class.soallocation.inc.php 2011-05-10 10:28:21 UTC
(rev 7281)
+++ trunk/booking/inc/class.soallocation.inc.php 2011-05-18 08:51:05 UTC
(rev 7282)
@@ -265,8 +265,8 @@
public function update_id_string()
{
+ $db = $this->db;
$table_name = $this->table_name;
- $db = $this->db;
$sql = "UPDATE $table_name SET id_string = cast(id AS
varchar)";
$db->query($sql, __LINE__, __FILE__);
}
Modified: trunk/booking/inc/class.soapplication.inc.php
===================================================================
--- trunk/booking/inc/class.soapplication.inc.php 2011-05-10 10:28:21 UTC
(rev 7281)
+++ trunk/booking/inc/class.soapplication.inc.php 2011-05-18 08:51:05 UTC
(rev 7282)
@@ -23,8 +23,8 @@
'activity_id' => array('type' =>
'int', 'required' => true),
'status' => array('type' =>
'string', 'required' => true),
'customer_identifier_type'
=> array('type' => 'string', 'required' => true),
- 'customer_ssn'
=> array('type' => 'string', 'sf_validator' =>
createObject('booking.sfValidatorNorwegianSSN', array('full_required'=>false)),
'required' => false),
- 'customer_organization_number' =>
array('type' => 'string', 'sf_validator' =>
createObject('booking.sfValidatorNorwegianOrganizationNumber', array(),
array('invalid' => '%field% is invalid'))),
+ 'customer_ssn'
=> array('type' => 'string', 'query' => true, 'sf_validator' =>
createObject('booking.sfValidatorNorwegianSSN', array('full_required'=>false)),
'required' => false),
+ 'customer_organization_number' =>
array('type' => 'string', 'query' => true, 'sf_validator' =>
createObject('booking.sfValidatorNorwegianOrganizationNumber', array(),
array('invalid' => '%field% is invalid'))),
'owner_name' => array('type' =>
'string', 'query' => true,
'join' =>
array(
'table' =>
'phpgw_accounts',
Modified: trunk/booking/inc/class.soseason.inc.php
===================================================================
--- trunk/booking/inc/class.soseason.inc.php 2011-05-10 10:28:21 UTC (rev
7281)
+++ trunk/booking/inc/class.soseason.inc.php 2011-05-18 08:51:05 UTC (rev
7282)
@@ -145,6 +145,12 @@
return false;
}
+ public function update_id_string()
+ {
+ $db = $this->db;
+ $sql = "UPDATE bb_allocation SET id_string = cast(id AS
varchar)";
+ $db->query($sql, __LINE__, __FILE__);
+ }
}
class booking_soseason_boundary extends booking_socommon
@@ -268,6 +274,7 @@
array_unshift($result_set, $record);
}
}
+
}
class booking_sowtemplate_alloc extends booking_socommon
Modified: trunk/booking/inc/class.uiallocation.inc.php
===================================================================
--- trunk/booking/inc/class.uiallocation.inc.php 2011-05-10 10:28:21 UTC
(rev 7281)
+++ trunk/booking/inc/class.uiallocation.inc.php 2011-05-18 08:51:05 UTC
(rev 7282)
@@ -204,7 +204,7 @@
$errors = $this->bo->validate($allocation);
- if (!$errors['booking'] &&
!$errors['season_boundary'])
+ if (!$errors)
{
$step++;
}
@@ -218,7 +218,7 @@
$errors['global'] = lang('Could
not add object due to insufficient permissions');
}
}
- else if ($_POST['outseason'] == 'on' &&
!$errors['booking'] && !$errors['season_boundary'] && $step > 1)
+ else if ($_POST['outseason'] == 'on' &&
!$errors && $step > 1)
{
$repeat_until =
strtotime($season['to_'])+60*60*24;
@@ -360,6 +360,7 @@
{
try {
$receipt =
$this->bo->update($allocation);
+ $this->bo->so->update_id_string();
$this->send_mailnotification_to_organization($organization, lang('Allocation
changed'), phpgw::get_var('mail', 'POST'));
$this->redirect(array('menuaction' => 'booking.uiallocation.show',
'id'=>$allocation['id']));
} catch (booking_unauthorized_exception
$e) {
Modified: trunk/booking/inc/class.uiapplication.inc.php
===================================================================
--- trunk/booking/inc/class.uiapplication.inc.php 2011-05-10 10:28:21 UTC
(rev 7281)
+++ trunk/booking/inc/class.uiapplication.inc.php 2011-05-18 08:51:05 UTC
(rev 7282)
@@ -154,6 +154,10 @@
'text' => lang('Status').':',
'list' => array(
array(
+ 'id' => 'none',
+ 'name' => lang('Not selected')
+ ),
+ array(
'id' => 'NEW',
'name' => lang('NEW')
),
@@ -182,6 +186,7 @@
'list' =>
$this->bo->so->get_activities_main_level(),
),
array('type' => 'text',
+ 'text' => lang('searchfield'),
'name' =>
'query'
),
array(
@@ -271,7 +276,14 @@
}
} else {
+ if (phpgw::get_var('status') == 'none')
+ {
+ $filters['status'] = array('NEW',
'PENDING','REJECTED', 'ACCEPTED');
+ }
+ else
+ {
$filters['status'] = phpgw::get_var('status');
+ }
$testdata = phpgw::get_var('buildings', 'int', 'REQUEST',
null);
if ($testdata != 0) {
$filters['building_name'] =
$this->bo->so->get_building(phpgw::get_var('buildings', 'int', 'REQUEST',
null));
@@ -421,7 +433,10 @@
if ($_POST['contact_email'] !=
$_POST['contact_email2']) {
$errors['email'] = lang('The e-mail
addresses you entered do not match');
$application['contact_email2'] =
$_POST['contact_email2'];
+ } else {
+ $application['contact_email2'] =
$_POST['contact_email2'];
}
+
foreach($application['agegroups'] as $ag)
{
if($ag['male'] > 9999 || $ag['female']
> 9999) {
@@ -491,7 +506,15 @@
$agegroups = $this->agegroup_bo->fetch_age_groups();
$agegroups = $agegroups['results'];
$audience = $this->audience_bo->fetch_target_audience();
+ foreach ($audience['results'] as &$type) {
+ if (in_array($type['id'],$_POST['audience'])) {
+ $type['checked'] = 'checked';
+ } else {
+ $type['checked'] = '';
+ }
+ }
$application['audience_json'] =
json_encode($audience['results']);
+
$audience = $audience['results'];
$this->install_customer_identifier_ui($application);
$application['customer_identifier_types']['ssn'] =
'Date of birth or SSN';
Modified: trunk/booking/inc/class.uibooking.inc.php
===================================================================
--- trunk/booking/inc/class.uibooking.inc.php 2011-05-10 10:28:21 UTC (rev
7281)
+++ trunk/booking/inc/class.uibooking.inc.php 2011-05-18 08:51:05 UTC (rev
7282)
@@ -252,16 +252,18 @@
# $errors['booking'] = lang('Can
not create a booking in the past');
# }
# }
+
if (!$booking['season_id'] &&
$_POST['outseason'] == 'on')
{
$errors['booking'] = lang('This booking
is not connected to a season');
}
- if (!$errors['activity_id'] &&
!$errors['booking'] && !$errors['season_boundary'])
+
+ if (!$errors)
{
$step++;
}
- if (!$errors && $_POST['recurring'] != 'on' &&
$_POST['outseason'] != 'on' )
+ if (!$errors && $_POST['recurring'] != 'on' &&
$_POST['outseason'] != 'on')
{
if( isset($noallocation)) {
$allocation['resources'] = $booking['resources'];
@@ -285,7 +287,7 @@
}
$this->redirect(array('menuaction' =>
'booking.uimassbooking.schedule', 'id'=>$booking['building_id']));
}
- else if ( ($_POST['recurring'] == 'on' ||
$_POST['outseason'] == 'on') && !$errors['booking'] &&
!$errors['season_boundary'] && $step > 1)
+ else if ( ($_POST['recurring'] == 'on' ||
$_POST['outseason'] == 'on') && !$errors && $step > 1)
{
if ($_POST['recurring'] == 'on') {
$repeat_until =
strtotime($_POST['repeat_until'])+60*60*24;
Modified: trunk/booking/inc/class.uiseason.inc.php
===================================================================
--- trunk/booking/inc/class.uiseason.inc.php 2011-05-10 10:28:21 UTC (rev
7281)
+++ trunk/booking/inc/class.uiseason.inc.php 2011-05-18 08:51:05 UTC (rev
7282)
@@ -381,6 +381,7 @@
$interval,
$step == 3);
}
+ $this->bo->so->update_id_string();
}
$this->flash_form_errors($errors);
self::render_template('season_generate', array('season'
=> $season,
Modified: trunk/booking/js/booking/schedule.js
===================================================================
--- trunk/booking/js/booking/schedule.js 2011-05-10 10:28:21 UTC (rev
7281)
+++ trunk/booking/js/booking/schedule.js 2011-05-18 08:51:05 UTC (rev
7282)
@@ -37,12 +37,12 @@
YAHOO.util.Dom.addClass(elCell, color);
YAHOO.util.Dom.addClass(elCell, booking.type);
if (booking.is_public == 0) {
- elCell.innerHTML = YAHOO.booking.shorten('Privat arr.',
12);
+ elCell.innerHTML = YAHOO.booking.shorten('Privat arr.',
9);
} else {
if (booking.shortname)
- elCell.innerHTML =
YAHOO.booking.shorten(booking.shortname, 12);
+ elCell.innerHTML =
YAHOO.booking.shorten(booking.shortname, 9);
else
- elCell.innerHTML =
YAHOO.booking.shorten(booking.name, 12);
+ elCell.innerHTML =
YAHOO.booking.shorten(booking.name, 9);
}
elCell.onclick = function()
{YAHOO.booking.showBookingInfo(booking,elCell); return false; };
}
@@ -84,9 +84,9 @@
var link = null;
}
if (booking.shortname)
- var html = YAHOO.booking.link(booking.shortname, link, 12);
+ var html = YAHOO.booking.link(booking.shortname, link, 9);
else
- var html = YAHOO.booking.link(booking.name, link, 12);
+ var html = YAHOO.booking.link(booking.name, link, 9);
if(booking.type == 'event' && booking.conflicts) {
for(var i=0; i<booking.conflicts.length;i++) {
@@ -119,9 +119,9 @@
var color = colorMap[booking.name];
YAHOO.util.Dom.addClass(elCell, color);
if (booking.shortname)
- elCell.innerHTML =
YAHOO.booking.link(booking.shortname, null, 12);
+ elCell.innerHTML =
YAHOO.booking.link(booking.shortname, null, 9);
else
- elCell.innerHTML = YAHOO.booking.link(booking.name,
null, 12);
+ elCell.innerHTML = YAHOO.booking.link(booking.name,
null, 9);
}
else {
elCell.innerHTML = '...';
Modified: trunk/booking/setup/phpgw_no.lang
===================================================================
--- trunk/booking/setup/phpgw_no.lang 2011-05-10 10:28:21 UTC (rev 7281)
+++ trunk/booking/setup/phpgw_no.lang 2011-05-18 08:51:05 UTC (rev 7282)
@@ -492,7 +492,7 @@
Activity booking no Aktiviteter
Not selected booking no Ikke valgt
Delete until booking no Slett til
-Recurring allocation deletion booking no Slettings intervall
+Recurring allocation deletion booking no Slett i intervall
Delete allocation booking no Slett tildeling
Delete allocations booking no Slett tildelinger
Delete booking booking no Slett booking
@@ -513,4 +513,5 @@
Show messages booking no Vis beskjeder
Internal account booking no Intern kontering
Internal customer output format booking no Intern kunde eksport
format
-Internal_account_helptext booking no Data som brukes for faktura
eksport av interne kunder
+Internal_account_helptext booking no Data som brukes for faktura
eksport av interne kunder
+searchfield booking no Fritekstsøk
Modified: trunk/booking/templates/base/application.xsl
===================================================================
--- trunk/booking/templates/base/application.xsl 2011-05-10 10:28:21 UTC
(rev 7281)
+++ trunk/booking/templates/base/application.xsl 2011-05-18 08:51:05 UTC
(rev 7282)
@@ -142,16 +142,14 @@
bookingParams[<xsl:value-of
select="id"/>] = <xsl:value-of select="booking_params"/>;
eventParams[<xsl:value-of
select="id"/>] = <xsl:value-of select="event_params"/>;
</script>
- <select name="create"
onchange="if(this.selectedIndex==1)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{id}]); if(this.selectedIndex==2)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uibooking.add',
eventParams[{id}]); if(this.selectedIndex==3)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uiallocation.add',
allocationParams[{id}])">
+ <select name="create"
onchange="if(this.selectedIndex==1)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uiallocation.add',
allocationParams[{id}]); if(this.selectedIndex==2)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uibooking.add',
eventParams[{id}]); if(this.selectedIndex==3)
YAHOO.booking.postToUrl('index.php?menuaction=booking.uievent.add',
eventParams[{id}]);">
<xsl:if
test="not(../case_officer/is_current_user)">
<xsl:attribute
name="disabled">disabled</xsl:attribute>
</xsl:if>
<option><xsl:value-of
select="php:function('lang', '- Actions -')" /></option>
-<!--
<option><xsl:value-of
select="php:function('lang', 'Create allocation')" /></option>
<option><xsl:value-of
select="php:function('lang', 'Create booking')" /></option>
--->
<option><xsl:value-of
select="php:function('lang', 'Create event')" /></option>
</select>
</xsl:if>
Modified: trunk/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- trunk/bookingfrontend/setup/phpgw_no.lang 2011-05-10 10:28:21 UTC (rev
7281)
+++ trunk/bookingfrontend/setup/phpgw_no.lang 2011-05-18 08:51:05 UTC (rev
7282)
@@ -324,8 +324,12 @@
Agegroups kan not be larger than 9999 peoples bookingfrontend no
Estimert antall deltakere kan ikke være større en 9999 personer
Contact information name is to long. max 50 characters bookingfrontend no
Navn i kontakt informasjon er for langt. Maks 50 tegn
Unable to fill report bookingfrontend no Greide ikke å fylle ut rapport
-Cancel booking bookingfrontend no Avbestill booking
-Cancel allocation bookingfrontend no Avbestill tildeling
+Cancel until bookingfrontend no Avbestill til
+Cancel booking bookingfrontend no Avbestill
+Cancel bookings bookingfrontend no Avbestill bookinger
+Cancel allocation also bookingfrontend no Avbestill følgende
+Recurring allocation cancelation bookingfrontend no Avbestill i
intervall
+Cancel allocations bookingfrontend no Avbestill tildelinger
Cancelation of allocation from bookingfrontend no Avbestilling av
tildeling fra
Cancelation of booking from bookingfrontend no Avbestilling av booking
fra
To cancel booking use this link bookingfrontend no For å slette
bookingen bruk lenken
Modified: trunk/bookingfrontend/templates/base/booking_cancel.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/booking_cancel.xsl 2011-05-10
10:28:21 UTC (rev 7281)
+++ trunk/bookingfrontend/templates/base/booking_cancel.xsl 2011-05-18
08:51:05 UTC (rev 7282)
@@ -2,7 +2,7 @@
<div id="content">
<dl class="form">
- <dt class="heading"><xsl:value-of select="php:function('lang', 'Cancel
Booking')"/></dt>
+ <dt class="heading"><xsl:value-of select="php:function('lang', 'Cancel
bookings')"/></dt>
</dl>
<xsl:call-template name="msgbox"/>
<xsl:call-template name="yui_booking_i18n"/>
@@ -34,7 +34,7 @@
<xsl:value-of select="booking/to_"/>
</div>
</dd>
- <dt><label for="field_repeat_until"><xsl:value-of
select="php:function('lang', 'Recurring allocation deletion')" /></label></dt>
+ <dt><label for="field_repeat_until"><xsl:value-of
select="php:function('lang', 'Recurring allocation cancelation')"
/></label></dt>
<dd>
<label>
<input type="checkbox" name="outseason"
id="outseason">
@@ -52,7 +52,7 @@
<xsl:attribute
name="checked">checked</xsl:attribute>
</xsl:if>
</input>
- <xsl:value-of
select="php:function('lang', 'Delete until')" />
+ <xsl:value-of
select="php:function('lang', 'Cancel until')" />
</label>
</dd>
<dd class="date-picker">
@@ -100,15 +100,24 @@
<dd>
<xsl:value-of select="booking/season_name"/>
</dd>
- <dt><label for="field_repeat_until"><xsl:value-of
select="php:function('lang', 'Delete allocation also')" /></label></dt>
+ <dt><label for="field_repeat_until"><xsl:value-of
select="php:function('lang', 'Cancel allocation also')" /></label></dt>
<dd>
<label>
+ <input type="checkbox"
name="delete_booking" id="delete_booking">
+ <xsl:attribute
name="checked">checked</xsl:attribute>
+ <xsl:attribute
name="disabled">disabled</xsl:attribute>
+ </input>
+ <xsl:value-of
select="php:function('lang', 'Cancel bookings')" />
+ </label>
+ </dd>
+ <dd>
+ <label>
<input type="checkbox"
name="delete_allocation" id="delete_allocation">
<xsl:if
test="delete_allocation='on'">
<xsl:attribute
name="checked">checked</xsl:attribute>
</xsl:if>
</input>
- <xsl:value-of
select="php:function('lang', 'Delete allocations')" />
+ <xsl:value-of
select="php:function('lang', 'Cancel allocations')" />
</label>
</dd>
</dl>
@@ -137,7 +146,7 @@
YAHOO.booking.group_id = '<xsl:value-of select="booking/group_id"/>';
<![CDATA[
var descEdit = new YAHOO.widget.SimpleEditor('field-message', {
- height: '300px',
+ height: '150px',
width: '522px',
dompath: true,
animate: true,
Modified: trunk/bookingfrontend/templates/base/search.xsl
===================================================================
--- trunk/bookingfrontend/templates/base/search.xsl 2011-05-10 10:28:21 UTC
(rev 7281)
+++ trunk/bookingfrontend/templates/base/search.xsl 2011-05-18 08:51:05 UTC
(rev 7282)
@@ -34,18 +34,12 @@
<xsl:if test="not(search)">
<div id="cloud">
- <div>Velkommen til Bergen kommune og <strong
style="font-size: 120%">AktivBy</strong>.</div>
- <div>Her finner du informasjon om bygg, anlegg</div>
- <div>som leies ut av <strong>Idrett, Kultur</strong> og
<strong>Grønn</strong> etat.</div>
- <div>Bruk <strong>søkefeltet</strong> til å finne det
du ønsker informasjon om.</div>
- <div>Det enkelte bygg, anlegg har en
<strong>kalender</strong> hvor du får</div>
- <div>oversikt over aktiviteter og hvilke tider som er
<strong>ledige</strong> for leie/bruk.</div>
- <div>Ønsker du å søke om leie/bruk gjør du det fra
kalenderen.</div>
+ <div>Velkommen til Bergen kommune og AktivBy.<br />
+ Her finner du informasjon om bygg, anlegg<br />
+ som leies ut av Idrett, Kultur og Grønn etat.</div>
- <div>Du kan også finne <strong>informasjon</strong> om
aktiviteter,</div>
- <div>åpen hall, <strong>publikumstid</strong> i
svømmehaller og <strong>kulturarrangementer</strong>.</div>
-
- </div>
+ </div><div style="text-align:center;"><img alt=""
src="/phpgwapi/templates/bkbooking/images/newlayout/forsidebilde.jpg" /></div>
+
</xsl:if>
<xsl:if test="search">
Modified: trunk/phpgwapi/templates/bkbooking/css/frontend.css
===================================================================
--- trunk/phpgwapi/templates/bkbooking/css/frontend.css 2011-05-10 10:28:21 UTC
(rev 7281)
+++ trunk/phpgwapi/templates/bkbooking/css/frontend.css 2011-05-18 08:51:05 UTC
(rev 7282)
@@ -275,3 +275,96 @@
.yui-skin-sam .yui-dt TABLE TD{
border: none !important;
}
+
+body{
+color: #575757;
+margin:0;
+padding:0;
+width:100%;
+height:100%;
+background: #fff url('../images/newlayout/bodyBg.gif') repeat-x;text-align:
center;width:100%;
+}
+
+#wrapper{
+background-color: #fff;
+width: 1000px;
+textalign: left;
+margin: 0 auto;
+overflow: hidden;
+padding: 0 0px 40px;
+}
+
+#header{
+overflow: hidden;
+line-height: 1;
+width: 1000px;
+background-image: none !important;
+height: 130px !important;
+}
+
+#login-bar{
+margin-top:10px;
+}
+
+#login-bar a{
+border-right: 1px solid #575757;
+padding: 0 0.5em;
+line-height: 1.2em;
+}
+
+#logo{
+background: url(../images/newlayout/logo.png) no-repeat;
+float: left;
+height: 75px;
+width: 102px;
+margin: 14px 0 0 49px !important;
+}
+
+#centerimage{
+display: block !important;
+margin-right: 5px !important;
+width: 172px !important;
+height: 108px !important;
+background: url(../images/newlayout/aktivby_logo.jpg) no-repeat !important;
+background-position: bottom center !important;
+padding: 22px 0px 0px 150px !important;
+}
+
+#header-search{
+margin: -3em 1em 1em 1em;
+}
+
+#frontend{
+background-image: url(../images/newlayout/pageContainerBg.gif);
+background-repeat: repeat-x;
+}
+
+#line{
+border-top: 5px solid #B11F24;
+clear: left;
+height: 30px;
+width: 960px;
+margin-left: 20px;
+}
+ #content{
+text-align:left;
+}
+
+#cloud{
+text-align:left;
+margin-left: 280px;
+}
+
+#footer{
+border: none !important;
+background:url('../images/newlayout/footerFjell_inkl_bunnlinje.gif') no-repeat
scroll center top transparent;
+clear:both;
+overflow:auto;
+height:160px;
+}
+
+#footer_address{
+padding-top: 1.5em;
+}
+
+
Modified: trunk/phpgwapi/templates/bkbooking/footer.tpl
===================================================================
--- trunk/phpgwapi/templates/bkbooking/footer.tpl 2011-05-10 10:28:21 UTC
(rev 7281)
+++ trunk/phpgwapi/templates/bkbooking/footer.tpl 2011-05-18 08:51:05 UTC
(rev 7282)
@@ -1,3 +1,10 @@
</div>
+<div id="footer">
+
+</div>
+<div id="footer_address">
+Bergen kommune | Rådhusgt 10 | Postboks 7700 | 5020 Bergen
+</div>
+
</body>
-</html>
\ No newline at end of file
+</html>
Modified: trunk/phpgwapi/templates/bkbooking/head.inc.php
===================================================================
--- trunk/phpgwapi/templates/bkbooking/head.inc.php 2011-05-10 10:28:21 UTC
(rev 7281)
+++ trunk/phpgwapi/templates/bkbooking/head.inc.php 2011-05-18 08:51:05 UTC
(rev 7282)
@@ -117,6 +117,10 @@
$app = lang($app);
$tpl_vars = array
(
+ 'manual_text' => lang('manual'),
+ 'manual_url' => 'logout.php',
+ 'help_text' => lang('help'),
+ 'help_url' => 'logout.php',
'css' => $GLOBALS['phpgw']->common->get_css(),
'javascript' => $GLOBALS['phpgw']->common->get_javascript(),
'img_icon' =>
$GLOBALS['phpgw']->common->find_image('phpgwapi', 'favicon.ico'),
Modified: trunk/phpgwapi/templates/bkbooking/head.tpl
===================================================================
--- trunk/phpgwapi/templates/bkbooking/head.tpl 2011-05-10 10:28:21 UTC (rev
7281)
+++ trunk/phpgwapi/templates/bkbooking/head.tpl 2011-05-18 08:51:05 UTC (rev
7282)
@@ -33,9 +33,9 @@
<div id="wrapper">
<div id="header">
<div id="login-bar">
- <a href="{login_url}">{login_text}</a>
+ <a href="{manual_url}">{manual_text}</a> <a
href="{help_url}">{help_text}</a> <a href="{login_url}">{login_text}</a>
</div>
- <a href="index.php?menuaction=bookingfrontend.uisearch.index"><div
id="logo" style="background: url({logofile}) no-repeat"></div></a>
+ <a href="index.php?menuaction=bookingfrontend.uisearch.index"><div
id="logo"></div></a>
<div id="centerimage"></div>
<form action="index.php" method="get" id="header-search"
class="{header_search_class}">
<input type="hidden" name="menuaction"
value="bookingfrontend.uisearch.index" />
@@ -45,4 +45,5 @@
</form>
</div>
<div class="yui-skin-sam" id='frontend'>
+<div id="line"></div>
<div style='margin:0; padding: 0; line-height: 0'> </div>
Added: trunk/phpgwapi/templates/bkbooking/images/newlayout/Thumbs.db
===================================================================
(Binary files differ)
Property changes on:
trunk/phpgwapi/templates/bkbooking/images/newlayout/Thumbs.db
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/phpgwapi/templates/bkbooking/images/newlayout/aktivby_logo.jpg
===================================================================
(Binary files differ)
Property changes on:
trunk/phpgwapi/templates/bkbooking/images/newlayout/aktivby_logo.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/phpgwapi/templates/bkbooking/images/newlayout/bodyBg.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/phpgwapi/templates/bkbooking/images/newlayout/bodyBg.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
trunk/phpgwapi/templates/bkbooking/images/newlayout/footerFjell_inkl_bunnlinje.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/phpgwapi/templates/bkbooking/images/newlayout/footerFjell_inkl_bunnlinje.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/phpgwapi/templates/bkbooking/images/newlayout/forsidebilde.jpg
===================================================================
(Binary files differ)
Property changes on:
trunk/phpgwapi/templates/bkbooking/images/newlayout/forsidebilde.jpg
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/phpgwapi/templates/bkbooking/images/newlayout/logo.png
===================================================================
(Binary files differ)
Property changes on:
trunk/phpgwapi/templates/bkbooking/images/newlayout/logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: trunk/phpgwapi/templates/bkbooking/images/newlayout/pageContainerBg.gif
===================================================================
(Binary files differ)
Property changes on:
trunk/phpgwapi/templates/bkbooking/images/newlayout/pageContainerBg.gif
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [7282] bkbooking: update layout + bugfixes,
Kjell Arne Espedal <=