Merge branch 'master' of ssh://dump.fm/pichat/repo

author: Scott Ostler <scottbot9000@gmail.com> 2010-12-03 18:00:43 -0500
committer: Scott Ostler <scottbot9000@gmail.com> 2010-12-03 18:00:43 -0500
commit: 4ccea08b8edbd3440f23cee2730a62d4013dc6e0 (patch)
tree: 4ec5b32b9719c9fbdc629b06f324f43a1c0a9f62 /template
parent: 13541b84837c8f360e2ae825d81ae489691b9e14 (diff)
parent: 59af476f7d0c29319931102f05b7b6da63c5ee54 (diff)
9 files changed, 88 insertions, 38 deletions
diff --git a/template/3frames.st b/template/3frames.st
new file mode 100644
index 0000000..3fd00a8
--- /dev/null
+++ b/template/3frames.st
@@ -0,0 +1,15 @@
+<html><head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>dump.fm - Deal With It GIF Maker</title>
+    $head()$
+
+</head>
+
+<body onload='window.focus();' class="profile" style="margin:0px;">      $banner()$
+
+<div id="chatrap"><div id="dcontent"><div id="messagePane">
+<iframe src="http://3fram.es/" width="99%"height="99%"style="border:7px inset #ccc;margin:0px;"></iframe></div></div></div>
+
+         <div id="footerc">
+	  $footer()$
+	</div>
+</body></html>
+\ No newline at end of file
diff --git a/template/banner.st b/template/banner.st
index 615256f..6108c9a 100644
--- a/template/banner.st
+++ b/template/banner.st
@@ -3,8 +3,8 @@
     <div id="logoicons">
       <div id="logo7">
 	<div align="center">
-	  <img style="visibility:hidden;width:0px;height:0px;" border=0 width=0 height=0 />
-	  <a class="img_roll" href="$domain$"></a>
+	  
+	  <a href="$domain$"><img src="$domain$/static/img/sassoonlogo.gif"id="sassoon"></a>
 	</div>
       </div>
       <div class="white">
@@ -27,8 +27,8 @@
 	        <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;">
 		  <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame 
 	        </a>
-	        <!--     <a href="$domain$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> -->
-                <a href="$domain$/$user_nick$/favorites" onclick="pageTracker._trackEvent('button', 'banner-favs'); return true;"><img src="$domain$/static/img/thumbs/favsbaricon.png"/> Favs</a>
+	        <!--     <a href="$domain$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> 
+                <a href="$domain$/$user_nick$/favorites" onclick="pageTracker._trackEvent('button', 'banner-favs'); return true;"><img src="$domain$/static/img/thumbs/favsbaricon.png"/> Favs</a>-->
                 <a href="$domain$/browser" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Image Search</a>
 
 
@@ -39,6 +39,7 @@
                       <option>Tools</option>
                       <option value="http://bon.gs/tile/" target="_blank">Tile Tool</option>
                       <option value="http://dump.fm/m/oie">Online Image Editor</option>
+                        <option value="http://dump.fm/m/3frames">3fram.es</option>
                       <option value="http://dump.fm/m/dwi">Deal With It Maker</option>
                       <option value="http://dump.fm/m/pixlr">Pixlr(image editor)</option>
                       <option value="http://dump.fm/m/arcade">Arcade Font Maker</option>
diff --git a/template/fame2.st b/template/fame2.st
index 89739cd..debc13e 100644
--- a/template/fame2.st
+++ b/template/fame2.st
@@ -15,14 +15,14 @@
         
         <div id="userListp">
         <img src="http://dump.fm/static/img/halloffametrophy.gif" id="halltrophy">
-          <h2>Hall Of Fame </h2><br><h3>updated hourly</h3>   <br>
+          <h1 style="font-size:150%;">Hall Of Fame </h1><br><br>
           <form name="halltime"> <B>    VIEW BY     </B>
 <select style="font-size:14px;color:#000;font-family:verdana;background-color:#ffffff;font-weight:bold;" name="menu" onChange="location=document.halltime.menu.options[document.halltime.menu.selectedIndex].value;">
 <option value="#">DAY</option>
 <option value="#">WEEK</option>
 <option value="http://">ALL TIME</option>
 </select>
-</form>
+</form><br>
         </div>
 	<div id="messageList">
           $if(dumps)$
diff --git a/template/head.st b/template/head.st
index ad23a44..a3ff733 100644
--- a/template/head.st
+++ b/template/head.st
@@ -1,17 +1,17 @@
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <meta name="keywords" content="dump.fm,hot girls, hot guys, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board">
 <meta name="description" content="dump.fm - Talk with pictures!" />
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script>
-<script type="text/javascript" src="$domain$/static/js/jquery-ui-1.8.effects.min.js"></script>
+<!-- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> --->
+<script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script>
+
+<!-- <script type="text/javascript" src="$domain$/static/js/jquery-ui-1.8.effects.min.js"></script> -->
 <script type="text/javascript" src="$domain$/static/js/pichat.js"></script>
 <link rel="stylesheet" type="text/css" href="$domain$/static/css/dump.css">
 <script>Domain = "$domain$"</script>
 
 $if(!user_nick)$
-<link href="$domain$/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css">
+<link href="$domain$/static/css/front.css" media="screen, projection" rel="stylesheet" type="text/css">
 <script type="text/javascript" src="$domain$/static/js/popup.js"></script>
-
-
 $endif$
 
 $if(isadmin)$
diff --git a/template/popular_dump.st b/template/popular_dump.st
index 4709725..88e61c4 100644
--- a/template/popular_dump.st
+++ b/template/popular_dump.st
@@ -9,7 +9,7 @@ $dump.created_on$  - in <b><a href="http://$dump.key$.dump.fm">$dump.key$</a></b
 <div class="content">$dump.content$</div>
 <hr/>
 <div class="faver-list">
-$dump.count$ <img src="http://dump.fm/static/img/thumbs/heartfavedsm.gif"></span> $dump.favers: { f | <a href="http://dump.fm/$f.nick$/popular"><b>$f.nick$</b></a> &nbsp; }$
+$dump.count$ <img src="http://dump.fm/static/img/thumbs/heartfavedsm.gif"></span> $dump.favers: { nick | <a href="http://dump.fm/$nick$/popular"><b>$nick$</b></a> &nbsp; }$
 </div>
 $share_buttons()$
 </div>
diff --git a/template/profile.st b/template/profile.st
index 8d8a019..3aae2c2 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -50,14 +50,14 @@
           
 	  <br> <h3>contact info</h3>
           $if(contact)$
-	  <div id="contact" class="linkify">$contact$</div>
+	  <div id="contact" class="linkify-text">$contact$</div>
 	  $else$
           <img id="contact" src="/static/img/noinfo.png">
 	  $endif$            
 	  <br>
 	  <h3>bio</h3>
           $if(bio)$
-	  <div id="bio" class="linkify">$bio$</div>
+	  <div id="bio" class="linkify-text">$bio$</div>
 	  $else$
 	  <img id="bio" src="/static/img/noinfo.png">
 	  $endif$
@@ -74,8 +74,10 @@
   	<h2><a href="http://dump.fm/$nick$/log">$if(is_home)$ your $else$ $nick$'s$endif$ posts &#10145;</a></h2>
 	<hr>
 	<h2><a href="http://dump.fm/$nick$/favorites"> $if(is_home)$ your $else$ $nick$'s $endif$ favs &#10145;</a></h2>
-	<hr>
+	
+  <hr>
 	<a href="http://dump.fm/$nick$/popular"><h3> $if(is_home)$ your $else$ $nick$'s$endif$ most popular &#10145;</h3></a>
+  
       </div>
     <div id="dashpix">
 	<a href="http://dump.fm/$nick$/log"><div id="favstxt">$if(is_home)$ your $else$ $nick$'s$endif$ most recent dumps</div></a>
@@ -88,7 +90,23 @@
         style="border:none; width:500px; height:30px"></iframe>
               </div>
 
+    </div>
+    $if(isadmin)$
+    <br />
+    <div id="directmsgs">
+      <h2>Messages</h2>
+        $dms: { dm |
+        <div class="directmsg">
+        <b><a href="/$dm.nick$">$dm.nick$</a></b>
+        <img src="$dm.avatar$" height="20" width="20" />
+        <span class="linkify-full">$dm.content$</span>
       </div>
+      }$
+    </div>
+    <script>
+      var Recips = $recips$;
+    </script>
+    $endif$
     
     </div>
 <div id="footerc">
diff --git a/template/rooms/VIP.st b/template/rooms/VIP.st
index f078d0d..fa38eb5 100644
--- a/template/rooms/VIP.st
+++ b/template/rooms/VIP.st
@@ -110,6 +110,9 @@
       <div id="dcontent">
         <div id="messagetabs"></div>
           $messagepane()$
+        <script>
+          var Recips = $recips$;
+        </script>
       </div>
     </div>
     <div id="palette">
diff --git a/template/rooms/chat.st b/template/rooms/chat.st
index b96456a..f7ca888 100644
--- a/template/rooms/chat.st
+++ b/template/rooms/chat.st
@@ -110,6 +110,9 @@
       <div id="dcontent">
         <div id="messagetabs"></div>
           $messagepane()$
+        <script>
+          var Recips = $recips$;
+        </script>
       </div>
     </div>
     <div id="palette">
diff --git a/template/single_message.st b/template/single_message.st
index e017b6f..1428f2b 100644
--- a/template/single_message.st
+++ b/template/single_message.st
@@ -1,37 +1,47 @@
 <html>
   <head>
-    
     <title>dump.fm</title>
     $head()$
     <script>
       jQuery(document).ready(initLog);
     </script>
-    
-    
   </head>
   <body class="permalink">
     $banner()$
-      <div class="content"><br><br>
-          <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
-<br>   <a href="/$dump.nick$">
-$if(dump.avatar)$
-              <div style="border-image:url($dump.avatar$)">  
-                <div id="avatarPic">
-                  <img height="50" width="50" src="$dump.avatar$"></img>
-                </div>
-              <b>$dump.nick$</b>
-                <hr>
-              </div>
-$endif$
-            </a>
-            <div class="content">$dump.content$</div>
-            <hr />
-$share_buttons()$            
+    <div class="content"><br><br><br>
 
+      <div class="logged-dump dump $if(dump.favorited)$favorite$endif$" id="message-$dump.message_id$" nick="$dump.nick$">
+
+        <div id="profiletxt">
+                <a href="/$dump.nick$">
+        $if(dump.avatar)$
+        <div style="border-image:url($dump.avatar$)">  
+          <div id="avatarPic">
+            <img height="50" width="50" src="$dump.avatar$"></img>
           </div>
-        <div id="footerc">
-            $footer()$
+          <b>$dump.nick$</b>
+
+        </div>
+        $endif$
+      </a>
+          
+          $dump.created_on$  - in <b><a href="http://$dump.key$.dump.fm">$dump.key$</a></b>
+
         </div>
-      </div>
-  </body>
+
+
+        <div class="content">$dump.content$</div>
+        <hr/>
+        <div class="faver-list">
+          $dump.count$ <img src="http://dump.fm/static/img/thumbs/heartfavedsm.gif"></span> $dump.favers: { nick | <a href="http://dump.fm/$nick$/popular"><b>$nick$</b></a> &nbsp; }$
+</div>
+$share_buttons()$
+</div>
+
+
+<div id="footerc">
+  $footer()$
+</div>
+</div>
+</body>
 </html>
author	Scott Ostler <scottbot9000@gmail.com>	2010-12-03 18:00:43 -0500
committer	Scott Ostler <scottbot9000@gmail.com>	2010-12-03 18:00:43 -0500
commit	4ccea08b8edbd3440f23cee2730a62d4013dc6e0 (patch)
tree	4ec5b32b9719c9fbdc629b06f324f43a1c0a9f62 /template
parent	13541b84837c8f360e2ae825d81ae489691b9e14 (diff)
parent	59af476f7d0c29319931102f05b7b6da63c5ee54 (diff)