Fixes #2919 Hiding some sections from setup, various css fixes

Conflicts:
	plugins/config/class_configInLdap.inc
	setup/class_setup.inc

html/themes/default/plugin.css

@@ -170,6 +170,10 @@ margin-bottom:0.5%;
 margin-right:0.5%;
 }
 
+html.ltr .plugin_section.invisible, html.rtl .plugin_section.invisible {
+display:none;
+}
+
 fieldset.plugin_section.critical legend span, .plugin_section.critical > span.legend {
 font-weight:bold;
 background-color:#BCF;
@@ -194,7 +198,9 @@ background-color:#DFEFFF;
   .plugin_section > div > table {
   width:100%;
   }
-  .plugin_section, .plugin_section:nth-child(even), .plugin_section.fullwidth {
+  html.ltr .plugin_section, html.ltr .plugin_section:nth-child(even), html.ltr .plugin_section.fullwidth,
+  html.rtl .plugin_section, html.rtl .plugin_section:nth-child(even), html.rtl .plugin_section.fullwidth
+  {
   display:block;
   float:none;
   clear:both;

html/themes/default/setup.css

 /*********
  * Setup
  *********/
+body.setup a.plugtop img {
+height:48px;
+}
+html.ltr body.setup div#header_left .plugtop {
+margin-left:80px;
+}
+html.rtl body.setup div#header_left .plugtop {
+margin-right:80px;
+}
 
 div.setup_menu {
 background-color:#F8F8F8;
@@ -162,3 +171,16 @@ padding-left:25px;
 html.rtl div.step2_warning_text {
 padding-right:25px;
 }
+
+/* On small screens */
+@media (max-width: 640px) {
+  body.setup a.plugtop img {
+  height:32px;
+  }
+  html.ltr body.setup div#header_left .plugtop {
+  margin-left:0px;
+  }
+  html.rtl body.setup div#header_left .plugtop {
+  margin-right:0px;
+  }
+}

plugins/config/class_configInLdap.inc

@@ -241,60 +241,6 @@ class configInLdap extends simplePlugin
           ),
         )
       ),
-      'miscellaneous' => array(
-        'name'  => _('Miscellaneous'),
-        'class' => array('fullwidth'),
-        'attrs' => array(
-          new OrderedArrayAttribute (
-            new CompositeAttribute (
-              _('Hooks that are called when specific actions happens'),
-              'fdTabHook',
-              array(
-                new SelectAttribute(
-                  _('tab'), _('The tab that this hook concerns'),
-                  'hookTab', TRUE,
-                  $plugins
-                ),
-                new SelectAttribute(
-                  _('mode'), _('When to call this command'),
-                  'hookMode', TRUE,
-                  array('postcreate', 'postremove', 'postmodify',
-                        'precreate', 'preremove', 'premodify', 'check')
-                ),
-                new StringAttribute(
-                  _('cmd'), _('The command that will be called'),
-                  'hookCmd', TRUE
-                )
-              ),
-              '/^([^\\|]+)\\|([^\\|]+)\\|(.*)$/',
-              '%s|%s|%s',
-              '', // acl
-              _('Hooks')
-            ),
-            FALSE, // non-ordered
-            array(),
-            TRUE // edition
-          ),
-          new BooleanAttribute (
-            _('Display hook output'),
-            _('When enabled successful hook execution output is displayed to the user using a dialog.'),
-            'fdDisplayHookOutput'
-          ),
-          new SetAttribute(
-            new StringAttribute (
-              _('Available shells'), _('Available POSIX shells for FD users.'),
-              'fdShells', FALSE
-            ),
-            array('/bin/ash','/bin/bash','/bin/csh','/bin/sh','/bin/ksh',
-                  '/bin/tcsh','/bin/dash','/bin/zsh')
-          ),
-          new BooleanAttribute (
-            _('Show ACL tab on all objects'),
-            _('For very specific ACL rights setting where you might need to give right on a single object.'),
-            'fdAclTabOnObjects'
-          ),
-        )
-      ),
       'people_and_group' => array(
         'name'  => _('People and group storage'),
         'class' => array('critical'),
@@ -420,6 +366,60 @@ class configInLdap extends simplePlugin
           ),
         )
       ),
+      'miscellaneous' => array(
+        'name'  => _('Miscellaneous'),
+        'class' => array('fullwidth'),
+        'attrs' => array(
+          new OrderedArrayAttribute (
+            new CompositeAttribute (
+              _('Hooks that are called when specific actions happens'),
+              'fdTabHook',
+              array(
+                new SelectAttribute(
+                  _('tab'), _('The tab that this hook concerns'),
+                  'hookTab', TRUE,
+                  $plugins
+                ),
+                new SelectAttribute(
+                  _('mode'), _('When to call this command'),
+                  'hookMode', TRUE,
+                  array('postcreate', 'postremove', 'postmodify',
+                        'precreate', 'preremove', 'premodify', 'check')
+                ),
+                new StringAttribute(
+                  _('cmd'), _('The command that will be called'),
+                  'hookCmd', TRUE
+                )
+              ),
+              '/^([^\\|]+)\\|([^\\|]+)\\|(.*)$/',
+              '%s|%s|%s',
+              '', // acl
+              _('Hooks')
+            ),
+            FALSE, // non-ordered
+            array(),
+            TRUE // edition
+          ),
+          new BooleanAttribute (
+            _('Display hook output'),
+            _('When enabled successful hook execution output is displayed to the user using a dialog.'),
+            'fdDisplayHookOutput'
+          ),
+          new SetAttribute(
+            new StringAttribute (
+              _('Available shells'), _('Available POSIX shells for FD users.'),
+              'fdShells', FALSE
+            ),
+            array('/bin/ash','/bin/bash','/bin/csh','/bin/sh','/bin/ksh',
+                  '/bin/tcsh','/bin/dash','/bin/zsh')
+          ),
+          new BooleanAttribute (
+            _('Show ACL tab on all objects'),
+            _('For very specific ACL rights setting where you might need to give right on a single object.'),
+            'fdAclTabOnObjects'
+          ),
+        )
+      ),
     );
   }
 

setup/class_setupStep_Config.inc

@@ -52,6 +52,9 @@ class Step_Config extends configInLdap
     global $config;
     parent::__construct($config, CONFIGRDN.$config->current['BASE']);
 
+    $this->attributesInfo['miscellaneous']['class'] = array('invisible');
+    $this->attributesInfo['debug']['class'] = array('invisible');
+
     $this->fdLanguage     = $cv['lang_selected'];
   }
 

setup/setup_frame.tpl

 <!-- Headline -->
-<body>
+<body class="setup">
   {$php_errors}
   <form action="setup.php" name="mainform" id="mainform" method="post" enctype="multipart/form-data">
     <div class="setup_header">