Standardize card-headers

templates/about.php

@@ -1,7 +1,13 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-      <div class="card-header"><i class="fas fa-info-circle mr-2"></i><?php echo _("About RaspAP"); ?></div>
+      <div class="card-header">
+        <div class="row">
+          <div class="col">
+            <i class="fas fa-info-circle mr-2"></i><?php echo _("About RaspAP"); ?>
+          </div>
+        </div><!-- ./row -->
+      </div><!-- ./card-header -->
       <div class="card-body text-center">
         <h3><?php echo _("RaspAP") . " v" . RASPI_VERSION; ?></h3>
         <h5><a href="https://github.com/billz/raspap-webgui/blob/master/LICENSE">GNU General Public License v3.0</a></h5>
@@ -9,7 +15,6 @@
         <p>RaspAP is a co-creation of <a href="https://github.com/billz">@billz</a> and <a href="https://github.com/sirlagz">@SirLagz</a><br />
           with the contributions of our <a href="https://github.com/billz/raspap-webgui/graphs/contributors">community</a>.</p>
           <p><i class="fab fa-github"></i> <a href="https://github.com/billz/raspap-webgui">https://github.com/billz/raspap-webgui</a></p>
-
       </div><!-- /.card-body -->
       <div class="card-footer"></div>
     </div><!-- /.card -->

templates/admin.php

@@ -1,7 +1,13 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-      <div class="card-header"><i class="fas fa-user-lock mr-2"></i><?php echo _("Configure Auth"); ?></div>
+      <div class="card-header">
+        <div class="row">
+	        <div class="col">
+						<i class="fas fa-user-lock mr-2"></i><?php echo _("Configure Auth"); ?>
+          </div>
+        </div><!-- /.row -->
+      </div><!-- /.card-header -->
       <div class="card-body">
         <?php $status->showMessages(); ?>
         <h4><?php echo _("Authentication settings") ;?></h4>

templates/configure_client.php

@@ -1,8 +1,13 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-      <div class="card-header"><i class="fas fa-wifi mr-2"></i><?php echo _("Configure WiFi client"); ?></div>
+      <div class="card-header">
-      <!-- /.card-header -->
+        <div class="row">
+          <div class="col">
+            <i class="fas fa-wifi mr-2"></i><?php echo _("Configure WiFi client"); ?>
+          </div>
+        </div><!-- /.row -->
+      </div><!-- /.card-header -->
       <div class="card-body">
         <?php $status->showMessages(); ?>
         <div class="row">
@@ -16,7 +21,7 @@
         <form method="POST" action="?page=wpa_conf" name="wpa_conf_form" class="row">
             <?php echo CSRFTokenFieldTag() ?>
           <input type="hidden" name="client_settings" ?>
-          <div class="js-wifi-stations loading-spinner w-100"></div>
+          <div class="js-wifi-stations loading-spinner"></div>
         </form>
       </div><!-- ./ card-body -->
       <div class="card-footer"><?php echo _("<strong>Note:</strong> WEP access points appear as 'Open'. RaspAP does not currently support connecting to WEP"); ?></div>

templates/dashboard.php

@@ -6,8 +6,7 @@ if ($arrHostapdConf['WifiAPEnable'] == 1) {
     $client_iface = RASPI_WIFI_CLIENT_INTERFACE;
 }
 exec('cat '.RASPI_DNSMASQ_LEASES.'| grep -E $(arp -i '.$client_iface.' -n | grep -oE "(([0-9]|[a-f]|[A-F]){2}:){5}([0-9]|[a-f]|[A-F]){2}" | tr "\n" "\|" | sed "s/.$//")', $clients);
-$ifaceStatus = $wlan0up ? "running" : "stopped";
+$ifaceStatus = $wlan0up ? "up" : "down";
-$ifaceLabel = $wlan0up ? "up" : "down";
 ?>
 <div class="row">
   <div class="col-lg-12">
@@ -20,7 +19,7 @@ $ifaceLabel = $wlan0up ? "up" : "down";
 	  <div class="col">
 	    <button class="btn btn-light btn-icon-split btn-sm service-status float-right">
 	      <span class="icon"><i class="fas fa-circle service-status-<?php echo $ifaceStatus ?>"></i></span>
-	      <span class="text service-status"><?php echo strtolower($client_iface) .' '. _($ifaceLabel) ?></span>
+	      <span class="text service-status"><?php echo strtolower($client_iface) .' '. _($ifaceStatus) ?></span>
 	    </button>
 	  </div>
         </div><!-- /.row -->
@@ -40,7 +39,7 @@ $ifaceLabel = $wlan0up ? "up" : "down";
                 <div class="info-item"><?php echo _("Link Quality"); ?></div>
                 <script>var linkQ = <?php echo json_encode($strLinkQuality); ?>;</script>
                 <div class="chart-pie pt-5">
-                  <canvas id="canvas" xwidth="662" xheight="430" class="chartjs-render-monitor"></canvas>
+                  <canvas id="canvas" class="chartjs-render-monitor"></canvas>
                 </div>
              </div><!-- /.card-body -->
             </div><!-- /.card -->

templates/data_usage.php

@@ -1,7 +1,13 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-      <div class="card-header"><i class="fas fa-chart-bar mr-2"></i><?php echo _("Data usage monitoring"); ?></div>
+      <div class="card-header">
+        <div class="row">
+          <div class="col">
+            <i class="fas fa-chart-bar mr-2"></i><?php echo _("Data usage monitoring"); ?>
+          </div>
+        </div><!-- /.row -->
+      </div><!-- /.card-header -->
 			<div class="card-body">
 				<ul id="tabbarBandwidth" class="nav nav-tabs" role="tablist">
 					<li class="nav-item"><a class="nav-link active" href="#hourly" aria-controls="hourly" role="tab" data-toggle="tab"><?php echo _("Hourly"); ?></a></li>
@@ -67,7 +73,6 @@
 						</div>
 					</div><!-- /.tab-pane -->
 				</div><!-- /.tabsBandwidth -->
-
 			 </div><!-- /.card-body -->
 			 <div class="card-footer"><?php echo _("Information provided by vnstat"); ?></div>
      </div><!-- /.card -->

templates/dhcp.php

@@ -94,7 +94,7 @@
 		<?php endif ?>
 		</div><!-- /.tab-pane -->
 
-  <div class="tab-pane fade in" id="client-list">
+		<div class="tab-pane fade" id="client-list">
 		<h4 class="mt-3 mb-3">Client list</h4>
 		<div class="row">
 		<div class="col-lg-12">
@@ -132,7 +132,7 @@
   </div><!-- /.row -->
   </div><!-- /.tab-pane -->
 
-  <div class="tab-pane fade in" id="static-leases">
+  <div class="tab-pane fade" id="static-leases">
       <div class="dhcp-static-leases js-dhcp-static-lease-container">
           <?php foreach ($dhcpHost as $host) : ?>
               <?php list($mac, $ip) = array_map("trim", explode(",", $host)); ?>

templates/networking.php

@@ -1,7 +1,13 @@
 <div class="row">
   <div class="col-lg-12">
    <div class="card">
-    <div class="card-header"><i class="fas fa-network-wired mr-2"></i><?php echo _("Configure networking"); ?></div>
+    <div class="card-header">
+      <div class="row">
+        <div class="col">
+          <i class="fas fa-network-wired mr-2"></i><?php echo _("Configure networking"); ?>
+        </div>
+      </div><!-- ./row -->
+     </div><!-- ./card-header -->
       <div class="card-body">
         <div id="msgNetworking"></div>
         <ul class="nav nav-tabs">

templates/system.php

@@ -29,7 +29,13 @@ if ($cpuload > 90) {
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-      <div class="card-header"><i class="fas fa-cube mr-2"></i><?php echo _("System"); ?></div>
+      <div class="card-header">
+        <div class="row">
+          <div class="col">
+            <i class="fas fa-cube mr-2"></i><?php echo _("System"); ?>
+          </div>
+        </div><!-- /.row -->
+      </div><!-- /.card-header -->
       <div class="card-body">
 				<?php $status->showMessages(); ?>
 				<form role="form" action="?page=system_info" method="POST">
@@ -86,7 +92,6 @@ if ($cpuload > 90) {
 						<input type="submit" class="btn btn-outline btn-primary" name="SaveLanguage" value="<?php echo _("Save settings"); ?>" />
 						<a href="?page=<?php echo $_GET['page'] ?>" class="btn btn-outline btn-primary"><i class="fas fa-sync-alt"></i> <?php echo _("Refresh") ?></a>
 					</div>
-
 					<div role="tabpanel" class="tab-pane" id="console">
 						<div class="row">
 							<div class="col-lg-12 mt-3">
@@ -95,7 +100,6 @@ if ($cpuload > 90) {
 						</div>
 					</div>
 				</div><!-- /.systemtabcontent -->
-
 				</form>
       </div><!-- /.card-body -->
       <div class="card-footer"></div>

templates/themes.php

@@ -1,7 +1,13 @@
 <div class="row">
   <div class="col-lg-12">
     <div class="card">
-      <div class="card-header"><i class="fas fa-paint-brush mr-2"></i><?php echo _("Change Theme"); ?></div>
+      <div class="card-header">
+        <div class="row">
+          <div class="col">
+            <i class="fas fa-paint-brush mr-2"></i><?php echo _("Change Theme"); ?>
+          </div>
+        </div><!-- /.row -->
+      </div><!-- /.card-header -->
       <div class="card-body">
         <h4><?php echo _("Theme settings"); ?></h4>
         <div class="row">