From f428196e75883c5e00a6cc9f556e4ffa0d6ffc37 Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Mon, 7 Jul 2014 19:33:17 +0000 Subject: [PATCH] Misc: jQuery goodness for Advanced buttons. --- app/extensions/app_languages.php | 5 -- app/extensions/extension_edit.php | 63 +++++++++++----------- app/gateways/app_languages.php | 5 -- app/gateways/gateway_edit.php | 13 ++--- app/ivr_menu/app_languages.php | 5 -- app/ivr_menu/ivr_menu_edit.php | 13 ++--- app/time_conditions/app_languages.php | 4 -- app/time_conditions/time_condition_add.php | 13 ++--- app/xmpp/app_languages.php | 5 -- app/xmpp/profile_edit.php | 15 ++---- 10 files changed, 46 insertions(+), 95 deletions(-) diff --git a/app/extensions/app_languages.php b/app/extensions/app_languages.php index 09da6428c7..9127337397 100644 --- a/app/extensions/app_languages.php +++ b/app/extensions/app_languages.php @@ -377,11 +377,6 @@ $text['description-user_context']['pt-pt'] = "Introduza o contexto do utilizador aqui."; $text['description-user_context']['fr-fr'] = "Insérer le contexte utilisateur. Surpasse le contexte du domaine. "; - $text['label-show_advanced']['en-us'] = "Show Advanced"; - $text['label-show_advanced']['es-cl'] = "Mostrar Avanzados"; - $text['label-show_advanced']['pt-pt'] = "Mostrar Opções Avançadas"; - $text['label-show_advanced']['fr-fr'] = "Paramètres Avancés"; - $text['button-advanced']['en-us'] = "Advanced"; $text['button-advanced']['es-cl'] = "Avanzado"; $text['button-advanced']['pt-pt'] = "Avançadas"; diff --git a/app/extensions/extension_edit.php b/app/extensions/extension_edit.php index 7ef26e6804..1b8788c33b 100644 --- a/app/extensions/extension_edit.php +++ b/app/extensions/extension_edit.php @@ -754,20 +754,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "}\n"; echo "\n"; echo "function show_advanced_config() {\n"; - echo " document.getElementById(\"show_advanced_box\").innerHTML='';\n"; - echo " document.getElementById('auth_acl').style.display = \"table-row\";\n"; - echo " document.getElementById('cidr').style.display = \"table-row\";\n"; - echo " document.getElementById('sip_force_contact').style.display = \"table-row\";\n"; - echo " document.getElementById('sip_force_expires').style.display = \"table-row\";\n"; - echo " document.getElementById('nibble_account').style.display = \"table-row\";\n"; - echo " document.getElementById('mwi_account').style.display = \"table-row\";\n"; - echo " document.getElementById('sip_bypass_media').style.display = \"table-row\";\n"; - echo " document.getElementById('dial_string').style.display = \"table-row\";\n"; - echo "}\n"; - echo "\n"; - echo "function hide_advanced_config() {\n"; - echo " document.getElementById(\"show_advanced_box\").innerHTML='';\n"; - echo " document.getElementById('show_advanced').style.display = \"none\";\n"; + echo " $('#show_advanced_box').slideToggle();\n"; + echo " $('#show_advanced').slideToggle();\n"; echo "}\n"; echo "\n"; echo "function copy_extension() {\n"; @@ -1593,26 +1581,35 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { //--- begin: show_advanced ----------------------- + echo "\n"; + echo "\n"; - echo "\n"; - echo " ".$text['label-show_advanced']."\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "\n"; + echo "
\n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo " \n"; + echo "
 \n"; + echo " \n"; + echo "
\n"; + echo "
\n"; - echo "\n"; - echo "\n"; + echo "
\n"; + echo " \n"; + + echo "\n"; + echo "\n"; - echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -1623,7 +1620,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -1645,7 +1642,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -1656,7 +1653,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -1667,7 +1664,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -1678,7 +1675,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -1700,7 +1697,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; @@ -1711,6 +1708,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; + echo "
\n"; echo " ".$text['label-auth_acl'].":\n"; echo "\n"; + echo "\n"; echo " \n"; echo "
\n"; echo $text['description-auth_acl']."\n"; echo "
\n"; echo " ".$text['label-cidr'].":\n"; echo "
\n"; echo " ".$text['label-sip_force_contact'].":\n"; echo "
\n"; echo " ".$text['label-sip_force_expires'].":\n"; echo "
\n"; echo " ".$text['label-nibble_account'].":\n"; echo "
\n"; echo " ".$text['label-mwi_account'].":\n"; echo "
\n"; echo " ".$text['label-sip_bypass_media'].":\n"; echo "
\n"; echo " ".$text['label-dial_string'].":\n"; echo "
\n"; + echo "
"; + + echo "\n"; + echo "\n"; + //--- end: show_advanced ----------------------- if (permission_exists('extension_enabled')) { diff --git a/app/gateways/app_languages.php b/app/gateways/app_languages.php index dbf3ffb343..588aad270a 100644 --- a/app/gateways/app_languages.php +++ b/app/gateways/app_languages.php @@ -377,11 +377,6 @@ $text['button-advanced']['pt-pt'] = "Avançadas"; $text['button-advanced']['fr-fr'] = "Afficher les Paramètres Avancés"; - $text['button-advanced-show']['en-us'] = "Show Advanced"; - $text['button-advanced-show']['es-cl'] = "Mostrar Avanzado"; - $text['button-advanced-show']['pt-pt'] = "Mostrar Avançadas"; - $text['button-advanced-show']['fr-fr'] = "Paramètres Avancés"; - $text['confirm-delete']['en-us'] = "Do you really want to delete this?"; $text['confirm-delete']['es-cl'] = "¿Realmente desea eliminar esto?"; $text['confirm-delete']['pt-pt'] = "Deseja realmente remover isto?"; diff --git a/app/gateways/gateway_edit.php b/app/gateways/gateway_edit.php index 79283e0cad..042453a6da 100644 --- a/app/gateways/gateway_edit.php +++ b/app/gateways/gateway_edit.php @@ -344,15 +344,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "}\n"; echo "\n"; echo "function show_advanced_config() {\n"; - echo " document.getElementById(\"show_advanced_box\").innerHTML='';\n"; - echo " aodiv = document.getElementById('show_advanced');\n"; - echo " aodiv.style.display = \"block\";\n"; - echo "}\n"; - echo "\n"; - echo "function hide_advanced_config() {\n"; - echo " document.getElementById(\"show_advanced_box\").innerHTML='';\n"; - echo " aodiv = document.getElementById('show_advanced');\n"; - echo " aodiv.style.display = \"block\";\n"; + echo " $('#show_advanced_box').slideToggle();\n"; + echo " $('#show_advanced').slideToggle();\n"; echo "}\n"; echo ""; @@ -523,7 +516,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; diff --git a/app/ivr_menu/app_languages.php b/app/ivr_menu/app_languages.php index bb49931b82..8ef82f26a8 100644 --- a/app/ivr_menu/app_languages.php +++ b/app/ivr_menu/app_languages.php @@ -173,11 +173,6 @@ $text['label-description']['pt-pt'] = "Descrição"; $text['label-description']['fr-fr'] = "Description"; - $text['label-advanced']['en-us'] = "Show Advanced"; - $text['label-advanced']['es-cl'] = "Mostrar Avanzados"; - $text['label-advanced']['pt-pt'] = "Opções Avançadas"; - $text['label-advanced']['fr-fr'] = "Paramètres Avancés"; - $text['label-option']['en-us'] = "Option"; $text['label-option']['es-cl'] = "Opción"; $text['label-option']['pt-pt'] = "Opção"; diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php index ea0cabd15b..45343a1e86 100644 --- a/app/ivr_menu/ivr_menu_edit.php +++ b/app/ivr_menu/ivr_menu_edit.php @@ -366,15 +366,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "}\n"; echo "\n"; echo "function show_advanced_config() {\n"; - echo " document.getElementById(\"show_advanced_box\").innerHTML='';\n"; - echo " aodiv = document.getElementById('show_advanced');\n"; - echo " aodiv.style.display = \"block\";\n"; - echo "}\n"; - echo "\n"; - echo "function hide_advanced_config() {\n"; - echo " document.getElementById(\"show_advanced_box\").innerHTML='';\n"; - echo " aodiv = document.getElementById('show_advanced');\n"; - echo " aodiv.style.display = \"block\";\n"; + echo " $('#show_advanced_box').slideToggle();\n"; + echo " $('#show_advanced').slideToggle();\n"; echo "}\n"; echo ""; @@ -834,7 +827,7 @@ for ($c = 0; $c < 1; $c++) { echo "
\n"; echo "
".$text['button-advanced-show']." \n"; echo " \n"; echo "
\n"; echo " \n"; - echo " \n"; + echo " \n"; echo " \n"; diff --git a/app/time_conditions/app_languages.php b/app/time_conditions/app_languages.php index 7cdd5151e7..029dd854b6 100644 --- a/app/time_conditions/app_languages.php +++ b/app/time_conditions/app_languages.php @@ -169,10 +169,6 @@ $text['description-week-of-month']['fr-fr'] = "Choisir le numéro de la semaine dans le mois"; //begin: show_advanced - $text['label-show-advanced']['en-us'] = "Show Advanced"; - $text['label-show-advanced']['es-cl'] = "Ver Avanzadas"; - $text['label-show-advanced']['pt-pt'] = "Opções Avançadas"; - $text['label-show-advanced']['fr-fr'] = "Paramètres avancés"; $text['button-advanced']['en-us'] = "Advanced"; $text['button-advanced']['es-cl'] = "Avanzadas"; diff --git a/app/time_conditions/time_condition_add.php b/app/time_conditions/time_condition_add.php index df48cb8ba5..ead726e3c8 100644 --- a/app/time_conditions/time_condition_add.php +++ b/app/time_conditions/time_condition_add.php @@ -494,15 +494,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
".$text['label-advanced']." \n"; echo " \n"; echo "