diff --git a/html/includes/common/alerts.inc.php b/html/includes/common/alerts.inc.php index 5d0a84decf..23f9263100 100644 --- a/html/includes/common/alerts.inc.php +++ b/html/includes/common/alerts.inc.php @@ -227,7 +227,7 @@ var alerts_grid = $("#alerts_'.$unique_id.'").bootgrid({ return "

" + row.msg + "

"; }, "ack": function(column,row) { - return ""; + return ""; }, "proc": function(column,row) { return ""; @@ -248,7 +248,7 @@ var alerts_grid = $("#alerts_'.$unique_id.'").bootgrid({ }).on("click", function(e) { var target = $(this).data("target"); $(target).collapse(\'toggle\'); - $(this).toggleClass(\'glyphicon-plus glyphicon-minus\'); + $(this).toggleClass(\'fa-plus fa-minus\'); }); alerts_grid.find(".incident").each( function() { $(this).parent().addClass(\'col-lg-4 col-md-4 col-sm-4 col-xs-4\'); @@ -258,8 +258,8 @@ var alerts_grid = $("#alerts_'.$unique_id.'").bootgrid({ $(this).find(".incident-toggle").fadeOut(200); }).on("click", "td:not(.incident-toggle-td)", function() { var target = $(this).parent().find(".incident-toggle").data("target"); - if( $(this).parent().find(".incident-toggle").hasClass(\'glyphicon-plus\') ) { - $(this).parent().find(".incident-toggle").toggleClass(\'glyphicon-plus glyphicon-minus\'); + if( $(this).parent().find(".incident-toggle").hasClass(\'fa-plus\') ) { + $(this).parent().find(".incident-toggle").toggleClass(\'fa-plus fa-minus\'); $(target).collapse(\'toggle\'); } }); diff --git a/html/includes/functions.inc.php b/html/includes/functions.inc.php index 628e335b29..2a988d6c47 100644 --- a/html/includes/functions.inc.php +++ b/html/includes/functions.inc.php @@ -1209,7 +1209,7 @@ function generate_dynamic_config_panel($title, $config_groups, $items = array(), $output .= '
-
+
'; if ($item['type'] == 'checkbox') { @@ -1217,7 +1217,7 @@ function generate_dynamic_config_panel($title, $config_groups, $items = array(), } elseif ($item['type'] == 'text') { $output .= ' - + '; } elseif ($item['type'] == 'select') { $output .= ' @@ -1242,7 +1242,7 @@ function generate_dynamic_config_panel($title, $config_groups, $items = array(), } $output .=' - + '; } $output .= ' diff --git a/html/includes/modal/alert_schedule.inc.php b/html/includes/modal/alert_schedule.inc.php index 48e3620e0f..27df26ac20 100644 --- a/html/includes/modal/alert_schedule.inc.php +++ b/html/includes/modal/alert_schedule.inc.php @@ -207,9 +207,32 @@ $('#map-stub').typeahead({ $(function () { $("#start").datetimepicker({ - minDate: '' + minDate: '', + icons: { + time: 'fa fa-clock-o', + date: 'fa fa-calendar', + up: 'fa fa-chevron-up', + down: 'fa fa-chevron-down', + previous: 'fa fa-chevron-left', + next: 'fa fa-chevron-right', + today: 'fa fa-calendar-check-o', + clear: 'fa fa-trash-o', + close: 'fa fa-close' + } + }); + $("#end").datetimepicker({ + icons: { + time: 'fa fa-clock-o', + date: 'fa fa-calendar', + up: 'fa fa-chevron-up', + down: 'fa fa-chevron-down', + previous: 'fa fa-chevron-left', + next: 'fa fa-chevron-right', + today: 'fa fa-calendar-check-o', + clear: 'fa fa-trash-o', + close: 'fa fa-close' + } }); - $("#end").datetimepicker(); $("#start").on("dp.change", function (e) { $("#end").data("DateTimePicker").minDate(e.date); }); diff --git a/html/includes/print-alert-rules.php b/html/includes/print-alert-rules.php index 2c240479f6..accf363ffb 100644 --- a/html/includes/print-alert-rules.php +++ b/html/includes/print-alert-rules.php @@ -162,13 +162,13 @@ $full_query = $full_query.$query." LIMIT $start,$results"; foreach (dbFetchRows($full_query, $param) as $rule) { $sub = dbFetchRows('SELECT * FROM alerts WHERE rule_id = ? ORDER BY `state` DESC, `id` DESC LIMIT 1', array($rule['id'])); - $ico = 'ok'; + $ico = 'check'; $col = 'success'; $extra = ''; if (sizeof($sub) == 1) { $sub = $sub[0]; if ((int) $sub['state'] === 0) { - $ico = 'ok'; + $ico = 'check'; $col = 'success'; } elseif ((int) $sub['state'] === 1 || (int) $sub['state'] === 2) { $ico = 'remove'; @@ -205,9 +205,9 @@ foreach (dbFetchRows($full_query, $param) as $rule) { echo ''.htmlentities($rule['rule']).''; echo ''.$rule['severity'].''; - echo " "; + echo " "; if ($rule_extra['mute'] === true) { - echo ""; + echo ""; } echo 'Max: '.$rule_extra['count'].'
Delay: '.$rule_extra['delay'].'
Interval: '.$rule_extra['interval'].''; @@ -219,8 +219,9 @@ foreach (dbFetchRows($full_query, $param) as $rule) { echo ''; echo ''; if ($_SESSION['userlevel'] >= '10') { - echo " "; - echo ""; + echo "
"; + echo " "; + echo ""; } echo ''; @@ -297,15 +298,15 @@ $('input[name="alert-rule"]').on('switchChange.bootstrapSwitch', function(event success: function(msg) { if(msg.indexOf("ERROR:") <= -1) { if(state) { - $('#alert-rule-'+alert_id).removeClass('glyphicon-pause'); - $('#alert-rule-'+alert_id).addClass('glyphicon-'+orig_state); + $('#alert-rule-'+alert_id).removeClass('fa-pause'); + $('#alert-rule-'+alert_id).addClass('fa-'+orig_state); $('#alert-rule-'+alert_id).removeClass('text-default'); $('#alert-rule-'+alert_id).addClass('text-'+orig_colour); $('#row_'+alert_id).removeClass('active'); $('#row_'+alert_id).addClass(orig_class); } else { - $('#alert-rule-'+alert_id).removeClass('glyphicon-'+orig_state); - $('#alert-rule-'+alert_id).addClass('glyphicon-pause'); + $('#alert-rule-'+alert_id).removeClass('fa-'+orig_state); + $('#alert-rule-'+alert_id).addClass('fa-pause'); $('#alert-rule-'+alert_id).removeClass('text-'+orig_colour); $('#alert-rule-'+alert_id).addClass('text-default'); $('#row_'+alert_id).removeClass('warning'); diff --git a/html/includes/print-alert-templates.php b/html/includes/print-alert-templates.php index 0af128a766..35f0fe6241 100644 --- a/html/includes/print-alert-templates.php +++ b/html/includes/print-alert-templates.php @@ -79,9 +79,11 @@ foreach (dbFetchRows($full_query, $param) as $template) { '.$template['name'].' '; if ($_SESSION['userlevel'] >= '10') { - echo " "; - echo " "; - echo ""; + echo "
"; + echo " "; + echo " "; + echo ""; + echo "
"; } echo ' diff --git a/html/includes/print-alerts.inc.php b/html/includes/print-alerts.inc.php index 8829f27c85..93911a212e 100644 --- a/html/includes/print-alerts.inc.php +++ b/html/includes/print-alerts.inc.php @@ -19,27 +19,27 @@ echo ''.htmlspecialchars($alert_entry['name']).''; if ($alert_state != '') { if ($alert_state == '0') { - $glyph_icon = 'ok'; - $glyph_color = 'green'; - $text = 'Ok'; + $fa_icon = 'check'; + $fa_color = 'success'; + $text = 'Ok'; } elseif ($alert_state == '1') { - $glyph_icon = 'remove'; - $glyph_color = 'red'; - $text = 'Alert'; + $fa_icon = 'remove'; + $fa_color = 'danger'; + $text = 'Alert'; } elseif ($alert_state == '2') { - $glyph_icon = 'info-sign'; - $glyph_color = 'lightgrey'; - $text = 'Ack'; + $fa_icon = 'info-circle'; + $fa_color = 'muted'; + $text = 'Ack'; } elseif ($alert_state == '3') { - $glyph_icon = 'arrow-down'; - $glyph_color = 'orange'; - $text = 'Worse'; + $fa_icon = 'arrow-down'; + $fa_color = 'warning'; + $text = 'Worse'; } elseif ($alert_state == '4') { - $glyph_icon = 'arrow-up'; - $glyph_color = 'khaki'; - $text = 'Better'; + $fa_icon = 'arrow-up'; + $fa_color = 'info'; + $text = 'Better'; }//end if - echo " $text"; + echo " $text"; }//end if echo ''; diff --git a/html/includes/print-date-selector.inc.php b/html/includes/print-date-selector.inc.php index 3333df0b6d..f7055b3a48 100644 --- a/html/includes/print-date-selector.inc.php +++ b/html/includes/print-date-selector.inc.php @@ -33,8 +33,8 @@ echo ' ("0"+strto.getHours()).slice(-2)+":"+ ("0"+strto.getMinutes()).slice(-2) ); - $("#dtpickerfrom").datetimepicker({useCurrent: true, sideBySide: true, useStrict: false}); - $("#dtpickerto").datetimepicker({useCurrent: true, sideBySide: true, useStrict: false}); + $("#dtpickerfrom").datetimepicker({useCurrent: true, sideBySide: true, useStrict: false, icons: {time: "fa fa-clock-o", date: "fa fa-calendar", up: "fa fa-chevron-up", down: "fa fa-chevron-down", previous: "fa fa-chevron-left", next: "fa fa-chevron-right", today: "fa fa-calendar-check-o", clear: "fa fa-trash-o", close: "fa fa-close"}}); + $("#dtpickerto").datetimepicker({useCurrent: true, sideBySide: true, useStrict: false, icons: {time: "fa fa-clock-o", date: "fa fa-calendar", up: "fa fa-chevron-up", down: "fa fa-chevron-down", previous: "fa fa-chevron-left", next: "fa fa-chevron-right", today: "fa fa-calendar-check-o", clear: "fa fa-trash-o", close: "fa fa-close"}}); }); '; diff --git a/html/includes/print-interface.inc.php b/html/includes/print-interface.inc.php index 414bdcf241..440dd80b94 100644 --- a/html/includes/print-interface.inc.php +++ b/html/includes/print-interface.inc.php @@ -232,7 +232,7 @@ if (strpos($port['label'], 'oopback') === false && !$graph_type) { }//end if if (count($int_links) > 3) { - echo '
+ echo '
'; } diff --git a/html/includes/table/alertlog.inc.php b/html/includes/table/alertlog.inc.php index 7d1ebfe2b7..cfc80b16b5 100644 --- a/html/includes/table/alertlog.inc.php +++ b/html/includes/table/alertlog.inc.php @@ -52,33 +52,33 @@ foreach (dbFetchRows($sql, $param) as $alertlog) { $fault_detail = alert_details($alertlog['details']); $alert_state = $alertlog['state']; if ($alert_state == '0') { - $glyph_icon = 'ok'; - $glyph_color = 'green'; - $text = 'Ok'; + $fa_icon = 'check'; + $fa_color = 'success'; + $text = 'Ok'; } elseif ($alert_state == '1') { - $glyph_icon = 'remove'; - $glyph_color = 'red'; - $text = 'Alert'; + $fa_icon = 'times'; + $fa_color = 'danger'; + $text = 'Alert'; } elseif ($alert_state == '2') { - $glyph_icon = 'info-sign'; - $glyph_color = 'lightgrey'; - $text = 'Ack'; + $fa_icon = 'info-circle'; + $fa_color = 'muted'; + $text = 'Ack'; } elseif ($alert_state == '3') { - $glyph_icon = 'arrow-down'; - $glyph_color = 'orange'; - $text = 'Worse'; + $fa_icon = 'arrow-down'; + $fa_color = 'warning'; + $text = 'Worse'; } elseif ($alert_state == '4') { - $glyph_icon = 'arrow-up'; - $glyph_color = 'khaki'; - $text = 'Better'; + $fa_icon = 'arrow-up'; + $fa_color = 'info'; + $text = 'Better'; }//end if $response[] = array( 'id' => $rulei++, 'time_logged' => $alertlog['humandate'], - 'details' => '', + 'details' => '', 'hostname' => '
'.generate_device_link($dev, shorthost($dev['hostname'])).'
'.$fault_detail.'
', 'alert' => htmlspecialchars($alertlog['alert']), - 'status' => " $text", + 'status' => " $text", ); }//end foreach diff --git a/html/includes/table/alerts.inc.php b/html/includes/table/alerts.inc.php index 802db97d66..dc8661fa77 100644 --- a/html/includes/table/alerts.inc.php +++ b/html/includes/table/alerts.inc.php @@ -101,12 +101,12 @@ foreach (dbFetchRows($sql, $param) as $alert) { $log = dbFetchCell('SELECT details FROM alert_log WHERE rule_id = ? AND device_id = ? ORDER BY id DESC LIMIT 1', array($alert['rule_id'], $alert['device_id'])); $fault_detail = alert_details($log); - $ico = 'ok'; + $ico = 'check'; $col = 'green'; $extra = ''; $msg = ''; if ((int) $alert['state'] === 0) { - $ico = 'ok'; + $ico = 'check'; $col = 'green'; $extra = 'success'; $msg = 'ok'; @@ -154,7 +154,7 @@ foreach (dbFetchRows($sql, $param) as $alert) { $response[] = array( 'id' => $rulei++, 'rule' => ''.htmlentities($alert['name']).'', - 'details' => '', + 'details' => '', 'hostname' => $hostname, 'timestamp' => ($alert['timestamp'] ? $alert['timestamp'] : 'N/A'), 'severity' => $severity, diff --git a/html/includes/table/edit-ports.inc.php b/html/includes/table/edit-ports.inc.php index 78797b79a5..5eec910397 100644 --- a/html/includes/table/edit-ports.inc.php +++ b/html/includes/table/edit-ports.inc.php @@ -70,8 +70,8 @@ foreach (dbFetchRows($sql, $param) as $port) { 'ignore' => ' ', 'port_tune' => '', - 'ifAlias' => '
', - 'ifSpeed' => '
', + 'ifAlias' => '
', + 'ifSpeed' => '
', ); }//end foreach diff --git a/html/js/librenms.js b/html/js/librenms.js index b0b1fd886c..686c60a5cc 100644 --- a/html/js/librenms.js +++ b/html/js/librenms.js @@ -213,11 +213,11 @@ $(document).on("click", '.collapse-neighbors', function(event) var list = caller.find('.neighbors-interface-list'); var continued = caller.find('.neighbors-list-continued'); - if(button.hasClass("glyphicon-plus")) { - button.addClass('glyphicon-minus').removeClass('glyphicon-plus'); + if(button.hasClass("fa-plus")) { + button.addClass('fa-minus').removeClass('fa-plus'); } else { - button.addClass('glyphicon-plus').removeClass('glyphicon-minus'); + button.addClass('fa-plus').removeClass('fa-minus'); } list.toggle(); diff --git a/html/pages/alert-log.inc.php b/html/pages/alert-log.inc.php index 4a2655d16b..372b4e7843 100644 --- a/html/pages/alert-log.inc.php +++ b/html/pages/alert-log.inc.php @@ -99,7 +99,7 @@ foreach (get_all_devices() as $hostname) { }).on("click", function(e) { var target = $(this).data("target"); $(target).collapse('toggle'); - $(this).toggleClass('glyphicon-plus glyphicon-minus'); + $(this).toggleClass('fa-plus fa-minus'); }); grid.find(".incident").each( function() { $(this).parent().addClass('col-lg-4 col-md-4 col-sm-4 col-xs-4'); @@ -109,8 +109,8 @@ foreach (get_all_devices() as $hostname) { $(this).find(".incident-toggle").fadeOut(200); }).on("click", "td:not(.incident-toggle-td)", function() { var target = $(this).parent().find(".incident-toggle").data("target"); - if( $(this).parent().find(".incident-toggle").hasClass('glyphicon-plus') ) { - $(this).parent().find(".incident-toggle").toggleClass('glyphicon-plus glyphicon-minus'); + if( $(this).parent().find(".incident-toggle").hasClass('fa-plus') ) { + $(this).parent().find(".incident-toggle").toggleClass('fa-plus fa-minus'); $(target).collapse('toggle'); } }); diff --git a/html/pages/alert-map.inc.php b/html/pages/alert-map.inc.php index 25880c1bcc..eb6665675c 100644 --- a/html/pages/alert-map.inc.php +++ b/html/pages/alert-map.inc.php @@ -21,8 +21,8 @@ foreach (dbFetchRows('SELECT alert_map.target,alert_map.id,alert_rules.name FROM echo ''.$link['name'].''; echo ''.$link['target'].''; echo ''; - echo " "; - echo ""; + echo " "; + echo ""; echo ''; echo ''; } diff --git a/html/pages/device-groups.inc.php b/html/pages/device-groups.inc.php index 0f1dd6a8fe..6d84020aeb 100644 --- a/html/pages/device-groups.inc.php +++ b/html/pages/device-groups.inc.php @@ -16,8 +16,8 @@ if (!empty($group_count_check)) { echo ''.$group['desc'].''; echo ''.$group['pattern'].''; echo ''; - echo " "; - echo ""; + echo " "; + echo ""; echo ''; echo ''; } diff --git a/html/pages/device/edit/health.inc.php b/html/pages/device/edit/health.inc.php index e5f104fa97..8073e19b39 100644 --- a/html/pages/device/edit/health.inc.php +++ b/html/pages/device/edit/health.inc.php @@ -58,13 +58,17 @@ foreach (dbFetchRows("SELECT * FROM sensors WHERE device_id = ? AND sensor_delet
- +
- +
@@ -128,18 +132,18 @@ $( ".sensor" ).blur(function() { dataType: "html", success: function(data){ $this.closest('.form-group').addClass('has-success'); - $this.next().addClass('glyphicon-ok'); + $this.next().addClass('fa-check'); setTimeout(function(){ $this.closest('.form-group').removeClass('has-success'); - $this.next().removeClass('glyphicon-ok'); + $this.next().removeClass('fa-check'); }, 2000); }, error:function(){ $(this).closest('.form-group').addClass('has-error'); - $this.next().addClass('glyphicon-remove'); + $this.next().addClass('fa-times'); setTimeout(function(){ $this.closest('.form-group').removeClass('has-error'); - $this.next().removeClass('glyphicon-remove'); + $this.next().removeClass('fa-times'); }, 2000); } }); diff --git a/html/pages/device/edit/ports.inc.php b/html/pages/device/edit/ports.inc.php index bd37f5cb2f..86aedef1cc 100644 --- a/html/pages/device/edit/ports.inc.php +++ b/html/pages/device/edit/ports.inc.php @@ -41,28 +41,28 @@ success: function (data) { if (data.status == 'ok') { $this.closest('.form-group').addClass('has-success'); - $this.next().addClass('glyphicon-ok'); + $this.next().addClass('fa-check'); setTimeout(function(){ $this.closest('.form-group').removeClass('has-success'); - $this.next().removeClass('glyphicon-ok'); + $this.next().removeClass('fa-check'); }, 2000); } else if (data.status == 'na') { } else { $(this).closest('.form-group').addClass('has-error'); - $this.next().addClass('glyphicon-remove'); + $this.next().addClass('fa-times'); setTimeout(function(){ $this.closest('.form-group').removeClass('has-error'); - $this.next().removeClass('glyphicon-remove'); + $this.next().removeClass('fa-times'); }, 2000); } }, error: function () { $(this).closest('.form-group').addClass('has-error'); - $this.next().addClass('glyphicon-remove'); + $this.next().addClass('fa-times'); setTimeout(function(){ $this.closest('.form-group').removeClass('has-error'); - $this.next().removeClass('glyphicon-remove'); + $this.next().removeClass('fa-times'); }, 2000); } }); @@ -82,29 +82,29 @@ success: function (data) { if (data.status == 'ok') { $this.closest('.form-group').addClass('has-success'); - $this.next().addClass('glyphicon-ok'); + $this.next().addClass('fa-check'); $this.val(speed); setTimeout(function(){ $this.closest('.form-group').removeClass('has-success'); - $this.next().removeClass('glyphicon-ok'); + $this.next().removeClass('fa-check'); }, 2000); } else if (data.status == 'na') { } else { $(this).closest('.form-group').addClass('has-error'); - $this.next().addClass('glyphicon-remove'); + $this.next().addClass('fa-times'); setTimeout(function(){ $this.closest('.form-group').removeClass('has-error'); - $this.next().removeClass('glyphicon-remove'); + $this.next().removeClass('fa-times'); }, 2000); } }, error: function () { $(this).closest('.form-group').addClass('has-error'); - $this.next().addClass('glyphicon-remove'); + $this.next().addClass('fa-times'); setTimeout(function(){ $this.closest('.form-group').removeClass('has-error'); - $this.next().removeClass('glyphicon-remove'); + $this.next().removeClass('fa-times'); }, 2000); } }); diff --git a/html/pages/device/performance.inc.php b/html/pages/device/performance.inc.php index 4557655618..332f481afd 100644 --- a/html/pages/device/performance.inc.php +++ b/html/pages/device/performance.inc.php @@ -51,8 +51,38 @@ if (empty($vars['dtpickerto'])) {
diff --git a/html/pages/device/processes.inc.php b/html/pages/device/processes.inc.php index 299b5ec0da..0ca7f1a7ce 100644 --- a/html/pages/device/processes.inc.php +++ b/html/pages/device/processes.inc.php @@ -72,7 +72,7 @@ foreach ($heads as $head => $extra) { $bhead = 'asc'; $icon = ''; if ('`'.$lhead.'`' == $order) { - $icon = " class='glyphicon glyphicon-chevron-"; + $icon = " class='fa fa-chevron-"; if ($by == 'asc') { $bhead = 'desc'; $icon .= 'up'; diff --git a/html/pages/device/routing/cisco-otv.inc.php b/html/pages/device/routing/cisco-otv.inc.php index 00d8794abb..da68ecca11 100644 --- a/html/pages/device/routing/cisco-otv.inc.php +++ b/html/pages/device/routing/cisco-otv.inc.php @@ -11,7 +11,7 @@ global $config; ?>
-

Overlay's & Adjacencies

+

Overlay's & Adjacencies

$adjacency) { $gli = "list-group-item-danger"; } ?> - - + -
- - + +
diff --git a/html/pages/health/mempool.inc.php b/html/pages/health/mempool.inc.php index 47a430d4da..f69374ff4d 100644 --- a/html/pages/health/mempool.inc.php +++ b/html/pages/health/mempool.inc.php @@ -29,7 +29,7 @@ return "

" + row.msg + "

"; }, "ack": function(column,row) { - return ""; + return ""; } }, templates: { diff --git a/html/pages/health/processor.inc.php b/html/pages/health/processor.inc.php index cfef63060d..1ff103d1ba 100644 --- a/html/pages/health/processor.inc.php +++ b/html/pages/health/processor.inc.php @@ -28,7 +28,7 @@ return "

" + row.msg + "

"; }, "ack": function(column,row) { - return ""; + return ""; } }, templates: { diff --git a/html/pages/health/storage.inc.php b/html/pages/health/storage.inc.php index acb7e70ed5..9c6ab38b0e 100644 --- a/html/pages/health/storage.inc.php +++ b/html/pages/health/storage.inc.php @@ -29,7 +29,7 @@ return "

" + row.msg + "

"; }, "ack": function(column,row) { - return ""; + return ""; } }, templates: { diff --git a/html/pages/routing/cisco-otv.inc.php b/html/pages/routing/cisco-otv.inc.php index 17c7ac3c6d..41fa98ce2f 100644 --- a/html/pages/routing/cisco-otv.inc.php +++ b/html/pages/routing/cisco-otv.inc.php @@ -39,7 +39,7 @@ foreach ($COMPONENTS as $DEVICE_ID => $COMP) { $GLI = "list-group-item-danger"; } ?> - - + - - - + + API URL ('.$api_method.')
- +
@@ -328,7 +330,9 @@ foreach ($api_urls as $api_url) {
- +
@@ -371,10 +375,12 @@ if (empty($config_groups['alert.transports.pagerduty']['config_value']) === fals
-
+
- +
@@ -390,7 +396,7 @@ if (empty($config_groups['alert.transports.pagerduty']['config_value']) === fals
-
+
@@ -429,7 +435,9 @@ foreach ($slack_urls as $slack_url) {
- +
@@ -438,7 +446,9 @@ foreach ($slack_urls as $slack_url) {
- +
'; @@ -449,7 +459,9 @@ foreach ($slack_urls as $slack_url) {
- +
@@ -497,7 +509,9 @@ foreach ($hipchat_urls as $hipchat_url) {
- +
@@ -507,20 +521,26 @@ foreach ($hipchat_urls as $hipchat_url) {
- +
- +
- +
'; @@ -531,7 +551,9 @@ foreach ($hipchat_urls as $hipchat_url) {
- +
@@ -541,14 +563,18 @@ foreach ($hipchat_urls as $hipchat_url) {
- +
- +
@@ -592,7 +618,9 @@ foreach ($pushover_appkeys as $pushover_appkey) {
- +
@@ -602,13 +630,17 @@ foreach ($pushover_appkeys as $pushover_appkey) {
- +
- +
'; @@ -619,7 +651,9 @@ echo '
- +
@@ -629,7 +663,9 @@ echo '
- +
@@ -672,7 +708,9 @@ foreach ($boxcar_appkeys as $boxcar_appkey) {
- +
@@ -681,7 +719,9 @@ foreach ($boxcar_appkeys as $boxcar_appkey) {
- +
'; @@ -692,7 +732,9 @@ echo '
- +
@@ -717,10 +759,12 @@ echo '
-
+
- +
@@ -736,10 +780,12 @@ echo '
-
+
- +
@@ -767,14 +813,18 @@ echo '
- +
- +
@@ -803,35 +853,45 @@ echo '
- +
- +
- +
- +
- +
@@ -855,35 +915,45 @@ echo '
- +
- +
- +
- +
- +
@@ -1242,17 +1312,17 @@ echo ' success: function (data) { if (data.status == 'ok') { $this.closest('.form-group').addClass('has-success'); - $this.next().addClass('glyphicon-ok'); + $this.next().addClass('fa-check'); setTimeout(function(){ $this.closest('.form-group').removeClass('has-success'); - $this.next().removeClass('glyphicon-ok'); + $this.next().removeClass('fa-check'); }, 2000); } else { $(this).closest('.form-group').addClass('has-error'); - $this.next().addClass('glyphicon-remove'); + $this.next().addClass('fa-times'); setTimeout(function(){ $this.closest('.form-group').removeClass('has-error'); - $this.next().removeClass('glyphicon-remove'); + $this.next().removeClass('fa-times'); }, 2000); } }, @@ -1275,17 +1345,17 @@ echo ' success: function (data) { if (data.status == 'ok') { $this.closest('.form-group').addClass('has-success'); - $this.next().addClass('glyphicon-ok'); + $this.next().addClass('fa-check'); setTimeout(function(){ $this.closest('.form-group').removeClass('has-success'); - $this.next().removeClass('glyphicon-ok'); + $this.next().removeClass('fa-check'); }, 2000); } else { $(this).closest('.form-group').addClass('has-error'); - $this.next().addClass('glyphicon-remove'); + $this.next().addClass('fa-times'); setTimeout(function(){ $this.closest('.form-group').removeClass('has-error'); - $this.next().removeClass('glyphicon-remove'); + $this.next().removeClass('fa-times'); }, 2000); } }, diff --git a/html/pages/syslog.inc.php b/html/pages/syslog.inc.php index 482dd48c8d..a2118a28c9 100644 --- a/html/pages/syslog.inc.php +++ b/html/pages/syslog.inc.php @@ -87,11 +87,35 @@ print_optionbar_start();