From 16d313582d6b7824eb0ec5ebd196157ed2e8850a Mon Sep 17 00:00:00 2001
From: DL6ER <dl6er@dl6er.de>
Date: Tue, 26 May 2020 18:10:59 +0200
Subject: [PATCH] Further tweaks and optimization

Signed-off-by: DL6ER <dl6er@dl6er.de>
---
 groups-domains.php           | 19 +++++++++----------
 scripts/pi-hole/js/footer.js |  4 ++++
 scripts/pi-hole/js/index.js  |  2 +-
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/groups-domains.php b/groups-domains.php
index 45d9a0bd..1f015986 100644
--- a/groups-domains.php
+++ b/groups-domains.php
@@ -48,17 +48,7 @@
                                 <div class="col-md-6">
                                     <div class="form-group">
                                         <label for="new_domain">Domain:</label>
-                                        <div class="input-group">
                                             <input id="new_domain" type="url" class="form-control active" placeholder="Domain to be added" autocomplete="off" spellcheck="false" autocapitalize="none" autocorrect="off">
-                                            <span class="input-group-addon">
-                                                <input type="checkbox" id="wildcard_checkbox">
-                                                <label for="wildcard_checkbox">wildcard</label>
-                                            </span>
-                                        </div>
-                                    </div>
-                                    <div class="form-group">
-                                        <strong><i class="fa fa-question-circle"></i> Checkbox "wildcard":</span></strong> Check this box if you want to involve
-                                        all subdomains. The entered domain will be converted to a RegEx filter while adding.
                                     </div>
                                 </div>
                                 <div class="col-md-6 form-group">
@@ -66,6 +56,15 @@
                                     <input id="new_domain_comment" type="text" class="form-control" placeholder="Description (optional)">
                                 </div>
                             </div>
+                            <div class="row">
+                                <div class="col-md-12">
+                                    <div>
+                                        <input type="checkbox" id="wildcard_checkbox">
+                                        <label for="wildcard_checkbox"><strong>Add domain as wildcard</strong></label>
+                                        <p>Check this box if you want to involve all subdomains. The entered domain will be converted to a RegEx filter while adding.</p>
+                                    </div>
+                                </div>
+                            </div>
                         </div>
                         <!-- RegEx tab -->
                         <div id="tab_regex" class="tab-pane fade">
diff --git a/scripts/pi-hole/js/footer.js b/scripts/pi-hole/js/footer.js
index d79a50f4..20cc4680 100644
--- a/scripts/pi-hole/js/footer.js
+++ b/scripts/pi-hole/js/footer.js
@@ -267,6 +267,10 @@ $(function () {
   initTheme();
   initCPUtemp();
 
+  if (typeof initpage === "function") {
+    setTimeout(initpage, 100);
+  }
+
   // Run check immediately after page loading ...
   checkMessages();
   // ... and once again with five seconds delay
diff --git a/scripts/pi-hole/js/index.js b/scripts/pi-hole/js/index.js
index d6b479e7..1619582a 100644
--- a/scripts/pi-hole/js/index.js
+++ b/scripts/pi-hole/js/index.js
@@ -1090,7 +1090,7 @@ $(function () {
     // Pull in data via AJAX
     updateForwardDestinationsPie();
   }
-});
+}
 
 //destroy all chartjs customTooltips on window resize
 window.addEventListener("resize", function () {