diff options
| -rw-r--r-- | gedcheck.php | 9 | ||||
| -rw-r--r-- | includes/old_messages.php | 62 | ||||
| -rw-r--r-- | modules_v3/googlemap/admin_editconfig.php | 463 | ||||
| -rw-r--r-- | modules_v3/googlemap/admin_placecheck.php | 54 | ||||
| -rw-r--r-- | modules_v3/googlemap/admin_places.php | 108 | ||||
| -rw-r--r-- | modules_v3/googlemap/defaultconfig.php | 17 | ||||
| -rw-r--r-- | modules_v3/googlemap/googlemap.php | 86 | ||||
| -rw-r--r-- | modules_v3/googlemap/googlemap_readme.txt | 16 | ||||
| -rw-r--r-- | modules_v3/googlemap/help_text.php | 81 | ||||
| -rw-r--r-- | modules_v3/googlemap/module.php | 8 | ||||
| -rw-r--r-- | modules_v3/googlemap/pedigree_map.php | 6 | ||||
| -rw-r--r-- | modules_v3/googlemap/placehierarchy.php | 12 | ||||
| -rw-r--r-- | modules_v3/googlemap/places_edit.php | 4 | ||||
| -rw-r--r-- | modules_v3/googlemap/wt_v3_googlemap.js.php | 2 | ||||
| -rw-r--r-- | modules_v3/googlemap/wt_v3_pedigree_map.js.php | 2 | ||||
| -rw-r--r-- | modules_v3/lightbox/admin_config.php | 2 |
16 files changed, 424 insertions, 508 deletions
diff --git a/gedcheck.php b/gedcheck.php index 5da52c2709..a0782598e0 100644 --- a/gedcheck.php +++ b/gedcheck.php @@ -77,7 +77,6 @@ else { $ged =safe_POST('ged', preg_quote_array(array_keys($all_geds)), $default_ged); $err_level =safe_POST('err_level', '[0-3]', $critical); // Higher numbers are more picky. -$openinnew =safe_POST('openinnew', '[01]', '0'); // Open links in same/new tab/window $context_lines=safe_POST('context_lines','[0-5]', '2'); // Lines of context to display $showall =safe_POST('showall', '[01]', '0'); // Show details of records with no problems @@ -95,11 +94,6 @@ for ($i=0; $i<count($levels); $i++) { echo '<option value="', $i, '"', $i==$err_level?' selected="selected"':'', '>', $levels[$i], '</option>'; } echo '</select></td></tr>'; -echo '<tr><td class="list_label">', WT_I18N::translate('Open links in'), '</td>'; -echo '<td class="optionbox"><select name="openinnew">'; -echo '<option value="0"', $openinnew==0?' selected="selected"':'', '>', WT_I18N::translate('Same tab/window'), '</option>'; -echo '<option value="1"', $openinnew==1?' selected="selected"':'', '>', WT_I18N::translate('New tab/window'), '</option>'; -echo '</select></td></tr>'; echo '<tr><td class="list_label">', WT_I18N::translate('Lines of GEDCOM context'), '</td>'; echo '<td class="optionbox"><select name="context_lines">'; for ($i=0; $i<6; $i++) { @@ -165,13 +159,12 @@ $WT_LINK=array( 'OBJE'=>'mediaviewer.php?mid=', 'NOTE'=>'note.php?nid=' ); -$target=($openinnew==1 ? ' target="_new"' : ''); function wt_href($tag, $xref, $name='') { global $WT_LINK, $target, $ged; $text=($name=='' ? "$tag $xref" : "$name ($xref)"); if (isset($WT_LINK[$tag]) && get_id_from_gedcom($ged)) { - return '‎<a href="'.$WT_LINK[$tag].str_replace('@','',$xref).'&ged='.rawurlencode($ged).'"'.$target.'>'.$text.'</a>‎'; + return '‎<a href="'.$WT_LINK[$tag].str_replace('@','',$xref).'&ged='.rawurlencode($ged).'">'.$text.'</a>‎'; } else { return "‎$tag $xref‎"; } diff --git a/includes/old_messages.php b/includes/old_messages.php index 7093114720..34d607d530 100644 --- a/includes/old_messages.php +++ b/includes/old_messages.php @@ -33,17 +33,70 @@ exit; // MESSAGES DELETED IN WEBTREES-1.2.8 /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('<span class="label">%1$s:</span> <span class="field">%2$s</span>'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('<strong>This tool</strong> provides a way to compare places in your gedcom file with the matching entries in the googlemaps \'placelocations\' table.<br /><br /><strong>The display</strong> can be structured for a specific gedcom file; for a specific country within that file; and for a particular area (e.g. state or county) within that country.<br /><br /><strong>Places</strong>are listed alphabetically so that minor spelling differences can be easily spotted, and corrected.<br /><br /><strong>From</strong> the results of the comparison you can click on place names for one of these three options:<br /><br /><strong>1 - </strong>For gedcom file places you will be taken to the Place Heirarchy view. Here you will see all records that are linked to that place.<br /><br /><strong>2 - </strong>For places that exist in the gedcom file, but not in the googlemap table (highlighted in red), you will get the googlemap \"Add place\" screen.<br /><br /><strong>3 - </strong>For places that exist in both the gedcom file and the googlemap table (perhaps without coordinates) you will get the googlemap \"edit place\" screen. Here you can edit any aspect of the place record for the googlemap display.<br /><br /><strong>Hovering</strong> over any place in the googlemap table columns will display the zoom level curently set for that place.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Add geographic location'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('By default the list does NOT INCLUDE places that are fully matched between the GEDCOM file and the GoogleMap tables.<br />Fully matched means all levels exist in both the gedcom file and the GoogleMap tables; and the GoogleMap places have coordinates for every level.<br /><br />Check this block to include those matched places.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Click here to show inactive places'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Click here to show inactive places'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Configuration per level'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Current User Time:'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Default person for pedigree and descendancy charts'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Display Map Co-ordinates'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Edit geographic place locations'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Enable Google Street View'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Export all locations to file'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Export location data to a file. This option will save the data from the current view and all dependant data to a file. This means that if a country is selected and the states are shown, this option will save the data of the states, all the counties that are defined in those states and all places within those counties.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Export location data to a file. This option will save the data from the current view and all dependant data to a file. This means that if a country is selected and the states are shown, this option will save the data of the states, all the counties that are defined in those states and all places within those counties.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Export locations to file'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('For each genealogical database, you can designate a <b>Root Person</b> for the user.<br /><br />This Root Person does not need to be the user himself; it can be anybody. The user will probably want to start the Pedigree chart with himself. You control that, as well as the default Root person on other charts, here.<br /><br />If the user has Edit rights to his own account information, he can change this setting himself.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('GEDCOM File Place Data<br />(2 PLAC tag)'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Google Maps configuration'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Google Maps'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Google Street View'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('GoogleMap Places Table Data'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Here you can specify if the counts of indis and families connected to the place is displayed. Now if GEDCOM file contains many people is recomended to turn it off.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Hide the flags that are configured in the googlemap module. Usually these are for countries and states. This serves as a visual cue that the markers around the flag are from the general area, and not the specific spot.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Import from all GEDCOMs'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Import from current GEDCOM'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Import from file'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Import geographic location data from a file. The file should be formatted as CSV file on the local computer. The record separator used within the lines is \';\'.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Import geographic location-data from all GEDCOMs. All GEDCOMs will be scanned and all places will be added to the table. If latitude and longitude are available these will also be imported.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Import geographic location-data from current GEDCOM. The current GEDCOM will be scanned and all places will be added to the table. If latitude and longitude are available these will also be imported.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Import geographic locations from GEDCOM'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Import geographic locations from all GEDCOMs'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Import geographic locations from file'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Key to colors used below'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Many programs will place the preferred given name in "quotes" in the GEDCOM. The usual convention for this is to underline the preferred given name. Enabling this option will convert any names surrounded by quotes to <span> with a CSS class of "starredname".<br /><br />For example, if the name in the GEDCOM were 1 NAME Gustave "Jean Paul" Charles /Wilson/ enabling this option would change the part of the name enclosed in quotes to <span class="starredname">Jean Paul</span> for printing purposes. Depending on other settings, the browser would then display that name as <b>Gustave <u>Jean Paul</u> Charles Wilson</b> or <b>Wilson, Gustave <u>Jean Paul</u> Charles</b>'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('New tab/window'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('No pre/postfix'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Normal, postfix, prefix, both'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Normal, prefix, postfix, both'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Only update existing records.<br />When this option is selected only existing records will be updated. This can be used to fill in latitude and longitude of places that have been imported from a GEDCOM. No new places will be added to the database.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Open links in'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Pedigree chart root ID'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Pedigree chart root person'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Place Check - List Filtering Optons'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Place list for GEDCOM file'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Postfix for names used on this level'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Postfix'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Postfix, prefix, both, normal'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Postfix, prefix, normal, both'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Prefix / Postfix order'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Prefix for names used on this level'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Prefix'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Prefix, postfix, both, normal'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Prefix, postfix, normal, both'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Reset to Default Blocks'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Same tab/window'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Search Engine Spider Detected'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Set the ID of the default person to display on Pedigree and Descendancy charts.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Size of Place Hierarchy map (in pixels)'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('The size of the map (in pixels) as shown on the Place Hierarchy pages.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('The size of the map (in pixels) as shown on the Individual pages.'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('The genealogy information on this website is powered by <a href="http://webtrees.net/" target="_blank">webtrees</a>. This page provides an introduction and overview to this genealogy.<br /><br />To begin working with the data, choose one of the charts from the Charts menu, go to the Individual list, or search for a name or place.<br /><br />If you have trouble using the site, you can click on the Help icon to give you information on how to use the page that you are currently viewing.<br /><br />Thank you for visiting this site.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('The number of markers to be placed at one point before a trail of pins is started in a north east line behind the younger generations. The \'trail\' is usually only visable at high zoom values.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('The type of map that will be shown by default. This can be Map, Satellite, Hybrid or Terrain.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('This field indicates the order in which names are tried using the prefix and postfix. The possible values are:<br /><ul><li>No pre/postfix</li><li>Normal name, Prefix, Postfix, both</li><li>Normal name, Postfix, Prefix, both</li><li>Prefix, Postfix, both, Normal name</li><li>Postfix, Prefix, both, Normal name</li><li>Prefix, Postfix, Normal name, both</li><li>Postfix, Prefix, Normal name, both</li></ul>'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('This is the starting (Root) person of all your charts.<br /><br />If, for example, you were to click the link to the Pedigree, you would see this root person in the leftmost box. This root person does not have to be you; you can start with any person (your grandfather or your mother\'s aunt, for instance), as long you have the rights to see that person.<br /><br />This changes the default Root person for most charts. You can change the Root person on many charts, but that is just for that page at that particular invocation.'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('This option controls whether or not the Close Relatives tab should show differences between birth dates of spouses, between marriage date and birth date of first child, and between birth dates of children.'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('This place and its coordinates do not exist in the GoogleMap tables.'); @@ -51,10 +104,19 @@ exit; /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('This place level is blank in your GEDCOM file, but exists as "unknown" in the GoogleMap places table with coordinates. No action required until the missing level can be entered.'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('This place level is blank in your GEDCOM file. It should be added to GoogleMap places as "unknown" with coordinates from its parent level before you add any place to the next level.'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('This section includes options to limit or extend the scope of the listed places.<br /><br />It is hoped to add more options in the future.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('This value will be added to the back of the names on this level. Multiple values can be used, seperated by semilcolons.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('This value will be added to the front of the names on this level. Multiple values can be used, seperated by semicolons.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('This will list all the places from the selected GEDCOM file. By default this will NOT INCLUDE places that are fully matched between the GEDCOM file and the GoogleMap tables'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Underline names in quotes'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Use Googlemap for Place Hierarchy'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Use this option to enable (Yes) or disable (No) the ability to substitute Googlemap for <strong>webtrees</strong> usual Place Hierarchy. To be able to set this option to YES, the Googlemap module must be also be enabled. CAUTION: Before using this option, it is recommended that you insert all places currently existing in your GED into the Googlemap tables.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Use this to add a place to the location table. The location will be added at this level.'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Welcome to Your Genealogy'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('When this option box is checked, the «Close Relatives» tab will show date differences as follows:<br /><ul><li>birth dates of partners.<br />A negative value indicates that the second partner is older than the first.<br /><br /></li><li>marriage date and birth date of the first child.<br />A negative value here indicates that the child was born before the marriage date or that either the birth date or the marriage date is wrong.<br /><br /></li><li>birth dates of siblings.<br />A negative value here indicates that either the order of the children is wrong or that one of the birth dates is wrong.</li></ul>'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('When this option is selected the placelocation database will be cleared. This means that only the location stored in this table will be deleted. This will not change anything in the GEDCOM.'); /* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('You must enter an email address.'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Export current view to file'); +/* I18N: This message is deleted in webtrees-1.2.8 */ WT_I18N::translate('Export all location data to a file. This option will save all location data and transfer it to the local computer.'); // MESSAGES DELETED IN WEBTREES-1.2.7 diff --git a/modules_v3/googlemap/admin_editconfig.php b/modules_v3/googlemap/admin_editconfig.php index 544c4302bd..838b910a32 100644 --- a/modules_v3/googlemap/admin_editconfig.php +++ b/modules_v3/googlemap/admin_editconfig.php @@ -36,16 +36,12 @@ $action=safe_REQUEST($_REQUEST, 'action'); $controller=new WT_Controller_Base(); $controller ->requireAdminLogin() - ->setPageTitle(WT_I18N::translate('Google Maps configuration')) - ->pageHeader(); + ->setPageTitle(WT_I18N::translate('Google Maps™')) + ->pageHeader() + ->addInlineJavaScript('jQuery("#tabs").tabs();'); -echo '<table id="gm_config"><tr>', - '<th><a ', (safe_GET('mod_action')=="admin_editconfig" ? 'class="current" ' : ''), 'href="module.php?mod=googlemap&mod_action=admin_editconfig">', WT_I18N::translate('Google Maps configuration'), '</a>', '</th>', - '<th><a ', (safe_GET('mod_action')=="admin_places" ? 'class="current" ' : ''), 'href="module.php?mod=googlemap&mod_action=admin_places">', WT_I18N::translate('Edit geographic place locations'), '</a>', '</th>', - '<th><a ', (safe_GET('mod_action')=="admin_placecheck" ? 'class="current" ' : ''), 'href="module.php?mod=googlemap&mod_action=admin_placecheck">', WT_I18N::translate('Place Check'), '</a>', help_link('GOOGLEMAP_PLACECHECK','googlemap'), '</th>', - '</tr></table>'; -if ($action=="update" && !isset($security_user)) { +if ($action=='update') { set_module_setting('googlemap', 'GM_MAP_TYPE', $_POST['NEW_GM_MAP_TYPE']); set_module_setting('googlemap', 'GM_USE_STREETVIEW', $_POST['NEW_GM_USE_STREETVIEW']); set_module_setting('googlemap', 'GM_MIN_ZOOM', $_POST['NEW_GM_MIN_ZOOM']); @@ -70,9 +66,8 @@ if ($action=="update" && !isset($security_user)) { set_module_setting('googlemap', 'GM_DISP_COUNT', $_POST['NEW_GM_DISP_COUNT']); for ($i=1; $i<=9; $i++) { - set_module_setting('googlemap', 'GM_PREFIX_'.$i, $_POST['NEW_GM_PREFIX_'.$i]); - set_module_setting('googlemap', 'GM_POSTFIX_'.$i, $_POST['NEW_GM_POSTFIX_'.$i]); - set_module_setting('googlemap', 'GM_PRE_POST_MODE_'.$i, $_POST['NEW_GM_PRE_POST_MODE_'.$i]); + set_module_setting('googlemap', 'GM_PREFIX_'.$i, $_POST['NEW_GM_PREFIX_'.$i]); + set_module_setting('googlemap', 'GM_POSTFIX_'.$i, $_POST['NEW_GM_POSTFIX_'.$i]); } AddToLog('Googlemap config updated', 'config'); @@ -81,275 +76,221 @@ if ($action=="update" && !isset($security_user)) { } ?> -<script type="text/javascript"> -<!-- - function showSelectedLevels() { - if (document.configform.NEW_GM_LEVEL_COUNT.value >= 1) { - document.getElementById('level1').style.display = 'block'; - } else { - document.getElementById('level1').style.display = 'none'; - } - if (document.configform.NEW_GM_LEVEL_COUNT.value >= 2) { - document.getElementById('level2').style.display = 'block'; - } else { - document.getElementById('level2').style.display = 'none'; - } - if (document.configform.NEW_GM_LEVEL_COUNT.value >= 3) { - document.getElementById('level3').style.display = 'block'; - } else { - document.getElementById('level3').style.display = 'none'; - } - if (document.configform.NEW_GM_LEVEL_COUNT.value >= 4) { - document.getElementById('level4').style.display = 'block'; - } else { - document.getElementById('level4').style.display = 'none'; - } - if (document.configform.NEW_GM_LEVEL_COUNT.value >= 5) { - document.getElementById('level5').style.display = 'block'; - } else { - document.getElementById('level5').style.display = 'none'; - } - if (document.configform.NEW_GM_LEVEL_COUNT.value >= 6) { - document.getElementById('level6').style.display = 'block'; - } else { - document.getElementById('level6').style.display = 'none'; - } - if (document.configform.NEW_GM_LEVEL_COUNT.value >= 7) { - document.getElementById('level7').style.display = 'block'; - } else { - document.getElementById('level7').style.display = 'none'; - } - if (document.configform.NEW_GM_LEVEL_COUNT.value >= 8) { - document.getElementById('level8').style.display = 'block'; - } else { - document.getElementById('level8').style.display = 'none'; - } - if (document.configform.NEW_GM_LEVEL_COUNT.value >= 9) { - document.getElementById('level9').style.display = 'block'; - } else { - document.getElementById('level9').style.display = 'none'; - } - } - - //--> -</script> - - -<?php -echo WT_JS_START; -?> -jQuery(document).ready(function() { -jQuery("#tabs").tabs(); -}); -<?php -echo WT_JS_END; -echo '<div id="tabs">', - '<ul>', - '<li><a href="#gm_basic"><span>', WT_I18N::translate('Basic'), '</span></a></li>', - '<li><a href="#gm_advanced"><span>', WT_I18N::translate('Advanced'), '</span></a></li>', - '</ul>'; -?> -<form method="post" name="configform" action="module.php?mod=googlemap&mod_action=admin_editconfig"> -<input type="hidden" name="action" value="update"> -<div id="gm_basic"> -<table class="gm_edit_config"> - <tr> - <th><?php echo WT_I18N::translate('Default map type'), help_link('GOOGLEMAP_MAP_TYPE','googlemap'); ?></th> - <td> - <select name="NEW_GM_MAP_TYPE"> - <option value="ROADMAP" <?php if ($GOOGLEMAP_MAP_TYPE=="ROADMAP") echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('Map'); ?></option> - <option value="SATELLITE" <?php if ($GOOGLEMAP_MAP_TYPE=="SATELLITE") echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('Satellite'); ?></option> - <option value="HYBRID" <?php if ($GOOGLEMAP_MAP_TYPE=="HYBRID") echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('Hybrid'); ?></option> - <option value="TERRAIN" <?php if ($GOOGLEMAP_MAP_TYPE=="TERRAIN") echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('Terrain'); ?></option> - </select> - </td> - </tr> - <tr> - <th><?php echo WT_I18N::translate('Enable Google Street View'), help_link('STREETVIEW_ENABLE','googlemap'); ?></th> - <td><?php echo edit_field_yes_no('NEW_GM_USE_STREETVIEW', get_module_setting('googlemap', 'GM_USE_STREETVIEW')); ?></td> - </tr> - <tr> - <th><?php echo WT_I18N::translate('Size of map (in pixels)'), help_link('GOOGLEMAP_MAP_SIZE','googlemap'); ?></th> - <td> - <?php echo WT_I18N::translate('Width'); ?> - <input type="text" name="NEW_GM_XSIZE" value="<?php echo $GOOGLEMAP_XSIZE; ?>" size="10"> - <?php echo WT_I18N::translate('Height'); ?> - <input type="text" name="NEW_GM_YSIZE" value="<?php echo $GOOGLEMAP_YSIZE; ?>" size="10"> - </td> - </tr> - <tr> - <th><?php echo WT_I18N::translate('Use Googlemap for Place Hierarchy'), help_link('GOOGLEMAP_PH','googlemap'); ?></th> - <td><?php echo edit_field_yes_no('NEW_GM_PLACE_HIERARCHY', get_module_setting('googlemap', 'GM_PLACE_HIERARCHY')); ?></td> - </tr> - <tr> - <th><?php echo WT_I18N::translate('Size of Place Hierarchy map (in pixels)'), help_link('GOOGLEMAP_PH_MAP_SIZE','googlemap'); ?></th> - <td> - <?php echo WT_I18N::translate('Width'); ?> - <input type="text" name="NEW_GM_PH_XSIZE" value="<?php echo $GOOGLEMAP_PH_XSIZE; ?>" size="10"> - <?php echo WT_I18N::translate('Height'); ?> - <input type="text" name="NEW_GM_PH_YSIZE" value="<?php echo $GOOGLEMAP_PH_YSIZE; ?>" size="10"> - </td> - </tr> - <tr> - <th><?php echo WT_I18N::translate('Type of place markers in Place Hierarchy'), help_link('GOOGLEMAP_PH_MARKER','googlemap'); ?></th> - <td> - <select name="NEW_GM_PH_MARKER"> - <option value="G_DEFAULT_ICON" <?php if ($GOOGLEMAP_PH_MARKER=="G_DEFAULT_ICON") echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('Standard'); ?></option> - <option value="G_FLAG" <?php if ($GOOGLEMAP_PH_MARKER=="G_FLAG") echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('Flag'); ?></option> - </select> - </td> - </tr> - <tr> - <th><?php echo WT_I18N::translate('Display short placenames'), help_link('GM_DISP_SHORT_PLACE','googlemap'); ?></th> - <td><?php echo edit_field_yes_no('NEW_GM_DISP_SHORT_PLACE', $GM_DISP_SHORT_PLACE); ?></td> - </tr> - <tr> - <th><?php echo WT_I18N::translate('Display indis and families count'), help_link('GM_DISP_COUNT','googlemap'); ?></th> - <td><?php echo edit_field_yes_no('NEW_GM_DISP_COUNT', $GM_DISP_COUNT); ?></td> - </tr> - <tr> - <th><?php echo WT_I18N::translate('Use mouse wheel for zoom'), help_link('GOOGLEMAP_PH_WHEEL','googlemap'); ?></th> - <td><?php echo edit_field_yes_no('NEW_GM_PH_WHEEL', $GOOGLEMAP_PH_WHEEL); ?></td> - </tr> +<table id="gm_config"> <tr> - <th><?php echo WT_I18N::translate('Hide map controls'), help_link('GOOGLEMAP_PH_CONTROLS','googlemap'); ?></th> - <td><?php echo edit_field_yes_no('NEW_GM_PH_CONTROLS', $GOOGLEMAP_PH_CONTROLS); ?></td> - </tr> - <tr> - <th><?php echo WT_I18N::translate('Display Map Co-ordinates'), help_link('GOOGLEMAP_COORD','googlemap'); ?></th> - <td><?php echo edit_field_yes_no('NEW_GM_COORD', $GOOGLEMAP_COORD); ?></td> - </tr> - <tr> - <th><?php echo WT_I18N::translate('Zoom factor of map'), help_link('GOOGLEMAP_MAP_ZOOM','googlemap'); ?></th> - <td> - <?php echo WT_I18N::translate('minimum'); ?>: <select name="NEW_GM_MIN_ZOOM"> - <?php for ($j=1; $j < 15; $j++) { ?> - <option value="<?php echo $j, "\""; if ($GOOGLEMAP_MIN_ZOOM==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> - <?php } ?> - </select> - <?php echo WT_I18N::translate('maximum'); ?>: <select name="NEW_GM_MAX_ZOOM"> - <?php for ($j=1; $j < 21; $j++) { ?> - <option value="<?php echo $j, "\""; if ($GOOGLEMAP_MAX_ZOOM==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> - <?php } ?> - </select> - </td> + <th> + <a class="current" href="module.php?mod=googlemap&mod_action=admin_editconfig"> + <?php echo WT_I18N::translate('Google Maps™ preferences'); ?> + </a> + </th> + <th> + <a href="module.php?mod=googlemap&mod_action=admin_places"> + <?php echo WT_I18N::translate('Geographic data'); ?> + </a> + </th> + <th> + <a href="module.php?mod=googlemap&mod_action=admin_placecheck"> + <?php echo WT_I18N::translate('Place Check'); ?> + </a> + <?php echo help_link('GOOGLEMAP_PLACECHECK','googlemap'); ?> + </th> </tr> </table> -</div> -<div id="gm_advanced"> -<table class="gm_edit_config"> - <tr> - <th colspan="2"><?php echo WT_I18N::translate('Precision of the latitude and longitude'), help_link('GOOGLEMAP_PRECISION','googlemap'); ?></th> - <td> - <table> + +<form method="post" name="configform" action="module.php?mod=googlemap&mod_action=admin_editconfig"> + <input type="hidden" name="action" value="update"> + + <div id="tabs"> + <ul> + <li><a href="#gm_basic"><span><?php echo WT_I18N::translate('Basic'); ?></span></a></li> + <li><a href="#gm_advanced"><span><?php echo WT_I18N::translate('Advanced'); ?></span></a></li> + <li><a href="#gm_ph"><span><?php echo WT_I18N::translate('Place hierarchy'); ?></span></a></li> + </ul> + + <div id="gm_basic"> + <table class="gm_edit_config"> <tr> - <td><?php echo WT_I18N::translate('Country'); ?> </td> - <td><select name="NEW_GM_PRECISION_0"> - <?php for ($j=0; $j < 10; $j++) { ?> - <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_0==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> - <?php } ?> - </select> <?php echo WT_I18N::translate('digits'); ?> + <th><?php echo WT_I18N::translate('Default map type'); ?></th> + <td> + <select name="NEW_GM_MAP_TYPE"> + <option value="ROADMAP" <?php if ($GOOGLEMAP_MAP_TYPE=="ROADMAP") echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('Map'); ?></option> + <option value="SATELLITE" <?php if ($GOOGLEMAP_MAP_TYPE=="SATELLITE") echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('Satellite'); ?></option> + <option value="HYBRID" <?php if ($GOOGLEMAP_MAP_TYPE=="HYBRID") echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('Hybrid'); ?></option> + <option value="TERRAIN" <?php if ($GOOGLEMAP_MAP_TYPE=="TERRAIN") echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('Terrain'); ?></option> + </select> </td> </tr> <tr> - <td><?php echo WT_I18N::translate('State'); ?> </td> - <td><select name="NEW_GM_PRECISION_1"> - <?php for ($j=0; $j < 10; $j++) { ?> - <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_1==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> - <?php } ?> - </select> <?php echo WT_I18N::translate('digits'); ?> + <th><?php echo WT_I18N::translate('Enable Google Street View™'); ?></th> + <td><?php echo edit_field_yes_no('NEW_GM_USE_STREETVIEW', get_module_setting('googlemap', 'GM_USE_STREETVIEW')); ?></td> + </tr> + <tr> + <th><?php echo WT_I18N::translate('Size of map (in pixels)'); ?></th> + <td> + <?php echo WT_I18N::translate('Width'); ?> + <input type="text" name="NEW_GM_XSIZE" value="<?php echo $GOOGLEMAP_XSIZE; ?>" size="10"> + <?php echo WT_I18N::translate('Height'); ?> + <input type="text" name="NEW_GM_YSIZE" value="<?php echo $GOOGLEMAP_YSIZE; ?>" size="10"> </td> </tr> <tr> - <td><?php echo WT_I18N::translate('City'); ?> </td> - <td><select name="NEW_GM_PRECISION_2"> - <?php for ($j=0; $j < 10; $j++) { ?> - <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_2==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> + <th><?php echo WT_I18N::translate('Display Map Coordinates'), help_link('GOOGLEMAP_COORD','googlemap'); ?></th> + <td><?php echo edit_field_yes_no('NEW_GM_COORD', $GOOGLEMAP_COORD); ?></td> + </tr> + <tr> + <th><?php echo WT_I18N::translate('Zoom factor of map'), help_link('GOOGLEMAP_MAP_ZOOM','googlemap'); ?></th> + <td> + <?php echo WT_I18N::translate('minimum'); ?>: <select name="NEW_GM_MIN_ZOOM"> + <?php for ($j=1; $j < 15; $j++) { ?> + <option value="<?php echo $j, "\""; if ($GOOGLEMAP_MIN_ZOOM==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> + <?php } ?> + </select> + <?php echo WT_I18N::translate('maximum'); ?>: <select name="NEW_GM_MAX_ZOOM"> + <?php for ($j=1; $j < 21; $j++) { ?> + <option value="<?php echo $j, "\""; if ($GOOGLEMAP_MAX_ZOOM==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> <?php } ?> - </select> <?php echo WT_I18N::translate('digits'); ?> + </select> </td> </tr> - <tr><td><?php echo WT_I18N::translate('Neighborhood'); ?> </td> - <td><select name="NEW_GM_PRECISION_3"> - <?php for ($j=0; $j < 10; $j++) { ?> - <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_3==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> - <?php } ?> - </select> <?php echo WT_I18N::translate('digits'); ?> + </table> + </div> + + <div id="gm_advanced"> + <table class="gm_edit_config"> + <tr> + <th colspan="2"><?php echo WT_I18N::translate('Precision of the latitude and longitude'), help_link('GOOGLEMAP_PRECISION','googlemap'); ?></th> + <td> + <table> + <tr> + <td><?php echo WT_I18N::translate('Country'); ?> </td> + <td><select name="NEW_GM_PRECISION_0"> + <?php for ($j=0; $j < 10; $j++) { ?> + <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_0==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> + <?php } ?> + </select> <?php echo WT_I18N::translate('digits'); ?> + </td> + </tr> + <tr> + <td><?php echo WT_I18N::translate('State'); ?> </td> + <td><select name="NEW_GM_PRECISION_1"> + <?php for ($j=0; $j < 10; $j++) { ?> + <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_1==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> + <?php } ?> + </select> <?php echo WT_I18N::translate('digits'); ?> + </td> + </tr> + <tr> + <td><?php echo WT_I18N::translate('City'); ?> </td> + <td><select name="NEW_GM_PRECISION_2"> + <?php for ($j=0; $j < 10; $j++) { ?> + <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_2==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> + <?php } ?> + </select> <?php echo WT_I18N::translate('digits'); ?> + </td> + </tr> + <tr><td><?php echo WT_I18N::translate('Neighborhood'); ?> </td> + <td><select name="NEW_GM_PRECISION_3"> + <?php for ($j=0; $j < 10; $j++) { ?> + <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_3==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> + <?php } ?> + </select> <?php echo WT_I18N::translate('digits'); ?> + </td> + </tr> + <tr><td><?php echo WT_I18N::translate('House'); ?> </td> + <td><select name="NEW_GM_PRECISION_4"> + <?php for ($j=0; $j < 10; $j++) { ?> + <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_4==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> + <?php } ?> + </select> <?php echo WT_I18N::translate('digits'); ?> + </td> + </tr> + <tr><td><?php echo WT_I18N::translate('Max'); ?> </td> + <td><select name="NEW_GM_PRECISION_5"> + <?php for ($j=0; $j < 10; $j++) { ?> + <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_5==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> + <?php } ?> + </select> <?php echo WT_I18N::translate('digits'); ?> + </td> + </tr> + </table> </td> + <td> </td> </tr> - <tr><td><?php echo WT_I18N::translate('House'); ?> </td> - <td><select name="NEW_GM_PRECISION_4"> - <?php for ($j=0; $j < 10; $j++) { ?> - <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_4==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> - <?php } ?> - </select> <?php echo WT_I18N::translate('digits'); ?> + <tr> + <th colspan="2"><?php echo WT_I18N::translate('Default value for top-level'), help_link('GM_DEFAULT_LEVEL_0','googlemap'); ?></th> + <td><input type="text" name="NEW_GM_DEFAULT_TOP_LEVEL" value="<?php echo $GM_DEFAULT_TOP_VALUE; ?>" size="20"></td> + <td> </td> + </tr> + <tr> + <th class="gm_prefix" colspan="3"><?php echo WT_I18N::translate('Optional prefixes and suffixes'), help_link('GM_NAME_PREFIX_SUFFIX','googlemap');?></th> + </tr> + <tr id="gm_level_titles"> + <th> </th> + <th><?php echo WT_I18N::translate('Prefixes'); ?></th> + <th><?php echo WT_I18N::translate('Suffixes'); ?></th> + <?php for ($level=1; $level < 10; $level++) { ?> + <tr class="gm_levels"> + <th> + <?php + if ($level==1) { + echo WT_I18N::translate('Country'); + } else { + echo WT_I18N::translate('Level'), " ", $level; + } + ?> + </th> + <td><input type="text" size="30" name="NEW_GM_PREFIX_<?php echo $level; ?>" value="<?php echo $GM_PREFIX[$level]; ?>"></td> + <td><input type="text" size="30" name="NEW_GM_POSTFIX_<?php echo $level; ?>" value="<?php echo $GM_POSTFIX[$level]; ?>"></td> + </tr> + <?php } ?> + </table> + </div> + + <div id="gm_ph"> + <table class="gm_edit_config"> + <tr> + <th><?php echo WT_I18N::translate('Use Google Maps™ for the place hierarchy'); ?></th> + <td><?php echo edit_field_yes_no('NEW_GM_PLACE_HIERARCHY', get_module_setting('googlemap', 'GM_PLACE_HIERARCHY')); ?></td> + </tr> + <tr> + <th><?php echo WT_I18N::translate('Size of map (in pixels)'); ?></th> + <td> + <?php echo WT_I18N::translate('Width'); ?> + <input type="text" name="NEW_GM_PH_XSIZE" value="<?php echo $GOOGLEMAP_PH_XSIZE; ?>" size="10"> + <?php echo WT_I18N::translate('Height'); ?> + <input type="text" name="NEW_GM_PH_YSIZE" value="<?php echo $GOOGLEMAP_PH_YSIZE; ?>" size="10"> </td> </tr> - <tr><td><?php echo WT_I18N::translate('Max'); ?> </td> - <td><select name="NEW_GM_PRECISION_5"> - <?php for ($j=0; $j < 10; $j++) { ?> - <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_5==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> - <?php } ?> - </select> <?php echo WT_I18N::translate('digits'); ?> + <tr> + <th><?php echo WT_I18N::translate('Type of place markers in Place Hierarchy'), help_link('GOOGLEMAP_PH_MARKER','googlemap'); ?></th> + <td> + <select name="NEW_GM_PH_MARKER"> + <option value="G_DEFAULT_ICON" <?php if ($GOOGLEMAP_PH_MARKER=="G_DEFAULT_ICON") echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('Standard'); ?></option> + <option value="G_FLAG" <?php if ($GOOGLEMAP_PH_MARKER=="G_FLAG") echo "selected=\"selected\""; ?>><?php echo WT_I18N::translate('Flag'); ?></option> + </select> </td> </tr> + <tr> + <th><?php echo WT_I18N::translate('Display short placenames'), help_link('GM_DISP_SHORT_PLACE','googlemap'); ?></th> + <td><?php echo edit_field_yes_no('NEW_GM_DISP_SHORT_PLACE', $GM_DISP_SHORT_PLACE); ?></td> + </tr> + <tr> + <th><?php echo WT_I18N::translate('Use mouse wheel for zoom'), help_link('GOOGLEMAP_PH_WHEEL','googlemap'); ?></th> + <td><?php echo edit_field_yes_no('NEW_GM_PH_WHEEL', $GOOGLEMAP_PH_WHEEL); ?></td> + </tr> + <tr> + <th><?php echo WT_I18N::translate('Display indis and families count'), help_link('GM_DISP_COUNT','googlemap'); ?></th> + <td><?php echo edit_field_yes_no('NEW_GM_DISP_COUNT', $GM_DISP_COUNT); ?></td> + </tr> + <tr> + <th><?php echo WT_I18N::translate('Hide map controls'), help_link('GOOGLEMAP_PH_CONTROLS','googlemap'); ?></th> + <td><?php echo edit_field_yes_no('NEW_GM_PH_CONTROLS', $GOOGLEMAP_PH_CONTROLS); ?></td> + </tr> </table> - </td> - <td> </td> - </tr> - <tr> - <th colspan="2"><?php echo WT_I18N::translate('Default value for top-level'), help_link('GM_DEFAULT_LEVEL_0','googlemap'); ?></th> - <td><input type="text" name="NEW_GM_DEFAULT_TOP_LEVEL" value="<?php echo $GM_DEFAULT_TOP_VALUE; ?>" size="20"></td> - <td> </td> - </tr> - <tr> - <th class="gm_prefix" colspan="4"><?php echo WT_I18N::translate('Configuration per level');?></th> - </tr> - <tr id="gm_level_titles"> - <th> </th> - <th><?php echo WT_I18N::translate('Prefix'), help_link('GM_NAME_PREFIX','googlemap'); ?></th> - <th><?php echo WT_I18N::translate('Postfix'), help_link('GM_NAME_POSTFIX','googlemap'); ?></th> - <th><?php echo WT_I18N::translate('Prefix / Postfix order'), help_link('GM_NAME_PRE_POST','googlemap'); ?></th> - <?php for ($level=1; $level < 10; $level++) { ?> - <tr class="gm_levels"> - <th> - <?php - if ($level==1) { - echo WT_I18N::translate('Country'); - } else { - echo WT_I18N::translate('Level'), " ", $level; - } - ?> - </th> - <td><input type="text" name="NEW_GM_PREFIX_<?php echo $level; ?>" value="<?php echo $GM_PREFIX[$level]; ?>"></td> - <td><input type="text" name="NEW_GM_POSTFIX_<?php echo $level; ?>" value="<?php echo $GM_POSTFIX[$level]; ?>"></td> - <td> - <select name="NEW_GM_PRE_POST_MODE_<?php echo $level; ?>" dir="ltr" onchange="showSelectedLevels()"> - <option value="0"<?php if ($GM_PRE_POST_MODE[$level] == 0) echo ' selected="selected"'; ?>><?php echo WT_I18N::translate('No pre/postfix'); ?></option> - <option value="1"<?php if ($GM_PRE_POST_MODE[$level] == 1) echo ' selected="selected"'; ?>><?php echo WT_I18N::translate('Normal, prefix, postfix, both'); ?></option> - <option value="2"<?php if ($GM_PRE_POST_MODE[$level] == 2) echo ' selected="selected"'; ?>><?php echo WT_I18N::translate('Normal, postfix, prefix, both'); ?></option> - <option value="3"<?php if ($GM_PRE_POST_MODE[$level] == 3) echo ' selected="selected"'; ?>><?php echo WT_I18N::translate('Prefix, postfix, both, normal'); ?></option> - <option value="4"<?php if ($GM_PRE_POST_MODE[$level] == 4) echo ' selected="selected"'; ?>><?php echo WT_I18N::translate('Postfix, prefix, both, normal'); ?></option> - <option value="5"<?php if ($GM_PRE_POST_MODE[$level] == 5) echo ' selected="selected"'; ?>><?php echo WT_I18N::translate('Prefix, postfix, normal, both'); ?></option> - <option value="6"<?php if ($GM_PRE_POST_MODE[$level] == 6) echo ' selected="selected"'; ?>><?php echo WT_I18N::translate('Postfix, prefix, normal, both'); ?></option> - </select> - </td> - </tr> - <?php } ?> -</table> -</div> -</div> -<p> - <input type="submit" value="<?php echo WT_I18N::translate('Save'); ?>"> - - <input type="reset" value="<?php echo WT_I18N::translate('Reset'); ?>"> -</p> + </div> + </div> + <p> + <input type="submit" value="<?php echo WT_I18N::translate('Save'); ?>"> + </p> </form> -<?php - -if (empty($SEARCH_SPIDER)) { -} else { - echo WT_I18N::translate('Search Engine Spider Detected'), ": ", $SEARCH_SPIDER; - echo "</div></body></html>"; -} diff --git a/modules_v3/googlemap/admin_placecheck.php b/modules_v3/googlemap/admin_placecheck.php index 093686e650..6245f2cab1 100644 --- a/modules_v3/googlemap/admin_placecheck.php +++ b/modules_v3/googlemap/admin_placecheck.php @@ -1,6 +1,6 @@ <?php // Provides a way to compare places in your family tree file with the matching -// entries in the Google Maps 'placelocations' table. +// entries in the Google Maps™ 'placelocations' table. // // webtrees: Web based Family History software // Copyright (C) 2012 webtrees development team. @@ -31,7 +31,6 @@ if (!defined('WT_WEBTREES')) { $action =safe_POST ('action' ); $gedcom_id=safe_POST ('gedcom_id', array_keys(get_all_gedcoms()), WT_GED_ID ); -$openinnew=safe_POST_bool('openinnew' ); $country =safe_POST ('country', WT_REGEX_UNSAFE, '' ); if (!$country) { // allow placelist to link directly to a specific country/state @@ -52,11 +51,6 @@ if ($show_changes && !empty($_SESSION['placecheck_gedcom_id'])) { } else { $_SESSION['placecheck_gedcom_id'] = $gedcom_id; } -if ($show_changes && !empty($_SESSION['placecheck_openinnew'])) { - $openinnew = $_SESSION['placecheck_openinnew']; -} else { - $_SESSION['placecheck_openinnew'] = $openinnew; -} if ($show_changes && !empty($_SESSION['placecheck_country'])) { $country = $_SESSION['placecheck_country']; } else { @@ -71,16 +65,32 @@ if ($show_changes && !empty($_SESSION['placecheck_state'])) { $controller=new WT_Controller_Base(); $controller ->requireAdminLogin() - ->setPageTitle(WT_I18N::translate('Place Check')) + ->setPageTitle(WT_I18N::translate('Google Maps™')) ->pageHeader(); -$target=$openinnew ? 'target="_blank"' : ''; +?> +<table id="gm_config"> + <tr> + <th> + <a href="module.php?mod=googlemap&mod_action=admin_editconfig"> + <?php echo WT_I18N::translate('Google Maps™ preferences'); ?> + </a> + </th> + <th> + <a href="module.php?mod=googlemap&mod_action=admin_places"> + <?php echo WT_I18N::translate('Geographic data'); ?> + </a> + </th> + <th> + <a class="current" href="module.php?mod=googlemap&mod_action=admin_placecheck"> + <?php echo WT_I18N::translate('Place Check'); ?> + </a> + <?php echo help_link('GOOGLEMAP_PLACECHECK','googlemap'); ?> + </th> + </tr> +</table> -echo '<table id="gm_config"><tr>', - '<th><a ', (safe_GET('mod_action')=="admin_editconfig" ? 'class="current" ' : ''), 'href="module.php?mod=googlemap&mod_action=admin_editconfig">', WT_I18N::translate('Google Maps configuration'), '</a>', '</th>', - '<th><a ', (safe_GET('mod_action')=="admin_places" ? 'class="current" ' : ''), 'href="module.php?mod=googlemap&mod_action=admin_places">', WT_I18N::translate('Edit geographic place locations'), '</a>', '</th>', - '<th><a ', (safe_GET('mod_action')=="admin_placecheck" ? 'class="current" ' : ''), 'href="module.php?mod=googlemap&mod_action=admin_placecheck">', WT_I18N::translate('Place Check'), '</a>', help_link('GOOGLEMAP_PLACECHECK','googlemap'), '</th>', -'</tr></table>'; +<?php //Start of User Defined options echo '<table id="gm_check_outer">'; @@ -96,12 +106,6 @@ foreach (get_all_gedcoms() as $ged_id=>$gedcom) { echo '<option value="', $ged_id, '"', $ged_id==$gedcom_id?' selected="selected"':'', '>', get_gedcom_setting($ged_id, 'title'), '</option>'; } echo '</select></td></tr>'; -//Option box for 'Open in new window' -echo '<tr><td>', WT_I18N::translate('Open links in'), '</td>'; -echo '<td><select name="openinnew">'; -echo '<option value="0" ', $openinnew?' selected="selected"':'', '>', WT_I18N::translate('Same tab/window'), '</option>'; -echo '<option value="1" ', $openinnew?' selected="selected"':'', '>', WT_I18N::translate('New tab/window'), '</option>'; -echo '</select></td></tr>'; //Option box to select Country within Gedcom echo '<tr><td>', WT_I18N::translate('Country'), '</td>'; echo '<td><select name="country">'; @@ -156,7 +160,7 @@ echo '></td></tr>'; echo '</table>'; echo '</td>'; echo '<td>'; -echo '<input type="submit" value="', WT_I18N::translate('Show'), '"', $target, '><input type="hidden" name="action" value="go">'; +echo '<input type="submit" value="', WT_I18N::translate('Show'), '"><input type="hidden" name="action" value="go">'; echo '</td>'; echo '</tr>'; echo '</form>'; @@ -166,7 +170,7 @@ echo '<hr>'; switch ($action) { case 'go': //Identify gedcom file - echo "<div id=\"gm_check_title\"><span>", WT_I18N::translate('Place list for GEDCOM file'), ": </span>", htmlspecialchars(get_gedcom_setting($gedcom_id, 'title')), "</div>"; + echo '<div id="gm_check_title"><span>', htmlspecialchars(get_gedcom_setting($gedcom_id, 'title')), '</span></div>'; //Select all '2 PLAC ' tags in the file and create array $place_list=array(); $ged_data=WT_DB::prepare("SELECT i_gedcom FROM `##individuals` WHERE i_gedcom LIKE ? AND i_file=?") @@ -241,8 +245,8 @@ case 'go': $span=$max*3+3; echo '<div class="gm_check_details">'; echo '<table class="gm_check_details"><tr>'; - echo '<th rowspan="3">', WT_I18N::translate('GEDCOM File Place Data<br />(2 PLAC tag)'), '</th>'; - echo '<th colspan="', $span, '">', WT_I18N::translate('GoogleMap Places Table Data'), '</th></tr>'; + echo '<th rowspan="3">', WT_I18N::translate('Place'), '</th>'; + echo '<th colspan="', $span, '">', WT_I18N::translate('Geographic data'), '</th></tr>'; echo '<tr>'; while ($cols<$max) { if ($cols == 0) { @@ -365,6 +369,6 @@ case 'go': default: // Do not run until user selects a gedcom/place/etc. // Instead, show some useful help info. - echo "<div class=\"gm_check_top accepted\">", WT_I18N::translate('This will list all the places from the selected GEDCOM file. By default this will NOT INCLUDE places that are fully matched between the GEDCOM file and the GoogleMap tables'), "</div>"; + echo "<div class=\"gm_check_top accepted\">", WT_I18N::translate('This will list all the places from the selected family tree. By default this will NOT INCLUDE places that are fully matched between the family tree and the Google Maps™ tables.'), "</div>"; break; } diff --git a/modules_v3/googlemap/admin_places.php b/modules_v3/googlemap/admin_places.php index 182587685e..a33ae7e021 100644 --- a/modules_v3/googlemap/admin_places.php +++ b/modules_v3/googlemap/admin_places.php @@ -29,6 +29,7 @@ if (!defined('WT_WEBTREES')) { } require WT_ROOT.WT_MODULES_DIR.'googlemap/defaultconfig.php'; +require WT_ROOT.'includes/functions/functions_edit.php'; global $WT_IMAGES; $action=safe_REQUEST($_REQUEST, 'action'); @@ -171,27 +172,39 @@ if ($action=='ExportFile' && WT_USER_IS_ADMIN) { } $controller=new WT_Controller_Base(); -$controller->setPageTitle(WT_I18N::translate('Edit geographic place locations')); +$controller->setPageTitle(WT_I18N::translate('Google Maps™')); $controller->pageHeader(); -echo '<table id="gm_config"><tr>', - '<th><a ', (safe_GET('mod_action')=='admin_editconfig' ? 'class="current" ' : ''), 'href="module.php?mod=googlemap&mod_action=admin_editconfig">', WT_I18N::translate('Google Maps configuration'), '</a>', '</th>', - '<th><a ', (safe_GET('mod_action')=='admin_places' ? 'class="current" ' : ''), 'href="module.php?mod=googlemap&mod_action=admin_places">', WT_I18N::translate('Edit geographic place locations'), '</a>', '</th>', - '<th><a ', (safe_GET('mod_action')=='admin_placecheck' ? 'class="current" ' : ''), 'href="module.php?mod=googlemap&mod_action=admin_placecheck">', WT_I18N::translate('Place Check'), '</a>', help_link('GOOGLEMAP_PLACECHECK','googlemap'), '</th>', -'</tr></table>'; +?> +<table id="gm_config"> + <tr> + <th> + <a href="module.php?mod=googlemap&mod_action=admin_editconfig"> + <?php echo WT_I18N::translate('Google Maps™ preferences'); ?> + </a> + </th> + <th> + <a class="current" href="module.php?mod=googlemap&mod_action=admin_places"> + <?php echo WT_I18N::translate('Geographic data'); ?> + </a> + </th> + <th> + <a href="module.php?mod=googlemap&mod_action=admin_placecheck"> + <?php echo WT_I18N::translate('Place Check'); ?> + </a> + <?php echo help_link('GOOGLEMAP_PLACECHECK','googlemap'); ?> + </th> + </tr> +</table> +<?php if ($action=='ImportGedcom') { + $ged_id=safe_GET('ged_id'); $placelist=array(); $j=0; - if ($mode=='all') { - $statement= - WT_DB::prepare("SELECT i_gedcom FROM `##individuals` UNION ALL SELECT f_gedcom FROM `##families`") - ->execute(); - } else { - $statement= - WT_DB::prepare("SELECT i_gedcom FROM `##individuals` WHERE i_file=? UNION ALL SELECT f_gedcom FROM `##families` WHERE f_file=?") - ->execute(array(WT_GED_ID, WT_GED_ID)); - } + $statement= + WT_DB::prepare("SELECT i_gedcom FROM `##individuals` WHERE i_file=? UNION ALL SELECT f_gedcom FROM `##families` WHERE f_file=?") + ->execute(array($ged_id, $ged_id)); while ($gedrec=$statement->fetchColumn()) { $i = 1; $placerec = get_sub_record(2, '2 PLAC', $gedrec, $i); @@ -571,12 +584,11 @@ foreach (array_reverse($where_am_i, true) as $id=>$place) { } echo '<a href="module.php?mod=googlemap&mod_action=admin_places&parent=0&inactive=', $inactive, '">', WT_I18N::translate('Top Level'), '</a></div>'; echo '<form name="active" method="post" action="module.php?mod=googlemap&mod_action=admin_places&parent=', $parent, '&inactive=', $inactive, '"><div id="gm_active">'; -echo '<label for="inactive">', WT_I18N::translate('Click here to show inactive places'), '</label>'; -echo help_link('PLE_ACTIVE','googlemap'); +echo '<label for="inactive">', WT_I18N::translate('Show inactive places'), '</label>'; echo '<input type="checkbox" name="inactive" id="inactive"'; if ($inactive) echo ' checked="checked"'; echo ' onclick="updateList(this.checked)"'; -echo '></div></form>'; +echo '>', help_link('PLE_ACTIVE','googlemap'), '</div></form>'; $placelist=get_place_list_loc($parent, $inactive); echo '<div class="gm_plac_edit">'; @@ -629,32 +641,48 @@ foreach ($placelist as $place) { ?> </table> </div> + <table id="gm_manage"> <tr> - <td colspan="3"><a href="#" onclick="add_place_location(<?php echo $parent; ?>);return false;"><?php echo WT_I18N::translate('Add place'); ?></a><?php echo help_link('PL_ADD_LOCATION','googlemap'); ?></td> + <td colspan="2"> + <a href="#" onclick="add_place_location(<?php echo $parent; ?>);return false;"> + <?php echo WT_I18N::translate('Add place'); ?> + </a> + </td> + </tr> + <tr> + <td> + <?php echo WT_I18N::translate('Import geographic data from a family tree'); ?> + </td> + <td> + <form action="module.php" method="get"> + <input type="hidden" name="mod" value="googlemap"> + <input type="hidden" name="mod_action" value="admin_places"> + <input type="hidden" name="action" value="ImportGedcom"> + <?php echo select_edit_control('ged_id', get_all_gedcoms(), null, WT_GED_ID); ?> + <input type="submit" value="<?php echo WT_I18N::translate('Import'); ?>"> + </form> + </td> </tr> <tr> - <td><a href="module.php?mod=googlemap&mod_action=admin_places&action=ImportGedcom&mode=curr"><?php echo WT_I18N::translate('Import from current GEDCOM'); ?></a><?php echo help_link('PL_IMPORT_GEDCOM','googlemap'); ?></td> - <td><a href="module.php?mod=googlemap&mod_action=admin_places&action=ImportGedcom&mode=all"><?php echo WT_I18N::translate('Import from all GEDCOMs'); ?></a><?php echo help_link('PL_IMPORT_ALL_GEDCOM','googlemap'); ?></td> - <td><a href="module.php?mod=googlemap&mod_action=admin_places&action=ImportFile&mode=add"><?php echo WT_I18N::translate('Import from file'); ?></a><?php echo help_link('PL_IMPORT_FILE','googlemap'); ?></td> + <td colspan="2"> + <a href="module.php?mod=googlemap&mod_action=admin_places&action=ImportFile"> + <?php echo WT_I18N::translate('Upload geographic data in CSV format'); ?> + </a> + </td> </tr> <tr> <td> -<?php - if (count($where_am_i)<=4) { - echo '<a href="module.php?mod=googlemap&mod_action=admin_places&action=ExportFile&parent=', $parent, '">'; - echo WT_I18N::translate('Export current view to file'), '</a>'; - echo help_link('PL_EXPORT_FILE','googlemap'); - } else { - echo ' '; - } - echo '</td><td colspan="2">'; - echo '<a href="module.php?mod=googlemap&mod_action=admin_places&action=ExportFile&parent=0">'; - echo WT_I18N::translate('Export all locations to file'), '</a>'; - echo help_link('PL_EXPORT_ALL_FILE','googlemap'); - echo '</td></tr></table>'; -if (empty($SEARCH_SPIDER)) { -} else { - echo WT_I18N::translate('Search Engine Spider Detected'), ': ', $SEARCH_SPIDER; - echo '</div></body></html>'; -} + <?php echo WT_I18N::translate('Download geographic data in CSV format'); ?> + </td> + <td> + <form action="module.php" method="get"> + <input type="hidden" name="mod" value="googlemap"> + <input type="hidden" name="mod_action" value="admin_places"> + <input type="hidden" name="action" value="ExportFile"> + <?php echo select_edit_control('parent', $where_am_i, 'All', WT_GED_ID); ?> + <input type="submit" value="<?php echo WT_I18N::translate('Download'); ?>"> + </form> + </td> + </tr> +</table> diff --git a/modules_v3/googlemap/defaultconfig.php b/modules_v3/googlemap/defaultconfig.php index 5907d03d4e..2ca60530cd 100644 --- a/modules_v3/googlemap/defaultconfig.php +++ b/modules_v3/googlemap/defaultconfig.php @@ -92,65 +92,48 @@ global $GM_MARKER_COLOR; global $GM_MARKER_SIZE; global $GM_PREFIX; global $GM_POSTFIX; -global $GM_PRE_POST_MODE; $GM_MARKER_COLOR [1]=get_module_setting('googlemap', 'GM_MARKER_COLOR_1', 'Red' ); // Marker to be used $GM_MARKER_SIZE [1]=get_module_setting('googlemap', 'GM_MARKER_SIZE_1', 'Large'); // 'Small' or 'Large' $GM_PREFIX [1]=get_module_setting('googlemap', 'GM_PREFIX_1', '' ); // Text to be placed in front of the name $GM_POSTFIX [1]=get_module_setting('googlemap', 'GM_POSTFIX_1', '' ); // Text to be placed after the name -$GM_PRE_POST_MODE[1]=get_module_setting('googlemap', 'GM_PRE_POST_MODE_1', '0' ); // Prefix/Postfix mode. Possible value are: - // 0 = no pre/postfix - // 1 = Normal name, Prefix, Postfix, Both - // 2 = Normal name, Postfix, Prefxi, Both - // 3 = Prefix, Postfix, Both, Normal name - // 4 = Postfix, Prefix, Both, Normal name - // 5 = Prefix, Postfix, Normal name, Both - // 6 = Postfix, Prefix, Normal name, Both $GM_MARKER_COLOR [2]=get_module_setting('googlemap', 'GM_MARKER_COLOR_2', 'Red' ); $GM_MARKER_SIZE [2]=get_module_setting('googlemap', 'GM_MARKER_SIZE_2', 'Large'); $GM_PREFIX [2]=get_module_setting('googlemap', 'GM_PREFIX_2', '' ); $GM_POSTFIX [2]=get_module_setting('googlemap', 'GM_POSTFIX_2', '' ); -$GM_PRE_POST_MODE[2]=get_module_setting('googlemap', 'GM_PRE_POST_MODE_2', '0' ); $GM_MARKER_COLOR [3]=get_module_setting('googlemap', 'GM_MARKER_COLOR_3', 'Red' ); $GM_MARKER_SIZE [3]=get_module_setting('googlemap', 'GM_MARKER_SIZE_3', 'Large'); $GM_PREFIX [3]=get_module_setting('googlemap', 'GM_PREFIX_3', '' ); $GM_POSTFIX [3]=get_module_setting('googlemap', 'GM_POSTFIX_3', '' ); -$GM_PRE_POST_MODE[3]=get_module_setting('googlemap', 'GM_PRE_POST_MODE_3', '0' ); $GM_MARKER_COLOR [4]=get_module_setting('googlemap', 'GM_MARKER_COLOR_4', 'Red' ); $GM_MARKER_SIZE [4]=get_module_setting('googlemap', 'GM_MARKER_SIZE_4', 'Large'); $GM_PREFIX [4]=get_module_setting('googlemap', 'GM_PREFIX_4', '' ); $GM_POSTFIX [4]=get_module_setting('googlemap', 'GM_POSTFIX_4', '' ); -$GM_PRE_POST_MODE[4]=get_module_setting('googlemap', 'GM_PRE_POST_MODE_4', '0' ); $GM_MARKER_COLOR [5]=get_module_setting('googlemap', 'GM_MARKER_COLOR_5', 'Red' ); $GM_MARKER_SIZE [5]=get_module_setting('googlemap', 'GM_MARKER_SIZE_5', 'Large'); $GM_PREFIX [5]=get_module_setting('googlemap', 'GM_PREFIX_5', '' ); $GM_POSTFIX [5]=get_module_setting('googlemap', 'GM_POSTFIX_5', '' ); -$GM_PRE_POST_MODE[5]=get_module_setting('googlemap', 'GM_PRE_POST_MODE_5', '0' ); $GM_MARKER_COLOR [6]=get_module_setting('googlemap', 'GM_MARKER_COLOR_6', 'Red' ); $GM_MARKER_SIZE [6]=get_module_setting('googlemap', 'GM_MARKER_SIZE_6', 'Large'); $GM_PREFIX [6]=get_module_setting('googlemap', 'GM_PREFIX_6', '' ); $GM_POSTFIX [6]=get_module_setting('googlemap', 'GM_POSTFIX_6', '' ); -$GM_PRE_POST_MODE[6]=get_module_setting('googlemap', 'GM_PRE_POST_MODE_6', '0' ); $GM_MARKER_COLOR [7]=get_module_setting('googlemap', 'GM_MARKER_COLOR_7', 'Red' ); $GM_MARKER_SIZE [7]=get_module_setting('googlemap', 'GM_MARKER_SIZE_7', 'Large'); $GM_PREFIX [7]=get_module_setting('googlemap', 'GM_PREFIX_7', '' ); $GM_POSTFIX [7]=get_module_setting('googlemap', 'GM_POSTFIX_7', '' ); -$GM_PRE_POST_MODE[7]=get_module_setting('googlemap', 'GM_PRE_POST_MODE_7', '0' ); $GM_MARKER_COLOR [8]=get_module_setting('googlemap', 'GM_MARKER_COLOR_8', 'Red' ); $GM_MARKER_SIZE [8]=get_module_setting('googlemap', 'GM_MARKER_SIZE_8', 'Large'); $GM_PREFIX [8]=get_module_setting('googlemap', 'GM_PREFIX_8', '' ); $GM_POSTFIX [8]=get_module_setting('googlemap', 'GM_POSTFIX_8', '' ); -$GM_PRE_POST_MODE[8]=get_module_setting('googlemap', 'GM_PRE_POST_MODE_8', '0' ); $GM_MARKER_COLOR [9]=get_module_setting('googlemap', 'GM_MARKER_COLOR_9', 'Red' ); $GM_MARKER_SIZE [9]=get_module_setting('googlemap', 'GM_MARKER_SIZE_9', 'Large'); $GM_PREFIX [9]=get_module_setting('googlemap', 'GM_PREFIX_9', '' ); $GM_POSTFIX [9]=get_module_setting('googlemap', 'GM_POSTFIX_9', '' ); -$GM_PRE_POST_MODE[9]=get_module_setting('googlemap', 'GM_PRE_POST_MODE_9', '0' ); diff --git a/modules_v3/googlemap/googlemap.php b/modules_v3/googlemap/googlemap.php index e024580feb..bbea458de1 100644 --- a/modules_v3/googlemap/googlemap.php +++ b/modules_v3/googlemap/googlemap.php @@ -141,33 +141,35 @@ function print_address_structure_map($factrec, $level) { if ($resultText!='<table></table>') echo str_replace(chr(10), ' ' , $resultText); } -function rem_prefix_from_placename($prefix_list, $place, &$placelist) { - $prefix_split = explode(';', $prefix_list); - foreach ($prefix_split as $prefix) { - if ($prefix && substr($place, 0, strlen($prefix)+1)==$prefix.' ') { - $placelist[] = substr($place, strlen($prefix)+1); +function rem_prefix_from_placename($prefix_list, $place, $placelist) { + if ($prefix_list) { + foreach (explode(';', $prefix_list) as $prefix) { + if ($prefix && substr($place, 0, strlen($prefix)+1)==$prefix.' ') { + $placelist[] = substr($place, strlen($prefix)+1); + } } } return $placelist; } -function rem_postfix_from_placename($postfix_list, $place, &$placelist) { - $postfix_split = explode (';', $postfix_list); - foreach ($postfix_split as $postfix) { - if ($postfix && substr($place, -strlen($postfix)-1)==' '.$postfix) { - $placelist[] = substr($place, 0, strlen($place)-strlen($postfix)-1); +function rem_postfix_from_placename($postfix_list, $place, $placelist) { + if ($postfix_list) { + foreach (explode (';', $postfix_list) as $postfix) { + if ($postfix && substr($place, -strlen($postfix)-1)==' '.$postfix) { + $placelist[] = substr($place, 0, strlen($place)-strlen($postfix)-1); + } } } return $placelist; } -function rem_prefix_postfix_from_placename($prefix_list, $postfix_list, $place, &$placelist) { - $prefix_split = explode (";", $prefix_list); - $postfix_split = explode (";", $postfix_list); - foreach ($prefix_split as $prefix) { - foreach ($postfix_split as $postfix) { - if ($prefix && $postfix && substr($place, 0, strlen($prefix)+1)==$prefix.' ' && substr($place, -strlen($postfix)-1)==' '.$postfix) { - $placelist[] = substr($place, strlen($prefix)+1, strlen($place)-strlen($prefix)-strlen($postfix)-2); +function rem_prefix_postfix_from_placename($prefix_list, $postfix_list, $place, $placelist) { + if ($prefix_list && $postfix_list) { + foreach (explode (";", $prefix_list) as $prefix) { + foreach (explode (";", $postfix_list) as $postfix) { + if ($prefix && $postfix && substr($place, 0, strlen($prefix)+1)==$prefix.' ' && substr($place, -strlen($postfix)-1)==' '.$postfix) { + $placelist[] = substr($place, strlen($prefix)+1, strlen($place)-strlen($prefix)-strlen($postfix)-2); + } } } } @@ -175,51 +177,15 @@ function rem_prefix_postfix_from_placename($prefix_list, $postfix_list, $place, } function create_possible_place_names ($placename, $level) { - global $GM_PREFIX, $GM_POSTFIX, $GM_PRE_POST_MODE; + global $GM_PREFIX, $GM_POSTFIX; $retlist = array(); - switch (@$GM_PRE_POST_MODE[$level]) { - case 0: // 0: no pre/postfix - $retlist[] = $placename; - break; - case 1: // 1 = Normal name, Prefix, Postfix, Both - $retlist[] = $placename; - $retlist = rem_prefix_from_placename($GM_PREFIX[$level], $placename, $retlist); - $retlist = rem_postfix_from_placename($GM_POSTFIX[$level], $placename, $retlist); - $retlist = rem_prefix_postfix_from_placename($GM_PREFIX[$level], $GM_POSTFIX[$level], $placename, $retlist); - break; - case 2: // 2 = Normal name, Postfix, Prefix, Both - $retlist[] = $placename; - $retlist = rem_postfix_from_placename($GM_POSTFIX[$level], $placename, $retlist); - $retlist = rem_prefix_from_placename($GM_PREFIX[$level], $placename, $retlist); - $retlist = rem_prefix_postfix_from_placename($GM_PREFIX[$level], $GM_POSTFIX[$level], $placename, $retlist); - break; - case 3: // 3 = Prefix, Postfix, Both, Normal name - $retlist = rem_prefix_from_placename($GM_PREFIX[$level], $placename, $retlist); - $retlist = rem_postfix_from_placename($GM_POSTFIX[$level], $placename, $retlist); - $retlist = rem_prefix_postfix_from_placename($GM_PREFIX[$level], $GM_POSTFIX[$level], $placename, $retlist); - $retlist[] = $placename; - break; - case 4: // 4 = Postfix, Prefix, Both, Normal name - $retlist = rem_postfix_from_placename($GM_POSTFIX[$level], $placename, $retlist); - $retlist = rem_prefix_from_placename($GM_PREFIX[$level], $placename, $retlist); - $retlist = rem_prefix_postfix_from_placename($GM_PREFIX[$level], $GM_POSTFIX[$level], $placename, $retlist); - $retlist[] = $placename; - break; - case 5: // 5 = Prefix, Postfix, Normal name, Both - $retlist = rem_prefix_from_placename($GM_PREFIX[$level], $placename, $retlist); - $retlist = rem_postfix_from_placename($GM_POSTFIX[$level], $placename, $retlist); - $retlist[] = $placename; - $retlist = rem_prefix_postfix_from_placename($GM_PREFIX[$level], $GM_POSTFIX[$level], $placename, $retlist); - break; - case 6: // 6 = Postfix, Prefix, Normal name, Both - $retlist = rem_postfix_from_placename($GM_POSTFIX[$level], $placename, $retlist); - $retlist = rem_prefix_from_placename($GM_PREFIX[$level], $placename, $retlist); - $retlist[] = $placename; - $retlist = rem_prefix_postfix_from_placename($GM_PREFIX[$level], $GM_POSTFIX[$level], $placename, $retlist); - break; - } + // Exact, remove prefix, remove suffix, remove both + $retlist[] = $placename; + $retlist = rem_prefix_from_placename($GM_PREFIX[$level], $placename, $retlist); + $retlist = rem_postfix_from_placename($GM_POSTFIX[$level], $placename, $retlist); + $retlist = rem_prefix_postfix_from_placename($GM_PREFIX[$level], $GM_POSTFIX[$level], $placename, $retlist); return $retlist; } @@ -502,7 +468,7 @@ function build_indiv_map($indifacts, $famids) { echo '</td></tr>'; if (WT_USER_IS_ADMIN) { echo '<tr><td class="center" colspan="2">'; - echo '<a href="module.php?mod=googlemap&mod_action=admin_editconfig">', WT_I18N::translate('Google Maps configuration'), '</a>'; + echo '<a href="module.php?mod=googlemap&mod_action=admin_editconfig">', WT_I18N::translate('Google Maps™ preferences'), '</a>'; echo '</td></tr>'; } } else { diff --git a/modules_v3/googlemap/googlemap_readme.txt b/modules_v3/googlemap/googlemap_readme.txt index b231597fc7..ad8755cb8b 100644 --- a/modules_v3/googlemap/googlemap_readme.txt +++ b/modules_v3/googlemap/googlemap_readme.txt @@ -1,21 +1,21 @@ -README file for the Google Maps module for webtrees +README file for the Google Maps™ module for webtrees The files in this archive should be extracted into your modules directory. -These are the instruction on getting your Google Maps interface to work: +These are the instruction on getting your Google Maps™ interface to work: 1. Go to the Modules. You can find this page under the Administration page. -2. Tick Enable Google Maps. +2. Tick Enable Google Maps™. The map will only be shown if at least one fact has a place with coordinates attached to it. Attaching a coordinate can be done through the generic -place-location interface (located at the Google Maps configuration page) or +place-location interface (located at the Google Maps™ preferences page) or by specifying a MAP record with an event. Adding places one by one to your GEDCOM file (not recommended): This method is included so that you may have an idea of how a GEDCOM stores -place data. You do not need the Google Maps module to use this procedure. +place data. You do not need the Google Maps™ module to use this procedure. The co-ordinates for an event can only be added directly to a GEDCOM file. The correct way to do this is for a PLAC record: 2 PLAC <Placename> @@ -33,7 +33,7 @@ editing if that option is selected. It is also possible to define a MAP record within a ADDR record, even though this is not according to the standard (these records are created by Legacy). -Add a place using webtrees Google Maps module (recommended method): +Add a place using webtrees Google Maps™ module (recommended method): Forenote: the Google Map module is designed to work with locations in tree-like fashion. If we were to consider a suburb of London, the tree would take the @@ -46,7 +46,7 @@ GEDCOM specification, a feature of webtrees. And, BEFORE you start with any mapping endeavours, review your data. Make sure spelling is consistent, there are no 'almost' duplicates, places are in their right country, and the places you describe are in true tree fashion. Only then -will the module make it easy for you to connect family data with Google Maps. +will the module make it easy for you to connect family data with Google Maps™. This feature uses new database tables to store place text and location information. Existing places can be imported and location information can be @@ -66,4 +66,4 @@ whatever is appropriate for your locale.) To make the flags work make sure that ./places/flags directory exists. More information: -http://wiki.webtrees.net/Google_Map_module
\ No newline at end of file +http://wiki.webtrees.net/Google_Map_module diff --git a/modules_v3/googlemap/help_text.php b/modules_v3/googlemap/help_text.php index f17d400308..59d7718666 100644 --- a/modules_v3/googlemap/help_text.php +++ b/modules_v3/googlemap/help_text.php @@ -29,17 +29,6 @@ if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='he } switch ($help) { - -case 'GOOGLEMAP_MAP_TYPE': - $title=WT_I18N::translate('Default map type'); - $text=WT_I18N::translate('The type of map that will be shown by default. This can be Map, Satellite, Hybrid or Terrain.'); - break; - -case 'GOOGLEMAP_MAP_SIZE': - $title=WT_I18N::translate('Size of map (in pixels)'); - $text=WT_I18N::translate('The size of the map (in pixels) as shown on the Individual pages.'); - break; - case 'GOOGLEMAP_MAP_ZOOM': $title=WT_I18N::translate('Zoom factor of map'); $text=WT_I18N::translate('Minimum and maximum zoom factor for the Google map. 1 is the full map, 15 is single house. Note that 15 is only available in certain areas.'); @@ -55,19 +44,9 @@ case 'GM_DEFAULT_LEVEL_0': $text=WT_I18N::translate('Here the default level for the highest level in the place-hierarchy can be defined. If a place cannot be found this name is added as the highest level (country) and the database is searched again.'); break; -case 'GM_NAME_PREFIX': - $title=WT_I18N::translate('Prefix for names used on this level'); - $text=WT_I18N::translate('This value will be added to the front of the names on this level. Multiple values can be used, seperated by semicolons.'); - break; - -case 'GM_NAME_POSTFIX': - $title=WT_I18N::translate('Postfix for names used on this level'); - $text=WT_I18N::translate('This value will be added to the back of the names on this level. Multiple values can be used, seperated by semilcolons.'); - break; - -case 'GM_NAME_PRE_POST': - $title=WT_I18N::translate('Prefix / Postfix order'); - $text=WT_I18N::translate('This field indicates the order in which names are tried using the prefix and postfix. The possible values are:<br /><ul><li>No pre/postfix</li><li>Normal name, Prefix, Postfix, both</li><li>Normal name, Postfix, Prefix, both</li><li>Prefix, Postfix, both, Normal name</li><li>Postfix, Prefix, both, Normal name</li><li>Prefix, Postfix, Normal name, both</li><li>Postfix, Prefix, Normal name, both</li></ul>'); +case 'GM_NAME_PREFIX_SUFFIX': + $title=WT_I18N::translate('Optional prefixes and suffixes'); + $text=WT_I18N::translate('Some place names may be written with optional prefixes and suffixes. For example “Orange” versus “Orange County”. If the family tree contains the full place names, but the geographic database contains the short place names, then you should specify a list of the prefixes and suffixes to be disregarded. Multiple options should be separated with semicolons. For example “County;County of” or “Township;Twp;Twp.”.'); break; case 'PL_EDIT_LOCATION': @@ -75,36 +54,6 @@ case 'PL_EDIT_LOCATION': $text=WT_I18N::translate('Here you can edit the location or delete the location. When you click on Edit a new window will open where you can change the values of the geographic location.<br />If you click on the delete-icon the record will be deleted. This can only be done if there are no records connected to this location. If no records are connected the delete-icon is active, otherwise it is inactive.'); break; -case 'PL_ADD_LOCATION': - $title=WT_I18N::translate('Add geographic location'); - $text=WT_I18N::translate('Use this to add a place to the location table. The location will be added at this level.'); - break; - -case 'PL_IMPORT_GEDCOM': - $title=WT_I18N::translate('Import geographic locations from GEDCOM'); - $text=WT_I18N::translate('Import geographic location-data from current GEDCOM. The current GEDCOM will be scanned and all places will be added to the table. If latitude and longitude are available these will also be imported.'); - break; - -case 'PL_IMPORT_ALL_GEDCOM': - $title=WT_I18N::translate('Import geographic locations from all GEDCOMs'); - $text=WT_I18N::translate('Import geographic location-data from all GEDCOMs. All GEDCOMs will be scanned and all places will be added to the table. If latitude and longitude are available these will also be imported.'); - break; - -case 'PL_IMPORT_FILE': - $title=WT_I18N::translate('Import geographic locations from file'); - $text=WT_I18N::translate('Import geographic location data from a file. The file should be formatted as CSV file on the local computer. The record separator used within the lines is \';\'.'); - break; - -case 'PL_EXPORT_FILE': - $title=WT_I18N::translate('Export locations to file'); - $text=WT_I18N::translate('Export location data to a file. This option will save the data from the current view and all dependant data to a file. This means that if a country is selected and the states are shown, this option will save the data of the states, all the counties that are defined in those states and all places within those counties.'); - break; - -case 'PL_EXPORT_ALL_FILE': - $title=WT_I18N::translate('Export all locations to file'); - $text=WT_I18N::translate('Export all location data to a file. This option will save all location data and transfer it to the local computer.'); - break; - case 'GOOGLEMAP_COORD': $title=WT_I18N::translate('Display Map Coordinates'); $text=WT_I18N::translate('This options sets whether Latitude and Longitude are displayed on the pop-up window attached to map markers.'); @@ -144,12 +93,12 @@ case 'PLIF_LOCALFILE': case 'PLIF_CLEAN': $title=WT_I18N::translate('Clear all place-locations before import?'); - $text=WT_I18N::translate('When this option is selected the placelocation database will be cleared. This means that only the location stored in this table will be deleted. This will not change anything in the GEDCOM.'); + $text=WT_I18N::translate('Delete all the geographic data before importing the new data.'); break; case 'PLIF_UPDATE': $title=WT_I18N::translate('Update existing records'); - $text=WT_I18N::translate('Only update existing records.<br />When this option is selected only existing records will be updated. This can be used to fill in latitude and longitude of places that have been imported from a GEDCOM. No new places will be added to the database.'); + $text=WT_I18N::translate('When this option is selected only existing records will be updated. This can be used to fill in latitude and longitude of places that have been imported from a family tree. No new places will be added to the database.'); break; case 'PLIF_OVERWRITE': @@ -171,26 +120,16 @@ case 'PLE_ACTIVE': case 'GOOGLEMAP_PLACECHECK': $title=WT_I18N::translate('Place Check'); - $text=WT_I18N::translate('<strong>This tool</strong> provides a way to compare places in your gedcom file with the matching entries in the googlemaps \'placelocations\' table.<br /><br /><strong>The display</strong> can be structured for a specific gedcom file; for a specific country within that file; and for a particular area (e.g. state or county) within that country.<br /><br /><strong>Places</strong>are listed alphabetically so that minor spelling differences can be easily spotted, and corrected.<br /><br /><strong>From</strong> the results of the comparison you can click on place names for one of these three options:<br /><br /><strong>1 - </strong>For gedcom file places you will be taken to the Place Heirarchy view. Here you will see all records that are linked to that place.<br /><br /><strong>2 - </strong>For places that exist in the gedcom file, but not in the googlemap table (highlighted in red), you will get the googlemap \"Add place\" screen.<br /><br /><strong>3 - </strong>For places that exist in both the gedcom file and the googlemap table (perhaps without coordinates) you will get the googlemap \"edit place\" screen. Here you can edit any aspect of the place record for the googlemap display.<br /><br /><strong>Hovering</strong> over any place in the googlemap table columns will display the zoom level curently set for that place.'); + $text=WT_I18N::translate('This tool provides a way to compare places in your gedcom file with the matching entries in the Google Maps™ “placelocations” table.<br /><br /><strong>The display</strong> can be structured for a specific gedcom file; for a specific country within that file; and for a particular area (e.g. state or county) within that country.<br /><br /><strong>Places</strong>are listed alphabetically so that minor spelling differences can be easily spotted, and corrected.<br /><br /><strong>From</strong> the results of the comparison you can click on place names for one of these three options:<br /><br /><strong>1 - </strong>For gedcom file places you will be taken to the Place Heirarchy view. Here you will see all records that are linked to that place.<br /><br /><strong>2 - </strong>For places that exist in the gedcom file, but not in the Google Maps™ table (highlighted in red), you will get the Google Maps™ “Add place” screen.<br /><br /><strong>3 - </strong>For places that exist in both the gedcom file and the Google Maps™ table (perhaps without coordinates) you will get the Google Maps™ “edit place” screen. Here you can edit any aspect of the place record for the Google Maps™ display.<br /><br /><strong>Hovering</strong> over any place in the Google Maps™ table columns will display the zoom level curently set for that place.'); break; case 'PLACECHECK_MATCH': $title=WT_I18N::translate('Include matched places'); - $text=WT_I18N::translate('By default the list does NOT INCLUDE places that are fully matched between the GEDCOM file and the GoogleMap tables.<br />Fully matched means all levels exist in both the gedcom file and the GoogleMap tables; and the GoogleMap places have coordinates for every level.<br /><br />Check this block to include those matched places.'); + $text=WT_I18N::translate('By default the list does NOT INCLUDE places that are fully matched between the family tree and the Google Maps™ tables.<br />Fully matched means all levels exist in both the gedcom file and the Google Maps™ tables; and the Google Maps™ places have coordinates for every level.<br /><br />Check this block to include those matched places.'); break; // Help text for Place Hierarchy display -case 'GOOGLEMAP_PH': - $title=WT_I18N::translate('Use Googlemap for Place Hierarchy'); - $text=WT_I18N::translate('Use this option to enable (Yes) or disable (No) the ability to substitute Googlemap for <strong>webtrees</strong> usual Place Hierarchy. To be able to set this option to YES, the Googlemap module must be also be enabled. CAUTION: Before using this option, it is recommended that you insert all places currently existing in your GED into the Googlemap tables.'); - break; - -case 'GOOGLEMAP_PH_MAP_SIZE': - $title=WT_I18N::translate('Size of Place Hierarchy map (in pixels)'); - $text=WT_I18N::translate('The size of the map (in pixels) as shown on the Place Hierarchy pages.'); - break; - case 'GOOGLEMAP_PH_MARKER': $title=WT_I18N::translate('Type of place markers in Place Hierarchy'); $text=WT_I18N::translate('Here you can specify what type of marker be able to use (standard or flag). If place has no flag, use standard marker.'); @@ -203,7 +142,7 @@ case 'GM_DISP_SHORT_PLACE': case 'GM_DISP_COUNT': $title=WT_I18N::translate('Display indis and families counts'); - $text=WT_I18N::translate('Here you can specify if the counts of indis and families connected to the place is displayed. Now if GEDCOM file contains many people is recomended to turn it off.'); + $text=WT_I18N::translate('Here you can specify if the counts of indis and families connected to the place is displayed. If the family tree contains many people is recomended to turn it off.'); break; case 'GOOGLEMAP_PH_WHEEL': @@ -220,7 +159,7 @@ case 'GOOGLEMAP_PH_CONTROLS': case 'PEDIGREE_MAP_clustersize': $title=WT_I18N::translate('Cluster size'); - $text=WT_I18N::translate('The number of markers to be placed at one point before a trail of pins is started in a north east line behind the younger generations. The \'trail\' is usually only visable at high zoom values.'); + $text=WT_I18N::translate('The number of markers to be placed at one point before a trail of pins is started in a north east line behind the younger generations. The “trail” is usually only visable at high zoom values.'); break; case 'PEDIGREE_MAP_hidelines': @@ -230,6 +169,6 @@ case 'PEDIGREE_MAP_hidelines': case 'PEDIGREE_MAP_hideflags': $title=WT_I18N::translate('Hide flags'); - $text=WT_I18N::translate('Hide the flags that are configured in the googlemap module. Usually these are for countries and states. This serves as a visual cue that the markers around the flag are from the general area, and not the specific spot.'); + $text=WT_I18N::translate('Hide the flags that are configured in the Google Maps™ module. Usually these are for countries and states. This serves as a visual cue that the markers around the flag are from the general area, and not the specific spot.'); break; } diff --git a/modules_v3/googlemap/module.php b/modules_v3/googlemap/module.php index d2ada27bf3..aaa1f3d967 100644 --- a/modules_v3/googlemap/module.php +++ b/modules_v3/googlemap/module.php @@ -45,7 +45,7 @@ if (!defined('WT_WEBTREES')) { class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Module_Tab { // Extend WT_Module public function getTitle() { - return /* I18N: The name of a module. Google Maps is a trademark. Do not translate it? http://en.wikipedia.org/wiki/Google_maps */ WT_I18N::translate('Google Maps™'); + return /* I18N: The name of a module. Google Maps™ is a trademark. Do not translate it? http://en.wikipedia.org/wiki/Google_maps */ WT_I18N::translate('Google Maps™'); } // Extend WT_Module @@ -103,7 +103,7 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu global $GOOGLEMAP_MAP_TYPE, $GOOGLEMAP_MIN_ZOOM, $GOOGLEMAP_MAX_ZOOM, $GEDCOM; global $GOOGLEMAP_XSIZE, $GOOGLEMAP_YSIZE, $SHOW_LIVING_NAMES; global $GM_DEFAULT_TOP_VALUE, $GOOGLEMAP_COORD, $GOOGLEMAP_PH_CONTROLS; - global $GM_MARKER_COLOR, $GM_MARKER_SIZE, $GM_PREFIX, $GM_POSTFIX, $GM_PRE_POST_MODE; + global $GM_MARKER_COLOR, $GM_MARKER_SIZE, $GM_PREFIX, $GM_POSTFIX; ob_start(); require_once WT_ROOT.WT_MODULES_DIR.'googlemap/googlemap.php'; @@ -118,10 +118,10 @@ class googlemap_WT_Module extends WT_Module implements WT_Module_Config, WT_Modu if (WT_USER_IS_ADMIN) { echo '<table width="100%"><tr>'; echo '<td width="40%" align="left">'; - echo '<a href="module.php?mod=', $this->getName(), '&mod_action=admin_editconfig">', WT_I18N::translate('Google Maps configuration'), '</a>'; + echo '<a href="module.php?mod=', $this->getName(), '&mod_action=admin_editconfig">', WT_I18N::translate('Google Maps™ preferences'), '</a>'; echo '</td>'; echo '<td width="35%" class="center">'; - echo '<a href="module.php?mod=', $this->getName(), '&mod_action=admin_places">', WT_I18N::translate('Edit geographic place locations'), '</a>'; + echo '<a href="module.php?mod=', $this->getName(), '&mod_action=admin_places">', WT_I18N::translate('Geographic data'), '</a>'; echo '</td>'; echo '<td width="25%" align="right">'; echo '<a href="module.php?mod=', $this->getName(), '&mod_action=admin_placecheck">', WT_I18N::translate('Place Check'),'</a>'; diff --git a/modules_v3/googlemap/pedigree_map.php b/modules_v3/googlemap/pedigree_map.php index da63325d8b..af896df814 100644 --- a/modules_v3/googlemap/pedigree_map.php +++ b/modules_v3/googlemap/pedigree_map.php @@ -2,7 +2,7 @@ // Print pedigree map using Googlemaps. // It requires that your place coordinates are stored on the Google Map // 'place_locations' table. It will NOT find coordinates stored only as tags in -// your GEDCOM file. As in the Google Maps module, it can only display place +// your GEDCOM file. As in the Google Maps™ module, it can only display place // markers where the location exists with identical spelling in both your // GEDCOM '2 PLAC' tag (within the '1 BIRT' event) and the place_locations table. // @@ -225,10 +225,10 @@ echo " background-image: url('", WT_STATIC_URL, "images/loading.gif'); backgroun if (WT_USER_IS_ADMIN) { echo "<table width=\"100%\">"; echo "<tr><td align=\"left\">"; - echo "<a href=\"module.php?mod=googlemap&mod_action=admin_editconfig\">", WT_I18N::translate('Google Maps configuration'), "</a>"; + echo "<a href=\"module.php?mod=googlemap&mod_action=admin_editconfig\">", WT_I18N::translate('Google Maps™ preferences'), "</a>"; echo "</td>"; echo "<td align=\"center\">"; - echo "<a href=\"module.php?mod=googlemap&mod_action=admin_places\">", WT_I18N::translate('Edit geographic place locations'), "</a>"; + echo "<a href=\"module.php?mod=googlemap&mod_action=admin_places\">", WT_I18N::translate('Geographic data'), "</a>"; echo "</td>"; echo "<td align=\"right\">"; echo "<a href=\"module.php?mod=googlemap&mod_action=admin_placecheck\">", WT_I18N::translate('Place Check'), "</a>"; diff --git a/modules_v3/googlemap/placehierarchy.php b/modules_v3/googlemap/placehierarchy.php index 419eb71c87..f1cf5e718d 100644 --- a/modules_v3/googlemap/placehierarchy.php +++ b/modules_v3/googlemap/placehierarchy.php @@ -167,9 +167,9 @@ function create_map($placelevels) { $adminplaces_url .= '&parent='.$latlng['pl_id']; } echo '</tr><tr><td>'; - echo '<a href="module.php?mod=googlemap&mod_action=admin_editconfig">', WT_I18N::translate('Google Maps configuration'), '</a>'; + echo '<a href="module.php?mod=googlemap&mod_action=admin_editconfig">', WT_I18N::translate('Google Maps™ preferences'), '</a>'; echo ' | '; - echo '<a href="'.$adminplaces_url.'">', WT_I18N::translate('Edit geographic place locations'), '</a>'; + echo '<a href="'.$adminplaces_url.'">', WT_I18N::translate('Geographic data'), '</a>'; echo ' | '; echo '<a href="'.$placecheck_url.'">', WT_I18N::translate('Place Check'), '</a>'; if (array_key_exists('batch_update', WT_Module::getActiveModules())) { @@ -218,7 +218,7 @@ function create_map($placelevels) { $sv_lat = $pl_lati; $sv_lng = $pl_long; } - // Set Street View parameters to numeric value if NULL (avoids problem with Google Street View Pane not rendering) + // Set Street View parameters to numeric value if NULL (avoids problem with Google Street View™ Pane not rendering) if ($sv_dir==null) { $sv_dir=0; } @@ -229,9 +229,9 @@ function create_map($placelevels) { $sv_zoom=1; } - $_map = WT_I18N::translate('Google Maps'); + $_map = WT_I18N::translate('Google Maps™'); $_reset = WT_I18N::translate('Reset'); - $_streetview = /* I18N: http://en.wikipedia.org/wiki/Google_street_view */ WT_I18N::translate('Google Street View'); + $_streetview = /* I18N: http://en.wikipedia.org/wiki/Google_street_view */ WT_I18N::translate('Google Street View™'); ?> <div> <iframe style="background:transparent; margin-top:-3px; margin-left:2px; width:530px;height:405px;padding:0;border:solid 0px black" src="<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/wt_v3_street_view.php?x=<?php echo $sv_lng; ?>&y=<?php echo $sv_lat; ?>&z=18&t=2&c=1&s=1&b=<?php echo $sv_dir; ?>&p=<?php echo $sv_pitch; ?>&m=<?php echo $sv_zoom; ?>&j=1&k=1&v=1&map=<?php echo $_map; ?>&reset=<?php echo $_reset; ?>&streetview=<?php echo $_streetview; ?>" marginwidth="0" marginheight="0" frameborder="0" scrolling="no"></iframe> @@ -367,7 +367,7 @@ function print_gm_markers($place2, $level, $parent, $levelm, $linklevels, $place } echo '<br>', WT_I18N::translate('This place has no coordinates'); if (WT_USER_IS_ADMIN) - echo "<br><a href='module.php?mod=googlemap&mod_action=admin_places&parent=", $levelm, "&display=inactive'>", WT_I18N::translate('Edit geographic location'), "</a>"; + echo "<br><a href='module.php?mod=googlemap&mod_action=admin_places&parent=", $levelm, "&display=inactive'>", WT_I18N::translate('Geographic data'), "</a>"; echo "</div>\", icon_type, \"", str_replace(array('‎', '‏'), array(WT_UTF8_LRM, WT_UTF8_RLM), addslashes($place2['place'])), "\");\n"; } else { $lati = str_replace(array('N', 'S', ','), array('', '-', '.'), $place2['lati']); diff --git a/modules_v3/googlemap/places_edit.php b/modules_v3/googlemap/places_edit.php index 5a4744b2b0..839f0eec4e 100644 --- a/modules_v3/googlemap/places_edit.php +++ b/modules_v3/googlemap/places_edit.php @@ -36,7 +36,7 @@ if (isset($_REQUEST['placeid'])) $placeid = $_REQUEST['placeid']; if (isset($_REQUEST['place_name'])) $place_name = $_REQUEST['place_name']; $controller=new WT_Controller_Simple(); -$controller->setPageTitle(WT_I18N::translate('Edit geographic place locations')); +$controller->setPageTitle(WT_I18N::translate('Geographic data')); $controller->pageHeader(); if (!WT_USER_IS_ADMIN) { @@ -127,7 +127,7 @@ if ($action=='updaterecord' && WT_USER_IS_ADMIN) { // Update placelocation STREETVIEW fields ---------------------------------------------------------- if ($action=='update_sv_params' && WT_USER_IS_ADMIN) { - echo "Google Street View parameters updated"; + echo "Google Street View™ parameters updated"; echo "<br><br>"; echo "LATI = ".$_REQUEST['svlati']."<br>"; echo "LONG = ".$_REQUEST['svlong']."<br>"; diff --git a/modules_v3/googlemap/wt_v3_googlemap.js.php b/modules_v3/googlemap/wt_v3_googlemap.js.php index b87c0ffa84..86ecec0525 100644 --- a/modules_v3/googlemap/wt_v3_googlemap.js.php +++ b/modules_v3/googlemap/wt_v3_googlemap.js.php @@ -642,7 +642,7 @@ $STREETVIEW=get_module_setting('googlemap', 'GM_USE_STREETVIEW'); '<ul class="tabs" >', '<li><a href="#event" id="EV"><?php echo WT_I18N::translate('Events'); ?><\/a><\/li>', <?php if ($STREETVIEW) { ?> - '<li><a href="#sview" id="SV"><?php echo WT_I18N::translate('Google Street View'); ?><\/a><\/li>', + '<li><a href="#sview" id="SV"><?php echo WT_I18N::translate('Google Street View™'); ?><\/a><\/li>', <?php } ?> // === To be used later === Do not delete ============== diff --git a/modules_v3/googlemap/wt_v3_pedigree_map.js.php b/modules_v3/googlemap/wt_v3_pedigree_map.js.php index 8e53921489..e37f9b31a5 100644 --- a/modules_v3/googlemap/wt_v3_pedigree_map.js.php +++ b/modules_v3/googlemap/wt_v3_pedigree_map.js.php @@ -5,7 +5,7 @@ // Print pedigree map using Googlemaps. // It requires that your place coordinates are stored on the Google Map // 'place_locations' table. It will NOT find coordinates stored only as tags in -// your GEDCOM file. As in the Google Maps module, it can only display place +// your GEDCOM file. As in the Google Maps™ module, it can only display place // markers where the location exists with identical spelling in both your // GEDCOM '2 PLAC' tag (within the '1 BIRT' event) and the place_locations table. // diff --git a/modules_v3/lightbox/admin_config.php b/modules_v3/lightbox/admin_config.php index 5b776f2b67..207360eba4 100644 --- a/modules_v3/lightbox/admin_config.php +++ b/modules_v3/lightbox/admin_config.php @@ -36,7 +36,7 @@ $controller $action = safe_POST('action'); -if ($action=='update' && !isset($security_user)) { +if ($action=='update') { set_module_setting('lightbox', 'LB_MUSIC_FILE', $_POST['NEW_LB_MUSIC_FILE']); set_module_setting('lightbox', 'LB_SS_SPEED', $_POST['NEW_LB_SS_SPEED']); set_module_setting('lightbox', 'LB_TRANSITION', $_POST['NEW_LB_TRANSITION']); |