From 767c9b410b1f97bebbdf988a4f114e0278a9dfb4 Mon Sep 17 00:00:00 2001
From: Rosiak <sorenrosiak@gmail.com>
Date: Sun, 29 Nov 2015 00:53:58 +0100
Subject: [PATCH] Fix #2517

Minor cleanup
---
 html/pages/bill/delete.inc.php | 30 +++++++++++++-------------
 html/pages/bill/reset.inc.php  | 39 ++++++++++++++++++----------------
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/html/pages/bill/delete.inc.php b/html/pages/bill/delete.inc.php
index fc4ea7ccd..f39af8cfc 100644
--- a/html/pages/bill/delete.inc.php
+++ b/html/pages/bill/delete.inc.php
@@ -1,6 +1,4 @@
-
 <form name="form1" action="" method="post" class="form-horizontal">
-  <link rel="stylesheet" href="<?php echo $config['base_url']; ?>/css/bootstrap.min.css">
   <script type="text/javascript">
     function showWarning(checked) {
       $('#warning').toggle();
@@ -12,22 +10,24 @@
     }
   </script>
   <input type="hidden" name="action" value="delete_bill">
-  <fieldset>
-    <legend>Delete Bill</legend>
-    <div class="control-group">
-      <label class="control-label" for="confirm"><strong>Confirm</strong></label>
-      <div class="controls">
-        <label class="checkbox">
-          <input type="checkbox" name="confirm" value="confirm" onchange="javascript: showWarning(this.checked);">
-          Yes, please delete this bill!
+  <h3>Delete Bill</h3>
+  <hr>
+  <div class="control-group">
+    <label class="control-label" for="confirm"><strong>Confirm</strong></label>
+    <div class="controls">
+      <div class="checkbox">
+        <label>
+        <input type="checkbox" name="confirm" value="confirm" onchange="javascript: showWarning(this.checked);">
+        Yes, please delete this bill!
         </label>
       </div>
     </div>
-    <div class="alert alert-message" id="warning" style="display: none;">
-      <h4 class="alert-heading"><i class="icon-warning-sign"></i> Warning!</h4>
-      Are you sure you want to delete his bill?
-    </div>
-  </fieldset>
+  </div>
+  <br>
+  <div class="alert alert-danger" id="warning" style="display: none;">
+    <h4 class="alert-heading"><i class="fa fa-exclamation-triangle"></i> Warning</h4>
+    You are about to delete this bill.
+  </div>
   <div class="form-actions">
     <button id="deleteBtn" type="submit" class="btn btn-danger" disabled="disabled"><i class="icon-trash icon-white"></i> <strong>Delete Bill</strong></button>
   </div>
diff --git a/html/pages/bill/reset.inc.php b/html/pages/bill/reset.inc.php
index 756f85bd2..5721cb9a5 100644
--- a/html/pages/bill/reset.inc.php
+++ b/html/pages/bill/reset.inc.php
@@ -1,5 +1,4 @@
 <form name="form1" action="" method="post" class="form-horizontal">
-  <link rel="stylesheet" href="<?php echo $config['base_url']; ?>/css/bootstrap.min.css">
   <script type="text/javascript">
     function showWarning() {
       var checked = $('input:checked').length;
@@ -13,27 +12,31 @@
     }
   </script>
   <input type="hidden" name="action" value="reset_bill">
-  <fieldset>
-    <legend>Reset Bill</legend>
-    <div class="control-group">
-      <label class="control-label" for="confirm"><strong>Confirm</strong></label>
-      <div class="controls">
-        <label class="checkbox">
-          <input type="checkbox" name="confirm" value="mysql" onchange="javascript: showWarning();">
-          Yes, please reset MySQL data for all interfaces on this bill!
+  <h3>Reset Bill</h3>
+  <hr>
+  <div class="control-group">
+    <label class="control-label" for="confirm"><strong>Confirm</strong></label>
+    <div class="controls">
+      <div class="checkbox">
+        <label>
+        <input type="checkbox" name="confirm" value="mysql" onchange="javascript: showWarning();">
+        Yes, please reset MySQL data for all interfaces on this bill!
         </label>
-        <label class="checkbox">
-          <input disabled type="checkbox" name="confirm" value="rrd" onchange="javascript: showWarning();">
-          Yes, please reset RRD data for all interfaces on this bill!
+      </div>
+      <div class="checkbox">
+        <label>
+        <input disabled type="checkbox" name="confirm" value="rrd" onchange="javascript: showWarning();">
+        Yes, please reset RRD data for all interfaces on this bill!
         </label>
       </div>
     </div>
-    <div class="alert alert-message" id="warning" style="display: none;">
-      <h4 class="alert-heading"><i class="icon-warning-sign"></i> Warning!</h4>
-      Are you sure you want to reset all <strong>MySQL</strong> and/or <strong>RRD</strong> data for all interface on this bill?
-    </div>
-  </fieldset>
+  </div>
+  <br>
+  <div class="alert alert-danger" id="warning" style="display: none;">
+    <h4 class="alert-heading"><i class="fa fa-exclamation-triangle"></i> Warning</h4>
+    Are you sure you want to reset all <strong>MySQL</strong> and/or <strong>RRD</strong> data for all interface on this bill?
+  </div>
   <div class="form-actions">
     <button id="resetBtn" type="submit" class="btn btn-danger" disabled="disabled"><i class="icon-refresh icon-white"></i> <strong>Reset Bill</strong></button>
   </div>
-</form>
+</form>
\ No newline at end of file