소스 검색

Contacts: Additional "Community" field, language additions, misc adjustments.

Nate Jones 10 년 전
부모
커밋
f1a97ea451
6개의 변경된 파일90개의 추가작업 그리고 14개의 파일을 삭제
  1. 4 0
      app_config.php
  2. 65 9
      app_languages.php
  3. 17 1
      contact_address_edit.php
  4. 1 1
      contact_addresses.php
  5. 2 2
      contact_import.php
  6. 1 1
      contacts.php

+ 4 - 0
app_config.php

@@ -276,6 +276,10 @@ $z++;
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the extended address.";
 		$z++;
+		$apps[$x]['db'][$y]['fields'][$z]['name'] = "address_community";
+		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
+		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the community.";
+		$z++;
 		$apps[$x]['db'][$y]['fields'][$z]['name'] = "address_locality";
 		$apps[$x]['db'][$y]['fields'][$z]['type'] = "text";
 		$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "Enter the city.";

+ 65 - 9
app_languages.php

@@ -539,6 +539,16 @@
 		$text['description-address_address']['pt-pt'] = "Introduza o endereço da rua";
 		$text['description-address_address']['fr-fr'] = "Saisissez l'adresse.";
 
+		$text['label-address_community']['en-us'] = "Community";
+		$text['label-address_community']['es-cl'] = "Comunidad";
+		$text['label-address_community']['pt-pt'] = "Comunidade";
+		$text['label-address_community']['fr-fr'] = "Communauté";
+
+		$text['description-address_community']['en-us'] = "Enter the community.";
+		$text['description-address_community']['es-cl'] = "Ingrese la comunidad.";
+		$text['description-address_community']['pt-pt'] = "Entre a comunidade.";
+		$text['description-address_community']['fr-fr'] = "Entrez dans la communauté.";
+
 		$text['label-address_locality']['en-us'] = "City";
 		$text['label-address_locality']['es-cl'] = "Ciudad";
 		$text['label-address_locality']['pt-pt'] = "Cidade";
@@ -823,20 +833,20 @@
 		$text['label-contact_note']['pt-pt'] = "Nota";
 		$text['label-contact_note']['fr-fr'] = "Note";
 
-		$text['description-contact_note']['en-us'] = "";
+		$text['description-contact_note']['en-us'] = "Enter a note for this contact.";
 		$text['description-contact_note']['es-cl'] = "Nota de contacto";
-		$text['description-contact_note']['pt-pt'] = "";
-		$text['description-contact_note']['fr-fr'] = "";
+		$text['description-contact_note']['pt-pt'] = "Ingrese una nota para este contacto.";
+		$text['description-contact_note']['fr-fr'] = "Entrez une note à ce contact.";
 
 		$text['label-note_content']['en-us'] = "Content";
-		$text['label-note_content']['es-cl'] = "";
-		$text['label-note_content']['pt-pt'] = "";
-		$text['label-note_content']['fr-fr'] = "";
+		$text['label-note_content']['es-cl'] = "Contenido";
+		$text['label-note_content']['pt-pt'] = "Conteúdo";
+		$text['label-note_content']['fr-fr'] = "Content";
 
 		$text['label-note_user']['en-us'] = "User";
-		$text['label-note_user']['es-cl'] = "";
-		$text['label-note_user']['pt-pt'] = "";
-		$text['label-note_user']['fr-fr'] = "";
+		$text['label-note_user']['es-cl'] = "Usuario";
+		$text['label-note_user']['pt-pt'] = "Usuário";
+		$text['label-note_user']['fr-fr'] = "Utilisateur";
 
 	// contact import
 		$text['title-contacts_import']['en-us'] = "Import Contacts";
@@ -889,6 +899,52 @@
 		$text['message-results']['pt-pt'] = "Os seguintes contactos foram importados com sucesso a partir do ficheiro CSV submetido:";
 		$text['message-results']['fr-fr'] = "Les contacts suivants ont été téléchargés correctement à partir di fichier CSV:";
 
+		$text['message-access_denied']['en-us'] = "Access Denied";
+		$text['message-access_denied']['es-cl'] = "Acceso Denegado";
+		$text['message-access_denied']['pt-pt'] = "Acesso Negado";
+		$text['message-access_denied']['fr-fr'] = "Accès Refusé";
+
+		$text['message-invalid_credentials']['en-us'] = "Invalid Credentials";
+		$text['message-invalid_credentials']['es-cl'] = "Credenciales No Válidas";
+		$text['message-invalid_credentials']['pt-pt'] = "Credenciais Inválidas";
+		$text['message-invalid_credentials']['fr-fr'] = "Pouvoirs Invalides";
+
+		$text['title-contacts_import_google']['en-us'] = "Import Google Contacts";
+		$text['title-contacts_import_google']['es-cl'] = "Importar Contactos de Google";
+		$text['title-contacts_import_google']['pt-pt'] = "Importar Contatos do Google";
+		$text['title-contacts_import_google']['fr-fr'] = "Importer les Contacts Google";
+
+		$text['header-contacts_import_google']['en-us'] = "Import Google Contacts";
+		$text['header-contacts_import_google']['es-cl'] = "Importar Contactos de Google";
+		$text['header-contacts_import_google']['pt-pt'] = "Importar Contatos do Google";
+		$text['header-contacts_import_google']['fr-fr'] = "Importer les Contacts Google";
+
+		$text['description-contacts_import_google']['en-us'] = "Select the desired contacts to import.";
+		$text['description-contacts_import_google']['es-cl'] = "Seleccione los contactos de Google deseados importar.";
+		$text['description-contacts_import_google']['pt-pt'] = "Selecione os desejados Google Contacts para importar.";
+		$text['description-contacts_import_google']['fr-fr'] = "Sélectionnez les contacts Google souhaités à importer.";
+
+		$text['label-contacts_import_google_account']['en-us'] = "Account";
+		$text['label-contacts_import_google_account']['es-cl'] = "Cuenta";
+		$text['label-contacts_import_google_account']['pt-pt'] = "Conta";
+		$text['label-contacts_import_google_account']['fr-fr'] = "Compte";
+
+		$text['button-reload']['en-us'] = "Reload";
+		$text['button-reload']['es-cl'] = "Recargar";
+		$text['button-reload']['pt-pt'] = "Recarregar";
+		$text['button-reload']['fr-fr'] = "Recharger";
+
+		$text['button-sign_out']['en-us'] = "Sign Out";
+		$text['button-sign_out']['es-cl'] = "Desconectar";
+		$text['button-sign_out']['pt-pt'] = "Sair";
+		$text['button-sign_out']['fr-fr'] = "Se Déconnecter";
+
+		$text['message-google_signed_out']['en-us'] = "Google Account: Signed Out";
+		$text['message-google_signed_out']['es-cl'] = "Cuenta de Google: Cerrado la Sesión";
+		$text['message-google_signed_out']['pt-pt'] = "Conta do Google: Assinado Fora";
+		$text['message-google_signed_out']['fr-fr'] = "Compte Google: Déconnecté";
+
+
 	// general labels
 		$text['label-primary']['en-us'] = "Primary";
 		$text['label-primary']['es-cl'] = "Primário";

+ 17 - 1
contact_address_edit.php

@@ -61,6 +61,7 @@ if (strlen($_GET["contact_uuid"]) > 0) {
 		$address_label_custom = check_str($_POST["address_label_custom"]);
 		$address_street = check_str($_POST["address_street"]);
 		$address_extended = check_str($_POST["address_extended"]);
+		$address_community = check_str($_POST["address_community"]);
 		$address_locality = check_str($_POST["address_locality"]);
 		$address_region = check_str($_POST["address_region"]);
 		$address_postal_code = check_str($_POST["address_postal_code"]);
@@ -118,6 +119,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "address_label, ";
 			$sql .= "address_street, ";
 			$sql .= "address_extended, ";
+			$sql .= "address_community, ";
 			$sql .= "address_locality, ";
 			$sql .= "address_region, ";
 			$sql .= "address_postal_code, ";
@@ -136,6 +138,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "'".$address_label."', ";
 			$sql .= "'".$address_street."', ";
 			$sql .= "'".$address_extended."', ";
+			$sql .= "'".$address_community."', ";
 			$sql .= "'".$address_locality."', ";
 			$sql .= "'".$address_region."', ";
 			$sql .= "'".$address_postal_code."', ";
@@ -160,6 +163,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "address_label = '".$address_label."', ";
 			$sql .= "address_street = '".$address_street."', ";
 			$sql .= "address_extended = '".$address_extended."', ";
+			$sql .= "address_community = '".$address_community."', ";
 			$sql .= "address_locality = '".$address_locality."', ";
 			$sql .= "address_region = '".$address_region."', ";
 			$sql .= "address_postal_code = '".$address_postal_code."', ";
@@ -195,6 +199,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$address_label = $row["address_label"];
 			$address_street = $row["address_street"];
 			$address_extended = $row["address_extended"];
+			$address_community = $row["address_community"];
 			$address_locality = $row["address_locality"];
 			$address_region = $row["address_region"];
 			$address_postal_code = $row["address_postal_code"];
@@ -323,13 +328,24 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 	echo "	".$text['label-address_address']."\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "	<input class='formfld' type='text' name='address_street' maxlength='255' value=\"$address_street\" style='margin-bottom: 3px;'><br>\n";
+	echo "	<textarea class='formfld' name='address_street' style='margin-bottom: 3px;'>$address_street</textarea><br>\n";
 	echo "	<input class='formfld' type='text' name='address_extended' maxlength='255' value=\"$address_extended\">\n";
 	echo "<br />\n";
 	echo $text['description-address_address']."\n";
 	echo "</td>\n";
 	echo "</tr>\n";
 
+	echo "<tr>\n";
+	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
+	echo "	".$text['label-address_community']."\n";
+	echo "</td>\n";
+	echo "<td class='vtable' align='left'>\n";
+	echo "	<input class='formfld' type='text' name='address_community' maxlength='255' value=\"$address_community\">\n";
+	echo "<br />\n";
+	echo $text['description-address_community']."\n";
+	echo "</td>\n";
+	echo "</tr>\n";
+
 	echo "<tr>\n";
 	echo "<td class='vncell' valign='top' align='left' nowrap='nowrap'>\n";
 	echo "	".$text['label-address_locality']."\n";

+ 1 - 1
contact_addresses.php

@@ -117,7 +117,7 @@ require_once "resources/paging.php";
 			echo "	<td valign='top' class='".$row_style[$c]."' style='white-space: nowrap;'>".$row['address_locality'].(($row['address_region'] != '') ? ", ".$row['address_region'] : null)."&nbsp;</td>\n";
 			echo "	<td valign='top' class='".$row_style[$c]."' style='text-align: center;'>".$row['address_country']."&nbsp;</td>\n";
 			echo "	<td valign='middle' class='".$row_style[$c]." tr_link_void' style='padding: 0px;'>\n";
-			echo "		<a href=\"http://maps.google.com/maps?q=".urlencode($map_query)."&hl=en\" target=\"_blank\"><img src='resources/images/icon_gmaps.png' style='width: 21px; height: 21px; alt='".$text['label-google_map']."' title='".$text['label-google_map']."'></a>\n";
+			echo "		<a href=\"http://maps.google.com/maps?q=".urlencode($map_query)."&hl=en\" target=\"_blank\"><img src='icon_gmaps.png' style='width: 21px; height: 21px; alt='".$text['label-google_map']."' title='".$text['label-google_map']."'></a>\n";
 			echo "	</td>\n";
 			echo "	<td valign='top' class='row_stylebg'>".$row['address_description']."&nbsp;</td>\n";
 			echo "	<td class='list_control_icons'>";

+ 2 - 2
contact_import.php

@@ -432,10 +432,10 @@ else {
 	echo "</tr>\n";
 
 	echo "	<tr>\n";
-	echo "		<td valign=\"top\" class=\"label\">\n";
+	echo "		<td valign=\"bottom\" class=\"label\">\n";
 	echo "			&nbsp;\n";
 	echo "		</td>\n";
-	echo "		<td valign=\"top\" align='right' class=\"label\" nowrap>\n";
+	echo "		<td valign=\"bottom\" align='right' class=\"label\" nowrap>\n";
 	echo "			<br />\n";
 	echo "			<input name=\"type\" type=\"hidden\" value=\"csv\">\n";
 	echo "			<input name=\"submit\" type=\"submit\"  class=\"btn\" id=\"upload\" value=\"".$text['button-upload']."\">\n";

+ 1 - 1
contacts.php

@@ -65,7 +65,7 @@ require_once "resources/paging.php";
 	echo "			<input class=\"formfld\" style='text-align: right;' type=\"text\" name=\"search_all\" value=\"$search_all\">\n";
 	echo "			<input class=\"btn\" type=\"submit\" name=\"submit\" value=\"".$text['button-search']."\">\n";
 	if (permission_exists('contact_add')) {
-		echo 		"<input type='button' class='btn' name='' alt='back' onclick=\"window.location='contact_import.php'\" value='".$text['button-import']."'>";
+		echo 		"<input type='button' class='btn' alt='".$text['button-import']."' onclick=\"window.location='contact_import.php'\" value='".$text['button-import']."'>\n";
 	}
 	echo "		</form>\n";
 	echo "	</td>\n";