From 1af83fad99ea8603b4cc64a3e1f777eab3087f2d Mon Sep 17 00:00:00 2001
From: Toby Zerner <toby.zerner@gmail.com>
Date: Sat, 22 Jul 2017 11:47:50 +0930
Subject: [PATCH] Only display "show language selector" toggle if there is more
 than one language

---
 .../core/js/admin/src/components/BasicsPage.js    | 15 ++++++---------
 framework/core/less/admin/BasicsPage.less         |  2 +-
 framework/core/less/lib/scaffolding.less          |  4 ++++
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/framework/core/js/admin/src/components/BasicsPage.js b/framework/core/js/admin/src/components/BasicsPage.js
index 90ea4b3f4..5dab07cb6 100644
--- a/framework/core/js/admin/src/components/BasicsPage.js
+++ b/framework/core/js/admin/src/components/BasicsPage.js
@@ -58,7 +58,7 @@ export default class BasicsPage extends Page {
               ]
             })}
 
-            {Object.keys(this.localeOptions).length > 1
+            {Object.keys(this.localeOptions).length > 0
               ? FieldSet.component({
                 label: app.translator.trans('core.admin.basics.default_language_heading'),
                 children: [
@@ -66,19 +66,16 @@ export default class BasicsPage extends Page {
                     options: this.localeOptions,
                     value: this.values.default_locale(),
                     onchange: this.values.default_locale
+                  }),
+                  Switch.component({
+                    state: this.values.show_language_selector(),
+                    onchange: this.values.show_language_selector,
+                    children: app.translator.trans('core.admin.basics.show_language_selector_label'),
                   })
                 ]
               })
               : ''}
 
-            {Switch.component({
-              state: this.values.show_language_selector(),
-              onchange: this.values.show_language_selector,
-              children: app.translator.trans('core.admin.basics.show_language_selector_label'),
-            })}
-
-            <br/>
-
             {FieldSet.component({
               label: app.translator.trans('core.admin.basics.home_page_heading'),
               className: 'BasicsPage-homePage',
diff --git a/framework/core/less/admin/BasicsPage.less b/framework/core/less/admin/BasicsPage.less
index 52d193961..c22ad472d 100644
--- a/framework/core/less/admin/BasicsPage.less
+++ b/framework/core/less/admin/BasicsPage.less
@@ -9,7 +9,7 @@
   }
 
   fieldset {
-    margin-bottom: 30px;
+    margin-bottom: 20px;
 
     > ul {
       list-style: none;
diff --git a/framework/core/less/lib/scaffolding.less b/framework/core/less/lib/scaffolding.less
index f723d850e..cbc55acca 100755
--- a/framework/core/less/lib/scaffolding.less
+++ b/framework/core/less/lib/scaffolding.less
@@ -83,6 +83,10 @@ fieldset {
   padding: 0;
   margin: 0;
   border: 0;
+
+  > ul > li {
+    margin-bottom: 10px;
+  }
 }
 legend {
   font-size: 14px;