From 9ebc6d9d837076bddd9eeb634a7023e76e8f7b2a Mon Sep 17 00:00:00 2001 From: Nate Date: Tue, 20 Aug 2019 19:53:21 -0600 Subject: [PATCH] Replace misc glyphicon usage. --- app/adminer/app_menu.php | 2 +- app/bridges/bridges.php | 2 +- app/call_broadcast/call_broadcast_edit.php | 2 +- app/call_recordings/call_recordings.php | 4 ++-- app/contacts/contacts.php | 2 +- app/destinations/destinations.php | 2 +- app/devices/device_edit.php | 4 ++-- app/devices/device_profile_edit.php | 4 ++-- app/devices/device_profiles.php | 3 +-- app/dialplans/app_menu.php | 2 +- app/edit/app_menu.php | 10 +++++----- app/email_templates/email_templates.php | 2 +- app/messages/messages_contacts.php | 6 +++--- app/sip_profiles/sip_profile_edit.php | 4 ++-- app/streams/streams.php | 2 +- core/apps/app_menu.php | 2 +- core/menu/app_menu.php | 12 ++++++------ core/user_settings/user_dashboard.php | 2 +- core/users/user_edit.php | 4 ++-- core/users/users.php | 2 +- themes/default/css.php | 2 +- 21 files changed, 37 insertions(+), 38 deletions(-) diff --git a/app/adminer/app_menu.php b/app/adminer/app_menu.php index fbf8980060..3c180ee2fa 100644 --- a/app/adminer/app_menu.php +++ b/app/adminer/app_menu.php @@ -23,7 +23,7 @@ $apps[$x]['menu'][$y]['uuid'] = "1f59d07b-b4f7-4f9e-bde9-312cf491d66e"; $apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f"; $apps[$x]['menu'][$y]['category'] = "external"; - $apps[$x]['menu'][$y]['icon'] = "glyphicon-new-window"; + $apps[$x]['menu'][$y]['icon'] = "external-link-alt"; $apps[$x]['menu'][$y]['path'] = "/app/adminer/index.php"; $apps[$x]['menu'][$y]['groups'][] = "superadmin"; diff --git a/app/bridges/bridges.php b/app/bridges/bridges.php index 32fcc429e9..f27836b0e4 100644 --- a/app/bridges/bridges.php +++ b/app/bridges/bridges.php @@ -233,7 +233,7 @@ echo "$v_link_label_edit"; } if (permission_exists('bridge_delete')) { - echo ""; + echo ""; } echo " \n"; echo "\n"; diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php index 9b5b3f6207..8ec1c29472 100644 --- a/app/call_broadcast/call_broadcast_edit.php +++ b/app/call_broadcast/call_broadcast_edit.php @@ -456,7 +456,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "
"; echo " OR "; echo "
"; - echo " Sample File "; + echo " Sample File "; echo "
"; echo " (Upload TXT- Plain Text, CSV- Comma Separated Values file format only.)"; echo "
"; diff --git a/app/call_recordings/call_recordings.php b/app/call_recordings/call_recordings.php index 817b78acc8..32136d25e9 100644 --- a/app/call_recordings/call_recordings.php +++ b/app/call_recordings/call_recordings.php @@ -247,10 +247,10 @@ echo " $v_link_label_view"; } if (permission_exists('call_recording_edit')) { - echo "\n"; + echo "\n"; } echo " \n"; echo "\n"; diff --git a/app/contacts/contacts.php b/app/contacts/contacts.php index 1651b8a8b1..0fea56a2ad 100644 --- a/app/contacts/contacts.php +++ b/app/contacts/contacts.php @@ -292,7 +292,7 @@ echo " ".escape($row['contact_organization'])." \n"; echo " "; if (is_uuid($row['contact_attachment_uuid'])) { - echo ""; + echo ""; } echo " \n"; echo " ".escape($row['contact_name_given'])." \n"; diff --git a/app/destinations/destinations.php b/app/destinations/destinations.php index 3f3810e471..2451be1b7f 100644 --- a/app/destinations/destinations.php +++ b/app/destinations/destinations.php @@ -298,7 +298,7 @@ echo "$v_link_label_edit"; } if (permission_exists('destination_delete')) { - echo ""; + echo ""; } echo " \n"; echo "\n"; diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index 43035cccd3..db12f40e34 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -1061,8 +1061,8 @@ echo " \n"; } echo " \n"; - echo " "; - echo " "; + echo " "; + echo " "; echo "
".$text['description-profile2']."\n"; echo " "; echo " "; diff --git a/app/devices/device_profile_edit.php b/app/devices/device_profile_edit.php index 6d17973f9b..50357d06d8 100644 --- a/app/devices/device_profile_edit.php +++ b/app/devices/device_profile_edit.php @@ -535,7 +535,7 @@ echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo " ".$v_link_label_delete."\n"; echo " \n"; echo " \n"; @@ -597,7 +597,7 @@ echo " \n"; echo " \n"; echo " \n"; - echo " \n"; + echo " ".$v_link_label_delete."\n"; echo " \n"; echo " \n"; $x++; diff --git a/app/devices/device_profiles.php b/app/devices/device_profiles.php index e125a67350..dfe49b25d1 100644 --- a/app/devices/device_profiles.php +++ b/app/devices/device_profiles.php @@ -257,8 +257,7 @@ echo "$v_link_label_edit"; } if (permission_exists('device_profile_delete')) { - echo " \n"; - //echo ""; + echo " ".$v_link_label_delete."\n"; } echo " \n"; echo "\n"; diff --git a/app/dialplans/app_menu.php b/app/dialplans/app_menu.php index 26677a1438..a00e94ae5f 100644 --- a/app/dialplans/app_menu.php +++ b/app/dialplans/app_menu.php @@ -23,7 +23,7 @@ $apps[$x]['menu'][$y]['uuid'] = "b94e8bd9-9eb5-e427-9c26-ff7a6c21552a"; $apps[$x]['menu'][$y]['parent_uuid'] = ""; $apps[$x]['menu'][$y]['category'] = "internal"; - $apps[$x]['menu'][$y]['icon'] = "glyphicon-transfer"; + $apps[$x]['menu'][$y]['icon'] = "fa-exchange-alt"; $apps[$x]['menu'][$y]['path'] = ""; $apps[$x]['menu'][$y]['order'] = "15"; $apps[$x]['menu'][$y]['groups'][] = "admin"; diff --git a/app/edit/app_menu.php b/app/edit/app_menu.php index 833d11200f..f6b284ef63 100644 --- a/app/edit/app_menu.php +++ b/app/edit/app_menu.php @@ -23,7 +23,7 @@ $apps[$x]['menu'][$y]['uuid'] = "f1905fec-0577-daef-6045-59d09b7d3f94"; $apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f"; $apps[$x]['menu'][$y]['category'] = "external"; - $apps[$x]['menu'][$y]['icon'] = "glyphicon-new-window"; + $apps[$x]['menu'][$y]['icon'] = "external-link-alt"; $apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=scripts"; $apps[$x]['menu'][$y]['groups'][] = "superadmin"; $y++; @@ -49,7 +49,7 @@ $apps[$x]['menu'][$y]['uuid'] = "16013877-606a-2a05-7d6a-c1b215839131"; $apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f"; $apps[$x]['menu'][$y]['category'] = "external"; - $apps[$x]['menu'][$y]['icon'] = "glyphicon-new-window"; + $apps[$x]['menu'][$y]['icon'] = "external-link-alt"; $apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=xml"; $apps[$x]['menu'][$y]['groups'][] = "superadmin"; $y++; @@ -75,7 +75,7 @@ $apps[$x]['menu'][$y]['uuid'] = "57773542-a565-1a29-605d-6535da1a0870"; $apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f"; $apps[$x]['menu'][$y]['category'] = "external"; - $apps[$x]['menu'][$y]['icon'] = "glyphicon-new-window"; + $apps[$x]['menu'][$y]['icon'] = "external-link-alt"; $apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=provision"; $apps[$x]['menu'][$y]['groups'][] = "superadmin"; $y++; @@ -101,7 +101,7 @@ $apps[$x]['menu'][$y]['uuid'] = "eae1f2d6-789b-807c-cc26-44501e848693"; $apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f"; $apps[$x]['menu'][$y]['category'] = "external"; - $apps[$x]['menu'][$y]['icon'] = "glyphicon-new-window"; + $apps[$x]['menu'][$y]['icon'] = "external-link-alt"; $apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=php"; $apps[$x]['menu'][$y]['groups'][] = "superadmin"; $y++; @@ -127,7 +127,7 @@ $apps[$x]['menu'][$y]['uuid'] = "c3db739e-89f9-0fa2-44ce-0f4c2ff43b1a"; $apps[$x]['menu'][$y]['parent_uuid'] = "594d99c5-6128-9c88-ca35-4b33392cec0f"; $apps[$x]['menu'][$y]['category'] = "external"; - $apps[$x]['menu'][$y]['icon'] = "glyphicon-new-window"; + $apps[$x]['menu'][$y]['icon'] = "external-link-alt"; $apps[$x]['menu'][$y]['path'] = "/app/edit/index.php?dir=grammar"; $apps[$x]['menu'][$y]['groups'][] = "superadmin"; diff --git a/app/email_templates/email_templates.php b/app/email_templates/email_templates.php index fc470ac8d3..0e10aa5a28 100644 --- a/app/email_templates/email_templates.php +++ b/app/email_templates/email_templates.php @@ -223,7 +223,7 @@ echo "$v_link_label_edit"; } if (permission_exists('email_template_delete')) { - echo ""; + echo ""; } echo " \n"; echo "\n"; diff --git a/app/messages/messages_contacts.php b/app/messages/messages_contacts.php index 04dd6118bc..9e4e6cfea9 100644 --- a/app/messages/messages_contacts.php +++ b/app/messages/messages_contacts.php @@ -183,12 +183,12 @@ } //contact name/number if ($contact[$number]['contact_name_given'] != '' || $contact[$number]['contact_name_family'] != '') { - echo "
\n"; + echo "
\n"; echo "
\n"; echo " ".escape($contact[$number]['contact_name_given'].' '.$contact[$number]['contact_name_family']).'
'; - echo " ".escape(format_phone($number)).'
'; + echo " ".escape(format_phone($number)).'
'; if (valid_email($contact[$number]['contact_email'])) { - echo "".$text['label-send_email']."
"; + echo "".$text['label-send_email']."
"; } if ($selected) { $contact_name = escape($contact[$number]['contact_name_given'].' '.$contact[$number]['contact_name_family']); diff --git a/app/sip_profiles/sip_profile_edit.php b/app/sip_profiles/sip_profile_edit.php index fe61e7e1fb..a25eb85baa 100644 --- a/app/sip_profiles/sip_profile_edit.php +++ b/app/sip_profiles/sip_profile_edit.php @@ -336,7 +336,7 @@ echo " \n"; echo " \n"; if (strlen($row["sip_profile_domain_name"]) > 0) { - echo " \n"; + echo " ".$v_link_label_delete."\n"; } echo " \n"; echo " \n"; @@ -403,7 +403,7 @@ echo " \n"; echo " \n"; if (strlen($row["sip_profile_setting_name"]) > 0) { - echo " \n"; + echo " ".$v_link_label_delete."\n"; } echo " \n"; echo " \n"; diff --git a/app/streams/streams.php b/app/streams/streams.php index aed5482bfb..58337c9faf 100644 --- a/app/streams/streams.php +++ b/app/streams/streams.php @@ -238,7 +238,7 @@ echo "$v_link_label_edit"; } if (permission_exists('stream_delete')) { - echo ""; + echo ""; } echo " \n"; echo "\n"; diff --git a/core/apps/app_menu.php b/core/apps/app_menu.php index 20ceada6cf..2145c1019b 100644 --- a/core/apps/app_menu.php +++ b/core/apps/app_menu.php @@ -22,7 +22,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'] = "glyphicon-send"; + $apps[$x]['menu'][$y]['icon'] = "fa-paper-plane"; $apps[$x]['menu'][$y]['path'] = ""; $apps[$x]['menu'][$y]['order'] = "20"; $apps[$x]['menu'][$y]['groups'][] = "superadmin"; diff --git a/core/menu/app_menu.php b/core/menu/app_menu.php index 2d826bc611..edfec78fcd 100644 --- a/core/menu/app_menu.php +++ b/core/menu/app_menu.php @@ -45,7 +45,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'] = "glyphicon-home"; + $apps[$x]['menu'][$y]['icon'] = "fa-home"; $apps[$x]['menu'][$y]['path'] = ""; $apps[$x]['menu'][$y]['order'] = "5"; $apps[$x]['menu'][$y]['groups'][] = "superadmin"; @@ -74,7 +74,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'] = "glyphicon-user"; + $apps[$x]['menu'][$y]['icon'] = "fa-user"; $apps[$x]['menu'][$y]['path'] = ""; $apps[$x]['menu'][$y]['order'] = "10"; $apps[$x]['menu'][$y]['groups'][] = "admin"; @@ -101,7 +101,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'] = "glyphicon-equalizer"; + $apps[$x]['menu'][$y]['icon'] = "fa-chart-bar"; $apps[$x]['menu'][$y]['path'] = ""; $apps[$x]['menu'][$y]['order'] = "25"; $apps[$x]['menu'][$y]['groups'][] = "user"; @@ -129,7 +129,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'] = "glyphicon-cog"; + $apps[$x]['menu'][$y]['icon'] = "fa-cog"; $apps[$x]['menu'][$y]['path'] = ""; $apps[$x]['menu'][$y]['order'] = "30"; $apps[$x]['menu'][$y]['groups'][] = "superadmin"; @@ -155,7 +155,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'] = "glyphicon-log-in"; + $apps[$x]['menu'][$y]['icon'] = "fa-sign-in-alt"; $apps[$x]['menu'][$y]['path'] = "/login.php"; $apps[$x]['menu'][$y]['groups'][] = "public"; $apps[$x]['menu'][$y]['order'] = "99"; @@ -181,7 +181,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'] = "glyphicon-log-out"; + $apps[$x]['menu'][$y]['icon'] = "fa-sign-out-alt"; $apps[$x]['menu'][$y]['path'] = '/logout.php'; $apps[$x]['menu'][$y]['groups'][] = 'superadmin'; $apps[$x]['menu'][$y]['groups'][] = 'admin'; diff --git a/core/user_settings/user_dashboard.php b/core/user_settings/user_dashboard.php index 78846d0a6f..c0e1739fea 100644 --- a/core/user_settings/user_dashboard.php +++ b/core/user_settings/user_dashboard.php @@ -1213,7 +1213,7 @@ echo "
"; echo "
"; echo $block['html']; - echo " "; + echo " "; echo "
"; echo "
"; echo "
"; diff --git a/core/users/user_edit.php b/core/users/user_edit.php index 8bf580e205..99395f482b 100644 --- a/core/users/user_edit.php +++ b/core/users/user_edit.php @@ -660,7 +660,7 @@ echo "
\n"; if ($unsaved) { - echo "".$text['message-unsaved_changes']." "; + echo "".$text['message-unsaved_changes']." "; } if (permission_exists('user_add') || permission_exists('user_edit')) { echo " "; @@ -1045,7 +1045,7 @@ } echo "
"; if ($unsaved) { - echo " ".$text['message-unsaved_changes']." "; + echo " ".$text['message-unsaved_changes']." "; } echo " "; echo " "; diff --git a/core/users/users.php b/core/users/users.php index cdcc7ff829..ab23d07895 100644 --- a/core/users/users.php +++ b/core/users/users.php @@ -196,7 +196,7 @@ echo " \n"; if (permission_exists('ticket_edit')) { - echo " \n"; + echo " \n"; } echo " \n"; echo " "; diff --git a/themes/default/css.php b/themes/default/css.php index e8c027d42b..abe4aa45ca 100644 --- a/themes/default/css.php +++ b/themes/default/css.php @@ -646,7 +646,7 @@ $default_login = ($_REQUEST['login'] == 'default') ? true : false; border-radius: 3px; text-align: center; text-transform: uppercase; - text-shadow: 0px 0px 1px rgba(0,0,0,0.9); + /* text-shadow: 0px 0px 1px rgba(0,0,0,0.9); */ opacity: 0.9; -moz-opacity: 0.9; }