From 8dbb2f3a1b005d671b56d776a1327a11db732cfb Mon Sep 17 00:00:00 2001
From: glaszig <glaszig@gmail.com>
Date: Sat, 3 Apr 2021 17:57:45 +0100
Subject: [PATCH] fix markup in networking

---
 templates/networking.php | 137 +++++++++++++++++++--------------------
 1 file changed, 65 insertions(+), 72 deletions(-)

diff --git a/templates/networking.php b/templates/networking.php
index 703c05df..d19093f3 100755
--- a/templates/networking.php
+++ b/templates/networking.php
@@ -1,84 +1,77 @@
 <div class="row">
   <div class="col-lg-12">
-   <div class="card">
-    <div class="card-header">
-      <div class="row">
-        <div class="col">
+    <div class="card">
+      <div class="card-header">
           <i class="fas fa-network-wired mr-2"></i><?php echo _("Networking"); ?>
-        </div>
-      </div><!-- ./row -->
-     </div><!-- ./card-header -->
+      </div>
+
       <div class="card-body">
         <div id="msgNetworking"></div>
-        <ul class="nav nav-tabs">
-          <li role="presentation" class="nav-item"><a class="nav-link active" href="#summary" aria-controls="summary" role="tab" data-toggle="tab"><?php echo _("Summary"); ?></a></li>
-        </ul>
-        <div class="tab-content">
-          <div role="tabpanel" class="tab-pane active" id="summary">
-            <h4 class="mt-3"><?php echo _("Internet connection"); ?></h4>
-            <div class="row">
-             <div class="col-sm-12">
-              <div class="table-responsive">
-                <table class="table">
-                  <thead>
-                    <tr>
-                      <th><?php echo _("Interface"); ?></th>
-                      <th><?php echo _("IP Address"); ?></th>
-                      <th><?php echo _("Gateway"); ?></th>
-                      <th colspan="2"><?php echo _("Internet Access"); ?></th>
-                    </tr>
-                  </thead>
-                  <tbody>
-                    <?php if (isset($routeInfo["error"]) || empty($routeInfo)): ?>
-                    <tr><td colspan=5>No route to the internet found</td></tr>
-                    <?php else: ?>
-                      <?php foreach($routeInfo as $route): ?>
-                        <tr>
-                          <td><?php echo $route['interface'] ?></td>
-                          <td><?php echo $route['ip-address'] ?></td>
-                          <td><?php echo $route['gateway'] ?><br><?php $route['gw-name'] ?></td>
-                          <td>
-                            <p class="m-0">
-                              <i class="fas <?php echo $route["access-ip"] ? "fa-check" : "fa-times"; ?>"></i> <?php echo RASPI_ACCESS_CHECK_IP ?>
-                            </p>
-                            <p class="m-0">
-                              <i class="fas <?php echo $route["access-dns"] ? "fa-check" : "fa-times"; ?>"></i> <?php echo RASPI_ACCESS_CHECK_DNS ?>
-                            </p>
-                          </td>
-                        </tr>
-                      <?php endforeach ?>
-                    <?php endif ?>
-                  </tbody>
-                </table>
-              </div>
-             </div>
-            </div>
-            <h4 class="mt-3"><?php echo _("Current settings") ?></h4>
-            <div class="row">
-            <?php if (!$bridgedEnabled) : // No interface details when bridged ?>
-              <?php foreach ($interfaces as $if): ?>
-                    <?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?>
-              <div class="col-md-6 mb-3">
-                <div class="card">
-                  <div class="card-header"><?php echo $if_quoted ?></div>
-                  <div class="card-body">
-                    <pre class="unstyled" id="<?php echo $if_quoted ?>-summary"></pre>
-                  </div>
-                </div>
-              </div>
-              <?php endforeach ?>
-            <?php endif ?>
-            </div><!-- /.row -->
-            <div class="col-lg-12">
-              <div class="row">
-                <button type="button" onClick="window.location.reload();" class="btn btn-outline btn-primary"><i class="fas fa-sync-alt"></i> <?php echo _("Refresh") ?></a>
-              </div>
+
+        <h4 class="card-title mt-3"><?php echo _("Internet connection"); ?></h4>
+        <div class="row">
+          <div class="col-sm-12">
+            <div class="table-responsive">
+              <table class="table">
+                <thead>
+                  <tr>
+                    <th><?php echo _("Interface"); ?></th>
+                    <th><?php echo _("IP Address"); ?></th>
+                    <th><?php echo _("Gateway"); ?></th>
+                    <th colspan="2"><?php echo _("Internet Access"); ?></th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <?php if (isset($routeInfo["error"]) || empty($routeInfo)): ?>
+                  <tr><td colspan=5>No route to the internet found</td></tr>
+                  <?php else: ?>
+                    <?php foreach($routeInfo as $route): ?>
+                      <tr>
+                        <td><?php echo $route['interface'] ?></td>
+                        <td><?php echo $route['ip-address'] ?></td>
+                        <td><?php echo $route['gateway'] ?><br><?php $route['gw-name'] ?></td>
+                        <td>
+                          <p class="m-0">
+                            <i class="fas <?php echo $route["access-ip"] ? "fa-check" : "fa-times"; ?>"></i> <?php echo RASPI_ACCESS_CHECK_IP ?>
+                          </p>
+                          <p class="m-0">
+                            <i class="fas <?php echo $route["access-dns"] ? "fa-check" : "fa-times"; ?>"></i> <?php echo RASPI_ACCESS_CHECK_DNS ?>
+                          </p>
+                        </td>
+                      </tr>
+                    <?php endforeach ?>
+                  <?php endif ?>
+                </tbody>
+              </table>
             </div>
           </div>
         </div>
+
+
+        <h4 class="card-title mt-3"><?php echo _("Current settings") ?></h4>
+        <div class="row">
+        <?php if (!$bridgedEnabled): // No interface details when bridged ?>
+          <?php foreach ($interfaces as $if): ?>
+          <?php $if_quoted = htmlspecialchars($if, ENT_QUOTES) ?>
+          <div class="col-md-6 mb-3">
+            <div class="card">
+              <div class="card-header"><?php echo $if_quoted ?></div>
+              <div class="card-body">
+                <pre class="unstyled" id="<?php echo $if_quoted ?>-summary"></pre>
+              </div>
+            </div>
+          </div>
+          <?php endforeach ?>
+        <?php endif ?>
+        </div><!-- /.row -->
+
+        <button type="button" onClick="window.location.reload();" class="btn btn-outline btn-primary"><i class="fas fa-sync-alt"></i> <?php echo _("Refresh") ?></a>
+
       </div><!-- /.card-body -->
-      <div class="card-footer"><?php echo _("Information provided by /sys/class/net"); ?></div>
+
+      <div class="card-footer">
+        <?php echo _("Information provided by /sys/class/net"); ?>
+      </div>
     </div><!-- /.card -->
   </div><!-- /.col-lg-12 -->
 </div><!-- /.row -->
-