X-Git-Url: http://git.bytex64.net/?a=blobdiff_plain;ds=sidebyside;f=www%2Findex.html;h=42a1c01b122361af0e5f750dbd4ecddc2529cab8;hb=0db9b1f8be6ebaac73c53f174d0b8527a09771d1;hp=20dc6e0d20942872b08a95782a9b8ca9a15efee7;hpb=acfedd7b7e02875fdc6a85fdcb080771da24961d;p=blerg.git

diff --git a/www/index.html b/www/index.html
index 20dc6e0..42a1c01 100644
--- a/www/index.html
+++ b/www/index.html
@@ -7,7 +7,9 @@
 <title>Blërg!</title>
 <link rel="stylesheet" href="css/blerg.css">
 <script type="text/javascript" src="js/prototype.js"></script>
+<script type="text/javascript" src="js/Bytex64.FX.js"></script>
 <script type="text/javascript" src="js/blerg.js"></script>
+<script type="text/javascript" src="js/blergmedia.js"></script>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
 <meta name="viewport" content="width=device-width, user-scalable=no, maximum-scale=1.0"/>
 </head>
@@ -15,9 +17,14 @@
 
 <div id="header">
   <div id="siteid">
-    <img src="/images/blerglogo.png" class="logo" width="125" height="122">
-    <h1><a href="/">Blërg!</a></h1>
+    <img src="images/blerglogo.png" class="logo" width="125" height="122">
+    <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" 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">
     <form style="font-size: small" id="login" onsubmit="loginStatus.login($('login.username').value, $('login.password').value); return false">
@@ -27,11 +34,12 @@
       <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 <span id="newFeedMessages"></span></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 id="rss" style="display:none"><a id="rsslink" href=""><img src="images/rss.png" width="16" height="16"> RSS</a></div>
   </div>
   <div style="clear:both"></div>
   <div id="post" style="display:none">
@@ -51,14 +59,13 @@
   <div id="items" style="display:none">
   </div>
 
-  <div id="welcome">
-
-  <div style="float: right; width: 25%; margin: 0 0 8pt 8pt">
-  <h2>Quick and dirty hack to show recent tags</h2>
-  <div id="newtags"></div>
+  <div id="welcome" style="display:none">
 
-  <h2>And here are some users with recent activity</h2>
-  <div id="newusers"></div>
+  <div id="latest">
+    <h2>Latest posts</h2>
+    <div id="latest-posts"></div>
+    <h2>Latest tags</h2>
+    <div id="latest-tags"></div>
   </div>
 
   <h2>I am 12 and what is this</h2>
@@ -121,8 +128,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">