Author: ralfbecker
New Revision: 55801
URL: http://svn.stylite.de/viewvc/egroupware?rev=55801&view=rev
Log:
move admin >> Site config to new et2 based site-config
Added:
trunk/admin/templates/default/site-config.xet
- copied, changed from r55790, trunk/admin/templates/default/config.xet
Removed:
trunk/admin/templates/default/config.tpl
Modified:
trunk/admin/inc/class.admin_config.inc.php
trunk/admin/inc/class.admin_hooks.inc.php
trunk/admin/inc/class.uiconfig.inc.php
trunk/admin/lang/ (props changed)
trunk/admin/setup/setup.inc.php
trunk/admin/templates/default/app.css
trunk/admin/templates/default/config.xet
trunk/admin/templates/pixelegg/app.css
trunk/egroupware/doc/config2xet.php
— trunk/admin/inc/class.admin_config.inc.php (original)
+++ trunk/admin/inc/class.admin_config.inc.php Thu Apr 21 18:39:59 2016
@@ -35,7 +35,7 @@
}
if ($GLOBALS[‘egw’]->acl->check(‘site_config_acce’,1,‘admin’))
{
@@ -56,7 +56,7 @@
case ‘phpgwapi’:
case ‘’:
/* This keeps the admin from getting into what is a setup-only config */
@@ -68,7 +68,7 @@
$c->read_repository();
if ($_content[‘cancel’] || ($_content[‘save’] || $_content[‘apply’]) && $GLOBALS[‘egw’]->acl->check(‘site_config_acce’,2,‘admin’))
{
@@ -118,8 +118,8 @@
if(!$errors && !$_content['apply'])
{
-
egw_framework::message(lang('Configuration saved.'), 'success');
-
egw::redirect_link('/index.php', array(
-
Api\Framework::message(lang('Configuration saved.'), 'success');
-
Api\Framework::redirect_link('/index.php', array(
'menuaction' => 'admin.admin_ui.index',
'ajax' => 'true'
), 'admin');
@@ -128,21 +128,34 @@
if($errors)
{
-
$sel_options = $readonlys = array();
-
$config = $c->read_repository();
-
-
// call "config" hook, allowing apps to overwrite config, eg. set default values,
-
// or return options in "sel_options" keys
-
$config['location'] = 'config';
-
$ret = Api\Hooks::single($config, $appname);
-
if (is_array($ret))
-
{
-
if (isset($ret['sel_options'])) $sel_options = $ret['sel_options'];
-
$config = array_merge($config, $ret);
-
}
$tmpl = new Api\Etemplate($appname.'.config');
$path = (parse_url($tmpl->rel_path, PHP_URL_SCHEME) !== 'vfs' ? EGW_SERVER_ROOT : '').$tmpl->rel_path;
-
$content = array(
-
'template' => $appname.'.config',
-
'newsettings' => array(),
-
);
// for security reasons we do not send all config to client-side, but only ones mentioned in templates
$matches = null;
@@ -152,6 +165,14 @@
$content[‘newsettings’][$name] = $config[$name];
}
-
$tmpl->exec('admin.admin_config.index', $content, array(), array(), array('appname' => $appname));
-
// make everything readonly and remove save/apply button, if user has not rights to store config
-
if ($GLOBALS['egw']->acl->check('site_config_acce',2,'admin'))
-
{
-
$readonlys[__ALL__] = true;
-
$readonlys['cancel'] = false;
-
}
-
-
$tmpl->read('admin.site-config');
-
$tmpl->exec('admin.admin_config.index', $content, $sel_options, $readonlys, array('appname' => $appname));
}
}
— trunk/admin/inc/class.admin_hooks.inc.php (original)
+++ trunk/admin/inc/class.admin_hooks.inc.php Thu Apr 21 18:39:59 2016
@@ -57,7 +57,7 @@
if (! $GLOBALS['egw']->acl->check('site_config_acce',1,'admin'))
{
-
$file['Site Configuration'] = egw::link('/index.php','menuaction=admin.admin_config.index&appname=admin&ajax=true');
}
if (! $GLOBALS['egw']->acl->check('account_access',1,'admin'))
@@ -251,4 +251,20 @@
}
return $actions;
}
+
— trunk/admin/inc/class.uiconfig.inc.php (original)
+++ trunk/admin/inc/class.uiconfig.inc.php Thu Apr 21 18:39:59 2016
@@ -20,6 +20,12 @@
function index($params=null)
{
-
// if we have a xet file, run new et2 config
-
if (file_exists(EGW_SERVER_ROOT.'/'.$_GET['appname'].'/templates/default/config.xet'))
-
{
-
$new_config = new admin_config();
-
return $new_config->index();
-
}
// allowing inline js
egw_framework::csp_script_src_attrs('unsafe-inline');
Propchange: trunk/admin/lang/
— svn:ignore (original)
+++ svn:ignore Thu Apr 21 18:39:59 2016
@@ -1,2 +1,3 @@
egw_de.lang.old
egw_en.lang.old
+.!5805!egw_tr.lang
— trunk/admin/setup/setup.inc.php (original)
+++ trunk/admin/setup/setup.inc.php Thu Apr 21 18:39:59 2016
@@ -38,6 +38,7 @@
$setup_info[‘admin’][‘hooks’][‘admin’] = ‘admin_hooks::all_hooks’;
$setup_info[‘admin’][‘hooks’][‘sidebox_menu’] = ‘admin_hooks::all_hooks’;
$setup_info[‘admin’][‘hooks’][‘edit_user’] = ‘admin_hooks::edit_user’;
+$setup_info[‘admin’][‘hooks’][‘config’] = ‘admin_hooks::config’;
// add account tab to addressbook.edit
$setup_info[‘admin’][‘hooks’][‘addressbook_edit’] = ‘admin.admin_account.addressbook_edit’;
— trunk/admin/templates/default/app.css (original)
+++ trunk/admin/templates/default/app.css Thu Apr 21 18:39:59 2016
@@ -157,7 +157,14 @@
/**
- new et2 site configuration
*/
-table.admin-config td.subHeader span {
+#admin-site-config > div > span.subHeader {
- border-bottom: 3px solid #696969;
- padding-left: 3px;
- padding-bottom: 3px;
- display: block;
- margin-bottom: 5px;
+}
+#admin-site-config span.subHeader {
font-weight: bold;
font-size: 110%;
-}
+}
— trunk/admin/templates/default/config.xet (original)
+++ trunk/admin/templates/default/config.xet Thu Apr 21 18:39:59 2016
@@ -9,9 +9,6 @@
-
<row>
-
<description value="Site configuration" span="all" class="subHeader"/>
-
</row>
<row>
<description value="Should the login page include a language selectbox (useful for demo-sites) ?" label="%s:"/>
<select id="newsettings[login_show_language_selection]">
@@ -94,7 +91,7 @@
@@ -103,7 +100,7 @@
Document root (default)
@@ -228,7 +225,7 @@
@@ -254,10 +251,5 @@
-
<hbox class="dialogFooterToolbar">
-
<button id="save" label="Save"/>
-
<button id="apply" label="Apply"/>
-
<button id="cancel" label="Cancel"/>
-
</hbox>
— trunk/admin/templates/default/config.xet (original)
+++ trunk/admin/templates/default/site-config.xet Thu Apr 21 18:39:59 2016
@@ -2,258 +2,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- No
- Yes
-
-
-
-
-
- {Firstname}.{Lastname}@domain.com
- {Firstname}{Lastname}@domain.com
- {Firstname}_{Lastname}@domain.com
- {Initial}{Lastname}@domain.com
- {Initial}.{Lastname}@domain.com
- {Lastname}.{Firstname}@domain.com
- {Lastname}{Firstname}@domain.com
- {Lastname}_{Firstname}@domain.com
- {Lastname}@domain.com
- {Firstname}@domain.com
- {Username}@domain.com
-
-
-
-
-
-
-
-
-
- No
- Yes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {No} - {more secure}
- Yes
- Yes, but no SCAYT
- {Yes, use browser based spell checking engine} - {more secure}
- Yes, use WebSpellChecker
-
-
-
-
-
- Enable
- Hide sidebox video tutorials
- Do not offer introduction video
- Disable all
-
-
-
-
-
-
-
-
-
-
-
-
- Document root (default)
- eGroupWare directory
-
-
-
-
-
-
-
-
-
-
-
-
-
- {Yes} - {more secure}
- No
-
-
-
-
-
- {Yes} - {more secure}
- No
-
-
-
-
-
- No
- Yes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- None
- 6
- 7
- 8
- 10
- 12
- 14
- 16
-
-
-
-
-
-
-
-
- None
- 2
- 3
- 4
-
-
-
-
-
- No
- Yes
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {No} - {more secure}
- Yes
-
-
-
-
-
- {No} - {Default}
- Yes
- Debug
-
-
-
-
+
+
+
— trunk/admin/templates/pixelegg/app.css (original)
+++ trunk/admin/templates/pixelegg/app.css Thu Apr 21 18:39:59 2016
@@ -18,7 +18,7 @@
-
-
@version $Id: app.css 55532 2016-03-28 18:51:38Z ralfbecker $
-
-
@version $Id: app.css 55790 2016-04-20 18:52:55Z ralfbecker $
/
.admin_tree table,
.admin_tree tr,
@@ -163,7 +163,14 @@
/*
- new et2 site configuration
*/
-table.admin-config td.subHeader span {
+#admin-site-config > div > span.subHeader {
- border-bottom: 3px solid #696969;
- padding-left: 3px;
- padding-bottom: 3px;
- display: block;
- margin-bottom: 5px;
+}
+#admin-site-config span.subHeader {
font-weight: bold;
font-size: 110%;
}
— trunk/egroupware/doc/config2xet.php (original)
+++ trunk/egroupware/doc/config2xet.php Thu Apr 21 18:39:59 2016
@@ -55,9 +55,6 @@
‘;
foreach($trs[2] as $n => $tr)
{
@@ -164,11 +161,6 @@
echo
’
-
<hbox class="dialogFooterToolbar">
-
<button id="save" label="Save"/>
-
<button id="apply" label="Apply"/>
-
<button id="cancel" label="Cancel"/>
-
</hbox>
';
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
