diff options
Diffstat (limited to 'modules')
27 files changed, 334 insertions, 337 deletions
diff --git a/modules/GEDFact_assistant/_CENS/census_2_source_input.php b/modules/GEDFact_assistant/_CENS/census_2_source_input.php index 5c173b7575..173dd28edf 100644 --- a/modules/GEDFact_assistant/_CENS/census_2_source_input.php +++ b/modules/GEDFact_assistant/_CENS/census_2_source_input.php @@ -515,7 +515,7 @@ global $TEXT_DIRECTION; } var cens_ctry_a = document.getElementById('censCtry'); var cens_ctry = cens_ctry_a.value; - document.getElementById('Titl').value = '<?php echo i18n::translate('Census transcript'),' - ',$wholename, ' - ', i18n::translate('Household');?>'; + document.getElementById('Titl').value = '<?php echo i18n::translate('Census transcript'),' - ',$wholename, ' - ', i18n::translate('Household'); ?>'; var prev = document.getElementById('prevYear'); prev.value = cenyear; } @@ -1002,7 +1002,7 @@ global $TEXT_DIRECTION; // Input renamed as type=hidden to hide the date field ----- // // Note Input field is still required ---------------------- // ?> - <input type="hidden" style="width:6em; background:#bbddff;" id="censDate" name="censDate" type="text" value="<?php echo "";?>" READONLY/> + <input type="hidden" style="width:6em; background:#bbddff;" id="censDate" name="censDate" type="text" value="<?php echo ""; ?>" READONLY/> </font> </td></tr></table> </div> @@ -1025,20 +1025,20 @@ global $TEXT_DIRECTION; <div class="cens_sour_1"> <div class="cens_sour_2"><?php echo i18n::translate('Title'); ?></div> <script type="text/javascript"> - document.writeln('<input id="Titl" name="Titl" type="text" value="<?php echo i18n::translate('Census transcript'),' - ',$wholename, ' - ', i18n::translate('Household');?>" />'); + document.writeln('<input id="Titl" name="Titl" type="text" value="<?php echo i18n::translate('Census transcript'),' - ',$wholename, ' - ', i18n::translate('Household'); ?>" />'); </script> </div> <div class="cens_sour_1"> <div class="cens_sour_2"><?php echo translate_fact('PAGE'); ?></div> - <input id="citation" name="citation" type="text" value="<?php echo "";?>" /> + <input id="citation" name="citation" type="text" value="<?php echo ""; ?>" /> </div> <div class="cens_sour_1"> <div class="cens_sour_2"><?php echo i18n::translate('Place'); ?></div> - <input id="locality" name="locality" type="text" value="<?php echo "";?>" /> + <input id="locality" name="locality" type="text" value="<?php echo ""; ?>" /> </div> <div class="cens_sour_1"> <div class="cens_sour_2"><?php echo i18n::translate('Notes'); ?></div> - <input id="notes" name="notes" type="text" value="<?php echo "";?>" /> + <input id="notes" name="notes" type="text" value="<?php echo ""; ?>" /> </div> </div> </div> diff --git a/modules/GEDFact_assistant/_CENS/census_3_find.php b/modules/GEDFact_assistant/_CENS/census_3_find.php index c972f57faf..204989e92d 100644 --- a/modules/GEDFact_assistant/_CENS/census_3_find.php +++ b/modules/GEDFact_assistant/_CENS/census_3_find.php @@ -612,26 +612,26 @@ if ($type == "facts") { <div id="layDefinedTags"><table id="tabDefinedTags"> <thead><tr> <th> </th> - <th><?php echo i18n::translate('Tag') ?></th> - <th><?php echo i18n::translate('Description') ?></th> + <th><?php echo i18n::translate('Tag'); ?></th> + <th><?php echo i18n::translate('Description'); ?></th> </tr></thead> <tbody id="tbDefinedTags"> </tbody> </table></div> <table id="tabDefinedTagsShow"><tbody><tr> - <td><a href="#" onclick="Lister.showSelected();return false"><?php echo i18n::translate('Show only selected tags') ?> (<span id="layCurSelectedCount"></span>)</a></td> - <td><a href="#" onclick="Lister.refreshNow(true);return false"><?php echo i18n::translate('Show all tags') ?></a></td> + <td><a href="#" onclick="Lister.showSelected();return false"><?php echo i18n::translate('Show only selected tags'); ?> (<span id="layCurSelectedCount"></span>)</a></td> + <td><a href="#" onclick="Lister.refreshNow(true);return false"><?php echo i18n::translate('Show all tags'); ?></a></td> </tr></tbody></table> <table id="tabFilterAndCustom"><tbody> - <tr><td><?php echo i18n::translate('Filter') ?>:</td><td><input type="text" id="tbxFilter" /></td></tr> - <tr><td><?php echo i18n::translate('Custom tags') ?>:</td><td><input type="text" id="tbxCustom" value="<?php echo addslashes(implode(',', $preselCustom)); ?>" /></td></tr> + <tr><td><?php echo i18n::translate('Filter'); ?>:</td><td><input type="text" id="tbxFilter" /></td></tr> + <tr><td><?php echo i18n::translate('Custom tags'); ?>:</td><td><input type="text" id="tbxCustom" value="<?php echo addslashes(implode(',', $preselCustom)); ?>" /></td></tr> <td><td></tbody></table> <table id="tabAction"><tbody><tr> - <td><button id="btnOk" disabled="disabled" onclick="if(!this.disabled)DoOK();"><?php echo i18n::translate('Accept') ?></button></td> - <td><button onclick="window.close();return false"><?php echo i18n::translate('Cancel') ?></button></td> + <td><button id="btnOk" disabled="disabled" onclick="if(!this.disabled)DoOK();"><?php echo i18n::translate('Accept'); ?></button></td> + <td><button onclick="window.close();return false"><?php echo i18n::translate('Cancel'); ?></button></td> <tr></tbody></table> <?php echo "</td></tr></table>"; diff --git a/modules/GEDFact_assistant/_CENS/census_asst_date.php b/modules/GEDFact_assistant/_CENS/census_asst_date.php index 0f518f51e5..4357b7c40b 100644 --- a/modules/GEDFact_assistant/_CENS/census_asst_date.php +++ b/modules/GEDFact_assistant/_CENS/census_asst_date.php @@ -35,7 +35,7 @@ var ddate = theCensDate.split(', '); document.getElementById('setctry').value = ddate[3]; document.getElementById('setyear').value = ddate[0]; - cal_setDateField('<?php echo $element_id;?>', parseInt(ddate[0]), parseInt(ddate[1]), parseInt(ddate[2])); return false; + cal_setDateField('<?php echo $element_id; ?>', parseInt(ddate[0]), parseInt(ddate[1]), parseInt(ddate[2])); return false; } function pasteAsstDate(setcy, setyr) { document.getElementById(setcy+setyr).selected = true; diff --git a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php index 3c6648e1a9..7463067b47 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php +++ b/modules/GEDFact_assistant/_MEDIA/media_3_search_add.php @@ -41,7 +41,7 @@ if (!defined('WT_WEBTREES')) { //-- Search Function ------------------------------------------------------------ ?> <tr> - <td class="descriptionbox font9 center"><?php echo i18n::translate('Search for People to add to Add Links list.');?></td> + <td class="descriptionbox font9 center"><?php echo i18n::translate('Search for People to add to Add Links list.'); ?></td> </tr> <tr> <td id="srch" class="optionbox center"> diff --git a/modules/GEDFact_assistant/_MEDIA/media_5_input.php b/modules/GEDFact_assistant/_MEDIA/media_5_input.php index d93a24b0aa..a5010d689f 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_5_input.php +++ b/modules/GEDFact_assistant/_MEDIA/media_5_input.php @@ -75,9 +75,9 @@ echo '<script src="modules/GEDFact_assistant/_MEDIA/media_5_input.js" type="text <tr> <th class="topbottombar" width="10" style="font-weight:100;" align="left">#</th> <th class="topbottombar" width="55" style="font-weight:100;" align="left">ID:</th> - <th class="topbottombar" width="370" style="font-weight:100;" align="left"><?php echo i18n::translate('Name');?></th> - <th class="topbottombar" width="20" style="font-weight:100;" align="left"><?php echo i18n::translate('Remove');?></th> - <th class="topbottombar" width="20" style="font-weight:100;" align="left"><?php echo i18n::translate('Navigator');?></th> + <th class="topbottombar" width="370" style="font-weight:100;" align="left"><?php echo i18n::translate('Name'); ?></th> + <th class="topbottombar" width="20" style="font-weight:100;" align="left"><?php echo i18n::translate('Remove'); ?></th> + <th class="topbottombar" width="20" style="font-weight:100;" align="left"><?php echo i18n::translate('Navigator'); ?></th> </tr> </thead> <tbody></tbody> diff --git a/modules/GEDFact_assistant/_MEDIA/media_query_3a.php b/modules/GEDFact_assistant/_MEDIA/media_query_3a.php index d11449e1ae..21f2546f2d 100644 --- a/modules/GEDFact_assistant/_MEDIA/media_query_3a.php +++ b/modules/GEDFact_assistant/_MEDIA/media_query_3a.php @@ -52,7 +52,7 @@ if ($record) { function insertId() { if (window.opener.document.getElementById('addlinkQueue')) { // alert('Please move this alert window and examine the contents of the pop-up window, then click OK') - window.opener.insertRowToTable("<?php echo $record->getXref(); ?>", "<?php echo htmlSpecialChars($record->getFullName()); ?>", "<?php echo $headjs;?>"); + window.opener.insertRowToTable("<?php echo $record->getXref(); ?>", "<?php echo htmlSpecialChars($record->getFullName()); ?>", "<?php echo $headjs; ?>"); window.close(); } } @@ -63,7 +63,7 @@ if ($record) { ?> <script language="JavaScript" type="text/javascript"> function insertId() { - window.opener.alert('<?php echo strtoupper($iid2); ?> - <?php echo i18n::translate('Not a valid Individual, Family or Source ID') ?>'); + window.opener.alert('<?php echo strtoupper($iid2); ?> - <?php echo i18n::translate('Not a valid Individual, Family or Source ID'); ?>'); window.close(); } </script> diff --git a/modules/clippings/index.php b/modules/clippings/index.php index 6d19277432..8a49a003d9 100644 --- a/modules/clippings/index.php +++ b/modules/clippings/index.php @@ -46,64 +46,64 @@ echo WT_JS_START; echo 'function radAncestors(elementid) {var radFamilies=document.getElementById(elementid);radFamilies.checked=true;}'; echo WT_JS_END; -if (count($cart)==0) {?> -<h2><?php echo i18n::translate('Family Tree Clippings Cart');?></h2> +if (count($cart)==0) { ?> +<h2><?php echo i18n::translate('Family Tree Clippings Cart'); ?></h2> <?php } if ($controller->action=='add') { $person = GedcomRecord::getInstance($controller->id); echo "<b>".$person->getFullName()."</b>"; - if ($controller->type=='fam') {?> + if ($controller->type=='fam') { ?> <form action="module.php" method="get"> <input type="hidden" name="mod" value="clippings" /> <input type="hidden" name="mod_action" value="index" /> <table> - <tr><td class="topbottombar"><?php echo i18n::translate('Which other links from this family would you like to add?')?> + <tr><td class="topbottombar"><?php echo i18n::translate('Which other links from this family would you like to add?'); ?> <input type="hidden" name="id" value="<?php echo $controller->id; ?>" /> - <input type="hidden" name="type" value="<?php echo $controller->type ?>" /> + <input type="hidden" name="type" value="<?php echo $controller->type; ?>" /> <input type="hidden" name="action" value="add1" /></td></tr> - <tr><td class="optionbox"><input type="radio" name="others" checked value="none" /><?php echo i18n::translate('Add just this family record.')?></td></tr> - <tr><td class="optionbox"><input type="radio" name="others" value="parents" /><?php echo i18n::translate('Add parents\' records together with this family record.')?></td></tr> - <tr><td class="optionbox"><input type="radio" name="others" value="members" /><?php echo i18n::translate('Add parents\' and children\'s records together with this family record.')?></td></tr> - <tr><td class="optionbox"><input type="radio" name="others" value="descendants" /><?php echo i18n::translate('Add parents\' and all descendants\' records together with this family record.')?></td></tr> - <tr><td class="topbottombar"><input type="submit" value="<?php echo i18n::translate('Continue Adding')?>" /></td></tr> + <tr><td class="optionbox"><input type="radio" name="others" checked value="none" /><?php echo i18n::translate('Add just this family record.'); ?></td></tr> + <tr><td class="optionbox"><input type="radio" name="others" value="parents" /><?php echo i18n::translate('Add parents\' records together with this family record.'); ?></td></tr> + <tr><td class="optionbox"><input type="radio" name="others" value="members" /><?php echo i18n::translate('Add parents\' and children\'s records together with this family record.'); ?></td></tr> + <tr><td class="optionbox"><input type="radio" name="others" value="descendants" /><?php echo i18n::translate('Add parents\' and all descendants\' records together with this family record.'); ?></td></tr> + <tr><td class="topbottombar"><input type="submit" value="<?php echo i18n::translate('Continue Adding'); ?>" /></td></tr> </table> </form> <?php } - else if ($controller->type=='indi') {?> + else if ($controller->type=='indi') { ?> <form action="module.php" method="get"> <input type="hidden" name="mod" value="clippings" /> <input type="hidden" name="mod_action" value="index" /> <table> - <tr><td class="topbottombar"><?php echo i18n::translate('Which links from this person would you also like to add?')?> + <tr><td class="topbottombar"><?php echo i18n::translate('Which links from this person would you also like to add?'); ?> <input type="hidden" name="id" value="<?php echo $controller->id; ?>" /> - <input type="hidden" name="type" value="<?php echo $controller->type ?>" /> + <input type="hidden" name="type" value="<?php echo $controller->type; ?>" /> <input type="hidden" name="action" value="add1" /></td></tr> - <tr><td class="optionbox"><input type="radio" name="others" checked value="none" /><?php echo i18n::translate('Add just this person.')?></td></tr> - <tr><td class="optionbox"><input type="radio" name="others" value="parents" /><?php echo i18n::translate('Add this person, his parents, and siblings.')?></td></tr> - <tr><td class="optionbox"><input type="radio" name="others" value="ancestors" id="ancestors" /><?php echo i18n::translate('Add this person and his direct line ancestors.')?><br /> - <?php echo i18n::translate('Number of generations:') ?> <input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');"/></td></tr> - <tr><td class="optionbox"><input type="radio" name="others" value="ancestorsfamilies" id="ancestorsfamilies" /><?php echo i18n::translate('Add this person, his direct line ancestors, and their families.')?><br > - <?php echo i18n::translate('Number of generations:') ?> <input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');" /></td></tr> - <tr><td class="optionbox"><input type="radio" name="others" value="members" /><?php echo i18n::translate('Add this person, his spouse, and children.')?></td></tr> - <tr><td class="optionbox"><input type="radio" name="others" value="descendants" id="descendants" /><?php echo i18n::translate('Add this person, his spouse, and all descendants.')?><br > - <?php echo i18n::translate('Number of generations:') ?> <input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');" /></td></tr> - <tr><td class="topbottombar"><input type="submit" value="<?php echo i18n::translate('Continue Adding')?>" /> + <tr><td class="optionbox"><input type="radio" name="others" checked value="none" /><?php echo i18n::translate('Add just this person.'); ?></td></tr> + <tr><td class="optionbox"><input type="radio" name="others" value="parents" /><?php echo i18n::translate('Add this person, his parents, and siblings.'); ?></td></tr> + <tr><td class="optionbox"><input type="radio" name="others" value="ancestors" id="ancestors" /><?php echo i18n::translate('Add this person and his direct line ancestors.'); ?><br /> + <?php echo i18n::translate('Number of generations:'); ?> <input type="text" size="5" name="level1" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestors');"/></td></tr> + <tr><td class="optionbox"><input type="radio" name="others" value="ancestorsfamilies" id="ancestorsfamilies" /><?php echo i18n::translate('Add this person, his direct line ancestors, and their families.'); ?><br > + <?php echo i18n::translate('Number of generations:'); ?> <input type="text" size="5" name="level2" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('ancestorsfamilies');" /></td></tr> + <tr><td class="optionbox"><input type="radio" name="others" value="members" /><?php echo i18n::translate('Add this person, his spouse, and children.'); ?></td></tr> + <tr><td class="optionbox"><input type="radio" name="others" value="descendants" id="descendants" /><?php echo i18n::translate('Add this person, his spouse, and all descendants.'); ?><br > + <?php echo i18n::translate('Number of generations:'); ?> <input type="text" size="5" name="level3" value="<?php echo $MAX_PEDIGREE_GENERATIONS; ?>" onfocus="radAncestors('descendants');" /></td></tr> + <tr><td class="topbottombar"><input type="submit" value="<?php echo i18n::translate('Continue Adding'); ?>" /> </table> </form> - <?php } else if ($controller->type=='sour') {?> + <?php } else if ($controller->type=='sour') { ?> <form action="module.php" method="get"> <input type="hidden" name="mod" value="clippings" /> <input type="hidden" name="mod_action" value="index" /> <table> - <tr><td class="topbottombar"><?php echo i18n::translate('Which records linked to this source should be added?')?> + <tr><td class="topbottombar"><?php echo i18n::translate('Which records linked to this source should be added?'); ?> <input type="hidden" name="id" value="<?php echo $controller->id; ?>" /> - <input type="hidden" name="type" value="<?php echo $controller->type ?>" /> + <input type="hidden" name="type" value="<?php echo $controller->type; ?>" /> <input type="hidden" name="action" value="add1" /></td></tr> - <tr><td class="optionbox"><input type="radio" name="others" checked value="none" /><?php echo i18n::translate('Add just this source.')?></td></tr> - <tr><td class="optionbox"><input type="radio" name="others" value="linked" /><?php echo i18n::translate('Add this source and families/people linked to it.')?></td></tr> - <tr><td class="topbottombar"><input type="submit" value="<?php echo i18n::translate('Continue Adding')?>" /> + <tr><td class="optionbox"><input type="radio" name="others" checked value="none" /><?php echo i18n::translate('Add just this source.'); ?></td></tr> + <tr><td class="optionbox"><input type="radio" name="others" value="linked" /><?php echo i18n::translate('Add this source and families/people linked to it.'); ?></td></tr> + <tr><td class="topbottombar"><input type="submit" value="<?php echo i18n::translate('Continue Adding'); ?>" /> </table> </form> <?php } @@ -144,7 +144,7 @@ if ($ct==0) { <?php print_findindi_link('cart_item_id', ''); ?> <?php print_findfamily_link('cart_item_id', ''); ?> <?php print_findsource_link('cart_item_id', ''); ?> - <input type="submit" value="<?php echo i18n::translate('Add');?>"/> + <input type="submit" value="<?php echo i18n::translate('Add'); ?>"/> </td> </tr> @@ -163,7 +163,7 @@ if ($ct==0) { <input type="hidden" name="mod_action" value="index" /> <input type="hidden" name="action" value="download" /> <table> - <tr><td colspan="2" class="topbottombar"><h2><?php echo i18n::translate('File Information') ?></h2></td></tr> + <tr><td colspan="2" class="topbottombar"><h2><?php echo i18n::translate('File Information'); ?></h2></td></tr> <tr><td class="descriptionbox width50 wrap"><?php echo i18n::translate('Zip File(s)'), help_link('zip'); ?></td> <td class="optionbox"><input type="checkbox" name="Zip" value="yes" checked="checked" /></td></tr> @@ -214,12 +214,12 @@ if ($ct==0) { <td class="optionbox"><input type="checkbox" name="remove" value="yes" checked="checked" /></td></tr> <tr><td class="descriptionbox width50 wrap"><?php echo i18n::translate('Convert media path to'), help_link('convertPath'); ?></td> - <td class="list_value"><input type="text" name="conv_path" size="30" value="<?php echo getLRM(), $controller->conv_path, getLRM();?>" /></td></tr> + <td class="list_value"><input type="text" name="conv_path" size="30" value="<?php echo getLRM(), $controller->conv_path, getLRM(); ?>" /></td></tr> <tr><td class="descriptionbox width50 wrap"><?php echo i18n::translate('Convert media folder separators to'), help_link('convertSlashes'); ?></td> <td class="list_value"> - <input type="radio" name="conv_slashes" value="forward" <?php if ($controller->conv_slashes=='forward') echo "checked=\"checked\" "; ?>/> <?php echo i18n::translate('Forward slashes : /');?><br /> - <input type="radio" name="conv_slashes" value="backward" <?php if ($controller->conv_slashes=='backward') echo "checked=\"checked\" "; ?>/> <?php echo i18n::translate('Backslashes : \\');?> + <input type="radio" name="conv_slashes" value="forward" <?php if ($controller->conv_slashes=='forward') echo "checked=\"checked\" "; ?>/> <?php echo i18n::translate('Forward slashes : /'); ?><br /> + <input type="radio" name="conv_slashes" value="backward" <?php if ($controller->conv_slashes=='backward') echo "checked=\"checked\" "; ?>/> <?php echo i18n::translate('Backslashes : \\'); ?> </td></tr> <tr><td class="topbottombar" colspan="2"> @@ -258,7 +258,7 @@ if ($ct==0) { <?php print_findindi_link('cart_item_id', ''); ?> <?php print_findfamily_link('cart_item_id', ''); ?> <?php print_findsource_link('cart_item_id', ''); ?> - <input type="submit" value="<?php echo i18n::translate('Add');?>"/> + <input type="submit" value="<?php echo i18n::translate('Add'); ?>"/> </td> </tr> @@ -267,7 +267,7 @@ if ($ct==0) { <?php } ?> - <br /><a href="module.php?mod=clippings&mod_action=index&action=empty"><?php echo i18n::translate('Empty Cart');?></a><?php echo help_link('empty_cart', $this->getName()); ?> + <br /><a href="module.php?mod=clippings&mod_action=index&action=empty"><?php echo i18n::translate('Empty Cart'); ?></a><?php echo help_link('empty_cart', $this->getName()); ?> </td></tr> <tr><td class="topbottombar"><h2><?php echo i18n::translate('Family Tree Clippings Cart'), help_link('clip_cart', $this->getName()); ?></h2></td></tr> @@ -275,10 +275,10 @@ if ($ct==0) { <tr><td valign="top"> <table id="mycart" class="sortable list_table width100"> <tr> - <th class="list_label"><?php echo i18n::translate('Type')?></th> - <th class="list_label"><?php echo i18n::translate('ID')?></th> - <th class="list_label"><?php echo i18n::translate('Name / Description')?></th> - <th class="list_label"><?php echo i18n::translate('Remove')?></th> + <th class="list_label"><?php echo i18n::translate('Type'); ?></th> + <th class="list_label"><?php echo i18n::translate('ID'); ?></th> + <th class="list_label"><?php echo i18n::translate('Name / Description'); ?></th> + <th class="list_label"><?php echo i18n::translate('Remove'); ?></th> </tr> <?php for ($i=0; $i<$ct; $i++) { @@ -295,16 +295,16 @@ if ($ct==0) { if ($tag=='OBJE') $icon = "media"; ?> <tr><td class="list_value"> - <?php if (!empty($icon)) { ?><img src="<?php echo $WT_IMAGES[$icon];?>" border="0" alt="<?php echo $tag;?>" title="<?php echo $tag;?>" /><?php } ?> + <?php if (!empty($icon)) { ?><img src="<?php echo $WT_IMAGES[$icon]; ?>" border="0" alt="<?php echo $tag; ?>" title="<?php echo $tag; ?>" /><?php } ?> </td> - <td class="list_value ltr"><?php echo $clipping['id']?></td> + <td class="list_value ltr"><?php echo $clipping['id']; ?></td> <td class="list_value"> <?php $record=GedcomRecord::getInstance($clipping['id']); if ($record) echo '<a href="', $record->getHtmlUrl(), '">', PrintReady($record->getListName()), '</a>'; ?> </td> - <td class="list_value center vmiddle"><a href="module.php?mod=clippings&mod_action=index&action=remove&item=<?php echo $i;?>"><img src="<?php echo $WT_IMAGES["remove"];?>" border="0" alt="<?php echo i18n::translate('Remove')?>" title="<?php echo i18n::translate('Remove');?>" /></a></td> + <td class="list_value center vmiddle"><a href="module.php?mod=clippings&mod_action=index&action=remove&item=<?php echo $i; ?>"><img src="<?php echo $WT_IMAGES["remove"]; ?>" border="0" alt="<?php echo i18n::translate('Remove'); ?>" title="<?php echo i18n::translate('Remove'); ?>" /></a></td> </tr> <?php } diff --git a/modules/family_nav/module.php b/modules/family_nav/module.php index 550810ca90..af8e7058dd 100644 --- a/modules/family_nav/module.php +++ b/modules/family_nav/module.php @@ -162,7 +162,7 @@ class family_nav_WT_Module extends WT_Module implements WT_Module_Sidebar { <td class="facts_label<?php echo $styleadd; ?>" nowrap="nowrap" style="width:75px;"> <?php echo $menu->getMenu(); ?> </td> - <td align="center" class="<?php echo $this->controller->getPersonStyle($people["husb"]);?> nam"> + <td align="center" class="<?php echo $this->controller->getPersonStyle($people["husb"]); ?> nam"> <?php echo "<a style=\"font:12px tahoma, arial, helvetica, sans-serif; padding:0px; width:100%;\" href=\"".$people["husb"]->getHtmlUrl()."\" onclick=\"return familyNavLoad('".$people['husb']->getHtmlUrl()."');\">"; echo PrintReady($people["husb"]->getFullName()); diff --git a/modules/googlemap/admin_config.php b/modules/googlemap/admin_config.php index 6d36568dc3..9dde2b9915 100644 --- a/modules/googlemap/admin_config.php +++ b/modules/googlemap/admin_config.php @@ -50,13 +50,13 @@ if (WT_USER_IS_ADMIN) { ?> <td colspan="2" class="topbottombar" style="text-align:center; "><?php echo i18n::translate('GoogleMap Configuration'); ?></td> </tr> <tr> - <td class="optionbox"><a href="module.php?mod=googlemap&mod_action=editconfig"><?php echo i18n::translate('Manage GoogleMap configuration');?></a><?php echo help_link('GOOGLEMAP_CONFIG','googlemap'); ?> + <td class="optionbox"><a href="module.php?mod=googlemap&mod_action=editconfig"><?php echo i18n::translate('Manage GoogleMap configuration'); ?></a><?php echo help_link('GOOGLEMAP_CONFIG','googlemap'); ?> </td> - <td class="optionbox"><a href="module.php?mod=googlemap&mod_action=places"><?php echo i18n::translate('Edit geographic place locations');?></a><?php echo help_link('PLE_EDIT','googlemap'); ?> + <td class="optionbox"><a href="module.php?mod=googlemap&mod_action=places"><?php echo i18n::translate('Edit geographic place locations'); ?></a><?php echo help_link('PLE_EDIT','googlemap'); ?> </td> </tr> <tr> - <td class="optionbox"><a href="module.php?mod=googlemap&mod_action=placecheck"><?php echo i18n::translate('Place Check');?></a><?php echo help_link('GOOGLEMAP_PLACECHECK','googlemap'); ?> + <td class="optionbox"><a href="module.php?mod=googlemap&mod_action=placecheck"><?php echo i18n::translate('Place Check'); ?></a><?php echo help_link('GOOGLEMAP_PLACECHECK','googlemap'); ?> </td> <td class="optionbox"> </td> diff --git a/modules/googlemap/editconfig.php b/modules/googlemap/editconfig.php index f660ac9446..c1c96df959 100644 --- a/modules/googlemap/editconfig.php +++ b/modules/googlemap/editconfig.php @@ -43,7 +43,7 @@ function print_level_config_table($level) { global $GM_MARKER_COLOR, $GM_MARKER_SIZE, $GM_PREFIX; global $GM_POSTFIX, $GM_PRE_POST_MODE, $GM_MAX_NOF_LEVELS; ?> - <div id="level<?php echo $level;?>" style="display:<?php if ($GM_MAX_NOF_LEVELS >= $level) {echo "block";} else {echo "none";}?>"> + <div id="level<?php echo $level; ?>" style="display:<?php if ($GM_MAX_NOF_LEVELS >= $level) {echo "block";} else {echo "none";} ?>"> <table class="facts_table"> <tr> <td class="descriptionbox" colspan="2"> @@ -55,7 +55,7 @@ function print_level_config_table($level) { <?php echo i18n::translate('Prefix'), help_link('GM_NAME_PREFIX','googlemap'); ?> </td> <td> - <input type="text" name="NEW_GM_PREFIX_<?php echo $level;?>" value="<?php echo $GM_PREFIX[$level];?>" size="20" /> + <input type="text" name="NEW_GM_PREFIX_<?php echo $level; ?>" value="<?php echo $GM_PREFIX[$level]; ?>" size="20" /> </td> </tr> <tr> @@ -63,7 +63,7 @@ function print_level_config_table($level) { <?php echo i18n::translate('Postfix'), help_link('GM_NAME_POSTFIX','googlemap'); ?> </td> <td> - <input type="text" name="NEW_GM_POSTFIX_<?php echo $level;?>" value="<?php echo $GM_POSTFIX[$level];?>" size="20" /> + <input type="text" name="NEW_GM_POSTFIX_<?php echo $level; ?>" value="<?php echo $GM_POSTFIX[$level]; ?>" size="20" /> </td> </tr> <tr> @@ -71,14 +71,14 @@ function print_level_config_table($level) { <?php echo i18n::translate('Prefix / Postfix order'), help_link('GM_NAME_PRE_POST','googlemap'); ?> </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 i18n::translate('No pre/postfix');?></option> - <option value="1"<?php if ($GM_PRE_POST_MODE[$level] == 1) echo ' selected="selected"';?>><?php echo i18n::translate('Normal, prefix, postfix, both');?></option> - <option value="2"<?php if ($GM_PRE_POST_MODE[$level] == 2) echo ' selected="selected"';?>><?php echo i18n::translate('Normal, postfix, prefix, both');?></option> - <option value="3"<?php if ($GM_PRE_POST_MODE[$level] == 3) echo ' selected="selected"';?>><?php echo i18n::translate('Prefix, postfix, both, normal');?></option> - <option value="4"<?php if ($GM_PRE_POST_MODE[$level] == 4) echo ' selected="selected"';?>><?php echo i18n::translate('Postfix, prefix, both, normal');?></option> - <option value="5"<?php if ($GM_PRE_POST_MODE[$level] == 5) echo ' selected="selected"';?>><?php echo i18n::translate('Prefix, postfix, normal, both');?></option> - <option value="6"<?php if ($GM_PRE_POST_MODE[$level] == 6) echo ' selected="selected"';?>><?php echo i18n::translate('Postfix, prefix, normal, both');?></option> + <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 i18n::translate('No pre/postfix'); ?></option> + <option value="1"<?php if ($GM_PRE_POST_MODE[$level] == 1) echo ' selected="selected"'; ?>><?php echo i18n::translate('Normal, prefix, postfix, both'); ?></option> + <option value="2"<?php if ($GM_PRE_POST_MODE[$level] == 2) echo ' selected="selected"'; ?>><?php echo i18n::translate('Normal, postfix, prefix, both'); ?></option> + <option value="3"<?php if ($GM_PRE_POST_MODE[$level] == 3) echo ' selected="selected"'; ?>><?php echo i18n::translate('Prefix, postfix, both, normal'); ?></option> + <option value="4"<?php if ($GM_PRE_POST_MODE[$level] == 4) echo ' selected="selected"'; ?>><?php echo i18n::translate('Postfix, prefix, both, normal'); ?></option> + <option value="5"<?php if ($GM_PRE_POST_MODE[$level] == 5) echo ' selected="selected"'; ?>><?php echo i18n::translate('Prefix, postfix, normal, both'); ?></option> + <option value="6"<?php if ($GM_PRE_POST_MODE[$level] == 6) echo ' selected="selected"'; ?>><?php echo i18n::translate('Postfix, prefix, normal, both'); ?></option> </select> </td> </tr> @@ -208,7 +208,7 @@ if ($action=="update" && !isset($security_user)) { <?php echo i18n::translate('GoogleMap API key'), help_link('GOOGLEMAP_API_KEY','googlemap'); ?> </td> <td class="optionbox width60"> - <input type="text" name="NEW_GM_API_KEY" value="<?php echo $GOOGLEMAP_API_KEY;?>" size="60" /> + <input type="text" name="NEW_GM_API_KEY" value="<?php echo $GOOGLEMAP_API_KEY; ?>" size="60" /> </td> </tr> <tr> @@ -217,10 +217,10 @@ if ($action=="update" && !isset($security_user)) { </td> <td class="optionbox width60"> <select name="NEW_GM_MAP_TYPE"> - <option value="G_NORMAL_MAP" <?php if ($GOOGLEMAP_MAP_TYPE=="G_NORMAL_MAP") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Map');?></option> - <option value="G_SATELLITE_MAP" <?php if ($GOOGLEMAP_MAP_TYPE=="G_SATELLITE_MAP") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Satellite');?></option> - <option value="G_HYBRID_MAP" <?php if ($GOOGLEMAP_MAP_TYPE=="G_HYBRID_MAP") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Hybrid');?></option> - <option value="G_PHYSICAL_MAP" <?php if ($GOOGLEMAP_MAP_TYPE=="G_PHYSICAL_MAP") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Terrain');?></option> + <option value="G_NORMAL_MAP" <?php if ($GOOGLEMAP_MAP_TYPE=="G_NORMAL_MAP") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Map'); ?></option> + <option value="G_SATELLITE_MAP" <?php if ($GOOGLEMAP_MAP_TYPE=="G_SATELLITE_MAP") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Satellite'); ?></option> + <option value="G_HYBRID_MAP" <?php if ($GOOGLEMAP_MAP_TYPE=="G_HYBRID_MAP") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Hybrid'); ?></option> + <option value="G_PHYSICAL_MAP" <?php if ($GOOGLEMAP_MAP_TYPE=="G_PHYSICAL_MAP") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Terrain'); ?></option> </select> </td> </tr> @@ -230,9 +230,9 @@ if ($action=="update" && !isset($security_user)) { </td> <td class="optionbox width60"> <?php echo i18n::translate('Width'); ?> - <input type="text" name="NEW_GM_XSIZE" value="<?php echo $GOOGLEMAP_XSIZE;?>" size="10" /> + <input type="text" name="NEW_GM_XSIZE" value="<?php echo $GOOGLEMAP_XSIZE; ?>" size="10" /> <?php echo i18n::translate('Height'); ?> - <input type="text" name="NEW_GM_YSIZE" value="<?php echo $GOOGLEMAP_YSIZE;?>" size="10" /> + <input type="text" name="NEW_GM_YSIZE" value="<?php echo $GOOGLEMAP_YSIZE; ?>" size="10" /> </td> </tr> <tr> @@ -249,9 +249,9 @@ if ($action=="update" && !isset($security_user)) { </td> <td class="optionbox width60"> <?php echo i18n::translate('Width'); ?> - <input type="text" name="NEW_GM_PH_XSIZE" value="<?php echo $GOOGLEMAP_PH_XSIZE;?>" size="10" /> + <input type="text" name="NEW_GM_PH_XSIZE" value="<?php echo $GOOGLEMAP_PH_XSIZE; ?>" size="10" /> <?php echo i18n::translate('Height'); ?> - <input type="text" name="NEW_GM_PH_YSIZE" value="<?php echo $GOOGLEMAP_PH_YSIZE;?>" size="10" /> + <input type="text" name="NEW_GM_PH_YSIZE" value="<?php echo $GOOGLEMAP_PH_YSIZE; ?>" size="10" /> </td> </tr> <tr> @@ -260,8 +260,8 @@ if ($action=="update" && !isset($security_user)) { </td> <td class="optionbox width60"> <select name="NEW_GM_PH_MARKER"> - <option value="G_DEFAULT_ICON" <?php if ($GOOGLEMAP_PH_MARKER=="G_DEFAULT_ICON") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Standard');?></option> - <option value="G_FLAG" <?php if ($GOOGLEMAP_PH_MARKER=="G_FLAG") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Flag');?></option> + <option value="G_DEFAULT_ICON" <?php if ($GOOGLEMAP_PH_MARKER=="G_DEFAULT_ICON") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Standard'); ?></option> + <option value="G_FLAG" <?php if ($GOOGLEMAP_PH_MARKER=="G_FLAG") echo "selected=\"selected\""; ?>><?php echo i18n::translate('Flag'); ?></option> </select> </td> </tr> @@ -310,14 +310,14 @@ if ($action=="update" && !isset($security_user)) { <?php echo i18n::translate('Zoom factor of map'), help_link('GOOGLEMAP_MAP_ZOOM','googlemap'); ?> </td> <td class="optionbox width60"> - <?php echo i18n::translate('minimum');?>: <select name="NEW_GM_MIN_ZOOM"> + <?php echo 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> + <option value="<?php echo $j, "\""; if ($GOOGLEMAP_MIN_ZOOM==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> <?php } ?> </select> - <?php echo i18n::translate('maximum');?>: <select name="NEW_GM_MAX_ZOOM"> + <?php echo i18n::translate('maximum'); ?>: <select name="NEW_GM_MAX_ZOOM"> <?php for ($j=1; $j < 15; $j++) { ?> - <option value="<?php echo $j, "\""; if ($GOOGLEMAP_MAX_ZOOM==$j) echo " selected=\"selected\""; echo ">", $j;?></option> + <option value="<?php echo $j, "\""; if ($GOOGLEMAP_MAX_ZOOM==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> <?php } ?> </select> </td> @@ -329,54 +329,54 @@ if ($action=="update" && !isset($security_user)) { <td class="optionbox width60"> <table> <tr> - <td><?php echo i18n::translate('Country');?> </td> + <td><?php echo 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> + <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_0==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> <?php } ?> - </select> <?php echo i18n::translate('digits');?> + </select> <?php echo i18n::translate('digits'); ?> </td> </tr> <tr> - <td><?php echo i18n::translate('State');?> </td> + <td><?php echo 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> + <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_1==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> <?php } ?> - </select> <?php echo i18n::translate('digits');?> + </select> <?php echo i18n::translate('digits'); ?> </td> </tr> <tr> - <td><?php echo i18n::translate('City');?> </td> + <td><?php echo 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> + <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_2==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> <?php } ?> - </select> <?php echo i18n::translate('digits');?> + </select> <?php echo i18n::translate('digits'); ?> </td> </tr> - <tr><td><?php echo i18n::translate('Neighborhood');?> </td> + <tr><td><?php echo 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> + <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_3==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> <?php } ?> - </select> <?php echo i18n::translate('digits');?> + </select> <?php echo i18n::translate('digits'); ?> </td> </tr> - <tr><td><?php echo i18n::translate('House');?> </td> + <tr><td><?php echo 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> + <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_4==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> <?php } ?> - </select> <?php echo i18n::translate('digits');?> + </select> <?php echo i18n::translate('digits'); ?> </td> </tr> - <tr><td><?php echo i18n::translate('Max');?> </td> + <tr><td><?php echo 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> + <option value="<?php echo $j; ?>"<?php if ($GOOGLEMAP_PRECISION_5==$j) echo " selected=\"selected\""; echo ">", $j; ?></option> <?php } ?> - </select> <?php echo i18n::translate('digits');?> + </select> <?php echo i18n::translate('digits'); ?> </td> </tr> </table> @@ -384,27 +384,27 @@ if ($action=="update" && !isset($security_user)) { </tr> <tr> <td class="descriptionbox nowrap"><?php echo i18n::translate('Default top level value'), help_link('GM_DEFAULT_LEVEL_0','googlemap'); ?></td> - <td class="optionbox width60"><input type="text" name="NEW_GM_DEFAULT_TOP_LEVEL" value="<?php echo $GM_DEFAULT_TOP_VALUE;?>" size="20" /></td> + <td class="optionbox width60"><input type="text" name="NEW_GM_DEFAULT_TOP_LEVEL" value="<?php echo $GM_DEFAULT_TOP_VALUE; ?>" size="20" /></td> </tr> <tr> <td class="descriptionbox nowrap"><?php echo i18n::translate('Number of levels'), help_link('GM_NOF_LEVELS','googlemap'); ?></td> <td class="optionbox width60"> <select name="NEW_GM_LEVEL_COUNT" dir="ltr" onchange="showSelectedLevels()"> - <option value="1"<?php if ($GM_MAX_NOF_LEVELS == 1) echo " selected=\"selected\"";?>>1</option> - <option value="2"<?php if ($GM_MAX_NOF_LEVELS == 2) echo " selected=\"selected\"";?>>2</option> - <option value="3"<?php if ($GM_MAX_NOF_LEVELS == 3) echo " selected=\"selected\"";?>>3</option> - <option value="4"<?php if ($GM_MAX_NOF_LEVELS == 4) echo " selected=\"selected\"";?>>4</option> - <option value="5"<?php if ($GM_MAX_NOF_LEVELS == 5) echo " selected=\"selected\"";?>>5</option> - <option value="6"<?php if ($GM_MAX_NOF_LEVELS == 6) echo " selected=\"selected\"";?>>6</option> - <option value="7"<?php if ($GM_MAX_NOF_LEVELS == 7) echo " selected=\"selected\"";?>>7</option> - <option value="8"<?php if ($GM_MAX_NOF_LEVELS == 8) echo " selected=\"selected\"";?>>8</option> - <option value="9"<?php if ($GM_MAX_NOF_LEVELS == 9) echo " selected=\"selected\"";?>>9</option> + <option value="1"<?php if ($GM_MAX_NOF_LEVELS == 1) echo " selected=\"selected\""; ?>>1</option> + <option value="2"<?php if ($GM_MAX_NOF_LEVELS == 2) echo " selected=\"selected\""; ?>>2</option> + <option value="3"<?php if ($GM_MAX_NOF_LEVELS == 3) echo " selected=\"selected\""; ?>>3</option> + <option value="4"<?php if ($GM_MAX_NOF_LEVELS == 4) echo " selected=\"selected\""; ?>>4</option> + <option value="5"<?php if ($GM_MAX_NOF_LEVELS == 5) echo " selected=\"selected\""; ?>>5</option> + <option value="6"<?php if ($GM_MAX_NOF_LEVELS == 6) echo " selected=\"selected\""; ?>>6</option> + <option value="7"<?php if ($GM_MAX_NOF_LEVELS == 7) echo " selected=\"selected\""; ?>>7</option> + <option value="8"<?php if ($GM_MAX_NOF_LEVELS == 8) echo " selected=\"selected\""; ?>>8</option> + <option value="9"<?php if ($GM_MAX_NOF_LEVELS == 9) echo " selected=\"selected\""; ?>>9</option> </select> </td> </tr> <tr> <td class="descriptionbox nowrap"> - <?php echo i18n::translate('Configuration per level');?> + <?php echo i18n::translate('Configuration per level'); ?> </td> <td class="optionbox width60"> <?php @@ -424,13 +424,13 @@ if ($action=="update" && !isset($security_user)) { <table class="facts_table"> <tr> <td class="descriptionbox" colspan="2" align="center"> - <a href="module.php?mod=googlemap&mod_action=places"><?php echo i18n::translate('Edit geographic place locations');?></a> + <a href="module.php?mod=googlemap&mod_action=places"><?php echo i18n::translate('Edit geographic place locations'); ?></a> </td> <tr> <td class="descriptionbox" colspan="2" align="center"> - <input type="submit" value="<?php echo i18n::translate('Save configuration');?>" onclick="closeHelp();" /> + <input type="submit" value="<?php echo i18n::translate('Save configuration'); ?>" onclick="closeHelp();" /> - <input type="reset" value="<?php echo i18n::translate('Reset');?>" /> + <input type="reset" value="<?php echo i18n::translate('Reset'); ?>" /> </td> </tr> </table> diff --git a/modules/googlemap/flags.php b/modules/googlemap/flags.php index 43bcfd138a..dc5a1631f4 100644 --- a/modules/googlemap/flags.php +++ b/modules/googlemap/flags.php @@ -81,11 +81,11 @@ if ($action == "ChangeFlag") { <!-- function edit_close() { <?php if($_POST["selcountry"] == "Countries") { ?> - window.opener.document.editplaces.icon.value = "places/flags/<?php echo $flags[$_POST["FLAGS"]];?>.gif"; - window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"places/flags/<?php echo $country[$_POST["FLAGS"]];?>.gif\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo i18n::translate('Change flag')?></a> <a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo i18n::translate('Remove flag')?></a>"; + window.opener.document.editplaces.icon.value = "places/flags/<?php echo $flags[$_POST["FLAGS"]]; ?>.gif"; + window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"places/flags/<?php echo $country[$_POST["FLAGS"]]; ?>.gif\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo i18n::translate('Change flag'); ?></a> <a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo i18n::translate('Remove flag'); ?></a>"; <?php } else { ?> - window.opener.document.editplaces.icon.value = "places/<?php echo $countrySelected, "/flags/", $flags[$_POST["FLAGS"]];?>.gif"; - window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"places/<?php echo $countrySelected, "/flags/", $flags[$_POST["FLAGS"]];?>.gif\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo i18n::translate('Change flag')?></a> <a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo i18n::translate('Remove flag')?></a>"; + window.opener.document.editplaces.icon.value = "places/<?php echo $countrySelected, "/flags/", $flags[$_POST["FLAGS"]]; ?>.gif"; + window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"places/<?php echo $countrySelected, "/flags/", $flags[$_POST["FLAGS"]]; ?>.gif\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo i18n::translate('Change flag'); ?></a> <a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo i18n::translate('Remove flag'); ?></a>"; <?php } ?> window.close(); } @@ -148,10 +148,10 @@ else { } ?> -<form method="post" id="flags" name="flags" action="module.php?mod=googlemap&mod_action=flags&countrySelected=<?php echo $countrySelected;?>"> +<form method="post" id="flags" name="flags" action="module.php?mod=googlemap&mod_action=flags&countrySelected=<?php echo $countrySelected; ?>"> <input type="hidden" name="action" value="ChangeFlag" /> - <input type="hidden" name="selcountry" value="<?php echo $countrySelected;?>" /> - <input id="savebutton" name="save1" type="submit" disabled="true" value="<?php echo i18n::translate('Save');?>" /><br /> + <input type="hidden" name="selcountry" value="<?php echo $countrySelected; ?>" /> + <input id="savebutton" name="save1" type="submit" disabled="true" value="<?php echo i18n::translate('Save'); ?>" /><br /> <table class="facts_table"> <tr> <td class="optionbox" colspan="4"> @@ -188,10 +188,9 @@ else { ?> </tr> </table> - <input id="savebutton" name="save2" type="submit" disabled="true" value="<?php echo i18n::translate('Save');?>" /><br /> + <input id="savebutton" name="save2" type="submit" disabled="true" value="<?php echo i18n::translate('Save'); ?>" /><br /> </form> <?php echo "<div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close();\">", i18n::translate('Close Window'), "</a></div><br />\n"; print_simple_footer(); -?> diff --git a/modules/googlemap/googlemap.php b/modules/googlemap/googlemap.php index e9f42b78b6..11e80143f0 100644 --- a/modules/googlemap/googlemap.php +++ b/modules/googlemap/googlemap.php @@ -318,10 +318,10 @@ function setup_map() { GUnload(); // Firefox and standard browsers }, false); } - var GOOGLEMAP_MAP_TYPE =<?php echo $GOOGLEMAP_MAP_TYPE;?>; - var minZoomLevel = <?php echo $GOOGLEMAP_MIN_ZOOM;?>; - var maxZoomLevel = <?php echo $GOOGLEMAP_MAX_ZOOM;?>; - var startZoomLevel = <?php echo $GOOGLEMAP_MAX_ZOOM;?>; + var GOOGLEMAP_MAP_TYPE =<?php echo $GOOGLEMAP_MAP_TYPE; ?>; + var minZoomLevel = <?php echo $GOOGLEMAP_MIN_ZOOM; ?>; + var maxZoomLevel = <?php echo $GOOGLEMAP_MAX_ZOOM; ?>; + var startZoomLevel = <?php echo $GOOGLEMAP_MAX_ZOOM; ?>; //]]> </script> <?php @@ -385,11 +385,11 @@ function create_indiv_buttons() { var button4 = document.createElement('li'); var button5 = document.createElement('li'); - button1.innerHTML = '<?php echo i18n::translate('Redraw map')?>'; - button2.innerHTML = '<?php echo i18n::translate('Map')?>'; - button3.innerHTML = '<?php echo i18n::translate('Satellite')?>'; - button4.innerHTML = '<?php echo i18n::translate('Hybrid')?>'; - button5.innerHTML = '<?php echo i18n::translate('Terrain')?>'; + button1.innerHTML = '<?php echo i18n::translate('Redraw map'); ?>'; + button2.innerHTML = '<?php echo i18n::translate('Map'); ?>'; + button3.innerHTML = '<?php echo i18n::translate('Satellite'); ?>'; + button4.innerHTML = '<?php echo i18n::translate('Hybrid'); ?>'; + button5.innerHTML = '<?php echo i18n::translate('Terrain'); ?>'; button1.onclick = function() { javascript:ResizeMap(); return false; }; button2.onclick = function() { map.setMapType(G_NORMAL_MAP); return false; }; diff --git a/modules/googlemap/pedigree_map.php b/modules/googlemap/pedigree_map.php index b10cd0b70c..a22ff13575 100644 --- a/modules/googlemap/pedigree_map.php +++ b/modules/googlemap/pedigree_map.php @@ -137,7 +137,7 @@ echo PrintReady($controller->getPersonName())."</h2>"; <tr> <td class="optionbox"> <input class="pedigree_form" type="text" id="rootid" name="rootid" size="3" value="<?php echo $controller->rootid; ?>" /> - <?php print_findindi_link("rootid","");?> + <?php print_findindi_link("rootid",""); ?> </td> <td class="optionbox"> <select name="PEDIGREE_GENERATIONS"> @@ -475,11 +475,11 @@ function Map_type() {} var button4 = document.createElement('li'); var button5 = document.createElement('li'); - button1.innerHTML = '<?php echo i18n::translate('Redraw map')?>'; - button2.innerHTML = '<?php echo i18n::translate('Map')?>'; - button3.innerHTML = '<?php echo i18n::translate('Satellite')?>'; - button4.innerHTML = '<?php echo i18n::translate('Hybrid')?>'; - button5.innerHTML = '<?php echo i18n::translate('Terrain')?>'; + button1.innerHTML = '<?php echo i18n::translate('Redraw map'); ?>'; + button2.innerHTML = '<?php echo i18n::translate('Map'); ?>'; + button3.innerHTML = '<?php echo i18n::translate('Satellite'); ?>'; + button4.innerHTML = '<?php echo i18n::translate('Hybrid'); ?>'; + button5.innerHTML = '<?php echo i18n::translate('Terrain'); ?>'; button1.onclick = function() { pm_map.setCenter(bounds.getCenter(), pm_map.getBoundsZoomLevel(bounds)); return false; }; button2.onclick = function() { pm_map.setMapType(G_NORMAL_MAP); return false; }; @@ -704,11 +704,11 @@ document.getElementById("side_bar").innerHTML = side_bar_html; // === create the context menu div === var contextmenu = document.createElement("div"); contextmenu.style.visibility="hidden"; - contextmenu.innerHTML = '<a href="javascript:zoomIn()"><div class="optionbox"> <?php echo i18n::translate('Zoom in');?> </div></a>' - + '<a href="javascript:zoomOut()"><div class="optionbox"> <?php echo i18n::translate('Zoom out');?> </div></a>' - + '<a href="javascript:zoomInHere()"><div class="optionbox"> <?php echo i18n::translate('Zoom in here');?> </div></a>' - + '<a href="javascript:zoomOutHere()"><div class="optionbox"> <?php echo i18n::translate('Zoom out here');?> </div></a>' - + '<a href="javascript:centreMapHere()"><div class="optionbox"> <?php echo i18n::translate('Center map here');?> </div></a>'; + contextmenu.innerHTML = '<a href="javascript:zoomIn()"><div class="optionbox"> <?php echo i18n::translate('Zoom in'); ?> </div></a>' + + '<a href="javascript:zoomOut()"><div class="optionbox"> <?php echo i18n::translate('Zoom out'); ?> </div></a>' + + '<a href="javascript:zoomInHere()"><div class="optionbox"> <?php echo i18n::translate('Zoom in here'); ?> </div></a>' + + '<a href="javascript:zoomOutHere()"><div class="optionbox"> <?php echo i18n::translate('Zoom out here'); ?> </div></a>' + + '<a href="javascript:centreMapHere()"><div class="optionbox"> <?php echo i18n::translate('Center map here'); ?> </div></a>'; pm_map.getContainer().appendChild(contextmenu); // === listen for singlerightclick === @@ -767,7 +767,7 @@ document.getElementById("side_bar").innerHTML = side_bar_html; GEvent.addListener(pm_map, "click", function() { contextmenu.style.visibility="hidden"; }); - <?php if ($GOOGLEMAP_PH_CONTROLS) {?> + <?php if ($GOOGLEMAP_PH_CONTROLS) { ?> // hide controls GEvent.addListener(pm_map, 'mouseout', function() {pm_map.hideControls();}); // show controls diff --git a/modules/googlemap/placehierarchy.php b/modules/googlemap/placehierarchy.php index 505081be9a..922439ec0d 100644 --- a/modules/googlemap/placehierarchy.php +++ b/modules/googlemap/placehierarchy.php @@ -455,11 +455,11 @@ function map_scripts($numfound, $level, $parent, $linklevels, $placelevels, $pla var button4 = document.createElement('li'); var button5 = document.createElement('li'); - button1.innerHTML = '<?php echo i18n::translate('Redraw map')?>'; - button2.innerHTML = '<?php echo i18n::translate('Map')?>'; - button3.innerHTML = '<?php echo i18n::translate('Satellite')?>'; - button4.innerHTML = '<?php echo i18n::translate('Hybrid')?>'; - button5.innerHTML = '<?php echo i18n::translate('Terrain')?>'; + button1.innerHTML = '<?php echo i18n::translate('Redraw map'); ?>'; + button2.innerHTML = '<?php echo i18n::translate('Map'); ?>'; + button3.innerHTML = '<?php echo i18n::translate('Satellite'); ?>'; + button4.innerHTML = '<?php echo i18n::translate('Hybrid'); ?>'; + button5.innerHTML = '<?php echo i18n::translate('Terrain'); ?>'; button1.onclick = function() { <?php if ($numfound>1) { @@ -631,7 +631,7 @@ function map_scripts($numfound, $level, $parent, $linklevels, $placelevels, $pla ?> //end markers place_map.setCenter(bounds.getCenter()); - <?php if ($GOOGLEMAP_PH_CONTROLS) {?> + <?php if ($GOOGLEMAP_PH_CONTROLS) { ?> // hide controls GEvent.addListener(place_map, 'mouseout', function() {place_map.hideControls();}); // show controls diff --git a/modules/googlemap/places.php b/modules/googlemap/places.php index a27c776351..35034689c5 100644 --- a/modules/googlemap/places.php +++ b/modules/googlemap/places.php @@ -336,7 +336,7 @@ if ($action=="ImportFile") { </tr> <?php } ?> <tr> - <td class="descriptionbox"><?php echo i18n::translate('Clear all place-locations before import?'), help_link('PLIF_CLEAN','googlemap');?></td> + <td class="descriptionbox"><?php echo i18n::translate('Clear all place-locations before import?'), help_link('PLIF_CLEAN','googlemap'); ?></td> <td class="optionbox"><input type="checkbox" name="cleardatabase"></td> </tr> <tr> @@ -348,7 +348,7 @@ if ($action=="ImportFile") { <td class="optionbox"><input type="checkbox" name="overwritedata"></td> </tr> </table> - <input id="savebutton" type="submit" value="<?php echo i18n::translate('Continue Adding');?>" /><br /> + <input id="savebutton" type="submit" value="<?php echo i18n::translate('Continue Adding'); ?>" /><br /> </form> <?php print_footer(); @@ -535,7 +535,7 @@ function add_place_location(placeid) { } function delete_place(placeid) { - var answer=confirm("<?php echo i18n::translate('Remove this location?');?>"); + var answer=confirm("<?php echo i18n::translate('Remove this location?'); ?>"); if (answer == true) { window.location = "<?php echo $_SERVER["REQUEST_URI"]; ?>&action=DeleteRecord&deleteRecord=" + placeid; } @@ -615,7 +615,7 @@ foreach ($placelist as $place) { ->execute(array($place["place_id"])) ->fetchOne(); if ($noRows==0) { ?> - <td class="optionbox"><a href="javascript:;" onclick="delete_place(<?php echo $place["place_id"], ");return false;\">";?><img src="images/remove.gif" border="0" alt="<?php echo i18n::translate('Remove');?>" /></a></td> + <td class="optionbox"><a href="javascript:;" onclick="delete_place(<?php echo $place["place_id"], ");return false;\">"; ?><img src="images/remove.gif" border="0" alt="<?php echo i18n::translate('Remove'); ?>" /></a></td> <?php } else { ?> <td class="optionbox"><img src="images/remove-dis.png" border="0" alt="" /> </td> <?php } ?> @@ -628,14 +628,14 @@ foreach ($placelist as $place) { ?> <table class="facts_table"> <tr> - <td class="optionbox" colspan="2"><a href="javascript:;" onclick="add_place_location(<?php echo $parent;?>);return false;"><?php echo i18n::translate('Add place');?></a><?php echo help_link('PL_ADD_LOCATION','googlemap'); ?></td> + <td class="optionbox" colspan="2"><a href="javascript:;" onclick="add_place_location(<?php echo $parent; ?>);return false;"><?php echo i18n::translate('Add place'); ?></a><?php echo help_link('PL_ADD_LOCATION','googlemap'); ?></td> </tr> <tr> - <td class="optionbox"><a href="module.php?mod=googlemap&mod_action=places&action=ImportGedcom&mode=curr"><?php echo i18n::translate('Import from current GEDCOM');?></a><?php echo help_link('PL_IMPORT_GEDCOM','googlemap'); ?></td> - <td class="optionbox"><a href="module.php?mod=googlemap&mod_action=places&action=ImportGedcom&mode=all"><?php echo i18n::translate('Import from all GEDCOMs');?></a><?php echo help_link('PL_IMPORT_ALL_GEDCOM','googlemap'); ?></td> + <td class="optionbox"><a href="module.php?mod=googlemap&mod_action=places&action=ImportGedcom&mode=curr"><?php echo i18n::translate('Import from current GEDCOM'); ?></a><?php echo help_link('PL_IMPORT_GEDCOM','googlemap'); ?></td> + <td class="optionbox"><a href="module.php?mod=googlemap&mod_action=places&action=ImportGedcom&mode=all"><?php echo i18n::translate('Import from all GEDCOMs'); ?></a><?php echo help_link('PL_IMPORT_ALL_GEDCOM','googlemap'); ?></td> </tr> <tr> - <td class="optionbox" colspan="2"><a href="module.php?mod=googlemap&mod_action=places&action=ImportFile&mode=add"><?php echo i18n::translate('Import from file');?></a><?php echo help_link('PL_IMPORT_FILE','googlemap'); ?></td> + <td class="optionbox" colspan="2"><a href="module.php?mod=googlemap&mod_action=places&action=ImportFile&mode=add"><?php echo i18n::translate('Import from file'); ?></a><?php echo help_link('PL_IMPORT_FILE','googlemap'); ?></td> </tr> <tr> <td class="optionbox"> diff --git a/modules/googlemap/places_edit.php b/modules/googlemap/places_edit.php index 360c5a4f5b..be92f4c1fd 100644 --- a/modules/googlemap/places_edit.php +++ b/modules/googlemap/places_edit.php @@ -232,7 +232,7 @@ if ($action=="add") { } ?> -<script src="http://maps.google.com/maps?file=api&v=2&sensor=false&key=<?php echo $GOOGLEMAP_API_KEY?>" type="text/javascript"></script> +<script src="http://maps.google.com/maps?file=api&v=2&sensor=false&key=<?php echo $GOOGLEMAP_API_KEY; ?>" type="text/javascript"></script> <script type="text/javascript"> <!-- if (window.attachEvent) { @@ -364,10 +364,10 @@ if ($action=="add") { var button3 = document.createElement('li'); var button4 = document.createElement('li'); - button1.innerHTML = '<?php echo i18n::translate('Map')?>'; - button2.innerHTML = '<?php echo i18n::translate('Satellite')?>'; - button3.innerHTML = '<?php echo i18n::translate('Hybrid')?>'; - button4.innerHTML = '<?php echo i18n::translate('Terrain')?>'; + button1.innerHTML = '<?php echo i18n::translate('Map'); ?>'; + button2.innerHTML = '<?php echo i18n::translate('Satellite'); ?>'; + button3.innerHTML = '<?php echo i18n::translate('Hybrid'); ?>'; + button4.innerHTML = '<?php echo i18n::translate('Terrain'); ?>'; button1.onclick = function() { map.setMapType(G_NORMAL_MAP); return false; }; button2.onclick = function() { map.setMapType(G_SATELLITE_MAP); return false; }; @@ -479,9 +479,9 @@ if ($action=="add") { document.editplaces.NEW_ZOOM_FACTOR.value = map.getZoom(); }); <?php if(($place_long == null) || ($place_lati == null)) { ?> - map.setCenter(new GLatLng( <?php echo $parent_lati, ", ", $parent_long, "), ", $zoomfactor;?>, G_NORMAL_MAP ); + map.setCenter(new GLatLng( <?php echo $parent_lati, ", ", $parent_long, "), ", $zoomfactor; ?>, G_NORMAL_MAP ); <?php }else { ?> - map.setCenter(new GLatLng( <?php echo $place_lati, ", ", $place_long, "), ", $zoomfactor;?>, G_NORMAL_MAP ); + map.setCenter(new GLatLng( <?php echo $place_lati, ", ", $place_long, "), ", $zoomfactor; ?>, G_NORMAL_MAP ); <?php } ?> <?php if ($level < 3) { ?> @@ -526,7 +526,7 @@ if ($action=="add") { } if ($show_marker == true) { if (($place_icon == NULL) || ($place_icon == "")) { - if (($place_lati == null) || ($place_long == null)) {?> + if (($place_lati == null) || ($place_long == null)) { ?> var icon_type = new GIcon(); icon_type.image = "modules/googlemap/images/marker_yellow.png"; icon_type.shadow = "modules/googlemap/images/shadow50.png"; @@ -534,23 +534,23 @@ if ($action=="add") { icon_type.shadowSize = new GSize(37, 34); icon_type.iconAnchor = new GPoint(10, 34); icon_type.infoWindowAnchor = new GPoint(5, 1); - map.addOverlay(new GMarker(new GLatLng(<?php echo $parent_lati, ", ", $parent_long;?>), icon_type)); + map.addOverlay(new GMarker(new GLatLng(<?php echo $parent_lati, ", ", $parent_long; ?>), icon_type)); <?php } else { ?> - map.addOverlay(new GMarker(new GLatLng(<?php echo $place_lati, ", ", $place_long;?>))); + map.addOverlay(new GMarker(new GLatLng(<?php echo $place_lati, ", ", $place_long; ?>))); <?php } } else { ?> var flagicon = new GIcon(); - flagicon.image = "<?php echo $place_icon;?>"; + flagicon.image = "<?php echo $place_icon; ?>"; flagicon.shadow = "modules/googlemap/images/flag_shadow.png"; flagicon.iconSize = new GSize(25, 15); flagicon.shadowSize = new GSize(35, 45); flagicon.iconAnchor = new GPoint(1, 45); flagicon.infoWindowAnchor = new GPoint(5, 1); -<?php if (($place_lati == null) || ($place_long == null)) {?> - map.addOverlay(new GMarker(new GLatLng(<?php echo $parent_lati, ", ", $parent_long;?>), flagicon)); +<?php if (($place_lati == null) || ($place_long == null)) { ?> + map.addOverlay(new GMarker(new GLatLng(<?php echo $parent_lati, ", ", $parent_long; ?>), flagicon)); <?php } else { ?> - map.addOverlay(new GMarker(new GLatLng(<?php echo $place_lati, ", ", $place_long;?>), flagicon)); + map.addOverlay(new GMarker(new GLatLng(<?php echo $place_lati, ", ", $place_long; ?>), flagicon)); <?php } } } ?> @@ -602,43 +602,43 @@ if ($action=="add") { var marker = new GMarker(point, icon); GEvent.addListener(marker, "click", function() { marker.openInfoWindowHtml(name + "<br /><a href=\"javascript:;\" onclick=\"setLoc(" + coordinates[1] + ", " + coordinates[0] + ");\"><?php - echo PrintReady(i18n::translate('Use this value'))?></a></div>"); + echo PrintReady(i18n::translate('Use this value')); ?></a></div>"); }); return marker; } function change_icon() { - window.open('module.php?mod=googlemap&mod_action=flags&countrySelected=<?php echo $selected_country ?>', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1'); + window.open('module.php?mod=googlemap&mod_action=flags&countrySelected=<?php echo $selected_country; ?>', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1'); return false; } function remove_icon() { document.editplaces.icon.value = ""; - document.getElementById('flagsDiv').innerHTML = "<a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo i18n::translate('Change flag')?></a>"; + document.getElementById('flagsDiv').innerHTML = "<a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo i18n::translate('Change flag'); ?></a>"; } function addAddressToMap(response) { map.clearOverlays(); var bounds = new GLatLngBounds(); if (!response || response.Status.code != 200) { - alert("<?php echo i18n::translate('No places found');?>"); + alert("<?php echo i18n::translate('No places found'); ?>"); } else { if(response.Placemark.length>0) { for (i=0;i<response.Placemark.length;i++) { place = response.Placemark[i]; point = new GLatLng(place.Point.coordinates[1], place.Point.coordinates[0]); - var name = '<td width=\'100%\'><div class=\'iwstyle\' style=\'width: 250px;\'>' + place.address + '<br />' + '<b><?php echo i18n::translate('Country')?>:</b> ' + place.AddressDetails.Country.CountryNameCode; + var name = '<td width=\'100%\'><div class=\'iwstyle\' style=\'width: 250px;\'>' + place.address + '<br />' + '<b><?php echo i18n::translate('Country'); ?>:</b> ' + place.AddressDetails.Country.CountryNameCode; var marker = createMarker(point, name, place.Point.coordinates); map.addOverlay(marker); bounds.extend(point); } zoomlevel = map.getBoundsZoomLevel(bounds)-1; - if (zoomlevel < <?php echo $GOOGLEMAP_MIN_ZOOM;?>) zoomlevel = <?php echo $GOOGLEMAP_MIN_ZOOM;?>; - if (zoomlevel > <?php echo $GOOGLEMAP_MAX_ZOOM;?>) zoomlevel = <?php echo $GOOGLEMAP_MAX_ZOOM;?>; + if (zoomlevel < <?php echo $GOOGLEMAP_MIN_ZOOM; ?>) zoomlevel = <?php echo $GOOGLEMAP_MIN_ZOOM; ?>; + if (zoomlevel > <?php echo $GOOGLEMAP_MAX_ZOOM; ?>) zoomlevel = <?php echo $GOOGLEMAP_MAX_ZOOM; ?>; if (document.editplaces.NEW_ZOOM_FACTOR.value<zoomlevel) { zoomlevel = document.editplaces.NEW_ZOOM_FACTOR.value; - if (zoomlevel < <?php echo $GOOGLEMAP_MIN_ZOOM;?>) zoomlevel = <?php echo $GOOGLEMAP_MIN_ZOOM;?>; - if (zoomlevel > <?php echo $GOOGLEMAP_MAX_ZOOM;?>) zoomlevel = <?php echo $GOOGLEMAP_MAX_ZOOM;?>; + if (zoomlevel < <?php echo $GOOGLEMAP_MIN_ZOOM; ?>) zoomlevel = <?php echo $GOOGLEMAP_MIN_ZOOM; ?>; + if (zoomlevel > <?php echo $GOOGLEMAP_MAX_ZOOM; ?>) zoomlevel = <?php echo $GOOGLEMAP_MAX_ZOOM; ?>; } map.setCenter(bounds.getCenter(), zoomlevel); @@ -647,7 +647,7 @@ if ($action=="add") { } function showLocation_level(address) { - address += '<?php if ($level>0) echo ", ", addslashes(PrintReady(implode(', ', array_reverse($where_am_i, true))));?>'; + address += '<?php if ($level>0) echo ", ", addslashes(PrintReady(implode(', ', array_reverse($where_am_i, true)))); ?>'; geocoder.getLocations(address, addAddressToMap); } @@ -667,16 +667,16 @@ if ($action=="add") { </script> <form method="post" id="editplaces" name="editplaces" action="module.php?mod=googlemap&mod_action=places_edit"> - <input type="hidden" name="action" value="<?php echo $action;?>record" /> - <input type="hidden" name="placeid" value="<?php echo $placeid;?>" /> - <input type="hidden" name="level" value="<?php echo $level;?>" /> - <input type="hidden" name="icon" value="<?php echo $place_icon;?>" /> - <input type="hidden" name="parent_id" value="<?php echo $parent_id;?>" /> - <input type="hidden" name="place_long" value="<?php echo $place_long;?>" /> - <input type="hidden" name="place_lati" value="<?php echo $place_lati;?>" /> - <input type="hidden" name="parent_long" value="<?php echo $parent_long;?>" /> - <input type="hidden" name="parent_lati" value="<?php echo $parent_lati;?>" /> - <input name="save1" type="submit" value="<?php echo i18n::translate('Save');?>" /><br /> + <input type="hidden" name="action" value="<?php echo $action; ?>record" /> + <input type="hidden" name="placeid" value="<?php echo $placeid; ?>" /> + <input type="hidden" name="level" value="<?php echo $level; ?>" /> + <input type="hidden" name="icon" value="<?php echo $place_icon; ?>" /> + <input type="hidden" name="parent_id" value="<?php echo $parent_id; ?>" /> + <input type="hidden" name="place_long" value="<?php echo $place_long; ?>" /> + <input type="hidden" name="place_lati" value="<?php echo $place_lati; ?>" /> + <input type="hidden" name="parent_long" value="<?php echo $parent_long; ?>" /> + <input type="hidden" name="parent_lati" value="<?php echo $parent_lati; ?>" /> + <input name="save1" type="submit" value="<?php echo i18n::translate('Save'); ?>" /><br /> <table class="facts_table"> <tr> @@ -689,16 +689,16 @@ if ($action=="add") { </td> </tr> <tr> - <td class="descriptionbox"><?php echo translate_fact('PLAC'), help_link('PLE_PLACES','googlemap');?></td> - <td class="optionbox"><input type="text" id="new_pl_name" name="NEW_PLACE_NAME" value="<?php echo htmlspecialchars($place_name) ?>" size="25" class="address_input" /> + <td class="descriptionbox"><?php echo translate_fact('PLAC'), help_link('PLE_PLACES','googlemap'); ?></td> + <td class="optionbox"><input type="text" id="new_pl_name" name="NEW_PLACE_NAME" value="<?php echo htmlspecialchars($place_name); ?>" size="25" class="address_input" /> <div id="INDI_PLAC_pop" style="display: inline;"> - <?php print_specialchar_link("NEW_PLACE_NAME", false);?></div> - <label for="new_pl_name"><a href="javascript:;" onclick="showLocation_level(document.getElementById('new_pl_name').value); return false"> <?php echo i18n::translate('Search on this level')?></a></label> | - <label for="new_pl_name"><a href="javascript:;" onclick="showLocation_all(document.getElementById('new_pl_name').value); return false"> <?php echo i18n::translate('Search all')?></a></label> + <?php print_specialchar_link("NEW_PLACE_NAME", false); ?></div> + <label for="new_pl_name"><a href="javascript:;" onclick="showLocation_level(document.getElementById('new_pl_name').value); return false"> <?php echo i18n::translate('Search on this level'); ?></a></label> | + <label for="new_pl_name"><a href="javascript:;" onclick="showLocation_all(document.getElementById('new_pl_name').value); return false"> <?php echo i18n::translate('Search all'); ?></a></label> </td> </tr> <tr> - <td class="descriptionbox"><?php echo i18n::translate('Precision'), help_link('PLE_PRECISION','googlemap');?></td> + <td class="descriptionbox"><?php echo i18n::translate('Precision'), help_link('PLE_PRECISION','googlemap'); ?></td> <?php $exp = explode(".", $place_lati); if (isset($exp[1])) { @@ -719,44 +719,44 @@ if ($action=="add") { } ?> <td class="optionbox"> - <input type="radio" id="new_prec_0" name="NEW_PRECISION" onchange="updateMap();" <?php if($precision==$GOOGLEMAP_PRECISION_0) echo "checked=\"checked\"";?> value="<?php echo $GOOGLEMAP_PRECISION_0;?>" /> - <label for="new_prec_0"><?php echo i18n::translate('Country');?></label> - <input type="radio" id="new_prec_1" name="NEW_PRECISION" onchange="updateMap();" <?php if($precision==$GOOGLEMAP_PRECISION_1) echo "checked=\"checked\"";?> value="<?php echo $GOOGLEMAP_PRECISION_1;?>" /> - <label for="new_prec_1"><?php echo i18n::translate('State');?></label> - <input type="radio" id="new_prec_2" name="NEW_PRECISION" onchange="updateMap();" <?php if($precision==$GOOGLEMAP_PRECISION_2) echo "checked=\"checked\"";?> value="<?php echo $GOOGLEMAP_PRECISION_2;?>" /> - <label for="new_prec_2"><?php echo i18n::translate('City');?></label> - <input type="radio" id="new_prec_3" name="NEW_PRECISION" onchange="updateMap();" <?php if($precision==$GOOGLEMAP_PRECISION_3) echo "checked=\"checked\"";?> value="<?php echo $GOOGLEMAP_PRECISION_3;?>" /> - <label for="new_prec_3"><?php echo i18n::translate('Neighborhood');?></label> - <input type="radio" id="new_prec_4" name="NEW_PRECISION" onchange="updateMap();"<?php if($precision==$GOOGLEMAP_PRECISION_4) echo "checked=\"checked\"";?> value="<?php echo $GOOGLEMAP_PRECISION_4;?>" /> - <label for="new_prec_4"><?php echo i18n::translate('House');?></label> - <input type="radio" id="new_prec_5" name="NEW_PRECISION" onchange="updateMap();"<?php if($precision>$GOOGLEMAP_PRECISION_4) echo "checked=\"checked\"";?> value="<?php echo $GOOGLEMAP_PRECISION_5;?>" /> - <label for="new_prec_5"><?php echo i18n::translate('Max');?></label> + <input type="radio" id="new_prec_0" name="NEW_PRECISION" onchange="updateMap();" <?php if($precision==$GOOGLEMAP_PRECISION_0) echo "checked=\"checked\""; ?> value="<?php echo $GOOGLEMAP_PRECISION_0; ?>" /> + <label for="new_prec_0"><?php echo i18n::translate('Country'); ?></label> + <input type="radio" id="new_prec_1" name="NEW_PRECISION" onchange="updateMap();" <?php if($precision==$GOOGLEMAP_PRECISION_1) echo "checked=\"checked\""; ?> value="<?php echo $GOOGLEMAP_PRECISION_1; ?>" /> + <label for="new_prec_1"><?php echo i18n::translate('State'); ?></label> + <input type="radio" id="new_prec_2" name="NEW_PRECISION" onchange="updateMap();" <?php if($precision==$GOOGLEMAP_PRECISION_2) echo "checked=\"checked\""; ?> value="<?php echo $GOOGLEMAP_PRECISION_2; ?>" /> + <label for="new_prec_2"><?php echo i18n::translate('City'); ?></label> + <input type="radio" id="new_prec_3" name="NEW_PRECISION" onchange="updateMap();" <?php if($precision==$GOOGLEMAP_PRECISION_3) echo "checked=\"checked\""; ?> value="<?php echo $GOOGLEMAP_PRECISION_3; ?>" /> + <label for="new_prec_3"><?php echo i18n::translate('Neighborhood'); ?></label> + <input type="radio" id="new_prec_4" name="NEW_PRECISION" onchange="updateMap();"<?php if($precision==$GOOGLEMAP_PRECISION_4) echo "checked=\"checked\""; ?> value="<?php echo $GOOGLEMAP_PRECISION_4; ?>" /> + <label for="new_prec_4"><?php echo i18n::translate('House'); ?></label> + <input type="radio" id="new_prec_5" name="NEW_PRECISION" onchange="updateMap();"<?php if($precision>$GOOGLEMAP_PRECISION_4) echo "checked=\"checked\""; ?> value="<?php echo $GOOGLEMAP_PRECISION_5; ?>" /> + <label for="new_prec_5"><?php echo i18n::translate('Max'); ?></label> </td> </tr> <tr> <td class="descriptionbox"><?php echo translate_fact('LATI'), help_link('PLE_LATLON_CTRL','googlemap'); ?></td> <td class="optionbox"> <select name="LATI_CONTROL" onchange="updateMap();"> - <option value="" <?php if ($place_lati == null) echo " selected=\"selected\"";?>></option> + <option value="" <?php if ($place_lati == null) echo " selected=\"selected\""; ?>></option> <option value="PL_N" <?php if ($place_lati > 0) echo " selected=\"selected\""; echo ">", i18n::translate_c('North', 'N'); ?></option> <option value="PL_S" <?php if ($place_lati < 0) echo " selected=\"selected\""; echo ">", i18n::translate_c('South', 'S'); ?></option> </select> - <input type="text" name="NEW_PLACE_LATI" value="<?php if ($place_lati != null) echo abs($place_lati);?>" size="20" onchange="updateMap();" /></td> + <input type="text" name="NEW_PLACE_LATI" value="<?php if ($place_lati != null) echo abs($place_lati); ?>" size="20" onchange="updateMap();" /></td> </tr> <tr> <td class="descriptionbox"><?php echo translate_fact('LONG'), help_link('PLE_LATLON_CTRL','googlemap'); ?></td> <td class="optionbox"> <select name="LONG_CONTROL" onchange="updateMap();"> - <option value="" <?php if ($place_long == null) echo " selected=\"selected\"";?>></option> + <option value="" <?php if ($place_long == null) echo " selected=\"selected\""; ?>></option> <option value="PL_E" <?php if ($place_long > 0) echo " selected=\"selected\""; echo ">", i18n::translate_c('East', 'E'); ?></option> <option value="PL_W" <?php if ($place_long < 0) echo " selected=\"selected\""; echo ">", i18n::translate_c('West', 'W'); ?></option> </select> - <input type="text" name="NEW_PLACE_LONG" value="<?php if ($place_long != null) echo abs($place_long);?>" size="20" onchange="updateMap();" /></td> + <input type="text" name="NEW_PLACE_LONG" value="<?php if ($place_long != null) echo abs($place_long); ?>" size="20" onchange="updateMap();" /></td> </tr> <tr> <td class="descriptionbox"><?php echo i18n::translate('Zoom factor'), help_link('PLE_ZOOM','googlemap'); ?></td> <td class="optionbox"> - <input type="text" name="NEW_ZOOM_FACTOR" value="<?php echo $zoomfactor;?>" size="20" onchange="updateMap();" /></td> + <input type="text" name="NEW_ZOOM_FACTOR" value="<?php echo $zoomfactor; ?>" size="20" onchange="updateMap();" /></td> </tr> <tr> <td class="descriptionbox"><?php echo i18n::translate('Flag'), help_link('PLE_ICON','googlemap'); ?></td> @@ -764,17 +764,17 @@ if ($action=="add") { <div id="flagsDiv"> <?php if (($place_icon == NULL) || ($place_icon == "")) { ?> - <a href="javascript:;" onclick="change_icon();return false;"><?php echo i18n::translate('Change flag')?></a> + <a href="javascript:;" onclick="change_icon();return false;"><?php echo i18n::translate('Change flag'); ?></a> <?php } else { ?> - <img alt="<?php echo i18n::translate('Flag')?>" src="<?php echo $place_icon;?>"/> - <a href="javascript:;" onclick="change_icon();return false;"><?php echo i18n::translate('Change flag')?></a> - <a href="javascript:;" onclick="remove_icon();return false;"><?php echo i18n::translate('Remove flag')?></a> + <img alt="<?php echo i18n::translate('Flag'); ?>" src="<?php echo $place_icon; ?>"/> + <a href="javascript:;" onclick="change_icon();return false;"><?php echo i18n::translate('Change flag'); ?></a> + <a href="javascript:;" onclick="remove_icon();return false;"><?php echo i18n::translate('Remove flag'); ?></a> <?php } ?> </div></td> </tr> </table> - <input name="save2" type="submit" value="<?php echo i18n::translate('Save');?>" /><br /> + <input name="save2" type="submit" value="<?php echo i18n::translate('Save'); ?>" /><br /> </form> <?php echo "<center><br /><br /><br /><a href=\"javascript:;\" onclick=\"edit_close('{$link}')\">", i18n::translate('Close Window'), "</a><br /></center>\n"; diff --git a/modules/lightbox/admin_config.php b/modules/lightbox/admin_config.php index 27ac4ef9ed..1d07f9b6ed 100644 --- a/modules/lightbox/admin_config.php +++ b/modules/lightbox/admin_config.php @@ -42,7 +42,7 @@ if (WT_USER_IS_ADMIN) { ?> </tr> <tr> <td class="optionbox"> - <a href="module.php?mod=lightbox&mod_action=lb_editconfig"><?php echo i18n::translate('Manage Lightbox configuration');?> + <a href="module.php?mod=lightbox&mod_action=lb_editconfig"><?php echo i18n::translate('Manage Lightbox configuration'); ?> </a><?php echo help_link('LIGHTBOX_CONFIG', $this->getName()); ?> </td> <td class="optionbox"> diff --git a/modules/lightbox/album.php b/modules/lightbox/album.php index 24b3af6fd7..52ea855ac9 100644 --- a/modules/lightbox/album.php +++ b/modules/lightbox/album.php @@ -98,9 +98,9 @@ $sort_i=0; // Used in sorting on lightbox_print_media_row.php page <input type="hidden" id="ord2" name="order2" value="" /> <center> - <button type="submit" title="<?php echo i18n::translate('Saves the sorted media to the database');?>" onclick="saveOrder();" ><?php echo i18n::translate('Save');?></button> - <button type="submit" title="<?php echo i18n::translate('Reset to the original order');?>" onclick="document.reorder_form.action.value='al_reset_media_update'; document.reorder_form.submit();"><?php echo i18n::translate('Reset');?></button> - <button type="button" title="<?php echo i18n::translate('Quit and return');?>" onClick="location.href='<?php echo WT_SCRIPT_NAME, "?pid=", $pid, "&tab=", $tabno; ?>'"><?php echo i18n::translate('Cancel');?></button> + <button type="submit" title="<?php echo i18n::translate('Saves the sorted media to the database'); ?>" onclick="saveOrder();" ><?php echo i18n::translate('Save'); ?></button> + <button type="submit" title="<?php echo i18n::translate('Reset to the original order'); ?>" onclick="document.reorder_form.action.value='al_reset_media_update'; document.reorder_form.submit();"><?php echo i18n::translate('Reset'); ?></button> + <button type="button" title="<?php echo i18n::translate('Quit and return'); ?>" onClick="location.href='<?php echo WT_SCRIPT_NAME, "?pid=", $pid, "&tab=", $tabno; ?>'"><?php echo i18n::translate('Cancel'); ?></button> <?php /* // Debug --------------------------------------------------------------------------- diff --git a/modules/lightbox/functions/lb_call_js.php b/modules/lightbox/functions/lb_call_js.php index 33bbc200b2..6d913511ab 100644 --- a/modules/lightbox/functions/lb_call_js.php +++ b/modules/lightbox/functions/lb_call_js.php @@ -52,8 +52,8 @@ global $tabno, $LB_MUSIC_FILE, $LB_SS_SPEED, $LB_TRANSITION, $TEXT_DIRECTION; var CB_Detail_Info = "<?php echo i18n::translate('View this Media Item Details ... Plus other Media Options - MediaViewer page'); ?>"; // = "View this Media Item......etc" var CB_ImgNotes = "<?php echo i18n::translate('Notes'); ?>"; // = "Notes" var CB_Note_Info = "<?php echo ''; ?>"; // = "" - var CB_Pause_SS = "<?php echo i18n::translate('Pause Slideshow'); ?>"; // = "Pause Slideshow" - var CB_Start_SS = "<?php echo i18n::translate('Start Slideshow'); ?>"; // = "Start Slideshow" + var CB_Pause_SS = "<?php echo i18n::translate('Pause Slideshow'); ?>"; // = "Pause Slideshow" + var CB_Start_SS = "<?php echo i18n::translate('Start Slideshow'); ?>"; // = "Start Slideshow" var CB_Music = "<?php echo i18n::translate('Turn Music On/Off'); ?>"; // = "Music On/Off " var CB_Zoom_Off = "<?php echo i18n::translate('Disable Zoom'); ?>"; // = "Disable Zoom" var CB_Zoom_On = "<?php echo i18n::translate('Zoom is enabled ... Use mousewheel or i and o keys to zoom in and out'); ?>"; // = "Zoom is Enabled" @@ -66,15 +66,15 @@ global $tabno, $LB_MUSIC_FILE, $LB_SS_SPEED, $LB_TRANSITION, $TEXT_DIRECTION; <?php }else{ ?> var CB_Alignm = "<?php echo "left"; ?>"; // Notes LTR Tooltip Balloon Text align var CB_ImgNotes2 = "<?php echo i18n::translate('Notes'); ?>"; // Notes LTR Tooltip for Full Image - <?php }?> + <?php } ?> <?php if ($LB_MUSIC_FILE == "") { ?> var myMusic = null; <?php }else{ ?> - var myMusic = '<?php echo $LB_MUSIC_FILE; ?>'; // The music file + var myMusic = '<?php echo $LB_MUSIC_FILE; ?>'; // The music file <?php } ?> - var CB_SlShowTime = '<?php echo $LB_SS_SPEED; ?>'; // Slide show timer - var CB_Animation = '<?php echo $LB_TRANSITION; ?>'; // Next/Prev Image transition effect + var CB_SlShowTime = '<?php echo $LB_SS_SPEED; ?>'; // Slide show timer + var CB_Animation = '<?php echo $LB_TRANSITION; ?>'; // Next/Prev Image transition effect </script> <?php diff --git a/modules/lightbox/functions/lb_indi_doors_0.php b/modules/lightbox/functions/lb_indi_doors_0.php index c7ae8c341a..71b3c62547 100644 --- a/modules/lightbox/functions/lb_indi_doors_0.php +++ b/modules/lightbox/functions/lb_indi_doors_0.php @@ -36,28 +36,28 @@ if (!defined('WT_WEBTREES')) { } ?> - <dd id="door1"><a href="javascript:;" onclick="tabswitch(1); return false;" ><?php echo i18n::translate('Personal Facts and Details')?></a></dd> - <dd id="door2"><a href="javascript:;" onclick="tabswitch(2); return false;" ><?php echo i18n::translate('Notes')?></a></dd> - <dd id="door3"><a href="javascript:;" onclick="tabswitch(3); return false;" ><?php echo i18n::translate('Sources')?></a></dd> + <dd id="door1"><a href="javascript:;" onclick="tabswitch(1); return false;" ><?php echo i18n::translate('Personal Facts and Details'); ?></a></dd> + <dd id="door2"><a href="javascript:;" onclick="tabswitch(2); return false;" ><?php echo i18n::translate('Notes'); ?></a></dd> + <dd id="door3"><a href="javascript:;" onclick="tabswitch(3); return false;" ><?php echo i18n::translate('Sources'); ?></a></dd> <?php if ($MULTI_MEDIA){ - if (!file_exists("modules/googlemap/defaultconfig.php")) { ?> - <?php if (file_exists("modules/lightbox/album.php") ) {?> - <dd id="door8"><a href="javascript:;" onclick="tabswitch(8); return false;" ><?php echo i18n::translate('Album') ?></a></dd> + if (!file_exists("modules/googlemap/defaultconfig.php")) { ?> + <?php if (file_exists("modules/lightbox/album.php") ) { ?> + <dd id="door8"><a href="javascript:;" onclick="tabswitch(8); return false;" ><?php echo i18n::translate('Album'); ?></a></dd> <?php } - }elseif (file_exists("modules/googlemap/defaultconfig.php")) { ?> - <?php if (file_exists("modules/lightbox/album.php") ) {?> - <dd id="door9"><a href="javascript:;" onclick="tabswitch(9); return false;" ><?php echo i18n::translate('Album') ?></a></dd> + }elseif (file_exists("modules/googlemap/defaultconfig.php")) { ?> + <?php if (file_exists("modules/lightbox/album.php") ) { ?> + <dd id="door9"><a href="javascript:;" onclick="tabswitch(9); return false;" ><?php echo i18n::translate('Album'); ?></a></dd> <?php } } } ?> - <dd id="door5"><a href="javascript:;" onclick="tabswitch(5); return false;" ><?php echo i18n::translate('Close Relatives')?></a></dd> - <dd id="door6"><a href="javascript:;" onclick="tabswitch(6); return false;" ><?php echo i18n::translate('Tree')?></a></dd> - <dd id="door7"><a href="javascript:;" onclick="tabswitch(7); return false;" ><?php echo i18n::translate('Research Assistant')?></a></dd> + <dd id="door5"><a href="javascript:;" onclick="tabswitch(5); return false;" ><?php echo i18n::translate('Close Relatives'); ?></a></dd> + <dd id="door6"><a href="javascript:;" onclick="tabswitch(6); return false;" ><?php echo i18n::translate('Tree'); ?></a></dd> + <dd id="door7"><a href="javascript:;" onclick="tabswitch(7); return false;" ><?php echo i18n::translate('Research Assistant'); ?></a></dd> <?php if (file_exists("modules/googlemap/defaultconfig.php")) { ?> - <dd id="door8"><a href="javascript:;" onclick="tabswitch(8); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php echo i18n::translate('Map')?></a></dd> + <dd id="door8"><a href="javascript:;" onclick="tabswitch(8); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php echo i18n::translate('Map'); ?></a></dd> <?php } ?> -<!-- <dd id="door10"><a href="javascript:;" onclick="tabswitch(10); return false;" ><?php echo "Spare Tab" ?></a></dd> --> - <dd id="door0"><a href="javascript:;" onclick="tabswitch(0); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php echo i18n::translate('All')?></a></dd> +<!-- <dd id="door10"><a href="javascript:;" onclick="tabswitch(10); return false;" ><?php echo "Spare Tab"; ?></a></dd> --> + <dd id="door0"><a href="javascript:;" onclick="tabswitch(0); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php echo i18n::translate('All'); ?></a></dd> diff --git a/modules/lightbox/functions/lb_indi_doors_1.php b/modules/lightbox/functions/lb_indi_doors_1.php index ac49b030e2..0f17b0b28b 100644 --- a/modules/lightbox/functions/lb_indi_doors_1.php +++ b/modules/lightbox/functions/lb_indi_doors_1.php @@ -36,32 +36,32 @@ if (!defined('WT_WEBTREES')) { } ?> - <dd id="door1"><a href="javascript:;" onclick="tabswitch(1); return false;" ><?php echo i18n::translate('Personal Facts and Details')?></a></dd> - <dd id="door2"><a href="javascript:;" onclick="tabswitch(2); return false;" ><?php echo i18n::translate('Notes')?></a></dd> - <dd id="door3"><a href="javascript:;" onclick="tabswitch(3); return false;" ><?php echo i18n::translate('Sources')?></a></dd> + <dd id="door1"><a href="javascript:;" onclick="tabswitch(1); return false;" ><?php echo i18n::translate('Personal Facts and Details'); ?></a></dd> + <dd id="door2"><a href="javascript:;" onclick="tabswitch(2); return false;" ><?php echo i18n::translate('Notes'); ?></a></dd> + <dd id="door3"><a href="javascript:;" onclick="tabswitch(3); return false;" ><?php echo i18n::translate('Sources'); ?></a></dd> <?php if ($MULTI_MEDIA){ - if (!file_exists("modules/googlemap/defaultconfig.php")) { ?> - <?php if (file_exists("modules/lightbox/album.php") ) {?> - <dd id="door4"><a href="javascript:;" onclick="tabswitch(4); return false;" ><?php echo i18n::translate('Media') ?></a></dd> - <dd id="door8"><a href="javascript:;" onclick="tabswitch(8); return false;" ><?php echo i18n::translate('Album') ?></a></dd> + if (!file_exists("modules/googlemap/defaultconfig.php")) { ?> + <?php if (file_exists("modules/lightbox/album.php") ) { ?> + <dd id="door4"><a href="javascript:;" onclick="tabswitch(4); return false;" ><?php echo i18n::translate('Media'); ?></a></dd> + <dd id="door8"><a href="javascript:;" onclick="tabswitch(8); return false;" ><?php echo i18n::translate('Album'); ?></a></dd> <?php } - }elseif (file_exists("modules/googlemap/defaultconfig.php")) { ?> - <?php if (file_exists("modules/lightbox/album.php") ) {?> - <dd id="door4"><a href="javascript:;" onclick="tabswitch(4); return false;" ><?php echo i18n::translate('Media') ?></a></dd> - <dd id="door9"><a href="javascript:;" onclick="tabswitch(9); return false;" ><?php echo i18n::translate('Album') ?></a></dd> + }elseif (file_exists("modules/googlemap/defaultconfig.php")) { ?> + <?php if (file_exists("modules/lightbox/album.php") ) { ?> + <dd id="door4"><a href="javascript:;" onclick="tabswitch(4); return false;" ><?php echo i18n::translate('Media'); ?></a></dd> + <dd id="door9"><a href="javascript:;" onclick="tabswitch(9); return false;" ><?php echo i18n::translate('Album'); ?></a></dd> <?php } } } ?> - <dd id="door5"><a href="javascript:;" onclick="tabswitch(5); return false;" ><?php echo i18n::translate('Close Relatives')?></a></dd> - <dd id="door6"><a href="javascript:;" onclick="tabswitch(6); return false;" ><?php echo i18n::translate('Tree')?></a></dd> - <dd id="door7"><a href="javascript:;" onclick="tabswitch(7); return false;" ><?php echo i18n::translate('Research Assistant')?></a></dd> + <dd id="door5"><a href="javascript:;" onclick="tabswitch(5); return false;" ><?php echo i18n::translate('Close Relatives'); ?></a></dd> + <dd id="door6"><a href="javascript:;" onclick="tabswitch(6); return false;" ><?php echo i18n::translate('Tree'); ?></a></dd> + <dd id="door7"><a href="javascript:;" onclick="tabswitch(7); return false;" ><?php echo i18n::translate('Research Assistant'); ?></a></dd> <?php if (file_exists("modules/googlemap/defaultconfig.php")) { ?> - <dd id="door8"><a href="javascript:;" onclick="tabswitch(8); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php echo i18n::translate('Map')?></a></dd> + <dd id="door8"><a href="javascript:;" onclick="tabswitch(8); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php echo i18n::translate('Map'); ?></a></dd> <?php } ?> -<!-- <dd id="door10"><a href="javascript:;" onclick="tabswitch(10); return false;" ><?php echo "Spare Tab" ?></a></dd> --> +<!-- <dd id="door10"><a href="javascript:;" onclick="tabswitch(10); return false;" ><?php echo "Spare Tab"; ?></a></dd> --> - <dd id="door0"><a href="javascript:;" onclick="tabswitch(0); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php echo i18n::translate('All')?></a></dd> + <dd id="door0"><a href="javascript:;" onclick="tabswitch(0); if (loadedTabs[8]) {ResizeMap(); ResizeMap();} return false;" ><?php echo i18n::translate('All'); ?></a></dd> diff --git a/modules/notes/module.php b/modules/notes/module.php index 0657ca16df..73ca383c25 100644 --- a/modules/notes/module.php +++ b/modules/notes/module.php @@ -70,7 +70,7 @@ if (!$this->controller->indi->canDisplayDetails()) { <td></td> <td class="descriptionbox rela"><input id="checkbox_note2" type="checkbox" - <?php if ($SHOW_LEVEL2_NOTES) echo " checked=\"checked\""?> + <?php if ($SHOW_LEVEL2_NOTES) echo " checked=\"checked\""; ?> onclick="toggleByClassName('TR', 'row_note2');" /> <label for="checkbox_note2"><?php echo i18n::translate('Show all notes'); ?></label> <?php echo help_link('show_fact_sources'); ?> @@ -165,5 +165,4 @@ if (!$SHOW_LEVEL2_NOTES) { public function getJSCallback() { return ''; } - } diff --git a/modules/personal_facts/module.php b/modules/personal_facts/module.php index 660a7748f4..64bf34a755 100644 --- a/modules/personal_facts/module.php +++ b/modules/personal_facts/module.php @@ -72,7 +72,7 @@ class personal_facts_WT_Module extends WT_Module implements WT_Module_Tab { echo '</td></tr>'; } else { $indifacts = $this->controller->getIndiFacts(); - if (count($indifacts)==0) {?> + if (count($indifacts)==0) { ?> <tr> <td id="no_tab1" colspan="2" class="facts_value"><?php echo i18n::translate('There are no Facts for this individual.'); ?> </td> @@ -85,10 +85,10 @@ class personal_facts_WT_Module extends WT_Module implements WT_Module_Tab { <td class="descriptionbox rela"> <input id="checkbox_rela_facts" type="checkbox" <?php if ($EXPAND_RELATIVES_EVENTS) echo ' checked="checked"'; ?> onclick="toggleByClassName('TR', 'row_rela');" /> <label for="checkbox_rela_facts"><?php echo i18n::translate('Events of close relatives'); ?></label> - <?php if (file_exists("languages/histo.".WT_LOCALE.".php")) {?> + <?php if (file_exists("languages/histo.".WT_LOCALE.".php")) { ?> <input id="checkbox_histo" type="checkbox" <?php if ($EXPAND_HISTO_EVENTS) echo ' checked="checked"'; ?> onclick="toggleByClassName('TR', 'row_histo');" /> <label for="checkbox_histo"><?php echo i18n::translate('Historical facts'); ?></label> - <?php }?> + <?php } ?> </td> </tr> <?php diff --git a/modules/relatives/module.php b/modules/relatives/module.php index 6dbb33f4f7..910d619643 100644 --- a/modules/relatives/module.php +++ b/modules/relatives/module.php @@ -190,8 +190,8 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { <tr> <td class="facts_label"><br /> </td> - <td class="facts_value<?php echo $styleadd ?>"> - <?php //echo "<span class=\"details_label\">".translate_fact('NCHI').": </span>".$family->getNumberOfChildren()."<br />";?> + <td class="facts_value<?php echo $styleadd; ?>"> + <?php //echo "<span class=\"details_label\">".translate_fact('NCHI').": </span>".$family->getNumberOfChildren()."<br />"; ?> <?php $marr_type = strtoupper($family->getMarriageType()); if ($marr_type=='CIVIL' || $marr_type=='PARTNERS' || $marr_type=='RELIGIOUS' || $marr_type=='UNKNOWN') { $marr_fact = translate_fact("MARR_".$marr_type); @@ -333,9 +333,9 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { ?> <tr> <td class="facts_label"> - <?php if (WT_USER_CAN_EDIT && isset($people["children"][1])) {?> + <?php if (WT_USER_CAN_EDIT && isset($people["children"][1])) { ?> <a href="javascript:;" onclick="reorder_children('<?php echo $family->getXref(); ?>');tabswitch(5);"><img src="images/topdown.gif" alt="" border="0" /> <?php echo i18n::translate('Re-order children'); ?></a> - <?php }?> + <?php } ?> </td> <td class="facts_value"> <a href="javascript:;" onclick="return addnewchild('<?php echo $family->getXref(); ?>');"><?php echo $child_u; ?></a> @@ -369,7 +369,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { ob_start(); ?> <table class="facts_table"><tr><td style="width:20%; padding:4px"></td><td class="descriptionbox rela"> - <input id="checkbox_elder" type="checkbox" onclick="toggleByClassName('DIV', 'elderdate');" <?php if ($SHOW_AGE_DIFF) echo "checked=\"checked\"";?>/> + <input id="checkbox_elder" type="checkbox" onclick="toggleByClassName('DIV', 'elderdate');" <?php if ($SHOW_AGE_DIFF) echo "checked=\"checked\""; ?>/> <label for="checkbox_elder"><?php echo i18n::translate('Show date differences'), help_link('age_differences'); ?></label> </td></tr></table> <?php @@ -435,7 +435,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { ?> <script type="text/javascript"> <!-- - <?php if (!$SHOW_AGE_DIFF) echo "toggleByClassName('DIV', 'elderdate');";?> + <?php if (!$SHOW_AGE_DIFF) echo "toggleByClassName('DIV', 'elderdate');"; ?> //--> </script> <br /> @@ -543,5 +543,4 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { public function getJSCallback() { return ''; } - } diff --git a/modules/sitemap/admin_config.php b/modules/sitemap/admin_config.php index 696d1c1711..734ab8b382 100644 --- a/modules/sitemap/admin_config.php +++ b/modules/sitemap/admin_config.php @@ -41,7 +41,7 @@ if (WT_USER_IS_ADMIN) { ?> <td colspan="2" class="topbottombar" style="text-align:center; "><?php echo i18n::translate('Sitemap'); ?></td> </tr> <tr> - <td class="optionbox"><a href="module.php?mod=sitemap"><?php echo i18n::translate('Generate Sitemap files');?></a><?php echo help_link('SITEMAP','sitemap');?> + <td class="optionbox"><a href="module.php?mod=sitemap"><?php echo i18n::translate('Generate Sitemap files'); ?></a><?php echo help_link('SITEMAP','sitemap'); ?> </td> <td class="optionbox"> </td> diff --git a/modules/sitemap/index.php b/modules/sitemap/index.php index 76f137c8c8..cf86e242e8 100644 --- a/modules/sitemap/index.php +++ b/modules/sitemap/index.php @@ -74,8 +74,8 @@ if ($action=="sendFiles") { header('Content-Type: application/octet-stream'); header('Content-Disposition: attachment; filename="'.$filename.'"'); - echo "<?xml version='1.0' encoding='UTF-8'?>\n"; - echo "<?xml-stylesheet type=\"text/xsl\" href=\"", WT_SERVER_NAME.WT_SCRIPT_PATH, "modules/sitemap/gss.xsl\"?>\n"; + echo "<?xml version='1.0' encoding='UTF-8' ?>\n"; + echo "<?xml-stylesheet type=\"text/xsl\" href=\"", WT_SERVER_NAME.WT_SCRIPT_PATH, "modules/sitemap/gss.xsl\" ?>\n"; echo "<urlset xmlns=\"http://www.sitemaps.org/schemas/sitemap/0.9\"\n"; echo " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; echo " xsi:schemaLocation=\"http://www.sitemaps.org/schemas/sitemap/0.9\n"; @@ -186,8 +186,8 @@ if ($action=="sendIndex") { header('Content-Type: application/octet-stream'); header('Content-Disposition: attachment; filename="SitemapIndex.xml"'); - echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n"; - echo "<?xml-stylesheet type=\"text/xsl\" href=\"", WT_SERVER_NAME, WT_SCRIPT_PATH, "modules/sitemap/gss.xsl\"?>\n"; + echo "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>\n"; + echo "<?xml-stylesheet type=\"text/xsl\" href=\"", WT_SERVER_NAME, WT_SCRIPT_PATH, "modules/sitemap/gss.xsl\" ?>\n"; echo "<sitemapindex xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n"; echo "xsi:schemaLocation=\"http://www.sitemaps.org/schemas/sitemap/0.9\"\n"; echo "url=\"http://www.sitemaps.org/schemas/sitemap/0.9/siteindex.xsd\"\n"; @@ -280,20 +280,20 @@ if ($action=="") { <td class="descriptionbox wrap width30"> </td> <td class="optionbox" colspan="3"> - <input type="checkbox" name="GEDCOM_Privacy" checked><?php echo i18n::translate('No links to private information');?> + <input type="checkbox" name="GEDCOM_Privacy" checked><?php echo i18n::translate('No links to private information'); ?> </td> </tr> <tr> <td class="descriptionbox wrap width30" rowspan="6"> <?php echo i18n::translate('Selected items to store in Sitemap:'), help_link('SM_ITEM_SELECT','sitemap'); ?> </td> - <td class="topbottombar"><?php echo i18n::translate('Item');?></td> - <td class="topbottombar"><?php echo i18n::translate('Priority');?></td> - <td class="topbottombar"><?php echo i18n::translate('Updates');?></td> + <td class="topbottombar"><?php echo i18n::translate('Item'); ?></td> + <td class="topbottombar"><?php echo i18n::translate('Priority'); ?></td> + <td class="topbottombar"><?php echo i18n::translate('Updates'); ?></td> </tr> <tr> <td class="optionbox"> - <input type="checkbox" name="welcome_page" checked><?php echo i18n::translate('Home page');?> + <input type="checkbox" name="welcome_page" checked><?php echo i18n::translate('Home page'); ?> </td> <td class="optionbox"> <select name="welcome_priority"> @@ -310,18 +310,18 @@ if ($action=="") { </td> <td class="optionbox"> <select name="welcome_update"> - <option value="always"><?php echo i18n::translate('always');?></option> - <option value="hourly"><?php echo i18n::translate('hourly');?></option> - <option value="daily"><?php echo i18n::translate('daily');?></option> - <option value="weekly"><?php echo i18n::translate('weekly');?></option> - <option value="monthly" selected="selected"><?php echo i18n::translate('monthly');?></option> - <option value="yearly"><?php echo i18n::translate('yearly');?></option> - <option value="never"><?php echo i18n::translate('never');?></option> + <option value="always"><?php echo i18n::translate('always'); ?></option> + <option value="hourly"><?php echo i18n::translate('hourly'); ?></option> + <option value="daily"><?php echo i18n::translate('daily'); ?></option> + <option value="weekly"><?php echo i18n::translate('weekly'); ?></option> + <option value="monthly" selected="selected"><?php echo i18n::translate('monthly'); ?></option> + <option value="yearly"><?php echo i18n::translate('yearly'); ?></option> + <option value="never"><?php echo i18n::translate('never'); ?></option> </select> </td> </tr> <tr> - <td class="optionbox"><input type="checkbox" name="indi_recs" checked><?php echo i18n::translate('Individual information');?></td> + <td class="optionbox"><input type="checkbox" name="indi_recs" checked><?php echo i18n::translate('Individual information'); ?></td> <td class="optionbox"> <select name="indirec_priority"> <option value="1">0.1</option> @@ -337,18 +337,18 @@ if ($action=="") { </td> <td class="optionbox"> <select name="indirec_update"> - <option value="always"><?php echo i18n::translate('always');?></option> - <option value="hourly"><?php echo i18n::translate('hourly');?></option> - <option value="daily"><?php echo i18n::translate('daily');?></option> - <option value="weekly"><?php echo i18n::translate('weekly');?></option> - <option value="monthly" selected="selected"><?php echo i18n::translate('monthly');?></option> - <option value="yearly"><?php echo i18n::translate('yearly');?></option> - <option value="never"><?php echo i18n::translate('never');?></option> + <option value="always"><?php echo i18n::translate('always'); ?></option> + <option value="hourly"><?php echo i18n::translate('hourly'); ?></option> + <option value="daily"><?php echo i18n::translate('daily'); ?></option> + <option value="weekly"><?php echo i18n::translate('weekly'); ?></option> + <option value="monthly" selected="selected"><?php echo i18n::translate('monthly'); ?></option> + <option value="yearly"><?php echo i18n::translate('yearly'); ?></option> + <option value="never"><?php echo i18n::translate('never'); ?></option> </select> </td> </tr> <tr> - <td class="optionbox"><input type="checkbox" name="indi_list"><?php echo i18n::translate('Individual List');?></td> + <td class="optionbox"><input type="checkbox" name="indi_list"><?php echo i18n::translate('Individual List'); ?></td> <td class="optionbox"> <select name="indilist_priority"> <option value="1">0.1</option> @@ -364,18 +364,18 @@ if ($action=="") { </td> <td class="optionbox"> <select name="indilist_update"> - <option value="always"><?php echo i18n::translate('always');?></option> - <option value="hourly"><?php echo i18n::translate('hourly');?></option> - <option value="daily"><?php echo i18n::translate('daily');?></option> - <option value="weekly"><?php echo i18n::translate('weekly');?></option> - <option value="monthly" selected="selected"><?php echo i18n::translate('monthly');?></option> - <option value="yearly"><?php echo i18n::translate('yearly');?></option> - <option value="never"><?php echo i18n::translate('never');?></option> + <option value="always"><?php echo i18n::translate('always'); ?></option> + <option value="hourly"><?php echo i18n::translate('hourly'); ?></option> + <option value="daily"><?php echo i18n::translate('daily'); ?></option> + <option value="weekly"><?php echo i18n::translate('weekly'); ?></option> + <option value="monthly" selected="selected"><?php echo i18n::translate('monthly'); ?></option> + <option value="yearly"><?php echo i18n::translate('yearly'); ?></option> + <option value="never"><?php echo i18n::translate('never'); ?></option> </select> </td> </tr> <tr> - <td class="optionbox"><input type="checkbox" name="fam_recs" checked><?php echo i18n::translate('Family information');?></td> + <td class="optionbox"><input type="checkbox" name="fam_recs" checked><?php echo i18n::translate('Family information'); ?></td> <td class="optionbox"> <select name="famrec_priority"> <option value="1">0.1</option> @@ -391,18 +391,18 @@ if ($action=="") { </td> <td class="optionbox"> <select name="famrec_update"> - <option value="always"><?php echo i18n::translate('always');?></option> - <option value="hourly"><?php echo i18n::translate('hourly');?></option> - <option value="daily"><?php echo i18n::translate('daily');?></option> - <option value="weekly"><?php echo i18n::translate('weekly');?></option> - <option value="monthly" selected="selected"><?php echo i18n::translate('monthly');?></option> - <option value="yearly"><?php echo i18n::translate('yearly');?></option> - <option value="never"><?php echo i18n::translate('never');?></option> + <option value="always"><?php echo i18n::translate('always'); ?></option> + <option value="hourly"><?php echo i18n::translate('hourly'); ?></option> + <option value="daily"><?php echo i18n::translate('daily'); ?></option> + <option value="weekly"><?php echo i18n::translate('weekly'); ?></option> + <option value="monthly" selected="selected"><?php echo i18n::translate('monthly'); ?></option> + <option value="yearly"><?php echo i18n::translate('yearly'); ?></option> + <option value="never"><?php echo i18n::translate('never'); ?></option> </select> </td> </tr> <tr> - <td class="optionbox"><input type="checkbox" name="fam_list"><?php echo i18n::translate('Family List');?></td> + <td class="optionbox"><input type="checkbox" name="fam_list"><?php echo i18n::translate('Family List'); ?></td> <td class="optionbox"> <select name="famlist_priority"> <option value="1">0.1</option> @@ -418,18 +418,18 @@ if ($action=="") { </td> <td class="optionbox"> <select name="famlist_update"> - <option value="always"><?php echo i18n::translate('always');?></option> - <option value="hourly"><?php echo i18n::translate('hourly');?></option> - <option value="daily"><?php echo i18n::translate('daily');?></option> - <option value="weekly"><?php echo i18n::translate('weekly');?></option> - <option value="monthly" selected="selected"><?php echo i18n::translate('monthly');?></option> - <option value="yearly"><?php echo i18n::translate('yearly');?></option> - <option value="never"><?php echo i18n::translate('never');?></option> + <option value="always"><?php echo i18n::translate('always'); ?></option> + <option value="hourly"><?php echo i18n::translate('hourly'); ?></option> + <option value="daily"><?php echo i18n::translate('daily'); ?></option> + <option value="weekly"><?php echo i18n::translate('weekly'); ?></option> + <option value="monthly" selected="selected"><?php echo i18n::translate('monthly'); ?></option> + <option value="yearly"><?php echo i18n::translate('yearly'); ?></option> + <option value="never"><?php echo i18n::translate('never'); ?></option> </select> </td> </tr> </table> - <center><input id="savebutton" type="submit" value="<?php echo i18n::translate('Generate');?>" /></center><br /><br /> + <center><input id="savebutton" type="submit" value="<?php echo i18n::translate('Generate'); ?>" /></center><br /><br /> </form> <?php diff --git a/modules/sources_tab/module.php b/modules/sources_tab/module.php index 0f414c5918..e701cb8213 100644 --- a/modules/sources_tab/module.php +++ b/modules/sources_tab/module.php @@ -72,7 +72,7 @@ class sources_tab_WT_Module extends WT_Module implements WT_Module_Tab { <tr> <td></td> <td class="descriptionbox rela"> - <input id="checkbox_sour2" type="checkbox" <?php if ($SHOW_LEVEL2_SOURCES) echo " checked=\"checked\""?> onclick="toggleByClassName('TR', 'row_sour2');" /> + <input id="checkbox_sour2" type="checkbox" <?php if ($SHOW_LEVEL2_SOURCES) echo " checked=\"checked\""; ?> onclick="toggleByClassName('TR', 'row_sour2');" /> <label for="checkbox_sour2"><?php echo i18n::translate('Show all sources'), help_link('show_fact_sources'); ?></label> </td> |