config.xet

ralfbecker_sf 2016-04-24 13:53:24 UTC #1

Author: ralfbecker
New Revision: 55815

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

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

Modified: trunk/resources/inc/class.resources_hooks.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/resources/inc/class.resources_hooks.inc.php?rev=55815&r1=55814&r2=55815&view=diff

— trunk/resources/inc/class.resources_hooks.inc.php (original)
+++ trunk/resources/inc/class.resources_hooks.inc.php Sun Apr 24 15:53:24 2016
@@ -19,7 +19,7 @@
{
function admin_prefs_sidebox($args)
{

  $this->acl =& CreateObject('resources.bo_acl');

  $this->acl = CreateObject('resources.bo_acl');

  $appname = 'resources';
  $location = is_array($args) ? $args['location'] : $args;

@@ -48,7 +48,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'),
  		'Global Categories'  => egw::link('/index.php',array(
  			'menuaction' => 'admin.admin_categories.index',
  			'appname'    => $appname,

@@ -150,7 +150,7 @@
$query = array(‘filter’ => $args[‘cat_id’]);
$bo = new resources_bo();
$bo->get_rows($query, $resources, $readonly);

  foreach($resources as $resource)
  {
  	if(is_array($resource))

Added: trunk/resources/templates/default/config.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/resources/templates/default/config.xet?rev=55815&view=auto

— trunk/resources/templates/default/config.xet (added)
+++ trunk/resources/templates/default/config.xet Sun Apr 24 15:53:24 2016
@@ -1,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+
+

  <grid width="100%" class="admin-config egwGridView_grid">

```
  	<columns>
```
```
  		<column width="60%"/>
```
```
  		<column/>
```
```
  	</columns>
```
```
  	<rows>
```
```
  		<row>
```

  			<description value="Allow ignore conflicts"/>

  			<select id="newsettings[ignoreconflicts]">

  				<option value="">Yes, only users with direct booking permission</option>

  				<option value="allusers">Yes, all users can ignore conflicts</option>

```
  				<option value="no">No</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>
```

Propchange: trunk/resources/templates/default/config.xet

svn:eol-style = native

Propchange: trunk/resources/templates/default/config.xet

svn:keywords = Author Date Id Rev URL

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

eGroupWare-cvs mailing list
eGroupWare-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/egroupware-cvs