committing stuff so i can merge pulled repo

author: tim b <timb@camcompu.home> 2010-04-03 20:36:43 -0700
committer: tim b <timb@camcompu.home> 2010-04-03 20:36:43 -0700
commit: 1239bda75594f1338482f71054dbb6aa84538c86 (patch)
tree: c1497a1503ad46a1728559125e447d0581d4d04c /template
parent: f3d1b68e3919345c67be06cbd7e7bb61f67ffcbd (diff)
12 files changed, 181 insertions, 242 deletions
diff --git a/template/banner.st b/template/banner.st
index 9c6198c..9c6198c 100755..100644
--- a/template/banner.st
+++ b/template/banner.st
diff --git a/template/browser.st b/template/browser.st
index 28a514d..28a514d 100755..100644
--- a/template/browser.st
+++ b/template/browser.st
diff --git a/template/chat.st b/template/chat.st
index c903a39..13b0a60 100755..100644
--- a/template/chat.st
+++ b/template/chat.st
@@ -1,110 +1,98 @@
 <html>
-  <head>
-    <title>dump.fm</title>
-    <META NAME="keywords" CONTENT="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board">
-<META NAME="description" CONTENT="Talk with pictures!">
-    $head()$
-    $if(!user_avatar)$
-    <link rel="stylesheet" type="text/css" href="/static/css/dumpnewuser.css">
-    $endif$
-    <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
-    <script type="text/javascript" src="/static/webcam/webcam.js"></script>
-    <script type="text/javascript" src="/static/js/tooltip.js"></script>
-    <script type="text/javascript" src="/static/away.js"></script>
-    <script type="text/javascript" src="/static/js/ajaxupload.js"></script>
-    <script>
-      jQuery(document).ready(initChat);
-      var Nick = $json_user_nick$;
-      var Room = $json_room_key$;
-      var Timestamp = $timestamp$;
-      function showAlert() { alert('MUST LOGIN'); }
-      $if(isadmin)$
-      var IsAdmin = true;
-      $else$
-      var IsAdmin = false;
-      $endif$
-    </script>
-    <script>
-      if (Nick) {
-          jQuery(document).ready(function() {
-              setupUpload('upload', Room);
-          });
-      }
-      var newwindow;
-function pop(url)
-{
-	newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0');
-	if (window.focus) {newwindow.focus()}
-} 
-    </script>
-  </head>
-<body onload="MM_preloadImages('/static/thumbs_up_sm.gif')">
-    $banner()$
-    <div id="chatrap">
-      <div id="logc">
-        <div id="content">
-          <div id="messagetabs"></div>
-          <div id="rapper">
-            <div id="loghead"></div>
-          </div>
-          <div id="userList">
-            $users: { u |
-            <div class="username"><a href="/u/$u.nick$" target="_blank">
-		$if(u.avatar)$<img src="$u.avatar$" width="50" height="50">$else$<img src="/static/noinfo.png"> $endif$
-                $u.nick$</a><br>
+<head>
+  <title>dump.fm</title>
+$head()$
+$if(!user_avatar)$
+  <link rel="stylesheet" type="text/css" href="/static/css/dumpnewuser.css">
+$endif$
+  <link rel="stylesheet" type="text/css" href="/static/css/dump.css">
+  <script type="text/javascript" src="/static/webcam/webcam.js"></script>
+  <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>
+  <script>
+    jQuery(document).ready(initChat);
+    var Nick = $json_user_nick$;
+    var Room = $json_room_key$;
+    var Timestamp = $timestamp$;
+$if(isadmin)$
+    var IsAdmin = true;
+$else$
+    var IsAdmin = false;
+$endif$
+    if (Nick) {
+      jQuery(document).ready(function() { setupUpload('upload', Room); });
+    }
+    function showAlert() { alert('MUST LOGIN'); }
+    var newwindow;
+    function pop(url) {
+      newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0');
+      if (window.focus) {newwindow.focus()}
+    } 
+  </script>
+</head>
+<body>
+$banner()$
+  <div id="chatrap">
+    <div id="logc">
+      <div id="content">
+        <div id="messagetabs"></div>
+        <div id="rapper">
+          <div id="loghead"></div>
+        </div>
+        <div id="userList">
+$users: { u |
+          <div class="username"><a href="/u/$u.nick$" target="_blank">
+  $if(u.avatar)$
+            <img src="$u.avatar$" width="50" height="50">
+  $else$
+            <img src="/static/noinfo.png">
+  $endif$
+              $u.nick$</a><br>
             </div>
-	    }$
-	  </div>          
-          <div id="messagePane">
-            <div id="messageList">
-              $messages: { m |
-              <div class="msgDiv oldmsg" id="message-$m.message_id$"><b>
-
+}$
+	      </div>          
+        <div id="messagePane">
+          <div id="messageList">
+$messages: { m |
+            <div class="msgDiv oldmsg" id="message-$m.message_id$"><b>
               <a href="/u/$m.nick$">$m.nick$</a>: </b>
-                <span class="content">$m.content$<span>
-
-<div id="faving" style="display:none;">
-
-<a href="#" onmouseout="MM_swapImgRestore()" onmouseover="MM_swapImage('like','','/static/thumbs_up_sm.gif',1)"><img src="/static/thumbup.gif" alt="like it!" name="like" width="14" height="15" border="0" id="like" /></a>
-</div>
-</div>
-
-
-              }$
-              <hr />
+              <span class="content">$m.content$<span>
             </div>
-            $if(user_avatar)$
-        <div id="msgInputDiv">
-                <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" />    </div>   
-              <input id="msgSubmit" type="submit" value="Send"
-                     />
-              <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><div id="effects-msg"class="invisible">click on your face for effects!</div>
+}$
+            <hr />
+          </div>
+$if(user_avatar)$
+          <div id="msgInputDiv">
+              <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" />    </div>   
+                <input id="msgSubmit" type="submit" value="Send"/>
+                <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><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();"
-                     />
+          <div id="msgInputDiv">
+              <div id="msginputrapper">  <input id="msgInput" class="msgInput" type="input" />    </div>   
+              <input id="msgSubmit" type="submit" value="Send"onClick="showAlert();"/>
               <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>          
-     
+              <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>
           </div>
-        </div>        
-      </div>
-      $new_user_bubbles()$
-       $endif$
-    <div id="footerc">
-      <p>
-        $footer()$
-      <p>
+  $chat_help_bubbles()$
+$endif$
+        </div>
+      </div>        
     </div>
-    $preload()$
-  </body>
-</html>
+  </div>
+  <div id="footerc">
+    <p>
+$footer()$
+    <p>
+  </div>
+$preload()$
+</body>
+</html>
+\ No newline at end of file
diff --git a/template/new_user_bubbles.st b/template/chat_help_bubbles.st
index a1e654d..fadf9dc 100644
--- a/template/new_user_bubbles.st
+++ b/template/chat_help_bubbles.st
@@ -1,4 +1,3 @@
-</div>
 <div id="newuserwrap">
 <div id="posthelp"><img src="/static/posthere.png"></div>
 <div id="webcamhelp"><img src="/static/webcamhelp.png"></div>
@@ -8,6 +7,6 @@
 <div id="signinblurb"><img src="/static/signinblurb.png"></div>
 <div id="beingpostednow"><img src="/static/beingpostednow.png"></div>
 <script>
-jQuery(document).ready(function(){ setTimeout( function(){ jQuery("#newuserwrap div").hide(1000) }, 10000 ) })
+jQuery(document).ready(function(){ setTimeout( function(){ jQuery("#newuserwrap div").hide("puff", 1000) }, 10000 ) })
 </script>
 </div>
 \ No newline at end of file
diff --git a/template/error_ie.st b/template/error_ie.st
new file mode 100644
index 0000000..a4f5b66
--- /dev/null
+++ b/template/error_ie.st
@@ -0,0 +1,3 @@
+<div id="iesucks">
+WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari ... (possibly Opera) ... sorry dude...
+</DIV>
+\ No newline at end of file
diff --git a/template/footer.st b/template/footer.st
index c3b4563..f737221 100755..100644
--- a/template/footer.st
+++ b/template/footer.st
@@ -4,15 +4,5 @@
 <a href="/help"><span style="word-spacing:normal;">Help FAQ</span></a> 
 <a href="/terms">Terms</a>
 <a href="/privacy">Privacy</a></div>
-
-<script type="text/javascript">
-var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
-document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
-</script>
-<script type="text/javascript">
-try {
-var pageTracker = _gat._getTracker("UA-12364576-1");
-pageTracker._trackPageview();
-} catch(err) {}</script>
-
+$google_analytics()$
 $debug_log()$
diff --git a/template/google_analytics.st b/template/google_analytics.st
new file mode 100644
index 0000000..1f2d6fc
--- /dev/null
+++ b/template/google_analytics.st
@@ -0,0 +1,7 @@
+<script type="text/javascript">
+var gaJsHost = (("https:" == document.location.protocol) ? "https://ssl." : "http://www.");
+document.write(unescape("%3Cscript src='" + gaJsHost + "google-analytics.com/ga.js' type='text/javascript'%3E%3C/script%3E"));
+</script>
+<script type="text/javascript">
+try { var pageTracker = _gat._getTracker("UA-12364576-1"); pageTracker._trackPageview();} catch(err) {}
+</script>
+\ No newline at end of file
diff --git a/template/head.st b/template/head.st
index 20192f8..cb2d0fb 100755..100644
--- a/template/head.st
+++ b/template/head.st
@@ -1,69 +1,21 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<META NAME="keywords" CONTENT="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board">
-<META NAME="description" CONTENT="Talk with pictures!">
-<script type="text/javascript" src="/static/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="/static/js/sha1.js"></script>
+<meta name="keywords" content="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board">
+<meta name="description" content="Talk with pictures!">
+<script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
 <script type="text/javascript" src="/static/js/pichat.js"></script>
-<script type="text/javascript" src="/static/js/jquery.lavalamp.js"></script>
-<script type="text/javascript" src="/static/js/jquery.easing.1.1.js"></script>
+<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/header.css">
+<link rel="stylesheet" type="text/css" href="/static/css/common.css">
 $if(!user_nick)$
 <link href="/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css">
 $endif$
 <link rel="shortcut icon" href="/static/favicon.ico">
-
 <script type="text/javascript">
 jQuery(document).ready(function () { MM_preloadImages('/static/mouseover.gif'); });
-jQuery(function() { jQuery("#banner-menu").lavaLamp({ fx: "backout", speed: 700 })});
 </script>
-
-
-<p><!--[if IE]>
-<div id="iesucks">
-WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
-</DIV>
-<![endif]-->
-<!--[if IE 5]>
-<div id="iesucks">
-WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
-</DIV><br />
-<![endif]-->
-<!--[if IE 5.0]>
-<div id="iesucks">
-WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
-</DIV><br />
-<![endif]-->
-<!--[if IE 5.5]>
-<div id="iesucks">
-WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
-</DIV><br />
-<![endif]-->
-<!--[if IE 7]>
-<div id="iesucks">
-WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
-</DIV><br />
-<![endif]-->
-<!--[if gte IE 5]>
-<div id="iesucks">
-WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
-</DIV><br />
-<![endif]-->
-<!--[if lt IE 6]>
-<div id="iesucks">
-WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
-</DIV><br />
-<![endif]-->
-<!--[if lte IE 5.5]>
-<div id="iesucks">
-WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
-</DIV><br />
-<![endif]-->
-<!--[if gt IE 7]>
-<div id="iesucks">
-WHOA HOLD UP!! dump.fm only works with Firefox, Chrome or Safari... sorry dude...
-</DIV><![endif]-->
-<!--[if gt IE 8]>
-According to the conditional comment this is Internet Explorer greater than 6<br />
-<![endif]-->
-</p>
+<!--[if IE]>
+<script>
+window.location.pathname = "/error/ie"
+</script>
+<![endif]-->
+\ No newline at end of file
diff --git a/template/log.st b/template/log.st
index 58e4e99..8af0154 100755..100644
--- a/template/log.st
+++ b/template/log.st
@@ -1,50 +1,48 @@
 <html>
-  <head>
-    <title>dump.fm log</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">  
-          <div id="lolbanner">
-            <img src="/static/welcomebanner.gif">
-          </div>
-          $if(dumpstest)$
-          HELLO
-            $dumpstest: {du | $du$ }$
-          $endif$
-          $if(dumps)$
-          $dumps: { d | $log_dump(dump=d)$ }$
-          $else$
-          No dumps!
-          $endif$
-          <div id="pnav">
-
-            $if(next)$
-            <div id="pnavn"><a href="/$roomkey$/log/$next$">next &#9758;</a></div> 
-            $endif$
-
+<head>
+  <title>dump.fm log</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">  
+        <div id="lolbanner">
+          <img src="/static/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="/$roomkey$/log/$next$">next &#9758;</a></div> 
+$endif$
             &nbsp;
-            $if(prev)$
-            <div id="pnavo">  <a href="/$roomkey$/log/$prev$">&#9756; prev</a>          </div>
-            $endif$
-
-            <br><br>
-          </div>
+$if(prev)$
+          <div id="pnavo">  <a href="/$roomkey$/log/$prev$">&#9756; prev</a>          </div>
+$endif$
+          <br><br>
         </div>
+      </div>
 
-        <div id="footer">
-	  $footer()$
-      </div></div>
-      
+      <div id="footer">
+$footer()$
+      </div>
+    </div>
   </body>
-</html>
+</html>
+\ No newline at end of file
diff --git a/template/log_dump.st b/template/log_dump.st
index 7a9435c..c772868 100644
--- a/template/log_dump.st
+++ b/template/log_dump.st
@@ -1,22 +1,18 @@
-$if(dump.tags)$
-<div class="logged-dump" id="message-$dump.message_id$" nick="$dump.nick$" tags="$dump.tags: { tag | $tag.nick$:$tag.tag$ }$">
+$if(dump.ztags)$
+  <div class="logged-dump" id="message-$dump.message_id$" nick="$dump.nick$" tags="$dump.tags: { tag | $tag.nick$:$tag.tag$ }$">
 $else$
-<div class="logged-dump" id="message-$dump.message_id$" nick="$dump.nick$">
+  <div class="logged-dump" id="message-$dump.message_id$" nick="$dump.nick$">
 $endif$
 
-    $dump.created_on$  -- by <b><a href="/u/$dump.nick$">$dump.nick$</b>
-
-
-  <div id="logavatar">
-  
-  $if(dump.avatar)$
-  <img height="50" width="50" src="$dump.avatar$" /> 
-  $else$  
-  <img height="50" width="50" src="/static/noinfo.png">  
-  $endif$
-  </div></a>
+$dump.created_on$  -- by <b><a href="/u/$dump.nick$">$dump.nick$</b>
+    <div id="logavatar">
+$if(dump.avatar)$
+      <img height="50" width="50" src="$dump.avatar$" /> 
+$else$  
+      <img height="50" width="50" src="/static/noinfo.png">  
+$endif$
+    </div></a>
   <div class="content">$dump.content$</div>
-  <hr />
-  $share_buttons()$
-  
-</div>
-\ No newline at end of file
+  <!-- <hr /> -->
+$share_buttons()$
+  </div>
+\ No newline at end of file
diff --git a/template/profile.st b/template/profile.st
index 918e659..918e659 100755..100644
--- a/template/profile.st
+++ b/template/profile.st
diff --git a/template/share_buttons.st b/template/share_buttons.st
index f446c43..4400fb3 100644
--- a/template/share_buttons.st
+++ b/template/share_buttons.st
@@ -1,7 +1,13 @@
 <div class="buttons">
-<img src="/static/thumbup.gif" class="fav" onclick="Like(this)">
-<img src="/static/share/tumblricon.png" class="share" onclick="Share.tumblr(this)">
-<img src="/static/share/fbbutton.png" class="share" onclick="Share.facebook(this)">
-<img src="/static/share/twittericon.png" class="share" onclick="Share.twitter(this)">
-<img src="/static/share/delishicon.png" class="share" onclick="Share.delicious(this)">
+$if(dump.favorited)$
+  <img src="/static/thumbup.colored.gif" class="thumb favorite" onclick="Tag.favorite(this)">
+$else$
+  <img src="/static/thumbup.gif" class="thumb" onclick="Tag.favorite(this)">
+$endif$
+  <span class="other-sites">
+    <img src="/static/share/tumblricon.png" class="share" onclick="Share.tumblr(this)">
+    <img src="/static/share/fbbutton.png" class="share" onclick="Share.facebook(this)">
+    <img src="/static/share/twittericon.png" class="share" onclick="Share.twitter(this)">
+    <img src="/static/share/delishicon.png" class="share" onclick="Share.delicious(this)">
+  </span>
 </div>
 \ No newline at end of file
author	tim b <timb@camcompu.home>	2010-04-03 20:36:43 -0700
committer	tim b <timb@camcompu.home>	2010-04-03 20:36:43 -0700
commit	1239bda75594f1338482f71054dbb6aa84538c86 (patch)
tree	c1497a1503ad46a1728559125e447d0581d4d04c /template
parent	f3d1b68e3919345c67be06cbd7e7bb61f67ffcbd (diff)