[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8068] bkbooking: update nsf branch
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [8068] bkbooking: update nsf branch |
|
Date: |
Wed, 09 Nov 2011 11:01:31 +0000 |
Revision: 8068
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8068
Author: kjell
Date: 2011-11-09 11:01:30 +0000 (Wed, 09 Nov 2011)
Log Message:
-----------
bkbooking: update nsf branch
Modified Paths:
--------------
branches/dev-thomasez/booking/inc/class.bobooking.inc.php
branches/dev-thomasez/booking/inc/class.bobuilding.inc.php
branches/dev-thomasez/booking/inc/class.menu.inc.php
branches/dev-thomasez/booking/inc/class.sobuilding.inc.php
branches/dev-thomasez/booking/inc/class.socommon.inc.php
branches/dev-thomasez/booking/inc/class.soresource.inc.php
branches/dev-thomasez/booking/inc/class.uidocument.inc.php
branches/dev-thomasez/booking/js/booking/schedule.js
branches/dev-thomasez/booking/setup/phpgw_no.lang
branches/dev-thomasez/booking/setup/setup.inc.php
branches/dev-thomasez/booking/setup/tables_current.inc.php
branches/dev-thomasez/booking/setup/tables_update.inc.php
branches/dev-thomasez/booking/templates/base/building_form.xsl
branches/dev-thomasez/booking/templates/base/css/base.css
branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang
branches/dev-thomasez/bookingfrontend/setup/setup.inc.php
branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
branches/dev-thomasez/bookingfrontend/templates/nsf/search.xsl
branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
branches/dev-thomasez/phpgwapi/templates/bkbooking/footer.tpl
Added Paths:
-----------
branches/dev-thomasez/booking/inc/class.uisettings.inc.php
branches/dev-thomasez/booking/templates/base/settings.xsl
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/newlayout/alltidberedt.png
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/nsf/
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/nsf/forbundsmerke.png
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/nsf/toppbanner_forside_kartsidene.png
Modified: branches/dev-thomasez/booking/inc/class.bobooking.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.bobooking.inc.php 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/booking/inc/class.bobooking.inc.php 2011-11-09
11:01:30 UTC (rev 8068)
@@ -234,7 +234,17 @@
array_multisort($sort, SORT_ASC, $resources);
$bookings = $this->_split_multi_day_bookings($bookings,
$from, $to);
$results = build_schedule_table($bookings, $resources);
- return array('total_records'=>count($results),
'results'=>$results);
+
+
+
+ $delete = array ("time" => '23:59-00:00',"_from" =>
'23:59',"_to" => '00:00');
+
+ foreach ($results as $array) {
+ if (array_diff($array, $delete) != array())
+ $filtered_result[] = array_diff($array,
$delete);
+ }
+
+ return array('total_records'=>count($filtered_result),
'results'=>$filtered_result);
}
/**
Modified: branches/dev-thomasez/booking/inc/class.bobuilding.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.bobuilding.inc.php 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/booking/inc/class.bobuilding.inc.php 2011-11-09
11:01:30 UTC (rev 8068)
@@ -80,6 +80,7 @@
$building['days'][] = array('label' =>
sprintf('%s<br/>%s %s', lang($date->format('l')), lang($date->format('M')),
$date->format('d')), 'key' => $date->format('D'));
$date->modify('+1 day');
}
+
return $building;
}
Modified: branches/dev-thomasez/booking/inc/class.menu.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.menu.inc.php 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/booking/inc/class.menu.inc.php 2011-11-09
11:01:30 UTC (rev 8068)
@@ -331,7 +331,12 @@
'text' => lang('Asynchronous
Tasks'),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'booking.uiasync_settings.index', 'appname' => 'booking') )
),
- );
+ 'settings' => array
+ (
+ 'text' => lang('Settings'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'booking.uisettings.index', 'appname' => 'booking') )
+ ),
+ );
}
Modified: branches/dev-thomasez/booking/inc/class.sobuilding.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.sobuilding.inc.php 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/booking/inc/class.sobuilding.inc.php 2011-11-09
11:01:30 UTC (rev 8068)
@@ -21,7 +21,14 @@
'zip_code' => array('type'
=> 'string'),
'district' => array('type'
=> 'string', 'query' => true),
'city' => array('type'
=> 'string', 'query' => true),
- 'active' => array('type' => 'int')
+ 'active' => array('type' => 'int'),
+ 'campsites' => array('type' => 'int'),
+ 'bedspaces' => array('type' => 'int'),
+ 'heating' => array('type'
=> 'string', 'query' => true),
+ 'water' => array('type'
=> 'string', 'query' => true),
+ 'location' => array('type'
=> 'string', 'query' => true),
+ 'communication' => array('type' =>
'string', 'query' => true),
+ 'usage_time' => array('type' =>
'string', 'query' => true)
)
);
}
Modified: branches/dev-thomasez/booking/inc/class.socommon.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.socommon.inc.php 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/booking/inc/class.socommon.inc.php 2011-11-09
11:01:30 UTC (rev 8068)
@@ -544,6 +544,7 @@
function add($entry)
{
+
$values =
$this->marshal_field_values($this->get_table_values($entry, __FUNCTION__));
$this->db->query('INSERT INTO ' . $this->table_name . '
(' . join(',', array_keys($values)) . ') VALUES(' . join(',', $values) . ')',
__LINE__,__FILE__);
Modified: branches/dev-thomasez/booking/inc/class.soresource.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.soresource.inc.php 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/booking/inc/class.soresource.inc.php 2011-11-09
11:01:30 UTC (rev 8068)
@@ -4,7 +4,9 @@
class booking_soresource extends booking_socommon
{
const TYPE_LOCATION = 'Location';
+ const TYPE_HOUSE = 'House';
const TYPE_EQUIPMENT = 'Equipment';
+ const TYPE_CAMPSITE = 'Campsite';
function __construct()
{
@@ -64,7 +66,7 @@
public static function allowed_types()
{
- return array(self::TYPE_LOCATION, self::TYPE_EQUIPMENT);
+ return array(self::TYPE_LOCATION, self::TYPE_EQUIPMENT,
self::TYPE_HOUSE, self::TYPE_CAMPSITE);
}
function doValidate($entity, booking_errorstack $errors)
Modified: branches/dev-thomasez/booking/inc/class.uidocument.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.uidocument.inc.php 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/booking/inc/class.uidocument.inc.php 2011-11-09
11:01:30 UTC (rev 8068)
@@ -296,7 +296,6 @@
if(!$errors)
{
try {
-
$receipt =
$this->bo->add($document);
$this->redirect_to_parent_if_inline();
$this->redirect($this->get_owner_typed_link_params('index'));
Added: branches/dev-thomasez/booking/inc/class.uisettings.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.uisettings.inc.php
(rev 0)
+++ branches/dev-thomasez/booking/inc/class.uisettings.inc.php 2011-11-09
11:01:30 UTC (rev 8068)
@@ -0,0 +1,40 @@
+<?php
+ phpgw::import_class('booking.uicommon');
+
+ class booking_uisettings extends booking_uicommon
+ {
+ public $public_functions = array
+ (
+ 'index' => true,
+ );
+
+ public function __construct()
+ {
+ parent::__construct();
+ self::set_active_menu('admin::booking::settings');
+ }
+
+ public function index()
+ {
+ $config = CreateObject('phpgwapi.config','booking');
+ $config->read();
+
+ if($_SERVER['REQUEST_METHOD'] == 'POST')
+ {
+ foreach($_POST as $dim => $value)
+ {
+ if (strlen(trim($value)) > 0)
+ {
+ $config->value($dim,
trim($value));
+ }
+ else
+ {
+
unset($config->config_data[$dim]);
+ }
+ }
+ $config->save_repository();
+ }
+
+ self::render_template('settings', array('config_data'
=>$config->config_data));
+ }
+ }
Modified: branches/dev-thomasez/booking/js/booking/schedule.js
===================================================================
--- branches/dev-thomasez/booking/js/booking/schedule.js 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/booking/js/booking/schedule.js 2011-11-09
11:01:30 UTC (rev 8068)
@@ -37,7 +37,7 @@
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.',
9);
+ elCell.innerHTML = YAHOO.booking.shorten('Opptatt', 9);
} else {
if (booking.shortname)
elCell.innerHTML =
YAHOO.booking.shorten(booking.shortname, 9);
@@ -47,7 +47,8 @@
elCell.onclick = function()
{YAHOO.booking.showBookingInfo(booking,elCell); return false; };
}
else {
- elCell.innerHTML = '...';
+ YAHOO.util.Dom.addClass(elCell, 'freegreen');
+ elCell.innerHTML = 'Ledig';
var data = oRecord.getData();
elCell.ondblclick = function()
{YAHOO.booking.newApplicationForm(YAHOO.booking.dates[oColumn.field],
data._from, data._to, elCell); return false; };
}
@@ -107,7 +108,8 @@
elCell.innerHTML = YAHOO.booking.bookingToHtml(booking);
}
else {
- elCell.innerHTML = '...';
+ YAHOO.util.Dom.addClass(elCell, 'freegreen');
+ elCell.innerHTML = 'Ledig';
}
};
@@ -124,7 +126,8 @@
elCell.innerHTML = YAHOO.booking.link(booking.name,
null, 9);
}
else {
- elCell.innerHTML = '...';
+ YAHOO.util.Dom.addClass(elCell, 'freegreen');
+ elCell.innerHTML = 'Ledig';
}
};
@@ -141,6 +144,7 @@
YAHOO.booking.renderSchedule = function(container, url, date, colFormatter,
includeResource) {
// Make sure date is a Monday
+
while(date.getDay() != 1)
date.setDate(date.getDate()-1);
var container = YAHOO.util.Dom.get(container);
Modified: branches/dev-thomasez/booking/setup/phpgw_no.lang
===================================================================
--- branches/dev-thomasez/booking/setup/phpgw_no.lang 2011-11-09 08:45:50 UTC
(rev 8067)
+++ branches/dev-thomasez/booking/setup/phpgw_no.lang 2011-11-09 11:01:30 UTC
(rev 8068)
@@ -38,15 +38,15 @@
aug booking no august
bookable resources booking no Bookbare ressurser
booking booking no Booking
-booking district booking no Bydel
+booking district booking no Fylke
booking name booking no Navn på booking
bookings booking no Bookinger
boundaries booking no Rammetid
-building booking no Objektgruppe
-building name booking no Objektgruppe
+building booking no Sted/utstyr
+building name booking no Sted/utstyr
building schedule booking no Kalender
-buildings booking no Objektgruppe
-bygning booking no Objektgruppe
+buildings booking no Sted/utstyr
+bygning booking no Sted/utstyr
cancel booking no Avbryt
cancelled booking no Avbestilt
case officer booking no Saksbehandler
@@ -68,7 +68,7 @@
day of the week booking no Ukedag
dec booking no desember
description booking no Beskrivelse
-district booking no Bydel
+district booking no Fylke
document booking no Dokument
document name booking no Dokumentnavn
documents booking no Dokumenter
@@ -108,7 +108,7 @@
jun booking no juni
last modified booking no Sist endret
joading... booking no Laster...
-location booking no Lokale
+location booking no Møtelokale
male booking no Mann
mar booking no mars
may booking no mai
@@ -124,8 +124,8 @@
new audience group booking no Ny målgruppe
new booking booking no Ny booking
new booking application booking no Ny søknad
-new building booking no Ny objektgruppe
-new building permission booking no Nye rettigheter objektgruppe
+new building booking no Nytt sted/utstyr
+new building permission booking no Nye rettigheter sted/utstyr
New Resource Permission booking no Nye rettigheter objekt
new contact booking no Ny kontakt
new document booking no Nye dokumenter
@@ -182,7 +182,7 @@
season name booking no Sesong
seasons booking no Sesonger
secondary admin booking no Kontaktperson 2
-select a building first booking no Velg objektgruppe først
+select a building first booking no Velg sted/utstyr først
select category... booking no Velg en kategori...
select role... booking no Velg rolle...
sep booking no september
@@ -357,7 +357,7 @@
Participants booking no Deltagere
Format booking no Format
Create report booking no Lag rapport
-No buildings selected booking no Du må velge minst en objektgruppe
+No buildings selected booking no Du må velge minst et sted/utstyr
Reports booking no Rapporter
Unable to set classpath booking no Kunne ikke sette classpath
Unable to perform chdir booking no Kunne ikke utføre chdir
@@ -410,7 +410,7 @@
to_ booking no Til
owner_id booking no Eier
object_id booking no Objekt
-building_id booking no Objektgruppe
+building_id booking no Sted/utstyr
subject_id booking no Bruker
export_configurations[external][account_code_set_id] booking no Velg
eksterne kontokoder
export_configurations[internal][account_code_set_id] booking no Velg
interne kontokoder
@@ -519,3 +519,5 @@
Documentation booking no Dokumentasjon
Upload manual booking no Last opp dokumentasjon
Are you sure you want to delete? booking no Er du sikker på at
søknad skal avvises?
+House booking no Hytte/hus
+Campsite booking no Leirplass
Modified: branches/dev-thomasez/booking/setup/setup.inc.php
===================================================================
--- branches/dev-thomasez/booking/setup/setup.inc.php 2011-11-09 08:45:50 UTC
(rev 8067)
+++ branches/dev-thomasez/booking/setup/setup.inc.php 2011-11-09 11:01:30 UTC
(rev 8068)
@@ -1,6 +1,6 @@
<?php
$setup_info['booking']['name'] = 'booking';
- $setup_info['booking']['version'] = '0.2.08';
+ $setup_info['booking']['version'] = '0.2.10';
$setup_info['booking']['app_order'] = 9;
$setup_info['booking']['enable'] = 1;
$setup_info['booking']['app_group'] = 'office';
Modified: branches/dev-thomasez/booking/setup/tables_current.inc.php
===================================================================
--- branches/dev-thomasez/booking/setup/tables_current.inc.php 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/booking/setup/tables_current.inc.php 2011-11-09
11:01:30 UTC (rev 8068)
@@ -769,6 +769,32 @@
'ix' => array(),
'uc' => array()
),
+ 'bb_office' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto', 'precision' =>
4,'nullable' => False),
+ 'name' => array('type' => 'varchar',
'precision' => 200,'nullable' => False),
+ 'user_id' => array('type' => 'int', 'precision'
=> 4,'nullable' => True),
+ 'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'modified_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array(),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
+ 'bb_office_user' => array(
+ 'fd' => array(
+ 'id' => array('type' => 'auto', 'precision' =>
4,'nullable' => False),
+ 'office' => array('type' => 'int', 'precision'
=> 4,'nullable' => True),
+ 'user_id' => array('type' => 'int', 'precision'
=> 4,'nullable' => True),
+ 'entry_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ 'modified_date' => array('type' => 'int',
'precision' => 4,'nullable' => True),
+ ),
+ 'pk' => array('id'),
+ 'fk' => array('bb_office' => array('office' => 'id')),
+ 'ix' => array(),
+ 'uc' => array()
+ ),
'bb_documentation' => array(
'fd' => array(
'id' => array('type' => 'auto', 'nullable' =>
false),
@@ -781,5 +807,4 @@
'ix' => array(),
'uc' => array()
),
-
);
Modified: branches/dev-thomasez/booking/setup/tables_update.inc.php
===================================================================
--- branches/dev-thomasez/booking/setup/tables_update.inc.php 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/booking/setup/tables_update.inc.php 2011-11-09
11:01:30 UTC (rev 8068)
@@ -2592,7 +2592,6 @@
{
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
-
$GLOBALS['phpgw_setup']->oProc->CreateTable(
'bb_documentation', array(
'fd' => array(
@@ -2626,6 +2625,7 @@
function booking_upgrade0_2_08()
{
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
$GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_resource ALTER COLUMN sort DROP NOT NULL");
if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
@@ -2635,3 +2635,29 @@
}
}
+ /**
+ * Update booking version from 0.2.09 to 0.2.10
+ * Update bb_building with som new fields.
+ *
+ */
+ $test[] = '0.2.09';
+ function booking_upgrade0_2_09()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN campsites integer DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN bedspaces integer DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN heating varchar(20) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN kitchen varchar(20) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN water varchar(20) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN location varchar(20) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN communication varchar(20) DEFAULT NULL");
+ $GLOBALS['phpgw_setup']->oProc->m_odb->query("ALTER TABLE
bb_building ADD COLUMN usage_time varchar(20) DEFAULT NULL");
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['booking']['currentver'] =
'0.2.10';
+ return $GLOBALS['setup_info']['booking']['currentver'];
+ }
+ }
+
Modified: branches/dev-thomasez/booking/templates/base/building_form.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/building_form.xsl
2011-11-09 08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/booking/templates/base/building_form.xsl
2011-11-09 11:01:30 UTC (rev 8068)
@@ -78,6 +78,36 @@
</dl>
<div class="clr"/>
<dl class="form-col">
+ <dt><label for="field_campsites"><xsl:value-of
select="php:function('lang', 'Campsites')"/></label></dt>
+ <dd><input id="field_campsites"
name="campsites" type="text" value="{building/campsites}"/></dd>
+
+ <dt><label for="field_bedspaces"><xsl:value-of
select="php:function('lang', 'Bedspaces')"/></label></dt>
+ <dd><input id="field_bedspaces"
name="bedspaces" type="text" value="{building/bedspaces}"/></dd>
+
+
+ <dt><label for="field_heating"><xsl:value-of
select="php:function('lang', 'Heating')"/></label></dt>
+ <dd><input type="text" name="heating"
id="field_heating" value="{building/heating}"/></dd>
+
+ <dt><label for='field_kitchen'><xsl:value-of
select="php:function('lang', 'Kitchen')"/></label></dt>
+ <dd><input type="text" name="kitchen"
id="field_kitchen" value="{building/kitchen}"/></dd>
+
+ </dl>
+ <dl class="form-col">
+ <dt><label for="field_water"><xsl:value-of
select="php:function('lang', 'Water')"/></label></dt>
+ <dd><input type="text" name="water"
id="field_water" value="{building/water}"/></dd>
+
+ <dt><label for="field_location"><xsl:value-of
select="php:function('lang', 'Location')"/></label></dt>
+ <dd><input type="text" name="location"
id="field_location" value="{building/location}"/></dd>
+
+ <dt><label
for='field_communication'><xsl:value-of select="php:function('lang',
'Communication')"/></label></dt>
+ <dd><input type="text" name="communication"
id="field_communication" value="{building/communication}"/></dd>
+
+ <dt><label for='field_usage_time'><xsl:value-of
select="php:function('lang', 'Usage time')"/></label></dt>
+ <dd><input type="text" name="usage_time"
id="field_usage_time" value="{building/usage_time}"/></dd>
+
+ </dl>
+ <div class="clr"/>
+ <dl class="form-col">
<xsl:if test="not(new_form)">
<dt><label
for="field_deactivate_application"><xsl:value-of select="php:function('lang',
'Deactivate application')"/></label></dt>
<dd>
Modified: branches/dev-thomasez/booking/templates/base/css/base.css
===================================================================
--- branches/dev-thomasez/booking/templates/base/css/base.css 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/booking/templates/base/css/base.css 2011-11-09
11:01:30 UTC (rev 8068)
@@ -202,6 +202,7 @@
#schedule_container .color18 { background-color: #bdb76b;} /* darkkhaki */
#schedule_container .color19 { background-color: #32cd32;} /* limegreen */
#schedule_container .color20 { background-color: #ffe4b5;} /* moccasin */
+#schedule_container .freegreen { color: #339933; font-weight: bold;} /* Green
*/
#boundary-table td, #boundary-table th {
padding: .1em .2em;
Added: branches/dev-thomasez/booking/templates/base/settings.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/settings.xsl
(rev 0)
+++ branches/dev-thomasez/booking/templates/base/settings.xsl 2011-11-09
11:01:30 UTC (rev 8068)
@@ -0,0 +1,39 @@
+<xsl:template match="data" xmlns:php="http://php.net/xsl";>
+ <div id="content">
+
+ <xsl:call-template name="msgbox"/>
+ <xsl:call-template name="yui_booking_i18n"/>
+
+ <dl class="form">
+ <dt class="heading"><xsl:value-of select="php:function('lang',
'Booking system settings')"/></dt>
+ </dl>
+
+ <form action="" method="POST">
+
+ <dl class="form-col">
+ <dt><label for="field_user_can_delete"><xsl:value-of
select="php:function('lang', 'NSF site setup')"/></label></dt>
+ <dd>
+ <select id="field_nsf_setup" name="nsf_setup">
+ <option value="no">
+ <xsl:if test="config_data/nsf_setup='no'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang', 'No')" />
+ </option>
+ <option value="yes">
+ <xsl:if test="config_data/nsf_setup='yes'">
+ <xsl:attribute
name="selected">checked</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of select="php:function('lang', 'Yes')" />
+ </option>
+ </select>
+ </dd>
+ </dl>
+ <div class="form-buttons">
+ <input type="submit">
+ <xsl:attribute name="value"><xsl:value-of
select="php:function('lang', 'Save')"/></xsl:attribute>
+ </input>
+ </div>
+ </form>
+ </div>
+</xsl:template>
Modified: branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang
===================================================================
--- branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang 2011-11-09
11:01:30 UTC (rev 8068)
@@ -37,15 +37,15 @@
aug bookingfrontend no august
bookable resources bookingfrontend no Bookbare ressurser
booking bookingfrontend no Booking
-booking district bookingfrontend no Bydel
+booking district bookingfrontend no Fylke
booking name bookingfrontend no Navn på booking
bookings bookingfrontend no Bookinger
boundaries bookingfrontend no Rammetid
-building bookingfrontend no Objektgruppe
-building name bookingfrontend no Objektgruppe
+building bookingfrontend no Sted/utstyr
+building name bookingfrontend no Sted/utstyr
building schedule bookingfrontend no Kalender
-buildings bookingfrontend no Objektgruppe
-bygning bookingfrontend no Objektgruppe
+buildings bookingfrontend no Sted/utstyr
+bygning bookingfrontend no Sted/utstyr
cancel bookingfrontend no Avbryt
cancelled bookingfrontend no Avbestilt
case officer bookingfrontend no Saksbehandler
@@ -68,7 +68,7 @@
day of the week bookingfrontend no Ukedag
dec bookingfrontend no desember
description bookingfrontend no Beskrivelse
-district bookingfrontend no Bydel
+district bookingfrontend no Fylke
document bookingfrontend no Dokument
documents bookingfrontend no Dokumenter
document name bookingfrontend no Dokumentnavn
@@ -107,7 +107,7 @@
jul bookingfrontend no juli
jun bookingfrontend no juni
last modified bookingfrontend no Sist endret
-location bookingfrontend no Lokale
+location bookingfrontend no Møtelokale
log on bookingfrontend no Logg inn
log off bookingfrontend no Logg ut
male bookingfrontend no Mann
@@ -125,8 +125,8 @@
new audience group bookingfrontend no Ny målgruppe
new booking bookingfrontend no Ny booking
new booking application bookingfrontend no Ny søknad
-new building bookingfrontend no Ny objektgruppe
-new building permission bookingfrontend no Nye rettigheter
objektgruppe
+new building bookingfrontend no Nytt sted/utstyr
+new building permission bookingfrontend no Nye rettigheter
sted/utstyr
new contact bookingfrontend no Ny kontakt
new document bookingfrontend no Nye dokumenter
new equipment bookingfrontend no Nytt utstyr
@@ -183,7 +183,7 @@
season name bookingfrontend no Sesong
seasons bookingfrontend no Sesonger
secondary admin bookingfrontend no Kontaktperson 2
-select a building first bookingfrontend no Velg objektgruppe først
+select a building first bookingfrontend no Velg sted/utstyr først
select a grooup bookingfrontend no Velg en Gruppe
select category... bookingfrontend no Velg en kategori...
select role... bookingfrontend no Velg rolle...
@@ -236,7 +236,7 @@
Account Codes bookingfrontend no Konteringsstreng
Field %1 is required bookingfrontend no Feltet '%1' må fylles ut
Field %1: Invalid format bookingfrontend no Feltet '%1': ugyldig
format
-Building users bookingfrontend no Brukere av objektgrupper
+Building users bookingfrontend no Brukere av sted/utstyr
Ssn bookingfrontend no Fødselsnummer (11 siffer)
Date of birth or SSN bookingfrontend no Fødselsdato eller fødselsnummer
Interval bookingfrontend no Interval
@@ -264,7 +264,7 @@
Loading... bookingfrontend no Laster...
customer_ssn contains an invalid Norwegian social security number (6 or 11
digits) bookingfrontend no Fødselsdato/fødselsnummer er ikke gyldig.
Nummeret må bestå av 6 eller 11 siffer
customer_organization_number is invalid bookingfrontend no
Organisasjonsnummer er ugyldig
-Used buildings bookingfrontend no Objektgrupper som brukes
+Used buildings bookingfrontend no Sted/utstyr som brukes
Add group bookingfrontend no Ny gruppe
Internal Customer bookingfrontend no Intern kunde
Customer number bookingfrontend no Ressursnummer
@@ -335,3 +335,6 @@
To cancel allocation use this link bookingfrontend no For å slette
tildelingen bruk lenken
manual common no Veiledning lag og organisasjoner
Cancel allocation bookingfrontend no Avbestill tildelinger
+House booking no Hytte/hus
+Campsite booking no Leirplass
+
Modified: branches/dev-thomasez/bookingfrontend/setup/setup.inc.php
===================================================================
--- branches/dev-thomasez/bookingfrontend/setup/setup.inc.php 2011-11-09
08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/bookingfrontend/setup/setup.inc.php 2011-11-09
11:01:30 UTC (rev 8068)
@@ -21,7 +21,7 @@
$setup_info['bookingfrontend']['depends'][] = array(
'appname' => 'booking',
- 'versions' => Array('0.2.00',
'0.2.01','0.2.02','0.2.03','0.2.04','0.2.05','0.2.06','0.2.07','0.2.08','0.2.09')
+ 'versions' => Array('0.2.00',
'0.2.01','0.2.02','0.2.03','0.2.04','0.2.05','0.2.06','0.2.07','0.2.08','0.2.09','0.2.10')
);
$setup_info['bookingfrontend']['depends'][] = array(
Modified: branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
2011-11-09 08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/bookingfrontend/templates/base/search.xsl
2011-11-09 11:01:30 UTC (rev 8068)
@@ -23,22 +23,21 @@
<input id="search" type="text" name="searchterm"
value="{search/searchterm}"/>
</xsl:when>
<xsl:otherwise>
- <input id="search" type="text" name="searchterm" value="Søk hall,
klubb eller aktivitet" onclick="value=''" />
+ <input id="search" type="text" name="searchterm" value="Søk
leirplass, hytte, utstyr eller aktivitet" onclick="value=''" />
</xsl:otherwise>
</xsl:choose>
<xsl:text> </xsl:text><input type="submit" value="{php:function('lang',
'Search')}"/>
<div class="hint">
- F.eks. "<i>Haukelandshallen</i>", "<i>Nordnes bydelshus</i>",
"<i>idrett</i>" eller "<i>kor</i>".
+ F.eks. "<i>Solstølen</i>", "<i>Tredalen</i>", "<i>kano</i>" eller
"<i>leir</i>"
</div>
</form>
<xsl:if test="not(search)">
<div id="cloud">
- <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>Velkommen til Norges Speiderforbund sitt hytte- og
aktivitetsbookingsystem.<br />
+ Her finner du informasjon om leirplasser, hytter og
utstyr som leies ut av Norges Speiderforbund.
</div>
+ </div>
<div style="text-align:center;">
<img alt="" >
<xsl:attribute name="src">
Modified: branches/dev-thomasez/bookingfrontend/templates/nsf/search.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/nsf/search.xsl
2011-11-09 08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/bookingfrontend/templates/nsf/search.xsl
2011-11-09 11:01:30 UTC (rev 8068)
@@ -23,12 +23,12 @@
<input id="search" type="text" name="searchterm"
value="{search/searchterm}"/>
</xsl:when>
<xsl:otherwise>
- <input id="search" type="text" name="searchterm" value="Søk hall,
klubb eller aktivitet" onclick="value=''" />
+ <input id="search" type="text" name="searchterm" value="Søk
leirplass, hytte, utstyr eller aktivitet" onclick="value=''" />
</xsl:otherwise>
</xsl:choose>
<xsl:text> </xsl:text><input type="submit" value="{php:function('lang',
'Search')}"/>
<div class="hint">
- F.eks. "<i>Haukelandshallen</i>", "<i>Nordnes bydelshus</i>",
"<i>idrett</i>" eller "<i>kor</i>".
+ F.eks. "<i>Solstølen</i>", "<i>Tredalen</i>", "<i>kano</i>" eller
"<i>leir</i>"
</div>
</form>
Modified: branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
2011-11-09 08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/phpgwapi/templates/bkbooking/css/frontend.css
2011-11-09 11:01:30 UTC (rev 8068)
@@ -283,7 +283,8 @@
padding:0;
width:100%;
height:100%;
-background: #fff url('../images/newlayout/bodyBg.gif') repeat-x;text-align:
center;width:100%;
+/*background: white url('../images/newlayout/bodyBg.gif') repeat-x;text-align:
center;width:100%;*/
+background: #8494A5;
}
#wrapper{
@@ -314,21 +315,24 @@
}
#logo{
-background: url(../images/newlayout/logo.png) no-repeat;
+background: url(../images/nsf/forbundsmerke.png) no-repeat;
float: left;
-height: 75px;
-width: 102px;
-margin: 14px 0 0 49px !important;
+height: 145px!important;
+width: 212px!important;
+margin: 0px 0 0 0px !important;
}
#centerimage{
-display: block !important;
+display: none;
+position: relative;
+right: 0px;
+top: 0px;
margin-right: 5px !important;
-width: 172px !important;
-height: 108px !important;
-background: url(../images/newlayout/aktivby_logo.jpg) no-repeat !important;
+width: 730px !important;
+height: 145px !important;
+background: url(../images/nsf/toppbanner_forside_kartsidene.png) no-repeat
!important;
background-position: bottom center !important;
-padding: 22px 0px 0px 100px !important;
+padding: 0px 0px 0px 0px !important;
}
#header-search{
@@ -351,10 +355,13 @@
text-align:left;
}
-#cloud{
+#cloud {
text-align:left;
-margin-left: 280px;
+margin-left: 0px;
}
+#cloud div {
+text-align: center;
+}
#footer{
border: none !important;
@@ -366,6 +373,7 @@
#footer_address{
padding-top: 1.5em;
+font-size: 0.9em;
}
Modified: branches/dev-thomasez/phpgwapi/templates/bkbooking/footer.tpl
===================================================================
--- branches/dev-thomasez/phpgwapi/templates/bkbooking/footer.tpl
2011-11-09 08:45:50 UTC (rev 8067)
+++ branches/dev-thomasez/phpgwapi/templates/bkbooking/footer.tpl
2011-11-09 11:01:30 UTC (rev 8068)
@@ -3,7 +3,7 @@
</div>
<div id="footer_address">
-Bergen kommune | Rådhusgt 10 | Postboks 7700 | 5020 Bergen
+Norges speiderforbund | Besøksadresse: St. Olavs gate 25, 0166 Oslo |
Postadresse: Postboks 6910 St. Olavs plass, 0130 Oslo | 22 99 22 30 | <a
href="mailto:address@hidden";>mailto:address@hidden</a>
</div>
</body>
Added:
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/newlayout/alltidberedt.png
===================================================================
(Binary files differ)
Property changes on:
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/newlayout/alltidberedt.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/nsf/forbundsmerke.png
===================================================================
(Binary files differ)
Property changes on:
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/nsf/forbundsmerke.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added:
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/nsf/toppbanner_forside_kartsidene.png
===================================================================
(Binary files differ)
Property changes on:
branches/dev-thomasez/phpgwapi/templates/bkbooking/images/nsf/toppbanner_forside_kartsidene.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8068] bkbooking: update nsf branch,
Kjell Arne Espedal <=