From 0db7b7ef7a35070bf802a6c3313701d6faa5b3dc Mon Sep 17 00:00:00 2001
From: tim b <timb@camcompu.home>
Date: Thu, 8 Apr 2010 18:22:25 -0700
Subject: favs

---
 template/chat.st              | 12 ++++++++---
 template/chat_help_bubbles.st | 14 ++++++-------
 template/directory.st         | 14 ++++++-------
 template/head.st              |  2 +-
 template/log.st               |  2 +-
 template/share_buttons.st     |  6 ++++--
 template/tagged_dumps.st      | 49 +++++++++++++++++++++++++++++++++++++++++++
 7 files changed, 78 insertions(+), 21 deletions(-)
 create mode 100644 template/tagged_dumps.st

(limited to 'template')

diff --git a/template/chat.st b/template/chat.st
index ef866ff..2ab2369 100644
--- a/template/chat.st
+++ b/template/chat.st
@@ -10,6 +10,9 @@ $endif$
   <script type="text/javascript" src="/static/js/tooltip.js"></script>
   <script type="text/javascript" src="/static/js/away.js"></script>
   <script type="text/javascript" src="/static/js/ajaxupload.js"></script>
+$if(user_nick)$
+  <script type="text/javascript" src="/json/$user_nick$/favorites"></script>
+$endif$
   <script>
     jQuery(document).ready(initChat);
     var Nick = $json_user_nick$;
@@ -61,7 +64,7 @@ $messages: { m |
   $if(m.favorited)$
     <img src="/static/img/thumbs/color.right.gif" class="thumb chat-thumb" onclick="Tag.favorite(this)">
   $else$
-    <img src="/static/img/thumbs/pink.diamond.gif" class="thumb chat-thumb" onclick="Tag.favorite(this)">
+    <img src="/static/img/thumbs/pink.circle.gif" class="thumb chat-thumb" onclick="Tag.favorite(this)">
   $endif$ 
               </span>
             <span class="content">$m.content$<span>
@@ -73,20 +76,22 @@ $if(user_avatar)$
           <div id="msgInputDiv">
               <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" />    </div>   
                 <input id="msgSubmit" type="submit" value="Send"/>
+                <button id="palette-button"><img src="/static/img/palette.gif"></button>
                 <input id="upload" value="Upload" type="submit">
                 <input id="webcam-button-upload" value="Webcam" type="submit">
                 <input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink">  
-                <div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"><img src="/static/trophyicon.gif"></a></div>
+                <div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"><img src="/static/img/trophyicon.gif"></a></div>
               </div><div id="effects-msg"class="invisible">click on your face for effects!</div>
           </div>
 $else$
           <div id="msgInputDiv">
               <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" />    </div>   
               <input id="msgSubmit" type="submit" value="Send"onClick="showAlert();"/>
+              <button id="palette-button"><img src="/static/img/palette.gif"></button>
               <input id="upload" value="Upload" type="submit"onClick="showAlert();">
               <input id="webcam-button-upload" value="Webcam" type="submit"onClick="showAlert();">
               <input id="webcam-button-snap" value="Send Pic" type="submit" class="invisible blink" onClick="showAlert();">  
-              <div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"onClick="showAlert();"><img src="/static/trophyicon.gif"></a></div>
+              <div id="trophy"><a href="javascript:pop('http://www.likeneveralways.com/trash/count/index.php');"class="tooltip" title="Contest Counter"onClick="showAlert();"><img src="/static/img/trophyicon.gif"></a></div>
             </div>
           </div>
   $chat_help_bubbles()$
@@ -95,6 +100,7 @@ $endif$
       </div>        
     </div>
   </div>
+  <div id="palette"><div id="palette-thumbs"></div></div>
   <div id="footerc">
     <p>
 $footer()$
diff --git a/template/chat_help_bubbles.st b/template/chat_help_bubbles.st
index fadf9dc..77a3e7d 100644
--- a/template/chat_help_bubbles.st
+++ b/template/chat_help_bubbles.st
@@ -1,11 +1,11 @@
 <div id="newuserwrap">
-<div id="posthelp"><img src="/static/posthere.png"></div>
-<div id="webcamhelp"><img src="/static/webcamhelp.png"></div>
-<div id="userlisthelp"><img src="/static/userlisthelp.png"></div>
-<div id="imageboard"><img src="/static/imageboard.png"></div>
-<div id="uploadstuff"><img src="/static/uploadstuff.png"></div>
-<div id="signinblurb"><img src="/static/signinblurb.png"></div>
-<div id="beingpostednow"><img src="/static/beingpostednow.png"></div>
+<div id="posthelp"><img src="/static/img/blurbs/posthere.png"></div>
+<div id="webcamhelp"><img src="/static/img/blurbs/webcamhelp.png"></div>
+<div id="userlisthelp"><img src="/static/img/blurbs/userlisthelp.png"></div>
+<div id="imageboard"><img src="/static/img/blurbs/imageboard.png"></div>
+<div id="uploadstuff"><img src="/static/img/blurbs/uploadstuff.png"></div>
+<div id="signinblurb"><img src="/static/img/blurbs/signinblurb.png"></div>
+<div id="beingpostednow"><img src="/static/img/blurbs/beingpostednow.png"></div>
 <script>
 jQuery(document).ready(function(){ setTimeout( function(){ jQuery("#newuserwrap div").hide("puff", 1000) }, 10000 ) })
 </script>
diff --git a/template/directory.st b/template/directory.st
index 05d13e2..bea2f58 100644
--- a/template/directory.st
+++ b/template/directory.st
@@ -29,13 +29,13 @@
             </div>
           </center>          
           $if(users)$
-          $users:{ u | 
-          <div class="logged-dump" id="message-$u.message_id$">
-            <a href="/u/$u.nick$">
-            <div id="usernicks">  <b>$u.nick$</b></div>
-              $if(u.avatar)$
+          $users:{ dump | 
+          <div class="logged-dump" id="message-$dump.message_id$">
+            <a href="/u/$dump.nick$">
+            <div id="usernicks">  <b>$dump.nick$</b></div>
+              $if(dump.avatar)$
               <div id="logavatar">
-                <img height="50" width="50" src="$u.avatar$" />
+                <img height="50" width="50" src="$dump.avatar$" />
               </div>
               $else$
               <div id="logavatar">
@@ -44,7 +44,7 @@
               $endif$
             </a>
             <div id="infotxt"><b>last post</b></div>
-            <span class="linkify">$u.content$</span>
+            <span class="linkify">$dump.content$</span>
             <hr />
             $share_buttons()$
             </div>
diff --git a/template/head.st b/template/head.st
index 8634534..18b5d16 100644
--- a/template/head.st
+++ b/template/head.st
@@ -6,7 +6,7 @@
 <script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script>
 <script type="text/javascript" src="/static/js/sha1.js"></script>
 <link rel="stylesheet" type="text/css" href="/static/css/reset.css">
-<link rel="stylesheet" type="text/css" href="/static/css/common.css">
+<link rel="stylesheet" type="text/css" href="/static/css/header.css">
 $if(!user_nick)$
 <link href="/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css">
 $endif$
diff --git a/template/log.st b/template/log.st
index 8af0154..88ab991 100644
--- a/template/log.st
+++ b/template/log.st
@@ -15,7 +15,7 @@ $head()$
       <br>
       <div id="posts">  
         <div id="lolbanner">
-          <img src="/static/welcomebanner.gif">
+          <img src="/static/img/welcomebanner.gif">
         </div>
 $if(dumps)$
   $dumps: { d | $log_dump(dump=d)$ }$
diff --git a/template/share_buttons.st b/template/share_buttons.st
index d061743..3f1f472 100644
--- a/template/share_buttons.st
+++ b/template/share_buttons.st
@@ -1,8 +1,10 @@
 <div class="buttons">
-$if(dump.favorited)$
+$if(dump)$
+  $if(dump.favorited)$
   <img src="/static/img/thumbs/color.left.gif" class="thumb favorite" onclick="Tag.favorite(this)">
-$else$
+  $else$
   <img src="/static/img/thumbs/bw.left.gif" class="thumb" onclick="Tag.favorite(this)">
+  $endif$
 $endif$
   <span class="other-sites">
     <img src="/static/img/share/tumblricon.png" class="share" onclick="Share.tumblr(this)">
diff --git a/template/tagged_dumps.st b/template/tagged_dumps.st
new file mode 100644
index 0000000..037a52b
--- /dev/null
+++ b/template/tagged_dumps.st
@@ -0,0 +1,49 @@
+<html>
+<head>
+  <title>dump.fm - $page_title$</title>
+$head()$
+  <link rel="stylesheet" type="text/css" href="/static/css/log.css">
+  <script>
+     jQuery(document).ready(initLog);
+  </script>
+</head>
+<body>
+  $banner()$
+  <div id="chatrap">
+    <div id="log">   
+	    <div id="loghead"></div>
+      <br>
+      <div id="posts">
+        <center><h2>$page_title$</h2></center>
+        <div id="lolbanner">
+          <img src="/static/img/welcomebanner.gif">
+        </div>
+$if(dumps)$
+  $dumps: { d | $log_dump(dump=d)$ }$
+  $if(json_tags)$
+<script>
+  $json_tags: { j | $j$;
+}$
+</script>
+  $endif$
+$else$
+  No dumps!
+$endif$
+        <div id="pnav">
+$if(next)$
+          <div id="pnavn"><a href="/$page_url$/$next$">next &#9758;</a></div> 
+$endif$
+            &nbsp;
+$if(prev)$
+          <div id="pnavo">  <a href="/$page_url$/$prev$">&#9756; prev</a>          </div>
+$endif$
+          <br><br>
+        </div>
+      </div>
+
+      <div id="footer">
+$footer()$
+      </div>
+    </div>
+  </body>
+</html>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2