Replace inline JS gtoggles with html attributes and some global JS

End goal is to remove all inline JS, starting with onclick

classes/debug.class.php

@@ -478,14 +478,14 @@ class DEBUG {
 ?>
   <table class="layout" width="100%">
     <tr>
-      <td align="left"><strong><a href="#" onclick="$('#debug_ocelot').gtoggle(); return false;" class="brackets">View</a> <?=number_format(count($OcelotRequests))?> Ocelot requests:</strong></td>
+      <td align="left"><strong><a toggle-target="#debug_ocelot" class="brackets">View</a> <?=number_format(count($OcelotRequests))?> Ocelot requests:</strong></td>
     </tr>
   </table>
   <table id="debug_ocelot" class="debug_table hidden" width="100%">
 <?    foreach ($OcelotRequests as $i => $Request) { ?>
     <tr>
       <td align="left" class="debug_data debug_ocelot_data">
-        <a href="#" onclick="$('#debug_ocelot_<?=$i?>').gtoggle(); return false"><?=display_str($Request['path'])?></a>
+        <a toggle-target="#debug_ocelot_<?=$i?>"><?=display_str($Request['path'])?></a>
         <pre id="debug_ocelot_<?=$i?>" class="hidden"><?=display_str($Request['response'])?></pre>
       </td>
       <td align="left" class="debug_info" style="width: 100px;">

classes/donationsview.class.php

@@ -103,7 +103,7 @@ class DonationsView {
       <div class="box">
         <div class="head">
           <span><?=!empty($ProfileRewards['ProfileInfoTitle' . $i]) ? display_str($ProfileRewards['ProfileInfoTitle' . $i]) : "Extra Profile " . ($i + 1)?></span>
-          <span style="float: right;"><a href="#" onclick="$('#profilediv_<?=$i?>').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets">Hide</a></span>
+          <span style="float: right;"><a toggle-target="#profilediv_<?=$i?>" toggle-replace="Show" class="brackets">Hide</a></span>
         </div>
         <div class="pad profileinfo" id="profilediv_<?=$i?>">
 <?          echo Text::full_format($ProfileRewards['ProfileInfo' . $i]); ?>
@@ -121,7 +121,7 @@ class DonationsView {
 ?>
     <div class="box box2" id="donation_history_box">
       <div class="head">
-        Donation History <a href="#" onclick="$('#donation_history').gtoggle(); return false;" class="brackets" style="float: right;">Toggle</a>
+        Donation History <a toggle-target="#donation_history" class="brackets" style="float: right;">Toggle</a>
       </div>
       <div class="hidden" id="donation_history">
         <table cellpadding="6" cellspacing="1" border="0" class="border" width="100%">

classes/testingview.class.php

@@ -56,7 +56,7 @@ class TestingView {
         <div class="head">
           <span><?=self::render_method_definition($Method)?></span>
           <span style="float: right;">
-            <a href="#" class="brackets" onclick="$('#method_params_<?=$Index?>').gtoggle(); return false;">Params</a>
+            <a toggle-target="#method_params_<?=$Index?>" class="brackets">Params</a>
             <a href="#" class="brackets run" data-gazelle-id="<?=$Index?>" data-gazelle-class="<?=$ClassName?>" data-gazelle-method="<?=$MethodName?>">Run</a>
           </span>
         </div>
@@ -172,4 +172,4 @@ class TestingView {
     echo $Results;
   }
 
-}
+}

design/views/generic/reply/staffpm.php

@@ -22,6 +22,6 @@
 
         <input type="button" value="Preview" class="hidden button_preview_<?=$TextPrev->getID()?>" />
         <input type="submit" value="Send message" />
-        <input type="button" value="Hide" onclick="$('#compose').gtoggle(); return false;" />
+        <input type="button" value="Hide" toggle-target="#compose" />
       </form>
     </div>

sections/artist/artist.php

@@ -630,7 +630,7 @@ if (empty($SimilarArray)) {
       <div id="info" class="head">
         <a href="#">&uarr;</a>&nbsp;
         <strong>Information</strong>
-        <a href="#" class="brackets" onclick="$('#body').gtoggle(); return false;">Toggle</a>
+        <a class="brackets" toggle-target="#body">Toggle</a>
       </div>
       <div id="body" class="body"><?=Text::full_format($Body)?></div>
     </div>
@@ -656,7 +656,7 @@ if (count($Collages) > 0) {
     $Range = range(0,count($Collages) - 1);
     shuffle($Range);
     $Indices = array_slice($Range, 0, MAX_COLLAGES);
-    $SeeAll = ' <a href="#" onclick="$(\'.collage_rows\').gtoggle(); return false;">(See all)</a>';
+    $SeeAll = ' <a toggle-target=".collage_rows">(See all)</a>';
   } else {
     $Indices = range(0, count($Collages)-1);
     $SeeAll = '';

sections/forums/forum.php

@@ -87,7 +87,7 @@ View::show_header('Forums > '. $Forums[$ForumID]['Name'], '', '');
 <? if (Forums::check_forumperm($ForumID, 'Write') && Forums::check_forumperm($ForumID, 'Create')) { ?>
     <a href="forums.php?action=new&amp;forumid=<?=$ForumID?>" class="brackets">New thread</a>
 <? } ?>
-    <a href="#" onclick="$('#searchforum').gtoggle(); this.innerHTML = (this.innerHTML == 'Search this forum' ? 'Hide search' : 'Search this forum'); return false;" class="brackets">Search this forum</a>
+    <a toggle-target="#searchforum" toggle-replace="Hide search" class="brackets">Search this forum</a>
     <div id="searchforum" class="hidden center">
       <div style="display: inline-block;">
         <h3>Search this forum:</h3>

sections/forums/newthread.php

@@ -35,7 +35,7 @@ View::show_header('Forums > '.$Forum['Name'].' > New Topic', 'comments,bbc
     </div>
 <?  if (check_perms('forums_polls_create')) { ?>
     <div class="box thin clear hidden" id="pollpreview">
-      <div class="head colhead_dark"><strong>Poll</strong> <a href="#" onclick="$('#threadpoll').gtoggle(); return false;" class="brackets">View</a></div>
+      <div class="head colhead_dark"><strong>Poll</strong> <a toggle-target="#threadpoll" class="brackets">View</a></div>
       <div class="pad" id="threadpoll">
         <p><strong id="pollquestion"></strong></p>
         <div id="pollanswers"></div>
@@ -135,7 +135,7 @@ if (check_perms('forums_polls_create')) {
         <tr>
           <td colspan="2" class="center">
             <strong>Poll Settings</strong>
-            <a href="#" onclick="$('#poll_question, #poll_answers').gtoggle(); return false;" class="brackets">View</a>
+            <a toggle-target="#poll_question, #poll_answers" class="brackets">View</a>
           </td>
         </tr>
         <tr id="poll_question" class="hidden">

sections/forums/search.php

@@ -334,7 +334,7 @@ while (list($ID, $Title, $ForumID, $ForumName, $LastTime, $PostID, $Body, $Threa
 <?
   }
   if ($Type == 'body') { ?>
-        <a href="#" onclick="$('#post_<?=$PostID?>_text').gtoggle(); return false;">(Show)</a> <span style="float: right;" class="tooltip last_read" title="Jump to post"><a href="forums.php?action=viewthread&amp;threadid=<?=$ID?><? if (!empty($PostID)) { echo "&amp;postid=$PostID#post$PostID"; } ?>"></a></span>
+        <a toggle-target="#post_<?=$PostID?>_text">(Show)</a> <span style="float: right;" class="tooltip last_read" title="Jump to post"><a href="forums.php?action=viewthread&amp;threadid=<?=$ID?><? if (!empty($PostID)) { echo "&amp;postid=$PostID#post$PostID"; } ?>"></a></span>
 <?  } ?>
       </td>
       <td>

sections/forums/thread.php

@@ -179,7 +179,7 @@ View::show_header($ThreadInfo['Title'] . ' < '.$Forums[$ForumID]['Name'].' &l
     <div class="center">
       <a href="reports.php?action=report&amp;type=thread&amp;id=<?=$ThreadID?>" class="brackets">Report thread</a>
       <a href="#" onclick="Subscribe(<?=$ThreadID?>);return false;" id="subscribelink<?=$ThreadID?>" class="brackets"><?=(in_array($ThreadID, $UserSubscriptions) ? 'Unsubscribe' : 'Subscribe')?></a>
-      <a href="#" onclick="$('#searchthread').gtoggle(); this.innerHTML = (this.innerHTML == 'Search this thread' ? 'Hide search' : 'Search this thread'); return false;" class="brackets">Search this thread</a>
+      <a toggle-target="#searchthread" toggle-replace="Hide search" class="brackets">Search this thread</a>
     </div>
     <div id="searchthread" class="hidden center">
       <div style="display: inline-block;">
@@ -548,7 +548,7 @@ if (check_perms('site_moderate_forums')) {
   $Notes = G::$DB->to_array();
 ?>
   <br />
-  <h3 id="thread_notes">Thread notes</h3> <a href="#" onclick="$('#thread_notes_table').gtoggle(); return false;" class="brackets">Toggle</a>
+  <h3 id="thread_notes">Thread notes</h3> <a toggle-target="#thread_notes_table" class="brackets">Toggle</a>
   <form action="forums.php" method="post">
     <input type="hidden" name="action" value="take_topic_notes" />
     <input type="hidden" name="auth" value="<?=$LoggedUser['AuthKey']?>" />
@@ -582,7 +582,7 @@ if (check_perms('site_moderate_forums')) {
       <tr>
         <td class="label"><label for="sticky_thread_checkbox">Sticky</label></td>
         <td>
-          <input type="checkbox" id="sticky_thread_checkbox" onclick="$('#ranking_row').gtoggle();" name="sticky"<? if ($ThreadInfo['IsSticky']) { echo ' checked="checked"'; } ?> tabindex="2" />
+          <input type="checkbox" id="sticky_thread_checkbox" toggle-target="#ranking_row" name="sticky"<? if ($ThreadInfo['IsSticky']) { echo ' checked="checked"'; } ?> tabindex="2" />
         </td>
       </tr>
       <tr id="ranking_row"<?=!$ThreadInfo['IsSticky'] ? ' class="hidden"' : ''?>>

sections/index/private.php

@@ -457,7 +457,7 @@ $Cache->increment('usage_index');
   <div class="box" id="recommended">
     <div class="head colhead_dark">
       <strong>Latest Vanity House additions</strong>
-      <a href="#" onclick="$('#vanityhouse').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets">Show</a>
+      <a toggle-target="#vanityhouse", toggle-replace="Hide" class="brackets">Show</a>
     </div>
 
     <table class="torrent_table hidden" id="vanityhouse">
@@ -504,7 +504,7 @@ foreach ($News as $NewsItem) {
 <?  if (check_perms('admin_manage_news')) { ?>
         - <a href="tools.php?action=editnews&amp;id=<?=$NewsID?>" class="brackets">Edit</a>
 <?  } ?>
-      <span style="float: right;"><a href="#" onclick="$('#newsbody<?=$NewsID?>').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets">Hide</a></span>
+      <span style="float: right;"><a toggle-target="#newsbody<?=$NewsID?>" toggle-replace="Show" class="brackets">Hide</a></span>
       </div>
       <div id="newsbody<?=$NewsID?>" class="pad"><?=Text::full_format($Body)?></div>
     </div>

sections/staff/index.php

@@ -18,7 +18,7 @@ list($FrontLineSupport, $ForumStaff, $Staff) = $SupportStaff;
     <h3>Contact Staff</h3>
     <div id="below_box">
       <p>If you are looking for help with a general question, we appreciate it if you would only message through the staff inbox, where we can all help you.</p>
-      <p>You can do that by <strong><a href="#" onclick="$('#compose').gtoggle(); return false;">sending a message to the Staff Inbox</a></strong>.</p>
+      <p>You can do that by <strong><a toggle-target="#compose">sending a message to the Staff Inbox</a></strong>.</p>
     </div>
     <? View::parse('generic/reply/staffpm.php', array('Hidden' => true)); ?>
 <? if ($FrontLineSupport) { ?>

sections/staffblog/index.php

@@ -85,7 +85,7 @@ if (check_perms('admin_manage_blog')) {
       <div class="head">
         <?=((empty($_GET['action'])) ? 'Create a staff blog post' : 'Edit staff blog post')?>
         <span style="float: right;">
-          <a href="#" onclick="$('#postform').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets"><?=(($_REQUEST['action'] != 'editblog') ? 'Show' : 'Hide')?></a>
+          <a toggle-target="#postform" toggle-replace="<?=(($_REQUEST['action'] != 'editblog') ? 'Hide' : 'Show')?>" class="brackets"><?=(($_REQUEST['action'] != 'editblog') ? 'Show' : 'Hide')?></a>
         </span>
       </div>
       <form class="<?=((empty($_GET['action'])) ? 'create_form' : 'edit_form')?>" name="blog_post" action="staffblog.php" method="post">

sections/staffpm/user_inbox.php

@@ -24,7 +24,7 @@ $StaffPMs = $DB->query("
   <div class="header">
     <h2>Staff PMs</h2>
     <div class="linkbox">
-      <a href="#" onclick="$('#compose').gtoggle();" class="brackets">Compose new</a>
+      <a toggle-target="#compose" class="brackets">Compose new</a>
     </div>
   </div>
   <br />

sections/staffpm/viewconv.php

@@ -232,7 +232,7 @@ if ($ConvID = (int)$_GET['id']) {
   if ($Status != 'Resolved') { ?>
           <input type="button" value="Resolve" onclick="location.href='staffpm.php?action=resolve&amp;id=<?=$ConvID?>';" />
 <?    if ($IsFLS) { //Moved by request ?>
-          <input type="button" value="Common answers" onclick="$('#common_answers').gtoggle();" />
+          <input type="button" value="Common answers" toggle-target="#common_answers" />
 <?    } ?>
           <input type="button" id="previewbtn" value="Preview" class="hidden button_preview_<?=$TextPrev->getID()?>" />
           <input type="submit" value="Send message" />
@@ -242,7 +242,7 @@ if ($ConvID = (int)$_GET['id']) {
   }
   if (check_perms('users_give_donor')) { ?>
           <br />
-          <input type="button" value="Make Donor" onclick="$('#make_donor_form').gtoggle(); return false;" />
+          <input type="button" value="Make Donor" toggle-target="#make_donor_form" />
 <?  } ?>
         </form>
 <?  if (check_perms('users_give_donor')) { ?>

sections/tools/managers/enable_requests.php

@@ -139,8 +139,8 @@ $DB->set_query_id($QueryID);
     <a class="brackets tooltip" href="tools.php?action=enable_requests&amp;view=invalid_email&amp;<?=Format::get_url(array('view', 'action'))?>" title="Non-matching email address">Invalid Email</a>
     <a class="brackets tooltip" href="tools.php?action=enable_requests&amp;view=ip_overlap&amp;<?=Format::get_url(array('view', 'action'))?>" title="Requests with IP matches to other accounts">IP Overlap</a>
     <a class="brackets tooltip" href="tools.php?action=enable_requests&amp;view=manual_disable&amp;<?=Format::get_url(array('view', 'action'))?>" title="Requests for accounts that were not disabled for inactivity">Manual Disable</a>
-    <a class="brackets tooltip" href="" title="Show/Hide Search" onclick="$('#search_form').gtoggle(); return false;">Search</a>
-    <a class="brackets tooltip" href="" title="Show/Hide Search" onclick="$('#scores').gtoggle(); return false;">Scores</a>
+    <a class="brackets tooltip" title="Show/Hide Search" toggle-target="#search_form">Search</a>
+    <a class="brackets tooltip" title="Show/Hide Search" toggle-target="#scores">Scores</a>
 </div><br />
 <div class="thin">
     <table id="scores" class="hidden" style="width: 50%; margin: 0 auto;">

sections/torrents/browse.php

@@ -387,7 +387,7 @@ View::show_header('Browse Torrents', 'browse');
       <table class="layout cat_list" width="100%">
         <tr>
           <td class="label">
-            <a class="brackets" href="#" onclick="$('#taglist').gtoggle(); if (this.innerHTML == 'View tags') { this.innerHTML = 'Hide tags'; } else { this.innerHTML = 'View tags'; }; return false;"><?=(empty($LoggedUser['ShowTags']) ? 'View tags' : 'Hide tags')?></a>
+            <a class="brackets" toggle-target="#taglist" toggle-replace="<?=(empty($LoggedUser['ShowTags']) ? 'Hide tags' : 'View tags')?>"><?=(empty($LoggedUser['ShowTags']) ? 'View tags' : 'Hide tags')?></a>
           </td>
         </tr>
       </table>

sections/torrents/details.php

@@ -540,7 +540,7 @@ foreach ($TorrentList as $Torrent) {
 <?  }?>
             | <a href="torrents.php?torrentid=<?=$TorrentID ?>" class="tooltip" title="Permalink">PL</a>
           ]</span>
-          &raquo; <a href="#" onclick="$('#torrent_<?=$TorrentID?>').gtoggle(); return false;"><?=$ExtraInfo; ?></a>
+          &raquo; <a toggle-target="#torrent_<?=$TorrentID?>"><?=$ExtraInfo; ?></a>
         </td>
         <td class="number_column nobr"><?=Format::get_size($Size)?></td>
         <td class="number_column"><?=number_format($Snatched)?></td>
@@ -625,7 +625,7 @@ if (empty($LoggedUser['DisableRequests']) && count($Requests) > 0) {
     <div class="box">
       <div class="head">
         <span style="font-weight: bold;">Requests (<?=number_format(count($Requests))?>)</span>
-        <a href="#" style="float: right;" onclick="$('#requests').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets">Show</a>
+        <a toggle-target="#requests" toggle-replace="Hide" style="float: right;" class="brackets">Show</a>
       </div>
       <table id="requests" class="request_table hidden">
         <tr class="colhead">
@@ -674,7 +674,7 @@ if (count($Collages) > 0) {
     $Range = range(0, count($Collages) - 1);
     shuffle($Range);
     $Indices = array_slice($Range, 0, MAX_COLLAGES);
-    $SeeAll = ' <a href="#" onclick="$(\'.collage_rows\').gtoggle(); return false;">(See all)</a>';
+    $SeeAll = ' <a toggle-target=".collage_rows">(See all)</a>';
   } else {
     $Indices = range(0, count($Collages) - 1);
     $SeeAll = '';
@@ -725,7 +725,7 @@ if (count($PersonalCollages) > 0) {
     $Range = range(0,count($PersonalCollages) - 1);
     shuffle($Range);
     $Indices = array_slice($Range, 0, MAX_PERS_COLLAGES);
-    $SeeAll = ' <a href="#" onclick="$(\'.personal_rows\').gtoggle(); return false;">(See all)</a>';
+    $SeeAll = ' <a toggle-target=".personal_rows">(See all)</a>';
   } else {
     $Indices = range(0, count($PersonalCollages) - 1);
     $SeeAll = '';
@@ -769,8 +769,8 @@ include(SERVER_ROOT.'/sections/torrents/voter_picks.php');
 <?
     if (count($Screenshots) > 0) {
 ?>
-    <a style="float: right;" class='brackets' onclick="$('.torrent_screenshots').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide');">Show</a>
-<?   }
+    <a style="float: right;" class='brackets' toggle-target=".torrent_screenshots" toggle-replace="Hide">Show</a>
+<?  }
 
     $DB->query("
       SELECT UserID

sections/torrents/functions.php

@@ -403,7 +403,7 @@ function build_torrents_table($Cache, $DB, $LoggedUser, $GroupID, $GroupName, $G
 <?  } ?>
               | <a href="torrents.php?torrentid=<?=($TorrentID)?>" class="tooltip" title="Permalink">PL</a>
             ]</span>
-            &raquo; <a href="#" onclick="$('#torrent_<?=($TorrentID)?>').gtoggle(); return false;"><?=($ExtraInfo)?></a>
+            &raquo; <a toggle-target="#torrent_<?=($TorrentID)?>"><?=($ExtraInfo)?></a>
           </td>
           <td class="number_column nobr"><?=(Format::get_size($Size))?></td>
           <td class="number_column"><?=(number_format($Snatched))?></td>

sections/torrents/voter_picks.php

@@ -39,7 +39,7 @@ if (count($Top10) > 0) {
 ?>
     <table class="box vote_matches_table" id="vote_matches">
       <tr class="colhead">
-        <td><a href="#">&uarr;</a>&nbsp;People who like this also liked... <a href="#" onclick="$('.votes_rows').gtoggle(); return false;" class="brackets" style="float: right;">Toggle</a></td>
+        <td><a href="#">&uarr;</a>&nbsp;People who like this also liked... <a toggle-target=".votes_rows" class="brackets" style="float: right;">Toggle</a></td>
       </tr>
 <?
   $Top10Groups = array_keys($Top10);

sections/upload/upload.php

@@ -112,7 +112,7 @@ $HideDNU = check_perms('torrents_hide_dnu') && !$NewDNU;
   <p><?=$NewDNU ? '<strong class="important_text">' : '' ?>Last updated: <?=time_diff($Updated)?><?=$NewDNU ? '</strong>' : '' ?></p>
   <p>The following releases are currently forbidden from being uploaded to the site. Do not upload them unless your torrent meets a condition specified in the comment.
 <?  if ($HideDNU) { ?>
-  <span id="showdnu"><a href="#" onclick="$('#dnulist').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets">Show</a></span>
+  <span id="showdnu"><a toggle-target="#dnulist" toggle-replace="Hide" class="brackets">Show</a></span>
 <?  } ?>
   </p>
   <table id="dnulist" class="<?=($HideDNU ? 'hidden' : '')?>">

sections/user/linkedfunctions.php

@@ -197,7 +197,7 @@ function user_dupes_table($UserID) {
       <input type="hidden" id="form_comment_hash" name="form_comment_hash" value="<?=$CommentHash?>" />
       <div class="box box2" id="l_a_box">
         <div class="head">
-          Linked Accounts (<?=max($DupeCount - 1, 0)?>) <span style="float: right;"><a href="#" onclick="$('.linkedaccounts').gtoggle(); return false;" class="brackets">Toggle</a></span>
+          Linked Accounts (<?=max($DupeCount - 1, 0)?>) <span style="float: right;"><a toggle-target=".linkedaccounts" class="brackets">Toggle</a></span>
         </div>
         <table width="100%" class="layout hidden linkedaccounts">
           <?=($DupeCount ? "<tr>\n" : '')?>

sections/user/notify_edit.php

@@ -89,7 +89,7 @@ foreach ($Notifications as $N) { // $N stands for Notifications
     <a href="feeds.php?feed=torrents_notify_<?=$N['ID']?>_<?=$LoggedUser['torrent_pass']?>&amp;user=<?=$LoggedUser['ID']?>&amp;auth=<?=$LoggedUser['RSS_Auth']?>&amp;passkey=<?=$LoggedUser['torrent_pass']?>&amp;authkey=<?=$LoggedUser['AuthKey']?>&amp;name=<?=urlencode($N['Label'])?>"><img src="<?=STATIC_SERVER?>/common/symbols/rss.png" alt="RSS feed" /></a>
     <?=display_str($N['Label'])?>
     <a href="user.php?action=notify_delete&amp;id=<?=$N['ID']?>&amp;auth=<?=$LoggedUser['AuthKey']?>" onclick="return confirm('Are you sure you want to delete this notification filter?')" class="brackets">Delete</a>
-    <a href="#" onclick="$('#filter_<?=$N['ID']?>').gtoggle(); return false;" class="brackets">Show</a>
+    <a toggle-target="#filter_<?=$N['ID']?>" class="brackets">Show</a>
   </h3>
 <?  } ?>
   <form class="box pad slight_margin <?=($NewFilter ? 'create_form' : 'edit_form')?>" id="<?=($NewFilter ? 'filter_form' : '')?>" name="notification" action="user.php" method="post">

sections/user/user.php

@@ -646,7 +646,7 @@ if ($RatioWatchEnds != '0000-00-00 00:00:00'
     <div class="box">
       <div class="head">
         <?=!empty($InfoTitle) ? $InfoTitle : 'Profile';?>
-        <span style="float: right;"><a href="#" onclick="$('#profilediv').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets">Hide</a></span>&nbsp;
+        <span style="float: right;"><a toggle-target="#profilediv" toggle-replace="Show" class="brackets">Hide</a></span>&nbsp;
       </div>
       <div class="pad profileinfo" id="profilediv">
 <?
@@ -778,7 +778,7 @@ foreach ($Collages as $CollageInfo) {
     <div class="head">
       <?=display_str($CName)?> - <a href="collages.php?id=<?=$CollageID?>" class="brackets">See full</a>
       <span style="float: right;">
-        <a href="#" onclick="$('#collage<?=$CollageID?>_box .images').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets"><?=$FirstCol ? 'Hide' : 'Show' ?></a>
+        <a toggle-target="#collage<?=$CollageID?>_box .images" toggle-replace="<?=$FirstCol ? 'Show' : 'Hide' ?>" class="brackets"><?=$FirstCol ? 'Hide' : 'Show' ?></a>
       </span>
     </div>
     <div id="user_collage_images" class="collage_images">
@@ -828,7 +828,7 @@ if ((check_perms('users_view_invites')) && $Invited > 0) {
 ?>
     <div class="box" id="invitetree_box">
       <div class="head">
-        Invite Tree <span style="float: right"><a href="#" onclick="$('#invitetree').gtoggle(); return false;" class="brackets">Toggle</a></span>
+        Invite Tree <span style="float: right"><a toggle-target="#invitetree" class="brackets">Toggle</a></span>
       </div>
       <div id="invitetree" class="hidden">
 <?        $Tree->make_tree(); ?>
@@ -857,7 +857,7 @@ if (empty($LoggedUser['DisableRequests']) && check_paranoia_here('requestsvoted_
 ?>
     <div class="box" id="requests_box">
       <div class="head">
-        Requests <span style="float: right;"><a href="#" onclick="$('#requests').gtoggle(); return false;" class="brackets">Show</a></span>
+        Requests <span style="float: right;"><a toggle-target="#requests" class="brackets">Show</a></span>
       </div>
       <div id="requests" class="hidden">
         <table cellpadding="6" cellspacing="1" border="0" width="100%">
@@ -951,7 +951,7 @@ if (check_perms('users_mod', $Class) || $IsFLS) {
 ?>
     <div class="box" id="staffpms_box">
       <div class="head">
-        Staff PMs <a href="#" onclick="$('#staffpms').gtoggle(); return false;" class="brackets" style="float:right;">Toggle</a>
+        Staff PMs <a toggle-target="#staffpms" class="brackets" style="float:right;">Toggle</a>
       </div>
       <table width="100%" class="message_table hidden" id="staffpms">
         <tr class="colhead">
@@ -1026,7 +1026,7 @@ if (check_perms('users_mod', $Class)) { ?>
         Staff Notes
         <a href="#" name="admincommentbutton" onclick="ChangeTo('text'); return false;" class="brackets">Edit</a>
         <span style="float: right;">
-        <a href="#" onclick="$('#staffnotes').gtoggle(); return false;" class="brackets">Toggle</a>
+        <a toggle-target="#staffnotes" class="brackets">Toggle</a>
         </span>
       </div>
       <div id="staffnotes" class="pad">

sections/userhistory/email_history2.php

@@ -283,7 +283,7 @@ if ($Old ?? false) {
     $Record['IP'] = apc_exists('DBKEY') ? DBCrypt::decrypt($Record['IP']) : '[Encrypted]';
 ?>
     <tr class="row">
-      <td><?=display_str($Record['Email'])?><?=(($MatchCount > 0) ? ' <a href="#" onclick="$(\'#matches_'.$j.'\').gtoggle(); return false;">('.$MatchCount.')</a>' : '')?></td>
+      <td><?=display_str($Record['Email'])?><?=(($MatchCount > 0) ? ' <a toggle-target="#matches_'.$j.'">('.$MatchCount.')</a>' : '')?></td>
       <td><?=time_diff($Record['StartTime'])?></td>
       <td><?=time_diff($Record['EndTime'])?></td>
       <td><?=time_diff($Record['ElapsedTime'])?></td>
@@ -353,7 +353,7 @@ $Invite['Email'] = apc_exists('DBKEY') ? DBCrypt::decrypt($Invite['Email']) : '[
 $Invite['IP'] = apc_exists('DBKEY') ? DBCrypt::decrypt($Invite['IP']) : '[Encrypted]';
 ?>
     <tr class="row">
-      <td><?=display_str($Invite['Email'])?><?=(($MatchCount > 0) ? ' <a href="#" onclick="$(\'#matches_invite\').gtoggle(); return false;">('.$MatchCount.')</a>' : '')?></td>
+      <td><?=display_str($Invite['Email'])?><?=(($MatchCount > 0) ? ' <a toggle-target="#matches_invite">('.$MatchCount.')</a>' : '')?></td>
       <td>Never</td>
       <td><?=time_diff($Invite['EndTime'])?></td>
       <td><?=time_diff($Invite['AccountAge'])?></td>

sections/userhistory/subscribed_collages.php

@@ -252,7 +252,7 @@ if (!$NumResults) {
           <strong><a href="collage.php?id=<?=$CollageID?>"><?=$CollageName?></a></strong> (<?=$NewTorrentCount?> new torrent<?=($NewTorrentCount == 1 ? '' : 's')?>)
         </span>&nbsp;
         <span style="float: right;">
-          <a href="#" onclick="$('#discog_table_<?=$CollageID?>').gtoggle(); this.innerHTML = (this.innerHTML == 'Hide' ? 'Show' : 'Hide'); return false;" class="brackets"><?=($ShowAll ? 'Show' : 'Hide')?></a>&nbsp;&nbsp;&nbsp;<a href="userhistory.php?action=catchup_collages&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;collageid=<?=$CollageID?>" class="brackets">Catch up</a>&nbsp;&nbsp;&nbsp;<a href="#" onclick="CollageSubscribe(<?=$CollageID?>); return false;" id="subscribelink<?=$CollageID?>" class="brackets">Unsubscribe</a>
+          <a toggle-target="#discog_table_<?=$CollageID?>" toggle-replace="<?=($ShowAll ? 'Hide' : 'Show')?>" class="brackets"><?=($ShowAll ? 'Show' : 'Hide')?></a>&nbsp;&nbsp;&nbsp;<a href="userhistory.php?action=catchup_collages&amp;auth=<?=$LoggedUser['AuthKey']?>&amp;collageid=<?=$CollageID?>" class="brackets">Catch up</a>&nbsp;&nbsp;&nbsp;<a href="#" onclick="CollageSubscribe(<?=$CollageID?>); return false;" id="subscribelink<?=$CollageID?>" class="brackets">Unsubscribe</a>
         </span>
       </td>
     </tr>

static/functions/global.js

@@ -210,4 +210,13 @@ $(function() {
     var a = $('[cover]')[0]
     if (a) preload(a.attributes.cover.value)
   }
+
+  document.querySelectorAll('[toggle-target]').forEach(function(el) {
+    el.addEventListener('click', function(event) {
+      $(el.attributes['toggle-target'].value).gtoggle()
+      if (el.attributes['toggle-replace']) {
+        [el.innerHTML, el.attributes['toggle-replace'].value] = [el.attributes['toggle-replace'].value, el.innerHTML]
+      }
+    })
+  })
 })

static/functions/news_ajax.js

@@ -32,9 +32,9 @@ function news_ajax(event, count, offset, privileged) {
           }));
           // I'm so happy with this condition statement.
           if (privileged) {
-            $('#news' + this[0]).append('<div class="head"><strong>' + this[1] + '</strong> ' + this[2] + ' - <a href="tools.php?action=editnews&amp;id=' + this[0] + '" class="brackets">Edit</a><span style="float: right;"><a class="brackets" onclick="$(\'#newsbody' + this[0] + '\').gtoggle(); this.innerHTML=(this.innerHTML == \'Hide\' ? \'Show\' : \'Hide\'); return false;" href="#">Hide</a></span></div>');
+            $('#news' + this[0]).append('<div class="head"><strong>' + this[1] + '</strong> ' + this[2] + ' - <a href="tools.php?action=editnews&amp;id=' + this[0] + '" class="brackets">Edit</a><span style="float: right;"><a class="brackets" toggle-target="#newsbody' + this[0] + '" toggle-replace="Show">Hide</a></span></div>');
           } else {
-            $('#news' + this[0]).append('<div class="head"><strong>' + this[1] + '</strong> ' + this[2] + '<span style="float: right;"><a class="brackets" onclick="$(\'#newsbody' + this[0] + '\').gtoggle(); this.innerHTML=(this.innerHTML == \'Hide\' ? \'Show\' : \'Hide\'); return false;" href="#">Hide</a></span></div>');
+            $('#news' + this[0]).append('<div class="head"><strong>' + this[1] + '</strong> ' + this[2] + '<span style="float: right;"><a class="brackets" toggle-target="#newsbody' + this[0] + '" toggle-replace="Show">Hide</a></span></div>');
           }
           $('#news' + this[0]).append('<div class="pad" id="newsbody'+this[0]+'">' + this[3] + '</div>');
         });

static/styles/global.css

@@ -96,6 +96,10 @@ div.collage_image {
   width: 20%;
 }
 
+[toggle-target] {
+  cursor: pointer;
+}
+
 button, input[type=button], input[type=submit] {
   cursor: pointer;
   background: #fff;