|
| From: | sigurdne |
| Subject: | [Fmsystem-commits] [16172] more on eventplanner |
| Date: | Fri, 20 Jan 2017 10:13:21 -0500 (EST) |
Revision: 16172
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16172
Author: sigurdne
Date: 2017-01-20 10:13:21 -0500 (Fri, 20 Jan 2017)
Log Message:
-----------
more on eventplanner
Modified Paths:
--------------
trunk/eventplanner/inc/class.bobooking.inc.php
trunk/eventplanner/inc/class.menu.inc.php
trunk/eventplanner/inc/class.uiapplication.inc.php
trunk/eventplanner/inc/model/class.application.inc.php
trunk/eventplanner/js/portico/application.edit.js
trunk/eventplanner/setup/phpgw_no.lang
trunk/eventplanner/setup/setup.inc.php
trunk/eventplanner/setup/tables_current.inc.php
trunk/eventplanner/setup/tables_update.inc.php
trunk/eventplanner/templates/base/application.xsl
trunk/eventplanner/templates/base/booking.xsl
trunk/eventplanner/templates/base/config.tpl
trunk/eventplanner/templates/base/vendor.xsl
trunk/eventplanner/templates/base/vendor_report.xsl
trunk/phpgwapi/inc/class.categories.inc.php
trunk/phpgwapi/templates/pure/css/pure-extension.css
Modified: trunk/eventplanner/inc/class.bobooking.inc.php
===================================================================
--- trunk/eventplanner/inc/class.bobooking.inc.php 2017-01-19 17:57:55 UTC
(rev 16171)
+++ trunk/eventplanner/inc/class.bobooking.inc.php 2017-01-20 15:13:21 UTC
(rev 16172)
@@ -68,6 +68,7 @@
public function read($params)
{
+ $status_text = array(lang('inactive'), lang('active'));
if(empty($params['filters']['active']))
{
$params['filters']['active'] = 1;
@@ -84,6 +85,7 @@
$entry['modified'] =
$GLOBALS['phpgw']->common->show_date($entry['modified']);
$entry['from_'] =
$GLOBALS['phpgw']->common->show_date($entry['from_']);
$entry['to_'] =
$GLOBALS['phpgw']->common->show_date($entry['to_']);
+ $entry['status'] =
$status_text[$entry['active']];
}
return $values;
}
Modified: trunk/eventplanner/inc/class.menu.inc.php
===================================================================
--- trunk/eventplanner/inc/class.menu.inc.php 2017-01-19 17:57:55 UTC (rev
16171)
+++ trunk/eventplanner/inc/class.menu.inc.php 2017-01-20 15:13:21 UTC (rev
16172)
@@ -62,6 +62,12 @@
{
$menus['admin'] = array
(
+ 'index' => array
+ (
+ 'text' => lang('Configuration'),
+ 'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'admin.uiconfig.index',
+ 'appname' =>
'eventplanner'))
+ ),
'acl' => array(
'text' =>
$GLOBALS['phpgw']->translation->translate('Configure Access Permissions',
array(), true),
'url' =>
$GLOBALS['phpgw']->link('/index.php', array('menuaction' =>
'preferences.uiadmin_acl.list_acl',
Modified: trunk/eventplanner/inc/class.uiapplication.inc.php
===================================================================
--- trunk/eventplanner/inc/class.uiapplication.inc.php 2017-01-19 17:57:55 UTC
(rev 16171)
+++ trunk/eventplanner/inc/class.uiapplication.inc.php 2017-01-20 15:13:21 UTC
(rev 16172)
@@ -206,7 +206,7 @@
public function edit( $values = array(), $mode = 'edit' )
{
$active_tab = !empty($values['active_tab']) ?
$values['active_tab'] : phpgw::get_var('active_tab', 'string', 'REQUEST',
'first_tab');
- $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' .
lang('edit');
+ // $GLOBALS['phpgw_info']['flags']['app_header'] .= '::' .
lang('edit');
if (empty($this->permissions[PHPGW_ACL_ADD]))
{
phpgw::no_access();
@@ -221,8 +221,9 @@
$id = !empty($values['id']) ? $values['id'] :
phpgw::get_var('id', 'int');
$application = $this->bo->read_single($id);
}
+ $config = CreateObject('phpgwapi.config',
'eventplanner')->read();
+ $default_category =
!empty($config['default_application_category']) ?
$config['default_application_category'] : null;
-
$tabs = array();
$tabs['first_tab'] = array(
'label' => lang('application'),
@@ -282,9 +283,9 @@
array('key' => 'id', 'label' => lang('id'),
'sortable' => true, 'resizeable' => true,'formatter' =>
'JqueryPortico.formatLink'),
array('key' => 'from_', 'label' =>
lang('From'), 'sortable' => false, 'resizeable' => true),
array('key' => 'to_', 'label' => lang('To'),
'sortable' => false, 'resizeable' => true),
- array('key' => 'active', 'label' =>
lang('active'), 'sortable' => false, 'resizeable' => true),
+ array('key' => 'status', 'label' =>
lang('status'), 'sortable' => false, 'resizeable' => true),
+ array('key' => 'customer_name', 'label' =>
lang('who'), 'sortable' => true, 'resizeable' => true),
array('key' => 'location', 'label' =>
lang('location'), 'sortable' => false, 'resizeable' => true),
- array('key' => 'customer_name', 'label' =>
lang('who'), 'sortable' => true, 'resizeable' => true),
array('key' => 'comment', 'label' =>
lang('Note'), 'sortable' => false, 'resizeable' => true),
array('key' => 'application_id', 'hidden' =>
true),
);
@@ -382,7 +383,7 @@
'list_case_officer' => array('options' =>
$case_officer_options),
'cat_select' =>
$this->cats->formatted_xslt_list(array(
'select_name' => 'category_id',
- 'selected' =>
$application->category_id,
+ 'selected' =>
$application->category_id ? $application->category_id : $default_category,
'use_acl' => $this->_category_acl,
'required' => true)),
'status_list' => array('options' =>
$this->get_status_options($application->status)),
Modified: trunk/eventplanner/inc/model/class.application.inc.php
===================================================================
--- trunk/eventplanner/inc/model/class.application.inc.php 2017-01-19
17:57:55 UTC (rev 16171)
+++ trunk/eventplanner/inc/model/class.application.inc.php 2017-01-20
15:13:21 UTC (rev 16172)
@@ -48,6 +48,7 @@
$vendor_id,
$vendor_name,
$status,
+ $num_granted_events,
$created,
$modified,
$secret,
@@ -144,6 +145,11 @@
'label' => 'status',
'history' => true
),
+ 'num_granted_events' => array('action'=>
PHPGW_ACL_ADD | PHPGW_ACL_EDIT,
+ 'type' => 'int',
+ 'label' => 'number of granted events',
+ 'history' => true
+ ),
'created' => array('action'=> PHPGW_ACL_READ |
PHPGW_ACL_ADD,
'type' => 'date',
'label' => 'created',
@@ -293,7 +299,7 @@
),
'timespan' => array('action'=> PHPGW_ACL_ADD |
PHPGW_ACL_EDIT,
'type' => 'int',
- 'label' => 'timespan',
+ 'label' => 'event timespan',
'required' => true,
'history' => true,
),
Modified: trunk/eventplanner/js/portico/application.edit.js
===================================================================
--- trunk/eventplanner/js/portico/application.edit.js 2017-01-19 17:57:55 UTC
(rev 16171)
+++ trunk/eventplanner/js/portico/application.edit.js 2017-01-20 15:13:21 UTC
(rev 16172)
@@ -20,7 +20,14 @@
{
return;
}
+ var id = $("#application_id").val();
+ if(id > 0)
+ {
+ document.form.submit();
+ return;
+ }
+
if (active_tab === 'first_tab')
{
$('#tab-content').responsiveTabs('activate', 1);
@@ -143,6 +150,8 @@
check_button_names = function ()
{
var tab = $("#active_tab").val();
+ var id = $("#application_id").val();
+
if (tab === 'calendar')
{
$("#floating-box").hide();
@@ -150,8 +159,16 @@
}
else if (tab === 'first_tab')
{
- $("#save_button").val(lang['next']);
- $("#save_button_bottom").val(lang['next']);
+ if(id > 0)
+ {
+ $("#save_button").val(lang['save']);
+ $("#save_button_bottom").val(lang['save']);
+ }
+ else
+ {
+ $("#save_button").val(lang['next']);
+ $("#save_button_bottom").val(lang['next']);
+ }
$("#floating-box").show();
$("#submit_group_bottom").show();
}
Modified: trunk/eventplanner/setup/phpgw_no.lang
===================================================================
--- trunk/eventplanner/setup/phpgw_no.lang 2017-01-19 17:57:55 UTC (rev
16171)
+++ trunk/eventplanner/setup/phpgw_no.lang 2017-01-20 15:13:21 UTC (rev
16172)
@@ -7,6 +7,7 @@
list eventplanner no Liste
general eventplanner no Generell
dates eventplanner no Datoer
+event dates eventplanner no Arrangement-dato
custom attributes eventplanner no Egendefinerte attributter
no category eventplanner no Kategori ikke valgt
time created eventplanner no Tidsstempel
@@ -31,18 +32,20 @@
contact phone eventplanner no Tlf. kontaktperson
case officer eventplanner no Saksbehandler
active eventplanner no Aktiv
+inactive eventplanner no Inaktiv
select eventplanner no Velg
remark eventplanner no Merknad
comment eventplanner no Kommentar
demands eventplanner no Forutsetning
payment eventplanner no Betaling
-labour support eventplanner no Personellstøtte
+labour support eventplanner no Opprigging/nedrigging
technical support eventplanner no Teknisk støtte
-charge per unit eventplanner no betaling pr stk
-timespan eventplanner no Varighet (min.)
+charge per unit eventplanner no Betaling pr
forestilling/kurs/omvisning
+event timespan eventplanner no Programvarighet (minutter)
number of units eventplanner no Antall arrangement
integer eventplanner no Heltall
-total amount eventplanner no Sum
+total amount eventplanner no Søknadssum
+number of granted events eventplanner no Antall innvilgede
arrangementer
created eventplanner no Registrert
modified eventplanner no Endret
id eventplanner no Id
@@ -56,15 +59,18 @@
other participants eventplanner no Navn på andre medvirkende (+
rolle)
arena requirement eventplanner no Krav til lokale
stage eventplanner no Scene
+size of stage eventplanner no Scenestørrelse
stage requirement eventplanner no Krav til scene
width eventplanner no Bredde
depth eventplanner no Dybde
-wardrobe eventplanner no Garderobe
+wardrobe eventplanner no Behov for utøvergarderobe
audience limit eventplanner no Maksimum antall publikum
-raider eventplanner no Raider
+raider eventplanner no Andre raiderønsker – (valgfri)
vendor report eventplanner no Utøverrapport
calendar eventplanner no Kalender
from eventplanner no Fra
+event start eventplanner no Ønsket arrangement dato/tid
+select event start eventplanner no Klikk på og velg ønsket måned,
dato og klokkeslett
select all eventplanner no Velg alle
enable eventplanner no Aktiver
disable eventplanner no Deaktiver
@@ -74,4 +80,14 @@
note eventplanner no Merknad
customer eventplanner no Mottakersted
customer report eventplanner no Rapport fra mottakersted
-organization number eventplanner no Organisasjonsnummer
\ No newline at end of file
+organization number eventplanner no Organisasjonsnummer
+program type eventplanner no Programtype
+program title eventplanner no Programtittel
+program description eventplanner no Programbeskrivelse
+zip code eventplanner no Postnummer
+city eventplanner no Sted
+address eventplanner no Adresse
+account number eventplanner no Kontonummer
+history eventplanner no Endringslogg
+user eventplanner no Bruker
+proceedings eventplanner no Saksbehandling
\ No newline at end of file
Modified: trunk/eventplanner/setup/setup.inc.php
===================================================================
--- trunk/eventplanner/setup/setup.inc.php 2017-01-19 17:57:55 UTC (rev
16171)
+++ trunk/eventplanner/setup/setup.inc.php 2017-01-20 15:13:21 UTC (rev
16172)
@@ -11,7 +11,7 @@
* @version $Id: setup.inc.php 14728 2016-02-11 22:28:46Z sigurdne $
*/
$setup_info['eventplanner']['name'] = 'eventplanner';
- $setup_info['eventplanner']['version'] = '0.9.18.002';
+ $setup_info['eventplanner']['version'] = '0.9.18.003';
$setup_info['eventplanner']['app_order'] = 20;
$setup_info['eventplanner']['enable'] = 1;
$setup_info['eventplanner']['app_group'] = 'office';
@@ -68,6 +68,7 @@
/* The hooks this app includes, needed for hooks registration */
$setup_info['eventplanner']['hooks'] = array(
+ 'config',
'manual',
'settings',
'help',
Modified: trunk/eventplanner/setup/tables_current.inc.php
===================================================================
--- trunk/eventplanner/setup/tables_current.inc.php 2017-01-19 17:57:55 UTC
(rev 16171)
+++ trunk/eventplanner/setup/tables_current.inc.php 2017-01-20 15:13:21 UTC
(rev 16172)
@@ -138,6 +138,7 @@
'date_start' => array('type' => 'int',
'precision' => '8', 'nullable' => False),
'date_end' => array('type' => 'int',
'precision' => '8', 'nullable' => False),
'modified' => array('type' => 'int',
'precision' => '8', 'nullable' => False),
+ 'num_granted_events' => array('type' => 'int',
'precision' => '4', 'nullable' => True,'default' => '0'),
'frontend_modified' => array('type' => 'int',
'precision' => '8', 'nullable' => True),
'other_participants' => array('type' => 'text',
'nullable' => True),
'title' => array('type' => 'text', 'nullable'
=> False),
Modified: trunk/eventplanner/setup/tables_update.inc.php
===================================================================
--- trunk/eventplanner/setup/tables_update.inc.php 2017-01-19 17:57:55 UTC
(rev 16171)
+++ trunk/eventplanner/setup/tables_update.inc.php 2017-01-20 15:13:21 UTC
(rev 16172)
@@ -43,3 +43,19 @@
}
return $GLOBALS['setup_info']['eventplanner']['currentver'];
}
+
+ $test[] = '0.9.18.002';
+
+ function eventplanner_upgrade0_9_18_002()
+ {
+ $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
$GLOBALS['phpgw_setup']->oProc->AddColumn('eventplanner_application',
'num_granted_events', array(
+ 'type' => 'int', 'precision' => 4, 'nullable' =>
True,'default' => 0));
+
+ if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+ {
+ $GLOBALS['setup_info']['eventplanner']['currentver'] =
'0.9.18.003';
+ }
+ return $GLOBALS['setup_info']['eventplanner']['currentver'];
+ }
Modified: trunk/eventplanner/templates/base/application.xsl
===================================================================
--- trunk/eventplanner/templates/base/application.xsl 2017-01-19 17:57:55 UTC
(rev 16171)
+++ trunk/eventplanner/templates/base/application.xsl 2017-01-20 15:13:21 UTC
(rev 16172)
@@ -46,13 +46,29 @@
<xsl:value-of
disable-output-escaping="yes" select="tabs"/>
<div id="floating-box">
<div id="submitbox">
+ <xsl:variable
name="lang_cancel">
+ <xsl:value-of
select="php:function('lang', 'cancel')"/>
+ </xsl:variable>
+ <xsl:variable
name="lang_save">
+ <xsl:value-of
select="php:function('lang', 'next')"/>
+ </xsl:variable>
+ <!--xsl:choose>
+ <xsl:when
test="application/id > 0">
+
<xsl:variable name="lang_save">
+
<xsl:value-of select="php:function('lang', 'save')"/>
+
</xsl:variable>
+ </xsl:when>
+ <xsl:otherwise>
+
<xsl:variable name="lang_save">
+
<xsl:value-of select="php:function('lang', 'next')"/>
+
</xsl:variable>
+ </xsl:otherwise>
+ </xsl:choose-->
+
<table width="200px">
<tbody>
<tr>
<td width="200px">
-
<xsl:variable name="lang_save">
-
<xsl:value-of select="php:function('lang', 'next')"/>
-
</xsl:variable>
<input type="button" class="pure-button pure-button-primary"
name="save" id="save_button" onClick="validate_submit();">
<xsl:attribute name="value">
<xsl:value-of select="$lang_save"/>
@@ -63,9 +79,6 @@
</input>
</td>
<td>
-
<xsl:variable name="lang_cancel">
-
<xsl:value-of select="php:function('lang', 'cancel')"/>
-
</xsl:variable>
<input type="button" class="pure-button pure-button-primary"
name="done" value="{$lang_cancel}" onClick="window.location = '{cancel_url}';">
<xsl:attribute name="title">
<xsl:value-of select="php:function('lang', 'Back to the
ticket list')"/>
@@ -80,6 +93,9 @@
<input type="hidden" id="active_tab"
name="active_tab" value="{value_active_tab}"/>
<div id="first_tab">
<fieldset>
+ <legend>
+ <xsl:value-of
select="php:function('lang', 'application')"/>
+ </legend>
<xsl:if
test="application/id > 0">
<div
class="pure-control-group">
<label>
@@ -124,6 +140,8 @@
<xsl:text>
</xsl:text>
<a
href="{new_vendor_url}" target="_blank">
<xsl:value-of select="php:function('lang', 'new')"/>
+
<xsl:text> </xsl:text>
+
<xsl:value-of select="$lang_vendor"/>
</a>
<div
id="vendor_container"/>
</div>
@@ -135,26 +153,9 @@
<xsl:value-of select="application/other_participants"/>
</textarea>
</div>
+
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'active')"/>
- </label>
- <input
type="checkbox" name="active" id="active" value="1">
- <xsl:if
test="application/active = 1">
-
<xsl:attribute name="checked" value="checked"/>
-
</xsl:if>
- </input>
- </div>
- <div
class="pure-control-group">
- <label>
-
<xsl:value-of select="php:function('lang', 'case officer')"/>
- </label>
- <select
id="case_officer_id" name="case_officer_id">
-
<xsl:apply-templates select="list_case_officer/options"/>
- </select>
- </div>
- <div
class="pure-control-group">
- <label>
<xsl:value-of select="php:function('lang', 'contact name')"/>
</label>
<input
type="text" id="contact_name" name="contact_name"
value="{application/contact_name}">
@@ -204,8 +205,35 @@
</div>
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'type')"/>
+
<xsl:value-of select="php:function('lang', 'program title')"/>
</label>
+ <input
type="text" id="title" name="title" value="{application/title}">
+
<xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="php:function('lang', 'program title')"/>
+
</xsl:attribute>
+
<xsl:attribute name="placeholder">
+
<xsl:value-of select="php:function('lang', 'program title')"/>
+
</xsl:attribute>
+ </input>
+ </div>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'program description')"/>
+ </label>
+ <textarea
cols="47" rows="7" name="description">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'might be published')"/>
+
</xsl:attribute>
+
<xsl:value-of select="application/description"/>
+ </textarea>
+ </div>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'program type')"/>
+ </label>
<div
class="pure-custom">
<table
class="pure-table pure-table-bordered" border="0" cellspacing="2"
cellpadding="2">
<thead>
@@ -214,7 +242,7 @@
<xsl:value-of select="php:function('lang', 'select')"/>
</th>
<th>
-
<xsl:value-of select="php:function('lang', 'type')"/>
+
<xsl:value-of select="php:function('lang', 'program
type')"/>
</th>
</tr>
</thead>
@@ -238,30 +266,8 @@
</div>
</div>
+
<div
class="pure-control-group">
- <xsl:variable
name="lang_status">
-
<xsl:value-of select="php:function('lang', 'status')"/>
- </xsl:variable>
- <label>
-
<xsl:value-of select="$lang_status"/>
- </label>
- <select
name="status">
-
<xsl:attribute name="title">
-
<xsl:value-of select="$lang_status"/>
-
</xsl:attribute>
-
<!--xsl:attribute name="data-validation">
-
<xsl:text>required</xsl:text>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-error-msg">
-
<xsl:value-of select="$lang_status"/>
-
</xsl:attribute-->
- <option
value="">
-
<xsl:value-of select="$lang_status"/>
-
</option>
-
<xsl:apply-templates select="status_list/options"/>
- </select>
- </div>
- <div
class="pure-control-group">
<xsl:variable
name="lang_date_start">
<xsl:value-of select="php:function('lang', 'date start')"/>
</xsl:variable>
@@ -307,7 +313,7 @@
</div>
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'timespan')"/>
+
<xsl:value-of select="php:function('lang', 'event timespan')"/>
</label>
<input
type="text" id="timespan" name="timespan" value="{application/timespan}">
<xsl:attribute name="data-validation">
@@ -314,10 +320,10 @@
<xsl:text>number</xsl:text>
</xsl:attribute>
<xsl:attribute name="data-validation-error-msg">
-
<xsl:value-of select="php:function('lang', 'timespan')"/>
+
<xsl:value-of select="php:function('lang', 'event timespan')"/>
</xsl:attribute>
<xsl:attribute name="placeholder">
-
<xsl:value-of select="php:function('lang', 'timespan')"/>
+
<xsl:value-of select="php:function('lang', 'event timespan')"/>
</xsl:attribute>
</input>
@@ -362,40 +368,69 @@
</label>
<input
id="total_amount" type="text" disabled="disabled"/>
</div>
+
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'title')"/>
+
<xsl:value-of select="php:function('lang', 'remark')"/>
</label>
- <input
type="text" id="title" name="title" value="{application/title}">
-
<xsl:attribute name="data-validation">
-
<xsl:text>required</xsl:text>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-error-msg">
-
<xsl:value-of select="php:function('lang', 'title')"/>
-
</xsl:attribute>
-
<xsl:attribute name="placeholder">
-
<xsl:value-of select="php:function('lang', 'title')"/>
-
</xsl:attribute>
+ <textarea
cols="47" rows="7" name="remark">
+
<xsl:value-of select="application/remark"/>
+ </textarea>
+ </div>
+ </fieldset>
+ <fieldset>
+ <legend>
+ <xsl:value-of
select="php:function('lang', 'proceedings')"/>
+ </legend>
+
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'case officer')"/>
+ </label>
+ <select
id="case_officer_id" name="case_officer_id">
+
<xsl:apply-templates select="list_case_officer/options"/>
+ </select>
+ </div>
+ <div
class="pure-control-group">
+ <label>
+
<xsl:value-of select="php:function('lang', 'active')"/>
+ </label>
+ <input
type="checkbox" name="active" id="active" value="1">
+ <xsl:if
test="application/active = 1">
+
<xsl:attribute name="checked" value="checked"/>
+
</xsl:if>
</input>
</div>
+
<div
class="pure-control-group">
+ <xsl:variable
name="lang_status">
+
<xsl:value-of select="php:function('lang', 'status')"/>
+ </xsl:variable>
<label>
-
<xsl:value-of select="php:function('lang', 'description')"/>
+
<xsl:value-of select="$lang_status"/>
</label>
- <textarea
cols="47" rows="7" name="description">
+ <select
name="status">
<xsl:attribute name="title">
-
<xsl:value-of select="php:function('lang', 'might be published')"/>
+
<xsl:value-of select="$lang_status"/>
</xsl:attribute>
-
<xsl:value-of select="application/description"/>
- </textarea>
+
<!--xsl:attribute name="data-validation">
+
<xsl:text>required</xsl:text>
+
</xsl:attribute>
+
<xsl:attribute name="data-validation-error-msg">
+
<xsl:value-of select="$lang_status"/>
+
</xsl:attribute-->
+ <option
value="">
+
<xsl:value-of select="$lang_status"/>
+
</option>
+
<xsl:apply-templates select="status_list/options"/>
+ </select>
</div>
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'remark')"/>
+
<xsl:value-of select="php:function('lang', 'number of granted events')"/>
</label>
- <textarea
cols="47" rows="7" name="remark">
-
<xsl:value-of select="application/remark"/>
- </textarea>
+ <input
type="text" id="num_granted_events" name="num_granted_events"
value="{application/num_granted_events}">
+ </input>
</div>
<div
class="pure-control-group">
<label>
@@ -433,7 +468,7 @@
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'stage')"/>
+
<xsl:value-of select="php:function('lang', 'size of stage')"/>
</label>
<input
type="text" id="stage_width" name="stage_width"
value="{application/stage_width}" size="2">
<xsl:attribute name="title">
@@ -503,7 +538,6 @@
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'support')"/>
</label>
<div
class="pure-custom">
<table
class="pure-table pure-table-bordered" border="0" cellspacing="2"
cellpadding="2">
@@ -510,9 +544,7 @@
<thead>
<tr>
<th></th>
-
<th>minutt før</th>
-
<th>Antall personer</th>
-
<th>minutt etter</th>
+
<th>Minutt</th>
</tr>
</thead>
<tbody>
@@ -529,53 +561,12 @@
</input>
</td>
-
<td>
-
<input type="text" id="rig_up_num_person"
name="rig_up_num_person" value="{application/rig_up_num_person}" size="3">
-
<xsl:attribute name="data-validation">
-
<xsl:text>number</xsl:text>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-optional">
-
<xsl:text>true</xsl:text>
-
</xsl:attribute>
-
</input>
-
</td>
-
<td>
-
</td>
</tr>
+
<tr>
-
<td>Hjelp undervegs i arrangement</td>
-
<td>
-
</td>
-
-
<td>
-
<input type="text" id="during_num_person"
name="during_num_person" value="{application/during_num_person}" size="3">
-
<xsl:attribute name="data-validation">
-
<xsl:text>number</xsl:text>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-optional">
-
<xsl:text>true</xsl:text>
-
</xsl:attribute>
-
</input>
-
</td>
-
<td>
-
</td>
-
</tr>
-
<tr>
<td>Hjelp til nedrigging</td>
-
<td>
-
</td>
<td>
-
<input type="text" id="rig_down_num_person"
name="rig_down_num_person" value="{application/rig_down_num_person}" size="3">
-
<xsl:attribute name="data-validation">
-
<xsl:text>number</xsl:text>
-
</xsl:attribute>
-
<xsl:attribute name="data-validation-optional">
-
<xsl:text>true</xsl:text>
-
</xsl:attribute>
-
</input>
-
</td>
-
<td>
<input type="text" id="rig_down_min_after"
name="rig_down_min_after" value="{application/rig_down_min_after}" size="3">
<xsl:attribute name="data-validation">
<xsl:text>number</xsl:text>
@@ -597,7 +588,6 @@
</legend>
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'support')"/>
</label>
<div
class="pure-custom">
<table
class="pure-table pure-table-bordered" border="0" cellspacing="2"
cellpadding="2">
@@ -604,7 +594,7 @@
<thead>
<tr>
<th>Hva</th>
-
<th>Ja/Nei</th>
+
<th>Ja</th>
<th>Fritekst</th>
</tr>
</thead>
@@ -687,7 +677,6 @@
</legend>
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'raider')"/>
</label>
<textarea
cols="47" rows="7" name="raider">
<xsl:value-of select="application/raider"/>
@@ -716,7 +705,7 @@
</div>
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'timespan')"/>
+
<xsl:value-of select="php:function('lang', 'event timespan')"/>
</label>
<xsl:if
test="application/date_end != 0 and application/timespan != ''">
<xsl:value-of select="application/timespan"/>
@@ -725,9 +714,12 @@
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'from')"/>
+
<xsl:value-of select="php:function('lang', 'event start')"/>
</label>
<input
type="text" id="from_" name="from_" size="16" readonly="readonly">
+
<xsl:attribute name="title">
+
<xsl:value-of select="php:function('lang', 'select event start')"/>
+
</xsl:attribute>
</input>
</div>
<!--div
class="pure-control-group">
@@ -740,7 +732,7 @@
<div
class="pure-control-group">
<label>
-
<xsl:value-of select="php:function('lang', 'dates')"/>
+
<xsl:value-of select="php:function('lang', 'event dates')"/>
</label>
<div
class="pure-custom">
<xsl:for-each select="datatable_def">
Modified: trunk/eventplanner/templates/base/booking.xsl
===================================================================
--- trunk/eventplanner/templates/base/booking.xsl 2017-01-19 17:57:55 UTC
(rev 16171)
+++ trunk/eventplanner/templates/base/booking.xsl 2017-01-20 15:13:21 UTC
(rev 16172)
@@ -323,7 +323,7 @@
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'timespan')"/>
+ <xsl:value-of
select="php:function('lang', 'event timespan')"/>
</label>
<xsl:value-of
select="application/timespan"/>
</div>
Modified: trunk/eventplanner/templates/base/config.tpl
===================================================================
--- trunk/eventplanner/templates/base/config.tpl 2017-01-19 17:57:55 UTC
(rev 16171)
+++ trunk/eventplanner/templates/base/config.tpl 2017-01-20 15:13:21 UTC
(rev 16172)
@@ -1,30 +1,35 @@
<!-- BEGIN header -->
<form method="POST" action="{action_url}">
<table class="pure-table pure-table-bordered">
- <!--
- <tr class="th">
+ <tr class="th">
<td colspan="2"><font
color="{th_text}"> <b>{title}</b></font></td>
- </tr>
- -->
+ </tr>
<!-- END header -->
<!-- BEGIN body -->
+ <tr>
+ <td>{lang_default_application_category}:</td>
+ <td>
+ <select
name="newsettings[default_application_category]">
+ {hook_default_application_category}
+ </select>
+ </td>
+ </tr>
<!-- END body -->
<!-- BEGIN footer -->
- <!--
- <tr class="th">
+
+ <tr class="th">
<td colspan="2">
-
+
</td>
- </tr>
+ </tr>
- <tr>
+ <tr>
<td colspan="2" align="center">
- <input type="submit" name="submit"
value="{lang_submit}">
- <input type="submit" name="cancel"
value="{lang_cancel}">
+ <input type="submit" name="submit"
value="{lang_submit}">
+ <input type="submit" name="cancel"
value="{lang_cancel}">
</td>
- </tr>
- -->
+ </tr>
</table>
</form>
<!-- END footer -->
Modified: trunk/eventplanner/templates/base/vendor.xsl
===================================================================
--- trunk/eventplanner/templates/base/vendor.xsl 2017-01-19 17:57:55 UTC
(rev 16171)
+++ trunk/eventplanner/templates/base/vendor.xsl 2017-01-20 15:13:21 UTC
(rev 16172)
@@ -88,10 +88,12 @@
</div>
<div class="pure-control-group">
<xsl:variable
name="lang_address_1">
- <xsl:value-of
select="php:function('lang', 'address_1')"/>
+ <xsl:value-of
select="php:function('lang', 'address')"/>
+ <xsl:text>
1</xsl:text>
</xsl:variable>
<xsl:variable
name="lang_address_2">
- <xsl:value-of
select="php:function('lang', 'address_2')"/>
+ <xsl:value-of
select="php:function('lang', 'address')"/>
+ <xsl:text>
2</xsl:text>
</xsl:variable>
<label>
<xsl:value-of
select="php:function('lang', 'address')"/>
@@ -113,7 +115,7 @@
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'postal_code_place')"/>
+ <xsl:value-of
select="php:function('lang', 'zip code')"/>
</label>
<input type="text"
name="zip_code" value="{vendor/zip_code}">
<xsl:attribute
name="data-validation">
@@ -120,7 +122,7 @@
<xsl:text>required</xsl:text>
</xsl:attribute>
<xsl:attribute
name="placeholder">
-
<xsl:value-of select="php:function('lang', 'zip_code')"/>
+
<xsl:value-of select="php:function('lang', 'zip code')"/>
</xsl:attribute>
</input>
<input type="text"
name="city" value="{vendor/city}">
@@ -134,7 +136,7 @@
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'vendor_organization_number')"/>
+ <xsl:value-of
select="php:function('lang', 'organization number')"/>
</label>
<input type="text"
id="lastname" name="vendor_organization_number"
value="{vendor/vendor_organization_number}">
<xsl:attribute
name="data-validation">
@@ -141,13 +143,13 @@
<xsl:text>required</xsl:text>
</xsl:attribute>
<xsl:attribute
name="placeholder">
-
<xsl:value-of select="php:function('lang', 'vendor_organization_number')"/>
+
<xsl:value-of select="php:function('lang', 'organization number')"/>
</xsl:attribute>
</input>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'contact_name')"/>
+ <xsl:value-of
select="php:function('lang', 'contact name')"/>
</label>
<input type="text"
name="contact_name" value="{vendor/contact_name}">
<xsl:attribute
name="data-validation">
@@ -154,7 +156,7 @@
<xsl:text>required</xsl:text>
</xsl:attribute>
<xsl:attribute
name="placeholder">
-
<xsl:value-of select="php:function('lang', 'contact_name')"/>
+
<xsl:value-of select="php:function('lang', 'contact name')"/>
</xsl:attribute>
</input>
</div>
@@ -173,7 +175,7 @@
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'contact_phone')"/>
+ <xsl:value-of
select="php:function('lang', 'contact phone')"/>
</label>
<input type="text"
name="contact_phone" value="{vendor/contact_phone}">
<xsl:attribute
name="data-validation">
@@ -180,13 +182,13 @@
<xsl:text>required</xsl:text>
</xsl:attribute>
<xsl:attribute
name="placeholder">
-
<xsl:value-of select="php:function('lang', 'contact_phone')"/>
+
<xsl:value-of select="php:function('lang', 'contact phone')"/>
</xsl:attribute>
</input>
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'account_number')"/>
+ <xsl:value-of
select="php:function('lang', 'account number')"/>
</label>
<input type="text"
name="account_number" value="{vendor/account_number}">
<xsl:attribute
name="data-validation">
@@ -193,7 +195,7 @@
<xsl:text>required</xsl:text>
</xsl:attribute>
<xsl:attribute
name="placeholder">
-
<xsl:value-of select="php:function('lang', 'account_number')"/>
+
<xsl:value-of select="php:function('lang', 'account number')"/>
</xsl:attribute>
</input>
</div>
@@ -226,7 +228,7 @@
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'details')"/>
+ <xsl:value-of
select="php:function('lang', 'history')"/>
</label>
<div
class="pure-custom">
<xsl:for-each
select="datatable_def">
Modified: trunk/eventplanner/templates/base/vendor_report.xsl
===================================================================
--- trunk/eventplanner/templates/base/vendor_report.xsl 2017-01-19 17:57:55 UTC
(rev 16171)
+++ trunk/eventplanner/templates/base/vendor_report.xsl 2017-01-20 15:13:21 UTC
(rev 16172)
@@ -69,7 +69,7 @@
</div>
<div class="pure-control-group">
<label>
- <xsl:value-of
select="php:function('lang', 'timespan')"/>
+ <xsl:value-of
select="php:function('lang', 'event timespan')"/>
</label>
<xsl:value-of
select="application/timespan"/>
</div>
Modified: trunk/phpgwapi/inc/class.categories.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.categories.inc.php 2017-01-19 17:57:55 UTC (rev
16171)
+++ trunk/phpgwapi/inc/class.categories.inc.php 2017-01-20 15:13:21 UTC (rev
16172)
@@ -269,8 +269,8 @@
'main' =>
$this->db->f('cat_main'),
'level' =>
$this->db->f('cat_level'),
'parent' =>
$this->db->f('cat_parent'),
- 'name' =>
$this->db->f('cat_name'),
- 'description' =>
$this->db->f('cat_description'),
+ 'name' =>
$this->db->f('cat_name',true),
+ 'description' =>
$this->db->f('cat_description',true),
'data' =>
$this->db->f('cat_data'),
'last_mod' =>
$this->db->f('last_mod'),
'active' =>
(int)$this->db->f('active')
@@ -367,8 +367,8 @@
'main' =>
(int)$this->db->f('cat_main'),
'level' =>
(int)$this->db->f('cat_level'),
'parent' =>
(int)$this->db->f('cat_parent'),
- 'name' =>
$this->db->f('cat_name'),
- 'description' =>
$this->db->f('cat_description'),
+ 'name' =>
$this->db->f('cat_name',true),
+ 'description' =>
$this->db->f('cat_description',true),
'data' =>
$this->db->f('cat_data'),
'active' =>
(int)$this->db->f('active')
);
@@ -413,8 +413,8 @@
'main' =>
(int)$this->db->f('cat_main'),
'level' =>
(int)$this->db->f('cat_level'),
'parent' =>
(int)$this->db->f('cat_parent'),
- 'name' =>
$this->db->f('cat_name'),
- 'description' =>
$this->db->f('cat_description'),
+ 'name' =>
$this->db->f('cat_name',true),
+ 'description' =>
$this->db->f('cat_description',true),
'data' =>
$this->db->f('cat_data'),
'active' =>
(int)$this->db->f('active')
);
@@ -595,9 +595,9 @@
}
*/
- $s .= '>' . str_repeat(' ' ,
(int)$cat['level'] ) . $GLOBALS['phpgw']->strip_html($cat['name']);
+ $s .= '>' . str_repeat('. ' ,
(int)$cat['level'] ) . $GLOBALS['phpgw']->strip_html($cat['name']);
- $s .=
$GLOBALS['phpgw']->strip_html($cat['name']);
+// $s .=
$GLOBALS['phpgw']->strip_html($cat['name']);
if ($cat['app_name'] == 'phpgw')
{
$s .= ' [' .
lang('Global') . ']';
Modified: trunk/phpgwapi/templates/pure/css/pure-extension.css
===================================================================
--- trunk/phpgwapi/templates/pure/css/pure-extension.css 2017-01-19
17:57:55 UTC (rev 16171)
+++ trunk/phpgwapi/templates/pure/css/pure-extension.css 2017-01-20
15:13:21 UTC (rev 16172)
@@ -328,4 +328,10 @@
ul#audience {list-style: none;padding-left: 10px;}
/* AUTOCOMPLETE */
-.ui-widget.ui-autocomplete {max-height: 224px;overflow-x: hidden;overflow-y:
auto;}
\ No newline at end of file
+.ui-widget.ui-autocomplete {max-height: 224px;overflow-x: hidden;overflow-y:
auto;}
+
+
+.pure-form input[type="text"][disabled], .pure-form
input[type="password"][disabled], .pure-form input[type="email"][disabled],
.pure-form input[type="url"][disabled], .pure-form
input[type="date"][disabled], .pure-form input[type="month"][disabled],
.pure-form input[type="time"][disabled], .pure-form
input[type="datetime"][disabled], .pure-form
input[type="datetime-local"][disabled], .pure-form
input[type="week"][disabled], .pure-form input[type="number"][disabled],
.pure-form input[type="search"][disabled], .pure-form
input[type="tel"][disabled], .pure-form input[type="color"][disabled],
.pure-form select[disabled], .pure-form textarea[disabled]
+{
+ color: #050000;
+}
\ No newline at end of file
| [Prev in Thread] | Current Thread | [Next in Thread] |