From 596c6a2b0242587cf217c3673ab0632a839af037 Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Sat, 26 Apr 2014 23:37:41 +0000 Subject: [PATCH] Submit button also placed at top; reordered to right margin, too. --- app/call_block/call_block_edit.php | 5 ++++- app/call_broadcast/call_broadcast_edit.php | 1 + app/call_center/call_center_agent_edit.php | 5 ++++- app/call_center/call_center_agent_status.php | 2 +- app/call_center/call_center_agents.php | 2 +- app/call_center/call_center_queue_edit.php | 3 ++- app/call_center/call_center_tier_edit.php | 5 ++++- app/call_flows/call_flow_edit.php | 5 ++++- app/calls/call_edit.php | 1 + .../conference_center_edit.php | 3 ++- .../conference_room_edit.php | 3 ++- app/contacts/contact_address_edit.php | 5 ++++- app/contacts/contact_edit.php | 18 ++++++++++-------- app/contacts/contact_import.php | 1 + app/contacts/contact_note_edit.php | 5 ++++- app/contacts/contact_phone_edit.php | 5 ++++- app/fax/fax_edit.php | 2 +- app/fax/fax_view.php | 2 +- app/fifo/fifo_add.php | 1 + app/hot_desking/extension_edit.php | 2 +- app/ivr_menu/ivr_menu_edit.php | 4 ++-- app/ivr_menu/ivr_menu_option_edit.php | 5 ++++- app/recordings/recording_edit.php | 5 ++++- .../ring_group_destination_edit.php | 7 +++++-- app/ring_groups/ring_group_edit.php | 2 +- app/ring_groups/ring_group_forward_edit.php | 1 + app/schemas/schema_edit.php | 1 + app/schemas/schema_field_edit.php | 5 ++++- app/schemas/schema_name_value_edit.php | 5 ++++- app/time_conditions/time_condition_add.php | 1 + app/voicemail_greetings/app_languages.php | 7 +------ .../voicemail_greetings.php | 10 ++++------ app/voicemails/voicemail_edit.php | 1 + app/xml_cdr/xml_cdr_search.php | 8 ++++++-- 34 files changed, 92 insertions(+), 46 deletions(-) diff --git a/app/call_block/call_block_edit.php b/app/call_block/call_block_edit.php index c92ab1b0e9..34604fb4a1 100644 --- a/app/call_block/call_block_edit.php +++ b/app/call_block/call_block_edit.php @@ -204,7 +204,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo "".$text['label-edit-edit']."\n"; } - echo "\n"; + echo ""; + echo " "; + echo " \n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/call_broadcast/call_broadcast_edit.php b/app/call_broadcast/call_broadcast_edit.php index 809779c36d..2beece45cd 100644 --- a/app/call_broadcast/call_broadcast_edit.php +++ b/app/call_broadcast/call_broadcast_edit.php @@ -224,6 +224,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "".$text['label-call-broadcast']."\n"; echo "\n"; echo " \n"; + echo " \n"; echo "\n"; echo "\n"; diff --git a/app/call_center/call_center_agent_edit.php b/app/call_center/call_center_agent_edit.php index 6dea7c1150..8a408c3faa 100644 --- a/app/call_center/call_center_agent_edit.php +++ b/app/call_center/call_center_agent_edit.php @@ -324,7 +324,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo "".$text['header-call_center_agent_edit']."\n"; } - echo "\n"; + echo ""; + echo " "; + echo " \n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/call_center/call_center_agent_status.php b/app/call_center/call_center_agent_status.php index b0402b54a6..0bb8251bc7 100644 --- a/app/call_center/call_center_agent_status.php +++ b/app/call_center/call_center_agent_status.php @@ -140,8 +140,8 @@ require_once "resources/paging.php"; echo "\n"; echo "".$text['header-call_center_agent_status']."\n"; echo "\n"; - echo " \n"; echo " \n"; + echo " \n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/call_center/call_center_agents.php b/app/call_center/call_center_agents.php index 500f59b647..938393e23a 100644 --- a/app/call_center/call_center_agents.php +++ b/app/call_center/call_center_agents.php @@ -60,8 +60,8 @@ require_once "resources/paging.php"; echo "\n"; echo "".$text['header-call_center_agents']."\n"; echo "\n"; - echo " \n"; echo " \n"; + echo " \n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/call_center/call_center_queue_edit.php b/app/call_center/call_center_queue_edit.php index e5c03d6aba..3e2c329da7 100644 --- a/app/call_center/call_center_queue_edit.php +++ b/app/call_center/call_center_queue_edit.php @@ -311,13 +311,14 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "".$text['header-call_center_queue_edit']."\n"; } echo "\n"; + echo " \n"; if ($action == "update") { echo " \n"; echo " \n"; echo " \n"; echo " \n"; } - echo " \n"; + echo " \n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/call_center/call_center_tier_edit.php b/app/call_center/call_center_tier_edit.php index c7d4cf9144..42668eb1a1 100644 --- a/app/call_center/call_center_tier_edit.php +++ b/app/call_center/call_center_tier_edit.php @@ -210,7 +210,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo "".$text['header-call_center_tier_edit']."\n"; } - echo "\n"; + echo ""; + echo " "; + echo " \n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/call_flows/call_flow_edit.php b/app/call_flows/call_flow_edit.php index 914382a189..3c2952d5dc 100644 --- a/app/call_flows/call_flow_edit.php +++ b/app/call_flows/call_flow_edit.php @@ -447,7 +447,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo $text['header-call_flow-add']; } echo "\n"; - echo "\n"; + echo ""; + echo " "; + echo " \n"; + echo "\n"; echo "\n"; echo "\n"; diff --git a/app/calls/call_edit.php b/app/calls/call_edit.php index 31dde33f0b..32adc27dbf 100644 --- a/app/calls/call_edit.php +++ b/app/calls/call_edit.php @@ -471,6 +471,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; echo " \n"; + echo " \n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/conference_centers/conference_center_edit.php b/app/conference_centers/conference_center_edit.php index d1e6c03769..d3fc192bf8 100644 --- a/app/conference_centers/conference_center_edit.php +++ b/app/conference_centers/conference_center_edit.php @@ -369,10 +369,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "".$text['title-conference-center']."\n"; echo "\n"; + echo " \n"; if (permission_exists('conference_active_advanced_view')) { echo " \n"; } - echo " \n"; + echo " \n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/conference_centers/conference_room_edit.php b/app/conference_centers/conference_room_edit.php index 626408a7f2..d6ed249006 100644 --- a/app/conference_centers/conference_room_edit.php +++ b/app/conference_centers/conference_room_edit.php @@ -503,11 +503,12 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "".$text['title-conference-rooms']."\n"; echo "\n"; + echo " \n"; if (strlen($meeting_uuid) > 0) { echo " \n"; echo " \n"; } - echo " \n"; + echo " \n"; echo "
\n"; echo "
\n"; echo "\n"; diff --git a/app/contacts/contact_address_edit.php b/app/contacts/contact_address_edit.php index 9cb79df39b..a37bf94b20 100644 --- a/app/contacts/contact_address_edit.php +++ b/app/contacts/contact_address_edit.php @@ -224,7 +224,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo $text['header-contact_addresses-add']; } echo "\n"; - echo "\n"; + echo ""; + echo " "; + echo " \n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/contacts/contact_edit.php b/app/contacts/contact_edit.php index 83e1613c72..0b1b0f6809 100644 --- a/app/contacts/contact_edit.php +++ b/app/contacts/contact_edit.php @@ -223,6 +223,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { } echo "\n"; echo "\n"; + echo " \n"; if ($action == "update") { echo " \n"; echo " \n"; @@ -230,7 +231,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update" && is_dir($_SERVER["DOCUMENT_ROOT"].PROJECT_PATH.'/app/invoices')) { echo " \n"; } - echo " \n"; + echo " \n"; echo "\n"; echo "\n"; echo "\n"; @@ -251,7 +252,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; echo "\n"; echo "\n"; - echo "\n"; echo "\n"; - echo ""; - echo ""; + echo "\n"; + } - echo "\n"; echo "\n"; echo "
\n"; + echo "\n"; echo " ".$text['label-contact_type'].":\n"; echo "\n"; @@ -533,16 +534,17 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo ""; echo "  \n"; - //echo "

\n"; - if ($action == "update") { + + if ($action == "update") { + echo "		  \n"; + //echo "

\n"; require "contact_phones.php"; require "contact_addresses.php"; require "contact_notes.php"; - } + echo "
\n"; diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php index 3c70d99414..c4f8cb68f8 100644 --- a/app/contacts/contact_import.php +++ b/app/contacts/contact_import.php @@ -365,6 +365,7 @@ else { echo " \n"; echo " \n"; echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo ""; diff --git a/app/contacts/contact_note_edit.php b/app/contacts/contact_note_edit.php index 0f5554358d..c6660b761f 100644 --- a/app/contacts/contact_note_edit.php +++ b/app/contacts/contact_note_edit.php @@ -179,7 +179,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo "".$text['header-contact_notes-edit']."\n"; } - echo "\n"; + echo ""; + echo " "; + echo " \n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/contacts/contact_phone_edit.php b/app/contacts/contact_phone_edit.php index bda49e3c3d..a25094fbd1 100644 --- a/app/contacts/contact_phone_edit.php +++ b/app/contacts/contact_phone_edit.php @@ -184,7 +184,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo $text['header-contact_phones-add']; } echo "\n"; - echo "\n"; + echo ""; + echo " "; + echo " \n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php index 5d3a3979a6..3a97ab8047 100644 --- a/app/fax/fax_edit.php +++ b/app/fax/fax_edit.php @@ -532,8 +532,8 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "".$text['confirm-fax-edit']."\n"; } echo "\n"; - echo " \n"; echo " \n"; + echo " \n"; echo " \n"; echo "\n"; echo "\n"; diff --git a/app/fax/fax_view.php b/app/fax/fax_view.php index 97b6209069..e025c097bc 100644 --- a/app/fax/fax_view.php +++ b/app/fax/fax_view.php @@ -386,10 +386,10 @@ else { echo " ".$text['title']."\n"; echo " \n"; echo " \n"; + echo " \n"; if (permission_exists('fax_extension_add') || permission_exists('fax_extension_edit')) { echo " \n"; } - echo " \n"; echo " \n"; echo "\n"; echo "\n"; diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php index fc0491db0a..0bf6bcdd88 100644 --- a/app/fifo/fifo_add.php +++ b/app/fifo/fifo_add.php @@ -282,6 +282,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " ".$text['header-queue_add']."\n"; echo " \n"; echo " \n"; + echo " \n"; echo " \n"; echo " \n"; echo " \n"; diff --git a/app/hot_desking/extension_edit.php b/app/hot_desking/extension_edit.php index c0d13422bb..2b2b1b2a39 100644 --- a/app/hot_desking/extension_edit.php +++ b/app/hot_desking/extension_edit.php @@ -243,8 +243,8 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo " ".$text['header-hot_desking']."\n"; echo " \n"; echo " \n"; - echo " \n"; echo " \n"; + echo " \n"; echo " \n"; echo "\n"; diff --git a/app/ivr_menu/ivr_menu_edit.php b/app/ivr_menu/ivr_menu_edit.php index d3c8aa2a75..8318a466f2 100644 --- a/app/ivr_menu/ivr_menu_edit.php +++ b/app/ivr_menu/ivr_menu_edit.php @@ -390,9 +390,9 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo " ".$text['header-ivr_menu']."\n"; echo " \n"; - echo " \n"; - echo " \n"; echo " \n"; + echo " \n"; + echo " \n"; echo " \n"; echo "\n"; echo "\n"; diff --git a/app/ivr_menu/ivr_menu_option_edit.php b/app/ivr_menu/ivr_menu_option_edit.php index 0cd27aa3a1..85bdd973f0 100644 --- a/app/ivr_menu/ivr_menu_option_edit.php +++ b/app/ivr_menu/ivr_menu_option_edit.php @@ -199,7 +199,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo "".$text['header-option_edit']."\n"; } - echo "\n"; + echo ""; + echo " "; + echo " \n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/recordings/recording_edit.php b/app/recordings/recording_edit.php index 5f606b292c..c1a3d1a185 100644 --- a/app/recordings/recording_edit.php +++ b/app/recordings/recording_edit.php @@ -201,7 +201,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo "".$text['title-edit']."\n"; } - echo "\n"; + echo ""; + echo " "; + echo " \n"; + echo "\n"; echo "\n"; echo "\n"; diff --git a/app/ring_groups/ring_group_destination_edit.php b/app/ring_groups/ring_group_destination_edit.php index 0a0631c149..ae41613be0 100644 --- a/app/ring_groups/ring_group_destination_edit.php +++ b/app/ring_groups/ring_group_destination_edit.php @@ -195,8 +195,11 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
\n"; echo "\n"; echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo "\n"; diff --git a/app/ring_groups/ring_group_edit.php b/app/ring_groups/ring_group_edit.php index b96a676f45..fbb2a7b7bb 100644 --- a/app/ring_groups/ring_group_edit.php +++ b/app/ring_groups/ring_group_edit.php @@ -406,8 +406,8 @@ else { echo "\n"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/ring_groups/ring_group_forward_edit.php b/app/ring_groups/ring_group_forward_edit.php index e105ad6e8a..7bbbcabbb5 100644 --- a/app/ring_groups/ring_group_forward_edit.php +++ b/app/ring_groups/ring_group_forward_edit.php @@ -125,6 +125,7 @@ require_once "resources/check_auth.php"; echo "\n"; echo "\n"; echo "\n"; echo "\n"; diff --git a/app/schemas/schema_edit.php b/app/schemas/schema_edit.php index d84e79c9b1..2a3956811e 100644 --- a/app/schemas/schema_edit.php +++ b/app/schemas/schema_edit.php @@ -196,6 +196,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { } include "export/index.php"; echo " \n"; + echo " \n"; echo "\n"; echo "\n"; diff --git a/app/schemas/schema_field_edit.php b/app/schemas/schema_field_edit.php index 6dc26813b6..4f630f5e22 100644 --- a/app/schemas/schema_field_edit.php +++ b/app/schemas/schema_field_edit.php @@ -215,7 +215,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo "
".$text['title-ring_group_destination']."".$text['title-ring_group_destination'].""; + echo " "; + echo " \n"; + echo "
".$text['label-ring-group']."\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"; diff --git a/app/voicemail_greetings/app_languages.php b/app/voicemail_greetings/app_languages.php index 26a77afd48..5d2529592a 100644 --- a/app/voicemail_greetings/app_languages.php +++ b/app/voicemail_greetings/app_languages.php @@ -11,11 +11,6 @@ $text['description']['pt-pt'] = "Escolha e active uma mensagem de saudação a aplicar na extensão:"; $text['description']['fr-fr'] = "Choisir le message de salutation à jouer pour l'extension:"; - $text['label-upload']['en-us'] = "File to Upload"; - $text['label-upload']['es-cl'] = "Archivo a subir"; - $text['label-upload']['pt-pt'] = "Ficheiro a Carregar"; - $text['label-upload']['fr-fr'] = "Fichier à télécharger"; - $text['table-choose']['en-us'] = "Choose"; $text['table-choose']['es-cl'] = "Escoger"; $text['table-choose']['pt-pt'] = "Escolher"; @@ -46,7 +41,7 @@ $text['button-back']['pt-pt'] = "Voltar"; $text['button-back']['fr-fr'] = "Retour"; - $text['button-save']['en-us'] = "Save"; + $text['button-save']['en-us'] = "Upload"; $text['button-save']['es-cl'] = "Guardar"; $text['button-save']['pt-pt'] = "Guardar"; $text['button-save']['fr-fr'] = "Sauvegarder"; diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php index 6996d1f103..f447614c4f 100644 --- a/app/voicemail_greetings/voicemail_greetings.php +++ b/app/voicemail_greetings/voicemail_greetings.php @@ -228,16 +228,14 @@ else { echo "
".$text['header-field'].""; + echo " "; + echo " \n"; + echo "
\n"; diff --git a/app/schemas/schema_name_value_edit.php b/app/schemas/schema_name_value_edit.php index 70e3c56a21..92a60b89db 100644 --- a/app/schemas/schema_name_value_edit.php +++ b/app/schemas/schema_name_value_edit.php @@ -178,7 +178,10 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { if ($action == "update") { echo "".$text['header-name_value']." ".$text['button-edit'].""; + echo " "; + echo " \n"; + echo "
\n"; diff --git a/app/time_conditions/time_condition_add.php b/app/time_conditions/time_condition_add.php index d8a9a3d0e4..7f73163d0b 100644 --- a/app/time_conditions/time_condition_add.php +++ b/app/time_conditions/time_condition_add.php @@ -738,6 +738,7 @@ echo " ".$text['title-time-condition-add']."
\n"; echo " 		\n"; echo " \n"; +echo " \n"; echo "
\n"; echo " \n"; - echo " "; - echo " \n"; echo " "; echo " "; diff --git a/app/voicemails/voicemail_edit.php b/app/voicemails/voicemail_edit.php index f7969d8f73..3be70a16d4 100644 --- a/app/voicemails/voicemail_edit.php +++ b/app/voicemails/voicemail_edit.php @@ -262,6 +262,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; echo "\n"; echo "\n"; diff --git a/app/xml_cdr/xml_cdr_search.php b/app/xml_cdr/xml_cdr_search.php index 85b79030b1..affa8e4dbf 100644 --- a/app/xml_cdr/xml_cdr_search.php +++ b/app/xml_cdr/xml_cdr_search.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Copyright (C) 2008-2012 + Copyright (C) 2008-2012 All Rights Reserved. Contributor(s): @@ -68,7 +68,11 @@ else { echo "\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo " ";
\n"; + echo " \n"; echo " ".$text['title']."
\n"; echo " 		\n"; - echo " \n"; - echo " \n"; + echo " \n"; + echo "      \n"; + echo " \n"; echo " \n"; echo " \n"; - echo "    \n"; - echo " \n"; echo "
".$text['title-voicemail']."\n"; echo " \n"; + echo " \n"; echo "
Advanced Search

"; + echo " "; + echo " "; + echo "

"; + echo "