Escape @ and #, as well; fix username in User.reload()

[blerg.git] / www / index.html

diff --git a/www/index.html b/www/index.html
index 0d44a66..06be484 100644 (file)
--- a/www/index.html
+++ b/www/index.html
@@ -20,9 +20,9 @@
     <h1><a href="/">Blërg!</a></h1>
     <h2><span name="section">Welcome</span></h2>
     <div id="usercontrols" style="display:none">
-      <a href="#" name="user.reflink">[chatter]</a>
-      <a href="#" name="user.obsesslink" onclick="obsess(); return false" style="display: none">[obsess]</a>
-      <a href="#" name="user.unobsesslink" onclick="unobsess(); return false" style="display: none">[stop obsessing]</a>
+      <a href="#" name="user.reflink" onclick="return qlink()">[chatter]</a>
+      <a href="#" name="user.subscribelink" onclick="subscribe(); return false" style="display: none">[stalk]</a>
+      <a href="#" name="user.unsubscribelink" onclick="unsubscribe(); return false" style="display: none">[stop stalking]</a>
     </div>
   </div>
   <div id="controls">
@@ -33,9 +33,10 @@
       <p style="font-size: large"><a href="#" onclick="$('welcome').hide(); $('items').hide(); $('post').hide(); $('signup').show(); return false;">I want to blërg!</a></p>
     </form>
     <div id="logout" style="display: none">
-      Hello, <a href="#" id="userlink"></a>. <a href="#" onclick="loginStatus.logout(); return false">logout</a><br>
+      Hello, <a href="#" id="userlink" onclick="return qlink()"></a>. <a href="#" onclick="loginStatus.logout(); return false">logout</a><br>
       <a href="#" onclick="postPopup(); return false">Write new entry</a><br>
-      <a href="#" id="reflink">Chatter about me</a>
+      <a href="#" id="reflink" onclick="return qlink()">Chatter about me</a><br>
+      <a href="/#/feed" onclick="return qlink()">Stalk your victims</a>
     </div>
     <div id="rss" style="display:none"><a id="rsslink" href=""><img src="/images/rss.png" width="16" height="16"> RSS</a></div>
   </div>
@@ -126,8 +127,8 @@
   </div>
 
   <div id="navigation">
-    <a id="newer_link" href="#" onclick="newer_page(); return false" style="display:none">&lt;&lt; newer</a>
-    <a id="older_link" href="#" onclick="older_page(); return false" style="display:none">older &gt;&gt;</a>
+    <a id="newer_link" href="#" onclick="return qlink()" style="display:none">&lt;&lt; newer</a>
+    <a id="older_link" href="#" onclick="return qlink()" style="display:none">older &gt;&gt;</a>
   </div>
 
   <div id="signup" style="display:none">