From ef6f6ed9f4bdd991b50ff5050e923e06e2b8f74b Mon Sep 17 00:00:00 2001 From: Mark Crane Date: Sat, 8 Nov 2014 21:44:57 +0000 Subject: [PATCH] Fix the app_languages labels as the only the type should have the dash after it. Fix the spacing so the layout looks better. --- app/contacts/app_languages.php | 65 ++++++++++--------------- app/contacts/contact_setting_delete.php | 31 ++++++------ app/contacts/contact_setting_edit.php | 6 +-- app/contacts/contact_settings.php | 27 +++++----- 4 files changed, 58 insertions(+), 71 deletions(-) diff --git a/app/contacts/app_languages.php b/app/contacts/app_languages.php index a8efdae923..3dd79ab640 100644 --- a/app/contacts/app_languages.php +++ b/app/contacts/app_languages.php @@ -1,7 +1,6 @@ ndice) para este elemento de la matriz."; $text['description-order']['pt-pt'] = "Defina a ordem (ndice) para este elemento da matriz."; $text['description-order']['fr-fr'] = "Dfinir l'ordre (index) pour cet lment de tableau."; + $text['header-contact_setting_edit']['en-us'] = "Contact Setting"; + $text['header-contact_setting_edit']['es-cl'] = "Configuraciones de contacto"; + $text['header-contact_setting_edit']['pt-pt'] = "Definições do Contacto"; + $text['header-contact_setting_edit']['fr-fr'] = "Paramètres du Contact"; - $text['header-contact_setting-edit']['en-us'] = "Contact Setting"; - $text['header-contact_setting-edit']['es-cl'] = "Configuraciones de contacto"; - $text['header-contact_setting-edit']['pt-pt'] = "Definições do Contacto"; - $text['header-contact_setting-edit']['fr-fr'] = "Paramètres du Contact"; + $text['header-contact_setting_add']['en-us'] = "Contact Setting Add"; + $text['header-contact_setting_add']['es-cl'] = "Agregar Configuración de Contacto"; + $text['header-contact_setting_add']['pt-pt'] = "Adicionar Definição ao Contacto"; + $text['header-contact_setting_add']['fr-fr'] = "Ajouter un paramètre au Contact"; + $text['title-contact_setting_edit']['en-us'] = "Contact Setting"; + $text['title-contact_setting_edit']['es-cl'] = "Configuraciones de contacto"; + $text['title-contact_setting_edit']['pt-pt'] = "Definições do Contacto"; + $text['title-contact_setting_edit']['fr-fr'] = "Paramètres du Contact"; - $text['header-contact_setting-add']['en-us'] = "Contact Setting Add"; - $text['header-contact_setting-add']['es-cl'] = "Agregar Configuración de Contacto"; - $text['header-contact_setting-add']['pt-pt'] = "Adicionar Definição ao Contacto"; - $text['header-contact_setting-add']['fr-fr'] = "Ajouter un paramètre au Contact"; - $text['title-contact_setting-edit']['en-us'] = "Contact Setting"; - $text['title-contact_setting-edit']['es-cl'] = "Configuraciones de contacto"; - $text['title-contact_setting-edit']['pt-pt'] = "Definições do Contacto"; - $text['title-contact_setting-edit']['fr-fr'] = "Paramètres du Contact"; + $text['title-contact_setting_add']['en-us'] = "Contact Setting Add"; + $text['title-contact_setting_add']['es-cl'] = "Agregar Configuración de Contacto"; + $text['title-contact_setting_add']['pt-pt'] = "Adicionar Definição ao Contacto"; + $text['title-contact_setting_add']['fr-fr'] = "Ajouter un paramètre au Contact"; - - $text['title-contact_setting-add']['en-us'] = "Contact Setting Add"; - $text['title-contact_setting-add']['es-cl'] = "Agregar Configuración de Contacto"; - $text['title-contact_setting-add']['pt-pt'] = "Adicionar Definição ao Contacto"; - $text['title-contact_setting-add']['fr-fr'] = "Ajouter un paramètre au Contact"; - - $text['description-contact_setting-edit']['en-us'] = "Edit a setting for this contact."; - $text['description-contact_setting-edit']['es-cl'] = "Edita una configuración para este contacto."; - $text['description-contact_setting-edit']['pt-pt'] = "Editar uma definição deste contacto."; - $text['description-contact_setting-edit']['fr-fr'] = "Editer un paramètre du contact."; + $text['description-contact_setting_edit']['en-us'] = "Edit a setting for this contact."; + $text['description-contact_setting_edit']['es-cl'] = "Edita una configuración para este contacto."; + $text['description-contact_setting_edit']['pt-pt'] = "Editar uma definição deste contacto."; + $text['description-contact_setting_edit']['fr-fr'] = "Editer un paramètre du contact."; $text['label-shared']['en-us'] = "Shared"; $text['label-shared']['es-cl'] = "Compartido"; @@ -648,7 +638,6 @@ $text['label-import_file_upload']['pt-pt'] = "Ficheiro para submeter"; $text['label-import_file_upload']['fr-fr'] = "Fichier à télécharger"; - $text['button-upload']['en-us'] = "Upload"; $text['button-upload']['es-cl'] = "Subir"; $text['button-upload']['pt-pt'] = "Submeter"; @@ -710,4 +699,4 @@ $text['message-required']['pt-pt'] = "Por favor indique: "; $text['message-required']['fr-fr'] = "Merci d'indiquer: "; -?> +?> \ No newline at end of file diff --git a/app/contacts/contact_setting_delete.php b/app/contacts/contact_setting_delete.php index fc40f034f2..a51475b799 100644 --- a/app/contacts/contact_setting_delete.php +++ b/app/contacts/contact_setting_delete.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2012 + Portions created by the Initial Developer are Copyright (C) 2008-2014 the Initial Developer. All Rights Reserved. Contributor(s): @@ -34,24 +34,25 @@ require_once "resources/check_auth.php"; $text[$key] = $value[$_SESSION['domain']['language']['code']]; } -if (count($_GET)>0) { - $id = check_str($_GET["id"]); - $contact_uuid = check_str($_GET["contact_uuid"]); -} +//set the variables + if (count($_GET) > 0) { + $id = check_str($_GET["id"]); + $contact_uuid = check_str($_GET["contact_uuid"]); + } -if (strlen($id)>0) { - //delete domain_setting - $sql = "delete from v_contact_settings "; - $sql .= "where contact_uuid = '$contact_uuid' "; - $sql .= "and contact_setting_uuid = '$id' "; - $prep_statement = $db->prepare(check_sql($sql)); - $prep_statement->execute(); - unset($sql); -} +//delete domain_setting + if (strlen($id) > 0) { + $sql = "delete from v_contact_settings "; + $sql .= "where contact_uuid = '$contact_uuid' "; + $sql .= "and contact_setting_uuid = '$id' "; + $prep_statement = $db->prepare(check_sql($sql)); + $prep_statement->execute(); + unset($sql); + } //redirect the user $_SESSION["message"] = $text['message-delete']; header("Location: contact_edit.php?id=".$contact_uuid); return; -?> +?> \ No newline at end of file diff --git a/app/contacts/contact_setting_edit.php b/app/contacts/contact_setting_edit.php index ece5382f8f..277b8b57f1 100644 --- a/app/contacts/contact_setting_edit.php +++ b/app/contacts/contact_setting_edit.php @@ -17,7 +17,7 @@ The Initial Developer of the Original Code is Mark J Crane - Portions created by the Initial Developer are Copyright (C) 2008-2012 + Portions created by the Initial Developer are Copyright (C) 2008-2014 the Initial Developer. All Rights Reserved. Contributor(s): @@ -200,7 +200,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo $text['header-contact_setting-edit']; } if ($action == "add") { - echo $text['header-contact_setting-add']; + echo $text['header-contact_setting_add']; } echo "\n"; echo ""; @@ -214,7 +214,7 @@ if (count($_POST) > 0 && strlen($_POST["persistformvar"]) == 0) { echo $text['description-contact_setting-edit']; } if ($action == "add") { - echo $text['header-contact_setting-add']; + echo $text['header-contact_setting_add']; } echo "

\n"; echo "\n"; diff --git a/app/contacts/contact_settings.php b/app/contacts/contact_settings.php index 4c2d1ac3cf..9497568990 100644 --- a/app/contacts/contact_settings.php +++ b/app/contacts/contact_settings.php @@ -27,7 +27,6 @@ require_once "root.php"; require_once "resources/require.php"; require_once "resources/check_auth.php"; - //require_once "resources/header.php"; require_once "resources/paging.php"; @@ -35,7 +34,6 @@ require_once "resources/paging.php"; $order_by = $_GET["order_by"]; $order = $_GET["order"]; - //prepare to page the results $sql = "select count(*) as num_rows from v_contact_settings "; $sql .= "where contact_uuid = '$contact_uuid' "; @@ -82,15 +80,15 @@ require_once "resources/paging.php"; $row_style["1"] = "row_style1"; //show the content - - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "\n"; - echo "
".$text['label-contact_properties']." 
\n"; + if ($num_rows == 0) { + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; + echo "
".$text['label-contact_settings']." 
\n"; + } - echo "

"; echo "\n"; if ($result_count > 0) { @@ -107,9 +105,9 @@ require_once "resources/paging.php"; echo " \n"; echo "\n"; echo "\n"; - echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; echo ""; echo ""; echo "\n"; echo "
".$text['label-subcategory']."".$text['label-type']."".$text['label-value']."".$text['label-subcategory']."sub".$text['label-type']."type".$text['label-value']."value".$text['label-enabled']."".$text['label-description'].""; @@ -166,7 +164,6 @@ require_once "resources/paging.php"; echo "
"; - //include the footer //require_once "resources/footer.php"; -?> +?> \ No newline at end of file