[eGroupWare-svn] r55814 - in /trunk/timesheet: inc/class.timesheet_hooks.inc.php templates/default/config.tpl templates/default/config.xet

[email protected]
Newsgroups gmane.comp.web.egroupware.cvs
Message-ID <[email protected]>
Author: ralfbecker
Date: Sun Apr 24 15:48:45 2016
New Revision: 55814

URL: http://svn.stylite.de/viewvc/egroupware?rev=55814&view=rev
Log:
use new et2 config

Added:
    trunk/timesheet/templates/default/config.xet   (with props)
Removed:
    trunk/timesheet/templates/default/config.tpl
Modified:
    trunk/timesheet/inc/class.timesheet_hooks.inc.php

Modified: trunk/timesheet/inc/class.timesheet_hooks.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/timesheet/inc/class.timesheet_hooks.inc.php?rev=55814&r1=55813&r2=55814&view=diff
==============================================================================
--- trunk/timesheet/inc/class.timesheet_hooks.inc.php (original)
+++ trunk/timesheet/inc/class.timesheet_hooks.inc.php Sun Apr 24 15:48:45 2016
@@ -5,7 +5,7 @@
  * @link http://www.egroupware.org
  * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @package timesheet
- * @copyright (c) 2005-13 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
+ * @copyright (c) 2005-16 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @version $Id$
  */
@@ -36,6 +36,8 @@
 	 */
 	static function search_link($location)
 	{
+		unset($location);	// not used, but required by function signature
+
 		return array(
 			'query' => TIMESHEET_APP.'.timesheet_bo.link_query',
 			'title' => TIMESHEET_APP.'.timesheet_bo.link_title',
@@ -123,7 +125,7 @@
 		if ($GLOBALS['egw_info']['user']['apps']['admin'])
 		{
 			$file = Array(
-				'Site Configuration' => egw::link('/index.php','menuaction=admin.uiconfig.index&appname=' . $appname),
+				'Site Configuration' => egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname,'&ajax=true'),
 				'Custom fields' => egw::link('/index.php','menuaction=admin.customfields.index&appname='.$appname.'&use_private=1'),
 				'Global Categories'  => egw::link('/index.php',array(
 					'menuaction' => 'admin.admin_categories.index',
@@ -209,10 +211,11 @@
 				}
 				catch (Exception $e)
 				{
+					unset($e);
 					// permission error
 					continue;
 				}
-				if ($title = $definition->get_title())
+				if (($title = $definition->get_title()))
 				{
 					$options[$title] = $title;
 				}
@@ -242,6 +245,8 @@
 	 */
 	public static function acl_rights($params)
 	{
+		unset($params);	// not used, but required by function signature
+
 		return array(
 			acl::READ    => 'read',
 			acl::EDIT    => 'edit',
@@ -257,6 +262,8 @@
 	 */
 	public static function categories($data)
 	{
+		unset($data);	// not used, but required by function signature
+
 		return true;
 	}
 }

Added: trunk/timesheet/templates/default/config.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/timesheet/templates/default/config.xet?rev=55814&view=auto
==============================================================================
--- trunk/timesheet/templates/default/config.xet (added)
+++ trunk/timesheet/templates/default/config.xet Sun Apr 24 15:48:45 2016
@@ -1,0 +1,48 @@
+<?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="timesheet.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="ProjectManager integration" label="%s:"/>
+					<select id="newsettings[pm_integration]">
+						<option value="">Both: allow to use ProjectManager and free project-names</option>
+						<option value="none">None: use only free project-names</option>
+						<option value="full">Full: use only ProjectManager</option>
+					</select>
+				</row>
+				<row>
+					<description value="Mode" label="%s:"/>
+					<select id="newsettings[ts_viewtype]">
+						<option value="normal">Regular</option>
+						<option value="short">Simple</option>
+					</select>
+				</row>
+				<row>
+					<description value="Show a quantity sum (eg. to sum up negative overtime)" label="%s:"/>
+					<select id="newsettings[quantity_sum]">
+						<option value="">No</option>
+						<option value="true">Yes</option>
+					</select>
+				</row>
+				<row>
+					<description value="History logging" span="all" class="subHeader"/>
+				</row>
+				<row>
+					<description value="Prevent deleting"/>
+					<select id="newsettings[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>
+			</rows>
+		</grid>
+	</template>
+</overlay>

Propchange: trunk/timesheet/templates/default/config.xet
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: trunk/timesheet/templates/default/config.xet
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Rev URL

Propchange: trunk/timesheet/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.