From ded7cb3266415936a3d062d21b6e805a747b4d3f Mon Sep 17 00:00:00 2001 From: Nate Jones Date: Sun, 15 Feb 2015 11:57:14 +0000 Subject: [PATCH] Visual adjustments. --- app/call_center_active/call_center_active.php | 1 + app/call_center_active/call_center_queue.php | 1 + app/calls_active/calls_active.php | 18 ++--- .../conference_center_edit.php | 9 ++- app/conference_centers/conference_centers.php | 2 +- app/conferences/conference_edit.php | 4 +- app/conferences_active/conferences_active.php | 11 ++- app/contacts/contact_address_edit.php | 1 + app/contacts/contact_edit.php | 1 + app/contacts/contact_email_edit.php | 1 + app/contacts/contact_import.php | 54 +------------- app/contacts/contact_note_edit.php | 1 + app/contacts/contact_phone_edit.php | 1 + app/contacts/contact_setting_edit.php | 1 + app/contacts/contact_url_edit.php | 1 + app/contacts/contacts.php | 1 + app/exec/app_languages.php | 11 ++- app/exec/exec.php | 32 ++++---- app/fax/fax.php | 9 +-- app/fifo/fifo_add.php | 10 +-- app/fifo_list/fifo_interactive.php | 6 +- app/fifo_list/fifo_list.php | 9 ++- app/fifo_list/fifo_list_inc.php | 24 +++--- app/hot_desking/extension_edit.php | 7 ++ app/music_on_hold/app_languages.php | 5 ++ app/music_on_hold/music_on_hold.php | 27 +++---- app/phrases/phrase_edit.php | 1 + app/recordings/app_languages.php | 7 +- app/recordings/recordings.php | 29 +++----- app/services/service_edit.php | 1 + app/sip_status/app_languages.php | 10 +++ app/sip_status/sip_status.php | 15 +++- app/system/app_languages.php | 10 +++ app/system/system.php | 38 +++------- app/traffic_graph/status_graph.php | 8 +- app/voicemails/voicemail_edit.php | 1 + app/xml_cdr/xml_cdr_statistics.php | 1 + core/apps/apps.php | 15 +--- core/default_settings/default_settings.php | 10 +-- core/domain_settings/domain_edit.php | 3 +- core/domain_settings/domain_settings.php | 2 +- core/users/group_permissions.php | 22 ++++-- core/users/groupmembers.php | 73 ++++++++----------- core/users/groups.php | 18 +++-- core/users/index.php | 9 --- core/users/users.php | 6 +- 46 files changed, 252 insertions(+), 275 deletions(-) diff --git a/app/call_center_active/call_center_active.php b/app/call_center_active/call_center_active.php index 09361650f7..0e69c68aac 100644 --- a/app/call_center_active/call_center_active.php +++ b/app/call_center_active/call_center_active.php @@ -112,6 +112,7 @@ function send_cmd(url) { \n"; +echo "

"; require_once "resources/footer.php"; ?> diff --git a/app/call_center_active/call_center_queue.php b/app/call_center_active/call_center_queue.php index 106cc0e555..b5d596e50a 100644 --- a/app/call_center_active/call_center_queue.php +++ b/app/call_center_active/call_center_queue.php @@ -161,6 +161,7 @@ else { echo "\n"; echo ""; + echo "

"; //show the footer require_once "resources/footer.php"; diff --git a/app/calls_active/calls_active.php b/app/calls_active/calls_active.php index 3124d0300c..ef2fb98241 100644 --- a/app/calls_active/calls_active.php +++ b/app/calls_active/calls_active.php @@ -113,10 +113,13 @@ var destination; echo "\n"; echo " \n"; -echo " \n"; -echo " "; - echo ""; - echo "
".$text['title']."
\n"; +echo " 		"; +echo " ".$text['title'].""; +echo "

\n"; echo " ".$text['description']."\n"; +echo "

\n"; echo " 		\n"; +echo " \n"; echo " \n"; echo " \n"; echo " \n"; echo "
\n"; @@ -133,14 +136,9 @@ echo "
\n"; -echo "\n"; -echo " \n"; -echo " "; -echo " "; -echo "
\n"; -echo "
\n"; -echo "
".date('Y-m-d-s')."
\n"; -echo "
"; +echo "
\n"; +echo "
".date('Y-m-d-s')."
\n"; +echo "


"; echo ""; //show the header - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "\n"; + echo "".$text['label-execute']."\n"; + echo "

"; + echo $text['description-execute']."\n"; + echo "

"; + //show the result + echo "\n"; + echo "
".$text['label-execute']."
\n"; - echo " ".$text['description-execute']."\n"; - echo "
\n"; - echo "
\n"; - echo "
\n"; if (count($_POST)>0) { echo " \n"; echo " \n"; echo "\n"; echo "\n"; @@ -169,7 +164,7 @@ else { echo " ".$text['label-php']."\n"; echo "\n"; echo "\n"; @@ -181,7 +176,7 @@ else { echo " ".$text['label-switch']."\n"; echo "\n"; echo "\n"; @@ -189,12 +184,13 @@ else { } echo " \n"; echo " \n"; echo " "; - echo ""; - echo "
\n"; @@ -149,15 +146,13 @@ else { } //html form - echo "\n"; - if (permission_exists('exec_command_line')) { echo "
\n"; echo " ".$text['label-shell']."\n"; echo "\n"; - echo " \n"; echo "
\n"; echo " ".$text['description-shell']."\n"; echo "		\n"; - echo " \n"; echo "
\n"; echo " ".$text['description-php']."\n"; echo "		\n"; - echo " \n"; echo "
\n"; echo " ".$text['description-switch']."\n"; echo "
\n"; + echo "
"; echo " \n"; echo "
"; + echo "

"; + echo ""; //show the footer require_once "resources/footer.php"; diff --git a/app/fax/fax.php b/app/fax/fax.php index 32248b1faf..d0baf34a3c 100644 --- a/app/fax/fax.php +++ b/app/fax/fax.php @@ -48,7 +48,8 @@ require_once "resources/paging.php"; echo "\n"; echo " \n"; echo " \n"; echo " \n"; @@ -195,12 +196,6 @@ require_once "resources/paging.php"; echo "\n"; echo "
\n"; - echo " ".$text['title']."

\n"; + echo " ".$text['title'].""; + echo "

\n"; echo " ".$text['description']."\n"; echo "
"; echo "

"; - echo "

"; - echo "

"; - - echo "
"; //show the footer require_once "resources/footer.php"; diff --git a/app/fifo/fifo_add.php b/app/fifo/fifo_add.php index 6b770da33d..6a61b10f88 100644 --- a/app/fifo/fifo_add.php +++ b/app/fifo/fifo_add.php @@ -310,7 +310,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " ".$text['label-name']."\n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo "
\n"; echo " ".$text['description-name']."\n"; echo " \n"; @@ -321,7 +321,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " ".$text['label-extension']."\n"; echo " \n"; echo " \n"; - echo " \n"; + echo " \n"; echo "
\n"; echo " ".$text['description-extension']."\n"; echo " \n"; @@ -375,7 +375,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " ".$text['label-description']."\n"; echo "\n"; echo "\n"; - echo " \n"; + echo " \n"; echo "
\n"; echo "\n"; echo "\n"; @@ -396,7 +396,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " ".$text['label-agent_queue_extension']."\n"; echo "\n"; echo "\n"; - echo " \n"; + echo " \n"; echo "
\n"; echo $text['description-agent_queue_extension']."\n"; echo "\n"; @@ -407,7 +407,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " ".$text['label-agent_loginout_extension']."\n"; echo "\n"; echo "\n"; - echo " \n"; + echo " \n"; echo "
\n"; echo $text['description-agent_loginout_extension']."\n"; echo "\n"; diff --git a/app/fifo_list/fifo_interactive.php b/app/fifo_list/fifo_interactive.php index 4afb36b102..3f1f349a1e 100644 --- a/app/fifo_list/fifo_interactive.php +++ b/app/fifo_list/fifo_interactive.php @@ -125,14 +125,18 @@ var record_count = 0; \n"; echo " \n"; -echo " ".$text['header-queue']."
\n"; +echo " "; +echo " ".$text['header-queue'].""; +echo "

\n"; echo " ".$text['description-queue']."\n"; echo " \n"; echo " \n"; echo "\n"; +echo "
"; echo "
\n"; echo "
".date('Y-m-d-s')."
\n"; +echo "

"; require_once "resources/footer.php"; ?> diff --git a/app/fifo_list/fifo_list.php b/app/fifo_list/fifo_list.php index 24b26dcbab..04e6e56e8d 100644 --- a/app/fifo_list/fifo_list.php +++ b/app/fifo_list/fifo_list.php @@ -94,14 +94,17 @@ else if (window.attachEvent) { \n"; echo " \n"; -echo " ".$text['header-active_queues']."
\n"; +echo " "; +echo " ".$text['header-active_queues'].""; +echo "

"; echo " ".$text['description-active_queues']."\n"; echo " \n"; echo " \n"; echo "\n"; +echo "
"; -echo "
\n"; -echo "
\n"; +echo "
\n"; +echo "

"; require_once "resources/footer.php"; ?> diff --git a/app/fifo_list/fifo_list_inc.php b/app/fifo_list/fifo_list_inc.php index e67da1962d..19bef1a297 100644 --- a/app/fifo_list/fifo_list_inc.php +++ b/app/fifo_list/fifo_list_inc.php @@ -74,7 +74,7 @@ if ($fp) { $row_style["0"] = "row_style0"; $row_style["1"] = "row_style1"; - echo "\n"; + echo "
\n"; echo "\n"; echo "\n"; echo "\n"; @@ -96,14 +96,16 @@ if ($fp) { $tmp_name_array = explode('@', $name); $tmp_name = $tmp_name_array[0]; + $td_onclick = "onclick=\"document.location.href='fifo_interactive.php?c=".$name."';\""; + if (if_group("superadmin")) { //show all fifo queues 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"; } @@ -111,11 +113,11 @@ if ($fp) { //show only the fifo queues that match the domain_name if (stripos($name, $_SESSION['domain_name']) !== false) { 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/hot_desking/extension_edit.php b/app/hot_desking/extension_edit.php index a8c6f8c8ff..86cb81dd1b 100644 --- a/app/hot_desking/extension_edit.php +++ b/app/hot_desking/extension_edit.php @@ -312,6 +312,13 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo "\n"; } + echo "\n"; + echo "\n"; + echo "\n"; + echo "
".$text['label-name']."".$text['label-consumer_count']."
".$tmp_name."".$consumer_count."".$caller_count."".$waiting_count."".$importance."".$tmp_name."".$consumer_count."".$caller_count."".$waiting_count."".$importance."$v_link_label_view
".$tmp_name."".$consumer_count."".$caller_count."".$waiting_count."".$importance."".$tmp_name."".$consumer_count."".$caller_count."".$waiting_count."".$importance."$v_link_label_view
\n"; + echo "
"; + echo " \n"; + echo "
"; echo "

"; echo ""; diff --git a/app/music_on_hold/app_languages.php b/app/music_on_hold/app_languages.php index 27ef119a68..99746830a2 100644 --- a/app/music_on_hold/app_languages.php +++ b/app/music_on_hold/app_languages.php @@ -26,6 +26,11 @@ Philippe Rioual */ + $text['title-moh']['en-us'] = "Music on Hold"; + $text['title-moh']['es-cl'] = "Musica en Espera"; + $text['title-moh']['pt-pt'] = "Música em Espera"; + $text['title-moh']['fr-fr'] = "Musique de Garde"; + $text['label-moh']['en-us'] = "Music on Hold"; $text['label-moh']['es-cl'] = "Musica en Espera"; $text['label-moh']['pt-pt'] = "Música em Espera"; diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php index 79ae0f65f0..21e33d7879 100644 --- a/app/music_on_hold/music_on_hold.php +++ b/app/music_on_hold/music_on_hold.php @@ -242,23 +242,22 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { //include the header require_once "resources/header.php"; + $document['title'] = $text['title-moh']; //show the title and description echo "\n"; - echo "
\n"; echo "\n"; echo " \n"; echo " \n"; echo " \n"; echo "
\n"; - echo " ".$text['label-moh']."
\n"; + echo " ".$text['label-moh'].""; + echo "

\n"; echo " ".$text['desc-moh']."\n"; echo "

\n"; echo "
\n"; - echo "\n"; - echo "

\n"; - echo "\n"; + echo "
\n"; //show the upload form if (permission_exists('music_on_hold_add')) { @@ -266,13 +265,13 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) { 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/phrases/phrase_edit.php b/app/phrases/phrase_edit.php index 6a00983b68..8b1b57cf77 100644 --- a/app/phrases/phrase_edit.php +++ b/app/phrases/phrase_edit.php @@ -456,6 +456,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo ""; echo "
\n"; - echo " ".$text['label-file-path']."
\n"; - echo " \n"; + echo " 		\n"; + echo " ".$text['label-file-path']; + echo " \n"; echo " ".$text['label-sampling']."
\n"; + echo " 		".$text['label-sampling'].""; echo " \n"; echo " ".$text['label-category']."
\n"; + echo " 		".$text['label-category'].""; echo " \n"; echo " "; echo "  
\n"; - echo " "; - echo " 		 
\n"; + echo " 		\n"; echo " \n"; echo "
"; + echo "

"; echo "
"; //include the footer diff --git a/app/recordings/app_languages.php b/app/recordings/app_languages.php index 787b508609..29d0fe1f13 100644 --- a/app/recordings/app_languages.php +++ b/app/recordings/app_languages.php @@ -41,7 +41,12 @@ $text['description']['pt-pt'] = "Para fazer uma gravação marque *732 ou crie um ficheiro WAV de 16bit 8khz/16khz e copie-o para a seguinte directoria e actualize a página para o ouvir. Clique em \'Filename\' para descarregá-lo ou em \'Recording Name\' para ouvir o áudio."; $text['description']['fr-fr'] = "Pour créer un guide vocal, composer le *732 ou créer un fichier audio WAV 16bit 8khz/16khz Mono et ensuite le copier dans le répertoire qui suit. Rafraîchir ensuite cette page pour le voir apparaitre."; - $text['label-upload']['en-us'] = "File to upload"; + $text['header']['en-us'] = "Upload Recording"; + $text['header']['es-cl'] = "Subir Grabación"; + $text['header']['pt-pt'] = "Carregar Gravações"; + $text['header']['fr-fr'] = "Télécharger Enregistrement"; + + $text['label-upload']['en-us'] = "File Path"; $text['label-upload']['es-cl'] = "Archivo a subir"; $text['label-upload']['pt-pt'] = "Ficheiro a carregar"; $text['label-upload']['fr-fr'] = "Fichier à déposer"; diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php index ef722e350d..ec418d0fda 100644 --- a/app/recordings/recordings.php +++ b/app/recordings/recordings.php @@ -150,31 +150,26 @@ require_once "resources/check_auth.php"; echo "\n"; echo " \n"; echo " \n"; echo " \n"; echo "
\n"; - echo " ".$text['title']."
\n"; + echo " ".$text['title'].""; + echo "

\n"; echo " ".stripslashes($text['description'])."\n"; + echo "

\n"; echo "
"; echo "
\n"; - echo "\n"; - echo " \n"; - echo " \n"; if (permission_exists('recording_upload')) { - echo " \n"; + echo "".$text['header'].""; + echo "

"; + echo "\n"; + echo "\n"; + echo "".$text['label-upload']."\n"; + echo "\n"; + echo "\n"; + echo ""; + echo "

\n"; } - echo " \n"; - echo "
\n"; - echo "  "; - echo " \n"; - echo "
\n"; - echo " \n"; - echo " ".$text['label-upload']."\n"; - echo " \n"; - echo " \n"; - echo "
"; - echo "
"; - echo "

\n"; $sql = "select * from v_recordings "; $sql .= "where domain_uuid = '$domain_uuid' "; diff --git a/app/services/service_edit.php b/app/services/service_edit.php index 4d7cc2840a..cb64aaac3a 100644 --- a/app/services/service_edit.php +++ b/app/services/service_edit.php @@ -281,6 +281,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) { echo " \n"; echo " "; echo ""; + echo "

"; echo ""; //show the footer diff --git a/app/sip_status/app_languages.php b/app/sip_status/app_languages.php index 3b2058f7e9..5a6d95ce11 100644 --- a/app/sip_status/app_languages.php +++ b/app/sip_status/app_languages.php @@ -26,6 +26,16 @@ Philippe Rioual */ + $text['title-sip-status']['en-us'] = "SIP Status"; + $text['title-sip-status']['es-cl'] = "SIP Estado"; + $text['title-sip-status']['pt-pt'] = "SIP Estado"; + $text['title-sip-status']['fr-fr'] = "SIP État"; + + $text['header-sip-status']['en-us'] = "SIP Status"; + $text['header-sip-status']['es-cl'] = "SIP Estado"; + $text['header-sip-status']['pt-pt'] = "SIP Estado"; + $text['header-sip-status']['fr-fr'] = "SIP État"; + $text['error-event-socket']['en-us'] = "Connection to Event Socket failed."; $text['error-event-socket']['es-cl'] = "Conexión a Socket de Eventos fallida."; $text['error-event-socket']['pt-pt'] = "A ligação ao Event Socket falhou."; diff --git a/app/sip_status/sip_status.php b/app/sip_status/sip_status.php index 96e3fd13ec..ea0624cd73 100644 --- a/app/sip_status/sip_status.php +++ b/app/sip_status/sip_status.php @@ -72,6 +72,7 @@ if ($_GET['a'] == "download") { //show the content require_once "resources/header.php"; + $document['title'] = $text['title-sip-status']; $msg = $_GET["savemsg"]; $fp = event_socket_create($_SESSION['event_socket_ip_address'], $_SESSION['event_socket_port'], $_SESSION['event_socket_password']); @@ -99,7 +100,7 @@ if ($_GET['a'] == "download") { $gateways = $prep_statement->fetchAll(PDO::FETCH_NAMED); unset ($prep_statement, $sql); -//get the sip profiles +//get the sip profiles $sql = "select sip_profile_name from v_sip_profiles "; $sql .= "order by sip_profile_name asc "; $prep_statement = $db->prepare(check_sql($sql)); @@ -117,11 +118,11 @@ if ($_GET['a'] == "download") { catch(Exception $e) { echo $e->getMessage(); } - echo "
\n"; - echo "\n"; + echo "
\n"; echo "\n"; echo "\n"; echo "\n"; echo "
\n"; - echo " ".$text['title-sofia-status']." \n"; + echo " ".$text['header-sip-status'].""; + echo "

"; echo "		\n"; echo " \n"; @@ -131,6 +132,12 @@ if ($_GET['a'] == "download") { echo "
\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
".$text['title-sofia-status']."
\n"; + echo "
"; echo "\n"; echo "\n"; diff --git a/app/system/app_languages.php b/app/system/app_languages.php index 982579aa0d..50d4331750 100644 --- a/app/system/app_languages.php +++ b/app/system/app_languages.php @@ -26,6 +26,16 @@ Philippe Rioual */ + $text['title-sys-status']['en-us'] = "System Status"; + $text['title-sys-status']['es-cl'] = "Estado del Sistema"; + $text['title-sys-status']['pt-pt'] = "Status do Sistema"; + $text['title-sys-status']['fr-fr'] = "État du Système"; + + $text['header-sys-status']['en-us'] = "System Status"; + $text['header-sys-status']['es-cl'] = "Estado del Sistema"; + $text['header-sys-status']['pt-pt'] = "Status do Sistema"; + $text['header-sys-status']['fr-fr'] = "État du Système"; + $text['title-sys-info']['en-us'] = "System Information"; $text['title-sys-info']['es-cl'] = "Información de Sistema"; $text['title-sys-info']['pt-pt'] = "Informação do Sistema"; diff --git a/app/system/system.php b/app/system/system.php index 1241067e6b..eb77d27d99 100644 --- a/app/system/system.php +++ b/app/system/system.php @@ -43,9 +43,7 @@ else { $text = $language->get(); require_once "resources/header.php"; - -echo "
"; -echo "
"; +$document['title'] = $text['title-sys-status']; // OS Support // @@ -70,7 +68,10 @@ echo "
"; // //system information - echo "
\n"; + echo "".$text['header-sys-status'].""; + echo "

"; + + echo "
\n"; echo "\n"; echo " \n"; echo "\n"; @@ -123,11 +124,7 @@ echo "
"; echo " \n"; echo "\n"; echo "
".$text['title-sys-info']."
\n"; - - echo "
"; - echo "
"; - echo "
\n"; - + echo "

"; //memory information if (permission_exists('system_view_ram')) { @@ -154,9 +151,7 @@ echo "
"; echo " \n"; echo "\n"; echo "\n"; - echo "
"; - echo "
"; - echo "
"; + echo "

"; } } @@ -183,9 +178,7 @@ echo "
"; echo " \n"; echo "\n"; echo "\n"; - echo "
"; - echo "
"; - echo "
"; + echo "

"; } } } @@ -223,9 +216,7 @@ echo "
"; echo " \n"; echo "\n"; echo "\n"; - echo "
"; - echo "
"; - echo "
"; + echo "

"; } } @@ -252,9 +243,7 @@ echo "
"; echo " \n"; echo "\n"; echo "\n"; - echo "
"; - echo "
"; - echo "
"; + echo "

"; } } } @@ -319,11 +308,8 @@ echo "
"; echo " \n"; echo "\n"; echo "\n"; - echo "\n"; } - echo "
"; - echo "
"; - echo "
"; + echo "

"; } //memcache information @@ -372,7 +358,7 @@ echo "
"; } echo "\n"; - echo "


\n"; + echo "

\n"; } diff --git a/app/traffic_graph/status_graph.php b/app/traffic_graph/status_graph.php index ac9daf5847..5195248697 100644 --- a/app/traffic_graph/status_graph.php +++ b/app/traffic_graph/status_graph.php @@ -69,13 +69,14 @@ else { require_once "resources/header.php"; $document['title'] = $text['title-traffic_graph']; + ?> - +
- -\n"; echo " "; echo "
+

+
:
"; + echo "

"; echo ""; //include the footer diff --git a/app/xml_cdr/xml_cdr_statistics.php b/app/xml_cdr/xml_cdr_statistics.php index ccc08b8f48..2be98869ce 100644 --- a/app/xml_cdr/xml_cdr_statistics.php +++ b/app/xml_cdr/xml_cdr_statistics.php @@ -219,6 +219,7 @@ else { $i++; } echo "\n"; + echo "

"; //show the footer require_once "resources/footer.php"; diff --git a/core/apps/apps.php b/core/apps/apps.php index 19f2d64075..e35f43e6cf 100644 --- a/core/apps/apps.php +++ b/core/apps/apps.php @@ -56,17 +56,10 @@ require_once "resources/paging.php"; } //show the content - echo "\n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo " \n"; - echo "
".$text['header-apps']." 
\n"; - echo " ".$text['description-apps']."

\n"; - echo "
\n"; + echo "".$text['header-apps']."\n"; + echo "

\n"; + echo $text['description-apps']; + echo "

\n"; $c = 0; $row_style["0"] = "row_style0"; diff --git a/core/default_settings/default_settings.php b/core/default_settings/default_settings.php index f81476a1f1..09690a6b2d 100644 --- a/core/default_settings/default_settings.php +++ b/core/default_settings/default_settings.php @@ -261,7 +261,7 @@ if (permission_exists("domain_select") && permission_exists("domain_setting_add" echo "
"; echo ""; - echo "\n"; + echo "
\n"; echo " \n"; echo " \n"; echo "\n"; + $previous_category = $row['default_setting_category']; - if ($c==0) { $c=1; } else { $c=0; } + $c = ($c == 0) ? 1 : 0; + } //end foreach unset($sql, $result, $row_count); } //end if results @@ -468,12 +470,10 @@ if (permission_exists("domain_select") && permission_exists("domain_setting_add" echo "
"; echo " ".$text['header-default_settings'].""; @@ -439,8 +439,10 @@ if (permission_exists("domain_select") && permission_exists("domain_setting_add" } echo "
"; echo "
"; echo $paging_controls; - echo "

"; + echo "


"; echo "
"; - echo "

"; - // check or uncheck all category checkboxes if (sizeof($subcat_ids) > 0) { echo "