Author: ralfbecker
New Revision: 55821
URL: http://svn.stylite.de/viewvc/egroupware?rev=55821&view=rev
Log:
use new et2 site config
Added:
trunk/wiki/templates/default/config.xet (with props)
Removed:
trunk/wiki/templates/default/config.tpl
Modified:
trunk/wiki/inc/class.wiki_hooks.inc.php
trunk/wiki/lang/egw_de.lang
trunk/wiki/lang/egw_en.lang
— trunk/wiki/inc/class.wiki_hooks.inc.php (original)
+++ trunk/wiki/inc/class.wiki_hooks.inc.php Mon Apr 25 10:26:59 2016
@@ -141,7 +141,7 @@
{
$title = $appname = ‘wiki’;
$file = Array(
-
'Site Configuration' => egw::link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname.'&ajax=true'),
// 'Lock / Unlock Pages' => $GLOBALS['egw']->link('/wiki/index.php','action=admin&locking=1'),
'Block / Unblock hosts' => egw::link('/wiki/index.php','action=admin&blocking=1'),
array(
@@ -173,7 +173,7 @@
{
$menu_title = lang(‘Wiki Administration’);
$file = Array(
-
'Site Configuration' => $GLOBALS['egw']->link('/index.php','menuaction=admin.admin_config.index&appname=' . $appname.'&ajax=true'),
// 'Lock / Unlock Pages' => $GLOBALS['egw']->link('/wiki/index.php','action=admin&locking=1'),
'Block / Unblock Hosts' => $GLOBALS['egw']->link('/wiki/index.php','action=admin&blocking=1')
);
@@ -271,26 +271,4 @@
$message = “$i Pages processed. $l Links inserted (or count updated).”;
return $message;
}
- /**
-
* Hook returning options for new_page_permission groups
-
*
-
* @param array $config
-
*/
-
public static function hook_new_page_permission($config)
-
{
-
// Definitions in wiki_so
-
$groups = array(
-
'_0' => lang('everyone'),
-
'_1' => lang('users'),
-
'_2' => lang('admins'),
-
);
-
$accs = $GLOBALS['egw']->accounts->get_list('groups');
-
foreach($accs as $acc)
-
{
-
$groups[$acc['account_id']] = lang('group').' '.$acc['account_lid'];
-
}
-
return html::select('newsettings[new_page_permission]',$config['new_page_permission'],
-
$groups,true,'',4);
-
}
}
— trunk/wiki/lang/egw_de.lang (original)
+++ trunk/wiki/lang/egw_de.lang Mon Apr 25 10:26:59 2016
@@ -6,6 +6,7 @@
admins wiki de Administratoren
after how many days should old versions of a page be removed (0 for never) admin de Nach wie vielen Tagen sollen alter Versionen einer Seite gelöscht werden (0 für niemals)
allow anonymous access admin de Anonymen Zugriff erlauben
+allow creating new pages (blank for all) wiki de Erlaube neue Seiten anzulegen (leer für alle)
anonymous password admin de Passwort des anonymen Benutzers
anonymous session type admin de Typ der anonymen Sitzung
anonymous username admin de Benutzername des anonymen Benutzers
@@ -74,6 +75,7 @@
page content wiki de Seiteninhalt
pages i have read access wiki de Seiten, zu denen ich Leseberechtigung besitze
pages i have write access wiki de Seiten, zu denen ich Schreibberechtigung besitze
+pages that match this regular expression wiki de Seiten die folgendem regulären Ausdruck entsprechen
path of the upload directory (has to be writable by the webserver!) admin de Pfad des Verzeichnisses zum Hochladen (muà vom Webserver beschreibbar sein!)
person who changed the page wiki de Die Person, die diese Seite verändert hat
picture upload via richtext editor (leave the upload directory empty to disable the upload) admin de Hochladen von Bildern über den Editor für formatierten Text (das Verzeichnis leer lassen um das Hochladen abzuschalten)
— trunk/wiki/lang/egw_en.lang (original)
+++ trunk/wiki/lang/egw_en.lang Mon Apr 25 10:26:59 2016
@@ -6,6 +6,7 @@
admins wiki en Admins
after how many days should old versions of a page be removed (0 for never) admin en After how many days should old versions of a page be removed, 0 = never.
allow anonymous access admin en Allow anonymous access
+allow creating new pages (blank for all) wiki en Allow creating new pages (blank for all)
anonymous password admin en Anonymous password
anonymous session type admin en Anonymous session type
anonymous username admin en Anonymous user name
— trunk/wiki/templates/default/config.xet (added)
+++ trunk/wiki/templates/default/config.xet Mon Apr 25 10:26:59 2016
@@ -1,0 +1,85 @@
+<?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="name wiki home link" label="%s:"/>
-
<textbox id="newsettings[wikihome]" size="30"/>
-
</row>
-
<row>
-
<description value="allow anonymous access" label="%s:"/>
-
<select id="newsettings[allow_anonymous]">
-
<option value="">No</option>
-
<option value="True">Yes</option>
-
<option value="Navbar">Yes with navbar</option>
-
</select>
-
</row>
-
<row>
-
<description value="Anonymous Session Type" label="%s:"/>
-
<select id="newsettings[Anonymous_Session_Type]">
-
<option value="readonly">readonly</option>
-
<option value="editable">editable</option>
-
</select>
-
</row>
-
<row>
-
<description value="anonymous username" label="%s:"/>
-
<textbox id="newsettings[anonymous_username]" size="30"/>
-
</row>
-
<row>
-
<description value="Anonymous password" label="%s:"/>
-
<textbox id="newsettings[anonymous_password]" size="30"/>
-
</row>
-
<row>
-
<description value="Allow creating new pages (blank for all)" label="%s:"/>
-
<select-account id="newsettings[new_page_permission]" account_type="groups" multiple="true" tags="true" width="100%">
-
<option value="_0">Everyone</option>
-
<option value="_1">Users</option>
-
<option value="_2">Admins</option>
-
</select-account>
-
</row>
-
<row>
-
<description value="Emailaddress Administrator" label="%s:"/>
-
<textbox id="newsettings[emailadmin]" size="30"/>
-
</row>
-
<row>
-
<description value="InterWikiPrefix" label="%s:"/>
-
<textbox id="newsettings[InterWikiPrefix]" size="30"/>
-
</row>
-
<row>
-
<description value="Enable Free Links" label="%s:"/>
-
<select id="newsettings[Enable_Free_Links]">
-
<option value="True">Yes</option>
-
<option value="False">No</option>
-
</select>
-
</row>
-
<row>
-
<description value="Enable Wiki Links" label="%s:"/>
-
<select id="newsettings[Enable_Wiki_Links]">
-
<option value="True">Yes</option>
-
<option value="False">No</option>
-
</select>
-
</row>
-
<row>
-
<description value="Automatically convert pages with wiki-syntax to richtext (if edited)?" label="%s:"/>
-
<select id="newsettings[AutoconvertPages]">
-
<option value="auto">Only if browser supports a richtext-editor</option>
-
<option value="onrequest">No only on request</option>
-
<option value="never">{No never} {(don't offer the possibility)}</option>
-
<option value="always">Yes always</option>
-
</select>
-
</row>
-
<row>
-
<description value="After how many days should old versions of a page be removed (0 for never)" label="%s:"/>
-
<textbox id="newsettings[ExpireLen]" size="5"/>
-
</row>
-
</rows>
-
</grid>
-
+
Propchange: trunk/wiki/templates/default/config.xet
svn:eol-style = native
Propchange: trunk/wiki/templates/default/config.xet
svn:keywords = Author Date Id Rev URL
Propchange: trunk/wiki/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
