Author: ralfbecker
Date: Sun Apr 24 15:41:36 2016
New Revision: 55813
URL: http://svn.stylite.de/viewvc/egroupware?rev=55813&view=rev
Log:
use new et2 config
Added:
trunk/calendar/templates/default/config.xet (with props)
Removed:
trunk/calendar/templates/default/config.tpl
Modified:
trunk/admin/templates/default/site-config.xet
trunk/calendar/inc/class.calendar_hooks.inc.php
trunk/calendar/inc/class.calendar_ui.inc.php
Modified: trunk/admin/templates/default/site-config.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/admin/templates/default/site-config.xet?rev=55813&r1=55812&r2=55813&view=diff
==============================================================================
--- trunk/admin/templates/default/site-config.xet (original)
+++ trunk/admin/templates/default/site-config.xet Sun Apr 24 15:41:36 2016
@@ -4,7 +4,7 @@
<overlay>
<template id="admin.site-config" template="" lang="" group="0" version="16.1">
<description value="Site configuration" class="subHeader"/>
- <template id="template" template="@template" width="100%"/>
+ <template template="@template" width="100%"/>
<hbox class="dialogFooterToolbar">
<button id="save" label="Save"/>
<button id="apply" label="Apply"/>
Modified: trunk/calendar/inc/class.calendar_hooks.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/inc/class.calendar_hooks.inc.php?rev=55813&r1=55812&r2=55813&view=diff
==============================================================================
--- trunk/calendar/inc/class.calendar_hooks.inc.php (original)
+++ trunk/calendar/inc/class.calendar_hooks.inc.php Sun Apr 24 15:41:36 2016
@@ -5,7 +5,7 @@
* @link http://www.egroupware.org
* @package calendar
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
- * @copyright (c) 2004-14 by RalfBecker-At-outdoor-training.de
+ * @copyright (c) 2004-16 by RalfBecker-At-outdoor-training.de
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
*/
@@ -79,7 +79,7 @@
static function admin()
{
$file = Array(
- 'Site Configuration' => egw::link('/index.php','menuaction=admin.uiconfig.index&appname=calendar'),
+ 'Site Configuration' => egw::link('/index.php','menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
'Custom fields' => egw::link('/index.php','menuaction=admin.customfields.index&appname=calendar'),
'Calendar Holiday Management' => egw::link('/index.php','menuaction=calendar.uiholiday.admin'),
'Global Categories' => egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar'),
Modified: trunk/calendar/inc/class.calendar_ui.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/inc/class.calendar_ui.inc.php?rev=55813&r1=55812&r2=55813&view=diff
==============================================================================
--- trunk/calendar/inc/class.calendar_ui.inc.php (original)
+++ trunk/calendar/inc/class.calendar_ui.inc.php Sun Apr 24 15:41:36 2016
@@ -370,7 +370,7 @@
}
$this->view_menuaction = $this->view == 'listview' ? 'calendar.calendar_uilist.listview' : 'calendar.calendar_uiviews.index';
- if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1) session was %2, states now %3',True,$set_states,$states_session,$states);
+ if ($this->debug > 0 || $this->debug == 'manage_states') $this->bo->debug_message('uical::manage_states(%1), states now %3',True,$set_states,$states);
// save the states in the session only when we are in calendar
if ($GLOBALS['egw_info']['flags']['currentapp']=='calendar')
{
@@ -480,7 +480,6 @@
*/
function sidebox_menu()
{
- $link_vars = array();
// Magic etemplate2 favorites menu (from framework)
display_sidebox('calendar', lang('Favorites'), egw_framework::favorite_list('calendar'));
@@ -520,7 +519,7 @@
if ($GLOBALS['egw_info']['user']['apps']['admin'])
{
$file = Array(
- 'Configuration'=>egw::link('/index.php','menuaction=admin.uiconfig.index&appname=calendar'),
+ 'Configuration'=>egw::link('/index.php','menuaction=admin.admin_config.index&appname=calendar&ajax=true'),
'Custom Fields'=>egw::link('/index.php','menuaction=admin.customfields.index&appname=calendar'),
'Holiday Management'=>egw::link('/index.php','menuaction=calendar.uiholiday.admin'),
'Global Categories' =>egw::link('/index.php','menuaction=admin.admin_categories.index&appname=calendar'),
@@ -688,6 +687,7 @@
}
$event['non_blocking'] = (bool)$event['non_blocking'];
+ $matches = null;
if(!(int)$event['id'] && preg_match('/^([a-z_-]+)([0-9]+)$/i',$event['id'],$matches))
{
$app = $matches[1];
Added: trunk/calendar/templates/default/config.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/calendar/templates/default/config.xet?rev=55813&view=auto
==============================================================================
--- trunk/calendar/templates/default/config.xet (added)
+++ trunk/calendar/templates/default/config.xet Sun Apr 24 15:41:36 2016
@@ -1,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE overlay PUBLIC "-//Stylite AG//eTemplate 2//EN" "http://www.egroupware.org/etemplate2.dtd">
+<!-- $Id$ -->
+<overlay>
+ <template id="calendar.config" template="" lang="" group="0" version="16.1">
+ <grid width="100%" class="admin-config egwGridView_grid">
+ <columns>
+ <column width="60%"/>
+ <column/>
+ </columns>
+ <rows>
+ <row>
+ <description value="Do you wish to autoload calendar holidays files dynamically?"/>
+ <select id="newsettings[auto_load_holidays]">
+ <option value="">No</option>
+ <option value="True">Yes</option>
+ </select>
+ </row>
+ <row>
+ <description value="Location to autoload from" label="%s:"/>
+ <select id="newsettings[holidays_url_path]">
+ <option value="localhost">localhost</option>
+ <option value="http://www.egroupware.org/cal">www.egroupware.org</option>
+ </select>
+ </row>
+ <row>
+ <description value="setting lock time calender" label="%s:"/>
+ <textbox id="newsettings[Lock_Time_Calender]" size="40"/>
+ </row>
+ <row>
+ <description value="Deny Ressources reservation for private events" label="%s:"/>
+ <select id="newsettings[no_ressources_private]">
+ <option value="">No</option>
+ <option value="yes">Yes</option>
+ </select>
+ </row>
+ <row>
+ <description value="Require an ACL grant to invite other users and groups" label="%s:"/>
+ <select id="newsettings[require_acl_invite]">
+ <option value="">{No}: {Every user can invite other users and groups}</option>
+ <option value="groups">Groups: other users can allways be invited, only groups require an invite grant</option>
+ <option value="all">Users + groups: inviting both allways requires an invite grant</option>
+ </select>
+ </row>
+ <row>
+ <description value="Allow users to prevent change notifications ('Do not notify')" label="%s:"/>
+ <select id="newsettings[calendar_allow_no_notification]">
+ <option value="">No</option>
+ <option value="True">Yes</option>
+ </select>
+ </row>
+ <row>
+ <description value="Use range-views to optimise calendar queries?"/>
+ <select id="newsettings[no_timerange_views]">
+ <option value="">Yes</option>
+ <option value="true">No</option>
+ </select>
+ </row>
+ <row>
+ <description value="Security" span="all" class="subHeader"/>
+ </row>
+ <row>
+ <vbox>
+ <description value="How many appointments should non-admins be able to export"/>
+ <description value="(empty = use global limit, no = no export at all)"/>
+ </vbox>
+ <textbox id="newsettings[calendar_export_limit]" size="5"/>
+ </row>
+ <row>
+ <description value="History logging" span="all" class="subHeader"/>
+ </row>
+ <row>
+ <description value="Prevent deleting of entries"/>
+ <select id="newsettings[calendar_delete_history]">
+ <option value="">No</option>
+ <option value="history">Yes, only admins can purge deleted items</option>
+ <option value="userpurge">Yes, users can purge their deleted items</option>
+ </select>
+ </row>
+ <row>
+ <description value="Automatically purge old events after"/>
+ <select id="newsettings[calendar_purge_old]">
+ <option value="0ff">No automatic purging</option>
+ <option value=".5">0.5 {years}</option>
+ <option value="1">1 {year}</option>
+ <option value="2">2 {years}</option>
+ <option value="3">3 {years}</option>
+ <option value="4">4 {years}</option>
+ <option value="5">5 {years}</option>
+ <option value="10">10 {years}</option>
+ </select>
+ </row>
+ <row>
+ <description value="Birthdays" span="all" class="subHeader"/>
+ </row>
+ <row>
+ <description value="Show birthdays from addressbook" label="%s:"/>
+ <select id="newsettings[hide_birthdays]">
+ <option value="">Yes</option>
+ <option value="dateonly">Show only the date, not the year</option>
+ <option value="yes">No</option>
+ </select>
+ </row>
+ <row>
+ <description value="Calendar recurrence horizont in days (default 1000)" label="%s:"/>
+ <textbox id="newsettings[calendar_horizont]" size="5"/>
+ </row>
+ <row>
+ <description value="Create links for participants from addressbook" label="%s:"/>
+ <select id="newsettings[link_contacts]">
+ <option value="">No</option>
+ <option value="yes">Yes</option>
+ </select>
+ </row>
+ </rows>
+ </grid>
+ </template>
+</overlay>
Propchange: trunk/calendar/templates/default/config.xet
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/calendar/templates/default/config.xet
------------------------------------------------------------------------------
svn:keywords = Author Date Id Rev URL
Propchange: trunk/calendar/templates/default/config.xet
------------------------------------------------------------------------------
svn:mime-type = text/xml
------------------------------------------------------------------------------
Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!
https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.