From 44042d99c327d7c7d72c9b0b9a95a141b7fbc9d4 Mon Sep 17 00:00:00 2001 From: Arjit Chaudhary Date: Tue, 15 Sep 2015 01:41:39 +0530 Subject: [PATCH 01/12] UI cleanup and icons added --- html/pages/device/edit/device.inc.php | 23 ++++++++++++----------- html/pages/device/edit/snmp.inc.php | 3 ++- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/html/pages/device/edit/device.inc.php b/html/pages/device/edit/device.inc.php index b9f0fd0d1..40694b609 100644 --- a/html/pages/device/edit/device.inc.php +++ b/html/pages/device/edit/device.inc.php @@ -65,23 +65,23 @@ elseif ($update_message) { ?>
+
- +
+
+ + +
- -
- -
-

@@ -141,7 +141,8 @@ if ($unknown) { /> - +
+

" . formatStorage($sizeondisk) . " in " . $numrrds . " RRD files."); - print_optionbar_end(); - ?> From c14942e399a35f4dbf499f674f5eac7664e80dcb Mon Sep 17 00:00:00 2001 From: Arjit Chaudhary Date: Wed, 16 Sep 2015 16:02:38 +0530 Subject: [PATCH 07/12] snmp.inc.php switch to offsets --- html/pages/device/edit/snmp.inc.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/html/pages/device/edit/snmp.inc.php b/html/pages/device/edit/snmp.inc.php index 26ce8dac5..804ffd63c 100644 --- a/html/pages/device/edit/snmp.inc.php +++ b/html/pages/device/edit/snmp.inc.php @@ -211,8 +211,11 @@ if ($config['distributed_poller'] === true) { echo ' -
- +
+
+ +
+
'; From 5b1d1f79fd6ce4bd264b3f7ab8bf0cdd3c0f5b06 Mon Sep 17 00:00:00 2001 From: Arjit Chaudhary Date: Wed, 16 Sep 2015 16:04:21 +0530 Subject: [PATCH 08/12] Display success/error messages across the width of the page screenshot: http://i.imgur.com/xcuHrMF.png --- html/pages/device/edit/snmp.inc.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/html/pages/device/edit/snmp.inc.php b/html/pages/device/edit/snmp.inc.php index 804ffd63c..aff9c8663 100644 --- a/html/pages/device/edit/snmp.inc.php +++ b/html/pages/device/edit/snmp.inc.php @@ -70,8 +70,6 @@ if ($_POST['editing']) { $device = dbFetchRow('SELECT * FROM `devices` WHERE `device_id` = ?', array($device['device_id'])); $descr = $device['purpose']; -echo '
-
'; if ($updated && $update_message) { print_message($update_message); } @@ -79,9 +77,6 @@ else if ($update_message) { print_error($update_message); } -echo '
-
'; - echo "
From 4c0b7078fb641c5cff799937637d8615f3f2dbdd Mon Sep 17 00:00:00 2001 From: Arjit Chaudhary Date: Wed, 16 Sep 2015 16:07:15 +0530 Subject: [PATCH 09/12] switch to bootstrap offsets --- html/pages/device/edit/ipmi.inc.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/html/pages/device/edit/ipmi.inc.php b/html/pages/device/edit/ipmi.inc.php index 680e71e53..f00c0e515 100644 --- a/html/pages/device/edit/ipmi.inc.php +++ b/html/pages/device/edit/ipmi.inc.php @@ -66,8 +66,11 @@ else if ($update_message) { -
- +
+
+ +
+


-
- +
+
+ +
+

-
- \ No newline at end of file +
+
+ +
+
From 99e819d3bbd71e42ae1ceba4cdd228fc43ac5156 Mon Sep 17 00:00:00 2001 From: Arjit Chaudhary Date: Wed, 16 Sep 2015 19:03:46 +0530 Subject: [PATCH 11/12] Add fa-check to Save and move out of table --- html/pages/device/edit/apps.inc.php | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/html/pages/device/edit/apps.inc.php b/html/pages/device/edit/apps.inc.php index 044952ab1..0bed0731c 100644 --- a/html/pages/device/edit/apps.inc.php +++ b/html/pages/device/edit/apps.inc.php @@ -58,10 +58,11 @@ if (count($apps_enabled)) { } } -echo " +echo "
+
- +
@@ -89,12 +90,13 @@ foreach ($applications as $app) { $row++; } -echo ' - - - '; echo '
Enable Application
- - -
'; +echo '
+
+ +
+
+'; echo '
'; +echo '
'; +echo '
'; From 9fcee7a0401388707fff8dd70dc15ee897c1985e Mon Sep 17 00:00:00 2001 From: Arjit Chaudhary Date: Wed, 16 Sep 2015 19:04:29 +0530 Subject: [PATCH 12/12] Added back table-condensed --- html/pages/device/edit/apps.inc.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html/pages/device/edit/apps.inc.php b/html/pages/device/edit/apps.inc.php index 0bed0731c..9ed743de7 100644 --- a/html/pages/device/edit/apps.inc.php +++ b/html/pages/device/edit/apps.inc.php @@ -62,7 +62,7 @@ echo "
- +
Enable Application