diff options
90 files changed, 365 insertions, 377 deletions
diff --git a/addmedia.php b/addmedia.php index 8e8f2b290d..cbcb046c54 100644 --- a/addmedia.php +++ b/addmedia.php @@ -82,7 +82,7 @@ if (!WT_USER_CAN_EDIT || !$disp || !$ALLOW_EDIT_GEDCOM) { echo '<br />', WT_I18N::translate('You have no access to'), ' pid ', $pid; } } - echo '<br /><br /><div class="center"><a href="javascript: ', WT_I18N::translate('Close Window'), '" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', WT_I18N::translate('Close Window'), '</a></div>'; + echo '<br /><br /><div class="center"><a href="#" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', WT_I18N::translate('Close Window'), '</a></div>'; exit; } @@ -415,7 +415,7 @@ if ($action=='newentry') { AddToLog('Media ID '.$media_id." successfully added to $linktoid.", 'edit'); $success=true; } else { - echo "<a href=\"javascript://OBJE $mediaid\" onclick=\"openerpasteid('$mediaid'); return false;\">", WT_I18N::translate('Paste the following ID into your editing fields to reference the newly created record '), " <b>$mediaid</b></a><br /><br />"; + echo "<a href=\"#\" onclick=\"openerpasteid('$mediaid'); return false;\">", WT_I18N::translate('Paste the following ID into your editing fields to reference the newly created record '), " <b>$mediaid</b></a><br /><br />"; echo WT_JS_START; echo "openerpasteid('", $mediaid, "');"; echo WT_JS_END; diff --git a/admin_media.php b/admin_media.php index 148cb61357..8b900cd1a5 100644 --- a/admin_media.php +++ b/admin_media.php @@ -802,7 +802,7 @@ if (check_media_structure()) { <?php echo "<a href=\"#\" onclick=\"expand_layer('uploadmedia');\">".WT_I18N::translate('Upload media files')."</a>". help_link('upload_media'); ?> </td>--> <td class="wrap"> - <a href="javascript:;" onclick="window.open('addmedia.php?action=showmediaform&linktoid=new', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1'); return false;"> <?php echo WT_I18N::translate('Add a new media object')."</a>". help_link('add_media'); ?> + <a href="#" onclick="window.open('addmedia.php?action=showmediaform&linktoid=new', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1'); return false;"> <?php echo WT_I18N::translate('Add a new media object')."</a>". help_link('add_media'); ?> </td> <?php $tempURL = WT_SCRIPT_NAME.'?'; @@ -1124,11 +1124,11 @@ if (check_media_structure()) { } else { $tempURL .= 'showmediaform&filename='.rawurlencode($media['FILE']).'&linktoid=new'; } - echo "<a href=\"javascript:", WT_I18N::translate('Edit'), "\" onclick=\"window.open('", $tempURL, "', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1'); return false;\">", WT_I18N::translate('Edit'), "</a><br />"; + echo "<a href=\"#\" onclick=\"window.open('", $tempURL, "', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1'); return false;\">", WT_I18N::translate('Edit'), "</a><br />"; // Edit Raw if ($media["XREF"] != "") { - echo "<a href=\"javascript:".WT_I18N::translate('Edit raw GEDCOM record')."\" onclick=\"return edit_raw('".$media['XREF']."');\">".WT_I18N::translate('Edit raw GEDCOM record')."</a><br />"; + echo "<a href=\"#\" onclick=\"return edit_raw('".$media['XREF']."');\">".WT_I18N::translate('Edit raw GEDCOM record')."</a><br />"; } // Delete File diff --git a/admin_site_merge.php b/admin_site_merge.php index 27c21113b4..5f69ad9458 100644 --- a/admin_site_merge.php +++ b/admin_site_merge.php @@ -301,9 +301,9 @@ if ($action=='choose') { if (isset($WT_IMAGES['button_source'])) $sourtext = '<img src="'.$WT_IMAGES['button_source'].'" alt="'.$sourtext.'" title="'.$sourtext.'" border="0" align="middle" />'; echo '</select> - <a href="javascript:iopen_find(document.merge.gid1, document.merge.ged);" tabindex="6">', $inditext, '</a> - <a href="javascript:fopen_find(document.merge.gid1, document.merge.ged);" tabindex="8">', $famtext, '</a> - <a href="javascript:sopen_find(document.merge.gid1, document.merge.ged);" tabindex="10">', $sourtext, '</a> + <a href="#" onclick="iopen_find(document.merge.gid1, document.merge.ged);" tabindex="6">', $inditext, '</a> + <a href="#" onclick="fopen_find(document.merge.gid1, document.merge.ged);" tabindex="8">', $famtext, '</a> + <a href="#" onclick="sopen_find(document.merge.gid1, document.merge.ged);" tabindex="10">', $sourtext, '</a> </td></tr><tr><td>', WT_I18N::translate('Merge From ID:'), '</td><td> @@ -322,9 +322,9 @@ if ($action=='choose') { } echo '</select> - <a href="javascript:iopen_find(document.merge.gid2, document.merge.ged2);" tabindex="7">', $inditext, '</a> - <a href="javascript:fopen_find(document.merge.gid2, document.merge.ged2);" tabindex="9">', $famtext, '</a> - <a href="javascript:sopen_find(document.merge.gid2, document.merge.ged2);" tabindex="11">', $sourtext, '</a> + <a href="#" onclick="iopen_find(document.merge.gid2, document.merge.ged2);" tabindex="7">', $inditext, '</a> + <a href="#" onclick="fopen_find(document.merge.gid2, document.merge.ged2);" tabindex="9">', $famtext, '</a> + <a href="#" onclick="sopen_find(document.merge.gid2, document.merge.ged2);" tabindex="11">', $sourtext, '</a> </td></tr></table> <input type="submit" value="', WT_I18N::translate('Merge records'), '" tabindex="3" /> </form></div>'; diff --git a/admin_site_other.php b/admin_site_other.php index cf69fa4102..b44893cbc1 100644 --- a/admin_site_other.php +++ b/admin_site_other.php @@ -58,15 +58,15 @@ echo $html, '<table id="other">', '<tr><td>', - '<a href="javascript:;" onclick="addnewchild(\'\'); return false;">', WT_I18N::translate('Add an unlinked person'), '</a>', + '<a href="#" onclick="addnewchild(\'\'); return false;">', WT_I18N::translate('Add an unlinked person'), '</a>', help_link('edit_add_unlinked_person'), '</td></tr>', '<tr><td>', - '<a href="javascript:;" onclick="addnewnote(\'\'); return false;">', WT_I18N::translate('Add an unlinked note'), '</a>', + '<a href="#" onclick="addnewnote(\'\'); return false;">', WT_I18N::translate('Add an unlinked note'), '</a>', help_link('edit_add_unlinked_note'), '</td></tr>', '<tr><td>', - '<a href="javascript:;" onclick="addnewsource(\'\'); return false;">', WT_I18N::translate('Add an unlinked source'), '</a>', + '<a href="#" onclick="addnewsource(\'\'); return false;">', WT_I18N::translate('Add an unlinked source'), '</a>', help_link('edit_add_unlinked_source'), '</td></tr>', '</table>', diff --git a/admin_trees_manage.php b/admin_trees_manage.php index ad17914db4..a1dcfd532e 100644 --- a/admin_trees_manage.php +++ b/admin_trees_manage.php @@ -219,7 +219,7 @@ foreach ($gedcoms as $gedcom_id=>$gedcom_name) { echo '<tr align="center">', // export - '<td><a href="javascript:" onclick="window.open(\'', "export_gedcom.php?export=", rawurlencode($gedcom_name), '\', \'_blank\',\'left=50,top=50,width=500,height=500,resizable=1,scrollbars=1\');">', WT_I18N::translate('Export'), '</a>', + '<td><a href="#" onclick="window.open(\'', "export_gedcom.php?export=", rawurlencode($gedcom_name), '\', \'_blank\',\'left=50,top=50,width=500,height=500,resizable=1,scrollbars=1\');">', WT_I18N::translate('Export'), '</a>', help_link('export_gedcom'), '</td>', // import diff --git a/admin_users_bulk.php b/admin_users_bulk.php index 050da9aa42..3e6e6978d0 100644 --- a/admin_users_bulk.php +++ b/admin_users_bulk.php @@ -38,7 +38,7 @@ require_once WT_ROOT.'includes/functions/functions_edit.php'; ?>
<div id="users_bulk" class="<?php echo $TEXT_DIRECTION; ?>">
- <p><a href="javascript: <?php echo WT_I18N::translate('Send message to all users'); ?>" onclick="message('all', 'messaging2', '', ''); return false;"><?php echo WT_I18N::translate('Send message to all users'); ?></a></p>
- <p><a href="javascript: <?php echo WT_I18N::translate('Send message to users who have never logged in'); ?>" onclick="message('never_logged', 'messaging2', '', ''); return false;"><?php echo WT_I18N::translate('Send message to users who have never logged in'); ?></a></p>
- <p><a href="javascript: <?php echo WT_I18N::translate('Send message to users who have not logged in for 6 months'); ?>" onclick="message('last_6mo', 'messaging2', '', ''); return false;"><?php echo WT_I18N::translate('Send message to users who have not logged in for 6 months'); ?></a></p>
+ <p><a href="#" onclick="message('all', 'messaging2', '', ''); return false;"><?php echo WT_I18N::translate('Send message to all users'); ?></a></p>
+ <p><a href="#" onclick="message('never_logged', 'messaging2', '', ''); return false;"><?php echo WT_I18N::translate('Send message to users who have never logged in'); ?></a></p>
+ <p><a href="#" onclick="message('last_6mo', 'messaging2', '', ''); return false;"><?php echo WT_I18N::translate('Send message to users who have not logged in for 6 months'); ?></a></p>
</div>
diff --git a/edit_changes.php b/edit_changes.php index af4aa6f770..a7273920e3 100644 --- a/edit_changes.php +++ b/edit_changes.php @@ -168,9 +168,9 @@ if ($changed_gedcoms) { $record=new WT_GedcomRecord($change->gedcom); } $output.='<b>'.$record->getFullName().'</b><br />'; - $output.='<a href="javascript:;" onclick="return show_diff(\''.$record->getHtmlUrl().'\');">'.WT_I18N::translate('View the changes').'</a> | '; - $output.="<a href=\"javascript:show_gedcom_record('".$change->xref."');\">".WT_I18N::translate('View GEDCOM Record')."</a> | "; - $output.="<a href=\"javascript:;\" onclick=\"return edit_raw('".$change->xref."');\">".WT_I18N::translate('Edit raw GEDCOM record').'</a><br />'; + $output.='<a href="#" onclick="return show_diff(\''.$record->getHtmlUrl().'\');">'.WT_I18N::translate('View the changes').'</a> | '; + $output.="<a href=\"#\" onclick=\"show_gedcom_record('".$change->xref."');\">".WT_I18N::translate('View GEDCOM Record')."</a> | "; + $output.="<a href=\"#\" onclick=\"return edit_raw('".$change->xref."');\">".WT_I18N::translate('Edit raw GEDCOM record').'</a><br />'; $output.='<div class="indent">'; $output.=WT_I18N::translate('The following changes were made to this record:').'<br />'; $output.='<table class="list_table"><tr>'; @@ -192,7 +192,7 @@ if ($changed_gedcoms) { $output.=WT_I18N::translate('Replace record'); } echo '</b></td>'; - $output .= "<td class=\"list_value\"><a href=\"javascript:;\" onclick=\"return reply('".$change->user_name."', '".WT_I18N::translate('Moderate pending changes')."')\" alt=\"".WT_I18N::translate('Send Message')."\">"; + $output .= "<td class=\"list_value\"><a href=\"#\" onclick=\"return reply('".$change->user_name."', '".WT_I18N::translate('Moderate pending changes')."')\" alt=\"".WT_I18N::translate('Send Message')."\">"; $output .= PrintReady($change->real_name); $output .= PrintReady(' ('.$change->user_name.')').'</a></td>'; $output .= '<td class="list_value">'.$change->change_time.'</td>'; @@ -232,7 +232,7 @@ if ($changed_gedcoms) { echo $output2, $output, $output2, '<br /><br />', - '<a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', + '<a href="#" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', WT_I18N::translate('Close Window'), '</a>'; } else { diff --git a/edit_interface.php b/edit_interface.php index f58b43ef63..1159c95116 100644 --- a/edit_interface.php +++ b/edit_interface.php @@ -180,7 +180,7 @@ if (!empty($pid)) { if (!WT_USER_CAN_EDIT || !$edit || !$ALLOW_EDIT_GEDCOM) { echo '<p class="error">', WT_I18N::translate('Privacy settings prevent you from editing this record.'), '</p>', - '<p><a href="javascript: ', WT_I18N::translate('Close Window'), '" onclick="window.close();">', WT_I18N::translate('Close Window'), '</a></p>'; + '<p><a href="#" onclick="window.close();">', WT_I18N::translate('Close Window'), '</a></p>'; exit; } @@ -760,7 +760,7 @@ case 'addsourceaction': $link = "source.php?sid=$xref"; if ($xref) { echo '<br /><br />', WT_I18N::translate('New source created successfully.'), '<br /><br />'; - echo "<a href=\"javascript://SOUR $xref\" onclick=\"openerpasteid('$xref'); return false;\">", WT_I18N::translate('Paste the following ID into your editing fields to reference the newly created record '), " <b>$xref</b></a>"; + echo "<a href=\"#\" onclick=\"openerpasteid('$xref'); return false;\">", WT_I18N::translate('Paste the following ID into your editing fields to reference the newly created record '), " <b>$xref</b></a>"; } break; //------------------------------------------------------------------------------ @@ -861,7 +861,7 @@ case 'addnoteaction': if ($xref != "none") { echo "<br /><br />".WT_I18N::translate('New Shared Note created successfully.')." (".$xref.")<br /><br />"; - echo "<a href=\"javascript://NOTE $xref\" onclick=\"openerpasteid('$xref'); return false;\">".WT_I18N::translate('Paste the following ID into your editing fields to reference the newly created record ')." <b>$xref</b></a>"; + echo "<a href=\"#\" onclick=\"openerpasteid('$xref'); return false;\">".WT_I18N::translate('Paste the following ID into your editing fields to reference the newly created record ')." <b>$xref</b></a>"; echo "<br /><br /><br /><br />"; echo "<br /><br /><br /><br />"; } @@ -1135,7 +1135,7 @@ case 'addrepoaction': $link = "repo.php?rid=$xref"; if ($xref) { echo '<br /><br />', WT_I18N::translate('New Repository created'), '<br /><br />'; - echo "<a href=\"javascript://REPO $xref\" onclick=\"openerpasteid('$xref'); return false;\">", WT_I18N::translate('Paste the following Repository ID into your editing fields to reference this Repository '), " <b>$xref</b></a>"; + echo "<a href=\"#\" onclick=\"openerpasteid('$xref'); return false;\">", WT_I18N::translate('Paste the following Repository ID into your editing fields to reference this Repository '), " <b>$xref</b></a>"; } break; //------------------------------------------------------------------------------ @@ -2035,8 +2035,8 @@ case 'changefamily': } ?> <td class="optionbox wrap <?php echo $TEXT_DIRECTION; ?>"> - <a href="javascript:;" id="husbrem" style="display: <?php echo is_null($father) ? 'none':'block'; ?>;" onclick="document.changefamform.HUSB.value=''; document.getElementById('HUSBName').innerHTML=''; this.style.display='none'; return false;"><?php echo WT_I18N::translate('Remove'); ?></a> - <a href="javascript:;" onclick="nameElement = document.getElementById('HUSBName'); remElement = document.getElementById('husbrem'); return findIndi(document.changefamform.HUSB);"><?php echo WT_I18N::translate('Change'); ?></a><br /> + <a href="#" id="husbrem" style="display: <?php echo is_null($father) ? 'none':'block'; ?>;" onclick="document.changefamform.HUSB.value=''; document.getElementById('HUSBName').innerHTML=''; this.style.display='none'; return false;"><?php echo WT_I18N::translate('Remove'); ?></a> + <a href="#" onclick="nameElement = document.getElementById('HUSBName'); remElement = document.getElementById('husbrem'); return findIndi(document.changefamform.HUSB);"><?php echo WT_I18N::translate('Change'); ?></a><br /> </td> </tr> <tr> @@ -2054,8 +2054,8 @@ case 'changefamily': } ?> <td class="optionbox wrap <?php echo $TEXT_DIRECTION; ?>"> - <a href="javascript:;" id="wiferem" style="display: <?php echo is_null($mother) ? 'none':'block'; ?>;" onclick="document.changefamform.WIFE.value=''; document.getElementById('WIFEName').innerHTML=''; this.style.display='none'; return false;"><?php echo WT_I18N::translate('Remove'); ?></a> - <a href="javascript:;" onclick="nameElement = document.getElementById('WIFEName'); remElement = document.getElementById('wiferem'); return findIndi(document.changefamform.WIFE);"><?php echo WT_I18N::translate('Change'); ?></a><br /> + <a href="#" id="wiferem" style="display: <?php echo is_null($mother) ? 'none':'block'; ?>;" onclick="document.changefamform.WIFE.value=''; document.getElementById('WIFEName').innerHTML=''; this.style.display='none'; return false;"><?php echo WT_I18N::translate('Remove'); ?></a> + <a href="#" onclick="nameElement = document.getElementById('WIFEName'); remElement = document.getElementById('wiferem'); return findIndi(document.changefamform.WIFE);"><?php echo WT_I18N::translate('Change'); ?></a><br /> </td> </tr> <?php @@ -2067,8 +2067,8 @@ case 'changefamily': <td class="descriptionbox <?php echo $TEXT_DIRECTION; ?>"><b><?php echo $child->getLabel(); ?></b><input type="hidden" name="CHIL<?php echo $i; ?>" value="<?php echo $child->getXref(); ?>" /></td> <td id="CHILName<?php echo $i; ?>" class="optionbox wrap"><?php echo $child->getFullName(); ?></td> <td class="optionbox wrap <?php echo $TEXT_DIRECTION; ?>"> - <a href="javascript:;" id="childrem<?php echo $i; ?>" style="display: block;" onclick="document.changefamform.CHIL<?php echo $i; ?>.value=''; document.getElementById('CHILName<?php echo $i; ?>').innerHTML=''; this.style.display='none'; return false;"><?php echo WT_I18N::translate('Remove'); ?></a> - <a href="javascript:;" onclick="nameElement = document.getElementById('CHILName<?php echo $i; ?>'); remElement = document.getElementById('childrem<?php echo $i; ?>'); return findIndi(document.changefamform.CHIL<?php echo $i; ?>);"><?php echo WT_I18N::translate('Change'); ?></a><br /> + <a href="#" id="childrem<?php echo $i; ?>" style="display: block;" onclick="document.changefamform.CHIL<?php echo $i; ?>.value=''; document.getElementById('CHILName<?php echo $i; ?>').innerHTML=''; this.style.display='none'; return false;"><?php echo WT_I18N::translate('Remove'); ?></a> + <a href="#" onclick="nameElement = document.getElementById('CHILName<?php echo $i; ?>'); remElement = document.getElementById('childrem<?php echo $i; ?>'); return findIndi(document.changefamform.CHIL<?php echo $i; ?>);"><?php echo WT_I18N::translate('Change'); ?></a><br /> </td> </tr> <?php @@ -2080,12 +2080,12 @@ case 'changefamily': <td class="descriptionbox <?php echo $TEXT_DIRECTION; ?>"><b><?php echo WT_I18N::translate('child'); ?></b><input type="hidden" name="CHIL<?php echo $i; ?>" value="" /></td> <td id="CHILName<?php echo $i; ?>" class="optionbox wrap"></td> <td class="optionbox wrap <?php echo $TEXT_DIRECTION; ?>"> - <a href="javascript:;" id="childrem<?php echo $i; ?>" style="display: none;" onclick="document.changefamform.CHIL<?php echo $i; ?>.value=''; document.getElementById('CHILName<?php echo $i; ?>').innerHTML=''; this.style.display='none'; return false;"><?php echo WT_I18N::translate('Remove'); ?></a> - <a href="javascript:;" onclick="nameElement = document.getElementById('CHILName<?php echo $i; ?>'); remElement = document.getElementById('childrem<?php echo $i; ?>'); return findIndi(document.changefamform.CHIL<?php echo $i; ?>);"><?php echo WT_I18N::translate('Add'); ?></a><br /> + <a href="#" id="childrem<?php echo $i; ?>" style="display: none;" onclick="document.changefamform.CHIL<?php echo $i; ?>.value=''; document.getElementById('CHILName<?php echo $i; ?>').innerHTML=''; this.style.display='none'; return false;"><?php echo WT_I18N::translate('Remove'); ?></a> + <a href="#" onclick="nameElement = document.getElementById('CHILName<?php echo $i; ?>'); remElement = document.getElementById('childrem<?php echo $i; ?>'); return findIndi(document.changefamform.CHIL<?php echo $i; ?>);"><?php echo WT_I18N::translate('Add'); ?></a><br /> </td> </tr> </table> - <!-- <a href="javascript: <?php echo WT_I18N::translate('Add an unlinked person'); ?>" onclick="addnewchild(''); return false;"><?php echo WT_I18N::translate('Add an unlinked person'); ?></a><br />--> + <!-- <a href="#" onclick="addnewchild(''); return false;"><?php echo WT_I18N::translate('Add an unlinked person'); ?></a><br />--> <br /> <input type="submit" value="<?php echo WT_I18N::translate('Save'); ?>" /><input type="button" value="<?php echo WT_I18N::translate('Cancel'); ?>" onclick="window.close();" /> </form> @@ -2361,9 +2361,9 @@ if ($success && !WT_DEBUG ) { // Decide whether to print footer or not if ($action == 'addmedia_links' || $action == 'addnewnote_assisted' ) { // Do not print footer. - echo "<br /><div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close('{$link}');\">", WT_I18N::translate('Close Window'), '</a></div>'; + echo "<br /><div class=\"center\"><a href=\"#\" onclick=\"edit_close('{$link}');\">", WT_I18N::translate('Close Window'), '</a></div>'; } elseif (isset($closeparent) && $closeparent=="yes" ) { - echo "<div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close('{$link}');\">", WT_I18N::translate('Close Window'), '</a></div><br />'; + echo "<div class=\"center\"><a href=\"#\" onclick=\"edit_close('{$link}');\">", WT_I18N::translate('Close Window'), '</a></div><br />'; } else { - echo "<div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close('{$link}');\">", WT_I18N::translate('Close Window'), '</a></div><br />'; + echo "<div class=\"center\"><a href=\"#\" onclick=\"edit_close('{$link}');\">", WT_I18N::translate('Close Window'), '</a></div><br />'; } diff --git a/editnews.php b/editnews.php index a94fbc058a..1465a36a18 100644 --- a/editnews.php +++ b/editnews.php @@ -117,4 +117,4 @@ if ($action=="compose") { } else if ($action=="delete") { if (deleteNews($news_id)) echo WT_I18N::translate('The news/journal entry has been deleted.'); } -echo "<center><br /><br /><a href=\"javascript:;\" onclick=\"if (window.opener.refreshpage) window.opener.refreshpage(); window.close();\">".WT_I18N::translate('Close Window')."</a><br /></center>"; +echo "<center><br /><br /><a href=\"#\" onclick=\"if (window.opener.refreshpage) window.opener.refreshpage(); window.close();\">".WT_I18N::translate('Close Window')."</a><br /></center>"; diff --git a/export_gedcom.php b/export_gedcom.php index 5155e482f4..9ce08b6847 100644 --- a/export_gedcom.php +++ b/export_gedcom.php @@ -88,4 +88,4 @@ if ($export) { echo '</ul>'; } -echo '<p class="center"><a href="javascript: ', WT_I18N::translate('Close Window'), '" onclick="window.close();">', WT_I18N::translate('Close Window'), '</a></p>'; +echo '<p class="center"><a href="#" onclick="window.close();">', WT_I18N::translate('Close Window'), '</a></p>'; diff --git a/family.php b/family.php index 2d36639d8d..050636c559 100644 --- a/family.php +++ b/family.php @@ -38,8 +38,8 @@ if ($controller->record && $controller->record->canDisplayDetails()) { '<p class="ui-state-highlight">', /* I18N: %1$s is "accept", %2$s is "reject". These are links. */ WT_I18N::translate( 'This family has been deleted. You should review the deletion and then %1$s or %2$s it.', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'accept') . '</a>', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'reject') . '</a>' + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'accept') . '</a>', + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'reject') . '</a>' ), ' ', help_link('pending_changes'), '</p>'; @@ -56,8 +56,8 @@ if ($controller->record && $controller->record->canDisplayDetails()) { '<p class="ui-state-highlight">', /* I18N: %1$s is "accept", %2$s is "reject". These are links. */ WT_I18N::translate( 'This family has been edited. You should review the changes and then %1$s or %2$s them.', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'accept') . '</a>', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'reject') . '</a>' + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'accept') . '</a>', + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'reject') . '</a>' ), ' ', help_link('pending_changes'), '</p>'; @@ -125,7 +125,7 @@ echo WT_JS_END; $husb=$controller->record->getHusband(); } if (!$husb) { - echo '<a href="javascript: ', WT_I18N::translate('Add a new father'), '" onclick="return addnewparentfamily(\'\', \'HUSB\', \'', $controller->record->getXref(), '\');">', WT_I18N::translate('Add a new father'), help_link('edit_add_parent'), '</a><br />'; + echo '<a href="#" onclick="return addnewparentfamily(\'\', \'HUSB\', \'', $controller->record->getXref(), '\');">', WT_I18N::translate('Add a new father'), help_link('edit_add_parent'), '</a><br />'; } if ($controller->diff_record) { $wife=$controller->diff_record->getWife(); @@ -133,7 +133,7 @@ echo WT_JS_END; $wife=$controller->record->getWife(); } if (!$wife) { - echo '<a href="javascript: ', WT_I18N::translate('Add a new mother'), '" onclick="return addnewparentfamily(\'\', \'WIFE\', \'', $controller->record->getXref(), '\');">', WT_I18N::translate('Add a new mother'), help_link('edit_add_parent'), '</a><br />'; + echo '<a href="#" onclick="return addnewparentfamily(\'\', \'WIFE\', \'', $controller->record->getXref(), '\');">', WT_I18N::translate('Add a new mother'), help_link('edit_add_parent'), '</a><br />'; } } ?> @@ -305,7 +305,7 @@ if ($type == 'media') { echo "<tr><td class=\"list_label width10\" wstyle=\"padding: 5px;\">"; echo "<input type=\"checkbox\" name=\"showthumb\" value=\"true\""; if ($showthumb) echo "checked=\"checked\""; - echo "onclick=\"javascript: this.form.submit();\" />", WT_I18N::translate('Show thumbnails'); + echo "onclick=\"#\" onclick=\"this.form.submit();\" />", WT_I18N::translate('Show thumbnails'); echo "</td></tr>"; echo "<tr><td class=\"list_label width10\" style=\"padding: 5px;\">"; echo "<input type=\"submit\" name=\"search\" value=\"", WT_I18N::translate('Filter'), "\" onclick=\"this.form.subclick.value=this.name\" /> "; @@ -605,7 +605,7 @@ echo "</td></tr>"; echo "</table>"; // Close table with find options echo "<br />"; -echo "<a href=\"javascript:;\" onclick=\"if (window.opener.showchanges) window.opener.showchanges(); window.close();\">", WT_I18N::translate('Close Window'), "</a><br />"; +echo "<a href=\"#\" onclick=\"if (window.opener.showchanges) window.opener.showchanges(); window.close();\">", WT_I18N::translate('Close Window'), "</a><br />"; echo "<br />"; if ($action=="filter") { @@ -748,7 +748,7 @@ if ($action=="filter") { //-- thumbnail field if ($showthumb) { echo "<td class=\"list_value $TEXT_DIRECTION width10\">"; - if (isset($media["THUMB"])) echo "<a href=\"javascript:;\" onclick=\"return openImage('", rawurlencode($media["FILE"]), "', $imgwidth, $imgheight);\"><img src=\"", filename_decode($media["THUMB"]), "\" border=\"0\" width=\"50\" alt=\"\" /></a>"; + if (isset($media["THUMB"])) echo "<a href=\"#\" onclick=\"return openImage('", rawurlencode($media["FILE"]), "', $imgwidth, $imgheight);\"><img src=\"", filename_decode($media["THUMB"]), "\" border=\"0\" width=\"50\" alt=\"\" /></a>"; else echo " "; } @@ -762,10 +762,10 @@ if ($action=="filter") { echo "<br />"; } if (!$embed) { - echo "<a href=\"javascript:;\" onclick=\"pasteid('", addslashes($media["FILE"]), "');\"><span dir=\"ltr\">", $media["FILE"], "</span></a> -- "; + echo "<a href=\"#\" onclick=\"pasteid('", addslashes($media["FILE"]), "');\"><span dir=\"ltr\">", $media["FILE"], "</span></a> -- "; } - else echo "<a href=\"javascript:;\" onclick=\"pasteid('", $media["XREF"], "', '", addslashes($media["TITL"]), "', '", addslashes($media["THUMB"]), "');\"><span dir=\"ltr\">", $media["FILE"], "</span></a> -- "; - echo "<a href=\"javascript:;\" onclick=\"return openImage('", rawurlencode($media["FILE"]), "', $imgwidth, $imgheight);\">", WT_I18N::translate('View'), "</a><br />"; + else echo "<a href=\"#\" onclick=\"pasteid('", $media["XREF"], "', '", addslashes($media["TITL"]), "', '", addslashes($media["THUMB"]), "');\"><span dir=\"ltr\">", $media["FILE"], "</span></a> -- "; + echo "<a href=\"#\" onclick=\"return openImage('", rawurlencode($media["FILE"]), "', $imgwidth, $imgheight);\">", WT_I18N::translate('View'), "</a><br />"; if (!$media["EXISTS"] && !isFileExternal($media["FILE"])) echo $media["FILE"], "<br /><span class=\"error\">", WT_I18N::translate('The filename entered does not exist.'), "</span><br />"; else if (!isFileExternal($media["FILE"]) && !empty($imgsize[0])) { echo WT_Gedcom_Tag::getLabelValue('__IMAGE_SIZE__', $imgsize[0].' × '.$imgsize[1]); @@ -832,7 +832,7 @@ if ($action=="filter") { uasort($revplacelist, "utf8_strcasecmp"); echo "<td class=\"list_value_wrap $TEXT_DIRECTION\"><ul>"; foreach ($revplacelist as $place) { - echo "<li><a href=\"javascript:;\" onclick=\"pasteid('", str_replace(array("'", '"'), array("\'", '"'), $place), "');\">", PrintReady($place), "</a></li>"; + echo "<li><a href=\"#\" onclick=\"pasteid('", str_replace(array("'", '"'), array("\'", '"'), $place), "');\">", PrintReady($place), "</a></li>"; } echo "</ul></td></tr>"; echo "<tr><td class=\"list_label\">", WT_I18N::translate('Places found'), " ", $ctplace; diff --git a/gedcheck.php b/gedcheck.php index 7c0b156ccd..3089cf040c 100644 --- a/gedcheck.php +++ b/gedcheck.php @@ -122,7 +122,7 @@ if (!isset($_POST['action'])) { // If we're checking a gedcom that is imported into the database, check that the file is synchronised if ($ged==WT_GEDCOM) { - $ged_link='href="javascript:" onclick="window.open(\''."export_gedcom.php?export=".rawurlencode($ged).'\', \'_blank\',\'left=50,top=50,width=500,height=500,resizable=1,scrollbars=1\');"'; + $ged_link='href="#" onclick="window.open(\''."export_gedcom.php?export=".rawurlencode($ged).'\', \'_blank\',\'left=50,top=50,width=500,height=500,resizable=1,scrollbars=1\');"'; echo '<div class="error">', WT_I18N::translate('Edits made to the database are not synchronized to the file %s. The file contents may be out-of-date. You can synchronize it with the database now by performing an <b><a "%s">export</a></b>.', $ged, $ged_link), '</div><hr/>'; } diff --git a/help_text.php b/help_text.php index 1d6004dbd1..e76c85924e 100644 --- a/help_text.php +++ b/help_text.php @@ -2932,5 +2932,5 @@ echo '<div class="helpfooter">'; if ($help!='help_contents_help') { echo '<a href="help_text.php?help=help_contents_help">', WT_I18N::translate('Help contents'), '</a><br />'; } -echo '<a href="javascript:;" onclick="window.close();">', WT_I18N::translate('Close Window'), '</a>'; +echo '<a href="#" onclick="window.close();">', WT_I18N::translate('Close Window'), '</a>'; echo '</div>'; diff --git a/imageview.php b/imageview.php index 072d48648a..da453f3a92 100644 --- a/imageview.php +++ b/imageview.php @@ -182,10 +182,10 @@ echo "<form name=\"zoomform\" onsubmit=\"setzoom(document.getElementById('zoomva if (!$controller->mediaobject->isExternal() && !$controller->mediaobject->fileExists() ) { echo '<p class="ui-state-error">', WT_I18N::translate('The file “%s” does not exist.', $controller->mediaobject->getLocalFilename()), '</p>'; } else { - echo "<center><font size=\"6\"><a href=\"javascript:;\" onclick=\"zoomin(); return false;\">+</a> <a href=\"javascript:;\" onclick=\"zoomout();\">–</a> </font>"; + echo "<center><font size=\"6\"><a href=\"#\" onclick=\"zoomin(); return false;\">+</a> <a href=\"#\" onclick=\"zoomout();\">–</a> </font>"; echo "<input type=\"text\" size=\"2\" name=\"zoomval\" id=\"zoomval\" value=\"100\" />%"; echo "<input type=\"button\" value=\"".WT_I18N::translate('Reset')."\" onclick=\"resetimage(); return false;\" />"; - echo "<br /><a href=\"javascript:;\" onclick=\"window.opener.location='".$controller->mediaobject->getRawUrl()."'; window.close();\">".WT_I18N::translate('View image details')."</a>"; + echo "<br /><a href=\"#\" onclick=\"window.opener.location='".$controller->mediaobject->getRawUrl()."'; window.close();\">".WT_I18N::translate('View image details')."</a>"; echo "</center>"; $imgsize = $controller->mediaobject->getImageAttributes('main',2,2); $imgwidth = $imgsize['adjW']; @@ -202,4 +202,4 @@ if (!$controller->mediaobject->isExternal() && !$controller->mediaobject->fileEx echo "</form>"; echo "<div style=\"position: relative; \">"; echo "</div>"; -echo "<div class=\"center\"><br /><a href=\"javascript:;\" onclick=\"window.close();\">".WT_I18N::translate('Close Window')."</a></div>"; +echo "<div class=\"center\"><br /><a href=\"#\" onclick=\"window.close();\">".WT_I18N::translate('Close Window')."</a></div>"; diff --git a/includes/functions/functions.php b/includes/functions/functions.php index 16a9c3e85f..73872c60ab 100644 --- a/includes/functions/functions.php +++ b/includes/functions/functions.php @@ -3081,35 +3081,35 @@ function mediaFileInfo($fileName, $thumbName, $mid, $name='', $notes='', $admin= // Lightbox is not installed or Lightbox is not appropriate for this media type switch ($type) { case 'url_flv': - $url = "javascript:;\" onclick=\" var winflv = window.open('".'js/jw_player/flvVideo.php?flvVideo='.rawurlencode($fileName) . "', 'winflv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winflv.focus();}"; + $url = "#\" onclick=\" var winflv = window.open('".'js/jw_player/flvVideo.php?flvVideo='.rawurlencode($fileName) . "', 'winflv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winflv.focus();}"; break 2; case 'local_flv': - $url = "javascript:;\" onclick=\" var winflv = window.open('".'js/jw_player/flvVideo.php?flvVideo='.rawurlencode(WT_SERVER_NAME.WT_SCRIPT_PATH.$fileName) . "', 'winflv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winflv.focus();}"; + $url = "#\" onclick=\" var winflv = window.open('".'js/jw_player/flvVideo.php?flvVideo='.rawurlencode(WT_SERVER_NAME.WT_SCRIPT_PATH.$fileName) . "', 'winflv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winflv.focus();}"; break 2; case 'url_wmv': - $url = "javascript:;\" onclick=\" var winwmv = window.open('".'js/jw_player/wmvVideo.php?wmvVideo='.rawurlencode($fileName) . "', 'winwmv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winwmv.focus();}"; + $url = "#\" onclick=\" var winwmv = window.open('".'js/jw_player/wmvVideo.php?wmvVideo='.rawurlencode($fileName) . "', 'winwmv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winwmv.focus();}"; break 2; case 'local_wmv': case 'local_audio': - $url = "javascript:;\" onclick=\" var winwmv = window.open('".'js/jw_player/wmvVideo.php?wmvVideo='.rawurlencode(WT_SERVER_NAME.WT_SCRIPT_PATH.$fileName) . "', 'winwmv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winwmv.focus();}"; + $url = "#\" onclick=\" var winwmv = window.open('".'js/jw_player/wmvVideo.php?wmvVideo='.rawurlencode(WT_SERVER_NAME.WT_SCRIPT_PATH.$fileName) . "', 'winwmv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winwmv.focus();}"; break 2; case 'url_image': case 'local_image': $imgsize = findImageSize($fileName); $imgwidth = $imgsize[0]+40; $imgheight = $imgsize[1]+150; - $url = "javascript:;\" onclick=\"var winimg = window.open('".$fileName."', 'winimg', 'width=".$imgwidth.", height=".$imgheight.", left=200, top=200'); if (window.focus) {winimg.focus();}"; + $url = "#\" onclick=\"var winimg = window.open('".$fileName."', 'winimg', 'width=".$imgwidth.", height=".$imgheight.", left=200, top=200'); if (window.focus) {winimg.focus();}"; break 2; case 'url_picasa': case 'url_page': case 'url_pdf': case 'url_other': case 'local_other'; - $url = "javascript:;\" onclick=\"var winurl = window.open('".$fileName."', 'winurl', 'width=900, height=600, left=200, top=200'); if (window.focus) {winurl.focus();}"; + $url = "#\" onclick=\"var winurl = window.open('".$fileName."', 'winurl', 'width=900, height=600, left=200, top=200'); if (window.focus) {winurl.focus();}"; break 2; case 'local_page': case 'local_pdf': - $url = "javascript:;\" onclick=\"var winurl = window.open('".WT_SERVER_NAME.WT_SCRIPT_PATH.$fileName."', 'winurl', 'width=900, height=600, left=200, top=200'); if (window.focus) {winurl.focus();}"; + $url = "#\" onclick=\"var winurl = window.open('".WT_SERVER_NAME.WT_SCRIPT_PATH.$fileName."', 'winurl', 'width=900, height=600, left=200, top=200'); if (window.focus) {winurl.focus();}"; break 2; case 'url_streetview': //echo '<iframe style="float:left; padding:5px;" width="264" height="176" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="', $fileName, '&output=svembed"></iframe>'; @@ -3122,7 +3122,7 @@ function mediaFileInfo($fileName, $thumbName, $mid, $name='', $notes='', $admin= $imgsize = findImageSize($fileName); $imgwidth = $imgsize[0]+40; $imgheight = $imgsize[1]+150; - $url = "javascript:;\" onclick=\"return openImage('".urlencode($fileName)."', $imgwidth, $imgheight);"; + $url = "#\" onclick=\"return openImage('".urlencode($fileName)."', $imgwidth, $imgheight);"; } break; } diff --git a/includes/functions/functions_charts.php b/includes/functions/functions_charts.php index 3669819d5f..48c4e63993 100644 --- a/includes/functions/functions_charts.php +++ b/includes/functions/functions_charts.php @@ -268,9 +268,9 @@ function print_family_children($famid, $childid = "", $sosa = 0, $label="", $per if ($sosa==0 && WT_USER_CAN_EDIT) { echo "<br />"; echo "<span class='nowrap font12'>"; - echo "<a href=\"javascript:;\" onclick=\"return addnewchild('$famid','');\">" . WT_I18N::translate('Add a child to this family') . "</a>"; - echo " <a href=\"javascript:;\" onclick=\"return addnewchild('$famid','M');\">[".WT_Person::sexImage('M', 'small', '', WT_I18N::translate('son' ))."]</a>"; - echo " <a href=\"javascript:;\" onclick=\"return addnewchild('$famid','F');\">[".WT_Person::sexImage('F', 'small', '', WT_I18N::translate('daughter'))."]</a>"; + echo "<a href=\"#\" onclick=\"return addnewchild('$famid','');\">" . WT_I18N::translate('Add a child to this family') . "</a>"; + echo " <a href=\"#\" onclick=\"return addnewchild('$famid','M');\">[".WT_Person::sexImage('M', 'small', '', WT_I18N::translate('son' ))."]</a>"; + echo " <a href=\"#\" onclick=\"return addnewchild('$famid','F');\">[".WT_Person::sexImage('F', 'small', '', WT_I18N::translate('daughter'))."]</a>"; echo help_link('add_child'); echo "</span>"; echo "<br /><br />"; @@ -462,14 +462,14 @@ function print_family_facts($family) { echo '<tr><td class="descriptionbox">'; echo WT_I18N::translate('Add Note'), help_link('add_note'); echo '</td><td class="optionbox">'; - echo "<a href=\"javascript:;\" onclick=\"return add_new_record('$famid','NOTE');\">", WT_I18N::translate('Add a new note'), '</a>'; + echo "<a href=\"#\" onclick=\"return add_new_record('$famid','NOTE');\">", WT_I18N::translate('Add a new note'), '</a>'; echo '</td></tr>'; // -- new shared note echo '<tr><td class="descriptionbox">'; echo WT_I18N::translate('Add Shared Note'), help_link('add_shared_note'); echo '</td><td class="optionbox">'; - echo "<a href=\"javascript:;\" onclick=\"return add_new_record('$famid','SHARED_NOTE');\">", WT_I18N::translate('Add a new shared note'), '</a>'; + echo "<a href=\"#\" onclick=\"return add_new_record('$famid','SHARED_NOTE');\">", WT_I18N::translate('Add a new shared note'), '</a>'; echo '</td></tr>'; // -- new media @@ -477,9 +477,9 @@ function print_family_facts($family) { echo '<tr><td class="descriptionbox">'; echo WT_I18N::translate('Add media'), help_link('add_media'); echo '</td><td class="optionbox">'; - echo "<a href=\"javascript:;\" onclick=\"window.open('addmedia.php?action=showmediaform&linktoid={$famid}', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1'); return false;\">", WT_I18N::translate('Add a new media object'), '</a>'; + echo "<a href=\"#\" onclick=\"window.open('addmedia.php?action=showmediaform&linktoid={$famid}', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1'); return false;\">", WT_I18N::translate('Add a new media object'), '</a>'; echo '<br />'; - echo "<a href=\"javascript:;\" onclick=\"window.open('inverselink.php?linktoid={$famid}&linkto=family', '_blank', 'top=50,left=50,width=400,height=300,resizable=1,scrollbars=1'); return false;\">", WT_I18N::translate('Link to an existing media object'), '</a>'; + echo "<a href=\"#\" onclick=\"window.open('inverselink.php?linktoid={$famid}&linkto=family', '_blank', 'top=50,left=50,width=400,height=300,resizable=1,scrollbars=1'); return false;\">", WT_I18N::translate('Link to an existing media object'), '</a>'; echo '</td></tr>'; } @@ -487,7 +487,7 @@ function print_family_facts($family) { echo '<tr><td class="descriptionbox">'; echo WT_I18N::translate('Add Source Citation'), help_link('add_source'); echo '</td><td class="optionbox">'; - echo "<a href=\"javascript:;\" onclick=\"return add_new_record('$famid','SOUR');\">", WT_I18N::translate('Add a new source citation'), '</a>'; + echo "<a href=\"#\" onclick=\"return add_new_record('$famid','SOUR');\">", WT_I18N::translate('Add a new source citation'), '</a>'; echo '</td></tr>'; // -- end new objects } diff --git a/includes/functions/functions_edit.php b/includes/functions/functions_edit.php index d6f506045d..79d0240e02 100644 --- a/includes/functions/functions_edit.php +++ b/includes/functions/functions_edit.php @@ -1087,7 +1087,7 @@ function print_calendar_popup($id, $asString=false) { if (isset($WT_IMAGES["button_calendar"])) $Link = "<img src=\"".$WT_IMAGES["button_calendar"]."\" name=\"img".$id."\" id=\"img".$id."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; $out = ' '; - $out .= "<a href=\"javascript: ".$text."\" onclick=\"cal_toggleDate('caldiv".$id."', '".$id."'); return false;\">"; + $out .= "<a href=\"#\" onclick=\"cal_toggleDate('caldiv".$id."', '".$id."'); return false;\">"; $out .= $Link; $out .= "</a>"; $out .= "<div id=\"caldiv".$id."\" style=\"position:absolute;visibility:hidden;background-color:white;layer-background-color:white; z-index: 1000;\"></div>"; @@ -1103,7 +1103,7 @@ function print_addnewmedia_link($element_id) { $text = WT_I18N::translate('Add a new media object'); if (isset($WT_IMAGES["button_addmedia"])) $Link = "<img src=\"".$WT_IMAGES["button_addmedia"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - echo ' <a href="javascript:;" onclick="pastefield=document.getElementById(\'', $element_id, '\'); window.open(\'addmedia.php?action=showmediaform&linktoid={$linkToID}&level={$level}\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">'; + echo ' <a href="#" onclick="pastefield=document.getElementById(\'', $element_id, '\'); window.open(\'addmedia.php?action=showmediaform&linktoid={$linkToID}&level={$level}\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">'; echo $Link; echo "</a>"; } @@ -1116,7 +1116,7 @@ function print_addnewrepository_link($element_id) { $text = WT_I18N::translate('Create Repository'); if (isset($WT_IMAGES["button_addrepository"])) $Link = "<img src=\"".$WT_IMAGES["button_addrepository"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - echo " <a href=\"javascript:;\" onclick=\"addnewrepository(document.getElementById('", $element_id, "')); return false;\">"; + echo " <a href=\"#\" onclick=\"addnewrepository(document.getElementById('", $element_id, "')); return false;\">"; echo $Link; echo "</a>"; } @@ -1130,7 +1130,7 @@ function print_addnewnote_link($element_id) { $text = WT_I18N::translate('Create a new Shared Note'); if (isset($WT_IMAGES["button_addnote"])) $Link = "<img src=\"".$WT_IMAGES["button_addnote"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - echo " <a href=\"javascript:ADD;\" onclick=\"addnewnote(document.getElementById('", $element_id, "')); return false;\">"; + echo " <a href=\"#\" onclick=\"addnewnote(document.getElementById('", $element_id, "')); return false;\">"; echo $Link; echo "</a>"; } @@ -1144,7 +1144,7 @@ function print_addnewnote_assisted_link($element_id) { $text = WT_I18N::translate('Create a new Shared Note using Assistant'); if (isset($WT_IMAGES["button_addnote"])) $Link = "<img src=\"".$WT_IMAGES["button_addnote"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - echo " <a href=\"javascript:ADD;\" onclick=\"addnewnote_assisted(document.getElementById('", $element_id, "'), '", $pid, "' ); return false;\">"; + echo " <a href=\"#\" onclick=\"addnewnote_assisted(document.getElementById('", $element_id, "'), '", $pid, "' ); return false;\">"; echo $Link; echo "</a>"; } @@ -1159,7 +1159,7 @@ function print_editnote_link($note_id) { $text = WT_I18N::translate('Edit Shared Note'); if (isset($WT_IMAGES["button_note"])) $Link = "<img src=\"".$WT_IMAGES["button_note"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - echo "<a href=\"javascript: var win02=window.open('edit_interface.php?action=editnote&pid=$note_id', 'win02', 'top=70, left=70, width=620, height=500, resizable=1, scrollbars=1 ' )\">"; + echo "<a href=\"#\" onclick=\"var win02=window.open('edit_interface.php?action=editnote&pid=$note_id', 'win02', 'top=70, left=70, width=620, height=500, resizable=1, scrollbars=1 ' )\">"; echo $Link; echo "</a>"; } @@ -1173,7 +1173,7 @@ function print_addnewsource_link($element_id) { $text = WT_I18N::translate('Create a new source'); if (isset($WT_IMAGES["button_addsource"])) $Link = "<img src=\"".$WT_IMAGES["button_addsource"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - echo " <a href=\"javascript:;\" onclick=\"addnewsource(document.getElementById('", $element_id, "')); return false;\">"; + echo " <a href=\"#\" onclick=\"addnewsource(document.getElementById('", $element_id, "')); return false;\">"; echo $Link; echo "</a>"; } @@ -1581,7 +1581,7 @@ function add_simple_tag($tag, $upperlevel='', $label='', $readOnly='', $noClose= print_specialchar_link($element_id, false); print_findplace_link($element_id); echo "</div>"; - echo "<a href=\"javascript:;\" onclick=\"toggle_lati_long();\"><img src=\"", $WT_IMAGES["target"], "\" border=\"0\" align=\"middle\" alt=\"", WT_Gedcom_Tag::getLabel('LATI'), " / ", WT_Gedcom_Tag::getLabel('LONG'), "\" title=\"", WT_Gedcom_Tag::getLabel('LATI'), " / ", WT_Gedcom_Tag::getLabel('LONG'), "\" /></a>"; + echo "<a href=\"#\" onclick=\"toggle_lati_long();\"><img src=\"", $WT_IMAGES["target"], "\" border=\"0\" align=\"middle\" alt=\"", WT_Gedcom_Tag::getLabel('LATI'), " / ", WT_Gedcom_Tag::getLabel('LONG'), "\" title=\"", WT_Gedcom_Tag::getLabel('LATI'), " / ", WT_Gedcom_Tag::getLabel('LONG'), "\" /></a>"; if (array_key_exists('places_assistant', WT_Module::getActiveModules())) { places_assistant_WT_Module::setup_place_subfields($element_id); places_assistant_WT_Module::print_place_subfields($element_id); @@ -1699,7 +1699,7 @@ function add_simple_tag($tag, $upperlevel='', $label='', $readOnly='', $noClose= if ($type_pid->getType()=="INDI" ) { echo " "; echo " "; - echo "<a href=\"javascript:ADD;\" onclick=\"addnewnote_assisted(document.getElementById('", $element_id, "'), '", $pid, "' ); return false;\" title=\"".WT_I18N::translate('Create a new Shared Note using Assistant')."\" alt=\"".WT_I18N::translate('Create a new Shared Note using Assistant')."\">"; + echo "<a href=\"#\" onclick=\"addnewnote_assisted(document.getElementById('", $element_id, "'), '", $pid, "' ); return false;\" title=\"".WT_I18N::translate('Create a new Shared Note using Assistant')."\" alt=\"".WT_I18N::translate('Create a new Shared Note using Assistant')."\">"; echo WT_I18N::translate('Shared Note using Assistant'); echo "</a>"; print_addnewnote_assisted_link($element_id); @@ -1775,7 +1775,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { if ($tag=="SOUR") { //-- Add new source to fact - echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newsource');\"><img id=\"newsource_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new source citation'), "</a>"; + echo "<a href=\"#\" onclick=\"return expand_layer('newsource');\"><img id=\"newsource_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new source citation'), "</a>"; echo help_link('edit_add_SOUR'); echo "<br />"; echo "<div id=\"newsource\" style=\"display: none;\">"; @@ -1806,12 +1806,12 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { if ($tag=="ASSO" || $tag=="ASSO2") { //-- Add a new ASSOciate if ($tag=="ASSO") { - echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newasso');\"><img id=\"newasso_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new associate'), "</a>"; + echo "<a href=\"#\" onclick=\"return expand_layer('newasso');\"><img id=\"newasso_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new associate'), "</a>"; echo help_link('edit_add_ASSO'); echo "<br />"; echo "<div id=\"newasso\" style=\"display: none;\">"; } else { - echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newasso2');\"><img id=\"newasso2_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new associate'), "</a>"; + echo "<a href=\"#\" onclick=\"return expand_layer('newasso2');\"><img id=\"newasso2_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new associate'), "</a>"; echo help_link('edit_add_ASSO'); echo "<br />"; echo "<div id=\"newasso2\" style=\"display: none;\">"; @@ -1831,7 +1831,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { if ($tag=="NOTE") { //-- Retrieve existing note or add new note to fact $text = ''; - echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newnote');\"><img id=\"newnote_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new note'), "</a>"; + echo "<a href=\"#\" onclick=\"return expand_layer('newnote');\"><img id=\"newnote_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new note'), "</a>"; echo help_link('edit_add_NOTE'); echo "<br />"; echo "<div id=\"newnote\" style=\"display: none;\">"; @@ -1844,7 +1844,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { if ($tag=="SHARED_NOTE") { //-- Retrieve existing shared note or add new shared note to fact $text = ''; - echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newshared_note');\"><img id=\"newshared_note_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new shared note'), "</a>"; + echo "<a href=\"#\" onclick=\"return expand_layer('newshared_note');\"><img id=\"newshared_note_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new shared note'), "</a>"; echo help_link('edit_add_SHARED_NOTE'); echo "<br />"; echo "<div id=\"newshared_note\" style=\"display: none;\">"; @@ -1857,7 +1857,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { } if ($tag=="OBJE") { //-- Add new obje to fact - echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newobje');\"><img id=\"newobje_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new media object'), "</a>"; + echo "<a href=\"#\" onclick=\"return expand_layer('newobje');\"><img id=\"newobje_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_I18N::translate('Add a new media object'), "</a>"; echo help_link('add_media'); echo "<br />"; echo "<div id=\"newobje\" style=\"display: none;\">"; @@ -1869,7 +1869,7 @@ function print_add_layer($tag, $level=2, $printSaveButton=true) { if ($tag=="RESN") { //-- Retrieve existing resn or add new resn to fact $text = ''; - echo "<a href=\"javascript:;\" onclick=\"return expand_layer('newresn');\"><img id=\"newresn_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_Gedcom_Tag::getLabel('RESN'), "</a>"; + echo "<a href=\"#\" onclick=\"return expand_layer('newresn');\"><img id=\"newresn_img\" src=\"", $WT_IMAGES["plus"], "\" border=\"0\" width=\"11\" height=\"11\" alt=\"\" title=\"\" /> ", WT_Gedcom_Tag::getLabel('RESN'), "</a>"; echo help_link('RESN'); echo "<br />"; echo "<div id=\"newresn\" style=\"display: none;\">"; diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index 81344ae336..4092aafcec 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -135,7 +135,7 @@ function print_pedigree_person($person, $style=1, $count=0, $personcount="1") { if (!$show_full) { $outBoxAdd .= $mouseAction4; } else { - $icons .= "<a href=\"javascript:;\""; + $icons .= "<a href=\"#\""; $icons .= $mouseAction4; $icons .= "><img id=\"iconz-$boxID\" src=\"".$WT_IMAGES["zoomin"]."\" border=\"0\" alt=\"".WT_I18N::translate('Zoom in/out on this box.')."\" title=\"".WT_I18N::translate('Zoom in/out on this box.')."\" /></a>"; $icons .= '<div class="itr"><img src="'.$WT_IMAGES['pedigree'].'" alt="" title="" /><div class="popup">'.$personlinks.'</div></div>'; @@ -320,7 +320,7 @@ function user_contact_link($user_id) { $email=getUserEmail($user_id); return '<a href="mailto:'.htmlspecialchars($email).'">'.htmlspecialchars($fullname).'</a>'; default: - return "<a href='javascript:;' onclick='message(\"".get_user_name($user_id)."\", \"{$method}\");return false;'>{$fullname}</a>"; + return "<a href='#' onclick='message(\"".get_user_name($user_id)."\", \"{$method}\");return false;'>{$fullname}</a>"; } } @@ -488,7 +488,7 @@ function print_note_record($text, $nlevel, $nrec, $textOnly=false, $return=false $data .= '<div class="fact_NOTE"><span class="label">'; if ($brpos !== false) { if ($EXPAND_NOTES) $plusminus='minus'; else $plusminus='plus'; - $data .= '<a href="javascript:;" onclick="expand_layer(\''.$elementID.'\'); return false;"><img id="'.$elementID.'_img" src="'.$WT_IMAGES[$plusminus].'" border="0" width="11" height="11" alt="'; + $data .= '<a href="#" onclick="expand_layer(\''.$elementID.'\'); return false;"><img id="'.$elementID.'_img" src="'.$WT_IMAGES[$plusminus].'" border="0" width="11" height="11" alt="'; if ($plusminus=='plus') $data .= WT_I18N::translate('Show Details').'" title="'.WT_I18N::translate('Show Details').'" /></a> '; else $data .= WT_I18N::translate('Hide Details').'" title="'.WT_I18N::translate('Hide Details').'" /></a> '; } @@ -608,7 +608,7 @@ function print_privacy_error() { echo '<div class="error">', WT_I18N::translate('For more information contact'), ' ', '<a href="mailto:'.htmlspecialchars($email).'">'.htmlspecialchars($fullname).'</a>', '</div>'; break; default: - echo '<div class="error">', WT_I18N::translate('For more information contact'), ' ', "<a href='javascript:;' onclick='message(\"".get_user_name($user_id)."\", \"{$method}\");return false;'>{$fullname}</a>", '</div>'; + echo '<div class="error">', WT_I18N::translate('For more information contact'), ' ', "<a href='#' onclick='message(\"".get_user_name($user_id)."\", \"{$method}\");return false;'>{$fullname}</a>", '</div>'; break; } } @@ -619,7 +619,7 @@ function help_link($help_topic, $module='') { if ($_SESSION['show_context_help']) { return - '<a class="help icon-help-15" href="javascript: '.$help_topic.'" onclick="helpPopup(\''.$help_topic.'\',\''.$module.'\'); return false;"> '. + '<a class="help icon-help-15" href="#" onclick="helpPopup(\''.$help_topic.'\',\''.$module.'\'); return false;"> '. ($WT_USE_HELPIMG ? '<img src="'.$WT_IMAGES['help'].'" class="icon" width="15" height="15" alt="" />' : WT_I18N::translate('?')). ' </a>'; } else { @@ -1248,7 +1248,7 @@ function print_add_new_fact($id, $usedfacts, $type) { } echo '</select>'; echo " <input type=\"button\" value=\"", WT_I18N::translate('Add'), "\" onclick=\"add_record('$id', 'newfact');\" /> "; - foreach ($quickfacts as $fact) echo " <small><a href='javascript://$fact' onclick=\"add_new_record('$id', '$fact');return false;\">", WT_Gedcom_Tag::getLabel($fact), "</a></small> "; + foreach ($quickfacts as $fact) echo " <small><a href='#' onclick=\"add_new_record('$id', '$fact');return false;\">", WT_Gedcom_Tag::getLabel($fact), "</a></small> "; echo '</form>'; echo '</td></tr>'; } @@ -1303,7 +1303,7 @@ function print_findindi_link($element_id, $indiname, $asString=false, $multiple= if (empty($ged)) $ged=$GEDCOM; if (isset($WT_IMAGES["button_indi"])) $Link = "<img src=\"".$WT_IMAGES["button_indi"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - $out = " <a href=\"javascript:;\" onclick=\"findIndi(document.getElementById('".$element_id."'), document.getElementById('".$indiname."'), '".$multiple."', '".$ged."', '".$filter."'); findtype='individual'; return false;\">"; + $out = " <a href=\"#\" onclick=\"findIndi(document.getElementById('".$element_id."'), document.getElementById('".$indiname."'), '".$multiple."', '".$ged."', '".$filter."'); findtype='individual'; return false;\">"; $out .= $Link; $out .= "</a>"; if ($asString) return $out; @@ -1317,7 +1317,7 @@ function print_findplace_link($element_id, $ged='', $asString=false) { $text = WT_I18N::translate('Find Place'); if (isset($WT_IMAGES["button_place"])) $Link = "<img src=\"".$WT_IMAGES["button_place"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - $out = " <a href=\"javascript:;\" onclick=\"findPlace(document.getElementById('".$element_id."'), '".$ged."'); return false;\">"; + $out = " <a href=\"#\" onclick=\"findPlace(document.getElementById('".$element_id."'), '".$ged."'); return false;\">"; $out .= $Link; $out .= "</a>"; if ($asString) return $out; @@ -1331,7 +1331,7 @@ function print_findfamily_link($element_id, $ged='', $asString=false) { $text = WT_I18N::translate('Find Family ID'); if (isset($WT_IMAGES["button_family"])) $Link = "<img src=\"".$WT_IMAGES["button_family"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - $out = " <a href=\"javascript:;\" onclick=\"findFamily(document.getElementById('".$element_id."'), '".$ged."'); return false;\">"; + $out = " <a href=\"#\" onclick=\"findFamily(document.getElementById('".$element_id."'), '".$ged."'); return false;\">"; $out .= $Link; $out .= "</a>"; if ($asString) return $out; @@ -1344,7 +1344,7 @@ function print_specialchar_link($element_id, $vert, $asString=false) { $text = WT_I18N::translate('Find Special Characters'); if (isset($WT_IMAGES["button_keyboard"])) $Link = "<img id=\"".$element_id."_spec\" name=\"".$element_id."_spec\" src=\"".$WT_IMAGES["button_keyboard"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - $out = " <a href=\"javascript:;\" onclick=\"findSpecialChar(document.getElementById('".$element_id."')); updatewholename(); return false;\">"; + $out = " <a href=\"#\" onclick=\"findSpecialChar(document.getElementById('".$element_id."')); updatewholename(); return false;\">"; $out .= $Link; $out .= "</a>"; if ($asString) return $out; @@ -1354,7 +1354,7 @@ function print_specialchar_link($element_id, $vert, $asString=false) { function print_autopaste_link($element_id, $choices, $concat=1, $name=1, $submit=0) { echo "<small>"; foreach ($choices as $indexval => $choice) { - echo " <a href=\"javascript:;\" onclick=\"document.getElementById('", $element_id, "').value "; + echo " <a href=\"#\" onclick=\"document.getElementById('", $element_id, "').value "; if ($concat) echo "+=' "; else echo "='"; echo $choice, "'; "; if ($name) echo " updatewholename();"; @@ -1371,7 +1371,7 @@ function print_findsource_link($element_id, $sourcename="", $asString=false, $ge $text = WT_I18N::translate('Find Source ID'); if (isset($WT_IMAGES["button_source"])) $Link = "<img src=\"".$WT_IMAGES["button_source"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - $out = " <a href=\"javascript:;\" onclick=\"findSource(document.getElementById('".$element_id."'), document.getElementById('".$sourcename."'), '".$ged."'); findtype='source'; return false;\">"; + $out = " <a href=\"#\" onclick=\"findSource(document.getElementById('".$element_id."'), document.getElementById('".$sourcename."'), '".$ged."'); findtype='source'; return false;\">"; $out .= $Link; $out .= "</a>"; if ($asString) return $out; @@ -1385,7 +1385,7 @@ function print_findnote_link($element_id, $notename="", $asString=false, $ged='' $text = WT_I18N::translate('Find Shared Note'); if (isset($WT_IMAGES["button_note"])) $Link = "<img src=\"".$WT_IMAGES["button_note"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - $out = " <a href=\"javascript:;\" onclick=\"findnote(document.getElementById('".$element_id."'), document.getElementById('".$notename."'), '".$ged."'); findtype='note'; return false;\">"; + $out = " <a href=\"#\" onclick=\"findnote(document.getElementById('".$element_id."'), document.getElementById('".$notename."'), '".$ged."'); findtype='note'; return false;\">"; $out .= $Link; $out .= "</a>"; if ($asString) return $out; @@ -1399,7 +1399,7 @@ function print_findrepository_link($element_id, $ged='', $asString=false) { $text = WT_I18N::translate('Find Repository'); if (isset($WT_IMAGES["button_repository"])) $Link = "<img src=\"".$WT_IMAGES["button_repository"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - $out = " <a href=\"javascript:;\" onclick=\"findRepository(document.getElementById('".$element_id."'), '".$ged."'); return false;\">"; + $out = " <a href=\"#\" onclick=\"findRepository(document.getElementById('".$element_id."'), '".$ged."'); return false;\">"; $out .= $Link; $out .= "</a>"; if ($asString) return $out; @@ -1413,7 +1413,7 @@ function print_findmedia_link($element_id, $choose="", $ged='', $asString=false) $text = WT_I18N::translate('Find media'); if (isset($WT_IMAGES["button_media"])) $Link = "<img src=\"".$WT_IMAGES["button_media"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"middle\" />"; else $Link = $text; - $out = " <a href=\"javascript:;\" onclick=\"findMedia(document.getElementById('".$element_id."'), '".$choose."', '".$ged."'); return false;\">"; + $out = " <a href=\"#\" onclick=\"findMedia(document.getElementById('".$element_id."'), '".$choose."', '".$ged."'); return false;\">"; $out .= $Link; $out .= "</a>"; if ($asString) return $out; @@ -1427,7 +1427,7 @@ function print_findfact_link($element_id, $ged='', $asString=false) { if (empty($ged)) $ged=$GEDCOM; if (isset($WT_IMAGES["button_find_facts"])) $Link = "<img src=\"".$WT_IMAGES["button_find_facts"]."\" alt=\"".$text."\" title=\"".$text."\" border=\"0\" align=\"top\" />"; else $Link = $text; - $out = " <a href=\"javascript:;\" onclick=\"findFact(document.getElementById('".$element_id."'), '".$ged."'); return false;\">"; + $out = " <a href=\"#\" onclick=\"findFact(document.getElementById('".$element_id."'), '".$ged."'); return false;\">"; $out .= $Link; $out .= "</a>"; if ($asString) return $out; diff --git a/includes/functions/functions_print_facts.php b/includes/functions/functions_print_facts.php index 355975785f..904a15a13b 100644 --- a/includes/functions/functions_print_facts.php +++ b/includes/functions/functions_print_facts.php @@ -162,11 +162,11 @@ function print_fact(WT_Event $fact, WT_GedcomRecord $record) { if (WT_USER_CAN_EDIT && $styleadd!='change_old' && $fact->getLineNumber()>0 && $fact->canEdit()) { echo - '<a onclick="return edit_record(\'', $pid, '\', ', $fact->getLineNumber(), ');" href="javascript:;" title="', WT_I18N::translate('Edit'), '">', $label, '</a>', + '<a onclick="return edit_record(\'', $pid, '\', ', $fact->getLineNumber(), ');" href="#" title="', WT_I18N::translate('Edit'), '">', $label, '</a>', '<div class="editfacts">', - '<div class="editlink"><a class="editicon" onclick="return edit_record(\'', $pid, '\', ', $fact->getLineNumber(), ');" href="javascript:;" title="', WT_I18N::translate('Edit'), '"><span class="link_text">', WT_I18N::translate('Edit'), '</span></a></div>', + '<div class="editlink"><a class="editicon" onclick="return edit_record(\'', $pid, '\', ', $fact->getLineNumber(), ');" href="#" title="', WT_I18N::translate('Edit'), '"><span class="link_text">', WT_I18N::translate('Edit'), '</span></a></div>', '<div class="copylink"><a class="copyicon" href="#" onclick="jQuery.post(\'action.php\',{action:\'copy-fact\', type:\''.$fact->getParentObject()->getType().'\',factgedcom:\''.rawurlencode($fact->getGedcomRecord()).'\'},function(){location.reload();})" title="', WT_I18N::translate('Copy'), '"><span class="link_text">', WT_I18N::translate('Copy'), '</span></a></div>', - '<div class="deletelink"><a class="deleteicon" onclick="return delete_record(\'', $pid, '\', ', $fact->getLineNumber(), ');" href="javascript:;" title="', WT_I18N::translate('Delete'), '"><span class="link_text">', WT_I18N::translate('Delete'), '</span></a></div>', + '<div class="deletelink"><a class="deleteicon" onclick="return delete_record(\'', $pid, '\', ', $fact->getLineNumber(), ');" href="#" title="', WT_I18N::translate('Delete'), '"><span class="link_text">', WT_I18N::translate('Delete'), '</span></a></div>', '</div>'; } else { echo $label; @@ -491,7 +491,7 @@ function print_fact_sources($factrec, $level, $return=false) { $plusminus='plus'; } if ($lt>0) { - $data .= "<a href=\"javascript:;\" onclick=\"expand_layer('$elementID'); return false;\"><img id=\"{$elementID}_img\" src=\"".$WT_IMAGES[$plusminus].'" border="0" width="11" height="11" alt="'; + $data .= "<a href=\"#\" onclick=\"expand_layer('$elementID'); return false;\"><img id=\"{$elementID}_img\" src=\"".$WT_IMAGES[$plusminus].'" border="0" width="11" height="11" alt="'; if ($plusminus=='plus') $data .= WT_I18N::translate('Show Details').'" title="'.WT_I18N::translate('Show Details').'" /></a> '; else $data .= WT_I18N::translate('Hide Details').'" title="'.WT_I18N::translate('Hide Details').'" /></a> '; } @@ -588,7 +588,7 @@ function print_media_links($factrec, $level, $pid='') { } else if ($USE_MEDIA_VIEWER) { echo '<a href="mediaviewer.php?mid=', $media_id, '">'; } else if (preg_match("/\.(jpe?g|gif|png)$/i", $mainMedia)) { - echo "<a href=\"javascript:;\" onclick=\"return openImage('", rawurlencode($mainMedia), "', $imgwidth, $imgheight);\">"; + echo "<a href=\"#\" onclick=\"return openImage('", rawurlencode($mainMedia), "', $imgwidth, $imgheight);\">"; // extra for Streetview ---------------------------------------- } else if (strpos($row['m_file'], 'http://maps.google.')===0) { echo '<iframe width="300" height="200" frameborder="0" scrolling="no" marginheight="0" marginwidth="0" src="', $row["m_file"], '&output=svembed"></iframe>'; @@ -835,15 +835,15 @@ function print_main_sources($factrec, $level, $pid, $linenum, $noedit=false) { } } else if (!$noedit && WT_USER_CAN_EDIT && !FactEditRestricted($pid, $factrec) && $styleadd!="red") { - echo "<a onclick=\"return edit_record('$pid', $linenum);\" href=\"javascript:;\" title=\"", WT_I18N::translate('Edit'), '">'; + echo "<a onclick=\"return edit_record('$pid', $linenum);\" href=\"#\" title=\"", WT_I18N::translate('Edit'), '">'; if ($SHOW_FACT_ICONS) { if ($level==1) echo '<img class="icon" src="', $WT_IMAGES['source'], '" alt="" />'; } echo WT_Gedcom_Tag::getLabel($factname, $parent), '</a>'; echo '<div class="editfacts">'; - echo "<div class=\"editlink\"><a class=\"editicon\" onclick=\"return edit_record('$pid', $linenum);\" href=\"javascript:;\" title=\"".WT_I18N::translate('Edit')."\"><span class=\"link_text\">".WT_I18N::translate('Edit')."</span></a></div>"; + echo "<div class=\"editlink\"><a class=\"editicon\" onclick=\"return edit_record('$pid', $linenum);\" href=\"#\" title=\"".WT_I18N::translate('Edit')."\"><span class=\"link_text\">".WT_I18N::translate('Edit')."</span></a></div>"; echo '<div class="copylink"><a class="copyicon" href="#" onclick="jQuery.post(\'action.php\',{action:\'copy-fact\', type:\'\', factgedcom:\''.rawurlencode($factrec).'\'},function(){location.reload();})" title="'.WT_I18N::translate('Copy').'"><span class="link_text">'.WT_I18N::translate('Copy').'</span></a></div>'; - echo "<div class=\"deletelink\"><a class=\"deleteicon\" onclick=\"return delete_record('$pid', $linenum);\" href=\"javascript:;\" title=\"".WT_I18N::translate('Delete')."\"><span class=\"link_text\">".WT_I18N::translate('Delete')."</span></a></div>"; + echo "<div class=\"deletelink\"><a class=\"deleteicon\" onclick=\"return delete_record('$pid', $linenum);\" href=\"#\" title=\"".WT_I18N::translate('Delete')."\"><span class=\"link_text\">".WT_I18N::translate('Delete')."</span></a></div>"; echo '</div>'; } else { echo WT_Gedcom_Tag::getLabel($factname, $parent); @@ -1035,7 +1035,7 @@ function print_main_notes($factrec, $level, $pid, $linenum, $noedit=false) { if ($level>=2) echo ' rela'; echo ' ', $styleadd, ' width20">'; if (!$noedit && WT_USER_CAN_EDIT && !FactEditRestricted($pid, $factrec) && $styleadd!='change_old') { - echo "<a onclick=\"return edit_record('$pid', $linenum);\" href=\"javascript:;\" title=\"", WT_I18N::translate('Edit'), '\">'; + echo "<a onclick=\"return edit_record('$pid', $linenum);\" href=\"#\" title=\"", WT_I18N::translate('Edit'), '\">'; if ($level<2) { if ($SHOW_FACT_ICONS) { echo '<img class="icon" src="', $WT_IMAGES['note'], '" alt="" />'; @@ -1047,9 +1047,9 @@ function print_main_notes($factrec, $level, $pid, $linenum, $noedit=false) { } echo '</a>'; echo '<div class="editfacts">'; - echo "<div class=\"editlink\"><a class=\"editicon\" onclick=\"return edit_record('$pid', $linenum);\" href=\"javascript:;\" title=\"".WT_I18N::translate('Edit')."\"><span class=\"link_text\">".WT_I18N::translate('Edit')."</span></a></div>"; + echo "<div class=\"editlink\"><a class=\"editicon\" onclick=\"return edit_record('$pid', $linenum);\" href=\"#\" title=\"".WT_I18N::translate('Edit')."\"><span class=\"link_text\">".WT_I18N::translate('Edit')."</span></a></div>"; echo '<div class="copylink"><a class="copyicon" href="#" onclick="jQuery.post(\'action.php\',{action:\'copy-fact\', type:\'\', factgedcom:\''.rawurlencode($factrec).'\'},function(){location.reload();})" title="'.WT_I18N::translate('Copy').'"><span class="link_text">'.WT_I18N::translate('Copy').'</span></a></div>'; - echo "<div class=\"deletelink\"><a class=\"deleteicon\" onclick=\"return delete_record('$pid', $linenum);\" href=\"javascript:;\" title=\"".WT_I18N::translate('Delete')."\"><span class=\"link_text\">".WT_I18N::translate('Delete')."</span></a></div>"; + echo "<div class=\"deletelink\"><a class=\"deleteicon\" onclick=\"return delete_record('$pid', $linenum);\" href=\"#\" title=\"".WT_I18N::translate('Delete')."\"><span class=\"link_text\">".WT_I18N::translate('Delete')."</span></a></div>"; echo '</div>'; } } else { @@ -1336,15 +1336,15 @@ function print_main_media_row($rtype, $rowm, $pid) { $linenum = 0; echo '<tr><td class="descriptionbox', $styleadd,' width20">'; if ($rowm['mm_gid']==$pid && WT_USER_CAN_EDIT && (!FactEditRestricted($mediaobject->getXref(), $mediaobject->getGedcomRecord())) && ($styleadd!='change_old') && $rowm['m_gedrec']!='') { - echo "<a onclick=\"return window.open('addmedia.php?action=editmedia&pid=", $mediaobject->getXref(), "&linktoid={$rowm['mm_gid']}', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1');\" href=\"javascript:;\" title=\"", WT_I18N::translate('Edit'), "\">"; + echo "<a onclick=\"return window.open('addmedia.php?action=editmedia&pid=", $mediaobject->getXref(), "&linktoid={$rowm['mm_gid']}', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1');\" href=\"#\" title=\"", WT_I18N::translate('Edit'), "\">"; if ($SHOW_FACT_ICONS) { echo '<img class="icon" src="', $WT_IMAGES['media'], '" alt="" />'; } echo WT_Gedcom_Tag::getLabel('OBJE'), '</a>'; echo '<div class="editfacts">'; - echo "<div class=\"editlink\"><a class=\"editicon\" onclick=\"return window.open('addmedia.php?action=editmedia&pid=".$mediaobject->getXref()."&linktoid={$rowm['mm_gid']}', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1');\" href=\"javascript:;\" title=\"".WT_I18N::translate('Edit')."\"><span class=\"link_text\">".WT_I18N::translate('Edit')."</span></a></div>"; + echo "<div class=\"editlink\"><a class=\"editicon\" onclick=\"return window.open('addmedia.php?action=editmedia&pid=".$mediaobject->getXref()."&linktoid={$rowm['mm_gid']}', '_blank', 'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1');\" href=\"#\" title=\"".WT_I18N::translate('Edit')."\"><span class=\"link_text\">".WT_I18N::translate('Edit')."</span></a></div>"; echo '<div class="copylink"><a class="copyicon" href="#" onclick="jQuery.post(\'action.php\',{action:\'copy-fact\', type:\'\', factgedcom:\'1 OBJE @'.$mediaobject->getXref().'@\'},function(){location.reload();})" title="'.WT_I18N::translate('Copy').'"><span class="link_text">'.WT_I18N::translate('Copy').'</span></a></div>'; - echo "<div class=\"deletelink\"><a class=\"deleteicon\" onclick=\"return delete_record('$pid', 'OBJE', '".$mediaobject->getXref()."');\" href=\"javascript:;\" title=\"".WT_I18N::translate('Delete')."\"><span class=\"link_text\">".WT_I18N::translate('Delete')."</span></a></div>"; + echo "<div class=\"deletelink\"><a class=\"deleteicon\" onclick=\"return delete_record('$pid', 'OBJE', '".$mediaobject->getXref()."');\" href=\"#\" title=\"".WT_I18N::translate('Delete')."\"><span class=\"link_text\">".WT_I18N::translate('Delete')."</span></a></div>"; echo '</div>'; echo '</td>'; } @@ -156,11 +156,11 @@ if ($blocks['side']) { // Ensure there is always way to configure the blocks if ($ctype=='user' && !in_array('user_welcome', $blocks['main']) && !in_array('user_welcome', $blocks['side'])) { echo '<div align="center">'; - echo "<a href=\"javascript:;\" onclick=\"window.open('index_edit.php?name=".rawurlencode(WT_USER_NAME)."&ctype=user', '_blank', 'top=50,left=10,width=600,height=500,scrollbars=1,resizable=1');\">".WT_I18N::translate('Change the blocks on this page').'</a>'; + echo "<a href=\"#\" onclick=\"window.open('index_edit.php?name=".rawurlencode(WT_USER_NAME)."&ctype=user', '_blank', 'top=50,left=10,width=600,height=500,scrollbars=1,resizable=1');\">".WT_I18N::translate('Change the blocks on this page').'</a>'; echo '</div>'; } if (WT_USER_IS_ADMIN && $ctype=='gedcom' && !in_array('gedcom_block', $blocks['main']) && !in_array('gedcom_block', $blocks['side'])) { echo '<div align="center">'; - echo "<a href=\"javascript:;\" onclick=\"window.open('index_edit.php?name=".WT_GEDURL."&ctype=gedcom', '_blank', 'top=50,left=10,width=600,height=500,scrollbars=1,resizable=1');\">".WT_I18N::translate('Change the blocks on this page').'</a>'; + echo "<a href=\"#\" onclick=\"window.open('index_edit.php?name=".WT_GEDURL."&ctype=gedcom', '_blank', 'top=50,left=10,width=600,height=500,scrollbars=1,resizable=1');\">".WT_I18N::translate('Change the blocks on this page').'</a>'; echo '</div>'; } diff --git a/index_edit.php b/index_edit.php index b853ed54ba..6a0873db30 100644 --- a/index_edit.php +++ b/index_edit.php @@ -47,7 +47,7 @@ if (isset($_REQUEST['name'])) $name = $_REQUEST['name']; if (!WT_USER_ID) { $controller->pageHeader(); echo WT_I18N::translate('<b>Access Denied</b><br />You do not have access to this resource.'); - echo '<div class="center"><a href="javascript:;" onclick="self.close();">', WT_I18N::translate('Close Window').'</a></div>'; + echo '<div class="center"><a href="#" onclick="self.close();">', WT_I18N::translate('Close Window').'</a></div>'; exit; } if (!WT_USER_IS_ADMIN) $setdefault=false; diff --git a/individual.php b/individual.php index 43ebbd3501..fe0582a419 100644 --- a/individual.php +++ b/individual.php @@ -57,8 +57,8 @@ if ($controller->record && $controller->record->canDisplayDetails()) { '<p class="ui-state-highlight">', /* I18N: %1$s is "accept", %2$s is "reject". These are links. */ WT_I18N::translate( 'This individual has been deleted. You should review the deletion and then %1$s or %2$s it.', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'accept') . '</a>', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'reject') . '</a>' + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'accept') . '</a>', + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'reject') . '</a>' ), ' ', help_link('pending_changes'), '</p>'; @@ -75,8 +75,8 @@ if ($controller->record && $controller->record->canDisplayDetails()) { '<p class="ui-state-highlight">', /* I18N: %1$s is "accept", %2$s is "reject". These are links. */ WT_I18N::translate( 'This individual has been edited. You should review the changes and then %1$s or %2$s them.', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'accept') . '</a>', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'reject') . '</a>' + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'accept') . '</a>', + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'reject') . '</a>' ), ' ', help_link('pending_changes'), '</p>'; diff --git a/inverselink.php b/inverselink.php index ef02ad5bbd..0c8d5e7a11 100644 --- a/inverselink.php +++ b/inverselink.php @@ -192,12 +192,12 @@ if (WT_USER_IS_ADMIN && $linkto=='manage' && array_key_exists('GEDFact_assistant echo '<tr><td class="topbottombar" colspan="2"><input type="submit" value="', WT_I18N::translate('Set link'), '" /></td></tr>'; echo '</table>'; echo '</form>'; - echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', WT_I18N::translate('Close Window'), '</a><br /></center>'; + echo '<br/><br/><center><a href="#" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', WT_I18N::translate('Close Window'), '</a><br /></center>'; } elseif ($action == "update" && $paramok) { linkMedia($mediaid, $linktoid); - echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', WT_I18N::translate('Close Window'), '</a><br /></center>'; + echo '<br/><br/><center><a href="#" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', WT_I18N::translate('Close Window'), '</a><br /></center>'; } else { echo '<center>nothing to do<center>'; - echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', WT_I18N::translate('Close Window'), '</a><br /></center>'; + echo '<br/><br/><center><a href="#" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close();">', WT_I18N::translate('Close Window'), '</a><br /></center>'; } } diff --git a/library/WT/Controller/Ancestry.php b/library/WT/Controller/Ancestry.php index 20e5728cbc..4c3e8cca79 100644 --- a/library/WT/Controller/Ancestry.php +++ b/library/WT/Controller/Ancestry.php @@ -145,7 +145,7 @@ class WT_Controller_Ancestry extends WT_Controller_Chart { if ($family && $new && $depth>0) { // print marriage info echo '<span class="details1" style="white-space: nowrap;" >'; - echo '<img src="', $WT_IMAGES['spacer'], '" height="2" width="', $Dindent, '" border="0" align="middle" alt="" /><a href="javascript: ', WT_I18N::translate('View Family'), '" onclick="expand_layer(\'sosa_', $sosa, '\'); return false;" class="top"><img id="sosa_', $sosa, '_img" src="', $WT_IMAGES['minus'], '" align="middle" hspace="0" vspace="3" border="0" alt="', WT_I18N::translate('View Family'), '" /></a>'; + echo '<img src="', $WT_IMAGES['spacer'], '" height="2" width="', $Dindent, '" border="0" align="middle" alt="" /><a href="#" onclick="expand_layer(\'sosa_', $sosa, '\'); return false;" class="top"><img id="sosa_', $sosa, '_img" src="', $WT_IMAGES['minus'], '" align="middle" hspace="0" vspace="3" border="0" alt="', WT_I18N::translate('View Family'), '" /></a>'; echo ' <span dir="ltr" class="person_box"> ', ($sosa*2), ' </span> ', WT_I18N::translate('and'); echo ' <span dir="ltr" class="person_boxF"> ', ($sosa*2+1), ' </span> '; $marriage = $family->getMarriage(); diff --git a/library/WT/Controller/Hourglass.php b/library/WT/Controller/Hourglass.php index ebfd90f64d..375009f20e 100644 --- a/library/WT/Controller/Hourglass.php +++ b/library/WT/Controller/Hourglass.php @@ -339,7 +339,7 @@ class WT_Controller_Hourglass extends WT_Controller_Chart { if ($num>0) { echo "<div class=\"center\" id=\"childarrow\" dir=\"".$TEXT_DIRECTION."\""; echo " style=\"position:absolute; width:".$bwidth."px; \">"; - echo "<a href=\"javascript: ".WT_I18N::translate('Show')."\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow',3);\" onmouseout=\"swap_image('larrow',3);\">"; + echo "<a href=\"#\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow',3);\" onmouseout=\"swap_image('larrow',3);\">"; echo "<img id=\"larrow\" src=\"".$WT_IMAGES["darrow"]."\" border=\"0\" alt=\"\" />"; echo "</a><br />"; echo "<div id=\"childbox\" dir=\"".$TEXT_DIRECTION."\" style=\"width:".$bwidth."px; height:".$bheight."px; visibility: hidden;\">"; diff --git a/library/WT/Controller/Individual.php b/library/WT/Controller/Individual.php index 75f5d02e54..bb9b349dcf 100644 --- a/library/WT/Controller/Individual.php +++ b/library/WT/Controller/Individual.php @@ -224,8 +224,8 @@ class WT_Controller_Individual extends WT_Controller_GedcomRecord { } } if ($this->record->canEdit() && !strpos($factrec, "\nWT_OLD")) { - echo "<div class=\"deletelink\"><a class=\"font9 deleteicon\" href=\"javascript:;\" onclick=\"delete_record('".$this->record->getXref()."', ".$linenum."); return false;\" title=\"".WT_I18N::translate('Delete name')."\"><span class=\"link_text\">".WT_I18N::translate('Delete name')."</span></a></div>"; - echo "<div class=\"editlink\"><a href=\"javascript:;\" class=\"font9 editicon\" onclick=\"edit_name('".$this->record->getXref()."', ".$linenum."); return false;\" title=\"".WT_I18N::translate('Edit name')."\"><span class=\"link_text\">".WT_I18N::translate('Edit name')."</span></a></div>"; + echo "<div class=\"deletelink\"><a class=\"font9 deleteicon\" href=\"#\" onclick=\"delete_record('".$this->record->getXref()."', ".$linenum."); return false;\" title=\"".WT_I18N::translate('Delete name')."\"><span class=\"link_text\">".WT_I18N::translate('Delete name')."</span></a></div>"; + echo "<div class=\"editlink\"><a href=\"#\" class=\"font9 editicon\" onclick=\"edit_name('".$this->record->getXref()."', ".$linenum."); return false;\" title=\"".WT_I18N::translate('Edit name')."\"><span class=\"link_text\">".WT_I18N::translate('Edit name')."</span></a></div>"; } echo '</dd>'; echo '</dl>'; @@ -303,10 +303,10 @@ class WT_Controller_Individual extends WT_Controller_GedcomRecord { if ($this->SEX_COUNT>1) { if ($this->record->canEdit() && strpos($factrec, "\nWT_OLD")===false) { if ($event->getLineNumber()=="new") { - echo "<a class=\"font9\" href=\"javascript:;\" onclick=\"add_new_record('".$this->record->getXref()."', 'SEX'); return false;\">".WT_I18N::translate('Edit')."</a>"; + echo "<a class=\"font9\" href=\"#\" onclick=\"add_new_record('".$this->record->getXref()."', 'SEX'); return false;\">".WT_I18N::translate('Edit')."</a>"; } else { - echo "<a class=\"font9\" href=\"javascript:;\" onclick=\"edit_record('".$this->record->getXref()."', ".$event->getLineNumber()."); return false;\">".WT_I18N::translate('Edit')."</a> | "; - echo "<a class=\"font9\" href=\"javascript:;\" onclick=\"delete_record('".$this->record->getXref()."', ".$event->getLineNumber()."); return false;\">".WT_I18N::translate('Delete')."</a>"; + echo "<a class=\"font9\" href=\"#\" onclick=\"edit_record('".$this->record->getXref()."', ".$event->getLineNumber()."); return false;\">".WT_I18N::translate('Edit')."</a> | "; + echo "<a class=\"font9\" href=\"#\" onclick=\"delete_record('".$this->record->getXref()."', ".$event->getLineNumber()."); return false;\">".WT_I18N::translate('Delete')."</a>"; } } } diff --git a/library/WT/Media.php b/library/WT/Media.php index 6b0291ce69..33594f6be7 100644 --- a/library/WT/Media.php +++ b/library/WT/Media.php @@ -541,24 +541,24 @@ class WT_Media extends WT_GedcomRecord { // Lightbox is not installed or Lightbox is not appropriate for this media type switch ($urltype) { case 'url_flv': - $url = "javascript:;\" onclick=\" var winflv = window.open('".'js/jw_player/flvVideo.php?flvVideo='.$this->getRawUrlDirect('main') . "', 'winflv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winflv.focus();}"; + $url = "#\" onclick=\" var winflv = window.open('".'js/jw_player/flvVideo.php?flvVideo='.$this->getRawUrlDirect('main') . "', 'winflv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winflv.focus();}"; break 2; case 'local_flv': - $url = "javascript:;\" onclick=\" var winflv = window.open('".'js/jw_player/flvVideo.php?flvVideo='.WT_SERVER_NAME.WT_SCRIPT_PATH.$this->getRawUrlDirect('main') . "', 'winflv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winflv.focus();}"; + $url = "#\" onclick=\" var winflv = window.open('".'js/jw_player/flvVideo.php?flvVideo='.WT_SERVER_NAME.WT_SCRIPT_PATH.$this->getRawUrlDirect('main') . "', 'winflv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winflv.focus();}"; break 2; case 'url_audio': case 'url_wmv': - $url = "javascript:;\" onclick=\" var winwmv = window.open('".'js/jw_player/wmvVideo.php?wmvVideo='.$this->getRawUrlDirect('main') . "', 'winwmv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winwmv.focus();}"; + $url = "#\" onclick=\" var winwmv = window.open('".'js/jw_player/wmvVideo.php?wmvVideo='.$this->getRawUrlDirect('main') . "', 'winwmv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winwmv.focus();}"; break 2; case 'local_audio': case 'local_wmv': - $url = "javascript:;\" onclick=\" var winwmv = window.open('".'js/jw_player/wmvVideo.php?wmvVideo='.WT_SERVER_NAME.WT_SCRIPT_PATH.$this->getRawUrlDirect('main') . "', 'winwmv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winwmv.focus();}"; + $url = "#\" onclick=\" var winwmv = window.open('".'js/jw_player/wmvVideo.php?wmvVideo='.WT_SERVER_NAME.WT_SCRIPT_PATH.$this->getRawUrlDirect('main') . "', 'winwmv', 'width=500, height=392, left=600, top=200'); if (window.focus) {winwmv.focus();}"; break 2; case 'url_image': case 'local_image': $imgsize = $this->getImageAttributes('main',40,150); if ($imgsize['0']) { - $url = "javascript:;\" onclick=\"var winimg = window.open('".$this->getRawUrlDirect('main')."', 'winimg', 'width=".$imgsize['adjW'].", height=".$imgsize['adjH'].", left=200, top=200'); if (window.focus) {winimg.focus();}"; + $url = "#\" onclick=\"var winimg = window.open('".$this->getRawUrlDirect('main')."', 'winimg', 'width=".$imgsize['adjW'].", height=".$imgsize['adjH'].", left=200, top=200'); if (window.focus) {winimg.focus();}"; } else { $url = $this->getHtmlUrl(); } @@ -568,13 +568,13 @@ class WT_Media extends WT_GedcomRecord { case 'url_pdf': case 'url_other': case 'url_document': - $url = "javascript:;\" onclick=\"var winurl = window.open('".$this->getRawUrlDirect('main')."', 'winurl', 'width=900, height=600, left=200, top=200'); if (window.focus) {winurl.focus();}"; + $url = "#\" onclick=\"var winurl = window.open('".$this->getRawUrlDirect('main')."', 'winurl', 'width=900, height=600, left=200, top=200'); if (window.focus) {winurl.focus();}"; break 2; case 'local_other'; case 'local_page': case 'local_pdf': case 'local_document': - $url = "javascript:;\" onclick=\"var winurl = window.open('".WT_SERVER_NAME.WT_SCRIPT_PATH.$this->getRawUrlDirect('main')."', 'winurl', 'width=900, height=600, left=200, top=200'); if (window.focus) {winurl.focus();}"; + $url = "#\" onclick=\"var winurl = window.open('".WT_SERVER_NAME.WT_SCRIPT_PATH.$this->getRawUrlDirect('main')."', 'winurl', 'width=900, height=600, left=200, top=200'); if (window.focus) {winurl.focus();}"; break 2; case 'url_streetview': // need to call getHtmlForStreetview() instead of getHtmlUrlSnippet() @@ -589,7 +589,7 @@ class WT_Media extends WT_GedcomRecord { $imgsize = $this->getImageAttributes('main',40,150); if ($imgsize['0']) { $jsurl = str_replace('mediaviewer.php?','imageview.php?', $this->getRawUrl()); - $url = "javascript:;\" onclick=\"return openImage('".$jsurl."', ".$imgsize['adjW'].", ".$imgsize['adjH'].");"; + $url = "#\" onclick=\"return openImage('".$jsurl."', ".$imgsize['adjW'].", ".$imgsize['adjH'].");"; } else { $url = $this->getHtmlUrl(); } diff --git a/library/WT/Menu.php b/library/WT/Menu.php index e172107c0e..c60de6eae8 100644 --- a/library/WT/Menu.php +++ b/library/WT/Menu.php @@ -124,7 +124,6 @@ class WT_Menu { $link .= ' target="'.$this->target.'"'; } if ($this->link=='#') { - $this->link = "javascript:;"; if ($this->onclick !== null) { $link .= ' onclick="'.$this->onclick.'"'; } @@ -181,7 +180,6 @@ class WT_Menu { $id = $menucount.rand(); $c = count($this->submenus); $output = "<div id=\"menu{$id}\" class=\"{$this->class}\">\n"; - if ($this->link=="#") $this->link = "javascript:;"; $link = "<a href=\"{$this->link}\" onmouseover=\""; if ($c >= 0) { $link .= "show_submenu('menu{$id}_subs', 'menu{$id}', '{$this->flyout}');"; diff --git a/library/WT/Stats.php b/library/WT/Stats.php index 12523de5ac..5885848a71 100644 --- a/library/WT/Stats.php +++ b/library/WT/Stats.php @@ -3694,9 +3694,9 @@ class WT_Stats { } if (WT_USER_ID != $user_id && get_user_setting($user_id, 'contactmethod') != 'none') { if ($type == 'list') { - $content .= "<br /><a href=\"javascript:;\" onclick=\"return message('{$user_id}');\">".WT_I18N::translate('Send Message')."</a>"; + $content .= "<br /><a href=\"#\" onclick=\"return message('{$user_id}');\">".WT_I18N::translate('Send Message')."</a>"; } else { - $content .= " <a href=\"javascript:;\" onclick=\"return message('{$user_id}');\">".WT_I18N::translate('Send Message')."</a>"; + $content .= " <a href=\"#\" onclick=\"return message('{$user_id}');\">".WT_I18N::translate('Send Message')."</a>"; } } if ($type == 'list') { diff --git a/login_register.php b/login_register.php index f8e57515fe..6188d317ff 100644 --- a/login_register.php +++ b/login_register.php @@ -329,10 +329,10 @@ switch ($action) { if (get_user_id($user_name)) { echo '<span class="warning">', WT_I18N::translate('Duplicate user name. A user with that user name already exists. Please choose another user name.'), '</span><br /><br />'; - echo '<a href="javascript:history.back()">', WT_I18N::translate('Back'), '</a><br />'; + echo '<a href="#" onclick="history.back()">', WT_I18N::translate('Back'), '</a><br />'; } elseif (get_user_by_email($user_email)) { echo '<span class="warning">', WT_I18N::translate('Duplicate email address. A user with that email already exists.'), '</span><br /><br />'; - echo '<a href="javascript:history.back()">', WT_I18N::translate('Back'), '</a><br />'; + echo '<a href="#" onclick="history.back()">', WT_I18N::translate('Back'), '</a><br />'; } elseif ($user_password01 == $user_password02) { if ($user_id=create_user($user_name, $user_realname, $user_email, $user_password01)) { set_user_setting($user_id, 'language', $user_language); @@ -349,11 +349,11 @@ switch ($action) { $user_created_ok = true; } else { echo '<span class="warning">', WT_I18N::translate('Unable to add user. Please try again.'), '<br /></span>'; - echo '<a href="javascript:history.back()">', WT_I18N::translate('Back'), '</a><br />'; + echo '<a href="#" onclick="history.back()">', WT_I18N::translate('Back'), '</a><br />'; } } else { echo '<span class="warning">', WT_I18N::translate('Passwords do not match.'), '</span><br />'; - echo '<a href="javascript:history.back()">', WT_I18N::translate('Back'), '</a><br />'; + echo '<a href="#" onclick="history.back()">', WT_I18N::translate('Back'), '</a><br />'; } if ($user_created_ok) { // switch to the user's language diff --git a/medialist.php b/medialist.php index 26708dd1bc..d9d299a9ab 100644 --- a/medialist.php +++ b/medialist.php @@ -432,7 +432,7 @@ if ($show == 'yes') { echo '<table border=0><tr>'; // ---------- Edit Media -------------------- echo '<td class="width33 wrap center font9" valign="top">'; - echo "<a href=\"javascript:;\" title=\"" . WT_I18N::translate('Edit this Media Item\'s Details') . "\" onclick=\" return window.open('addmedia.php?action=editmedia&pid=".$mediaobject->getXref()."&linktoid=', '_blank', 'top=50, left=50, width=600, height=600, resizable=1, scrollbars=1');\">"; + echo "<a href=\"#\" title=\"" . WT_I18N::translate('Edit this Media Item\'s Details') . "\" onclick=\" return window.open('addmedia.php?action=editmedia&pid=".$mediaobject->getXref()."&linktoid=', '_blank', 'top=50, left=50, width=600, height=600, resizable=1, scrollbars=1');\">"; echo '<img src="'.WT_STATIC_URL.WT_MODULES_DIR.'lightbox/images/image_edit.gif" alt="" class="icon" title="', WT_I18N::translate('Edit this Media Item\'s Details'), '" /> '; echo '<br />'; echo WT_I18N::translate('Edit Details') ; diff --git a/mediaviewer.php b/mediaviewer.php index 858cbf38b0..9d7be25363 100644 --- a/mediaviewer.php +++ b/mediaviewer.php @@ -39,8 +39,8 @@ if ($controller->record && $controller->record->canDisplayDetails()) { '<p class="ui-state-highlight">', /* I18N: %1$s is "accept", %2$s is "reject". These are links. */ WT_I18N::translate( 'This media object has been deleted. You should review the deletion and then %1$s or %2$s it.', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'accept') . '</a>', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'reject') . '</a>' + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'accept') . '</a>', + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'reject') . '</a>' ), ' ', help_link('pending_changes'), '</p>'; @@ -57,8 +57,8 @@ if ($controller->record && $controller->record->canDisplayDetails()) { '<p class="ui-state-highlight">', /* I18N: %1$s is "accept", %2$s is "reject". These are links. */ WT_I18N::translate( 'This media object has been edited. You should review the changes and then %1$s or %2$s them.', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'accept') . '</a>', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'reject') . '</a>' + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'accept') . '</a>', + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'reject') . '</a>' ), ' ', help_link('pending_changes'), '</p>'; diff --git a/message.php b/message.php index c8418e1b53..1d6466f864 100644 --- a/message.php +++ b/message.php @@ -230,4 +230,4 @@ if ($action=='compose') { else if ($action=='delete') { if (deleteMessage($id)) echo WT_I18N::translate('Message Deleted'); } -echo '<center><br /><br /><a href="javascript:;" onclick="if (window.opener.refreshpage) window.opener.refreshpage(); window.close();">', WT_I18N::translate('Close Window'), '</a><br /></center>'; +echo '<center><br /><br /><a href="#" onclick="if (window.opener.refreshpage) window.opener.refreshpage(); window.close();">', WT_I18N::translate('Close Window'), '</a><br /></center>'; diff --git a/modules_v3/GEDFact_assistant/_CENS/addnoteaction_assisted.php b/modules_v3/GEDFact_assistant/_CENS/addnoteaction_assisted.php index 415f587248..e96ce72cf9 100644 --- a/modules_v3/GEDFact_assistant/_CENS/addnoteaction_assisted.php +++ b/modules_v3/GEDFact_assistant/_CENS/addnoteaction_assisted.php @@ -1,31 +1,27 @@ <?php -/** -* Include for GEDFact Assistant - Census. -* -* webtrees: Web based Family History software - * Copyright (C) 2011 webtrees development team. - * - * Derived from PhpGedView -* Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. -* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -* -* This program is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU General Public License for more details. -* -* You should have received a copy of the GNU General Public License -* along with this program; if not, write to the Free Software -* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -* -* @package webtrees - * @subpackage GEDFact_assistant -* @version $Id$ -*/ +// Include for GEDFact Assistant - Census. +// +// webtrees: Web based Family History software +// Copyright (C) 2011 webtrees development team. +// +// Derived from PhpGedView +// Copyright (C) 2002 to 2010 PGV Development Team. All rights reserved. +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// $Id$ // This file is required by the addnoteaction_assisted function in edit_interface.php @@ -114,7 +110,7 @@ if ($xref != "none") { echo " The Census event (when saved) will be linked to Indi id's: ". $pid_array; echo '<br /><br />'; echo '<br /><br />'; - echo " <a href=\"javascript://NOTE $xref\" onclick=\"openerpasteid('$xref'); return false;\">".WT_I18N::translate('Paste the following ID into your editing fields to reference the newly created record ')." <b>$xref</b></a>\n"; + echo " <a href=\"#\" onclick=\"openerpasteid('$xref'); return false;\">".WT_I18N::translate('Paste the following ID into your editing fields to reference the newly created record ')." <b>$xref</b></a>\n"; echo '<br /><br /><br /><br />'; ?> diff --git a/modules_v3/GEDFact_assistant/_CENS/census_3_find.php b/modules_v3/GEDFact_assistant/_CENS/census_3_find.php index ded88fd038..dd6310ecce 100644 --- a/modules_v3/GEDFact_assistant/_CENS/census_3_find.php +++ b/modules_v3/GEDFact_assistant/_CENS/census_3_find.php @@ -308,7 +308,7 @@ if ($type == 'media') { echo "<tr><td class=\"list_label width10\" wstyle=\"padding: 5px;\">"; echo "<input type=\"checkbox\" name=\"showthumb\" value=\"true\""; if ($showthumb) echo "checked=\"checked\""; - echo "onclick=\"javascript: this.form.submit();\" />", WT_I18N::translate('Show thumbnails'); + echo "onclick=\"this.form.submit();\" />", WT_I18N::translate('Show thumbnails'); echo "</td></tr>"; echo "<tr><td class=\"list_label width10\" style=\"padding: 5px;\">"; echo "<input type=\"submit\" name=\"search\" value=\"", WT_I18N::translate('Filter'), "\" onclick=\"this.form.subclick.value=this.name\" /> "; @@ -418,7 +418,7 @@ if ($type == "specialchar") { } $language_options = str_replace("\"$language_filter\"", "\"$language_filter\" selected", $language_options); echo $language_options; - echo "</select><br /><a href=\"javascript:;\" onclick=\"setMagnify()\">", WT_I18N::translate('Magnify'), "</a>"; + echo "</select><br /><a href=\"#\" onclick=\"setMagnify()\">", WT_I18N::translate('Magnify'), "</a>"; echo "</td></tr></table>"; echo "</form></div>"; } @@ -607,7 +607,7 @@ echo "</td></tr>"; echo "</table>"; // Close table with find options echo "<br />"; -echo "<a href=\"javascript:;\" onclick=\"if (window.opener.showchanges) window.opener.showchanges(); window.close();\">", WT_I18N::translate('Close Window'), "</a><br />"; +echo "<a href=\"#\" onclick=\"if (window.opener.showchanges) window.opener.showchanges(); window.close();\">", WT_I18N::translate('Close Window'), "</a><br />"; echo "<br />"; if ($action=="filter") { @@ -691,7 +691,7 @@ if ($action=="filter") { // ============================================================================================================================== // NOTES = is equivalent to= function pasterow(id, nam, mnam, label, gend, cond, dom, dob, age, dod, occu, birthpl, fbirthpl, mbirthpl, chilBLD) { // ============================================================================================================================== - echo "<a href=\"javascript:;\" onclick=\"window.opener.insertRowToTable("; + echo "<a href=\"#\" onclick=\"window.opener.insertRowToTable("; echo "'".$indi->getXref()."', "; // id - Indi Id echo "'".addslashes(strip_tags($fulln))."', "; // nam - Name echo "'".addslashes(strip_tags($fulmn))."', "; // mnam - Married Name @@ -849,7 +849,7 @@ if ($action=="filter") { //-- thumbnail field if ($showthumb) { echo "<td class=\"list_value $TEXT_DIRECTION width10\">"; - if (isset($media["THUMB"])) echo "<a href=\"javascript:;\" onclick=\"return openImage('", rawurlencode($media["FILE"]), "', $imgwidth, $imgheight);\"><img src=\"", filename_decode($media["THUMB"]), "\" border=\"0\" width=\"50\" alt=\"\" /></a>"; + if (isset($media["THUMB"])) echo "<a href=\"#\" onclick=\"return openImage('", rawurlencode($media["FILE"]), "', $imgwidth, $imgheight);\"><img src=\"", filename_decode($media["THUMB"]), "\" border=\"0\" width=\"50\" alt=\"\" /></a>"; else echo " "; } @@ -863,10 +863,10 @@ if ($action=="filter") { echo "<br />"; } if (!$embed) { - echo "<a href=\"javascript:;\" onclick=\"pasteid('", addslashes($media["FILE"]), "');\"><span dir=\"ltr\">", $media["FILE"], "</span></a> -- "; + echo "<a href=\"#\" onclick=\"pasteid('", addslashes($media["FILE"]), "');\"><span dir=\"ltr\">", $media["FILE"], "</span></a> -- "; } - else echo "<a href=\"javascript:;\" onclick=\"pasteid('", $media["XREF"], "', '", addslashes($media["TITL"]), "', '", addslashes($media["THUMB"]), "');\"><span dir=\"ltr\">", $media["FILE"], "</span></a> -- "; - echo "<a href=\"javascript:;\" onclick=\"return openImage('", rawurlencode($media["FILE"]), "', $imgwidth, $imgheight);\">", WT_I18N::translate('View'), "</a><br />"; + else echo "<a href=\"#\" onclick=\"pasteid('", $media["XREF"], "', '", addslashes($media["TITL"]), "', '", addslashes($media["THUMB"]), "');\"><span dir=\"ltr\">", $media["FILE"], "</span></a> -- "; + echo "<a href=\"#\" onclick=\"return openImage('", rawurlencode($media["FILE"]), "', $imgwidth, $imgheight);\">", WT_I18N::translate('View'), "</a><br />"; if (!$media["EXISTS"] && !isFileExternal($media["FILE"])) echo $media["FILE"], "<br /><span class=\"error\">", WT_I18N::translate('The filename entered does not exist.'), "</span><br />"; else if (!isFileExternal($media["FILE"]) && !empty($imgsize[0])) { echo WT_Gedcom_Tag::getLabelValue('__IMAGE_SIZE__', $imgsize[0].' × '.$imgsize[1]); @@ -933,7 +933,7 @@ if ($action=="filter") { uasort($revplacelist, "utf8_strcasecmp"); echo "<td class=\"list_value_wrap $TEXT_DIRECTION\"><ul>"; foreach ($revplacelist as $place) { - echo "<li><a href=\"javascript:;\" onclick=\"pasteid('", str_replace(array("'", '"'), array("\'", '"'), $place), "');\">", PrintReady($place), "</a></li>"; + echo "<li><a href=\"#\" onclick=\"pasteid('", str_replace(array("'", '"'), array("\'", '"'), $place), "');\">", PrintReady($place), "</a></li>"; } echo "</ul></td></tr>"; echo "<tr><td class=\"list_label\">", WT_I18N::translate('Places found'), " ", $ctplace; diff --git a/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php b/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php index b321367aaa..85f894f624 100644 --- a/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php +++ b/modules_v3/GEDFact_assistant/_CENS/census_3_search_add.php @@ -57,7 +57,7 @@ if (!defined('WT_WEBTREES')) { </script> <?php echo "<input id=personid type=\"text\" size=\"20\" STYLE=\"color: #000000;\" value=\"\" />"; - echo "<a href=\"javascript: onclick=findindi()\">" ; + echo "<a href=\"#\" onclick=\"findindi()\">" ; echo " <font size=\"2\"> ".WT_I18N::translate('Search')."</font>"; echo '</a>'; ?> @@ -1551,7 +1551,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $fulmn = rtrim($nam[$i]['givn'],'*')." ".$nam[$i]['surname']; } } - $parentlinks .= "<a class=\"linka\" href=\"javascript:insertRowToTable("; + $parentlinks .= "<a class=\"linka\" href=\"#\" onclick=\"insertRowToTable("; $parentlinks .= "'".$husb->getXref()."',"; // pid = PID $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name if (isset($fulmn)) { @@ -1646,7 +1646,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", } } - $parentlinks .= "<a class=\"linka\" href=\"javascript:insertRowToTable("; + $parentlinks .= "<a class=\"linka\" href=\"#\" onclick=\"insertRowToTable("; $parentlinks .= "'".$wife->getXref()."',"; // pid = PID $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name if (isset($fulmn)) { @@ -1761,7 +1761,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $fulmn = rtrim($nam[$i]['givn'],'*')." ".$nam[$i]['surname']; } } - $parentlinks .= "<a class=\"linka\" href=\"javascript:insertRowToTable("; + $parentlinks .= "<a class=\"linka\" href=\"#\" onclick=\"insertRowToTable("; $parentlinks .= "'".$husb->getXref()."',"; // pid = PID $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name if (isset($fulmn)) { @@ -1859,7 +1859,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", } } - $parentlinks .= "<a class=\"linka\" href=\"javascript:insertRowToTable("; + $parentlinks .= "<a class=\"linka\" href=\"#\" onclick=\"insertRowToTable("; $parentlinks .= "'".$wife->getXref()."',"; // pid = PID $parentlinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name if (isset($fulmn)) { @@ -1977,7 +1977,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", } } - $spouselinks .= "<a href=\"javascript:insertRowToTable("; + $spouselinks .= "<a href=\"#\" onclick=\"insertRowToTable("; $spouselinks .= "'".$spouse->getXref()."',"; // pid = PID $spouselinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name if (isset($fulmn)) { @@ -2115,7 +2115,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", } } - $spouselinks .= "<a href=\"javascript:insertRowToTable("; + $spouselinks .= "<a href=\"#\" onclick=\"insertRowToTable("; $spouselinks .= "'".$child->getXref()."',"; // pid = PID $spouselinks .= "'".addslashes(strip_tags($fulln))."',"; // nam = Name if (isset($chfulmn)) { diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php index d9ac19d68f..f4c64e37fd 100644 --- a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php +++ b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php @@ -165,7 +165,7 @@ if ($action == "choose" && $paramok) { if ($record->getType()=='INDI') { ?> - <td align="center"><a href="#"><img style="border-style:none; margin-top:5px;" src="<?php echo $WT_IMAGES['button_family']; ?>" alt="<?php echo WT_I18N::translate('Open Family Navigator'); ?>" title="<?php echo WT_I18N::translate('Open Family Navigator'); ?>" name="family_'<?php echo $link; ?>'" onclick="javascript:openFamNav('<?php echo $link; ?>');" /></a></td> + <td align="center"><img style="border-style:none; margin-top:5px;" src="<?php echo $WT_IMAGES['button_family']; ?>" alt="<?php echo WT_I18N::translate('Open Family Navigator'); ?>" title="<?php echo WT_I18N::translate('Open Family Navigator'); ?>" name="family_'<?php echo $link; ?>'" onclick="openFamNav('<?php echo $link; ?>');" /></td> <?php } elseif ($record->getType()=='FAM') { if ($record->getHusband()) { @@ -176,7 +176,7 @@ if ($action == "choose" && $paramok) { $head=''; } ?> - <td align="center"><a href="#"><img style="border-style:none; margin-top:5px;" src="<?php echo $WT_IMAGES['button_family']; ?>" alt="<?php echo WT_I18N::translate('Open Family Navigator'); ?>" title="<?php echo WT_I18N::translate('Open Family Navigator'); ?>" name="family_'<?php echo $link; ?>'" onclick="javascript:openFamNav('<?php echo $head; ?>');" /></a></td> + <td align="center"><img style="border-style:none; margin-top:5px;" src="<?php echo $WT_IMAGES['button_family']; ?>" alt="<?php echo WT_I18N::translate('Open Family Navigator'); ?>" title="<?php echo WT_I18N::translate('Open Family Navigator'); ?>" name="family_'<?php echo $link; ?>'" onclick="openFamNav('<?php echo $head; ?>');" /></td> <?php } else { echo '<td></td>'; @@ -207,9 +207,9 @@ if ($action == "choose" && $paramok) { echo '</td><td style=" padding-bottom:2px; vertical-align:middle">'; echo ' '; if (isset($WT_IMAGES["add"])) { - echo '<a href="#"><img style="border-style:none;" src="', $WT_IMAGES["add"], '" alt="', WT_I18N::translate('Add'), ' "title="', WT_I18N::translate('Add'), '" align="middle" name="addLink" value="" onClick="javascript:blankwin(); return false;" />'; + echo '<img style="border-style:none;" src="', $WT_IMAGES["add"], '" alt="', WT_I18N::translate('Add'), ' "title="', WT_I18N::translate('Add'), '" align="middle" name="addLink" value="" onclick="blankwin(); return false;" />'; } else { - echo '<button name="addLink" value="" type="button" onClick="javascript:blankwin(); return false;">', WT_I18N::translate('Add'), '</button>'; + echo '<button name="addLink" value="" type="button" onclick="blankwin(); return false;">', WT_I18N::translate('Add'), '</button>'; } echo ' '; print_findindi_link("gid", ""); @@ -612,7 +612,7 @@ function openInNewWindow(frm) echo '<tr><td colspan="2">'; echo '</td></tr>'; echo '<tr><td class="topbottombar" colspan="2">'; - echo '<center><input type="submit" value="', WT_I18N::translate('Save'), '" onclick="javascript:shiftlinks();" />'; + echo '<center><input type="submit" value="', WT_I18N::translate('Save'), '" onclick="shiftlinks();" />'; echo '</center></td></tr>'; ?> <script> @@ -687,7 +687,7 @@ function shiftlinks() { <?php echo '</table>'; echo '</form>'; - echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close(); winNav.close(); ">', WT_I18N::translate('Close Window'), '</a><br /></center>'; + echo '<br/><br/><center><a href="#" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close(); winNav.close(); ">', WT_I18N::translate('Close Window'), '</a><br /></center>'; } elseif ($action == "update" && $paramok) { @@ -731,8 +731,8 @@ function shiftlinks() { echo '<br />'; } - echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close(); winNav.close(); ">', WT_I18N::translate('Close Window'), '</a><br /></center>'; + echo '<br/><br/><center><a href="#" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close(); winNav.close(); ">', WT_I18N::translate('Close Window'), '</a><br /></center>'; } else { // echo '<center>You must be logged in as an Administrator<center>'; - echo '<br/><br/><center><a href="javascript:;" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close(); winNav.close();">', WT_I18N::translate('Close Window'), '</a><br /></center>'; + echo '<br/><br/><center><a href="#" onclick="if (window.opener.showchanges) window.opener.showchanges(); window.close(); winNav.close();">', WT_I18N::translate('Close Window'), '</a><br /></center>'; } diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_1_ctrl.php b/modules_v3/GEDFact_assistant/_MEDIA/media_1_ctrl.php index d3ff2872ef..0a0a16d5ab 100644 --- a/modules_v3/GEDFact_assistant/_MEDIA/media_1_ctrl.php +++ b/modules_v3/GEDFact_assistant/_MEDIA/media_1_ctrl.php @@ -104,7 +104,7 @@ if ($pid=="") { </script> <?php echo '<input id="personid" type="text" value="" />'; - echo '<a href="javascript: onclick=findindi()">' ; + echo '<a href="#" onclick="onclick=findindi()">' ; echo ' <font size="2"> ', WT_I18N::translate('Search'), '</font>'; echo '</a>'; ?> @@ -1121,7 +1121,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $fulmn = rtrim($nam[1]['givn'],'*')." ".$nam[1]['surn']; $marn = $nam[1]['surn']; } - $parentlinks .= "<a href=\"javascript:opener.insertRowToTable("; + $parentlinks .= "<a href=\"#\" onclick=\"opener.insertRowToTable("; $parentlinks .= "'".$husb->getXref()."', "; // pid = PID $parentlinks .= "'".$fulln."', "; // nam = Name if ($currpid=="Wife" || $currpid=="Husband") { @@ -1167,7 +1167,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $fulmn = $nam[1]['fullNN']; $marn = $nam[1]['surname']; } - $parentlinks .= "<a href=\"javascript:opener.insertRowToTable("; + $parentlinks .= "<a href=\"#\" onclick=\"opener.insertRowToTable("; $parentlinks .= "'".$wife->getXref()."',"; // pid = PID // $parentlinks .= "'".$fulln."',"; // nam = Name @@ -1304,7 +1304,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $fulmn = rtrim($nam[1]['givn'],'*')." ".$nam[1]['surname']; $marn = $nam[1]['surname']; } - $spouselinks .= "<a href=\"javascript:opener.insertRowToTable("; + $spouselinks .= "<a href=\"#\" onclick=\"opener.insertRowToTable("; $spouselinks .= "'".$spouse->getXref()."',"; // pid = PID //$spouselinks .= "'".$fulln."',"; // nam = Name //if ($married>=0 && isset($nam[1])) { @@ -1371,7 +1371,7 @@ function print_pedigree_person_nav2($pid, $style=1, $count=0, $personcount="1", $marn = $nam[1]['surname']; } $spouselinks .= "<li>"; - $spouselinks .= "<a href=\"javascript:opener.insertRowToTable("; + $spouselinks .= "<a href=\"#\" onclick=\"opener.insertRowToTable("; $spouselinks .= "'".$child->getXref()."',"; // pid = PID //$spouselinks .= "'".$child->getFullName()."',"; // nam = Name $spouselinks .= "'".$fulln."',"; // nam = Name diff --git a/modules_v3/GEDFact_assistant/module.php b/modules_v3/GEDFact_assistant/module.php index 334875500d..c8aab93325 100644 --- a/modules_v3/GEDFact_assistant/module.php +++ b/modules_v3/GEDFact_assistant/module.php @@ -313,7 +313,7 @@ class GEDFact_assistant_WT_Module extends WT_Module { echo "<tr><td class=\"list_label width10\" wstyle=\"padding: 5px;\">"; echo "<input type=\"checkbox\" name=\"showthumb\" value=\"true\""; if ($showthumb) echo "checked=\"checked\""; - echo "onclick=\"javascript: this.form.submit();\" />", WT_I18N::translate('Show thumbnails'); + echo "onclick=\"#\" onclick=\"this.form.submit();\" />", WT_I18N::translate('Show thumbnails'); echo "</td></tr>"; echo "<tr><td class=\"list_label width10\" style=\"padding: 5px;\">"; echo "<input type=\"submit\" name=\"search\" value=\"", WT_I18N::translate('Filter'), "\" onclick=\"this.form.subclick.value=this.name\" /> "; @@ -424,7 +424,7 @@ class GEDFact_assistant_WT_Module extends WT_Module { } $language_options = str_replace("\"$language_filter\"", "\"$language_filter\" selected", $language_options); echo $language_options; - echo "</select><br /><a href=\"javascript:;\" onclick=\"setMagnify()\">", WT_I18N::translate('Magnify'), "</a>"; + echo "</select><br /><a href=\"#\" onclick=\"setMagnify()\">", WT_I18N::translate('Magnify'), "</a>"; echo "</td></tr></table>"; echo "</form></div>"; } @@ -433,7 +433,7 @@ class GEDFact_assistant_WT_Module extends WT_Module { echo "</table>"; // Close table with find options echo "<br />"; - echo "<a href=\"javascript:;\" onclick=\"if (window.opener.showchanges) window.opener.showchanges(); window.close();\">", WT_I18N::translate('Close Window'), "</a><br />"; + echo "<a href=\"#\" onclick=\"if (window.opener.showchanges) window.opener.showchanges(); window.close();\">", WT_I18N::translate('Close Window'), "</a><br />"; echo "<br />"; if ($action=="filter") { @@ -450,7 +450,7 @@ class GEDFact_assistant_WT_Module extends WT_Module { foreach ($myindilist as $indi) { //echo $indi->format_list('li', true); $nam = htmlspecialchars($indi->getFullName()); - echo "<li><a href=\"javascript:;\" onclick=\"pasterow( + echo "<li><a href=\"#\" onclick=\"pasterow( '".$indi->getXref()."' , '".$nam."' , '".$indi->getSex()."' , @@ -595,7 +595,7 @@ class GEDFact_assistant_WT_Module extends WT_Module { //-- thumbnail field if ($showthumb) { echo "<td class=\"list_value $TEXT_DIRECTION width10\">"; - if (isset($media["THUMB"])) echo "<a href=\"javascript:;\" onclick=\"return openImage('", rawurlencode($media["FILE"]), "', $imgwidth, $imgheight);\"><img src=\"", filename_decode($media["THUMB"]), "\" border=\"0\" width=\"50\" alt=\"\" /></a>"; + if (isset($media["THUMB"])) echo "<a href=\"#\" onclick=\"return openImage('", rawurlencode($media["FILE"]), "', $imgwidth, $imgheight);\"><img src=\"", filename_decode($media["THUMB"]), "\" border=\"0\" width=\"50\" alt=\"\" /></a>"; else echo " "; } @@ -609,10 +609,10 @@ class GEDFact_assistant_WT_Module extends WT_Module { echo "<br />"; } if (!$embed) { - echo "<a href=\"javascript:;\" onclick=\"pasteid('", addslashes($media["FILE"]), "');\"><span dir=\"ltr\">", $media["FILE"], "</span></a> -- "; + echo "<a href=\"#\" onclick=\"pasteid('", addslashes($media["FILE"]), "');\"><span dir=\"ltr\">", $media["FILE"], "</span></a> -- "; } - else echo "<a href=\"javascript:;\" onclick=\"pasteid('", $media["XREF"], "','", addslashes($media["TITL"]), "','", addslashes($media["THUMB"]), "');\"><span dir=\"ltr\">", $media["FILE"], "</span></a> -- "; - echo "<a href=\"javascript:;\" onclick=\"return openImage('", rawurlencode($media["FILE"]), "', $imgwidth, $imgheight);\">", WT_I18N::translate('View'), "</a><br />"; + else echo "<a href=\"#\" onclick=\"pasteid('", $media["XREF"], "','", addslashes($media["TITL"]), "','", addslashes($media["THUMB"]), "');\"><span dir=\"ltr\">", $media["FILE"], "</span></a> -- "; + echo "<a href=\"#\" onclick=\"return openImage('", rawurlencode($media["FILE"]), "', $imgwidth, $imgheight);\">", WT_I18N::translate('View'), "</a><br />"; if (!$media["EXISTS"] && !isFileExternal($media["FILE"])) echo $media["FILE"], "<br /><span class=\"error\">", WT_I18N::translate('The filename entered does not exist.'), "</span><br />"; else if (!isFileExternal($media["FILE"]) && !empty($imgsize[0])) { echo WT_Gedcom_Tag::getLabelValue('__IMAGE_SIZE__', $imgsize[0].' × '.$imgsize[1]); @@ -679,7 +679,7 @@ class GEDFact_assistant_WT_Module extends WT_Module { uasort($revplacelist, "utf8_strcasecmp"); echo "<td class=\"list_value_wrap $TEXT_DIRECTION\"><ul>"; foreach ($revplacelist as $place) { - echo "<li><a href=\"javascript:;\" onclick=\"pasteid('", str_replace(array("'", '"'), array("\'", '"'), $place), "');\">", PrintReady($place), "</a></li>"; + echo "<li><a href=\"#\" onclick=\"pasteid('", str_replace(array("'", '"'), array("\'", '"'), $place), "');\">", PrintReady($place), "</a></li>"; } echo "</ul></td></tr>"; echo "<tr><td class=\"list_label\">", WT_I18N::translate('Places found'), " ", $ctplace; diff --git a/modules_v3/batch_update/admin_batch_update.php b/modules_v3/batch_update/admin_batch_update.php index f8d6d6e3db..b0b47c7548 100644 --- a/modules_v3/batch_update/admin_batch_update.php +++ b/modules_v3/batch_update/admin_batch_update.php @@ -434,7 +434,7 @@ class base_plugin { static function createEditLinks($gedrec) { return preg_replace( "/@([^#@\n]+)@/m", - '<a href="javascript:;" onclick="return edit_raw(\'\\1\');">@\\1@</a>', + '<a href="#" onclick="return edit_raw(\'\\1\');">@\\1@</a>', $gedrec ); } diff --git a/modules_v3/charts/module.php b/modules_v3/charts/module.php index c7d0d554fe..35325bf209 100644 --- a/modules_v3/charts/module.php +++ b/modules_v3/charts/module.php @@ -83,7 +83,7 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block { $class=$this->getName().'_block'; $title=''; if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) { - $title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=700,height=400,scrollbars=1,resizable=1'); return false;\">"; + $title .= "<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=700,height=400,scrollbars=1,resizable=1'); return false;\">"; $title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>"; } if ($person) { diff --git a/modules_v3/gedcom_block/module.php b/modules_v3/gedcom_block/module.php index 4729b72592..d40aea5ebc 100644 --- a/modules_v3/gedcom_block/module.php +++ b/modules_v3/gedcom_block/module.php @@ -52,7 +52,7 @@ class gedcom_block_WT_Module extends WT_Module implements WT_Module_Block { $content .= WT_I18N::translate('Hit Count:')." ".$hitCount."<br />"; $content .= "<br />"; if (WT_USER_GEDCOM_ADMIN) { - $content .= "<a href=\"javascript:;\" onclick=\"window.open('index_edit.php?name=".WT_GEDURL."&ctype=gedcom', '_blank', 'top=50,left=10,width=600,height=500,scrollbars=1,resizable=1'); return false;\">".WT_I18N::translate('Change the blocks on this page')."</a><br />"; + $content .= "<a href=\"#\" onclick=\"window.open('index_edit.php?name=".WT_GEDURL."&ctype=gedcom', '_blank', 'top=50,left=10,width=600,height=500,scrollbars=1,resizable=1'); return false;\">".WT_I18N::translate('Change the blocks on this page')."</a><br />"; } $content .= "</div>"; diff --git a/modules_v3/gedcom_news/module.php b/modules_v3/gedcom_news/module.php index 52ad39a85d..a0125387fc 100644 --- a/modules_v3/gedcom_news/module.php +++ b/modules_v3/gedcom_news/module.php @@ -85,7 +85,7 @@ class gedcom_news_WT_Module extends WT_Module implements WT_Module_Block { $class=$this->getName().'_block'; $title=''; if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) { - $title.="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title.="<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; $title.="<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>"; } $title.=$this->getTitle(); @@ -118,14 +118,14 @@ class gedcom_news_WT_Module extends WT_Module implements WT_Module_Block { // Print Admin options for this News item if (WT_USER_GEDCOM_ADMIN) { $content .= "<hr size=\"1\" />" - ."<a href=\"javascript:;\" onclick=\"editnews('".$news['id']."'); return false;\">".WT_I18N::translate('Edit')."</a> | " + ."<a href=\"#\" onclick=\"editnews('".$news['id']."'); return false;\">".WT_I18N::translate('Edit')."</a> | " ."<a href=\"index.php?action=deletenews&news_id=".$news['id']."&ctype={$ctype}\" onclick=\"return confirm('".WT_I18N::translate('Are you sure you want to delete this News entry?')."');\">".WT_I18N::translate('Delete')."</a><br />"; } $content .= "</div>"; } $printedAddLink = false; if (WT_USER_GEDCOM_ADMIN) { - $content .= "<a href=\"javascript:;\" onclick=\"addnews('".WT_GEDURL."'); return false;\">".WT_I18N::translate('Add a News article')."</a>"; + $content .= "<a href=\"#\" onclick=\"addnews('".WT_GEDURL."'); return false;\">".WT_I18N::translate('Add a News article')."</a>"; $printedAddLink = true; } if ($limit=='date' || $limit=='count') { diff --git a/modules_v3/gedcom_stats/module.php b/modules_v3/gedcom_stats/module.php index 5be78f74fa..2ca27376c4 100644 --- a/modules_v3/gedcom_stats/module.php +++ b/modules_v3/gedcom_stats/module.php @@ -76,7 +76,7 @@ class gedcom_stats_WT_Module extends WT_Module implements WT_Module_Block { $class=$this->getName().'_block'; $title=''; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title .= "<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; $title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>"; } $title.=$this->getTitle(); diff --git a/modules_v3/googlemap/admin_placecheck.php b/modules_v3/googlemap/admin_placecheck.php index 3a9b7ebb41..b14c5fed30 100644 --- a/modules_v3/googlemap/admin_placecheck.php +++ b/modules_v3/googlemap/admin_placecheck.php @@ -278,8 +278,8 @@ case 'go': $id=0; $level=0; $matched[$x]=0;// used to exclude places where the gedcom place is matched at all levels - $mapstr_edit="<a href=\"javascript:;\" onclick=\"edit_place_location('"; - $mapstr_add="<a href=\"javascript:;\" onclick=\"add_place_location('"; + $mapstr_edit="<a href=\"#\" onclick=\"edit_place_location('"; + $mapstr_add="<a href=\"#\" onclick=\"add_place_location('"; $mapstr3=""; $mapstr4=""; $mapstr5="')\" title='"; diff --git a/modules_v3/googlemap/admin_places.php b/modules_v3/googlemap/admin_places.php index 0240055632..f8788d58b6 100644 --- a/modules_v3/googlemap/admin_places.php +++ b/modules_v3/googlemap/admin_places.php @@ -613,13 +613,13 @@ foreach ($placelist as $place) { echo '<img src="', WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place['icon'], '" width="25" height="15">'; } echo '</td>'; - echo '<td class="narrow"><a href="javascript:;" onclick="edit_place_location(', $place['place_id'], ');return false;"><img src="', $WT_IMAGES['edit'], '" border="0" alt="', WT_I18N::translate("Edit"), '" /></a></td>'; + echo '<td class="narrow"><a href="#" onclick="edit_place_location(', $place['place_id'], ');return false;"><img src="', $WT_IMAGES['edit'], '" border="0" alt="', WT_I18N::translate("Edit"), '" /></a></td>'; $noRows= WT_DB::prepare("SELECT COUNT(pl_id) FROM `##placelocation` WHERE pl_parent_id=?") ->execute(array($place['place_id'])) ->fetchOne(); if ($noRows==0) { ?> - <td><a href="javascript:;" onclick="delete_place(<?php echo $place['place_id'], ');return false;">'; ?><img src="<?php echo $WT_IMAGES['remove'];?>" border="0" alt="<?php echo WT_I18N::translate('Remove'); ?>" /></a></td> + <td><a href="#" onclick="delete_place(<?php echo $place['place_id'], ');return false;">'; ?><img src="<?php echo $WT_IMAGES['remove'];?>" border="0" alt="<?php echo WT_I18N::translate('Remove'); ?>" /></a></td> <?php } else { ?> <td><img src="<?php echo $WT_IMAGES['remove_grey'];?>" border="0" alt="" /> </td> <?php } ?> @@ -631,7 +631,7 @@ foreach ($placelist as $place) { </div> <table id="gm_manage"> <tr> - <td colspan="3"><a href="javascript:;" onclick="add_place_location(<?php echo $parent; ?>);return false;"><?php echo WT_I18N::translate('Add place'); ?></a><?php echo help_link('PL_ADD_LOCATION','googlemap'); ?></td> + <td colspan="3"><a href="#" onclick="add_place_location(<?php echo $parent; ?>);return false;"><?php echo WT_I18N::translate('Add place'); ?></a><?php echo help_link('PL_ADD_LOCATION','googlemap'); ?></td> </tr> <tr> <td><a href="module.php?mod=googlemap&mod_action=admin_places&action=ImportGedcom&mode=curr"><?php echo WT_I18N::translate('Import from current GEDCOM'); ?></a><?php echo help_link('PL_IMPORT_GEDCOM','googlemap'); ?></td> diff --git a/modules_v3/googlemap/flags.php b/modules_v3/googlemap/flags.php index 9d03d1262f..f639a3e096 100644 --- a/modules_v3/googlemap/flags.php +++ b/modules_v3/googlemap/flags.php @@ -86,13 +86,13 @@ if ($action == 'ChangeFlag') { function edit_close() { <?php if ($_POST['selcountry'] == 'Countries') { ?> window.opener.document.editplaces.icon.value = 'places/flags/<?php echo $flags[$_POST['FLAGS']]; ?>.png'; - window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/places/flags/<?php echo $country[$_POST['FLAGS']]; ?>.png\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a> <a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo WT_I18N::translate('Remove flag'); ?></a>"; + window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/places/flags/<?php echo $country[$_POST['FLAGS']]; ?>.png\"> <a href=\"#\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a> <a href=\"#\" onclick=\"remove_icon();return false;\"><?php echo WT_I18N::translate('Remove flag'); ?></a>"; <?php } else if ($_POST["selstate"] != "States"){ ?> window.opener.document.editplaces.icon.value = 'places/<?php echo $countrySelected, '/flags/', $_POST['selstate'], '/', $flags_s[$_POST['FLAGS']]; ?>.png'; - window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/places/<?php echo $countrySelected, "/flags/", $_POST["selstate"], "/", $flags_s[$_POST['FLAGS']]; ?>.png\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a> <a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo WT_I18N::translate('Remove flag'); ?></a>"; + window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/places/<?php echo $countrySelected, "/flags/", $_POST["selstate"], "/", $flags_s[$_POST['FLAGS']]; ?>.png\"> <a href=\"#\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a> <a href=\"#\" onclick=\"remove_icon();return false;\"><?php echo WT_I18N::translate('Remove flag'); ?></a>"; <?php } else { ?> window.opener.document.editplaces.icon.value = "places/<?php echo $countrySelected, "/flags/", $flags[$_POST['FLAGS']]; ?>.png"; - window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/places/<?php echo $countrySelected, "/flags/", $flags[$_POST['FLAGS']]; ?>.png\"> <a href=\"javascript:;\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a> <a href=\"javascript:;\" onclick=\"remove_icon();return false;\"><?php echo WT_I18N::translate('Remove flag'); ?></a>"; + window.opener.document.getElementById('flagsDiv').innerHTML = "<img src=\"<?php echo WT_STATIC_URL, WT_MODULES_DIR; ?>googlemap/places/<?php echo $countrySelected, "/flags/", $flags[$_POST['FLAGS']]; ?>.png\"> <a href=\"#\" onclick=\"change_icon();return false;\"><?php echo WT_I18N::translate('Change flag'); ?></a> <a href=\"#\" onclick=\"remove_icon();return false;\"><?php echo WT_I18N::translate('Remove flag'); ?></a>"; <?php } ?> window.close(); } @@ -103,7 +103,7 @@ if ($action == 'ChangeFlag') { if (!WT_DEBUG) { echo "\n<script type=\"text/javascript\">\n<!--\nedit_close();\n//-->\n</script>"; } - echo "<div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close();\">", WT_I18N::translate('Close Window'), "</a></div><br />\n"; + echo "<div class=\"center\"><a href=\"#\" onclick=\"edit_close();\">", WT_I18N::translate('Close Window'), "</a></div><br />\n"; exit; } else { @@ -244,4 +244,4 @@ else { <input id="savebutton" name="save2" type="submit" disabled="true" value="<?php echo WT_I18N::translate('Save'); ?>" /><br /> </form> <?php -echo '<div class="center"><a href="javascript:;" onclick="edit_close();">', WT_I18N::translate('Close Window'), '</a></div><br />'; +echo '<div class="center"><a href="#" onclick="edit_close();">', WT_I18N::translate('Close Window'), '</a></div><br />'; diff --git a/modules_v3/googlemap/googlemap.php b/modules_v3/googlemap/googlemap.php index af774abf1c..2669af5ffd 100644 --- a/modules_v3/googlemap/googlemap.php +++ b/modules_v3/googlemap/googlemap.php @@ -571,7 +571,7 @@ function build_indiv_map($indifacts, $famids) { foreach($markers as $marker) { echo '<tr>'; echo '<td class="facts_label">'; - echo '<a href="javascript:myclick(', $z, ', ', $marker['index'], ', ', $marker['tabindex'], ')">', $marker['fact'], '</a></td>'; + echo '<a href="#" onclick="myclick(', $z, ', ', $marker['index'], ', ', $marker['tabindex'], ')">', $marker['fact'], '</a></td>'; $z++; echo '<td class="', $marker['class'], '" style="white-space: normal">'; if (!empty($marker['info'])) { diff --git a/modules_v3/googlemap/placehierarchy.php b/modules_v3/googlemap/placehierarchy.php index 46b2e1204b..cf74071fb0 100644 --- a/modules_v3/googlemap/placehierarchy.php +++ b/modules_v3/googlemap/placehierarchy.php @@ -261,7 +261,7 @@ function create_map($placelevels) { echo "<tr><td>\n"; echo "<form style=\"text-align:left; margin-left:5px; font:11px verdana; color:blue;\" method=\"post\" action=\"\">"; echo $list_latlon; - echo "<input type=\"submit\" name=\"Submit\" onClick=\"update_sv_params($placeid);\" value=\"", WT_I18N::translate('Save'), "\">"; + echo "<input type=\"submit\" name=\"Submit\" onclick=\"update_sv_params($placeid);\" value=\"", WT_I18N::translate('Save'), "\">"; echo "</form>"; echo "</td></tr>\n"; echo "</table>\n"; diff --git a/modules_v3/googlemap/places_edit.php b/modules_v3/googlemap/places_edit.php index 1f0d509648..6be738bcfe 100644 --- a/modules_v3/googlemap/places_edit.php +++ b/modules_v3/googlemap/places_edit.php @@ -102,7 +102,7 @@ if ($action=='addrecord' && WT_USER_IS_ADMIN) { if (!WT_DEBUG) { echo "\n<script type=\"text/javascript\">\n<!--\nedit_close('');\n//-->\n</script>"; } - echo "<div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close('');return false;\">", WT_I18N::translate('Close Window'), "</a></div><br />\n"; + echo "<div class=\"center\"><a href=\"#\" onclick=\"edit_close('');return false;\">", WT_I18N::translate('Close Window'), "</a></div><br />\n"; exit; } @@ -120,7 +120,7 @@ if ($action=='updaterecord' && WT_USER_IS_ADMIN) { if (!WT_DEBUG) { echo "\n<script type=\"text/javascript\">\n<!--\nedit_close('');\n//-->\n</script>"; } - echo "<div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close('');return false;\">", WT_I18N::translate('Close Window'), "</a></div><br />\n"; + echo "<div class=\"center\"><a href=\"#\" onclick=\"edit_close('');return false;\">", WT_I18N::translate('Close Window'), "</a></div><br />\n"; exit; } @@ -140,7 +140,7 @@ if ($action=='update_sv_params' && WT_USER_IS_ADMIN) { if (!WT_DEBUG) { echo "\n<script type=\"text/javascript\">\n<!--\nedit_close();\n//-->\n</script>"; } - echo "<div class=\"center\"><a href=\"javascript:;\" onclick=\"edit_close();return false;\">", WT_I18N::translate('Close Window'), "</a></div><br />\n"; + echo "<div class=\"center\"><a href=\"#\" onclick=\"edit_close();return false;\">", WT_I18N::translate('Close Window'), "</a></div><br />\n"; exit; } @@ -276,8 +276,8 @@ $api="v3"; <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 WT_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 WT_I18N::translate('Search all'); ?></a></label> + <label for="new_pl_name"><a href="#" onclick="showLocation_level(document.getElementById('new_pl_name').value); return false"> <?php echo WT_I18N::translate('Search on this level'); ?></a></label> | + <label for="new_pl_name"><a href="#" onclick="showLocation_all(document.getElementById('new_pl_name').value); return false"> <?php echo WT_I18N::translate('Search all'); ?></a></label> </td> </tr> <tr> @@ -347,12 +347,12 @@ $api="v3"; <div id="flagsDiv"> <?php if (($place_icon == NULL) || ($place_icon == "")) { ?> - <a href="javascript:;" onclick="change_icon();return false;"><?php echo WT_I18N::translate('Change flag'); ?></a> + <a href="#" onclick="change_icon();return false;"><?php echo WT_I18N::translate('Change flag'); ?></a> <?php } else { ?> <img alt="<?php echo /* I18N: The emblem of a country or region */ WT_I18N::translate('Flag'); ?>" src="<?php echo WT_STATIC_URL, WT_MODULES_DIR, 'googlemap/', $place_icon; ?>"/> - <a href="javascript:;" onclick="change_icon();return false;"><?php echo WT_I18N::translate('Change flag'); ?></a> - <a href="javascript:;" onclick="remove_icon();return false;"><?php echo WT_I18N::translate('Remove flag'); ?></a> + <a href="#" onclick="change_icon();return false;"><?php echo WT_I18N::translate('Change flag'); ?></a> + <a href="#" onclick="remove_icon();return false;"><?php echo WT_I18N::translate('Remove flag'); ?></a> <?php } ?> </div></td> </tr> @@ -360,4 +360,4 @@ $api="v3"; <input name="save2" type="submit" value="<?php echo WT_I18N::translate('Save'); ?>" /><br /> </form> <?php -echo "<center><a href=\"javascript:;\" onclick=\"edit_close('')\">", WT_I18N::translate('Close Window'), "</a><br /></center>\n"; +echo "<center><a href=\"#\" onclick=\"edit_close('')\">", WT_I18N::translate('Close Window'), "</a><br /></center>\n"; diff --git a/modules_v3/googlemap/wt_v3_googlemap.js.php b/modules_v3/googlemap/wt_v3_googlemap.js.php index 59345b5bb0..b61cef4510 100644 --- a/modules_v3/googlemap/wt_v3_googlemap.js.php +++ b/modules_v3/googlemap/wt_v3_googlemap.js.php @@ -350,15 +350,15 @@ $STREETVIEW=get_module_setting('googlemap', 'GM_USE_STREETVIEW'); if (gmarkers[i].getVisible()) { // if (x==gmarkers[i].myindex) { if (x==i ) { - html += '<a style="text-decoration:none; color:black; background:white; " href="javascript:myclick('+i+', '+gmarkers[i].mytab+')">' + gmarkers[i].myevent + '<\/a><br>'; + html += '<a style="text-decoration:none; color:black; background:white; " href="#" onclick="myclick('+i+', '+gmarkers[i].mytab+')">' + gmarkers[i].myevent + '<\/a><br>'; } else if (gmarkers[i].mycategory=='theatre') { - html += '<a style="text-decoration:none; color:red;" href="javascript:myclick('+i+', '+gmarkers[i].mytab+')">' + gmarkers[i].myevent + '<\/a><br>'; + html += '<a style="text-decoration:none; color:red;" href="#" onclick="myclick('+i+', '+gmarkers[i].mytab+')">' + gmarkers[i].myevent + '<\/a><br>'; } else if (gmarkers[i].mycategory=='golf') { - html += '<a style="text-decoration:none; color:green;" href="javascript:myclick('+i+', '+gmarkers[i].mytab+')">' + gmarkers[i].myevent + '<\/a><br>'; + html += '<a style="text-decoration:none; color:green;" href="#" onclick="myclick('+i+', '+gmarkers[i].mytab+')">' + gmarkers[i].myevent + '<\/a><br>'; } else if (gmarkers[i].mycategory=='info') { - html += '<a style="text-decoration:none; color:yellow;" href="javascript:myclick('+i+', '+gmarkers[i].mytab+')">' + gmarkers[i].myevent + '<\/a><br>'; + html += '<a style="text-decoration:none; color:yellow;" href="#" onclick="myclick('+i+', '+gmarkers[i].mytab+')">' + gmarkers[i].myevent + '<\/a><br>'; } else { - html += '<a style="text-decoration:none; color:black;" href="javascript:myclick('+i+', '+gmarkers[i].mytab+')">'+ gmarkers[i].myevent + '<\/a><br>'; + html += '<a style="text-decoration:none; color:black;" href="#" onclick="myclick('+i+', '+gmarkers[i].mytab+')">'+ gmarkers[i].myevent + '<\/a><br>'; } } } diff --git a/modules_v3/googlemap/wt_v3_pedigree_map.js.php b/modules_v3/googlemap/wt_v3_pedigree_map.js.php index d8f229c6b7..b8c2ca699e 100644 --- a/modules_v3/googlemap/wt_v3_pedigree_map.js.php +++ b/modules_v3/googlemap/wt_v3_pedigree_map.js.php @@ -400,7 +400,7 @@ function createMarker(point, name, html, mhtml, icontype) { // save the info we need to use later for the side_bar gmarkers[i] = marker; // add a line to the side_bar html - side_bar_html += '<br /><div id="'+linkid+'"><a href="javascript:myclick(' + i + ')">' + html +'</a><br></div>'; + side_bar_html += '<br /><div id="'+linkid+'"><a href="#" onclick="myclick(' + i + ')">' + html +'</a><br></div>'; i++; return marker; }; @@ -614,11 +614,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 WT_I18N::translate('Zoom in'); ?> </div></a>' - + '<a href="javascript:zoomOut()"><div class="optionbox"> <?php echo WT_I18N::translate('Zoom out'); ?> </div></a>' - + '<a href="javascript:zoomInHere()"><div class="optionbox"> <?php echo WT_I18N::translate('Zoom in here'); ?> </div></a>' - + '<a href="javascript:zoomOutHere()"><div class="optionbox"> <?php echo WT_I18N::translate('Zoom out here'); ?> </div></a>' - + '<a href="javascript:centreMapHere()"><div class="optionbox"> <?php echo WT_I18N::translate('Center map here'); ?> </div></a>'; + contextmenu.innerHTML = '<a href="#" onclick="zoomIn()"><div class="optionbox"> <?php echo WT_I18N::translate('Zoom in'); ?> </div></a>' + + '<a href="#" onclick="zoomOut()"><div class="optionbox"> <?php echo WT_I18N::translate('Zoom out'); ?> </div></a>' + + '<a href="#" onclick="zoomInHere()"><div class="optionbox"> <?php echo WT_I18N::translate('Zoom in here'); ?> </div></a>' + + '<a href="#" onclick="zoomOutHere()"><div class="optionbox"> <?php echo WT_I18N::translate('Zoom out here'); ?> </div></a>' + + '<a href="#" onclick="centreMapHere()"><div class="optionbox"> <?php echo WT_I18N::translate('Center map here'); ?> </div></a>'; //BH pm_map.getContainer().appendChild(contextmenu); // === listen for singlerightclick === diff --git a/modules_v3/googlemap/wt_v3_places_edit.js.php b/modules_v3/googlemap/wt_v3_places_edit.js.php index d884413412..8ae55fdf24 100644 --- a/modules_v3/googlemap/wt_v3_places_edit.js.php +++ b/modules_v3/googlemap/wt_v3_places_edit.js.php @@ -391,7 +391,7 @@ if (!defined('WT_WEBTREES')) { function remove_icon() { document.editplaces.icon.value = ''; - document.getElementById('flagsDiv').innerHTML = '<a href="javascript:;" onclick="change_icon();return false;"><?php echo WT_I18N::translate('Change flag'); ?></a>'; + document.getElementById('flagsDiv').innerHTML = '<a href="#" onclick="change_icon();return false;"><?php echo WT_I18N::translate('Change flag'); ?></a>'; } function addAddressToMap(response) { @@ -402,7 +402,7 @@ if (!defined('WT_WEBTREES')) { if (response.length > 0) { for (i=0; i<response.length; i++) { var name = '<div id="gname" class="iwstyle">'+response[i].address_components[0].short_name+'<br /> '+response[i].geometry.location+'' - name += '<br /><a href="javascript:;" onclick="setLoc(' + response[i].geometry.location.lat() + ', ' + response[i].geometry.location.lng() + ');"><div id="namelink"><?php echo PrintReady(WT_I18N::translate('Use this value')); ?></div></a>' + name += '<br /><a href="#" onclick="setLoc(' + response[i].geometry.location.lat() + ', ' + response[i].geometry.location.lng() + ');"><div id="namelink"><?php echo PrintReady(WT_I18N::translate('Use this value')); ?></div></a>' name += '</div>' var point = response[i].geometry.location; var marker = createMarker(i, point, name); diff --git a/modules_v3/googlemap/wt_v3_street_view.php b/modules_v3/googlemap/wt_v3_street_view.php index 8cd145e297..02bfe35dd7 100644 --- a/modules_v3/googlemap/wt_v3_street_view.php +++ b/modules_v3/googlemap/wt_v3_street_view.php @@ -1,30 +1,24 @@ <?php -/** - * Displays a streetview map - * - * webtrees: Web based Family History software - * Copyright (C) 2011 webtrees development team. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * @package webtrees - * @subpackage Googlemaps v3 - * @version $Id$ - * - * @author Brian Holland (windmillway) - */ +// Displays a streetview map +// +// webtrees: Web based Family History software +// Copyright (C) 2011 webtrees development team. +// +// This program is free software; you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation; either version 2 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +// +// $Id$ header('Content-type: text/html; charset=UTF-8'); @@ -399,7 +393,7 @@ google.maps.event.addDomListener(window, 'load', initialize); <div id="toggle"> <form name="myForm" title="myForm"> <!-- - <input type="button" value="street" name="sv_btn" onClick="addStreetViewOverlay()"></input> + <input type="button" value="street" name="sv_btn" onclick="addStreetViewOverlay()"></input> --> <?php diff --git a/modules_v3/html/module.php b/modules_v3/html/module.php index c804e470ac..975079feb0 100644 --- a/modules_v3/html/module.php +++ b/modules_v3/html/module.php @@ -98,7 +98,7 @@ class html_WT_Module extends WT_Module implements WT_Module_Block { $class=$this->getName().'_block'; $title=''; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">" + $title .= "<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">" ."<img class=\"adminicon\" src=\"{$WT_IMAGES['admin']}\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure').'" /></a>'; } $title.=$title_tmp; diff --git a/modules_v3/lightbox/functions/lb_head.php b/modules_v3/lightbox/functions/lb_head.php index fde0cca6f2..6bba046606 100644 --- a/modules_v3/lightbox/functions/lb_head.php +++ b/modules_v3/lightbox/functions/lb_head.php @@ -68,19 +68,19 @@ if (isset($reorder) && $reorder==1) { echo '<td class="descriptionbox rela">'; // Add a new media object if (get_gedcom_setting(WT_GED_ID, 'MEDIA_UPLOAD') >= WT_USER_ACCESS_LEVEL) { - echo '<span><a href="javascript: album_add()">'; + echo '<span><a href="#" onclick="album_add()">'; echo '<img src="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/images/image_add.gif" id="head_icon" class="icon" title="', WT_I18N::translate('Add a new media object'), '" alt="', WT_I18N::translate('Add a new media object'), '" />'; echo WT_I18N::translate('Add a new media object'); echo '</a></span>'; // Link to an existing item - echo '<span><a href="javascript: album_link()">'; + echo '<span><a href="#" onclick="album_link()">'; echo '<img src="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/images/image_link.gif" id="head_icon" class="icon" title="', WT_I18N::translate('Link to an existing media object'), '" alt="', WT_I18N::translate('Link to an existing media object'), '" />'; echo WT_I18N::translate('Link to an existing media object'); echo '</a></span>'; } if (WT_USER_GEDCOM_ADMIN) { // Popup Reorder Media - echo '<span><a href="javascript: reorder_media()">'; + echo '<span><a href="#" onclick="reorder_media()">'; echo '<img src="', WT_STATIC_URL, WT_MODULES_DIR, 'lightbox/images/images.gif" id="head_icon" class="icon" title="', WT_I18N::translate('Re-order media'), '" alt="', WT_I18N::translate('Re-order media'), '" />'; echo WT_I18N::translate('Re-order media'); echo '</a></span>'; diff --git a/modules_v3/logged_in/module.php b/modules_v3/logged_in/module.php index 000c2b0757..ad0f8b912c 100644 --- a/modules_v3/logged_in/module.php +++ b/modules_v3/logged_in/module.php @@ -70,7 +70,7 @@ class logged_in_WT_Module extends WT_Module implements WT_Module_Block { foreach ($loggedusers as $user_id=>$user_name) { $content .= "<tr><td>".PrintReady(getUserFullName($user_id))." - ".$user_name; if (WT_USER_ID!=$user_id && get_user_setting($user_id, 'contactmethod')!="none") { - $content .= "<br /><a href=\"javascript:;\" onclick=\"return message('" . $user_name . "');\">" . WT_I18N::translate('Send Message') . "</a>"; + $content .= "<br /><a href=\"#\" onclick=\"return message('" . $user_name . "');\">" . WT_I18N::translate('Send Message') . "</a>"; } $content .= "</td></tr>"; } diff --git a/modules_v3/media/module.php b/modules_v3/media/module.php index 226fb6fb43..0522213fa9 100644 --- a/modules_v3/media/module.php +++ b/modules_v3/media/module.php @@ -83,8 +83,8 @@ class media_WT_Module extends WT_Module implements WT_Module_Tab { <tr> <td class="facts_label"><?php echo WT_I18N::translate('Add media'), help_link('add_media'); ?></td> <td class="facts_value"> - <a href="javascript:;" onclick="window.open('addmedia.php?action=showmediaform&linktoid=<?php echo $controller->record->getXref(); ?>', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1'); return false;"> <?php echo WT_I18N::translate('Add a new media object'); ?></a><br /> - <a href="javascript:;" onclick="window.open('inverselink.php?linktoid=<?php echo $controller->record->getXref(); ?>&linkto=person', '_blank', 'top=50,left=50,width=400,height=300,resizable=1,scrollbars=1'); return false;"><?php echo WT_I18N::translate('Link to an existing media object'); ?></a> + <a href="#" onclick="window.open('addmedia.php?action=showmediaform&linktoid=<?php echo $controller->record->getXref(); ?>', '_blank', 'top=50,left=50,width=600,height=500,resizable=1,scrollbars=1'); return false;"> <?php echo WT_I18N::translate('Add a new media object'); ?></a><br /> + <a href="#" onclick="window.open('inverselink.php?linktoid=<?php echo $controller->record->getXref(); ?>&linkto=person', '_blank', 'top=50,left=50,width=400,height=300,resizable=1,scrollbars=1'); return false;"><?php echo WT_I18N::translate('Link to an existing media object'); ?></a> </td> </tr> <?php diff --git a/modules_v3/notes/module.php b/modules_v3/notes/module.php index 9b010b9678..3536e09bbe 100644 --- a/modules_v3/notes/module.php +++ b/modules_v3/notes/module.php @@ -97,14 +97,14 @@ class notes_WT_Module extends WT_Module implements WT_Module_Tab { ?> <tr> <td class="facts_label"><?php echo WT_I18N::translate('Add Note'), help_link('add_note'); ?></td> - <td class="facts_value"><a href="javascript:;" + <td class="facts_value"><a href="#" onclick="add_new_record('<?php echo $controller->record->getXref(); ?>','NOTE'); return false;"><?php echo WT_I18N::translate('Add a new note'); ?></a> <br /> </td> </tr> <tr> <td class="facts_label"><?php echo WT_I18N::translate('Add Shared Note'), help_link('add_shared_note'); ?></td> - <td class="facts_value"><a href="javascript:;" + <td class="facts_value"><a href="#" onclick="add_new_record('<?php echo $controller->record->getXref(); ?>','SHARED_NOTE'); return false;"><?php echo WT_I18N::translate('Add a new shared note'); ?></a> <br /> </td> diff --git a/modules_v3/random_media/module.php b/modules_v3/random_media/module.php index 2c848b7198..4e7620d7f9 100644 --- a/modules_v3/random_media/module.php +++ b/modules_v3/random_media/module.php @@ -183,7 +183,7 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block { $title=''; $content = ''; if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) { - $title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title .= "<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; $title .= "<img class=\"adminicon\" src=\"{$WT_IMAGES['admin']}\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure').'" /></a>'; } $title .= $this->getTitle(); @@ -194,11 +194,11 @@ class random_media_WT_Module extends WT_Module implements WT_Module_Block { } else { $image = "rarrow"; } - $linkNextImage = "<a href=\"javascript: ".WT_I18N::translate('Next image')."\" onclick=\"jQuery('#block_{$block_id}').load('index.php?ctype={$ctype}&action=ajax&block_id={$block_id}');return false;\"><img src=\"{$WT_IMAGES['rdarrow']}\" border=\"0\" alt=\"".WT_I18N::translate('Next image')."\" title=\"".WT_I18N::translate('Next image')."\" /></a>"; + $linkNextImage = "<a href=\"#\" onclick=\"jQuery('#block_{$block_id}').load('index.php?ctype={$ctype}&action=ajax&block_id={$block_id}');return false;\"><img src=\"{$WT_IMAGES['rdarrow']}\" border=\"0\" alt=\"".WT_I18N::translate('Next image')."\" title=\"".WT_I18N::translate('Next image')."\" /></a>"; $content .= "<div class=\"center\" id=\"random_picture_controls$block_id\"><br />"; if ($TEXT_DIRECTION=="rtl") $content .= $linkNextImage; - $content .= "<a href=\"javascript: ".WT_I18N::translate('Play')."/".WT_I18N::translate('Stop')."\" onclick=\"togglePlay(); return false;\">"; + $content .= "<a href=\"#\" onclick=\"togglePlay(); return false;\">"; if (isset($WT_IMAGES[$image])) $content .= "<img id=\"play_stop\" src=\"{$WT_IMAGES[$image]}\" border=\"0\" alt=\"".WT_I18N::translate('Play')."/".WT_I18N::translate('Stop')."\" title=\"".WT_I18N::translate('Play')."/".WT_I18N::translate('Stop')."\" />"; else $content .= WT_I18N::translate('Play')."/".WT_I18N::translate('Stop'); $content .= "</a>"; diff --git a/modules_v3/recent_changes/module.php b/modules_v3/recent_changes/module.php index 0b49c7cd5c..080dc5820c 100644 --- a/modules_v3/recent_changes/module.php +++ b/modules_v3/recent_changes/module.php @@ -70,7 +70,7 @@ class recent_changes_WT_Module extends WT_Module implements WT_Module_Block { $class=$this->getName().'_block'; $title = ''; if ($ctype == "gedcom" && WT_USER_GEDCOM_ADMIN || $ctype == 'user') { - $title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title .= "<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; $title .= "<img class=\"adminicon\" src=\"" . $WT_IMAGES["admin"] . "\" width=\"15\" height=\"15\" border=\"0\" alt=\"" . WT_I18N::translate('Configure') . "\" /></a>"; } $title.= /* I18N: title for list of recent changes */ WT_I18N::plural('Changes in the last %d day', 'Changes in the last %d days', $days, $days); diff --git a/modules_v3/relatives/module.php b/modules_v3/relatives/module.php index 71c977d034..443d397445 100644 --- a/modules_v3/relatives/module.php +++ b/modules_v3/relatives/module.php @@ -104,7 +104,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { ?> <tr> <td class="facts_label"><?php echo WT_I18N::translate('Add a new father'); ?></td> - <td class="facts_value"><a href="javascript <?php echo WT_I18N::translate('Add a new father'); ?>" onclick="return addnewparentfamily('<?php echo $controller->record->getXref(); ?>', 'HUSB', '<?php echo $family->getXref(); ?>');"><?php echo WT_I18N::translate('Add a new father'); ?></a><?php echo help_link('edit_add_parent'); ?></td> + <td class="facts_value"><a href="#" onclick="return addnewparentfamily('<?php echo $controller->record->getXref(); ?>', 'HUSB', '<?php echo $family->getXref(); ?>');"><?php echo WT_I18N::translate('Add a new father'); ?></a><?php echo help_link('edit_add_parent'); ?></td> </tr> <?php } @@ -115,7 +115,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { ?> <tr> <td class="facts_label"><?php echo WT_I18N::translate('Add husband'); ?></td> - <td class="facts_value"><a href="javascript:;" onclick="return addnewspouse('<?php echo $family->getXref(); ?>', 'HUSB');"><?php echo WT_I18N::translate('Add a husband to this family'); ?></a></td> + <td class="facts_value"><a href="#" onclick="return addnewspouse('<?php echo $family->getXref(); ?>', 'HUSB');"><?php echo WT_I18N::translate('Add a husband to this family'); ?></a></td> </tr> <?php } @@ -150,7 +150,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { ?> <tr> <td class="facts_label"><?php echo WT_I18N::translate('Add a new mother'); ?></td> - <td class="facts_value"><a href="javascript:;" onclick="return addnewparentfamily('<?php echo $controller->record->getXref(); ?>', 'WIFE', '<?php echo $family->getXref(); ?>');"><?php echo WT_I18N::translate('Add a new mother'); ?></a><?php echo help_link('edit_add_parent'); ?></td> + <td class="facts_value"><a href="#" onclick="return addnewparentfamily('<?php echo $controller->record->getXref(); ?>', 'WIFE', '<?php echo $family->getXref(); ?>');"><?php echo WT_I18N::translate('Add a new mother'); ?></a><?php echo help_link('edit_add_parent'); ?></td> </tr> <?php } @@ -161,7 +161,7 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { ?> <tr> <td class="facts_label"><?php echo WT_I18N::translate('Add wife'); ?></td> - <td class="facts_value"><a href="javascript:;" onclick="return addnewspouse('<?php echo $family->getXref(); ?>', 'WIFE');"><?php echo WT_I18N::translate('Add a wife to this family'); ?></a></td> + <td class="facts_value"><a href="#" onclick="return addnewspouse('<?php echo $family->getXref(); ?>', 'WIFE');"><?php echo WT_I18N::translate('Add a wife to this family'); ?></a></td> </tr> <?php } @@ -327,14 +327,14 @@ 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])) { ?> - <a href="javascript:;" onclick="reorder_children('<?php echo $family->getXref(); ?>');tabswitch(5);"><img src="<?php echo WT_STATIC_URL; ?>images/topdown.gif" alt="" border="0" /> <?php echo WT_I18N::translate('Re-order children'); ?></a> + <a href="#" onclick="reorder_children('<?php echo $family->getXref(); ?>');tabswitch(5);"><img src="<?php echo WT_STATIC_URL; ?>images/topdown.gif" alt="" border="0" /> <?php echo WT_I18N::translate('Re-order children'); ?></a> <?php } ?> </td> <td class="facts_value"> - <a href="javascript:;" onclick="return addnewchild('<?php echo $family->getXref(); ?>');"><?php echo $child_u; ?></a> + <a href="#" onclick="return addnewchild('<?php echo $family->getXref(); ?>');"><?php echo $child_u; ?></a> <span style='white-space:nowrap;'> - <a href="javascript:;" onclick="return addnewchild('<?php echo $family->getXref(); ?>','M');"><?php echo WT_Person::sexImage('M', 'small', '', $child_m); ?></a> - <a href="javascript:;" onclick="return addnewchild('<?php echo $family->getXref(); ?>','F');"><?php echo WT_Person::sexImage('F', 'small', '', $child_f); ?></a> + <a href="#" onclick="return addnewchild('<?php echo $family->getXref(); ?>','M');"><?php echo WT_Person::sexImage('M', 'small', '', $child_m); ?></a> + <a href="#" onclick="return addnewchild('<?php echo $family->getXref(); ?>','F');"><?php echo WT_Person::sexImage('F', 'small', '', $child_f); ?></a> </span> <?php if ($type=='spouse') { @@ -373,10 +373,10 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { ?> <table class="facts_table"> <tr> - <td class="facts_value"><a href="javascript:;" onclick="return addnewparent('<?php echo $controller->record->getXref(); ?>', 'HUSB');"><?php echo WT_I18N::translate('Add a new father'); ?></a><?php echo help_link('edit_add_parent'); ?></td> + <td class="facts_value"><a href="#" onclick="return addnewparent('<?php echo $controller->record->getXref(); ?>', 'HUSB');"><?php echo WT_I18N::translate('Add a new father'); ?></a><?php echo help_link('edit_add_parent'); ?></td> </tr> <tr> - <td class="facts_value"><a href="javascript:;" onclick="return addnewparent('<?php echo $controller->record->getXref(); ?>', 'WIFE');"><?php echo WT_I18N::translate('Add a new mother'); ?></a><?php echo help_link('edit_add_parent'); ?></td> + <td class="facts_value"><a href="#" onclick="return addnewparent('<?php echo $controller->record->getXref(); ?>', 'WIFE');"><?php echo WT_I18N::translate('Add a new mother'); ?></a><?php echo help_link('edit_add_parent'); ?></td> </tr> </table> <?php @@ -435,33 +435,33 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { if (count($families)>1) { ?> <tr> <td class="facts_value"> - <a href="javascript:;" onclick="return reorder_families('<?php echo $controller->record->getXref(); ?>');"><?php echo WT_I18N::translate('Reorder families'); ?></a> + <a href="#" onclick="return reorder_families('<?php echo $controller->record->getXref(); ?>');"><?php echo WT_I18N::translate('Reorder families'); ?></a> <?php echo help_link('reorder_families'); ?> </td> </tr> <?php } ?> <tr> <td class="facts_value"> - <a href="javascript:;" onclick="return add_famc('<?php echo $controller->record->getXref(); ?>');"><?php echo WT_I18N::translate('Link this person to an existing family as a child'); ?></a> + <a href="#" onclick="return add_famc('<?php echo $controller->record->getXref(); ?>');"><?php echo WT_I18N::translate('Link this person to an existing family as a child'); ?></a> <?php echo help_link('link_child'); ?> </td> </tr> <?php if ($controller->record->getSex()!="F") { ?> <tr> <td class="facts_value"> - <a href="javascript:;" onclick="return addspouse('<?php echo $controller->record->getXref(); ?>','WIFE');"><?php echo WT_I18N::translate('Add a new wife'); ?></a> + <a href="#" onclick="return addspouse('<?php echo $controller->record->getXref(); ?>','WIFE');"><?php echo WT_I18N::translate('Add a new wife'); ?></a> <?php echo help_link('add_wife'); ?> </td> </tr> <tr> <td class="facts_value"> - <a href="javascript:;" onclick="return linkspouse('<?php echo $controller->record->getXref(); ?>','WIFE');"><?php echo WT_I18N::translate('Add a wife using an existing person'); ?></a> + <a href="#" onclick="return linkspouse('<?php echo $controller->record->getXref(); ?>','WIFE');"><?php echo WT_I18N::translate('Add a wife using an existing person'); ?></a> <?php echo help_link('link_new_wife'); ?> </td> </tr> <tr> <td class="facts_value"> - <a href="javascript:;" onclick="return add_fams('<?php echo $controller->record->getXref(); ?>','HUSB');"><?php echo WT_I18N::translate('Link this person to an existing family as a husband'); ?></a> + <a href="#" onclick="return add_fams('<?php echo $controller->record->getXref(); ?>','HUSB');"><?php echo WT_I18N::translate('Link this person to an existing family as a husband'); ?></a> <?php echo help_link('link_new_husb'); ?> </td> </tr> @@ -469,26 +469,26 @@ class relatives_WT_Module extends WT_Module implements WT_Module_Tab { if ($controller->record->getSex()!="M") { ?> <tr> <td class="facts_value"> - <a href="javascript:;" onclick="return addspouse('<?php echo $controller->record->getXref(); ?>','HUSB');"><?php echo WT_I18N::translate('Add a new husband'); ?></a> + <a href="#" onclick="return addspouse('<?php echo $controller->record->getXref(); ?>','HUSB');"><?php echo WT_I18N::translate('Add a new husband'); ?></a> <?php echo help_link('add_husband'); ?> </td> </tr> <tr> <td class="facts_value"> - <a href="javascript:;" onclick="return linkspouse('<?php echo $controller->record->getXref(); ?>','HUSB');"><?php echo WT_I18N::translate('Add a husband using an existing person'); ?></a> + <a href="#" onclick="return linkspouse('<?php echo $controller->record->getXref(); ?>','HUSB');"><?php echo WT_I18N::translate('Add a husband using an existing person'); ?></a> <?php echo help_link('link_husband'); ?> </td> </tr> <tr> <td class="facts_value"> - <a href="javascript:;" onclick="return add_fams('<?php echo $controller->record->getXref(); ?>','WIFE');"><?php echo WT_I18N::translate('Link this person to an existing family as a wife'); ?></a> + <a href="#" onclick="return add_fams('<?php echo $controller->record->getXref(); ?>','WIFE');"><?php echo WT_I18N::translate('Link this person to an existing family as a wife'); ?></a> <?php echo help_link('link_wife'); ?> </td> </tr> <?php } ?> <tr> <td class="facts_value"> - <a href="javascript:;" onclick="return addopfchild('<?php echo $controller->record->getXref(); ?>','U');"><?php echo WT_I18N::translate('Add a child to create a one-parent family'); ?></a> + <a href="#" onclick="return addopfchild('<?php echo $controller->record->getXref(); ?>','U');"><?php echo WT_I18N::translate('Add a child to create a one-parent family'); ?></a> <?php echo help_link('add_opf_child'); ?> </td> </tr> diff --git a/modules_v3/review_changes/module.php b/modules_v3/review_changes/module.php index ed4a50b042..7d498f42fa 100644 --- a/modules_v3/review_changes/module.php +++ b/modules_v3/review_changes/module.php @@ -97,13 +97,13 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block { $class=$this->getName().'_block'; $title=''; if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) { - $title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title .= "<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; $title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>"; } $title.=$this->getTitle().help_link('review_changes', $this->getName()); $content = ""; if (WT_USER_CAN_ACCEPT) { - $content .= "<a href=\"javascript:;\" onclick=\"window.open('edit_changes.php','_blank','width=600,height=500,resizable=1,scrollbars=1'); return false;\">".WT_I18N::translate('There are pending changes for you to moderate.')."</a><br />"; + $content .= "<a href=\"#\" onclick=\"window.open('edit_changes.php','_blank','width=600,height=500,resizable=1,scrollbars=1'); return false;\">".WT_I18N::translate('There are pending changes for you to moderate.')."</a><br />"; } if ($sendmail=="yes") { $content .= WT_I18N::translate('Last email reminder was sent ').format_timestamp($LAST_CHANGE_EMAIL)."<br />"; diff --git a/modules_v3/sources_tab/module.php b/modules_v3/sources_tab/module.php index 7c64deac2f..5d32650c72 100644 --- a/modules_v3/sources_tab/module.php +++ b/modules_v3/sources_tab/module.php @@ -85,7 +85,7 @@ class sources_tab_WT_Module extends WT_Module implements WT_Module_Tab { <tr> <td class="facts_label"><?php echo WT_I18N::translate('Add Source Citation'), help_link('add_source'); ?></td> <td class="facts_value"> - <a href="javascript:;" onclick="add_new_record('<?php echo $controller->record->getXref(); ?>','SOUR'); return false;"><?php echo WT_I18N::translate('Add a new source citation'); ?></a> + <a href="#" onclick="add_new_record('<?php echo $controller->record->getXref(); ?>','SOUR'); return false;"><?php echo WT_I18N::translate('Add a new source citation'); ?></a> <br /> </td> </tr> diff --git a/modules_v3/todays_events/module.php b/modules_v3/todays_events/module.php index f1cf343d60..60b3a2751d 100644 --- a/modules_v3/todays_events/module.php +++ b/modules_v3/todays_events/module.php @@ -64,7 +64,7 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block { $class=$this->getName().'_block'; $title=''; if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) { - $title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title .= "<a href=\"#\" onclick=\"configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; $title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>"; } $title.=$this->getTitle(); diff --git a/modules_v3/todo/module.php b/modules_v3/todo/module.php index 93af610883..a44998dc51 100644 --- a/modules_v3/todo/module.php +++ b/modules_v3/todo/module.php @@ -64,7 +64,7 @@ class todo_WT_Module extends WT_Module implements WT_Module_Block { } else { $name = WT_USER_NAME; } - $title.="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title.="<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; $title.="<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>"; } $title.=$this->getTitle().help_link('todo', $this->getName()); diff --git a/modules_v3/top10_givnnames/module.php b/modules_v3/top10_givnnames/module.php index 7335321a12..7eda6e5581 100644 --- a/modules_v3/top10_givnnames/module.php +++ b/modules_v3/top10_givnnames/module.php @@ -61,7 +61,7 @@ class top10_givnnames_WT_Module extends WT_Module implements WT_Module_Block { $class=$this->getName().'_block'; $title=''; if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) { - $title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title .= "<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; $title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>"; } // I18N: There are separate lists of male/female names, containing %d names each diff --git a/modules_v3/top10_pageviews/module.php b/modules_v3/top10_pageviews/module.php index a475450309..0eea262db4 100644 --- a/modules_v3/top10_pageviews/module.php +++ b/modules_v3/top10_pageviews/module.php @@ -58,7 +58,7 @@ class top10_pageviews_WT_Module extends WT_Module implements WT_Module_Block { $class=$this->getName().'_block'; $title=''; if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) { - $title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title .= "<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; $title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>"; } $title .= $this->getTitle(); diff --git a/modules_v3/top10_surnames/module.php b/modules_v3/top10_surnames/module.php index c4d030fe9b..eaf46212aa 100644 --- a/modules_v3/top10_surnames/module.php +++ b/modules_v3/top10_surnames/module.php @@ -81,7 +81,7 @@ class top10_surnames_WT_Module extends WT_Module implements WT_Module_Block { $class=$this->getName().'_block'; $title=''; if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) { - $title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title .= "<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; $title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>"; } // I18N: There are separate lists of male/female names, containing %d names each diff --git a/modules_v3/upcoming_events/module.php b/modules_v3/upcoming_events/module.php index 16924e8120..cef5b99364 100644 --- a/modules_v3/upcoming_events/module.php +++ b/modules_v3/upcoming_events/module.php @@ -67,7 +67,7 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block { $class=$this->getName().'_block'; $title=''; if ($ctype=="gedcom" && WT_USER_GEDCOM_ADMIN || $ctype=="user" && WT_USER_ID) { - $title.="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; + $title.="<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">"; $title.="<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>"; } $title.= $this->getTitle(); diff --git a/modules_v3/user_blog/module.php b/modules_v3/user_blog/module.php index 40c05a5fd7..9e52a4cbf4 100644 --- a/modules_v3/user_blog/module.php +++ b/modules_v3/user_blog/module.php @@ -89,12 +89,12 @@ class user_blog_WT_Module extends WT_Module implements WT_Module_Block { $news["text"]=nl2br($news["text"]); } $content .= $news["text"]."<br /><br />"; - $content .= "<a href=\"javascript:;\" onclick=\"editnews('$key'); return false;\">".WT_I18N::translate('Edit')."</a> | "; + $content .= "<a href=\"#\" onclick=\"editnews('$key'); return false;\">".WT_I18N::translate('Edit')."</a> | "; $content .= "<a href=\"index.php?action=deletenews&news_id={$key}&ctype={$ctype}\" onclick=\"return confirm('".WT_I18N::translate('Are you sure you want to delete this Journal entry?')."');\">".WT_I18N::translate('Delete')."</a><br />"; $content .= "</div><br />"; } if (WT_USER_ID) { - $content .= "<br /><a href=\"javascript:;\" onclick=\"addnews('".WT_USER_ID."'); return false;\">".WT_I18N::translate('Add a new Journal entry')."</a>"; + $content .= "<br /><a href=\"#\" onclick=\"addnews('".WT_USER_ID."'); return false;\">".WT_I18N::translate('Add a new Journal entry')."</a>"; } if ($template) { diff --git a/modules_v3/user_messages/module.php b/modules_v3/user_messages/module.php index 275b614c8c..6ab184565e 100644 --- a/modules_v3/user_messages/module.php +++ b/modules_v3/user_messages/module.php @@ -99,7 +99,7 @@ class user_messages_WT_Module extends WT_Module implements WT_Module_Block { $content .= 'return false;}'.WT_JS_END; $content .= '<input type="hidden" name="action" value="deletemessage" />'; $content .= '<table class="list_table"><tr>'; - $content .= '<td class="list_label">'.WT_I18N::translate('Delete')."<br /><a href=\"javascript:;\" onclick=\"return select_all();\">".WT_I18N::translate('All').'</a></td>'; + $content .= '<td class="list_label">'.WT_I18N::translate('Delete')."<br /><a href=\"#\" onclick=\"return select_all();\">".WT_I18N::translate('All').'</a></td>'; $content .= '<td class="list_label">'.WT_I18N::translate('Subject:').'</td>'; $content .= '<td class="list_label">'.WT_I18N::translate('Date Sent:').'</td>'; $content .= '<td class="list_label">'.WT_I18N::translate('Email Address:').'</td>'; @@ -110,7 +110,7 @@ class user_messages_WT_Module extends WT_Module implements WT_Module_Block { $content .= "<td class=\"list_value_wrap\"><input type=\"checkbox\" id=\"cb_message$key\" name=\"message_id[]\" value=\"$key\" /></td>"; $showmsg=preg_replace("/(\w)\/(\w)/","\$1/<span style=\"font-size:1px;\"> </span>\$2",PrintReady($message['subject'])); $showmsg=str_replace("@","@<span style=\"font-size:1px;\"> </span>",$showmsg); - $content .= "<td class=\"list_value_wrap\"><a href=\"javascript:;\" onclick=\"expand_layer('message{$key}'); return false;\"><img id=\"message{$key}_img\" src=\"".$WT_IMAGES['plus']."\" border=\"0\" alt=\"".WT_I18N::translate('Show Details')."\" title=\"".WT_I18N::translate('Show Details')."\" /> <b>".$showmsg."</b></a></td>"; + $content .= "<td class=\"list_value_wrap\"><a href=\"#\" onclick=\"expand_layer('message{$key}'); return false;\"><img id=\"message{$key}_img\" src=\"".$WT_IMAGES['plus']."\" border=\"0\" alt=\"".WT_I18N::translate('Show Details')."\" title=\"".WT_I18N::translate('Show Details')."\" /> <b>".$showmsg."</b></a></td>"; $content .= '<td class="list_value_wrap">'.format_timestamp($message['created']).'</td>'; $content .= '<td class="list_value_wrap">'; $user_id=get_user_id($message['from']); @@ -135,7 +135,7 @@ class user_messages_WT_Module extends WT_Module implements WT_Module_Block { $message['subject']= /* I18N: Shortcut for answer the message */ WT_I18N::translate('RE:').$message['subject']; } if ($user_id) { - $content .= "<a href=\"javascript:;\" onclick=\"reply('".addslashes($message['from'])."', '".addslashes($message['subject'])."'); return false;\">".WT_I18N::translate('Reply').'</a> | '; + $content .= "<a href=\"#\" onclick=\"reply('".addslashes($message['from'])."', '".addslashes($message['subject'])."'); return false;\">".WT_I18N::translate('Reply').'</a> | '; } $content .= "<a href=\"index.php?action=deletemessage&message_id={$key}\" onclick=\"return confirm('".WT_I18N::translate('Are you sure you want to delete this message? It cannot be retrieved later.')."');\">".WT_I18N::translate('Delete').'</a></div></td></tr>'; } diff --git a/modules_v3/user_welcome/module.php b/modules_v3/user_welcome/module.php index 93e12fa1c9..d083e8e60f 100644 --- a/modules_v3/user_welcome/module.php +++ b/modules_v3/user_welcome/module.php @@ -57,7 +57,7 @@ class user_welcome_WT_Module extends WT_Module implements WT_Module_Block { $content .= "<td class=\"center details2\" style=\" width: 33%; clear: none; vertical-align: top; margin-top: 2px;\"><a href=\"individual.php?pid=".WT_USER_GEDCOM_ID."&ged=".WT_GEDURL."\"><img class=\"block\" src=\"".$WT_IMAGES["indis"]."\" border=\"0\" alt=\"".WT_I18N::translate('My individual record')."\" /><br />".WT_I18N::translate('My individual record')."</a></td>"; } $content .= "</tr><tr><td class=\"center\" colspan=\"3\">"; - $content .= "<a href=\"javascript:;\" onclick=\"window.open('index_edit.php?name=".WT_USER_NAME."&ctype=user"."', '_blank', 'top=50,left=10,width=705,height=355,scrollbars=1,resizable=1');\">".WT_I18N::translate('Change the blocks on this page')."</a>"; + $content .= "<a href=\"#\" onclick=\"window.open('index_edit.php?name=".WT_USER_NAME."&ctype=user"."', '_blank', 'top=50,left=10,width=705,height=355,scrollbars=1,resizable=1');\">".WT_I18N::translate('Change the blocks on this page')."</a>"; $content .= "<br />".format_timestamp(client_time())."<br />"; if ($SHOW_COUNTER) $content .= WT_I18N::translate('Hit Count:')." ".$hitCount."<br />"; diff --git a/modules_v3/yahrzeit/module.php b/modules_v3/yahrzeit/module.php index 450965e9f4..51957a17e9 100644 --- a/modules_v3/yahrzeit/module.php +++ b/modules_v3/yahrzeit/module.php @@ -60,7 +60,7 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block { $id=$this->getName().$block_id; $class=$this->getName().'_block'; if ($ctype=='gedcom' && WT_USER_GEDCOM_ADMIN || $ctype=='user' && WT_USER_ID) { - $title="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\"><img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>"; + $title="<a href=\"#\" onclick=\"window.open('index_edit.php?action=configure&ctype={$ctype}&block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\"><img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>"; } else { $title=''; } @@ -38,8 +38,8 @@ if ($controller->record && $controller->record->canDisplayDetails()) { '<p class="ui-state-highlight">', /* I18N: %1$s is "accept", %2$s is "reject". These are links. */ WT_I18N::translate( 'This note has been deleted. You should review the deletion and then %1$s or %2$s it.', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'accept') . '</a>', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'reject') . '</a>' + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'accept') . '</a>', + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'reject') . '</a>' ), ' ', help_link('pending_changes'), '</p>'; @@ -56,8 +56,8 @@ if ($controller->record && $controller->record->canDisplayDetails()) { '<p class="ui-state-highlight">', /* I18N: %1$s is "accept", %2$s is "reject". These are links. */ WT_I18N::translate( 'This note has been edited. You should review the changes and then %1$s or %2$s them.', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'accept') . '</a>', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'reject') . '</a>' + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'accept') . '</a>', + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'reject') . '</a>' ), ' ', help_link('pending_changes'), '</p>'; @@ -126,11 +126,11 @@ echo '<div id="note-tabs"> echo '<table class="facts_table">'; echo '<tr><td align="left" class="descriptionbox ', $TEXT_DIRECTION, '">'; if (WT_USER_CAN_EDIT) { - echo '<a href="javascript: edit_note()" title="', WT_I18N::translate('Edit'), '">'; + echo '<a href="#" onclick="edit_note()" title="', WT_I18N::translate('Edit'), '">'; if (!empty($WT_IMAGES['note']) && $SHOW_FACT_ICONS) echo '<img src="', $WT_IMAGES['note'], '" alt="" align="top" />'; echo WT_I18N::translate('Shared note'), '</a>'; echo '<div class="editfacts">'; - echo '<div class="editlink"><a class="editicon" href="javascript: edit_note()" title="', WT_I18N::translate('Edit'), '"><span class="link_text">', WT_I18N::translate('Edit'), '</span></div></a>'; + echo '<div class="editlink"><a class="editicon" href="#" onclick="edit_note()" title="', WT_I18N::translate('Edit'), '"><span class="link_text">', WT_I18N::translate('Edit'), '</span></div></a>'; echo '</div>'; } else { if (!empty($WT_IMAGES['note']) && $SHOW_FACT_ICONS) echo '<img src="', $WT_IMAGES['note'], '" alt="" align="top" />'; diff --git a/pedigree.php b/pedigree.php index 256c2ea195..fcb3660599 100644 --- a/pedigree.php +++ b/pedigree.php @@ -320,10 +320,10 @@ if ($controller->rootPerson->canDisplayDetails()) { } echo $addxoffset, "px; top:", $yoffset, "px; width:10px; height:10px; \">"; if ($TEXT_DIRECTION=="rtl") { - echo "<a href=\"javascript: ", WT_I18N::translate('Show'), "\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow', 1);\" onmouseout=\"swap_image('larrow', 1);\">"; + echo "<a href=\"#\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow', 1);\" onmouseout=\"swap_image('larrow', 1);\">"; echo "<img id=\"larrow\" src=\"", $WT_IMAGES["rarrow"], "\" border=\"0\" alt=\"\" />"; } else { - echo "<a href=\"javascript: ", WT_I18N::translate('Show'), "\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow', 0);\" onmouseout=\"swap_image('larrow', 0);\">"; + echo "<a href=\"#\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow', 0);\" onmouseout=\"swap_image('larrow', 0);\">"; echo "<img id=\"larrow\" src=\"", $WT_IMAGES["larrow"], "\" border=\"0\" alt=\"\" />"; } break; @@ -331,21 +331,21 @@ if ($controller->rootPerson->canDisplayDetails()) { if ($PEDIGREE_GENERATIONS<4) $basexoffset += 60; echo $basexoffset, "px; top:", $yoffset, "px; width:10px; height:10px; \">"; if ($TEXT_DIRECTION=="rtl") { - echo "<a href=\"javascript: ", WT_I18N::translate('Show'), "\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow', 1);\" onmouseout=\"swap_image('larrow', 1);\">"; + echo "<a href=\"#\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow', 1);\" onmouseout=\"swap_image('larrow', 1);\">"; echo "<img id=\"larrow\" src=\"", $WT_IMAGES["rarrow"], "\" border=\"0\" alt=\"\" />"; } else { - echo "<a href=\"javascript: ", WT_I18N::translate('Show'), "\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow', 0);\" onmouseout=\"swap_image('larrow', 0);\">"; + echo "<a href=\"#\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('larrow', 0);\" onmouseout=\"swap_image('larrow', 0);\">"; echo "<img id=\"larrow\" src=\"", $WT_IMAGES["larrow"], "\" border=\"0\" alt=\"\" />"; } break; case 2: echo ($linexoffset-10+$controller->pbwidth/2+$vlength/2), "px; top:", ($yoffset+$controller->pbheight/2+10), "px; width:10px; height:10px; \">"; - echo "<a href=\"javascript: ", WT_I18N::translate('Show'), "\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('darrow', 3);\" onmouseout=\"swap_image('darrow', 3);\">"; + echo "<a href=\"#\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('darrow', 3);\" onmouseout=\"swap_image('darrow', 3);\">"; echo "<img id=\"darrow\" src=\"", $WT_IMAGES["darrow"], "\" border=\"0\" alt=\"\" />"; break; case 3: echo ($linexoffset-10+$controller->pbwidth/2+$vlength/2), "px; top:", ($yoffset-$controller->pbheight/2-10), "px; width:10px; height:10px; \">"; - echo "<a href=\"javascript: ", WT_I18N::translate('Show'), "\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('uarrow', 2);\" onmouseout=\"swap_image('uarrow', 2);\">"; + echo "<a href=\"#\" onclick=\"togglechildrenbox(); return false;\" onmouseover=\"swap_image('uarrow', 2);\" onmouseout=\"swap_image('uarrow', 2);\">"; echo "<img id=\"uarrow\" src=\"", $WT_IMAGES["uarrow"], "\" border=\"0\" alt=\"\" />"; break; } @@ -38,8 +38,8 @@ if ($controller->record && $controller->record->canDisplayDetails()) { '<p class="ui-state-highlight">', /* I18N: %1$s is "accept", %2$s is "reject". These are links. */ WT_I18N::translate( 'This repository has been deleted. You should review the deletion and then %1$s or %2$s it.', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'accept') . '</a>', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'reject') . '</a>' + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'accept') . '</a>', + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'reject') . '</a>' ), ' ', help_link('pending_changes'), '</p>'; @@ -56,8 +56,8 @@ if ($controller->record && $controller->record->canDisplayDetails()) { '<p class="ui-state-highlight">', /* I18N: %1$s is "accept", %2$s is "reject". These are links. */ WT_I18N::translate( 'This repository has been edited. You should review the changes and then %1$s or %2$s them.', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'accept') . '</a>', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'reject') . '</a>' + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'accept') . '</a>', + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'reject') . '</a>' ), ' ', help_link('pending_changes'), '</p>'; @@ -123,9 +123,9 @@ echo '<div id="repo-tabs"> echo '<tr><td class="descriptionbox">'; echo WT_I18N::translate('Add media'), help_link('add_media'); echo '</td><td class="optionbox">'; - echo '<a href="javascript:;" onclick="window.open(\'addmedia.php?action=showmediaform&linktoid=', $controller->record->getXref(), '\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">', WT_I18N::translate('Add a new media object'), '</a>'; + echo '<a href="#" onclick="window.open(\'addmedia.php?action=showmediaform&linktoid=', $controller->record->getXref(), '\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">', WT_I18N::translate('Add a new media object'), '</a>'; echo '<br />'; - echo '<a href="javascript:;" onclick="window.open(\'inverselink.php?linktoid=', $controller->record->getXref(), '&linkto=repository\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">', WT_I18N::translate('Link to an existing media object'), '</a>'; + echo '<a href="#" onclick="window.open(\'inverselink.php?linktoid=', $controller->record->getXref(), '&linkto=repository\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">', WT_I18N::translate('Link to an existing media object'), '</a>'; echo '</td></tr>'; }} echo '</table> diff --git a/reportengine.php b/reportengine.php index 35bb1ad2aa..09332ba39e 100644 --- a/reportengine.php +++ b/reportengine.php @@ -294,7 +294,7 @@ elseif ($action=='setup') { } ?> - <a href="javascript: <?php echo $input['name']; ?>" onclick="cal_toggleDate('div_<?php echo $input['name']; ?>', '<?php echo $input['name']; ?>'); return false;"> + <a href="#" onclick="cal_toggleDate('div_<?php echo $input['name']; ?>', '<?php echo $input['name']; ?>'); return false;"> <?php echo $Link; ?> </a> <div id="div_<?php echo $input['name']; ?>" style="position:absolute;visibility:hidden;background-color:white;layer-background-color:white;"></div> diff --git a/source.php b/source.php index e102232aec..38f9d00a59 100644 --- a/source.php +++ b/source.php @@ -38,8 +38,8 @@ if ($controller->record && $controller->record->canDisplayDetails()) { '<p class="ui-state-highlight">', /* I18N: %1$s is "accept", %2$s is "reject". These are links. */ WT_I18N::translate( 'This source has been deleted. You should review the deletion and then %1$s or %2$s it.', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'accept') . '</a>', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'reject') . '</a>' + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'accept') . '</a>', + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the deletion and then accept or reject it.', 'reject') . '</a>' ), ' ', help_link('pending_changes'), '</p>'; @@ -56,8 +56,8 @@ if ($controller->record && $controller->record->canDisplayDetails()) { '<p class="ui-state-highlight">', /* I18N: %1$s is "accept", %2$s is "reject". These are links. */ WT_I18N::translate( 'This source has been edited. You should review the changes and then %1$s or %2$s them.', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'accept') . '</a>', - '<a href="#" onClick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'reject') . '</a>' + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'accept-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'accept') . '</a>', + '<a href="#" onclick="jQuery.post(\'action.php\',{action:\'reject-changes\',xref:\''.$controller->record->getXref().'\'},function(){location.reload();})">' . WT_I18N::translate_c('You should review the changes and then accept or reject them.', 'reject') . '</a>' ), ' ', help_link('pending_changes'), '</p>'; @@ -131,9 +131,9 @@ echo '<div id="source-tabs"> echo '<tr><td class="descriptionbox">'; echo WT_I18N::translate('Add media'), help_link('add_media'); echo '</td><td class="optionbox">'; - echo '<a href="javascript:;" onclick="window.open(\'addmedia.php?action=showmediaform&linktoid=', $controller->record->getXref(), '\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">', WT_I18N::translate('Add a new media object'), '</a>'; + echo '<a href="#" onclick="window.open(\'addmedia.php?action=showmediaform&linktoid=', $controller->record->getXref(), '\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">', WT_I18N::translate('Add a new media object'), '</a>'; echo '<br />'; - echo '<a href="javascript:;" onclick="window.open(\'inverselink.php?linktoid=', $controller->record->getXref(), '&linkto=source\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">', WT_I18N::translate('Link to an existing media object'), '</a>'; + echo '<a href="#" onclick="window.open(\'inverselink.php?linktoid=', $controller->record->getXref(), '&linkto=source\', \'_blank\', \'top=50, left=50, width=600, height=500, resizable=1, scrollbars=1\'); return false;">', WT_I18N::translate('Link to an existing media object'), '</a>'; echo '</td></tr>'; } } diff --git a/themes/_administration/header.php b/themes/_administration/header.php index a25ecfd172..9a66b94d5b 100644 --- a/themes/_administration/header.php +++ b/themes/_administration/header.php @@ -61,7 +61,7 @@ echo } echo '</span>'; if (WT_USER_CAN_ACCEPT && exists_pending_change()) { - echo ' | <li><a href="javascript:;" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>'; + echo ' | <li><a href="#" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>'; } echo '</div>', '<div id="info">', diff --git a/themes/clouds/footer.php b/themes/clouds/footer.php index ac852faea7..16a1f1e4df 100644 --- a/themes/clouds/footer.php +++ b/themes/clouds/footer.php @@ -42,7 +42,7 @@ if ($view!='simple') { echo execution_stats(); } if (exists_pending_change()) { - echo '<a href="javascript:;" onclick="window.open(\'edit_changes.php\', \'_blank\', \'width=600, height=500, resizable=1, scrollbars=1\'); return false;">'; + echo '<a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', \'width=600, height=500, resizable=1, scrollbars=1\'); return false;">'; echo '<p class="error center">', WT_I18N::translate('There are pending changes for you to moderate.'), '</p>'; echo '</a>'; } diff --git a/themes/clouds/header.php b/themes/clouds/header.php index 9fbd1228c8..f5acf003b8 100644 --- a/themes/clouds/header.php +++ b/themes/clouds/header.php @@ -108,7 +108,7 @@ if ($view!='simple') { // Use "simple" headers for popup windows if (WT_USER_ID) { echo '<li><a href="edituser.php" class="link">', getUserFullName(WT_USER_ID), '</a></li><li>', logout_link(), '</li>'; if (WT_USER_CAN_ACCEPT && exists_pending_change()) { - echo ' <li><a href="javascript:;" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>'; + echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>'; } } else { echo '<li>', login_link(),'</li>'; diff --git a/themes/colors/footer.php b/themes/colors/footer.php index fac381225c..a98e9af3e9 100644 --- a/themes/colors/footer.php +++ b/themes/colors/footer.php @@ -42,7 +42,7 @@ if ($view!='simple') { echo execution_stats(); } if (exists_pending_change()) { - echo '<a href="javascript:;" onclick="window.open(\'edit_changes.php\', \'_blank\', \'width=600, height=500, resizable=1, scrollbars=1\'); return false;">'; + echo '<a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', \'width=600, height=500, resizable=1, scrollbars=1\'); return false;">'; echo '<p class="error center">', WT_I18N::translate('There are pending changes for you to moderate.'), '</p>'; echo '</a>'; } diff --git a/themes/colors/header.php b/themes/colors/header.php index 7e5fd1526b..274d743ee6 100644 --- a/themes/colors/header.php +++ b/themes/colors/header.php @@ -71,7 +71,7 @@ if ($view!='simple') { // Use "simple" headers for popup windows if (WT_USER_ID) { echo '<li><a href="edituser.php" class="link">', getUserFullName(WT_USER_ID), '</a></li><li>', logout_link(), '</li>'; if (WT_USER_CAN_ACCEPT && exists_pending_change()) { - echo ' <li><a href="javascript:;" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>'; + echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>'; } } else { echo '<li>', login_link(),'</li>'; diff --git a/themes/fab/header.php b/themes/fab/header.php index 6fcf854257..2f91809056 100644 --- a/themes/fab/header.php +++ b/themes/fab/header.php @@ -72,7 +72,7 @@ if ($view!='simple') { // Use "simple" headers for popup windows if (WT_USER_ID) { echo '<li><a href="edituser.php">', getUserFullName(WT_USER_ID), '</a></li> <li>', logout_link(), '</li>'; if (WT_USER_CAN_ACCEPT && exists_pending_change()) { - echo ' <li><a href="javascript:;" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>'; + echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>'; } } else { echo '<li>', login_link(), '</li> '; diff --git a/themes/minimal/footer.php b/themes/minimal/footer.php index 0fffc35252..65e365335c 100644 --- a/themes/minimal/footer.php +++ b/themes/minimal/footer.php @@ -40,7 +40,7 @@ if ($view!='simple') { echo execution_stats(); } if (exists_pending_change()) { - echo '<a href="javascript:;" onclick="window.open(\'edit_changes.php\', \'_blank\', \'width=600, height=500, resizable=1, scrollbars=1\'); return false;">'; + echo '<a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', \'width=600, height=500, resizable=1, scrollbars=1\'); return false;">'; echo '<p class="error center">', WT_I18N::translate('There are pending changes for you to moderate.'), '</p>'; echo '</a>'; } diff --git a/themes/webtrees/footer.php b/themes/webtrees/footer.php index 4464805eba..55537a44ac 100644 --- a/themes/webtrees/footer.php +++ b/themes/webtrees/footer.php @@ -40,7 +40,7 @@ if ($view!='simple') { echo execution_stats(); } if (exists_pending_change()) { - echo '<a href="javascript:;" onclick="window.open(\'edit_changes.php\', \'_blank\', \'width=600, height=500, resizable=1, scrollbars=1\'); return false;">'; + echo '<a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', \'width=600, height=500, resizable=1, scrollbars=1\'); return false;">'; echo '<p class="error center">', WT_I18N::translate('There are pending changes for you to moderate.'), '</p>'; echo '</a>'; } diff --git a/themes/xenea/footer.php b/themes/xenea/footer.php index 0c71909c7e..e28b1c91ff 100644 --- a/themes/xenea/footer.php +++ b/themes/xenea/footer.php @@ -40,7 +40,7 @@ if ($view!='simple') { echo execution_stats(); } if (exists_pending_change()) { - echo '<a href="javascript:;" onclick="window.open(\'edit_changes.php\', \'_blank\', \'width=600, height=500, resizable=1, scrollbars=1\'); return false;">'; + echo '<a href="#" onclick="window.open(\'edit_changes.php\', \'_blank\', \'width=600, height=500, resizable=1, scrollbars=1\'); return false;">'; echo '<p class="error center">', WT_I18N::translate('There are pending changes for you to moderate.'), '</p>'; echo '</a>'; } diff --git a/themes/xenea/header.php b/themes/xenea/header.php index 99974f4408..d15b9db005 100644 --- a/themes/xenea/header.php +++ b/themes/xenea/header.php @@ -100,7 +100,7 @@ if ($view!='simple') { // Use "simple" headers for popup windows if (WT_USER_ID) { echo '<li><a href="edituser.php">', getUserFullName(WT_USER_ID), '</a></li> <li>', logout_link(), '</li>'; if (WT_USER_CAN_ACCEPT && exists_pending_change()) { - echo ' <li><a href="javascript:;" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>'; + echo ' <li><a href="#" onclick="window.open(\'edit_changes.php\',\'_blank\',\'width=600,height=500,resizable=1,scrollbars=1\'); return false;" style="color:red;">', WT_I18N::translate('Pending changes'), '</a></li>'; } } else { echo '<li>', login_link(), '</li> '; |