dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update Font Awesome to v6.6.x, adjust some icon references.

Browse Source
This commit is contained in:
fusionate
2024-08-09 18:14:52 -06:00
parent 10bd1b9f9f
commit 4b23913555
2622 changed files with 321441 additions and 70166 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/dashboard/app_defaults.php
+11 -1
View File
@@ -119,6 +119,16 @@ if ($domains_processed == 1) {
$p->delete('dashboard_add', 'temp');
$p->delete('dashboard_group_add', 'temp');
//update dashboard icons to be prefixed with v6.x font awesome style class name (e.g. 'fa-solid ')
$queries[] = "update v_dashboard set dashboard_icon = concat('fa-solid ', dashboard_icon) where dashboard_icon is not null and dashboard_icon not like 'fa-solid fa-%' and dashboard_icon not like 'fa-regular fa-%' and dashboard_icon not like 'fa-brands fa-%' ";
//execute array of queries
foreach ($queries as $sql) {
$database = new database;
$database->execute($sql);
}
unset($queries, $sql);
}
?>
?>
core/dashboard/dashboard_edit.php
+36 -11
View File
@@ -558,36 +558,61 @@
echo " <tr class='type_icon' ".($dashboard_path != 'core/dashboard/resources/dashboard/icon.php' ? "style='display: none;'" : null).">";
echo " <td class='vncell'>".$text['label-icon']."</td>";
echo " <td class='vtable' style='vertical-align: bottom;'>";
if (file_exists($_SERVER["PROJECT_ROOT"].'/resources/fontawesome/fas_icons.php')) {
include 'resources/fontawesome/fas_icons.php';
if (is_array($font_awesome_solid_icons) && @sizeof($font_awesome_solid_icons) != 0) {
// rebuild and sort array
foreach ($font_awesome_solid_icons as $i => $icon_class) {
$icon_label = str_replace('fa-', '', $icon_class);
if (file_exists($_SERVER["PROJECT_ROOT"].'/resources/fontawesome/fa_icons.php')) {
include $_SERVER["PROJECT_ROOT"].'/resources/fontawesome/fa_icons.php';
if (!empty($font_awesome_icons) && is_array($font_awesome_icons)) {
//initialize variables
$previous_icon_classes = $previous_icon_name = $previous_icon_style = '';
//rebuild array, parse and format label
foreach ($font_awesome_icons as $i => $icon_classes) {
//split classes
$icon_class = explode(' ', $icon_classes);
$icon_style = $icon_class[0];
$icon_name = $icon_class[1];
//determine label
$icon_label = str_replace('fa-', '', $icon_name);
$icon_label = str_replace('-', ' ', $icon_label);
$icon_label = ucwords($icon_label);
$icons[$icon_class] = $icon_label;
//update previous
if (
!empty($previous_icon_name) &&
!empty($previous_icon_style) &&
$icon_name == $previous_icon_name &&
$icon_style != $previous_icon_style
) {
$icons[$previous_icon_classes] = $icon_label.' - '.ucwords(str_replace('fa-', '', $previous_icon_style));
$append_style = true;
}
else {
$append_style = false;
}
//set current
$icons[$icon_classes] = $icon_label.($append_style ? ' - '.ucwords(str_replace('fa-', '', $icon_style)) : null);
//set previous values
$previous_icon_name = $icon_name;
$previous_icon_style = $icon_style;
$previous_icon_classes = $icon_classes;
}
asort($icons, SORT_STRING);
unset($icon_classes, $icon_class, $icon_style, $icon_name, $previous_icon_classes, $previous_icon_style, $previous_icon_name, $icon_label, $previous_icon_name, $previous_icon_style, $previous_icon_classes);
echo "<table cellpadding='0' cellspacing='0' border='0'>\n";
echo " <tr>\n";
echo " <td>\n";
echo " <select class='formfld' name='dashboard_icon' id='dashboard_icon' onchange=\"$('#icons').slideUp(); $('#grid_icon').fadeIn();\">\n";
echo " <option value=''></option>\n";
foreach ($icons as $icon_class => $icon_label) {
$selected = ($dashboard_icon == $icon_class) ? "selected" : null;
$selected = $dashboard_icon == $icon_class ? "selected" : null;
echo " <option value='".escape($icon_class)."' ".$selected.">".escape($icon_label)."</option>\n";
}
echo " </select>\n";
echo " </td>\n";
echo " <td style='padding: 0 0 0 5px;'>\n";
echo " <button id='grid_icon' type='button' class='btn btn-default list_control_icon' style='font-size: 15px; padding-top: 1px; padding-left: 3px;' onclick=\"$('#icons').fadeIn(); $(this).fadeOut();\"><span class='fas fa-th'></span></button>";
echo " <button id='grid_icon' type='button' class='btn btn-default list_control_icon' style='font-size: 15px; padding-top: 1px; padding-left: 3px;' onclick=\"$('#icons').fadeIn(); $(this).fadeOut();\"><span class='fa-solid fa-th'></span></button>";
echo " </td>\n";
echo " </tr>\n";
echo "</table>\n";
echo "<div id='icons' style='clear: both; display: none; margin-top: 8px; padding-top: 10px; color: #000; max-height: 400px; overflow: auto;'>\n";
foreach ($icons as $icon_class => $icon_label) {
echo "<span class='fas ".escape($icon_class)." fa-fw' style='font-size: 24px; float: left; margin: 0 8px 8px 0; cursor: pointer; opacity: 0.3;' title='".escape($icon_label)."' onclick=\"$('#dashboard_icon').val('".escape($icon_class)."'); $('#icons').slideUp(); $('#grid_icon').fadeIn();\" onmouseover=\"this.style.opacity='1';\" onmouseout=\"this.style.opacity='0.3';\"></span>\n";
echo "<span class='".escape($icon_class)." fa-fw' style='font-size: 24px; float: left; margin: 0 8px 8px 0; cursor: pointer; opacity: 0.3;' title='".escape($icon_label)."' onclick=\"$('#dashboard_icon').val('".escape($icon_class)."'); $('#icons').slideUp(); $('#grid_icon').fadeIn();\" onmouseover=\"this.style.opacity='1';\" onmouseout=\"this.style.opacity='0.3';\"></span>\n";
}
echo "</div>";
}
core/menu/app_menu.php
+8 -8
View File
@@ -58,7 +58,7 @@
$apps[$x]['menu'][$y]['uuid'] = "02194288-6d56-6d3e-0b1a-d53a2bc10788";
$apps[$x]['menu'][$y]['parent_uuid'] = "";
$apps[$x]['menu'][$y]['category'] = "internal";
$apps[$x]['menu'][$y]['icon'] = "fa-home";
$apps[$x]['menu'][$y]['icon'] = "fa-solid fa-house";
$apps[$x]['menu'][$y]['path'] = "";
$apps[$x]['menu'][$y]['order'] = "5";
$apps[$x]['menu'][$y]['groups'][] = "superadmin";
@@ -93,7 +93,7 @@
$apps[$x]['menu'][$y]['uuid'] = "bc96d773-ee57-0cdd-c3ac-2d91aba61b55";
$apps[$x]['menu'][$y]['parent_uuid'] = "";
$apps[$x]['menu'][$y]['category'] = "internal";
$apps[$x]['menu'][$y]['icon'] = "fa-user";
$apps[$x]['menu'][$y]['icon'] = "fa-solid fa-user";
$apps[$x]['menu'][$y]['path'] = "";
$apps[$x]['menu'][$y]['order'] = "10";
$apps[$x]['menu'][$y]['groups'][] = "admin";
@@ -124,7 +124,7 @@
$apps[$x]['menu'][$y]['uuid'] = "fd29e39c-c936-f5fc-8e2b-611681b266b5";
$apps[$x]['menu'][$y]['parent_uuid'] = "";
$apps[$x]['menu'][$y]['category'] = "internal";
$apps[$x]['menu'][$y]['icon'] = "fa-paper-plane";
$apps[$x]['menu'][$y]['icon'] = "fa-solid fa-paper-plane";
$apps[$x]['menu'][$y]['path'] = "";
$apps[$x]['menu'][$y]['order'] = "20";
$apps[$x]['menu'][$y]['groups'][] = "superadmin";
@@ -159,7 +159,7 @@
$apps[$x]['menu'][$y]['uuid'] = "0438b504-8613-7887-c420-c837ffb20cb1";
$apps[$x]['menu'][$y]['parent_uuid'] = "";
$apps[$x]['menu'][$y]['category'] = "internal";
$apps[$x]['menu'][$y]['icon'] = "fa-chart-bar";
$apps[$x]['menu'][$y]['icon'] = "fa-solid fa-chart-column";
$apps[$x]['menu'][$y]['path'] = "";
$apps[$x]['menu'][$y]['order'] = "25";
$apps[$x]['menu'][$y]['groups'][] = "admin";
@@ -191,7 +191,7 @@
$apps[$x]['menu'][$y]['uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f";
$apps[$x]['menu'][$y]['parent_uuid'] = "";
$apps[$x]['menu'][$y]['category'] = "internal";
$apps[$x]['menu'][$y]['icon'] = "fa-cog";
$apps[$x]['menu'][$y]['icon'] = "fa-solid fa-gear";
$apps[$x]['menu'][$y]['path'] = "";
$apps[$x]['menu'][$y]['order'] = "30";
$apps[$x]['menu'][$y]['groups'][] = "superadmin";
@@ -222,7 +222,7 @@
$apps[$x]['menu'][$y]['uuid'] = "c85bf816-b88d-40fa-8634-11b456928afa";
$apps[$x]['menu'][$y]['parent_uuid'] = "";
$apps[$x]['menu'][$y]['category'] = "internal";
$apps[$x]['menu'][$y]['icon'] = "fa-sign-in-alt";
$apps[$x]['menu'][$y]['icon'] = "fa-solid fa-right-to-bracket";
$apps[$x]['menu'][$y]['path'] = "/login.php";
$apps[$x]['menu'][$y]['order'] = "99";
$apps[$x]['menu'][$y]['groups'][] = "public";
@@ -253,7 +253,7 @@
$apps[$x]['menu'][$y]['uuid'] = "0d29e9f4-0c9b-9d8d-cd2d-454899dc9bc4";
$apps[$x]['menu'][$y]['parent_uuid'] = "02194288-6d56-6d3e-0b1a-d53a2bc10788";
$apps[$x]['menu'][$y]['category'] = "internal";
$apps[$x]['menu'][$y]['icon'] = "fa-sign-out-alt";
$apps[$x]['menu'][$y]['icon'] = "fa-solid fa-right-from-bracket";
$apps[$x]['menu'][$y]['path'] = "/logout.php";
$apps[$x]['menu'][$y]['order'] = "";
$apps[$x]['menu'][$y]['groups'][] = "superadmin";
@@ -263,4 +263,4 @@
$apps[$x]['menu'][$y]['groups'][] = "fax";
$y++;
?>
?>
core/menu/menu_item_edit.php
+36 -11
View File
@@ -433,36 +433,61 @@
echo " <tr>";
echo " <td class='vncell'>".$text['label-icon']."</td>";
echo " <td class='vtable' style='vertical-align: bottom;'>";
if (file_exists($_SERVER["PROJECT_ROOT"].'/resources/fontawesome/fas_icons.php')) {
include 'resources/fontawesome/fas_icons.php';
if (is_array($font_awesome_solid_icons) && @sizeof($font_awesome_solid_icons) != 0) {
// rebuild and sort array
foreach ($font_awesome_solid_icons as $i => $icon_class) {
$icon_label = str_replace('fa-', '', $icon_class);
if (file_exists($_SERVER["PROJECT_ROOT"].'/resources/fontawesome/fa_icons.php')) {
include $_SERVER["PROJECT_ROOT"].'/resources/fontawesome/fa_icons.php';
if (!empty($font_awesome_icons) && is_array($font_awesome_icons)) {
//initialize variables
$previous_icon_classes = $previous_icon_name = $previous_icon_style = '';
//rebuild array, parse and format label
foreach ($font_awesome_icons as $i => $icon_classes) {
//split classes
$icon_class = explode(' ', $icon_classes);
$icon_style = $icon_class[0];
$icon_name = $icon_class[1];
//determine label
$icon_label = str_replace('fa-', '', $icon_name);
$icon_label = str_replace('-', ' ', $icon_label);
$icon_label = ucwords($icon_label);
$icons[$icon_class] = $icon_label;
//update previous
if (
!empty($previous_icon_name) &&
!empty($previous_icon_style) &&
$icon_name == $previous_icon_name &&
$icon_style != $previous_icon_style
) {
$icons[$previous_icon_classes] = $icon_label.' - '.ucwords(str_replace('fa-', '', $previous_icon_style));
$append_style = true;
}
else {
$append_style = false;
}
//set current
$icons[$icon_classes] = $icon_label.($append_style ? ' - '.ucwords(str_replace('fa-', '', $icon_style)) : null);
//set previous values
$previous_icon_name = $icon_name;
$previous_icon_style = $icon_style;
$previous_icon_classes = $icon_classes;
}
asort($icons, SORT_STRING);
unset($icon_classes, $icon_class, $icon_style, $icon_name, $previous_icon_classes, $previous_icon_style, $previous_icon_name, $icon_label, $previous_icon_name, $previous_icon_style, $previous_icon_classes);
echo "<table cellpadding='0' cellspacing='0' border='0'>\n";
echo " <tr>\n";
echo " <td>\n";
echo " <select class='formfld' name='menu_item_icon' id='menu_item_icon' onchange=\"$('#icons').slideUp(); $('#grid_icon').fadeIn();\">\n";
echo " <option value=''></option>\n";
foreach ($icons as $icon_class => $icon_label) {
$selected = ($menu_item_icon == $icon_class) ? "selected" : null;
$selected = $menu_item_icon == $icon_class ? "selected" : null;
echo " <option value='".escape($icon_class)."' ".$selected.">".escape($icon_label)."</option>\n";
}
echo " </select>\n";
echo " </td>\n";
echo " <td style='padding: 0 0 0 5px;'>\n";
echo " <button id='grid_icon' type='button' class='btn btn-default list_control_icon' style='font-size: 15px; padding-top: 1px; padding-left: 3px;' onclick=\"$('#icons').fadeIn(); $(this).fadeOut();\"><span class='fas fa-th'></span></button>";
echo " <button id='grid_icon' type='button' class='btn btn-default list_control_icon' style='font-size: 15px; padding-top: 1px; padding-left: 3px;' onclick=\"$('#icons').fadeIn(); $(this).fadeOut();\"><span class='fa-solid fa-th'></span></button>";
echo " </td>\n";
echo " </tr>\n";
echo "</table>\n";
echo "<div id='icons' style='clear: both; display: none; margin-top: 8px; padding-top: 10px; color: #000; max-height: 400px; overflow: auto;'>\n";
foreach ($icons as $icon_class => $icon_label) {
echo "<span class='fas ".escape($icon_class)." fa-fw' style='font-size: 24px; float: left; margin: 0 8px 8px 0; cursor: pointer; opacity: 0.3;' title='".escape($icon_label)."' onclick=\"$('#menu_item_icon').val('".escape($icon_class)."'); $('#icons').slideUp(); $('#grid_icon').fadeIn();\" onmouseover=\"this.style.opacity='1';\" onmouseout=\"this.style.opacity='0.3';\"></span>\n";
echo "<span class='".escape($icon_class)." fa-fw' style='font-size: 24px; float: left; margin: 0 8px 8px 0; cursor: pointer; opacity: 0.3;' title='".escape($icon_label)."' onclick=\"$('#menu_item_icon').val('".escape($icon_class)."'); $('#icons').slideUp(); $('#grid_icon').fadeIn();\" onmouseover=\"this.style.opacity='1';\" onmouseout=\"this.style.opacity='0.3';\"></span>\n";
}
echo "</div>";
}
core/users/resources/dashboard/config.php
+4 -4
View File
@@ -4,7 +4,7 @@
$array['dashboard'][$x]['dashboard_uuid'] = '57fd7761-6ffb-4a11-bdf0-4ce632f50c3c';
$array['dashboard'][$x]['dashboard_name'] = 'Users';
$array['dashboard'][$x]['dashboard_path'] = 'core/dashboard/resources/dashboard/icon.php';
$array['dashboard'][$x]['dashboard_icon'] = 'fa-user-friends';
$array['dashboard'][$x]['dashboard_icon'] = 'fa-solid fa-user-group';
$array['dashboard'][$x]['dashboard_url'] = '/core/users/users.php';
$array['dashboard'][$x]['dashboard_target'] = 'self';
$array['dashboard'][$x]['dashboard_width'] = '';
@@ -43,7 +43,7 @@ $x++;
$array['dashboard'][$x]['dashboard_uuid'] = '8aa9bb66-7a62-4a90-b52e-68bd4ccf325f';
$array['dashboard'][$x]['dashboard_name'] = 'Account Settings';
$array['dashboard'][$x]['dashboard_path'] = 'core/dashboard/resources/dashboard/icon.php';
$array['dashboard'][$x]['dashboard_icon'] = 'fa-user-cog';
$array['dashboard'][$x]['dashboard_icon'] = 'fa-solid fa-user-gear';
$array['dashboard'][$x]['dashboard_url'] = '/core/users/user_edit.php?id=user';
$array['dashboard'][$x]['dashboard_target'] = 'self';
$array['dashboard'][$x]['dashboard_width'] = '';
@@ -78,7 +78,7 @@ $x++;
$array['dashboard'][$x]['dashboard_uuid'] = 'b04ad600-9acc-45e5-a89a-d7a59a6fcb4c';
$array['dashboard'][$x]['dashboard_name'] = 'Logout';
$array['dashboard'][$x]['dashboard_path'] = 'core/dashboard/resources/dashboard/icon.php';
$array['dashboard'][$x]['dashboard_icon'] = 'fa-sign-out-alt';
$array['dashboard'][$x]['dashboard_icon'] = 'fa-solid fa-right-from-bracket';
$array['dashboard'][$x]['dashboard_url'] = '/logout.php';
$array['dashboard'][$x]['dashboard_target'] = 'self';
$array['dashboard'][$x]['dashboard_width'] = '';
@@ -112,4 +112,4 @@ $array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_group_uuid'] = '3cf3a
$array['dashboard'][$x]['dashboard_groups'][$y]['dashboard_uuid'] = 'b04ad600-9acc-45e5-a89a-d7a59a6fcb4c';
$array['dashboard'][$x]['dashboard_groups'][$y]['group_name'] = 'user';
?>
?>