Author: ralfbecker
Date: Sun Apr 24 16:04:14 2016
New Revision: 55816
URL: http://svn.stylite.de/viewvc/egroupware?rev=55816&view=rev
Log:
use new et2 config
Added:
trunk/bookmarks/templates/default/config.xet (with props)
Removed:
trunk/bookmarks/templates/default/config.tpl
Modified:
trunk/bookmarks/inc/class.bookmarks_hooks.inc.php
trunk/egroupware/doc/config2xet.php
Modified: trunk/bookmarks/inc/class.bookmarks_hooks.inc.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/bookmarks/inc/class.bookmarks_hooks.inc.php?rev=55816&r1=55815&r2=55816&view=diff
==============================================================================
--- trunk/bookmarks/inc/class.bookmarks_hooks.inc.php (original)
+++ trunk/bookmarks/inc/class.bookmarks_hooks.inc.php Sun Apr 24 16:04:14 2016
@@ -74,7 +74,7 @@
if ($GLOBALS['egw_info']['user']['apps']['admin'] && $location != 'preferences')
{
$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','menuaction=admin.admin_categories.index&appname=' . $appname),
'Custom fields' => egw::link('/index.php','menuaction=admin.customfields.index&appname=' . $appname),
);
@@ -129,10 +129,11 @@
}
catch (Exception $e)
{
+ unset($e);
// permission error
continue;
}
- if ($title = $definition->get_title())
+ if (($title = $definition->get_title()))
{
$options[$title] = $title;
}
@@ -161,6 +162,8 @@
*/
public static function acl_rights($params)
{
+ unset($params); // not used, but required by function signature
+
return array(
// ACL works differently in bookmarks, we change the label to ease confusion
acl::READ => 'private',
@@ -177,6 +180,8 @@
*/
public static function categories($data)
{
+ unset($data); // not used, but required by function signature
+
return true;
}
Added: trunk/bookmarks/templates/default/config.xet
URL: http://svn.stylite.de/viewvc/egroupware/trunk/bookmarks/templates/default/config.xet?rev=55816&view=auto
==============================================================================
--- trunk/bookmarks/templates/default/config.xet (added)
+++ trunk/bookmarks/templates/default/config.xet Sun Apr 24 16:04:14 2016
@@ -1,0 +1,21 @@
+<?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="bookmarks.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="Append this message to mailed bookmarks" span="all"/>
+ </row>
+ <row>
+ <textbox id="newsettings[mail_footer]" rows="7" cols="50" wrap="hard"/>
+ </row>
+ </rows>
+ </grid>
+ </template>
+</overlay>
Propchange: trunk/bookmarks/templates/default/config.xet
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: trunk/bookmarks/templates/default/config.xet
------------------------------------------------------------------------------
svn:keywords = Author Date Id Rev URL
Propchange: trunk/bookmarks/templates/default/config.xet
------------------------------------------------------------------------------
svn:mime-type = text/xml
Modified: trunk/egroupware/doc/config2xet.php
URL: http://svn.stylite.de/viewvc/egroupware/trunk/egroupware/doc/config2xet.php?rev=55816&r1=55815&r2=55816&view=diff
==============================================================================
--- trunk/egroupware/doc/config2xet.php (original)
+++ trunk/egroupware/doc/config2xet.php Sun Apr 24 16:04:14 2016
@@ -79,6 +79,7 @@
switch($matches[1])
{
case 'input':
+ case 'textarea':
echo "\t\t\t\t\t<textbox id=\"".$attrs['name'].'"';
unset($attrs['value'], $attrs['name']);
foreach($attrs as $name => $value)
@@ -86,7 +87,7 @@
echo " $name=\"$value\"";
}
echo "/>\n";
- if (trim($matches[3]))
+ if (trim($matches[3]) && $matches['1'] == 'input')
{
if ($commented)
{
------------------------------------------------------------------------------
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.