diff --git a/auth_profile.php b/auth_profile.php index c31c620201..6c5c01688f 100644 --- a/auth_profile.php +++ b/auth_profile.php @@ -423,7 +423,7 @@ function settings() { foreach ($settings_user as $tab_short_name => $tab_fields) { $collapsible = true; - print "
" . $tabs_graphs[$tab_short_name] . ($collapsible ? "
" : '') . "
"; + print "
" . $tabs_graphs[$tab_short_name] . ($collapsible ? "
" : '') . "
"; $form_array = array(); diff --git a/automation_snmp.php b/automation_snmp.php index c23de21839..91432c420f 100644 --- a/automation_snmp.php +++ b/automation_snmp.php @@ -799,19 +799,19 @@ function automation_snmp_edit() { if (read_config_option('drag_and_drop') == '') { if ($i < $total_items && $total_items > 1) { - $form_data .= ''; + $form_data .= ''; } else { $form_data .= ''; } if ($i > 1 && $i <= $total_items) { - $form_data .= ''; + $form_data .= ''; } else { $form_data .= ''; } } - $form_data .= ''; + $form_data .= ''; $form_data .= ''; print $form_data; diff --git a/automation_templates.php b/automation_templates.php index 7e834f9381..c3273c4c9c 100644 --- a/automation_templates.php +++ b/automation_templates.php @@ -1177,19 +1177,19 @@ function template_edit() { $action = ''; if (!$dnd) { if ($i != cacti_sizeof($graph_rules) - 1) { - $action .= ''; + $action .= ''; } else { $action .= ''; } if ($i > 0) { - $action .= ''; + $action .= ''; } else { $action .= ''; } } - form_selectable_cell("$action", $id, '40', 'right'); + form_selectable_cell("$action", $id, '40', 'right'); form_end_row(); @@ -1287,19 +1287,19 @@ function template_edit() { $action = ''; if (!$dnd) { if ($i != cacti_sizeof($tree_rules) - 1) { - $action .= ''; + $action .= ''; } else { $action .= ''; } if ($i > 0) { - $action .= ''; + $action .= ''; } else { $action .= ''; } } - form_selectable_cell("$action", $id, '40', 'right'); + form_selectable_cell("$action", $id, '40', 'right'); form_end_row(); @@ -1368,7 +1368,7 @@ function template_edit() { form_selectable_ecell($rule['name'], $id); - form_selectable_cell("$action", $id, '40', 'right'); + form_selectable_cell("$action", $id, '40', 'right'); form_end_row(); } @@ -1645,13 +1645,13 @@ function template() { $add_text = ''; if ($i < $total_items && $total_items > 1) { - $add_text .= ''; + $add_text .= ''; } else { $add_text .= ''; } if ($i > 1 && $i <= $total_items) { - $add_text .= ''; + $add_text .= ''; } else { $add_text .= ''; } diff --git a/cdef.php b/cdef.php index da5e5d24e4..edafdbe13f 100644 --- a/cdef.php +++ b/cdef.php @@ -609,19 +609,19 @@ function cdef_edit() { if (read_config_option('drag_and_drop') == '') { if ($i < $total_items && $total_items > 0) { - $actions .= ''; + $actions .= ''; } else { $actions .= ''; } if ($i > 1 && $i <= $total_items) { - $actions .= ''; + $actions .= ''; } else { $actions .= ''; } } - $actions .= ""; + $actions .= ""; form_selectable_cell($actions, $cdef_item['id'], '', 'right'); diff --git a/changelog.php b/changelog.php index cb8d0c1a1c..a7624d356d 100644 --- a/changelog.php +++ b/changelog.php @@ -168,22 +168,22 @@ function changelog_view() { switch ($type) { case 'issue': - $icon = ''; + $icon = ''; break; case 'feature': - $icon = ''; + $icon = ''; $highlight = true; break; case ' security': - $icon = ''; + $icon = ''; $highlight = true; break; default: - $icon = ''; + $icon = ''; break; } diff --git a/color_templates.php b/color_templates.php index 63e29b7187..938740db21 100644 --- a/color_templates.php +++ b/color_templates.php @@ -152,19 +152,19 @@ function draw_color_template_items_list($item_list, $filename, $url_data, $disab if (read_config_option('drag_and_drop') == '') { if ($i < $total_items && $total_items > 1) { - print ''; + print ''; } else { print ''; } if ($i > 1 && $i <= $total_items) { - print ''; + print ''; } else { print ''; } } - print ""; + print ""; print "\n"; } diff --git a/data_debug.php b/data_debug.php index 4ace4114f2..867bac3dc7 100644 --- a/data_debug.php +++ b/data_debug.php @@ -764,9 +764,9 @@ function debug_view() { $debug_status = debug_process_status($id); if ($debug_status == 'waiting') { - html_start_box(__('Data Source Troubleshooter [ Auto Refreshing till Complete ] %s', ''), '100%', '', '3', 'center', ''); + html_start_box(__('Data Source Troubleshooter [ Auto Refreshing till Complete ] %s', ''), '100%', '', '3', 'center', ''); } elseif ($debug_status == 'analysis') { - html_start_box(__('Data Source Troubleshooter [ Auto Refreshing till RRDfile Update ] %s', ''), '100%', '', '3', 'center', ''); + html_start_box(__('Data Source Troubleshooter [ Auto Refreshing till RRDfile Update ] %s', ''), '100%', '', '3', 'center', ''); } else { html_start_box(__('Data Source Troubleshooter [ Analysis Complete! %s ]', '' . __('Rerun Analysis') . ''), '100%', '', '3', 'center', ''); } @@ -911,48 +911,48 @@ function debug_view() { function debug_icon_valid_result($result) { if ($result === '' || $result === false) { - return ''; + return ''; } if ($result === '-') { - return ''; + return ''; } if (is_array($result)) { foreach ($result as $variable => $value) { if (!prepare_validate_result($value)) { - return ''; + return ''; } } - return ''; + return ''; } if (prepare_validate_result($result)) { - return ''; + return ''; } else { - return ''; + return ''; } } function debug_icon($result) { if ($result === '' || $result === false) { - return ''; + return ''; } if ($result === '-') { - return ''; + return ''; } if ($result === 1 || $result === 'on') { - return ''; + return ''; } if ($result === 0 || $result === 'off') { - return ''; + return ''; } - return ''; + return ''; } function create_filter() { diff --git a/data_input.php b/data_input.php index 5b614a0343..219e301124 100644 --- a/data_input.php +++ b/data_input.php @@ -613,7 +613,7 @@ function data_edit() { form_selectable_cell($field['sequence'], $i); - form_selectable_cell("", $i, '', 'right'); + form_selectable_cell("", $i, '', 'right'); form_end_row(); @@ -657,11 +657,11 @@ function data_edit() { form_selectable_cell(html_boolean_friendly($field['update_rra']), $i); if ($output_disabled) { - form_selectable_cell("", $i); + form_selectable_cell("", $i); } else { $url = html_escape('data_input.php?action=field_remove_confirm&id=' . $field['id'] . '&data_input_id=' . get_request_var('id')); - form_selectable_cell("", $id, '', 'right'); + form_selectable_cell("", $id, '', 'right'); } form_end_row(); diff --git a/data_queries.php b/data_queries.php index 6a1f3971d4..42b475bf20 100644 --- a/data_queries.php +++ b/data_queries.php @@ -808,12 +808,12 @@ function assignDataQueryGraphName(init) { - ' href=''> + ' href=''> - ' href=''> + ' href=''> @@ -822,7 +822,7 @@ function assignDataQueryGraphName(init) { - ' href=''> + ' href=''> - ' href=''> + ' href=''> - ' href=''> + ' href=''> @@ -930,7 +930,7 @@ function assignDataQueryGraphName(init) { - ' href=''> + ' href=''> ", $i, '', 'right'); + form_selectable_cell("", $i, '', 'right'); } else { - form_selectable_cell("", $i, '', 'right'); + form_selectable_cell("", $i, '', 'right'); } form_end_row(); diff --git a/data_source_profiles.php b/data_source_profiles.php index bad593abfb..cd410ad97d 100644 --- a/data_source_profiles.php +++ b/data_source_profiles.php @@ -1132,7 +1132,7 @@ function profile_edit() { form_selectable_cell('' . $rra['rows'] . '', $i); if (!$readonly) { - form_selectable_cell("", $i, '', 'right'); + form_selectable_cell("", $i, '', 'right'); } else { form_selectable_cell('', $i, '', 'right'); } diff --git a/data_sources.php b/data_sources.php index 3bca1084b6..e4c75eb52c 100644 --- a/data_sources.php +++ b/data_sources.php @@ -1085,7 +1085,7 @@ function ds_edit() { foreach ($template_data_rrds as $template_data_rrd) { $i++; print ' - $i: " . html_escape($template_data_rrd['data_source_name']) . '' . (($use_data_template == false) ? " " : '') . ' + $i: " . html_escape($template_data_rrd['data_source_name']) . '' . (($use_data_template == false) ? " " : '') . ' '; print ""; } diff --git a/data_templates.php b/data_templates.php index 528094b562..d8a21f7777 100644 --- a/data_templates.php +++ b/data_templates.php @@ -780,7 +780,7 @@ function template_edit() { print "
"); + $('body').append(""); $.get('graphs.php?action=unlock&id='+$('#local_graph_id').val()) .done(function(data) { diff --git a/graphs_new.php b/graphs_new.php index 01251cc087..6e0097586d 100644 --- a/graphs_new.php +++ b/graphs_new.php @@ -370,12 +370,12 @@ function create_filter($host, $snmp_queries) { array( 'display' => __('Edit this Device'), 'url' => 'host.php?action=edit&id=' . get_request_var('host_id'), - 'class' => 'fa fa-wrench newDevice' + 'class' => 'ti ti-tool newDevice' ), array( 'display' => __('Create New Device'), 'url' => 'host.php?action=edit', - 'class' => 'fa fa-server editDevice' + 'class' => 'ti ti-device-cog editDevice' ), ) ); @@ -735,7 +735,7 @@ function graphs() { " . __esc('Data Query [%s]', $snmp_query['name']) . "
- +
"; diff --git a/host.php b/host.php index 039dfd0683..1e8be7078a 100644 --- a/host.php +++ b/host.php @@ -725,42 +725,42 @@ function create_host_edit_filter($host, $content = '') { array( 'display' => __('Create New Device'), 'url' => 'host.php?action=edit', - 'class' => 'fa fa-server newDevice' + 'class' => 'ti ti-devices-plus newDevice' ), array( 'display' => __('Create New Graphs'), 'url' => 'graphs_new.php?reset=true&host_id=' . $host['id'], - 'class' => 'fa fa-chart-line newGraph' + 'class' => 'ti ti-chart-area-line-filled newGraph' ), array( 'display' => __('Re-Index Device'), 'url' => 'host.php?action=reindex&host_id=' . $host['id'], - 'class' => 'fa fa-sync reindexDevice' + 'class' => 'ti ti-refresh reindexDevice' ), array( 'display' => ($debug ? __('Disable Device Debug'):__('Enable Device Debug')), 'url' => 'host.php?action=' . ($debug ? 'disable_debug':'enable_debug') . '&host_id=' . $host['id'], - 'class' => ($debug ? 'fa fa-bug disableDebug':'fa fa-bug enableDebug') + 'class' => ($debug ? 'ti ti-bug disableDebug':'ti ti-bug enableDebug') ), array( 'display' => __('Repopulate Poller Cache'), 'url' => 'host.php?action=repopulate&host_id=' . $host['id'], - 'class' => 'fa fa-hammer repopulateCache' + 'class' => 'ti ti-hammer repopulateCache' ), array( 'display' => __('View Poller Cache'), 'url' => 'utilities.php?poller_action=-1&action=view_poller_cache&host_id=' . $host['id'] . '&template_id=-1&filter=&rows=-1', - 'class' => 'fa fa-search-plus viewCache' + 'class' => 'ti ti-list-search viewCache' ), array( 'display' => __('View Data Source List'), 'url' => 'data_sources.php?reset=true&host_id=' . $host['id'] . '&ds_rows=30&filter=&template_id=-1&method_id=-1&page=1', - 'class' => 'fa fa-th-large viewSources' + 'class' => 'ti ti-brand-databricks viewSources' ), array( 'display' => __('View Graphs List'), 'url' => 'graphs.php?reset=true&host_id=' . $host['id'] . '&graph_rows=30&filter=&template_id=-1&page=1', - 'class' => 'fa fa-th-large viewGraphs' + 'class' => 'ti ti-graph-filled viewGraphs' ), ) ); @@ -799,7 +799,7 @@ function create_host_edit_filter($host, $content = '') { $filters['links'][] = array( 'display' => $name, 'url' => $href, - 'class' => 'fa fa-plug' + 'class' => 'ti ti-plug' ); } } @@ -838,7 +838,7 @@ function host_edit() { if (cacti_sizeof($host)) { $content = "
"; - $content .= "
" . __('Contacting Device') . " 
"; + $content .= "
" . __('Contacting Device') . " 
"; $content .= "
"; $filters = create_host_edit_filter($host, $content); @@ -944,7 +944,7 @@ function host_edit() { " . __('Is Being Graphed') . " (" . __('Edit') . ')' : "" . __('Not Being Graphed') . ''); ?> - ' class='deletequery fa fa-times' id='gtremove' data-id=''> + ' class='deletequery ti ti-x' id='gtremove' data-id=''> - + @@ -1078,9 +1078,9 @@ function host_edit() { " . __('Success') . '' : "" . __('Fail')) . '' . __(' [%d Items, %d Rows]', $item['itemCount'], $item['rowCount']); ?> ' : ''); + $maint = ($host['maint'] == 1 ? '' : ''); form_selectable_cell(filter_value($host['description'], get_request_var('filter'), 'host.php?action=edit&id=' . $host['id']) . $maint, $host['id']); form_selectable_cell(filter_value($host['hostname'], get_request_var('filter')), $host['id']); diff --git a/host_templates.php b/host_templates.php index 759ae8073c..2cb8eabf35 100644 --- a/host_templates.php +++ b/host_templates.php @@ -614,7 +614,7 @@ function template_edit() { )) 'fa fa-map', - __('Create') => 'fa fa-chart-area', - __('Management') => 'fa fa-home', - __('Data Collection') => 'fa fa-database', - __('Templates') => 'fa fa-clone', - __('Automation') => 'fab fa-superpowers', - __('Presets') => 'fa fa-archive', - __('Import/Export') => 'fa fa-exchange-alt', - __('Configuration') => 'fa fa-sliders-h', - __('Utilities') => 'fa fa-cogs', - __('External Links') => 'fa fa-external-link-alt', - __('Support') => 'fa fa-question-circle', - __('Troubleshooting') => 'fa fa-bug' + __('Main Console') => 'ti ti-map', + __('Create') => 'ti ti-chart-area-line', + __('Management') => 'ti ti-devices', + __('Data Collection') => 'ti ti-affiliate', + __('Templates') => 'ti ti-template', + __('Automation') => 'ti ti-automation', + __('Presets') => 'ti ti-color-swatch', + __('Import/Export') => 'ti ti-transfer', + __('Configuration') => 'ti ti-adjustments-cog', + __('Utilities') => 'ti ti-tools', + __('External Links') => 'ti ti-external-link', + __('Support') => 'ti ti-help-circle', + __('Troubleshooting') => 'ti ti-bug' ); $device_classes = array( diff --git a/include/layout.js b/include/layout.js index b2866a24e3..f5d4109448 100644 --- a/include/layout.js +++ b/include/layout.js @@ -71,31 +71,31 @@ var previousMainWidth = null; var previousColumns = null; var faIcons = { open: { - icon: '' + icon: '' }, close: { - icon: '' + icon: '' }, checkAll: { - icon: '' + icon: '' }, uncheckAll: { - icon: '' + icon: '' }, flipAll: { - icon: '' + icon: '' }, collapseAll: { - icon: '' + icon: '' }, expandAll: { - icon: '' + icon: '' }, collapse: { - icon: '' + icon: '' }, expand: { - icon: '' + icon: '' } }; @@ -1053,10 +1053,10 @@ function checkPasswordConfirm() { if ($('#password_confirm').val().length > 0) { if ($('#password').val() != $('#password_confirm').val()) { $('#passconfirm').remove(); - $('#password_confirm').after('
'); + $('#password_confirm').after('
'); } else { $('#passconfirm').remove(); - $('#password_confirm').after('
'); + $('#password_confirm').after('
'); } } else { $('#passconfirm').remove(); @@ -1352,12 +1352,12 @@ function markFilterTDs(child, filterNum) { function finalizeAuthProfileData(options, data) { if (hScroll) { $('#main, .cactiConsoleContentArea').css({ 'overflow-x': 'visible' }); - $('#overflow').removeClass('fa-expand').addClass('fa-compress'); + $('#overflow').removeClass('ti-arrows-diagonal').addClass('ti-arrows-diagonal-minimize-2'); resetTables(); } else { $('#main, .cactiConsoleContentArea').css({ 'overflow-x': 'hidden' }); - $('#overflow').removeClass('fa-compress').addClass('fa-expand'); + $('#overflow').removeClass('ti-arrows-diagonal-minimize-2').addClass('ti-arrows-diagonal'); tuneTables(); } @@ -1380,10 +1380,10 @@ function makeFiltersResponsive() { if (filterHeader.find('.cactiSwitchConstraints').length == 0) { if (hScroll) { $('#main, .cactiConsoleContentArea').css({ 'overflow-x': 'visible' }); - filterHeader.find('div.cactiTableButton').append(''); + filterHeader.find('div.cactiTableButton').append(''); } else { $('#main, .cactiConsoleContentArea').css({ 'overflow-x': 'hidden' }); - filterHeader.find('div.cactiTableButton').append(''); + filterHeader.find('div.cactiTableButton').append(''); } $('.cactiSwitchConstraints').off('click').on('click', function (event) { @@ -1408,7 +1408,7 @@ function makeFiltersResponsive() { if (filterContents.find('#export').length) { title = $('#export').attr('title'); - filterHeader.find('div.cactiTableButton').append(''); + filterHeader.find('div.cactiTableButton').append(''); $('.cactiFilterExport').off('click').on('click', function (event) { event.stopPropagation(); @@ -1418,7 +1418,7 @@ function makeFiltersResponsive() { if (filterContents.find('#import').length) { title = $('#import').attr('title'); - filterHeader.find('div.cactiTableButton').append(''); + filterHeader.find('div.cactiTableButton').append(''); $('.cactiFilterImport').off('click').on('click', function (event) { event.stopPropagation(); @@ -1428,7 +1428,7 @@ function makeFiltersResponsive() { if (filterContents.find('#clear').length) { if (filterHeader.find('.cactiFilterClear').length == 0) { - filterHeader.find('div.cactiTableButton').append(''); + filterHeader.find('div.cactiTableButton').append(''); } $('.cactiFilterClear').off('click').on('click', function(event) { @@ -1447,11 +1447,11 @@ function makeFiltersResponsive() { if (state == 'hidden') { if (filterHeader.find('.cactiFilterState').length == 0) { - filterHeader.find('div.cactiTableButton').append(''); + filterHeader.find('div.cactiTableButton').append(''); } } else { if (filterHeader.find('.cactiFilterState').length == 0) { - filterHeader.find('div.cactiTableButton').append(''); + filterHeader.find('div.cactiTableButton').append(''); } } @@ -1475,8 +1475,8 @@ function makeFiltersResponsive() { anchors.each(function () { $(this).attr('title', $(this).text()); }); - anchors.not('.cactiTableCopy').addClass('fa fa-trash-alt'); - anchors.filter('.cactiTableCopy').addClass('fa fa-copy'); + anchors.not('.cactiTableCopy').addClass('ti ti-trash'); + anchors.filter('.cactiTableCopy').addClass('ti ti-copy'); anchors.tooltip().text(''); } }); diff --git a/include/themes/cacti/main.css b/include/themes/cacti/main.css index f2f4f928e0..5ef60955da 100644 --- a/include/themes/cacti/main.css +++ b/include/themes/cacti/main.css @@ -179,6 +179,7 @@ label { .glyph_tab-console:before { content: ''; + display: inline-block; } .text_tab-console { @@ -2239,6 +2240,7 @@ tr#realtime td:first-child { font-size: 12px; width: 20px; vertical-align: 30%; + margin-right: 0.3rem; } .menuitem span { diff --git a/include/themes/cacti/main.js b/include/themes/cacti/main.js index a8fca761f6..7b48db36d6 100644 --- a/include/themes/cacti/main.js +++ b/include/themes/cacti/main.js @@ -30,16 +30,16 @@ function themeReady() { setMenuVisibility(); // Add nice search filter to filters - if ($('input[id="filter"]').length > 0 && $('input[id="filter"]').next('i[class="fa fa-search filter"]').length < 1) { - $('input[id="filter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="filter"]').length > 0 && $('input[id="filter"]').next('i[class="ti ti-search filter"]').length < 1) { + $('input[id="filter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); } - if ($('input[id="filterd"]').length > 0 && $('input[id="filterd"]').next('i[class="fa fa-search filter"]').length < 1) { - $('input[id="filterd"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="filterd"]').length > 0 && $('input[id="filterd"]').next('i[class="ti ti-search filter"]').length < 1) { + $('input[id="filterd"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); } - if ($('input[id="rfilter"]').length > 0 && $('input[id="rfilter"]').next('i[class="fa fa-search filter"]').length < 1) { - $('input[id="rfilter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchRFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="rfilter"]').length > 0 && $('input[id="rfilter"]').next('i[class="ti ti-search filter"]').length < 1) { + $('input[id="rfilter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchRFilter).parent('td').css('white-space', 'nowrap'); } $('input#filter, input#rfilter').addClass('ui-state-default ui-corner-all'); @@ -49,7 +49,7 @@ function themeReady() { /* Start clean up */ //login page - $('.cactiLoginLogo').html("").css('font-size: 20px'); + $('.cactiLoginLogo').html("").css('font-size: 20px'); /* clean up the navigation menu */ $('.cactiConsoleNavigationArea').find('#menu').appendTo($('.cactiConsoleNavigationArea').find('#navigation')); @@ -77,8 +77,8 @@ function themeReady() { $('.menuHr').remove(); $('
' +'' +'
').insertAfter('.maintabs'); diff --git a/include/themes/carrot/main.css b/include/themes/carrot/main.css index 8e302f5779..cac436fd3b 100644 --- a/include/themes/carrot/main.css +++ b/include/themes/carrot/main.css @@ -167,8 +167,8 @@ label { } .glyph_tab-console:before { - content: '\f787'; - font-family: "Font Awesome 5 Free"; + content: '\f21c'; + display: inline-block; } .text_tab-console { @@ -2253,6 +2253,7 @@ tr#realtime td:first-child { font-size: 12px; width: 20px; vertical-align: 30%; + margin-right: 0.3rem; } .menuitem span { diff --git a/include/themes/carrot/main.js b/include/themes/carrot/main.js index a8fca761f6..7b48db36d6 100644 --- a/include/themes/carrot/main.js +++ b/include/themes/carrot/main.js @@ -30,16 +30,16 @@ function themeReady() { setMenuVisibility(); // Add nice search filter to filters - if ($('input[id="filter"]').length > 0 && $('input[id="filter"]').next('i[class="fa fa-search filter"]').length < 1) { - $('input[id="filter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="filter"]').length > 0 && $('input[id="filter"]').next('i[class="ti ti-search filter"]').length < 1) { + $('input[id="filter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); } - if ($('input[id="filterd"]').length > 0 && $('input[id="filterd"]').next('i[class="fa fa-search filter"]').length < 1) { - $('input[id="filterd"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="filterd"]').length > 0 && $('input[id="filterd"]').next('i[class="ti ti-search filter"]').length < 1) { + $('input[id="filterd"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); } - if ($('input[id="rfilter"]').length > 0 && $('input[id="rfilter"]').next('i[class="fa fa-search filter"]').length < 1) { - $('input[id="rfilter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchRFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="rfilter"]').length > 0 && $('input[id="rfilter"]').next('i[class="ti ti-search filter"]').length < 1) { + $('input[id="rfilter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchRFilter).parent('td').css('white-space', 'nowrap'); } $('input#filter, input#rfilter').addClass('ui-state-default ui-corner-all'); @@ -49,7 +49,7 @@ function themeReady() { /* Start clean up */ //login page - $('.cactiLoginLogo').html("").css('font-size: 20px'); + $('.cactiLoginLogo').html("").css('font-size: 20px'); /* clean up the navigation menu */ $('.cactiConsoleNavigationArea').find('#menu').appendTo($('.cactiConsoleNavigationArea').find('#navigation')); @@ -77,8 +77,8 @@ function themeReady() { $('.menuHr').remove(); $('
' +'' +'
').insertAfter('.maintabs'); diff --git a/include/themes/dark/main.css b/include/themes/dark/main.css index e413484fd6..c819c9e54a 100644 --- a/include/themes/dark/main.css +++ b/include/themes/dark/main.css @@ -2200,15 +2200,15 @@ tr th:last-child .checkbox { margin-right: 10px !important; } -.fa-angle-double-up, .fa-angle-double-down { +.ti-chevrons-up, .ti-chevrons-down { margin-right: 10px; } -.cactiTableButton .fa-plus, .cactiTableButton .fa-question-circle, .cactiTableButton .fa-bars, .cactiTableButton .fa-sort-alpha-down, .cactiTableButton .fa-sort-alpha-up { +.cactiTableButton .ti-plus, .cactiTableButton .ti-help-circle-filled, .cactiTableButton .ti-menu-2, .cactiTableButton .ti-sort-ascending-letters, .cactiTableButton .ti-sort-descending-letters { margin-right: 10px; } -.fa-compress, .fa-expand { +.ti-arrows-diagonal-minimize-2, .ti-arrows-diagonal { margin-right: 10px; } @@ -2410,6 +2410,7 @@ tr#realtime td:first-child { vertical-align: middle; text-align: left; width: 24px; + margin-right: 0.3rem; } .graphDrillDown { diff --git a/include/themes/dark/main.js b/include/themes/dark/main.js index 501430dcd5..7ffa6e5221 100644 --- a/include/themes/dark/main.js +++ b/include/themes/dark/main.js @@ -31,16 +31,16 @@ function themeReady() { setMenuVisibility(); // Add nice search filter to filters - if ($('input[id="filter"]').length > 0 && $('input[id="filter"]').next('i[class="fa fa-search filter"]').length < 1) { - $('input[id="filter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="filter"]').length > 0 && $('input[id="filter"]').next('i[class="ti ti-search filter"]').length < 1) { + $('input[id="filter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); } - if ($('input[id="filterd"]').length > 0 && $('input[id="filterd"]').next('i[class="fa fa-search filter"]').length < 1) { - $('input[id="filterd"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="filterd"]').length > 0 && $('input[id="filterd"]').next('i[class="ti ti-search filter"]').length < 1) { + $('input[id="filterd"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); } - if ($('input[id="rfilter"]').length > 0 && $('input[id="rfilter"]').next('i[class="fa fa-search filter"]').length < 1) { - $('input[id="rfilter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchRFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="rfilter"]').length > 0 && $('input[id="rfilter"]').next('i[class="ti ti-search filter"]').length < 1) { + $('input[id="rfilter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchRFilter).parent('td').css('white-space', 'nowrap'); } $('input#filter, input#rfilter').addClass('ui-state-default ui-corner-all'); diff --git a/include/themes/hollyberry/main.css b/include/themes/hollyberry/main.css index a4e232ac32..6f279c02fa 100644 --- a/include/themes/hollyberry/main.css +++ b/include/themes/hollyberry/main.css @@ -2322,6 +2322,7 @@ tr#realtime td:first-child { font-size: 12px; width: 20px; vertical-align: 30%; + margin-right: 0.3rem; } .menuitem span { diff --git a/include/themes/hollyberry/main.js b/include/themes/hollyberry/main.js index a8fca761f6..7b48db36d6 100644 --- a/include/themes/hollyberry/main.js +++ b/include/themes/hollyberry/main.js @@ -30,16 +30,16 @@ function themeReady() { setMenuVisibility(); // Add nice search filter to filters - if ($('input[id="filter"]').length > 0 && $('input[id="filter"]').next('i[class="fa fa-search filter"]').length < 1) { - $('input[id="filter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="filter"]').length > 0 && $('input[id="filter"]').next('i[class="ti ti-search filter"]').length < 1) { + $('input[id="filter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); } - if ($('input[id="filterd"]').length > 0 && $('input[id="filterd"]').next('i[class="fa fa-search filter"]').length < 1) { - $('input[id="filterd"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="filterd"]').length > 0 && $('input[id="filterd"]').next('i[class="ti ti-search filter"]').length < 1) { + $('input[id="filterd"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); } - if ($('input[id="rfilter"]').length > 0 && $('input[id="rfilter"]').next('i[class="fa fa-search filter"]').length < 1) { - $('input[id="rfilter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchRFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="rfilter"]').length > 0 && $('input[id="rfilter"]').next('i[class="ti ti-search filter"]').length < 1) { + $('input[id="rfilter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchRFilter).parent('td').css('white-space', 'nowrap'); } $('input#filter, input#rfilter').addClass('ui-state-default ui-corner-all'); @@ -49,7 +49,7 @@ function themeReady() { /* Start clean up */ //login page - $('.cactiLoginLogo').html("").css('font-size: 20px'); + $('.cactiLoginLogo').html("").css('font-size: 20px'); /* clean up the navigation menu */ $('.cactiConsoleNavigationArea').find('#menu').appendTo($('.cactiConsoleNavigationArea').find('#navigation')); @@ -77,8 +77,8 @@ function themeReady() { $('.menuHr').remove(); $('
' +'' +'
').insertAfter('.maintabs'); diff --git a/include/themes/midwinter/css/media/compact-landscape.css b/include/themes/midwinter/css/media/compact-landscape.css index 8e2ad56f8e..cabfa19117 100755 --- a/include/themes/midwinter/css/media/compact-landscape.css +++ b/include/themes/midwinter/css/media/compact-landscape.css @@ -179,7 +179,8 @@ html { } .navControl { - padding-right: calc( 0.5rem + 5px); + /* padding-right: calc( 0.5rem + 5px); */ + padding-right: 0.5rem; } /* ensure that save buttons stay at the bottom. no solution has been found yet to use grid-area: footer instead */ @@ -193,6 +194,10 @@ html { padding-right: 0.5rem; border-top: 1px solid var(--border-color-semilight); background: var(--background-content); + + & .formRow { + display: block; + } } /* Console Navigation Area */ @@ -349,10 +354,7 @@ html { .navBox-content { overflow-y: auto; - padding: 0; - & nav { - padding: 0 1rem; - } + padding: 0 1rem; } } @@ -414,6 +416,27 @@ html { writing-mode: unset; } } + + & .filterColumn:has(div.filterFieldName) { + display: none; + } + + & .filterRow:has(div.filterColumnButton) { + display: flex; + flex-direction: column; + + .filterColumnButton { + order: 0; + } + .filterColumn { + order: 1; + } + } + + & .filterColumn { + line-height: 1.5rem; + } + } #nav li a, diff --git a/include/themes/midwinter/css/media/compact.css b/include/themes/midwinter/css/media/compact.css index d3b2f11a45..28a65eb293 100644 --- a/include/themes/midwinter/css/media/compact.css +++ b/include/themes/midwinter/css/media/compact.css @@ -146,12 +146,56 @@ grid-area: left; height: auto; border-right: 1px solid var(--border-color-semilight); + width: min-content; + padding: 0 0.5rem; + + & .cactiTable { + width: 100% !important; + padding: 0 !important; /* again usage of inline style detected :( */ + margin: 0 !important; + } + + & .filterTable { + white-space: unset; + display: flex; + width: 100%; + + & tbody { + flex: 1; + } + + & td { + display: inline-block; + width: 100%; + } + + & tr:has(input) { + display: flex; + flex-direction: column-reverse; + } + + &:has(div) { + + } + } } & .mdw-DockRight { grid-area: right; height: auto; border-left: 1px solid var(--border-color-semilight); + display: flex; + flex-direction: column; + align-items: center; + + & .mdw-ConsoleNavigationBox { + visibility: visible !important; /* NavigationBoxes within docks cannot be hidden */ + height: 50%; /* we allow two Boxes per total per dock, in this case set initial height to 50% */ + } + + & .mdw-ConsoleNavigationBox:only-child { + height: 100%; + } } & > div[class^="mdw-Dock"] { @@ -192,14 +236,12 @@ .displayOptions { height: 100%; width: 100%; - padding: 1rem; .displayOptionsTap { .tab-label { display: inline-flex; width: 100%; margin-top: 1rem; - padding: 0rem 1rem; border-bottom: 3px solid transparent; justify-content: space-between; align-items: center; @@ -256,12 +298,10 @@ overflow: hidden; border-bottom: 1px solid var(--border-color-semilight); line-height: 3.5em; - padding: 0.25rem 0; & div:nth-child(2n+1) { float: left; width: 70%; - padding-left: 1rem; white-space: nowrap; overflow: hidden; text-overflow: ellipsis; @@ -271,6 +311,7 @@ float: left; width: 30%; text-align: right; + padding-left: 2.1rem; } } diff --git a/include/themes/midwinter/css/media/core.css b/include/themes/midwinter/css/media/core.css index cf430a29d7..1dff69c2f0 100755 --- a/include/themes/midwinter/css/media/core.css +++ b/include/themes/midwinter/css/media/core.css @@ -264,8 +264,8 @@ input[type="checkbox"]:focus-within + label:before { display: inline-block; width: 2.25rem; height: 0.75rem; - margin-right: 15px; - margin-left: 5px; + margin-right: 1rem; + /* margin-left: 5px;*/ cursor: pointer; } @@ -430,7 +430,7 @@ label { .glyph_tab-console:before { margin-left: 17px; - content: "\f0c9"; + content: "\ec42"; } .text_tab-console { @@ -1323,9 +1323,11 @@ legend::before { .graphWrapper { width: fit-content; position: relative; +} + +.graphimage { border: 1px solid var(--border-color); border-radius: 2px; - background-color: var(--background); } .cactiGraphContentArea { diff --git a/include/themes/midwinter/main.js b/include/themes/midwinter/main.js index 8226f81a2c..dd2c3e9f95 100755 --- a/include/themes/midwinter/main.js +++ b/include/themes/midwinter/main.js @@ -187,7 +187,7 @@ function setupTheme() { $('.versionInfo').detach().appendTo('.cactiAuthBody'); - $('').insertAfter('#login_username'); + $('').insertAfter('#login_username'); } @@ -213,15 +213,15 @@ function setupTheme() { '' + '' + '' + '
' + - ''+ - ''+ + ''+ + '
'+ '' + ''+ '
' + @@ -296,7 +296,7 @@ function setupTheme() { } /* user help */ - new navigationButton('help', 'Help', 'Help', 'far fa-comment-alt', '#compact_user_menu').show(); + new navigationButton('help', 'Help', 'Help', 'ti ti-message-circle-question', '#compact_user_menu').show(); new navigationBox(help, 'help', 'half', '2', { close: false, search: false, @@ -304,7 +304,7 @@ function setupTheme() { }, 'left', justCacti+' ® v'+cactiVersion).build(); /* user settings */ - new navigationButton('user', 'User', 'User Settings', 'far fa-user', '#compact_user_menu').show(); + new navigationButton('user', 'User', 'User Settings', 'ti ti-user', '#compact_user_menu').show(); new navigationBox( cactiUser, 'user', 'half', '2', { close: false, search: false, @@ -319,7 +319,7 @@ function setupTheme() { close: true, search: false, resize: false, - dock: false, + dock: true, }, 'right','Table Layout', 'auto').build(); new navigationButton('toggleColorMode', 'Color', 'Toggle light/dark Mode', 'fas fa-adjust', '#navControl', 'toggleColorMode', 'on').show(); new navigationButton('kioskMode', 'Kiosk', 'Enable Kiosk Mode', 'fas fa-tv', '#navControl', 'kioskMode', 'on').show(); @@ -330,16 +330,6 @@ function setupTheme() { $('#menu_main_console').remove(); $('a.menu_parent').removeClass('mdw-active').prop('inert', true); // suppress focus - /* replace default icons */ - $('i.menu_glyph:not(.ignore).fa-home').removeClass('fa fa-home').addClass('fa fa-tools'); - $('i.menu_glyph.fa-folder').removeClass('fa').addClass('far'); - $('i.menu_glyph.fa-clone').removeClass('fa').addClass('far'); - $('i.menu_glyph.fa-database').removeClass('fa fa-database').addClass('far fa-hdd'); - $('i.menu_glyph:not(.ignore).fa-chart-area').removeClass('fa fa-chart-area').addClass('fa fa-plus'); - $('i.menu_glyph.fa-cogs').removeClass('fa fa-cogs').addClass('fa fa-toolbox'); - $('i.menu_glyph.fa-superpowers').removeClass('fab fa-superpowers').addClass('fas fa-network-wired'); - - /* hide settings icon if the user got access to console only for e.g. Intropage, but nothing else */ if($('[class^="mdw-ConsoleNavigationBox"][data-helper="settings"]').has('li').length === 0) { $('[class^="compact_nav_icon"][data-helper="settings"]').addClass('hide'); @@ -576,14 +566,25 @@ function setupDefaultElements() { $('.stickyContainer').remove(); } - let btn_filter = new navigationButton('displayDockTop', 'Filter', 'Show Filter Dock','fas fa-filter', '#navFilter', 'toggleCactiDockNavigationBox', 'Top'); + +// let btn_filter1 = new navigationButton('displayDockTop', 'Filter', 'Show Filter Dock','fas fa-filter', '#navFilter', 'toggleCactiDockNavigationBox', 'Top'); + let btn_filter = new navigationButton('displayFilterOptions', 'Filter', 'Show Filter Dock','fas fa-filter', '#navFilter'); let btn_calendar = new navigationButton('daterangepicker', 'Calendar', 'Select Timeframe', 'fas fa-calendar-alt', '#navFilter', '', ''); let btn_add = new navigationButton('formAction', 'New', 'Add','fas fa-plus', '#navFilter'); if ($("#main .filterTable").length) { let filter; - filter = $("#main .filterTable:first").closest('div').detach(); - $(".mdw-DockTop").html(filter); + filter = $("#main .filterTable:first").closest('div.cactiTable').detach(); + + if( !$('[class^="mdw-ConsoleNavigationBox"][data-helper="displayFilterOptions"]').length ) { + new navigationBox('Filter', 'displayFilterOptions', 'auto', '1', { + close: true, + search: false, + resize: false, + dock: true, + }, 'right', 'Display Filter', '').build(); + } + $('[class^="mdw-ConsoleNavigationBox"][data-helper="displayFilterOptions"] .navBox-content').html(filter); /* custom content */ if($("#main >div:first .filterTable:first").closest('div').length === 1) { @@ -728,16 +729,16 @@ function setupDefaultElements() { } // Add nice search filter to filters - if ($('input[id="filter"]').length > 0 && $('input[id="filter"] > i[class="fa fa-search filter"]').length < 1) { - $('input[id="filter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="filter"]').length > 0 && $('input[id="filter"] > i[class="ti ti-search filter"]').length < 1) { + $('input[id="filter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); } - if ($('input[id="filterd"]').length > 0 && $('input[id="filterd"] > i[class="fa fa-search filter"]').length < 1) { - $('input[id="filterd"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="filterd"]').length > 0 && $('input[id="filterd"] > i[class="ti ti-search filter"]').length < 1) { + $('input[id="filterd"]').after("").attr('autocomplete', 'off').attr('placeholder', searchFilter).parent('td').css('white-space', 'nowrap'); } - if ($('input[id="rfilter"]').length > 0 && $('input[id="rfilter"] > i[class="fa fa-search filter"]').length < 1) { - $('input[id="rfilter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchRFilter).parent('td').css('white-space', 'nowrap'); + if ($('input[id="rfilter"]').length > 0 && $('input[id="rfilter"] > i[class="ti ti-search filter"]').length < 1) { + $('input[id="rfilter"]').after("").attr('autocomplete', 'off').attr('placeholder', searchRFilter).parent('td').css('white-space', 'nowrap'); } $('input#filter, input#rfilter').addClass('ui-state-default ui-corner-all'); diff --git a/include/themes/midwinter/midwinter.js b/include/themes/midwinter/midwinter.js index 070c84ffc0..59ab4c2f09 100644 --- a/include/themes/midwinter/midwinter.js +++ b/include/themes/midwinter/midwinter.js @@ -333,7 +333,7 @@ function get_help_content() { + '' + ''; } @@ -1789,7 +1789,7 @@ function draw_menu($user_menu = '') { if (isset($menu_glyphs[$header_name])) { $glyph = ''; } else { - $glyph = ''; + $glyph = ''; } print "
  • " . html_escape($tab['title']) . "
    • "; + print "
  • " . html_escape($tab['title']) . "
    • "; } - print "
    • "; + print "
    • "; print ''; } @@ -2858,44 +2858,44 @@ function html_spikekill_menu_item($text, $icon = '', $class = '', $id = '', $dat */ function html_spikekill_menu($local_graph_id) { global $settings; - $ravgnan1 = html_spikekill_menu_item(__('Average'), html_spikekill_setting('spikekill_avgnan') == 'avg' ? 'fa fa-check':'fa', 'skmethod', 'method_avg'); - $ravgnan2 = html_spikekill_menu_item(__('NaN\'s'), html_spikekill_setting('spikekill_avgnan') == 'nan' ? 'fa fa-check':'fa', 'skmethod', 'method_nan'); - $ravgnan3 = html_spikekill_menu_item(__('Last Known Good'), html_spikekill_setting('spikekill_avgnan') == 'last' ? 'fa fa-check':'fa', 'skmethod', 'method_last'); + $ravgnan1 = html_spikekill_menu_item(__('Average'), html_spikekill_setting('spikekill_avgnan') == 'avg' ? 'ti ti-check':'fa', 'skmethod', 'method_avg'); + $ravgnan2 = html_spikekill_menu_item(__('NaN\'s'), html_spikekill_setting('spikekill_avgnan') == 'nan' ? 'ti ti-check':'fa', 'skmethod', 'method_nan'); + $ravgnan3 = html_spikekill_menu_item(__('Last Known Good'), html_spikekill_setting('spikekill_avgnan') == 'last' ? 'ti ti-check':'fa', 'skmethod', 'method_last'); $ravgnan = html_spikekill_menu_item(__('Replacement Method'), '', '', '', '', $ravgnan1 . $ravgnan2 . $ravgnan3); $rstddev = ''; foreach ($settings['spikes']['spikekill_deviations']['array'] as $key => $value) { - $rstddev .= html_spikekill_menu_item($value, html_spikekill_setting('spikekill_deviations') == $key ? 'fa fa-check':'fa', 'skstddev', 'stddev_' . $key); + $rstddev .= html_spikekill_menu_item($value, html_spikekill_setting('spikekill_deviations') == $key ? 'ti ti-check':'fa', 'skstddev', 'stddev_' . $key); } $rstddev = html_spikekill_menu_item(__('Standard Deviations'), '', '', '', '', $rstddev); $rvarpct = ''; foreach ($settings['spikes']['spikekill_percent']['array'] as $key => $value) { - $rvarpct .= html_spikekill_menu_item($value, html_spikekill_setting('spikekill_percent') == $key ? 'fa fa-check':'fa', 'skvarpct', 'varpct_' . $key); + $rvarpct .= html_spikekill_menu_item($value, html_spikekill_setting('spikekill_percent') == $key ? 'ti ti-check':'fa', 'skvarpct', 'varpct_' . $key); } $rvarpct = html_spikekill_menu_item(__('Variance Percentage'), '', '', '', '', $rvarpct); $rvarout = ''; foreach ($settings['spikes']['spikekill_outliers']['array'] as $key => $value) { - $rvarout .= html_spikekill_menu_item($value, html_spikekill_setting('spikekill_outliers') == $key ? 'fa fa-check':'fa', 'skvarout', 'varout_' . $key); + $rvarout .= html_spikekill_menu_item($value, html_spikekill_setting('spikekill_outliers') == $key ? 'ti ti-check':'fa', 'skvarout', 'varout_' . $key); } $rvarout = html_spikekill_menu_item(__('Variance Outliers'), '', '', '', '', $rvarout); $rkills = ''; foreach ($settings['spikes']['spikekill_number']['array'] as $key => $value) { - $rkills .= html_spikekill_menu_item($value,html_spikekill_setting('spikekill_number') == $key ? 'fa fa-check':'fa', 'skills', 'kills_' . $key); + $rkills .= html_spikekill_menu_item($value,html_spikekill_setting('spikekill_number') == $key ? 'ti ti-check':'fa', 'skills', 'kills_' . $key); } $rkills = html_spikekill_menu_item(__('Kills Per RRA'), '', '', '', '', $rkills); $rabsmax = ''; foreach ($settings['spikes']['spikekill_absmax']['array'] as $key => $value) { - $rabsmax .= html_spikekill_menu_item($value, html_spikekill_setting('spikekill_absmax') == $key ? 'fa fa-check':'fa', 'skabsmax', 'absmax_' . $key); + $rabsmax .= html_spikekill_menu_item($value, html_spikekill_setting('spikekill_absmax') == $key ? 'ti ti-check':'fa', 'skabsmax', 'absmax_' . $key); } $rabsmax = html_spikekill_menu_item(__('Absolute Max Value'), '', '', '', '', $rabsmax); @@ -2903,19 +2903,19 @@ function html_spikekill_menu($local_graph_id) { '; } else { // Make a row using a div if (isset($config_array['force_row_color'])) { @@ -722,13 +722,13 @@ function form_dirpath_box($form_name, $form_previous_value, $form_default_value, } if (is_dir($form_previous_value)) { - $extra_data = ""; + $extra_data = ""; } elseif (is_file($form_previous_value)) { - $extra_data = "'; + $extra_data = "'; } elseif ($form_previous_value == '') { $extra_data = ''; } else { - $extra_data = ""; + $extra_data = ""; } print " id='$form_name' name='$form_name' placeholder='" . __esc('Enter a valid directory path') . "' size='$form_size'" . (!empty($form_max_length) ? " maxlength='$form_max_length'" : '') . " value='" . html_escape($form_previous_value) . "'>" . $extra_data; @@ -872,7 +872,7 @@ function form_dropdown($form_name, $form_data, $column_display, $column_id, $for * $dropdown_array = array( * 'server' => array( * 'display' => __('Some Value'), - * 'class' => 'fa fa-server', + * 'class' => 'ti ti-server', * 'style' => 'width:30px;...' * ), * ... diff --git a/lib/html_graph.php b/lib/html_graph.php index 6fa07bba57..f1d7970013 100644 --- a/lib/html_graph.php +++ b/lib/html_graph.php @@ -1756,19 +1756,19 @@ function html_graph_single_view() { print "
    "; print ""; - print "
    "; + print "
    "; print ""; - print "
    "; + print "
    "; if (is_realm_allowed(10) && $graph_template_id > 0) { print ""; - print ""; + print ""; print '
    '; } if (read_config_option('realtime_enabled') == 'on' || is_realm_allowed(25)) { - print "
    "; + print "
    "; } print($aggregate_url != '' ? $aggregate_url : ''); @@ -2049,16 +2049,16 @@ function html_graph_zoom() {
    ' style='vertical-align:top;' class='graphDrillDown noprint'> _properties' class='iconLink properties'> - '> + '>
    _csv' class='iconLink properties'> - '> + '>
    0) { - print ""; + print ""; print '
    '; } diff --git a/lib/html_reports.php b/lib/html_reports.php index a244a409e0..04b1683894 100644 --- a/lib/html_reports.php +++ b/lib/html_reports.php @@ -1805,14 +1805,14 @@ function display_reports_items($report_id) { $form_data .= '
    '; if ($i == 1) { - $form_data .= ''; + $form_data .= '' . ''; print $form_data; @@ -2273,17 +2273,17 @@ function reports() { $notify = ''; $found = false; if ($report['email'] != '') { - $notify .= ''; + $notify .= ''; $found = true; } if ($report['bcc'] != '') { - $notify .= ''; + $notify .= ''; $found = true; } if ($report['bcc'] != '') { - $notify .= ''; + $notify .= ''; $found = true; } @@ -2293,7 +2293,7 @@ function reports() { form_selectable_cell($notify, $id); - form_selectable_cell($report['enabled'] ? '' : '', $id, '', 'right'); + form_selectable_cell($report['enabled'] ? '' : '', $id, '', 'right'); if ($report['sched_type'] != 1) { form_selectable_cell(date($date_format, strtotime($report['next_start'])), $id, '', 'right'); diff --git a/lib/html_utility.php b/lib/html_utility.php index 53272125e0..692f5cf61f 100644 --- a/lib/html_utility.php +++ b/lib/html_utility.php @@ -1486,7 +1486,7 @@ function get_current_graph_end() { */ function display_tooltip($text) { if ($text != '') { - return '
    ' . $text . "
    \n"; + return '
    ' . $text . "
    \n"; } else { return ''; } diff --git a/lib/installer.php b/lib/installer.php index 686c4bcf9f..e467a9427e 100644 --- a/lib/installer.php +++ b/lib/installer.php @@ -216,11 +216,11 @@ public function __construct($install_params = array()) { $this->setStep($step); $this->iconClass = array( - DB_STATUS_ERROR => 'fa fa-thumbs-down', - DB_STATUS_WARNING => 'fa fa-exclamation-triangle', - DB_STATUS_RESTART => 'fa fa-exclamation-triangle', - DB_STATUS_SUCCESS => 'fa fa-thumbs-up', - DB_STATUS_SKIPPED => 'fa fa-check-circle' + DB_STATUS_ERROR => 'ti ti-thumb-down', + DB_STATUS_WARNING => 'ti ti-alert-triangle-filled', + DB_STATUS_RESTART => 'ti ti-alert-triangle-filled', + DB_STATUS_SUCCESS => 'ti ti-thumb-up', + DB_STATUS_SKIPPED => 'ti ti-check-circle' ); $this->defaultAutomation = array( @@ -2435,7 +2435,7 @@ public function processStepBinaryLocations() { $form_check_string = ''; /* draw the actual header and textbox on the form */ - print "
    " . $array['friendly_name'] . "
    " . $array['description'] . '
    '; + print "
    " . $array['friendly_name'] . "
    " . $array['description'] . '
    '; print "
    "; diff --git a/lib/package.php b/lib/package.php index a981ab9c63..10ad770647 100644 --- a/lib/package.php +++ b/lib/package.php @@ -353,7 +353,7 @@ function get_package_contents($export_type, $export_item_id, $include_deps = tru foreach($queries as $q) { $file = str_replace('', CACTI_PATH_BASE, $q['xml_path']); $exists = file_exists($file); - $output .= '
    ' . html_escape(basename($file)) . ($exists ? '':'') . '
    '; + $output .= '
    ' . html_escape(basename($file)) . ($exists ? '':'') . '
    '; } $output .= '
    '; @@ -369,7 +369,7 @@ function get_package_contents($export_type, $export_item_id, $include_deps = tru if (array_search($file, $found) === false) { if (strpos($file['file'], '/resource/') === false) { $exists = file_exists($file['file']); - $output .= '
    ' . html_escape(basename($file['file'])) . ($exists ? '':'') . '
    '; + $output .= '
    ' . html_escape(basename($file['file'])) . ($exists ? '':'') . '
    '; } $found[] = $file; diff --git a/links.php b/links.php index 8e1de8b6d1..b0de9ff063 100644 --- a/links.php +++ b/links.php @@ -326,7 +326,7 @@ function pages() { if (get_request_var('sort_column') == 'sortorder') { if ($i != 0) { - $sort = ''; + $sort = ''; } else { $sort = ''; } @@ -334,7 +334,7 @@ function pages() { if ($i == cacti_sizeof($pages) - 1) { $sort .= ''; } else { - $sort .= ''; + $sort .= ''; } form_selectable_cell($sort, $page['id'], '', 'center'); diff --git a/plugins.php b/plugins.php index 092d70f0d9..54a080c9f1 100644 --- a/plugins.php +++ b/plugins.php @@ -1459,13 +1459,13 @@ function format_plugin_row($plugin, $last_plugin, $include_ordering, $table) { $row .= "
    '; @@ -1625,28 +1625,28 @@ function format_archive_plugin_row($plugin, $table) { if (plugin_valid_version_range($plugin['archive_compat'])) { if (plugin_valid_dependencies($plugin['archive_requires'])) { if ($plugin['version'] == '') { - $row .= ""; + $row .= ""; $status = __('Compatible, Loadable'); } elseif (cacti_version_compare($plugin['archive_version'], $plugin['version'], '<')) { - $row .= ""; + $row .= ""; $status = __('Compatible, Downgrade'); } elseif (cacti_version_compare($plugin['archive_version'], $plugin['version'], '=')) { - $row .= ""; + $row .= ""; $status = __('Compatible, Same Version'); } else { - $row .= ""; + $row .= ""; $status = __('Compatible, Upgradable'); } } else { - $row .= ""; + $row .= ""; $status = __('Not Compatible, Dependencies'); } } else { - $row .= ""; + $row .= ""; $status = __('Not Compatible, Cacti Version'); } - $row .= ""; + $row .= ""; $row .= ''; $uname = strtoupper($plugin['plugin']); @@ -1782,23 +1782,23 @@ function plugin_get_install_links($plugin, $table) { if ($plugin['status'] == 0) { if (!file_exists("$path/setup.php")) { - $link .= ""; + $link .= ""; } elseif (!file_exists("$path/INFO")) { - $link .= ""; + $link .= ""; } else { $not_installed = plugin_required_installed($plugin, $table); if ($not_installed != '') { - $link .= ""; + $link .= ""; } else { - $link .= ""; + $link .= ""; } - $link .= ""; + $link .= ""; } - $link .= ""; + $link .= ""; $setup_file = CACTI_PATH_BASE . '/plugins/' . $plugin['plugin'] . '/setup.php'; @@ -1809,7 +1809,7 @@ function plugin_get_install_links($plugin, $table) { $rm_data_function = "plugin_{$plugin['plugin']}_remove_data"; if (function_exists($has_data_function) && function_exists($rm_data_function) && $has_data_function()) { - $link .= ""; + $link .= ""; } } } @@ -1837,43 +1837,43 @@ function plugin_actions($plugin, $table) { $required = plugin_required_for_others($plugin, $table); if ($required != '') { - $link .= ""; + $link .= ""; } else { - $link .= ""; + $link .= ""; } - $link .= ""; + $link .= ""; if ($archived) { - $link .= ""; + $link .= ""; } else { - $link .= ""; + $link .= ""; } break; case '2': // Configuration issues - $link .= ""; + $link .= ""; - $link .= ""; + $link .= ""; - $link .= ""; + $link .= ""; break; case '4': // Installed but not active $required = plugin_required_for_others($plugin, $table); if ($required != '') { - $link .= ""; + $link .= ""; } else { - $link .= ""; + $link .= ""; } - $link .= ""; + $link .= ""; if ($archived) { - $link .= ""; + $link .= ""; } else { - $link .= ""; + $link .= ""; } break; @@ -1881,47 +1881,47 @@ function plugin_actions($plugin, $table) { $required = plugin_required_for_others($plugin, $table); if ($required != '') { - $link .= ""; + $link .= ""; } else { - $link .= ""; + $link .= ""; } - $link .= ""; + $link .= ""; if ($archived) { - $link .= ""; + $link .= ""; } else { - $link .= ""; + $link .= ""; } break; case '-5': // Plugin directory missing - $link .= ""; + $link .= ""; break; case '-4': // Plugins should have INFO file since 1.0.0 - $link .= ""; + $link .= ""; break; case '-3': // Plugins can have spaces in their names - $link .= ""; + $link .= ""; break; case '-2': // Naming issues - $link .= ""; + $link .= ""; break; default: // Old PIA $path = CACTI_PATH_PLUGINS . '/' . $plugin['plugin']; if (!file_exists("$path/setup.php")) { - $link .= ""; + $link .= ""; } elseif (!file_exists("$path/INFO")) { - $link .= ""; + $link .= ""; } elseif (in_array($plugin['plugin'], $plugins_integrated, true)) { - $link .= ""; + $link .= ""; } else { - $link .= ""; + $link .= ""; } break; @@ -1932,10 +1932,10 @@ function plugin_actions($plugin, $table) { if ($plugin['remote_status'] == 1) { // Installed and Active // ToDo: Disabling here does not make much sense as the main will be replicated // with any change of any other plugin thus undoing. Fix that moving forward - //$link .= ""; + //$link .= ""; } elseif ($plugin['remote_status'] == 4) { // Installed but inactive if ($plugin['status'] == 1) { - $link .= ""; + $link .= ""; } } } diff --git a/pollers.php b/pollers.php index 706171005f..e340873214 100644 --- a/pollers.php +++ b/pollers.php @@ -890,9 +890,9 @@ function test_database_connection($poller = array()) { if (is_object($connection)) { db_close($connection); - print '  ' . __('Connection Successful'); + print '  ' . __('Connection Successful'); } else { - print '  ' . __('Connection Failed'); + print '  ' . __('Connection Failed'); } } diff --git a/tree.php b/tree.php index bc2e105ba5..7c7e893b76 100644 --- a/tree.php +++ b/tree.php @@ -1069,7 +1069,7 @@ function setBranchSortIcon(nodeid) { function getHostSortIcon(type, nodeid) { if (hostSortInfo[nodeid] == type) { - return 'fa fa-check'; + return 'ti ti-check'; } else { return 'false'; } @@ -1077,7 +1077,7 @@ function getHostSortIcon(type, nodeid) { function getBranchSortIcon(type, nodeid) { if (branchSortInfo[nodeid] == type) { - return 'fa fa-check'; + return 'ti ti-check'; } else { return 'false'; } @@ -1570,7 +1570,7 @@ function branchContext(nodeid) { 'create' : { 'separator_before' : false, 'separator_after' : true, - 'icon' : 'fa fa-folder', + 'icon' : 'ti ti-folder-filled', '_disabled' : false, 'label' : '', 'action' : function (data) { @@ -1584,7 +1584,7 @@ function branchContext(nodeid) { 'rename' : { 'separator_before' : false, 'separator_after' : false, - 'icon' : 'fa fa-pencil-alt', + 'icon' : 'ti ti-pencil', '_disabled' : false, 'label' : '', 'action' : function (data) { @@ -1595,7 +1595,7 @@ function branchContext(nodeid) { }, 'remove' : { 'separator_before' : false, - 'icon' : 'fa fa-times', + 'icon' : 'ti ti-x', 'separator_after' : false, '_disabled' : false, 'label' : '', @@ -1611,7 +1611,7 @@ function branchContext(nodeid) { }, 'bst' : { 'separator_before' : true, - 'icon' : 'fa fa-sort', + 'icon' : 'ti ti-caret-up-down-filled', 'separator_after' : false, 'label' : '', 'action' : false, @@ -1690,7 +1690,7 @@ function branchContext(nodeid) { }, 'ccp' : { 'separator_before' : true, - 'icon' : 'fa fa-edit', + 'icon' : 'ti ti-edit', 'separator_after' : false, 'label' : '', 'action' : false, @@ -1698,7 +1698,7 @@ function branchContext(nodeid) { 'cut' : { 'separator_before' : false, 'separator_after' : false, - 'icon' : 'fa fa-cut', + 'icon' : 'ti ti-scissors', 'label' : '', 'action' : function (data) { var inst = $.jstree.reference(data.reference); @@ -1712,7 +1712,7 @@ function branchContext(nodeid) { }, 'copy' : { 'separator_before' : false, - 'icon' : 'fa fa-copy', + 'icon' : 'ti ti-copy', 'separator_after' : false, 'label' : '', 'action' : function (data) { @@ -1727,7 +1727,7 @@ function branchContext(nodeid) { }, 'paste' : { 'separator_before' : false, - 'icon' : 'fa fa-clipboard', + 'icon' : 'ti ti-clipboard-copy', '_disabled' : function (data) { return !$.jstree.reference(data.reference).can_paste(); }, @@ -1748,7 +1748,7 @@ function graphContext(nodeid) { return { 'remove' : { 'separator_before' : false, - 'icon' : 'fa fa-times', + 'icon' : 'ti ti-x', 'separator_after' : false, '_disabled' : false, //(this.check('delete_node', data.reference, this.get_parent(data.reference), '')), 'label' : '', @@ -1764,7 +1764,7 @@ function graphContext(nodeid) { }, 'ccp' : { 'separator_before' : true, - 'icon' : 'fa fa-edit', + 'icon' : 'ti ti-edit', 'separator_after' : false, 'label' : '', 'action' : false, @@ -1772,7 +1772,7 @@ function graphContext(nodeid) { 'cut' : { 'separator_before' : false, 'separator_after' : false, - 'icon' : 'fa fa-cut', + 'icon' : 'ti ti-scissors', 'label' : '', 'action' : function (data) { var inst = $.jstree.reference(data.reference); @@ -1786,7 +1786,7 @@ function graphContext(nodeid) { }, 'copy' : { 'separator_before' : false, - 'icon' : 'fa fa-copy', + 'icon' : 'ti ti-copy', 'separator_after' : false, 'label' : '', 'action' : function (data) { @@ -1808,7 +1808,7 @@ function siteContext(nodeid) { return { 'remove' : { 'separator_before' : false, - 'icon' : 'fa fa-times', + 'icon' : 'ti ti-x', 'separator_after' : false, '_disabled' : false, 'label' : '', @@ -1829,7 +1829,7 @@ function hostContext(nodeid) { return { 'remove' : { 'separator_before' : false, - 'icon' : 'fa fa-times', + 'icon' : 'ti ti-x', 'separator_after' : false, '_disabled' : false, 'label' : '', @@ -1846,7 +1846,7 @@ function hostContext(nodeid) { 'hso' : { 'separator_before' : true, 'separator_after' : false, - 'icon' : 'fa fa-sort', + 'icon' : 'ti ti-caret-up-down-filled', 'label' : '', 'action' : false, 'submenu' : { @@ -1872,7 +1872,7 @@ function hostContext(nodeid) { }, 'ccp' : { 'separator_before' : true, - 'icon' : 'fa fa-edit', + 'icon' : 'ti ti-edit', 'separator_after' : false, 'label' : '', 'action' : false, @@ -1880,7 +1880,7 @@ function hostContext(nodeid) { 'cut' : { 'separator_before' : false, 'separator_after' : false, - 'icon' : 'fa fa-cut', + 'icon' : 'ti ti-scissors', 'label' : '', 'action' : function (data) { var inst = $.jstree.reference(data.reference), @@ -1894,7 +1894,7 @@ function hostContext(nodeid) { }, 'copy' : { 'separator_before' : false, - 'icon' : 'fa fa-copy', + 'icon' : 'ti ti-copy', 'separator_after' : false, 'label' : '', 'action' : function (data) { @@ -2038,7 +2038,7 @@ function tree() { 'href' => 'tree.php?action=sortasc', 'callback' => true, 'title' => __esc('Sort Trees Ascending'), - 'class' => 'fa fa-sort-alpha-down' + 'class' => 'ti ti-sort-ascending-letters' ); $button2 = array( @@ -2046,7 +2046,7 @@ function tree() { 'href' => 'tree.php?action=sortdesc', 'callback' => true, 'title' => __esc('Sort Trees Descending'), - 'class' => 'fa fa-sort-alpha-up' + 'class' => 'ti ti-sort-descending-letters' ); /* create the page filter */ @@ -2197,14 +2197,14 @@ function tree() { $sequence .= ''; $sequence .= ''; } elseif ($i == 1) { - $sequence .= ''; + $sequence .= ''; $sequence .= ''; } elseif ($i == cacti_sizeof($trees)) { $sequence .= ''; - $sequence .= ''; + $sequence .= ''; } else { - $sequence .= ''; - $sequence .= ''; + $sequence .= ''; + $sequence .= ''; } } diff --git a/user_admin.php b/user_admin.php index f3e9f44284..5489d7ff62 100644 --- a/user_admin.php +++ b/user_admin.php @@ -1764,7 +1764,7 @@ function settings_edit($header_label) { foreach ($settings_user as $tab_short_name => $tab_fields) { $collapsible = true; - print "
    " . $tabs_graphs[$tab_short_name] . ($collapsible ? "
    ":'') . '
    '; + print "
    " . $tabs_graphs[$tab_short_name] . ($collapsible ? "
    ":'') . '
    '; $form_array = array(); diff --git a/user_group_admin.php b/user_group_admin.php index 46781e01eb..7b372795ac 100644 --- a/user_group_admin.php +++ b/user_group_admin.php @@ -1626,7 +1626,7 @@ function user_group_settings_edit($header_label) { foreach ($settings_user as $tab_short_name => $tab_fields) { $collapsible = true; - print "
    " . $tabs_graphs[$tab_short_name] . ($collapsible ? "
    ":'') . '
    '; + print "
    " . $tabs_graphs[$tab_short_name] . ($collapsible ? "
    ":'') . '
    '; $form_array = array(); diff --git a/vdef.php b/vdef.php index ec311bf531..4062d5c4b7 100644 --- a/vdef.php +++ b/vdef.php @@ -603,19 +603,19 @@ function vdef_edit() { if (read_config_option('drag_and_drop') == '') { if ($i < $total_items && $total_items > 0) { - $actions .= ''; + $actions .= ''; } else { $actions .= ''; } if ($i > 1 && $i <= $total_items) { - $actions .= ''; + $actions .= ''; } else { $actions .= ''; } } - $actions .= ""; + $actions .= ""; form_selectable_cell($actions, $vdef_item['id'], '', 'right');
    - ' title='' data-id=''> - ' title='' data-id=''> - ' title='' data-id=''> + ' title='' data-id=''> + ' title='' data-id=''> + ' title='' data-id=''> - ' href=''> + ' href=''> - ' href=''> + ' href=''> "; if ($i != cacti_sizeof($item_list) - 1) { - print ""; + print ""; } else { print ""; } if ($i > 0) { - print ""; + print ""; } else { print ""; } - print ""; + print ""; print '' . $size . '' . ''; + $form_data .= '' . ''; } elseif ($i > 1 && $i < cacti_sizeof($items)) { - $form_data .= '' . ''; + $form_data .= '' . ''; } else { - $form_data .= '' . ''; + $form_data .= '' . ''; } - $form_data .= '' . '
    "; if (!$first_plugin) { - $row .= ""; + $row .= ""; } else { $row .= ''; } if (!$last_plugin) { - $row .= ""; + $row .= ""; } else { $row .= ''; } @@ -1504,39 +1504,39 @@ function format_available_plugin_row($plugin, $table) { if (plugin_valid_dependencies($plugin['avail_requires'])) { if ($plugin['version'] == '') { if ($avail_version != 'develop') { - $row .= ""; + $row .= ""; } else { - $row .= ""; + $row .= ""; } $status = __('Compatible, Loadable'); } elseif ($avail_version == 'develop') { - $row .= ""; + $row .= ""; $status = __('Compatible, Upgrade'); } elseif (cacti_version_compare($avail_version, $plugin['version'], '<')) { - $row .= ""; + $row .= ""; $status = __('Compatible, Downgrade'); } elseif (cacti_version_compare($avail_version, $plugin['version'], '=')) { - $row .= ""; + $row .= ""; $status = __('Compatible, Same Version'); } else { - $row .= ""; + $row .= ""; $status = __('Compatible, Upgrade'); } } else { - $row .= ""; + $row .= ""; $status = __('Not Compatible, Dependencies'); } } else { - $row .= ""; + $row .= ""; $status = __('Not Compatible, Cacti Version'); } - $row .= ""; + $row .= ""; /* no link to the changelog unless it exists */ if ($plugin['changelog'] > 0) { - $row .= ""; + $row .= ""; } $row .= '