move "Collab Editor settings" and "Collabora Online" in a single "Collabora Online" tab

This commit is contained in:
Ralf Becker 2021-05-03 18:12:11 +02:00
parent 82ab8d9092
commit 9643bfc6a4

View File

@ -223,10 +223,11 @@ class filemanager_hooks
} }
if (!$GLOBALS['egw_info']['user']['apps']['collabeditor']) unset($document_doubleclick_action['collabeditor']); if (!$GLOBALS['egw_info']['user']['apps']['collabeditor']) unset($document_doubleclick_action['collabeditor']);
asort($mimes); asort($mimes);
$settings += array ( $settings += array (
'sections.2' => array( 'sections.2' => array(
'type' => 'section', 'type' => 'section',
'title' => lang('Collab Editor settings'), 'title' => lang('Collabora Online'),
'no_lang'=> true, 'no_lang'=> true,
'xmlrpc' => False, 'xmlrpc' => False,
'admin' => False 'admin' => False
@ -265,13 +266,6 @@ class filemanager_hooks
if($GLOBALS['egw_info']['user']['apps']['collabora']) if($GLOBALS['egw_info']['user']['apps']['collabora'])
{ {
$settings += array( $settings += array(
'sections.collabora' => array(
'type' => 'section',
'title' => lang('Collabora'),
'no_lang'=> true,
'xmlrpc' => False,
'admin' => False
),
'ui_mode' => array( 'ui_mode' => array(
'type' => 'select', 'type' => 'select',
'label' => lang('UI mode'), 'label' => lang('UI mode'),