Skip to content

Commit

Permalink
Migrating icons from FontAwesome to Tabler
Browse files Browse the repository at this point in the history
  • Loading branch information
@browniebraun
browniebraun committed Jan 5, 2025
1 parent 4a01ef7 commit 5be7d7f
Show file tree
Hide file tree
Showing 61 changed files with 534 additions and 455 deletions.
2 changes: 1 addition & 1 deletion auth_profile.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -423,7 +423,7 @@ function settings() {
foreach ($settings_user as $tab_short_name => $tab_fields) {
$collapsible = true;

print "<div class='spacer formHeader" . ($collapsible ? ' collapsible' : '') . "' id='row_$tab_short_name'><div class='formHeaderText'>" . $tabs_graphs[$tab_short_name] . ($collapsible ? "<div style='float:right;padding-right:4px;'><i class='fa fa-angle-double-up'></i></div>" : '') . "</div></div>";
print "<div class='spacer formHeader" . ($collapsible ? ' collapsible' : '') . "' id='row_$tab_short_name'><div class='formHeaderText'>" . $tabs_graphs[$tab_short_name] . ($collapsible ? "<div style='float:right;padding-right:4px;'><i class='ti ti-chevrons-up'></i></div>" : '') . "</div></div>";

$form_array = array();

Expand Down
6 changes: 3 additions & 3 deletions automation_snmp.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -799,19 +799,19 @@ function automation_snmp_edit() {

if (read_config_option('drag_and_drop') == '') {
if ($i < $total_items && $total_items > 1) {
$form_data .= '<a class="pic fa fa-caret-down moveArrow" href="' . html_escape('automation_snmp.php?action=item_movedown&item_id=' . $item['id'] . '&id=' . $item['snmp_id']) . '" title="' . __esc('Move Down') . '"></a>';
$form_data .= '<a class="pic ti ti-caret-down-filled moveArrow" href="' . html_escape('automation_snmp.php?action=item_movedown&item_id=' . $item['id'] . '&id=' . $item['snmp_id']) . '" title="' . __esc('Move Down') . '"></a>';
} else {
$form_data .= '<span class="moveArrowNone"></span>';
}

if ($i > 1 && $i <= $total_items) {
$form_data .= '<a class="pic fa fa-caret-up moveArrow" href="' . html_escape('automation_snmp.php?action=item_moveup&item_id=' . $item['id'] . '&id=' . $item['snmp_id']) . '" title="' . __esc('Move Up') . '"></a>';
$form_data .= '<a class="pic ti ti-caret-up-filled moveArrow" href="' . html_escape('automation_snmp.php?action=item_moveup&item_id=' . $item['id'] . '&id=' . $item['snmp_id']) . '" title="' . __esc('Move Up') . '"></a>';
} else {
$form_data .= '<span class="moveArrowNone"></span>';
}
}

$form_data .= '<a class="delete deleteMarker fa fa-times" id="' . $item['id'] . '_' . $item['snmp_id'] . '" title="' . __esc('Delete') . '"></a>';
$form_data .= '<a class="delete deleteMarker ti ti-x" id="' . $item['id'] . '_' . $item['snmp_id'] . '" title="' . __esc('Delete') . '"></a>';
$form_data .= '</td>';

print $form_data;
Expand Down
18 changes: 9 additions & 9 deletions automation_templates.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1177,19 +1177,19 @@ function template_edit() {
$action = '';
if (!$dnd) {
if ($i != cacti_sizeof($graph_rules) - 1) {
$action .= '<a class="pic fa fa-caret-down moveArrow" href="' . html_escape('automation_templates.php?action=item_movedown&template_id=' . get_request_var('id') . '&id=' . $rule['id'] . '&rule_type=1') . '" title="' . __esc('Move Down') . '"></a>';
$action .= '<a class="pic ti ti-caret-down-filled moveArrow" href="' . html_escape('automation_templates.php?action=item_movedown&template_id=' . get_request_var('id') . '&id=' . $rule['id'] . '&rule_type=1') . '" title="' . __esc('Move Down') . '"></a>';
} else {
$action .= '<a href="#" class="moveArrowNone"></a>';
}

if ($i > 0) {
$action .= '<a class="pic fa fa-caret-up moveArrow" href="' . html_escape('automation_templates.php?action=item_moveup&template_id=' . get_request_var('id') . '&id=' . $rule['id'] . '&rule_type=1') . '" title="' . __esc('Move Up') . '"></a>';
$action .= '<a class="pic ti ti-caret-up-filled moveArrow" href="' . html_escape('automation_templates.php?action=item_moveup&template_id=' . get_request_var('id') . '&id=' . $rule['id'] . '&rule_type=1') . '" title="' . __esc('Move Up') . '"></a>';
} else {
$action .= '<a href="#" class="moveArrowNone"></a>';
}
}

form_selectable_cell("$action<a class='delete deleteMarker fa fa-times' title='" . __esc('Delete') . "' href='" . html_escape('automation_templates.php?action=item_remove_agr_confirm&template_id=' . get_request_var('id') . '&rule_id=' . $rule['id']) . "'></a>", $id, '40', 'right');
form_selectable_cell("$action<a class='delete deleteMarker ti ti-x' title='" . __esc('Delete') . "' href='" . html_escape('automation_templates.php?action=item_remove_agr_confirm&template_id=' . get_request_var('id') . '&rule_id=' . $rule['id']) . "'></a>", $id, '40', 'right');

form_end_row();

Expand Down Expand Up @@ -1287,19 +1287,19 @@ function template_edit() {
$action = '';
if (!$dnd) {
if ($i != cacti_sizeof($tree_rules) - 1) {
$action .= '<a class="pic fa fa-caret-down moveArrow" href="' . html_escape('automation_templates.php?action=item_movedown&template_id=' . get_request_var('id') . '&id=' . $rule['id'] . '&rule_type=2') . '" title="' . __esc('Move Down') . '"></a>';
$action .= '<a class="pic ti ti-caret-down-filled moveArrow" href="' . html_escape('automation_templates.php?action=item_movedown&template_id=' . get_request_var('id') . '&id=' . $rule['id'] . '&rule_type=2') . '" title="' . __esc('Move Down') . '"></a>';
} else {
$action .= '<a href="#" class="moveArrowNone"></a>';
}

if ($i > 0) {
$action .= '<a class="pic fa fa-caret-up moveArrow" href="' . html_escape('automation_templates.php?action=item_moveup&template_id=' . get_request_var('id') . '&id=' . $rule['id'] . '&rule_type=2') . '" title="' . __esc('Move Up') . '"></a>';
$action .= '<a class="pic ti ti-caret-up-filled moveArrow" href="' . html_escape('automation_templates.php?action=item_moveup&template_id=' . get_request_var('id') . '&id=' . $rule['id'] . '&rule_type=2') . '" title="' . __esc('Move Up') . '"></a>';
} else {
$action .= '<a href="#" class="moveArrowNone"></a>';
}
}

form_selectable_cell("$action<a class='delete deleteMarker fa fa-times' title='" . __esc('Delete') . "' href='" . html_escape('automation_templates.php?action=item_remove_atr_confirm&template_id=' . get_request_var('id') . '&rule_id=' . $rule['id']) . "'></a>", $id, '40', 'right');
form_selectable_cell("$action<a class='delete deleteMarker ti ti-x' title='" . __esc('Delete') . "' href='" . html_escape('automation_templates.php?action=item_remove_atr_confirm&template_id=' . get_request_var('id') . '&rule_id=' . $rule['id']) . "'></a>", $id, '40', 'right');

form_end_row();

Expand Down Expand Up @@ -1368,7 +1368,7 @@ function template_edit() {

form_selectable_ecell($rule['name'], $id);

form_selectable_cell("$action<a class='delete deleteMarker fa fa-times' title='" . __esc('Delete') . "' href='" . html_escape('automation_templates.php?action=item_remove_ttr_confirm&id=' . get_request_var('id') . '&template_id=' . $template['host_template'] . '&rule_id=' . $rule['rule_id']) . "'></a>", $id, '40', 'right');
form_selectable_cell("$action<a class='delete deleteMarker ti ti-x' title='" . __esc('Delete') . "' href='" . html_escape('automation_templates.php?action=item_remove_ttr_confirm&id=' . get_request_var('id') . '&template_id=' . $template['host_template'] . '&rule_id=' . $rule['rule_id']) . "'></a>", $id, '40', 'right');

form_end_row();
}
Expand Down Expand Up @@ -1645,13 +1645,13 @@ function template() {
$add_text = '';

if ($i < $total_items && $total_items > 1) {
$add_text .= '<a class="pic fa fa-caret-down moveArrow" href="' . html_escape('automation_templates.php?action=movedown&id=' . $dt['id']) . '" title="' . __esc('Move Down') . '"></a>';
$add_text .= '<a class="pic ti ti-caret-down-filled moveArrow" href="' . html_escape('automation_templates.php?action=movedown&id=' . $dt['id']) . '" title="' . __esc('Move Down') . '"></a>';
} else {
$add_text .= '<span class="moveArrowNone"></span>';
}

if ($i > 1 && $i <= $total_items) {
$add_text .= '<a class="pic fa fa-caret-up moveArrow" href="' . html_escape('automation_templates.php?action=moveup&id=' . $dt['id']) . '" title="' . __esc('Move Up') . '"></a>';
$add_text .= '<a class="pic ti ti-caret-up-filled moveArrow" href="' . html_escape('automation_templates.php?action=moveup&id=' . $dt['id']) . '" title="' . __esc('Move Up') . '"></a>';
} else {
$add_text .= '<span class="moveArrowNone"></span>';
}
Expand Down
6 changes: 3 additions & 3 deletions cdef.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -609,19 +609,19 @@ function cdef_edit() {

if (read_config_option('drag_and_drop') == '') {
if ($i < $total_items && $total_items > 0) {
$actions .= '<a class="pic fa fa-caret-down moveArrow" href="' . html_escape('cdef.php?action=item_movedown&id=' . $cdef_item['id'] . '&cdef_id=' . $cdef_item['cdef_id']) . '" title="' . __esc('Move Down') . '"></a>';
$actions .= '<a class="pic ti ti-caret-down-filled moveArrow" href="' . html_escape('cdef.php?action=item_movedown&id=' . $cdef_item['id'] . '&cdef_id=' . $cdef_item['cdef_id']) . '" title="' . __esc('Move Down') . '"></a>';
} else {
$actions .= '<span class="moveArrowNone"></span>';
}

if ($i > 1 && $i <= $total_items) {
$actions .= '<a class="pic fa fa-caret-up moveArrow" href="' . html_escape('cdef.php?action=item_moveup&id=' . $cdef_item['id'] . '&cdef_id=' . $cdef_item['cdef_id']) . '" title="' . __esc('Move Up') . '"></a>';
$actions .= '<a class="pic ti ti-caret-up-filled moveArrow" href="' . html_escape('cdef.php?action=item_moveup&id=' . $cdef_item['id'] . '&cdef_id=' . $cdef_item['cdef_id']) . '" title="' . __esc('Move Up') . '"></a>';
} else {
$actions .= '<span class="moveArrowNone"></span>';
}
}

$actions .= "<a id='{$cdef['id']}_{$cdef_item['id']}' class='delete deleteMarker fa fa-times' title='" . __esc('Delete') . "' href='#'></a>";
$actions .= "<a id='{$cdef['id']}_{$cdef_item['id']}' class='delete deleteMarker ti ti-x' title='" . __esc('Delete') . "' href='#'></a>";

form_selectable_cell($actions, $cdef_item['id'], '', 'right');

Expand Down
8 changes: 4 additions & 4 deletions changelog.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,22 +168,22 @@ function changelog_view() {

switch ($type) {
case 'issue':
$icon = '<i class="fas fa-wrench"></i>';
$icon = '<i class="ti ti-tool"></i>';

break;
case 'feature':
$icon = '<i class="fas fa-rocket"></i>';
$icon = '<i class="ti ti-rocket"></i>';
$highlight = true;

break;
case ' security':
$icon = '<i class="fas fa-shield-alt"></i>';
$icon = '<i class="ti ti-shield-half"></i>';
$highlight = true;

break;

default:
$icon = '<i class="far fa-question-circle"></i>';
$icon = '<i class="ti ti-help"></i>';

break;
}
Expand Down
6 changes: 3 additions & 3 deletions color_templates.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 '<a class="pic fa fa-caret-down moveArrow" href="' . html_escape('color_templates.php?action=item_movedown&color_template_item_id=' . $item['color_template_item_id'] . '&color_template_id=' . $item['color_template_id']) . '" title="' . __esc('Move Down') . '"></a>';
print '<a class="pic ti ti-caret-down-filled moveArrow" href="' . html_escape('color_templates.php?action=item_movedown&color_template_item_id=' . $item['color_template_item_id'] . '&color_template_id=' . $item['color_template_id']) . '" title="' . __esc('Move Down') . '"></a>';
} else {
print '<span class="moveArrowNone"></span>';
}

if ($i > 1 && $i <= $total_items) {
print '<a class="pic fa fa-caret-up moveArrow" href="' . html_escape('color_templates.php?action=item_moveup&color_template_item_id=' . $item['color_template_item_id'] . '&color_template_id=' . $item['color_template_id']) . '" title="' . __esc('Move Up') . '"></a>';
print '<a class="pic ti ti-caret-up-filled moveArrow" href="' . html_escape('color_templates.php?action=item_moveup&color_template_item_id=' . $item['color_template_item_id'] . '&color_template_id=' . $item['color_template_id']) . '" title="' . __esc('Move Up') . '"></a>';
} else {
print '<span class="moveArrowNone"></span>';
}
}

print "<a class='delete deleteMarker fa fa-times' id='" . $item['color_template_id'] . '_' . $item['color_template_item_id'] . "' title='" . __esc('Delete') . "'></a>";
print "<a class='delete deleteMarker ti ti-x' id='" . $item['color_template_id'] . '_' . $item['color_template_item_id'] . "' title='" . __esc('Delete') . "'></a>";

print "</td>\n";
}
Expand Down
26 changes: 13 additions & 13 deletions data_debug.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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', '<i class="reloadquery fa fa-sync" data-id="' . $id . '" title="' . __esc('Refresh Now') . '"></i>'), '100%', '', '3', 'center', '');
html_start_box(__('Data Source Troubleshooter [ Auto Refreshing till Complete ] %s', '<i class="reloadquery ti ti-refresh" data-id="' . $id . '" title="' . __esc('Refresh Now') . '"></i>'), '100%', '', '3', 'center', '');
} elseif ($debug_status == 'analysis') {
html_start_box(__('Data Source Troubleshooter [ Auto Refreshing till RRDfile Update ] %s', '<i class="reloadquery fa fa-sync" data-id="' . $id . '" title="' . __esc('Refresh Now') . '"></i>'), '100%', '', '3', 'center', '');
html_start_box(__('Data Source Troubleshooter [ Auto Refreshing till RRDfile Update ] %s', '<i class="reloadquery ti ti-refresh" data-id="' . $id . '" title="' . __esc('Refresh Now') . '"></i>'), '100%', '', '3', 'center', '');
} else {
html_start_box(__('Data Source Troubleshooter [ Analysis Complete! %s ]', '<a href="#" class="rerun linkEditMain" data-id="' . $id . '" style="cursor:pointer;">' . __('Rerun Analysis') . '</a>'), '100%', '', '3', 'center', '');
}
Expand Down Expand Up @@ -911,48 +911,48 @@ function debug_view() {

function debug_icon_valid_result($result) {
if ($result === '' || $result === false) {
return '<i class="fa fa-spinner fa-pulse fa-fw"></i>';
return '<i class="ti ti-loader fa-pulse fa-fw"></i>';
}

if ($result === '-') {
return '<i class="fa fa-info-circle"></i>';
return '<i class="ti ti-info-circle-filled"></i>';
}

if (is_array($result)) {
foreach ($result as $variable => $value) {
if (!prepare_validate_result($value)) {
return '<i class="fa fa-times" style="color:red"></i>';
return '<i class="ti ti-x" style="color:red"></i>';
}
}

return '<i class="fa fa-check" style="color:green"></i>';
return '<i class="ti ti-check" style="color:green"></i>';
}

if (prepare_validate_result($result)) {
return '<i class="fa fa-check" style="color:green"></i>';
return '<i class="ti ti-check" style="color:green"></i>';
} else {
return '<i class="fa fa-times" style="color:red"></i>';
return '<i class="ti ti-x" style="color:red"></i>';
}
}

function debug_icon($result) {
if ($result === '' || $result === false) {
return '<i class="fa fa-spinner fa-pulse fa-fw"></i>';
return '<i class="ti ti-loader fa-pulse fa-fw"></i>';
}

if ($result === '-') {
return '<i class="fa fa-info-circle"></i>';
return '<i class="ti ti-info-circle-filled"></i>';
}

if ($result === 1 || $result === 'on') {
return '<i class="fa fa-check" style="color:green"></i>';
return '<i class="ti ti-check" style="color:green"></i>';
}

if ($result === 0 || $result === 'off') {
return '<i class="fa fa-times" style="color:red"></i>';
return '<i class="ti ti-x" style="color:red"></i>';
}

return '<i class="fa fa-exclamation-triangle" style="color:orange"></i>';
return '<i class="ti ti-alert-triangle-filled" style="color:orange"></i>';
}

function create_filter() {
Expand Down
6 changes: 3 additions & 3 deletions data_input.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -613,7 +613,7 @@ function data_edit() {

form_selectable_cell($field['sequence'], $i);

form_selectable_cell("<a class='delete deleteMarker fa fa-times' href='" . html_escape('data_input.php?action=field_remove_confirm&id=' . $field['id'] . '&data_input_id=' . get_request_var('id')) . "' title='" . __esc('Delete') . "'></a>", $i, '', 'right');
form_selectable_cell("<a class='delete deleteMarker ti ti-x' href='" . html_escape('data_input.php?action=field_remove_confirm&id=' . $field['id'] . '&data_input_id=' . get_request_var('id')) . "' title='" . __esc('Delete') . "'></a>", $i, '', 'right');

form_end_row();

Expand Down Expand Up @@ -657,11 +657,11 @@ function data_edit() {
form_selectable_cell(html_boolean_friendly($field['update_rra']), $i);

if ($output_disabled) {
form_selectable_cell("<a class='deleteMarkerDisabled fa fa-times' href='#' title='" . __esc('Output Fields can not be removed when Data Sources are present') . "'></a>", $i);
form_selectable_cell("<a class='deleteMarkerDisabled ti ti-x' href='#' title='" . __esc('Output Fields can not be removed when Data Sources are present') . "'></a>", $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("<a class='delete deleteMarker fa fa-times' href='$url' title='" . __esc('Delete') . "'></a>", $id, '', 'right');
form_selectable_cell("<a class='delete deleteMarker ti ti-x' href='$url' title='" . __esc('Delete') . "'></a>", $id, '', 'right');
}

form_end_row();
Expand Down
Loading

0 comments on commit 5be7d7f

Please sign in to comment.