From dfb93c343bb4fe365c4c18cc1d59d7d471ee5838 Mon Sep 17 00:00:00 2001
From: Shreyas Zare <shreyas@technitium.com>
Date: Sun, 16 Jun 2019 21:59:12 +0530
Subject: [PATCH] minor ui changes done

---
 DnsServerCore/www/index.html | 14 ++++----------
 DnsServerCore/www/js/dhcp.js | 12 ++++++------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/DnsServerCore/www/index.html b/DnsServerCore/www/index.html
index e86c3d0e..b12fc9a2 100644
--- a/DnsServerCore/www/index.html
+++ b/DnsServerCore/www/index.html
@@ -1223,11 +1223,8 @@
                                                     <thead>
                                                         <tr>
                                                             <th>Name</th>
-                                                            <th>Starting Address</th>
-                                                            <th>Ending Address</th>
-                                                            <th>Subnet Mask</th>
-                                                            <th>Network</th>
-                                                            <th>Broadcast</th>
+                                                            <th>Scope Range/Subnet Mask</th>
+                                                            <th>Network/Broadcast</th>
                                                             <th>Interface</th>
                                                             <th></th>
                                                         </tr>
@@ -1235,11 +1232,8 @@
                                                     <tbody id="tableDhcpScopes">
                                                         <tr>
                                                             <td>Default</td>
-                                                            <td>192.168.10.1</td>
-                                                            <td>192.168.10.100</td>
-                                                            <td>255.255.255.0</td>
-                                                            <td>192.168.10.0</td>
-                                                            <td>192.168.10.255</td>
+                                                            <td>192.168.10.1 - 192.168.10.100</td>
+                                                            <td>192.168.10.0<br />192.168.10.255</td>
                                                             <td>192.168.10.1</td>
                                                             <td>Edit Delete</td>
                                                         </tr>
diff --git a/DnsServerCore/www/js/dhcp.js b/DnsServerCore/www/js/dhcp.js
index 3dae0bed..8d85f42f 100644
--- a/DnsServerCore/www/js/dhcp.js
+++ b/DnsServerCore/www/js/dhcp.js
@@ -71,21 +71,21 @@ function refreshDhcpScopes() {
             var tableHtmlRows;
 
             if (dhcpScopes.length < 1) {
-                tableHtmlRows = "<tr><td colspan=\"8\" align=\"center\">No Scope Found</td></tr>";
+                tableHtmlRows = "<tr><td colspan=\"5\" align=\"center\">No Scope Found</td></tr>";
             }
             else {
                 tableHtmlRows = "";
 
                 for (var i = 0; i < dhcpScopes.length; i++) {
-                    tableHtmlRows += "<tr><td>" + htmlEncode(dhcpScopes[i].name) + "</td><td>" + dhcpScopes[i].startingAddress + "</td><td>" + dhcpScopes[i].endingAddress + "</td><td>" + dhcpScopes[i].subnetMask + "</td><td>" + dhcpScopes[i].networkAddress + "</td><td>" + dhcpScopes[i].broadcastAddress + "</td><td>" + (dhcpScopes[i].interfaceAddress == null ? "" : dhcpScopes[i].interfaceAddress) + "</td>";
-                    tableHtmlRows += "<td><button type=\"button\" class=\"btn btn-primary\" style=\"font-size: 12px; padding: 2px 16px; margin-right: 6px;\" onclick=\"showEditDhcpScope('" + dhcpScopes[i].name + "');\">Edit</button>";
+                    tableHtmlRows += "<tr><td>" + htmlEncode(dhcpScopes[i].name) + "</td><td>" + dhcpScopes[i].startingAddress + " - " + dhcpScopes[i].endingAddress + "<br />" + dhcpScopes[i].subnetMask + "</td><td>" + dhcpScopes[i].networkAddress + "<br />" + dhcpScopes[i].broadcastAddress + "</td><td>" + (dhcpScopes[i].interfaceAddress == null ? "" : dhcpScopes[i].interfaceAddress) + "</td>";
+                    tableHtmlRows += "<td><button type=\"button\" class=\"btn btn-primary\" style=\"font-size: 12px; padding: 2px 0px; width: 60px; margin: 0 6px 6px 0;\" onclick=\"showEditDhcpScope('" + dhcpScopes[i].name + "');\">Edit</button>";
 
                     if (dhcpScopes[i].enabled)
-                        tableHtmlRows += "<button type=\"button\" class=\"btn btn-warning\" style=\"font-size: 12px; padding: 2px 6px; margin-right: 6px;\" onclick=\"disableDhcpScope('" + dhcpScopes[i].name + "');\">Disable</button>";
+                        tableHtmlRows += "<button type=\"button\" class=\"btn btn-warning\" style=\"font-size: 12px; padding: 2px 0px; width: 60px; margin: 0 6px 6px 0;\" onclick=\"disableDhcpScope('" + dhcpScopes[i].name + "');\">Disable</button>";
                     else
-                        tableHtmlRows += "<button type=\"button\" class=\"btn btn-default\" style=\"font-size: 12px; padding: 2px 6px; margin-right: 6px;\" onclick=\"enableDhcpScope('" + dhcpScopes[i].name + "');\">Enable</button>";
+                        tableHtmlRows += "<button type=\"button\" class=\"btn btn-default\" style=\"font-size: 12px; padding: 2px 0px; width: 60px; margin: 0 6px 6px 0;\" onclick=\"enableDhcpScope('" + dhcpScopes[i].name + "');\">Enable</button>";
 
-                    tableHtmlRows += "<button type=\"button\" class=\"btn btn-danger\" style=\"font-size: 12px; padding: 2px 10px;\" onclick=\"deleteDhcpScope('" + dhcpScopes[i].name + "');\">Delete</button></td></tr>";
+                    tableHtmlRows += "<button type=\"button\" class=\"btn btn-danger\" style=\"font-size: 12px; padding: 2px 0px; width: 60px; margin: 0 6px 6px 0;\" onclick=\"deleteDhcpScope('" + dhcpScopes[i].name + "');\">Delete</button></td></tr>";
                 }
             }