Merge pull request #371 from glaszig/ui/layout-fixes

layout improvements

includes/about.php

@@ -14,23 +14,14 @@ function DisplayAbout()
   <div class="col-lg-12">
   <div class="panel panel-primary">
   <div class="panel-heading"><i class="fa fa-info-circle fa-fw"></i> <?php echo _("About RaspAP"); ?></div>
-  <div class="panel-body">
+  <div class="panel-body text-center">
 
-    <div class="panel panel-default">
-    <div class="panel-body">
-      <div class="row">
-        <div class="col-lg-6" style="text-align: 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>
     <p><img src="img/authors-8bit-200px.png"></p>
     <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="fa fa-github fa-fw"></i> <a href="https://github.com/billz/raspap-webgui">https://github.com/billz/raspap-webgui</a></p>
-       </div><!-- /.col-lg-6 -->
-      </div><!-- /.row -->
-
-    </div><!-- ./panel-body-->
-    </div><!-- /.panel-default -->
 
   </div><!-- /.panel-body -->
   <div class="panel-footer"></div>

includes/configure_client.php

@@ -181,7 +181,7 @@ function DisplayWPAConfig()
               <a href=".?<?php echo htmlspecialchars($_SERVER['QUERY_STRING'], ENT_QUOTES); ?>" style="padding:10px;float: right;display: block;position: relative;margin-top: -55px;" class="col-md-2 btn btn-info" id="update"><?php echo _("Rescan"); ?></a>
             </div> 
 
-            <form method="POST" action="?page=wpa_conf" name="wpa_conf_form">
+            <form method="POST" action="?page=wpa_conf" name="wpa_conf_form" class="row">
                 <?php echo CSRFTokenFieldTag() ?>
               <input type="hidden" name="client_settings" ?>
               <script>

includes/data_usage.php

@@ -12,15 +12,13 @@ function DisplayDataUsage(&$extraFooterScripts)
       <div class="panel panel-primary">
         <div class="panel-heading"><i class="fa fa-bar-chart fa-fw"></i> <?php echo _("Data usage monitoring"); ?></div>
           <div class="panel-body">
-            <div class="row">
+
-              <div class="col-md-12">
-                <div class="panel panel-default">
-                  <div class="panel-body">
             <ul id="tabbarBandwidth" class="nav nav-tabs" role="tablist">
               <li role="presentation" class="active"><a href="#hourly" aria-controls="hourly" role="tab" data-toggle="tab"><?php echo _("Hourly"); ?></a></li>
               <li role="presentation" class=""><a href="#daily" aria-controls="daily" role="tab" data-toggle="tab"><?php echo _("Daily"); ?></a></li>
               <li role="presentation" class=""><a href="#monthly" aria-controls="monthly" role="tab" data-toggle="tab"><?php echo _("Monthly"); ?></a></li>
             </ul>
+
             <div id="tabsBandwidth" class="tabcontenttraffic tab-content">
               <div role="tabpanel" class="tab-pane active fade in" id="hourly">
                 <div class="row">
@@ -30,7 +28,7 @@ function DisplayDataUsage(&$extraFooterScripts)
                     <select id="cbxInterfacehourly" class="form-control" name="interfacehourly">
 <?php
 foreach ($interfacesWlo as $interface) {
-    echo '                              <option value="' , htmlentities($interface, ENT_QUOTES) , '">' ,
+echo '                              <option value="' , htmlentities($interface, ENT_QUOTES) , '">' ,
     htmlentities($interface, ENT_QUOTES) , '</option>' , PHP_EOL;
 }
 ?>
@@ -51,7 +49,7 @@ foreach ($interfacesWlo as $interface) {
                     <select id="cbxInterfacedaily" class="form-control" name="interfacedaily">
 <?php
 foreach ($interfacesWlo as $interface) {
-    echo '                              <option value="' , htmlentities($interface, ENT_QUOTES) , '">' ,
+echo '                              <option value="' , htmlentities($interface, ENT_QUOTES) , '">' ,
     htmlentities($interface, ENT_QUOTES) , '</option>' , PHP_EOL;
 }
 ?>
@@ -72,7 +70,7 @@ foreach ($interfacesWlo as $interface) {
                     <select id="cbxInterfacemonthly" class="form-control" name="interfacemonthly">
 <?php
 foreach ($interfacesWlo as $interface) {
-    echo '                            <option value="' , htmlentities($interface, ENT_QUOTES) , '">' ,
+echo '                            <option value="' , htmlentities($interface, ENT_QUOTES) , '">' ,
     htmlentities($interface, ENT_QUOTES) , '</option>' , PHP_EOL;
 }
 ?>
@@ -86,13 +84,11 @@ foreach ($interfacesWlo as $interface) {
                 </div>
               </div><!-- /.tab-pane -->
             </div><!-- /.tabsBandwidth -->
-                  </div><!-- /.panel-default -->
+
-                </div><!-- /.col-md-6 -->
-              </div><!-- /.row -->
            </div><!-- /.panel-body -->
-         </div><!-- /.panel-primary -->
          <div class="panel-footer"><?php echo _("Information provided by vnstat"); ?></div>
        </div><!-- /.panel-primary -->
+      </div><!-- /.panel-primary -->
     </div><!-- /.col-lg-12 -->
   </div><!-- /.row -->
 <script type="text/javascript"<?php //echo ' nonce="'.$csp_page_nonce.'"'; ?>>

includes/dhcp.php

@@ -220,6 +220,7 @@ foreach ($interfaces as $inet) {
 
     <div class="tab-pane fade in" id="client-list">
     <h4>Client list</h4>
+    <div class="row">
     <div class="col-lg-12">
       <div class="panel panel-default">
       <div class="panel-heading"><?php echo _("Active DHCP leases"); ?></div>
@@ -253,7 +254,8 @@ foreach ($leases as $lease) {
         </div><!-- /.table-responsive -->
       </div><!-- /.panel-body -->
       </div><!-- /.panel -->
-    </div><!-- /.col-lg-6 -->
+    </div><!-- /.col-lg-12 -->
+    </div><!-- /.row -->
     </div><!-- /.tab-pane -->
 
     <div class="tab-pane fade in" id="static-leases">

includes/system.php

@@ -152,10 +152,6 @@ if (isset($_POST['system_shutdown'])) {
 }
 ?>
 
-  <div class="row">
-  <div class="col-md-12">
-  <div class="panel panel-default">
-  <div class="panel-body">
   <p><?php $status->showMessages(); ?></p>
   <form role="form" action="?page=system_info" method="POST">
   <ul class="nav nav-tabs" role="tablist">
@@ -221,12 +217,8 @@ if (isset($_POST['system_shutdown'])) {
 
   </div><!-- /.systemtabcontent -->
 
-    </div><!-- /.panel-default -->
-    </div><!-- /.col-md-6 -->
-    </div><!-- /.row -->
-  </div><!-- /.panel-body -->
   </form>
-  </div><!-- /.panel-primary -->
+  </div><!-- /.panel-body -->
   <div class="panel-footer"></div>
   </div><!-- /.panel-primary -->
   </div><!-- /.col-lg-12 -->

includes/themes.php

@@ -28,10 +28,7 @@ function DisplayThemeConfig()
   <div class="panel panel-primary">
   <div class="panel-heading"><i class="fa fa-wrench fa-fw"></i> <?php echo _("Change Theme"); ?></div>
   <div class="panel-body">
-    <div class="row">
+
-    <div class="col-md-6">
-    <div class="panel panel-default">
-    <div class="panel-body">
     <h4><?php echo _("Theme settings"); ?></h4>
 
     <div class="row">
@@ -45,11 +42,6 @@ function DisplayThemeConfig()
       </div>
     </div>
 
-    </div><!-- /.panel-body -->
-    </div><!-- /.panel-default -->
-    </div><!-- /.col-md-6 -->
-    </div><!-- /.row -->
-
     <form action="?page=system_info" method="POST">
       <input type="button" class="btn btn-outline btn-primary" value="<?php echo _("Refresh"); ?>" onclick="document.location.reload(true)" />
     </form>