holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use new et2 config

Browse Source
This commit is contained in:
Ralf Becker 2016-04-24 13:53:24 +00:00
parent 68e998c649
commit 540b59a711
3 changed files with 37 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
resources/inc/class.resources_hooks.inc.php
View File

@ -19,7 +19,7 @@ class resources_hooks
{
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 @@ class resources_hooks
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 @@ class resources_hooks
$query = array('filter' => $args['cat_id']);
$bo = new resources_bo();
$bo->get_rows($query, $resources, $readonly);
foreach($resources as $resource)
{
if(is_array($resource))

54
resources/templates/default/config.tpl
View File

@ -1,54 +0,0 @@
<!-- BEGIN header -->
<p style="text-align: center; color: {th_err};">{error}</p>
<form name=frm method="POST" action="{action_url}">
{hidden_vars}
<table border="0" align="left">
<tr class="th">
<td colspan="2">&nbsp;<b>{title}</b></td>
</tr>
<!-- END header -->
<!-- BEGIN body -->
<tr class="row_on">
<tr class="th">
<td colspan="2">&nbsp;<b>{lang_History_logging}</b></td>
</tr>
<tr class="row_on">
<td>&nbsp;{lang_Prevent_deleting}</td>
<td>
<select name="newsettings[history]">
<option value="">{lang_No}</option>
<option value="history"{selected_history_history}>{lang_Yes,_only_admins_can_purge_deleted_items}</option>
<option value="userpurge"{selected_history_userpurge}>{lang_Yes,_users_can_purge_their_deleted_items}</option>
</select>
</td>
</tr>
<tr class="row_on">
<td>
&nbsp;{lang_Allow_ignore_conflicts}
</td>
<td>
<select name="newsettings[ignoreconflicts]">
<option value=""{selected_ignoreconflicts_directbooking}>{lang_Yes,_only_users_with_direct_booking_permission}</option>
<option value="allusers"{selected_ignoreconflicts_allusers}>{lang_Yes,_all_users_can_ignore_conflicts}</option>
<option value="no">{lang_No}</option>
</select>
</td>
</tr>
<!-- END body -->
<!-- BEGIN footer -->
<tr class="th">
<td colspan="2">
&nbsp;
</td>
</tr>
<tr>
<td colspan="2" align="center">
<input type="submit" name="submit" value="{lang_submit}">
<input type="submit" name="cancel" value="{lang_cancel}">
</td>
</tr>
</table>
</form>
<!-- END footer -->

34
resources/templates/default/config.xet Normal file
View File

@ -0,0 +1,34 @@
<?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="resources.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="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>
</template>
</overlay>