diff --git a/app/basic_operator_panel/index.php b/app/basic_operator_panel/index.php index 93e1f4bae7..4e961a62cd 100644 --- a/app/basic_operator_panel/index.php +++ b/app/basic_operator_panel/index.php @@ -346,7 +346,7 @@ } else { $('#destination_'+ext+'_call').show(0, function() { - $('#destination_'+ext+'_call').focus(); + $('#destination_'+ext+'_call').trigger('focus'); $('#destination_'+ext+'_call').autocomplete({ source: "autocomplete.php", minLength: 3, @@ -374,7 +374,7 @@ else { $('#op_caller_details_'+ext).hide(0, function() { $('#destination_'+ext+'_transfer').show(0, function() { - $('#destination_'+ext+'_transfer').focus(); + $('#destination_'+ext+'_transfer').trigger('focus'); $('#destination_'+ext+'_transfer').autocomplete({ source: "autocomplete.php", minLength: 3, diff --git a/app/contacts/contact_address_edit.php b/app/contacts/contact_address_edit.php index ca539b8c59..8f1ace49cd 100644 --- a/app/contacts/contact_address_edit.php +++ b/app/contacts/contact_address_edit.php @@ -216,7 +216,7 @@ else { echo " document.getElementById(field).selectedIndex = 0;"; echo " document.getElementById(field+'_custom').value = '';"; echo " $('#'+field+'_custom').toggle();"; - echo " if ($('#'+field+'_custom').is(':visible')) { $('#'+field+'_custom').focus(); } else { $('#'+field).focus(); }"; + echo " if ($('#'+field+'_custom').is(':visible')) { $('#'+field+'_custom').trigger('focus'); } else { $('#'+field).trigger('focus'); }"; echo " }"; echo ""; diff --git a/app/contacts/contact_email_edit.php b/app/contacts/contact_email_edit.php index bf0e8e9af5..28a7ee5d99 100644 --- a/app/contacts/contact_email_edit.php +++ b/app/contacts/contact_email_edit.php @@ -188,7 +188,7 @@ if (is_uuid($_GET["contact_uuid"])) { echo " document.getElementById(field).selectedIndex = 0;"; echo " document.getElementById(field+'_custom').value = '';"; echo " $('#'+field+'_custom').toggle();"; - echo " if ($('#'+field+'_custom').is(':visible')) { $('#'+field+'_custom').focus(); } else { $('#'+field).focus(); }"; + echo " if ($('#'+field+'_custom').is(':visible')) { $('#'+field+'_custom').trigger('focus'); } else { $('#'+field).trigger('focus'); }"; echo " }"; echo ""; diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php index 61d17860e0..8cc1aa9291 100644 --- a/app/contacts/contact_phone_edit.php +++ b/app/contacts/contact_phone_edit.php @@ -218,7 +218,7 @@ echo " document.getElementById(field).selectedIndex = 0;\n"; echo " document.getElementById(field+'_custom').value = '';\n"; echo " $('#'+field+'_custom').toggle();\n"; - echo " if ($('#'+field+'_custom').is(':visible')) { $('#'+field+'_custom').focus(); } else { $('#'+field).focus(); }\n"; + echo " if ($('#'+field+'_custom').is(':visible')) { $('#'+field+'_custom').trigger('focus'); } else { $('#'+field).trigger('focus'); }\n"; echo " }"; echo ""; diff --git a/app/contacts/contact_relation_edit.php b/app/contacts/contact_relation_edit.php index d04b3f70c1..af2aedd960 100644 --- a/app/contacts/contact_relation_edit.php +++ b/app/contacts/contact_relation_edit.php @@ -183,7 +183,7 @@ else { echo " document.getElementById(field).selectedIndex = 0;"; echo " document.getElementById(field+'_custom').value = '';"; echo " $('#'+field+'_custom').toggle();"; - echo " if ($('#'+field+'_custom').is(':visible')) { $('#'+field+'_custom').focus(); } else { $('#'+field).focus(); }"; + echo " if ($('#'+field+'_custom').is(':visible')) { $('#'+field+'_custom').trigger('focus'); } else { $('#'+field).trigger('focus'); }"; echo " }"; echo ""; diff --git a/app/contacts/contact_timer.php b/app/contacts/contact_timer.php index 950bf2ac40..5a9ca76f99 100644 --- a/app/contacts/contact_timer.php +++ b/app/contacts/contact_timer.php @@ -132,9 +132,18 @@ if (!permission_exists('contact_time_add')) { echo "access denied"; exit; } if ($contact_organization != '') { $contact .= ($contact != '') ? ', '.$contact_organization : $contact_organization; } -?> - +//get the browser version + $user_agent = http_user_agent(); + $browser_version = $user_agent['version']; + $browser_name = $user_agent['name']; + $browser_version_array = explode('.', $browser_version); + +//set the doctype + echo ($browser_name != "Internet Explorer") ? "\n" : "\n"; + +?> + <?php echo $text['label-time_timer']; ?>: <?php echo $contact; ?> - + + + +
+ @@ -347,5 +356,6 @@ if (!permission_exists('contact_time_add')) { echo "access denied"; exit; } + \ No newline at end of file diff --git a/app/contacts/contact_url_edit.php b/app/contacts/contact_url_edit.php index cfe193de10..f580461f6f 100644 --- a/app/contacts/contact_url_edit.php +++ b/app/contacts/contact_url_edit.php @@ -189,7 +189,7 @@ else { echo " document.getElementById(field).selectedIndex = 0;"; echo " document.getElementById(field+'_custom').value = '';"; echo " $('#'+field+'_custom').toggle();"; - echo " if ($('#'+field+'_custom').is(':visible')) { $('#'+field+'_custom').focus(); } else { $('#'+field).focus(); }"; + echo " if ($('#'+field+'_custom').is(':visible')) { $('#'+field+'_custom').trigger('focus'); } else { $('#'+field).trigger('focus'); }"; echo " }"; echo ""; diff --git a/app/devices/device_edit.php b/app/devices/device_edit.php index 5ebcfc0c6e..43035cccd3 100644 --- a/app/devices/device_edit.php +++ b/app/devices/device_edit.php @@ -604,7 +604,7 @@ echo "\n"; echo " $( document ).ready(function() {\n"; - echo " $('#default_setting_search').focus();\n"; + echo " $('#default_setting_search').trigger('focus');\n"; if ($search == '') { echo " // scroll to previous category\n"; echo " var category_span_id;\n"; @@ -1603,7 +1603,7 @@ echo " if (event.which == 13) { submit_form(); }\n"; echo " });\n"; // capture device selection events - echo " $('#device_profile_uuid').change(function(event){ \n"; + echo " $('#device_profile_uuid').on('change',function(event){ \n"; echo " if (this.value == '') {\$('#device_profile_edit').hide()} else {\$('#device_profile_edit').show()} \n"; echo " }); \n"; // convert password fields to diff --git a/app/edit/cliplist.php b/app/edit/cliplist.php index dea415b1a4..1919cb2f5c 100644 --- a/app/edit/cliplist.php +++ b/app/edit/cliplist.php @@ -136,7 +136,8 @@ echo "}\n"; echo ""; // keyboard shortcut bindings -echo "\n"; +echo "\n"; +echo "\n"; //save file key_press('ctrl+s', 'down', 'window', null, null, "if (parent.document.getElementById('frm_edit')) { parent.$('form#frm_edit').submit(); return false; }", true); diff --git a/app/edit/filelist.php b/app/edit/filelist.php index 6792a14464..a6184f75ce 100644 --- a/app/edit/filelist.php +++ b/app/edit/filelist.php @@ -237,7 +237,8 @@ echo "}\n"; echo ""; // keyboard shortcut bindings -echo "\n"; +echo "\n"; +echo "\n"; //save file key_press('ctrl+s', 'down', 'window', null, null, "parent.$('form#frm_edit').submit(); return false;", true); diff --git a/app/edit/index.php b/app/edit/index.php index 5540badb51..18c90467d3 100644 --- a/app/edit/index.php +++ b/app/edit/index.php @@ -97,7 +97,8 @@ <?php echo $title; ?> - + + "; diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php index 4b104d9ef0..acfdf1f258 100644 --- a/app/xml_cdr/xml_cdr_statistics.php +++ b/app/xml_cdr/xml_cdr_statistics.php @@ -227,7 +227,7 @@ ''); }); - choiceContainer.find("input").click(plotAccordingToChoices); + choiceContainer.find("input").on('click', plotAccordingToChoices); function plotAccordingToChoices() { var data = []; diff --git a/core/default_settings/default_setting_edit.php b/core/default_settings/default_setting_edit.php index ef7590067d..1186abcaf9 100644 --- a/core/default_settings/default_setting_edit.php +++ b/core/default_settings/default_setting_edit.php @@ -437,7 +437,7 @@ elseif ($category == "theme" && substr_count($subcategory, "_font") > 0 && $name == "text") { $default_setting_value = str_replace('"', "'", $default_setting_value); if ($fonts = get_available_fonts('alpha')) { - echo " \n"; echo " \n"; echo " \n"; $option_found = false; @@ -671,7 +671,7 @@ echo "\n"; diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index ad0afb0444..2a19f60e88 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -219,7 +219,7 @@ echo " }\n"; echo "\n"; echo " $( document ).ready(function() {\n"; - echo " $('#default_setting_search').focus();\n"; + echo " $('#default_setting_search').trigger('focus').trigger('select');\n"; if ($search == '') { echo " // scroll to previous category\n"; echo " var category_span_id;\n"; @@ -240,7 +240,7 @@ //prevent enter key submit on search field echo "\n"; diff --git a/core/domain_settings/app_languages.php b/core/domain_settings/app_languages.php index 70237dd730..db4916cafb 100644 --- a/core/domain_settings/app_languages.php +++ b/core/domain_settings/app_languages.php @@ -421,6 +421,26 @@ $text['label-fixed']['ru-ru'] = "Фиксированный"; $text['label-fixed']['sv-se'] = "Fast"; $text['label-fixed']['uk-ua'] = "фіксований"; +$text['label-side']['en-us'] = "Side"; +$text['label-side']['ar-eg'] = "Side"; +$text['label-side']['de-at'] = "Side"; +$text['label-side']['de-ch'] = "Side"; +$text['label-side']['de-de'] = "Side"; +$text['label-side']['es-cl'] = "Side"; +$text['label-side']['es-mx'] = "Side"; +$text['label-side']['fr-ca'] = "Side"; +$text['label-side']['fr-fr'] = "Side"; +$text['label-side']['he-il'] = "Side"; +$text['label-side']['it-it'] = "Side"; +$text['label-side']['nl-nl'] = "Side"; +$text['label-side']['pl-pl'] = "Side"; +$text['label-side']['pt-br'] = "Side"; +$text['label-side']['pt-pt'] = "Side"; +$text['label-side']['ro-ro'] = "Side"; +$text['label-side']['ru-ru'] = "Side"; +$text['label-side']['sv-se'] = "Side"; +$text['label-side']['uk-ua'] = "Side"; + $text['label-domain']['en-us'] = "Domain"; $text['label-domain']['ar-eg'] = ""; $text['label-domain']['de-at'] = "Domain"; //copied from de-de diff --git a/core/domain_settings/domain_setting_edit.php b/core/domain_settings/domain_setting_edit.php index 0d7175f927..362f80fd75 100644 --- a/core/domain_settings/domain_setting_edit.php +++ b/core/domain_settings/domain_setting_edit.php @@ -382,7 +382,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; } else { - echo " \n"; echo " \n"; if (is_array($allowed_categories) && sizeof($allowed_categories) > 0) { foreach ($allowed_categories as $category) { @@ -534,7 +534,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { elseif ($category == "theme" && substr_count($subcategory, "_font") > 0 && $name == "text") { $row['domain_setting_value'] = str_replace('"', "'", $row['domain_setting_value']); if ($fonts = get_available_fonts('alpha')) { - echo " \n"; echo " \n"; echo " \n"; $option_found = false; @@ -623,6 +623,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo " \n"; echo " \n"; + echo " \n"; echo " \n"; } elseif ($category == "theme" && $subcategory == "menu_position" && $name == "text" ) { @@ -732,7 +733,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; diff --git a/core/domains/domain_edit.php b/core/domains/domain_edit.php index ce0269cb89..6113f89f7a 100644 --- a/core/domains/domain_edit.php +++ b/core/domains/domain_edit.php @@ -514,8 +514,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " });\n"; echo " }\n"; echo "\n"; - echo " $( document ).ready(function() {\n"; - echo " $('#domain_setting_search').focus();\n"; + echo " $(document).ready(function() {\n"; + echo " $('#domain_setting_search').trigger('focus');\n"; if ($search == '') { echo " // scroll to previous category\n"; echo " var category_span_id;\n"; diff --git a/core/groups/group_permissions.php b/core/groups/group_permissions.php index 9db79e0cc4..0326737ba7 100644 --- a/core/groups/group_permissions.php +++ b/core/groups/group_permissions.php @@ -339,7 +339,7 @@ echo " }\n"; echo "\n"; echo " $( document ).ready(function() {\n"; - echo " $('#group_permission_search').focus();\n"; + echo " $('#group_permission_search').trigger('focus');\n"; echo " });\n"; echo "\n"; diff --git a/core/menu/menu_item_edit.php b/core/menu/menu_item_edit.php index 317a22dc6e..1d57b92f56 100644 --- a/core/menu/menu_item_edit.php +++ b/core/menu/menu_item_edit.php @@ -400,36 +400,36 @@ else { echo " "; echo " ".$text['label-icon'].""; echo " "; - if (file_exists($_SERVER["PROJECT_ROOT"].'/resources/bootstrap/glyphicons.json')) { - $tmp_array = json_decode(file_get_contents($_SERVER["PROJECT_ROOT"].'/resources/bootstrap/glyphicons.json'), true); - if (is_array($tmp_array['icons']) && sizeof($tmp_array['icons']) > 0) { + 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 ($tmp_array['icons'] as $i => $glyphicon) { - $tmp_string = str_replace('glyphicon-', '', $glyphicon['id']); - $tmp_string = str_replace('-', ' ', $tmp_string); - $tmp_string = ucwords($tmp_string); - $glyphicons[$glyphicon['id']] = $tmp_string; + foreach ($font_awesome_solid_icons as $i => $icon_class) { + $icon_label = str_replace('fa-', '', $icon_class); + $icon_label = str_replace('-', ' ', $icon_label); + $icon_label = ucwords($icon_label); + $icons[$icon_class] = $icon_label; } - asort($glyphicons, SORT_STRING); + asort($icons, SORT_STRING); echo "\n"; echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo "
\n"; - echo " \n"; echo " \n"; - foreach ($glyphicons as $glyphicon_class => $glyphicon_name) { - $selected = ($menu_item_icon == $glyphicon_class) ? "selected" : null; - echo " \n"; + foreach ($icons as $icon_class => $icon_label) { + $selected = ($menu_item_icon == $icon_class) ? "selected" : null; + echo " \n"; } echo " \n"; echo " \n"; - echo " "; + echo " "; echo "
\n"; - echo "