[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [8192] bkbooking: nsf update
|
From: |
Kjell Arne Espedal |
|
Subject: |
[Fmsystem-commits] [8192] bkbooking: nsf update |
|
Date: |
Thu, 24 Nov 2011 11:44:33 +0000 |
Revision: 8192
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=8192
Author: kjell
Date: 2011-11-24 11:44:08 +0000 (Thu, 24 Nov 2011)
Log Message:
-----------
bkbooking: nsf update
Modified Paths:
--------------
branches/dev-thomasez/booking/inc/class.boresource.inc.php
branches/dev-thomasez/booking/inc/class.menu.inc.php
branches/dev-thomasez/booking/inc/class.socompleted_reservation_export.inc.php
branches/dev-thomasez/booking/inc/class.uiapplication.inc.php
branches/dev-thomasez/booking/inc/class.uievent.inc.php
branches/dev-thomasez/booking/setup/phpgw_no.lang
branches/dev-thomasez/booking/templates/base/application_new.xsl
branches/dev-thomasez/booking/templates/base/building.xsl
branches/dev-thomasez/booking/templates/base/css/base.css
branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang
branches/dev-thomasez/bookingfrontend/templates/base/resource.xsl
Added Paths:
-----------
branches/dev-thomasez/booking/inc/class.uiapplication_settings.inc.php
branches/dev-thomasez/booking/inc/class.uimail_settings.inc.php
branches/dev-thomasez/booking/templates/base/application_settings.xsl
branches/dev-thomasez/booking/templates/base/mail_settings.xsl
Modified: branches/dev-thomasez/booking/inc/class.boresource.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.boresource.inc.php 2011-11-24
09:51:30 UTC (rev 8191)
+++ branches/dev-thomasez/booking/inc/class.boresource.inc.php 2011-11-24
11:44:08 UTC (rev 8192)
@@ -121,6 +121,10 @@
$resource['link'] =
$this->link(array('menuaction' => $menuaction, 'id' => $resource['id']));
$resource['type'] =
lang($resource['type']);
$resource['full_name'] =
$resource['building_name'] . ' / ' . $resource['name'];
+ if ($resource['cost_type'] != '')
+ {
+ $resource['cost_type'] =
lang($resource['cost_type']);
+ }
}
$data = array(
'ResultSet' => array(
Modified: branches/dev-thomasez/booking/inc/class.menu.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.menu.inc.php 2011-11-24
09:51:30 UTC (rev 8191)
+++ branches/dev-thomasez/booking/inc/class.menu.inc.php 2011-11-24
11:44:08 UTC (rev 8192)
@@ -278,6 +278,16 @@
)
)
),
+ 'mail_settings' => array
+ (
+ 'text' =>
lang('Mail Settings'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'booking.uimail_settings.index', 'appname' => 'booking') )
+ ),
+ 'application_settings'
=> array
+ (
+ 'text' =>
lang('Application Settings'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'booking.uiapplication_settings.index', 'appname' => 'booking') )
+ ),
)
);
if ($manual !== null)
Modified:
branches/dev-thomasez/booking/inc/class.socompleted_reservation_export.inc.php
===================================================================
---
branches/dev-thomasez/booking/inc/class.socompleted_reservation_export.inc.php
2011-11-24 09:51:30 UTC (rev 8191)
+++
branches/dev-thomasez/booking/inc/class.socompleted_reservation_export.inc.php
2011-11-24 11:44:08 UTC (rev 8192)
@@ -98,14 +98,6 @@
* Normalizes data on entity.
*/
public function initialize_entity(&$entity) {
- ob_start();
- $myFile = "/tmp/debug2.txt";
- $fh = fopen($myFile, 'w') or die("can't open file");
- echo '<pre>';print_r($entity);
- $op = ob_get_contents();
- fwrite($fh, $op);
- fclose($fh);
- ob_end_clean();
if (isset($entity['__initialized__']) &&
$entity['__initialized__'] === true) { return $entity; }
$entity['__initialized__'] = true;
Modified: branches/dev-thomasez/booking/inc/class.uiapplication.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.uiapplication.inc.php
2011-11-24 09:51:30 UTC (rev 8191)
+++ branches/dev-thomasez/booking/inc/class.uiapplication.inc.php
2011-11-24 11:44:08 UTC (rev 8192)
@@ -412,6 +412,9 @@
public function add()
{
+ $config = CreateObject('phpgwapi.config','booking');
+ $config->read();
+ $application_text = $config->config_data;
$errors = array();
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
@@ -511,7 +514,7 @@
$audience = $audience['results'];
$this->install_customer_identifier_ui($application);
$application['customer_identifier_types']['ssn'] =
'Date of birth or SSN';
- self::render_template('application_new',
array('application' => $application, 'activities' => $activities, 'agegroups'
=> $agegroups, 'audience' => $audience));
+ self::render_template('application_new',
array('application' => $application, 'activities' => $activities, 'agegroups'
=> $agegroups, 'audience' => $audience,'config' => $application_text));
}
public function edit()
Added: branches/dev-thomasez/booking/inc/class.uiapplication_settings.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.uiapplication_settings.inc.php
(rev 0)
+++ branches/dev-thomasez/booking/inc/class.uiapplication_settings.inc.php
2011-11-24 11:44:08 UTC (rev 8192)
@@ -0,0 +1,40 @@
+<?php
+ phpgw::import_class('booking.uicommon');
+
+ class booking_uiapplication_settings extends booking_uicommon
+ {
+ public $public_functions = array
+ (
+ 'index' => true,
+ );
+
+ public function __construct()
+ {
+ parent::__construct();
+
self::set_active_menu('booking::settings::application_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();
+ }
+ $this->use_yui_editor();
+ self::render_template('application_settings',
array('config_data' =>$config->config_data));
+ }
+ }
Modified: branches/dev-thomasez/booking/inc/class.uievent.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.uievent.inc.php 2011-11-24
09:51:30 UTC (rev 8191)
+++ branches/dev-thomasez/booking/inc/class.uievent.inc.php 2011-11-24
11:44:08 UTC (rev 8192)
@@ -298,6 +298,7 @@
{
$errors = array();
$event = array('customer_internal' => 0);
+ $event['is_public'] = 0;
if($_SERVER['REQUEST_METHOD'] == 'POST')
{
@@ -312,7 +313,6 @@
array_set_default($event, 'audience', array());
array_set_default($event, 'agegroups', array());
$event['secret'] = $this->generate_secret();
- $event['is_public'] = 1;
$event['building_name'] =
$_POST['building_name'];
if (!$_POST['application_id'])
Added: branches/dev-thomasez/booking/inc/class.uimail_settings.inc.php
===================================================================
--- branches/dev-thomasez/booking/inc/class.uimail_settings.inc.php
(rev 0)
+++ branches/dev-thomasez/booking/inc/class.uimail_settings.inc.php
2011-11-24 11:44:08 UTC (rev 8192)
@@ -0,0 +1,40 @@
+<?php
+ phpgw::import_class('booking.uicommon');
+
+ class booking_uimail_settings extends booking_uicommon
+ {
+ public $public_functions = array
+ (
+ 'index' => true,
+ );
+
+ public function __construct()
+ {
+ parent::__construct();
+
self::set_active_menu('booking::settings::mail_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();
+ }
+ $this->use_yui_editor();
+ self::render_template('mail_settings',
array('config_data' =>$config->config_data));
+ }
+ }
Modified: branches/dev-thomasez/booking/setup/phpgw_no.lang
===================================================================
--- branches/dev-thomasez/booking/setup/phpgw_no.lang 2011-11-24 09:51:30 UTC
(rev 8191)
+++ branches/dev-thomasez/booking/setup/phpgw_no.lang 2011-11-24 11:44:08 UTC
(rev 8192)
@@ -162,7 +162,7 @@
planning booking no Planlegging
prev booking no Forrige
preview booking no Forhåndsvisning
-previous week booking no Forige uke
+previous week booking no Forrige uke
price list booking no Prisliste
primary admin booking no Kontaktperson 1
primary contact booking no Kontaktperson 1
@@ -420,7 +420,7 @@
To borrow premises you must verify that you have read terms and conditions
booking no For å låne lokaler må du bekrefte at du har lest juridiske
betingelser
In order to send the invoice we need information about either customer
organization number or norwegian social security number booking no For å
kunne sende faktura trenger vi opplysninger om organisasjonsnr. eller fødselsnr.
Event type booking no Arrangementstype
-Private event booking no Privat arrangement
+Private event booking no Opptatt
Public event booking no Offentlig arrangement
customer_ssn contains an invalid Norwegian social security number (11 digits)
booking no Fødselsnummer er ugyldig (11 siffer)
show only unexported booking no Vis bare ikke-eksporterte
@@ -532,10 +532,13 @@
Internal Cost booking no Pris medlem
External Cost booking no Pris ikke-medlem
Cost Type booking no Pristype
-Perhour booking no Per time
-Perday booking no Per dag
-Perweek booking no Per uke
+Perhour booking no Pr time
+Perday booking no Pr dag
+Perweek booking no Pr uke
Select Cost type booking no Velg pristype
Map url booking no Kart
Weather url booking no Været
Click here booking no Klikk her
+Mail Settings booking no E-post oppsett
+Application Settings booking no Søknads oppsett
+
Modified: branches/dev-thomasez/booking/templates/base/application_new.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/application_new.xsl
2011-11-24 09:51:30 UTC (rev 8191)
+++ branches/dev-thomasez/booking/templates/base/application_new.xsl
2011-11-24 11:44:08 UTC (rev 8192)
@@ -6,22 +6,36 @@
<xsl:call-template name="yui_booking_i18n"/>
<form action="" method="POST" id='application_form'>
- <p style="width: 750px;">For at vi skal kunne behandle din
søknad
- trenger vi en del opplysninger, og vi trenger en del
opplysninger
- for statistikk formål. Du må derfor fylle ut alle
feltene i
- søknadskjemaet, er det vanskelig å angi eksakt så gi
oss et
- estimat.</p>
+ <xsl:if test="config/application_new_application">
+ <p style="width: 750px;">
+ <xsl:value-of
select="config/application_new_application"/>
+ </p>
+ </xsl:if>
+<!-- <xsl:if test="not (config/application_new_application)">-->
+<!-- <p style="width: 750px;">For at vi skal kunne behandle din
søknad-->
+<!-- trenger vi en del opplysninger, og vi trenger en del
opplysninger-->
+<!-- for statistikk formål. Du må derfor fylle ut alle
feltene i-->
+<!-- søknadskjemaet, er det vanskelig å angi eksakt så gi
oss et-->
+<!-- estimat.</p>-->
+<!-- </xsl:if>-->
<dl class="form-2col">
<div class="heading">1. <xsl:value-of
select="php:function('lang', 'Why?')" /></div>
<dt>
<label for="field_activity"><xsl:value-of
select="php:function('lang', 'Activity')" /></label>
- <p>Informasjon om aktiviteten/arrangementet
- Gi en kort beskrivelse av arrangementet
/aktiviteten.
- For åpne arrangement, aktiviteter og trening i
regi av
- organisasjoner og klubber vises denne
informasjonen på internett.
- For faste aktiviteter oppgi intervall og til
dato,
- f.eks. torsdager kl.19-20 frem til 23/6.</p>
+ <xsl:if test="config/application_activities">
+ <p>
+ <xsl:value-of
select="config/application_activities"/>
+ </p>
+ </xsl:if>
+<!-- <xsl:if test="not
(config/application_activities)">-->
+<!-- <p>Informasjon om
aktiviteten/arrangementet-->
+<!-- Gi en kort beskrivelse av arrangementet
/aktiviteten. -->
+<!-- For åpne arrangement, aktiviteter og
trening i regi av -->
+<!-- organisasjoner og klubber vises denne
informasjonen på internett. -->
+<!-- For faste aktiviteter oppgi intervall
og til dato, -->
+<!-- f.eks. torsdager kl.19-20 frem til
23/6.</p>-->
+<!-- </xsl:if>-->
</dt>
<dd>
<select name="activity_id" id="field_activity">
@@ -39,7 +53,14 @@
</dd>
<dt>
<label for="field_description"><xsl:value-of
select="php:function('lang', 'Information about the event')" /></label>
- <p><xsl:value-of select="php:function('lang',
'Short description. For public events, activities and training under the
direction of organizations and clubs, this information will be displayed on the
internet')" /></p>
+ <xsl:if test="config/application_description">
+ <p>
+ <xsl:value-of
select="config/application_description"/>
+ </p>
+ </xsl:if>
+<!-- <xsl:if test="not
(config/application_description)">-->
+<!-- <p><xsl:value-of
select="php:function('lang', 'Short description. For public events, activities
and training under the direction of organizations and clubs, this information
will be displayed on the internet')" /></p>-->
+<!-- </xsl:if>-->
</dt>
<dd>
<textarea id="field_description"
class="full-width" name="description"><xsl:value-of
select="application/description"/></textarea>
@@ -47,7 +68,14 @@
</dl>
<dl class="form-col">
<div class="heading">2. <xsl:value-of
select="php:function('lang', 'How many?')" /></div>
- <p>Oppgi forventet/estimert antall deltakere. Vi vil ha
det fordelt på aldersgruppeog kjønn. Dette er viktig ift. å kartlegge hvem som
bruker anleggene.</p>
+ <xsl:if test="config/application_howmany">
+ <p>
+ <xsl:value-of
select="config/application_howmany"/>
+ </p>
+ </xsl:if>
+<!-- <xsl:if test="not (config/application_howmany)">-->
+<!-- <p>Oppgi forventet/estimert antall deltakere.
Vi vil ha det fordelt på aldersgruppeog kjønn. Dette er viktig ift. å kartlegge
hvem som bruker anleggene.</p>-->
+<!-- </xsl:if>-->
<dt><label for="field_activity"><xsl:value-of
select="php:function('lang', 'Estimated number of participants')"
/></label></dt>
<dd>
<table id="agegroup">
@@ -77,7 +105,14 @@
<div class="clr"/>
<dl class="form-col">
<div class="heading">3. <xsl:value-of
select="php:function('lang', 'Where?')" /></div>
- <p>Velg hus og ressurser</p>
+ <xsl:if test="config/application_where">
+ <p>
+ <xsl:value-of
select="config/application_where"/>
+ </p>
+ </xsl:if>
+<!-- <xsl:if test="not (config/application_where)">-->
+<!-- <p>Velg hus og ressurser</p>-->
+<!-- </xsl:if>-->
<dt><label for="field_building"><xsl:value-of
select="php:function('lang', 'Building')" /></label></dt>
<dd>
<div class="autocomplete">
@@ -98,7 +133,14 @@
<div class="clr"/>
<dl class="form-col">
<div class="heading">4. <xsl:value-of
select="php:function('lang', 'When?')" /></div>
- <p>Velg fra dato og angi fra klokkeslett. Velg til dato
og angi klokkeslett. Dato velges fra kalender. Klokkeslett angis med
timer:minutter. Du kan søke om flere tider ved å velge Legg til
dato. For søknad om fast tid i en gitt periode legg inn startdato og
klokkeslett for den første gangen her og oppgi intervall og
sluttdato i felt 1: "Informasjon om aktiviteten"</p>
+ <xsl:if test="config/application_when">
+ <p>
+ <xsl:value-of
select="config/application_when"/>
+ </p>
+ </xsl:if>
+<!-- <xsl:if test="not (config/application_when)">-->
+<!-- <p>Velg fra dato og angi fra klokkeslett. Velg
til dato og angi klokkeslett. Dato velges fra kalender. Klokkeslett angis med
timer:minutter. Du kan søke om flere tider ved å velge
Legg til dato. For søknad om fast tid i en gitt periode legg inn startdato og
klokkeslett for den første gangen her og oppgi
intervall og sluttdato i felt 1: "Informasjon om aktiviteten"</p>-->
+<!-- </xsl:if>-->
<div id="dates-container">
<xsl:for-each select="application/dates">
<div class="date-container">
@@ -126,7 +168,14 @@
</dl>
<dl class="form-col">
<div class="heading">5. <xsl:value-of
select="php:function('lang', 'Who?')" /></div>
- <p>Kryss av for hvilken målgruppe
arrangementet/treningen er rettet mot. Du kan krysse av for flere.</p>
+ <xsl:if test="config/application_who">
+ <p>
+ <xsl:value-of
select="config/application_who"/>
+ </p>
+ </xsl:if>
+<!-- <xsl:if test="not (config/application_who)">-->
+<!-- <p>Kryss av for hvilken målgruppe
arrangementet/treningen er rettet mot. Du kan krysse av for flere.</p>-->
+<!-- </xsl:if>-->
<dt><label for="field_from"><xsl:value-of
select="php:function('lang', 'Target audience')" /></label></dt>
<dd>
<div id="audience_container"> </div>
@@ -135,7 +184,12 @@
<div class="clr"/>
<dl class="form-col">
<div class="heading"><br />6. <xsl:value-of
select="php:function('lang', 'Contact information')" /></div>
- <p>Oppgi ditt navn (fornavn og etternavn), e-post
adresse vi kan nå deg på og telefon, mobil om du vil ha melding på SMS.</p>
+ <xsl:if test="config/application_contact_information">
+ <p>
+ <xsl:value-of
select="config/application_contact_information"/>
+ </p>
+ </xsl:if>
+<!-- <p>Oppgi ditt navn (fornavn og etternavn), e-post
adresse vi kan nå deg på og telefon, mobil om du vil ha melding på SMS.</p>-->
<dt><label for="field_contact_name"><xsl:value-of
select="php:function('lang', 'Name')" /></label></dt>
<dd>
<input id="field_contact_name"
name="contact_name" type="text">
@@ -163,18 +217,38 @@
</dl>
<dl class="form-col">
<div class="heading">7. <xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /></div>
- <p>Ut fra reglementet i pkt. 8 finner du kriterier for
fakturering. Når du som privatperson skal låne noe som det ikke skal faktureres
for oppgir du kun fødselsdato, men skal du leie noe som koster noe, da må vi ha
hele personnummeret. Alle lag og organisasjoner skal oppgi organisasjonsnr.</p>
+ <xsl:if test="config/application_responsible_applicant">
+ <p>
+ <xsl:value-of
select="config/application_responsible_applicant"/>
+ </p>
+ </xsl:if>
+<!-- <p>Ut fra reglementet i pkt. 8 finner du kriterier for
fakturering. Når du som privatperson skal låne noe som det ikke skal faktureres
for oppgir du kun fødselsdato, men skal du leie noe som koster noe, da må vi ha
hele personnummeret. Alle lag og organisasjoner skal oppgi
organisasjonsnr.</p>-->
<xsl:copy-of
select="phpgw:booking_customer_identifier(application, '')"/>
<br />
- <p><xsl:value-of select="php:function('lang', 'In order
to send the invoice we need information about either customer organization
number or norwegian social security number')" /></p>
+ <xsl:if test="config/application_invoice_information">
+ <p>
+ <xsl:value-of
select="config/application_invoice_information"/>
+ </p>
+ </xsl:if>
+<!-- <p><xsl:value-of select="php:function('lang', 'In order
to send the invoice we need information about either customer organization
number or norwegian social security number')" /></p>-->
</dl>
<dl class="form-col">
<div class="heading"><br />8. <xsl:value-of
select="php:function('lang', 'Terms and conditions')" /></div>
- <p>Alle som leier lokaler hos Bergen kommune må
bekrefte at de har lest betingelsene, dette gjelder som regel brannforskrifter
og husreglement.</p>
+ <xsl:if test="config/application_terms">
+ <p>
+ <xsl:value-of
select="config/application_terms"/>
+ </p>
+ </xsl:if>
+<!-- <p>Alle som leier lokaler hos Bergen kommune må
bekrefte at de har lest betingelsene, dette gjelder som regel brannforskrifter
og husreglement.</p>-->
<br />
<div id='regulation_documents'> </div>
<br />
- <p><xsl:value-of select="php:function('lang', 'To
borrow premises you must verify that you have read terms and conditions')"
/></p>
+ <xsl:if test="config/application_terms2">
+ <p>
+ <xsl:value-of
select="config/application_terms2"/>
+ </p>
+ </xsl:if>
+<!-- <p><xsl:value-of select="php:function('lang', 'To
borrow premises you must verify that you have read terms and conditions')"
/></p>-->
</dl>
<div class="form-buttons">
<input type="submit">
Added: branches/dev-thomasez/booking/templates/base/application_settings.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/application_settings.xsl
(rev 0)
+++ branches/dev-thomasez/booking/templates/base/application_settings.xsl
2011-11-24 11:44:08 UTC (rev 8192)
@@ -0,0 +1,73 @@
+<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 application settings')"/></dt>
+ </dl>
+
+ <form action="" method="POST">
+
+ <dl class="form-col">
+ <dt><label for="field_application_new_application"><xsl:value-of
select="php:function('lang', 'New application')"/></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea
id="field_application_new_application" class="full-width settings"
name="application_new_application" type="text"><xsl:value-of
select="config_data/application_new_application"/></textarea>
+ </dd>
+ <dt><label for="field_application_activities"><xsl:value-of
select="php:function('lang', 'Activity')"/></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_activities"
name="application_activities" class="full-width settings"
type="text"><xsl:value-of
select="config_data/application_activities"/></textarea>
+ </dd>
+ <dt>
+ <label
for="field_application_description"><xsl:value-of select="php:function('lang',
'Information about the event')" /></label>
+ </dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_description"
name="application_description" class="full-width settings"
type="text"><xsl:value-of
select="config_data/application_description"/></textarea>
+ </dd>
+ <dt><label for="field_application_howmany"><xsl:value-of
select="php:function('lang', 'How many?')" /></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_howmany"
name="application_howmany" class="full-width settings"
type="text"><xsl:value-of select="config_data/application_howmany"/></textarea>
+ </dd>
+ <dt><label for="field_application_where"><xsl:value-of
select="php:function('lang', 'Where?')" /></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_where"
name="application_where" class="full-width settings" type="text"><xsl:value-of
select="config_data/application_where"/></textarea>
+ </dd>
+ <dt><label for="field_application_when"><xsl:value-of
select="php:function('lang', 'When?')" /></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_when"
name="application_when" class="full-width settings" type="text"><xsl:value-of
select="config_data/application_when"/></textarea>
+ </dd>
+ <dt><label for="field_application_who"><xsl:value-of
select="php:function('lang', 'Who?')" /></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_who"
name="application_who" class="full-width settings" type="text"><xsl:value-of
select="config_data/application_who"/></textarea>
+ </dd>
+ <dt><label
for="field_application_contact_information"><xsl:value-of
select="php:function('lang', 'Contact information')" /></label></dt>
+ <dd class="yui-skin-sam">
+ <textarea
id="field_application_contact_information"
name="application_contact_information" class="full-width settings"
type="text"><xsl:value-of
select="config_data/application_contact_information"/></textarea>
+ </dd>
+ <dt><label
for="field_application_responsible_applicant"><xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /> 1</label></dt>
+ <dd class="yui-skin-sam">
+ <textarea
id="field_application_responsible_applicant"
name="application_responsible_applicant" class="full-width settings"
type="text"><xsl:value-of
select="config_data/application_responsible_applicant"/></textarea>
+ </dd>
+ <dt><label
for="field_application_invoice_information"><xsl:value-of
select="php:function('lang', 'responsible applicant')" /> / <xsl:value-of
select="php:function('lang', 'invoice information')" /> 2</label></dt>
+ <dd class="yui-skin-sam">
+ <textarea
id="field_application_invoice_information"
name="application_invoice_information" class="full-width settings"
type="text"><xsl:value-of
select="config_data/application_invoice_information"/></textarea>
+ </dd>
+ <dt><label for="field_application_terms"><xsl:value-of
select="php:function('lang', 'Terms and conditions')" /> 1</label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_terms"
name="application_terms" class="full-width settings" type="text"><xsl:value-of
select="config_data/application_terms"/></textarea>
+ </dd>
+ <dt><label for="field_application_terms2"><xsl:value-of
select="php:function('lang', 'Terms and conditions')" /> 2</label></dt>
+ <dd class="yui-skin-sam">
+ <textarea id="field_application_terms2"
name="application_terms2" class="full-width settings"
type="text"><xsl:value-of select="config_data/application_terms2"/></textarea>
+ </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/booking/templates/base/building.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/building.xsl 2011-11-24
09:51:30 UTC (rev 8191)
+++ branches/dev-thomasez/booking/templates/base/building.xsl 2011-11-24
11:44:08 UTC (rev 8192)
@@ -95,6 +95,7 @@
</xsl:if>
</dl>
<div class="clr"/>
+ <xsl:if test="not (building/map_url='')">
<dl class="form-col">
<dt><label for="field_map_url"><xsl:value-of
select="php:function('lang', 'Map url')"/></label></dt>
<dd><a target="_blank">
@@ -102,6 +103,8 @@
<xsl:value-of select="php:function('lang', 'Click here')"
/></a>
</dd>
</dl>
+ </xsl:if>
+ <xsl:if test="not (building/weather_url='')">
<dl class="form-col">
<dt><label
for="field_weather_url"><xsl:value-of select="php:function('lang', 'Weather
url')"/></label></dt>
<dd><a target="_blank">
@@ -109,6 +112,7 @@
<xsl:value-of select="php:function('lang', 'Click here')"
/></a>
</dd>
</dl>
+ </xsl:if>
<div class='clr'/>
<dl class="form-col">
<xsl:if test="building/internal_cost!=''">
Modified: branches/dev-thomasez/booking/templates/base/css/base.css
===================================================================
--- branches/dev-thomasez/booking/templates/base/css/base.css 2011-11-24
09:51:30 UTC (rev 8191)
+++ branches/dev-thomasez/booking/templates/base/css/base.css 2011-11-24
11:44:08 UTC (rev 8192)
@@ -295,4 +295,9 @@
#overlay-info .close { float: right; }
#overlay-info .actions { margin-top: 1em;}
-
+.settings {
+ padding: 5px;
+}
+span.space {
+ padding-right: 8px;
+}
Added: branches/dev-thomasez/booking/templates/base/mail_settings.xsl
===================================================================
--- branches/dev-thomasez/booking/templates/base/mail_settings.xsl
(rev 0)
+++ branches/dev-thomasez/booking/templates/base/mail_settings.xsl
2011-11-24 11:44:08 UTC (rev 8192)
@@ -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-24
09:51:30 UTC (rev 8191)
+++ branches/dev-thomasez/bookingfrontend/setup/phpgw_no.lang 2011-11-24
11:44:08 UTC (rev 8192)
@@ -278,7 +278,7 @@
Short description. For public events, activities and training under the
direction of organizations and clubs, this information will be displayed on the
internet bookingfrontend no Gi en kort beskrivelse av arrangementet.
For åpne arrangement, aktiviteter og trening i regi av organisasjoner og
klubber vises denne informasjonen på internett
To borrow premises you must verify that you have read terms and conditions
bookingfrontend no For å låne lokaler må du bekrefte at du har lest
juridiske betingelser
In order to send the invoice we need information about either customer
organization number or norwegian social security number bookingfrontend no
For å kunne sende faktura trenger vi opplysninger om organisasjonsnr. eller
fødselsnr.
-Private event bookingfrontend no Privat arrangement
+Private event bookingfrontend no Opptatt
Mass update bookingfrontend no Masseoppdatering
You are now about to update all bookings from this date and to the end of the
season. bookingfrontend no Du er nå i ferd med å oppdatere alle bookinger
fra dagens dato og ut sesongen.
Please update the data and click the Next-button. bookingfrontend no
Vennligst oppdater dataene og klikk på Neste-knappen.
@@ -340,6 +340,6 @@
Internal Cost bookingfrontend no Medlems pris
External Cost bookingfrontend no Pris
Cost Type bookingfrontend no Pris type
-Perhour bookingfrontend no Per time
-Perday bookingfrontend no Per dag
-Perweek bookingfrontend no Per uke
+Perhour bookingfrontend no Pr time
+Perday bookingfrontend no Pr dag
+Perweek bookingfrontend no Pr uke
Modified: branches/dev-thomasez/bookingfrontend/templates/base/resource.xsl
===================================================================
--- branches/dev-thomasez/bookingfrontend/templates/base/resource.xsl
2011-11-24 09:51:30 UTC (rev 8191)
+++ branches/dev-thomasez/bookingfrontend/templates/base/resource.xsl
2011-11-24 11:44:08 UTC (rev 8192)
@@ -33,6 +33,14 @@
<dt><xsl:value-of select="php:function('lang',
'Resource Type')" /></dt>
<dd><xsl:value-of select="php:function('lang',
string(resource/type))"/></dd>
+
+ <dt><xsl:value-of select="php:function('lang',
'Internal cost')"/></dt>
+ <dd><span class="space"><xsl:value-of
select="resource/internal_cost"/></span>
+ <xsl:value-of select="php:function('lang',
string(resource/cost_type))"/></dd>
+
+ <dt><xsl:value-of select="php:function('lang',
'External cost')"/></dt>
+ <dd><span class="space"><xsl:value-of
select="resource/external_cost"/></span>
+ <xsl:value-of select="php:function('lang',
string(resource/cost_type))"/></dd>
<h3><xsl:value-of select="php:function('lang',
'Documents')" /></h3>
<div id="documents_container"/>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [8192] bkbooking: nsf update,
Kjell Arne Espedal <=