From fb541dd8ba3d96f7c0eb3dd32ffef8ea9b152f2e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Sat, 11 Aug 2018 23:22:47 +0200
Subject: [PATCH] ui: fix footer boxing; closes #2626

---
 src/opnsense/mvc/app/views/layouts/default.volt | 16 ++++++++--------
 src/www/diag_ipsec_sad.php                      |  4 +---
 src/www/diag_system_pftop.php                   |  6 +++---
 src/www/foot.inc                                |  2 +-
 src/www/interfaces.php                          |  5 ++---
 src/www/interfaces_assign.php                   |  4 ++--
 6 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/src/opnsense/mvc/app/views/layouts/default.volt b/src/opnsense/mvc/app/views/layouts/default.volt
index 4509005ec..58943d5e9 100644
--- a/src/opnsense/mvc/app/views/layouts/default.volt
+++ b/src/opnsense/mvc/app/views/layouts/default.volt
@@ -262,15 +262,15 @@
             </div>
           </div>
         </section>
+        <!-- page footer -->
+        <footer class="page-foot">
+          <div class="container-fluid">
+            <a target="_blank" href="{{ product_website }}" class="redlnk">{{ product_name }}</a>
+            (c) {{ product_copyright_years }}
+            <a href="{{ product_copyright_url }}" class="tblnk">{{ product_copyright_owner }}</a>
+          </div>
+        </footer>
       </div>
-      <!-- page footer -->
-      <footer class="page-foot col-sm-push-3 col-lg-push-2">
-        <div class="container-fluid">
-          <a target="_blank" href="{{ product_website }}" class="redlnk">{{ product_name }}</a>
-          (c) {{ product_copyright_years }}
-          <a href="{{ product_copyright_url }}" class="tblnk">{{ product_copyright_owner }}</a>
-        </div>
-      </footer>
     </main>
 
     <!-- dialog "wait for (service) action" -->
diff --git a/src/www/diag_ipsec_sad.php b/src/www/diag_ipsec_sad.php
index 75c979574..9effdf1cf 100644
--- a/src/www/diag_ipsec_sad.php
+++ b/src/www/diag_ipsec_sad.php
@@ -80,12 +80,10 @@ legacy_html_escape_form_data($sad);
                   <?php endif; ?>
                 </table>
               </div>
-            </div>
           </div>
         </section>
       </div>
     </div>
   </section>
 
-
-<?php include("foot.inc"); ?>
+<?php include("foot.inc");
diff --git a/src/www/diag_system_pftop.php b/src/www/diag_system_pftop.php
index 4de99f67e..f28421985 100644
--- a/src/www/diag_system_pftop.php
+++ b/src/www/diag_system_pftop.php
@@ -159,12 +159,12 @@ $( document ).ready(function() {
             </tbody>
           </table>
         </form>
-      </div>
         <section class="col-xs-12">
             <div id="pftopactivitydiv"><?=gettext("Gathering pfTOP activity, please wait...");?></div>
         </section>
-     </section>
+      </div>
     </div>
   </div>
 </section>
-<?php include("foot.inc"); ?>
+
+<?php include("foot.inc");
diff --git a/src/www/foot.inc b/src/www/foot.inc
index fe870ac57..df303a974 100644
--- a/src/www/foot.inc
+++ b/src/www/foot.inc
@@ -1,5 +1,5 @@
 
-      <footer class="page-foot col-sm-push-3 col-lg-push-2">
+      <footer class="page-foot">
         <div class="container-fluid">
           <a target="_blank" href="<?=$g['product_website']?>" class="redlnk"><?=$g['product_name']?></a> (c)
             <?=$g['product_copyright_years']?> <a href="<?=$g['product_copyright_url']?>" class="tblnk"><?=$g['product_copyright_owner']?></a>
diff --git a/src/www/interfaces.php b/src/www/interfaces.php
index bc8ee5a2e..59c95dded 100644
--- a/src/www/interfaces.php
+++ b/src/www/interfaces.php
@@ -3388,10 +3388,9 @@ include("head.inc");
                   </div>
                 </div>
               </form>
-            </div>
-          </div>
         </section>
       </div>
     </div>
   </section>
-  <?php include("foot.inc"); ?>
+
+<?php include("foot.inc");
diff --git a/src/www/interfaces_assign.php b/src/www/interfaces_assign.php
index 9cd6641a7..2fa27fbeb 100644
--- a/src/www/interfaces_assign.php
+++ b/src/www/interfaces_assign.php
@@ -459,7 +459,6 @@ include("head.inc");
                       </tr>
                     </tbody>
                   </table>
-                </div>
               </div>
             </form>
           </div>
@@ -467,4 +466,5 @@ include("head.inc");
       </div>
     </div>
   </section>
-<?php include("foot.inc"); ?>
+
+<?php include("foot.inc");