sostler PROD commit

29 files changed, 271 insertions, 62 deletions

diff --git a/static/css/dump.css b/static/css/dump.css
index 9d5f838..40e29c8 100755
--- a/static/css/dump.css
+++ b/static/css/dump.css
@@ -167,7 +167,7 @@ margin-right:374;
 	display:inline-block;
 	width:120px;
 height:35px;
-right:40px;
+right:260px;
 font-size:20px;
 background-image:url(/static/img/urlbutton.png);
 text-indent:27;
@@ -193,7 +193,7 @@ top:15px;
 	width:120px;
 height:35px;
 background-position:center;
-right:60;
+right:20;
 top:15px;
 padding-bottom:1;
 text-indent:28;
@@ -221,7 +221,7 @@ background-image:url(/static/img/cambutton.png);
 	width:120px;
 height:35px;
 background-position:center;
-right:60;
+right:20;
 top:15px;
 padding-bottom:4;
 	text-align:center;
@@ -285,7 +285,7 @@ border:1px solid #999;
 	width:120px;
 height:35px;
 background-position:center;
-right:180;
+right:140;
 top:15px;
 padding-bottom:1;
 text-indent:24;
@@ -321,19 +321,16 @@ opacity:1;
 }
 
 #palette-button {
-	border-top-right-radius:10px;
-	-webkit-border-top-right-radius:5px;
-	-moz-border-radius-topright:5px;
-	border-bottom-right-radius:5px;
-	-webkit-border-bottom-right-radius:5px;
-	-moz-border-radius-bottomright:5px;
+
 	border-radius:5px;
+background-image:url(/static/img/upbutton.png);
+background-position:top right;
 	position:absolute;
 /*	display:inline-block;*/
   display: none;
 	width:40px;
-  height:34px;
-  right:20px;
+  height:35px;
+  right:260px;
   top:15px;
   padding-bottom:1;
 	text-align:center;
diff --git a/static/css/header.css b/static/css/header.css
index 2caa474..4c64c72 100755
--- a/static/css/header.css
+++ b/static/css/header.css
@@ -34,13 +34,17 @@ margin-right:80%;
 	color: #fff;
 }
 
-
+	@font-face {  
+  font-family: dumparial ;  
+  src: url(/static/img/dumparial.ttf) format("truetype");  
+}  
 #header7{
 	background-image:url(/static/img/dblue2.png);
 	background-attachment:inherit;
 	margin: 0px auto -1px auto;
 	top: 0px;
 height:49;
+
 	position:fixed;
 background-position:7 -14;
 background-repeat:repeat-x;
@@ -297,7 +301,7 @@ img.chat-thumb {
 
 }
 .buttons .share {
-  opacity: 0.7;
+  opacity: 0.8;
 }
 .buttons .share:hover {
   opacity: 1;
@@ -307,19 +311,20 @@ img.chat-thumb {
 }
 img.thumb {
   position: absolute;
+image-rendering: -moz-crisp-edges;
   margin-left: 0px;
   margin-top: 0px;
-  height: 16px;
-  width: 16px;
-  right: 10px;
-  top: 10px;
+  height: 27px;
+  width: 27px;
+  right: 6px;
+  top: 3px;
   display: block;
 }
 .thumb.favorite {
   position: absolute;
   margin-left: 0px;
   margin-top: 0px;
-  height: 16px;
-  width: 16px;
+  height: 27px;
+  width: 27px;
   display: block;
 }
diff --git a/static/css/index.css b/static/css/index.css
index 680fe8a..24a28da 100644
--- a/static/css/index.css
+++ b/static/css/index.css
@@ -5,13 +5,56 @@ body {
 	background:#EEF2FF url(/static/img/fade-blue.png) top center repeat-x;
 	background-repeat:repeat-x;
 	background-position:top;
-  margin:6%;
+
+}
+#content{
+margin:6%;
 }
 #preload {
   position: absolute;
   left: 0px;
   top: 0px;
 }
+
+#panel {
+	padding: 10px 10px 10px 10px;
+	height: 600;
+	margin: 0 auto 0 auto;
+	display: none;
+
+}
+.slide {	margin: 0 auto 0 auto;
+	margin: 0;
+	padding: 0;
+border-top:1px solid #ccc;
+
+color:black;
+}
+.btn-slide {
+
+	text-align: center;
+	width: 144px;	margin: 0 auto 0 auto;
+	height: 0px;
+	padding: 5px 10px 0 0;
+	margin: 0 auto;
+	display: block;
+
+font-size:42%;
+	text-decoration: none;
+	text-align: center;
+	-webkit-border-bottom-left-radius:5px;
+	-webkit-border-bottom-right-radius:5px;
+	-moz-border-radius-bottomleft:5px;
+	-moz-border-radius-bottomright:5px;
+
+width:150;
+
+}
+
+.active {
+	background-position: right 12px;
+}
+
 #main {
 	width:460px;
 	margin: 0 auto 0 auto;
diff --git a/static/css/pages.css b/static/css/pages.css
index a24e102..f2b3fae 100644
--- a/static/css/pages.css
+++ b/static/css/pages.css
@@ -9,10 +9,7 @@ top:150;
   margin-left:auto;
   margin-right: auto ;
 
-#cats{
-background-image:url(/static/img/dumpcats2.png);
-}
-	
+
 
 }
 
diff --git a/static/css/profile.css b/static/css/profile.css
index 24c9af1..4429a91 100755
--- a/static/css/profile.css
+++ b/static/css/profile.css
@@ -6,6 +6,7 @@ height:auto;
 background-image:url(/static/img/upload.png);
 width:auto;
 padding:2;
+color:#fff;
 text-align:center;
 background-color:#0c8fff;
 border-bottom:1px solid #f0e0d6;
@@ -17,12 +18,12 @@ border-left:1px solid #f0e0d6;
 }
 #edit-toggle a{font-size:12;
 letter-spacing:;
-	text-shadow: 1px 1px 1px #ccc;
+
 color:#fff;
 }
 #edit-toggle a:hover{font-size:12;
 letter-spacing:;
-color:#fff;	text-shadow: 1px 1px 1px #ccc;
+
 }
    
    #profile {
@@ -70,6 +71,20 @@ background-image:url(/static/img/leftarrow.png);
 margin-top:-22;
 
 }
+#profile h7{
+margin-top:12;
+font-size:140%;
+letter-spacing:1.5;
+color:blue;
+text-transform:uppercase;
+font-weight:bold;
+display:inline-block;
+line-height:1.5;
+bottom:0;
+padding-bottom:10;
+position:absolute;
+text-shadow:#EEF2FF -1px -1px 1;
+}
 
 #logavatar img{
     max-width:20px;
diff --git a/static/img/bottomarrow.png b/static/img/bottomarrow.png
new file mode 100644
index 0000000..b9aeb47
--- /dev/null
+++ b/static/img/bottomarrow.png
diff --git a/static/img/btn-slide.gif b/static/img/btn-slide.gif
new file mode 100644
index 0000000..3a73530
--- /dev/null
+++ b/static/img/btn-slide.gif
diff --git a/static/img/dumparial.ttf b/static/img/dumparial.ttf
new file mode 100644
index 0000000..29b211e
--- /dev/null
+++ b/static/img/dumparial.ttf
diff --git a/static/img/favheart.gif b/static/img/favheart.gif
new file mode 100644
index 0000000..c22628d
--- /dev/null
+++ b/static/img/favheart.gif
diff --git a/static/img/palette.gif b/static/img/palette.gif
index ffe5b3e..5eeed2b 100644
--- a/static/img/palette.gif
+++ b/static/img/palette.gif
diff --git a/static/img/thumbs/chatheartover.gif b/static/img/thumbs/chatheartover.gif
new file mode 100644
index 0000000..e79d9cc
--- /dev/null
+++ b/static/img/thumbs/chatheartover.gif
diff --git a/static/img/thumbs/favheart.gif b/static/img/thumbs/favheart.gif
new file mode 100644
index 0000000..c22628d
--- /dev/null
+++ b/static/img/thumbs/favheart.gif
diff --git a/static/img/thumbs/heart.gif b/static/img/thumbs/heart.gif
new file mode 100644
index 0000000..241fb04
--- /dev/null
+++ b/static/img/thumbs/heart.gif
diff --git a/static/img/thumbs/heartfaved.gif b/static/img/thumbs/heartfaved.gif
new file mode 100644
index 0000000..e79d9cc
--- /dev/null
+++ b/static/img/thumbs/heartfaved.gif
diff --git a/static/img/thumbs/heartover.gif b/static/img/thumbs/heartover.gif
new file mode 100644
index 0000000..3385af9
--- /dev/null
+++ b/static/img/thumbs/heartover.gif
diff --git a/static/img/thumbs/pink.circle.gif b/static/img/thumbs/pink.circle.gif
index 19f6e6c..32f2ef5 100644
--- a/static/img/thumbs/pink.circle.gif
+++ b/static/img/thumbs/pink.circle.gif
diff --git a/static/img/thumbs/smallheart.gif b/static/img/thumbs/smallheart.gif
new file mode 100644
index 0000000..8d853ab
--- /dev/null
+++ b/static/img/thumbs/smallheart.gif
diff --git a/static/img/thumbs/smallheartfaved.gif b/static/img/thumbs/smallheartfaved.gif
new file mode 100644
index 0000000..0177b26
--- /dev/null
+++ b/static/img/thumbs/smallheartfaved.gif
diff --git a/static/img/thumbup.gif b/static/img/thumbup.gif
new file mode 100644
index 0000000..b039245
--- /dev/null
+++ b/static/img/thumbup.gif
diff --git a/static/img/white-arrow.gif b/static/img/white-arrow.gif
new file mode 100644
index 0000000..19ecebb
--- /dev/null
+++ b/static/img/white-arrow.gif
diff --git a/static/index.html b/static/index.html
index 8a24365..08b934e 100755
--- a/static/index.html
+++ b/static/index.html
@@ -11,11 +11,21 @@
 <script type="text/javascript" src="/static/js/jcarousellite_1.0.1.pack.js"></script>
 <script>
 $(document).ready(initLoginForm);
-jQuery(".auto .jCarouselLite").jCarouselLite({
-    auto: 800,
-    speed: 1000
+
+</script>  
+
+<script type="text/javascript">
+$(document).ready(function(){
+
+	jQuery(".btn-slide").click(function(){
+		jQuery("#panel").slideToggle("slow");
+		jQuery(this).toggleClass("active"); return false;
+	});
+	
+	 
 });
-</script>         
+</script>
+
 <link rel="stylesheet" type="text/css" href="static/css/reset.css">  
 <link rel="stylesheet" type="text/css" href="static/css/index.css">  
         <link rel="shortcut icon" href="static/favicon.ico">
@@ -23,7 +33,12 @@ jQuery(".auto .jCarouselLite").jCarouselLite({
 
 </head>
 <body>
+<div id="panel">
+<center><object width="600" height="450"><param name="allowfullscreen" value="true" /><param name="allowscriptaccess" value="always" /><param name="movie" value="http://vimeo.com/moogaloop.swf?clip_id=10819709&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;autoplay=1&amp;show_portrait=0&amp;color=ffffff&amp;fullscreen=1" /><embed src="http://vimeo.com/moogaloop.swf?clip_id=10819709&amp;server=vimeo.com&amp;show_title=0&amp;show_byline=0&amp;show_portrait=0&amp;color=ffffff&amp;autoplay=1&amp;fullscreen=1" type="application/x-shockwave-flash" allowfullscreen="true" allowscriptaccess="always" width="600" height="450"></embed></object></center>
+</div>
 
+<p class="slide"><a href="#" class="btn-slide">watch a lil video!</a>
+<div id="content">
 <div id="main" align="center">
   
   <img src="/static/img/flyhorse.gif" id="horse" />
@@ -61,14 +76,9 @@ jQuery(".auto .jCarouselLite").jCarouselLite({
   <img src="/static/img/valid_html.gif">
  
 </div>
-<div id="dumpednow" style="display:none;">
- <div class="carousel main"style="display:none;">
-            <a href="#" class="prev">&nbsp;</a>
-            <div style="visibility: visible; overflow: hidden; position: relative; z-index: 2; left: 0px; width: 420px;display:none;" class="jCarouselLite">
-            $.content$
-        </div></div></div>
+
             
-</div>
+</div></div>
 <div id="preload">
   <img src="/static/img/cursors/osx.hand.gif" class="no-cursor invisible" id="cursor-big">
 </div>
diff --git a/static/js/pichat.js b/static/js/pichat.js
index d5ffbee..886e2c1 100644
--- a/static/js/pichat.js
+++ b/static/js/pichat.js
@@ -7,21 +7,21 @@ var MaxImagePosts = 40
 
 // todo: preload these. also, look into image sprites (no go on animating their sizes tho)
 Imgs = {
-  "chatThumb": "/static/img/thumbs/color.right.gif",
-  "chatThumbBig": "/static/img/thumbs/color.right.4x.gif",
-  "chatThumbOff": "/static/img/thumbs/bw.right.gif",
-  "chatThumbDot": "/static/img/thumbs/pink.circle.gif",
-  "logThumb": "/static/img/thumbs/color.left.gif",
-  "logThumbBig": "/static/img/thumbs/color.left.4x.gif",
-  "logThumbOff": "/static/img/thumbs/bw.left.gif"
+  "chatThumb": "/static/img/thumbs/smallheartfaved.gif",
+  "chatThumbBig": "/static/img/thumbs/chatheartover.gif",
+  "chatThumbOff": "/static/img/thumbs/smallheart.gif",
+  "chatThumbDot": "/static/img/thumbs/smallheart.gif",
+  "logThumb": "/static/img/thumbs/heartfaved.gif",
+  "logThumbBig": "/static/img/thumbs/heartover.gif",
+  "logThumbOff": "/static/img/thumbs/heart.gif"
 }
 
 Anim = {
-    "chatThumbBig": {"width": "56px", "height": "60px", "right": "-35px", "bottom": "-10px"},
+    "chatThumbBig": {"width": "27px", "height": "27px", "right": "0px", "bottom": "2px"},
     "chatThumbTiny": {"width": "8px", "height": "8px", "right": "8px", "bottom": "8px"},
     "chatThumb": {"width": "16px", "height": "16px", "right": "4px", "bottom": "4px"},
-    "logThumb": {"width": "16px", "height": "16px", "marginLeft": "0px", "marginTop": "0px"},
-    "logThumbBig": {"width": "56px", "height": "60px", "marginLeft": "-40px", "marginTop": "-27px"}
+    "logThumb": {"width": "27px", "height": "27px", "marginRight": "0px", "marginTop": "0px"},
+    "logThumbBig": {"width": "64px", "height": "64px", "marginRight": "-20px", "marginTop": "-20px"}
 }
 
 // Utils
diff --git a/static/register.html b/static/register.html
index fe7f17e..0ce2911 100644
--- a/static/register.html
+++ b/static/register.html
@@ -41,15 +41,14 @@
           <span>password</span>
           <input type="password" class="field" id="passwordInput" />
           <br />
-          <span>password 2x</span>
+          <span>password2x</span>
           <input type="password" class="field" id="passwordInput2" />
       
         </h1>
         <h1><span>email</span>
           <input type="text" class="field"id="emailInput" />
         </h1>
- <div id="termz">   <input type="checkbox" name="terms" id="terms">
-                               I Agree to the <a href="http://dump.fm/terms">Terms of Service</a></label></div>
+
                            </form>
          
          <h1><br />
diff --git a/template/butt.st b/template/butt.st
index b14df64..e89a285 100644
--- a/template/butt.st
+++ b/template/butt.st
@@ -1 +1,141 @@
-Hi
+<html>
+  <head>
+    <title>$nick$'s dump.fm</title>
+    $head()$
+    <link rel="stylesheet" type="text/css" media="screen" href="/static/css/profile.css">
+    <script src="/static/js/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script>
+    <script src="/static/js/ajaxupload.js"></script>
+    <script>
+      jQuery(document).ready(initProfile);
+    </script> 
+    
+  </head>
+  <body>
+    $banner()$
+    <div id="chatrap">  
+      <div id="headerbar"></div>
+
+      <div id="log">
+        <div id="loghead">
+        </div>
+        <br>
+        <div id="posts">
+          
+          <div id="cats">
+            $if(dumps)$
+            <div id="lolbanner">
+              <img src="/static/img/welcomebanner.gif">
+            </div>
+            
+            $dumps:{ d | $profile_dump(dump=d)$ }$
+            <div id="profile">
+
+              <h2>$nick$</h2>
+              $if(avatar)$
+              <img id="avatarPic" src="$avatar$" width="150px"/>
+              $else$
+              <img id="avatarPic"><img src="/static/img/noinfo.png">
+              $endif$
+              
+              $if(is_home)$
+              <div id="avatar-editing" style="display: none">
+                <div id="avatar" class="editable">$avatar$</div>
+                <input id="upload" value="Upload Icon" type="submit">
+                <img id="spinner" src="/static/img/spinner.gif" style="display: none" />
+              </div>
+              $endif$
+              
+	      <h3>contact info</h3>
+              $if(contact)$
+	      <div id="contact" class="linkify">$contact$</div>
+	      $else$
+	      <div><img id="contact" src="/static/img/noinfo.png"></div>
+	      $endif$            
+	      <br>
+              
+	      <h3>bio</h3>
+              $if(bio)$
+	      <div id="bio" class="linkify">$bio$</div>
+	      $else$
+	      <div><img id="bio" src="/static/img/noinfo.png"></div>
+	      $endif$
+
+              $if(is_home)$
+              <br>
+              <div id="edit-toggle"><a href="#">edit profile</a></div>
+              $endif$
+
+              <br>
+              <div id="date">
+                <div type="text" id="datepicker"></div></div>
+	    </div>
+
+	    $else$
+	    <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>
+            <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>
+            <div id="newuser">
+              <h2>Welcome to dump.fm</h2>
+              <br><br>
+              
+              <h1>Step &#x2776;</h1>
+              <h3>&#x261F; Find a sweet image for your avatar, paste the URL below &#x261F;</h3>
+	      $if(avatar)$
+              <img id="avatarPic" src="$avatar$" width="150px"/>
+              $else$
+              <b id="avatarPic"></b>
+              $endif$
+              
+              $if(is_home)$
+              <div id="avatar-editing">
+                <div id="avatar" class="editable">$avatar$</div>
+                <input id="upload" value="Upload Icon" type="submit">
+                <img id="spinner" src="/static/img/spinner.gif" style="display: none" />
+              </div>
+              $endif$
+              
+              <h1>Step &#x2777;</h1>
+              <h3>&#x261F; Enter some contact info below &#x261F;</h3>
+              <div id="contact" class="$if(is_home)$editable$else$linkify$endif$">$contact$</div>
+              <br>
+              
+              <h1>Step &#x2778;</h1>
+              <h3>&#x261F; Enter some personal info below &#x261F;</h3>
+              <div id="bio" class="$if(is_home)$editable$else$linkify$endif$">$bio$</div>
+              <br>
+              <h1>Step &#x2779;</h1>
+              
+              <h3> <a href="/chat">Join the &#x2663; and start posting pictures!</a></h3>
+	      <h3>&nbsp;</h3></div>
+	    <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>	  
+            <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>
+	    <h3>&nbsp;</h3>
+	    $endif$
+            
+	    <p>&nbsp;</p>
+	    <div id="pnav">
+
+              $if(next)$
+              <div id="pnavn"><a href="/u/$nick$/$next$">next &#9758;</a></div> 
+              $endif$
+
+              &nbsp;
+              $if(prev)$
+              <div id="pnavo">  <a href="/u/$nick$/$prev$">&#9756; prev</a></div>
+              $endif$
+              
+              <br><br>
+            </div>
+
+            <div id="footer">
+              $footer()$
+            </div>
+          </div>
+    </div></div></div>
+  </body>
+</html>
diff --git a/template/chat.st b/template/chat.st
index a018174..422c640 100644
--- a/template/chat.st
+++ b/template/chat.st
@@ -60,11 +60,11 @@ $users: { u |
 $messages: { m |
             <div class="msgDiv oldmsg dump $if(m.favorited)$favorite$endif$" id="message-$m.message_id$" nick="$m.nick$">
               <span class="nick">
-                <b><a href="/u/$m.nick$">$m.nick$</a>:</b>
+                <b><a href="/u/$m.nick$">$m.nick$</a></b>
   $if(m.favorited)$
-    <img src="/static/img/thumbs/color.right.gif" class="chat-thumb" onclick="Tag.favorite(this)">
+    <img src="/static/img/thumbs/chatheartover.gif" class="chat-thumb" onclick="Tag.favorite(this)">
   $else$
-    <img src="/static/img/thumbs/pink.circle.gif" class="chat-thumb" onclick="Tag.favorite(this)">
+    <img src="/static/img/thumbs/smallheart.gif" class="chat-thumb" onclick="Tag.favorite(this)">
   $endif$ 
               </span>
             <span class="content">$m.content$</span>
diff --git a/template/log_dump.st b/template/log_dump.st
index 2f06e81..633338f 100644
--- a/template/log_dump.st
+++ b/template/log_dump.st
@@ -13,9 +13,9 @@ $else$
 $endif$
     </div></a>
 $if(dump.favorited)$
-  <img src="/static/img/thumbs/color.left.gif" class="thumb favorite" onclick="Tag.favorite(this)">
+  <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.favorite(this)">
 $else$
-  <img src="/static/img/thumbs/bw.left.gif" class="thumb" onclick="Tag.favorite(this)">
+  <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)">
 $endif$
   <div class="content">$dump.content$</div>
   <hr />
diff --git a/template/profile.st b/template/profile.st
index e89a285..2af0072 100644
--- a/template/profile.st
+++ b/template/profile.st
@@ -66,6 +66,9 @@
               $endif$
 
               <br>
+              
+         <a href="/u/$nick$/favorites"><h7>$nick$'s <br>Favorite Pix</h7></a>     
+              
               <div id="date">
                 <div type="text" id="datepicker"></div></div>
 	    </div>
diff --git a/template/profile_dump.st b/template/profile_dump.st
index b910274..adc47f3 100644
--- a/template/profile_dump.st
+++ b/template/profile_dump.st
@@ -11,9 +11,9 @@ $else$
 $endif$
   </div></a>
 $if(dump.favorited)$
-  <img src="/static/img/thumbs/color.left.gif" class="thumb favorite" onclick="Tag.favorite(this)">
+  <img src="/static/img/thumbs/heartover.gif" class="thumb favorite" onclick="Tag.favorite(this)">
 $else$
-  <img src="/static/img/thumbs/bw.left.gif" class="thumb" onclick="Tag.favorite(this)">
+  <img src="/static/img/thumbs/heart.gif" class="thumb" onclick="Tag.favorite(this)">
 $endif$
   <div class="content">$dump.content$</div>
 <hr/>
diff --git a/template/tagged_dumps.st b/template/tagged_dumps.st
index 037a52b..94b66e7 100644
--- a/template/tagged_dumps.st
+++ b/template/tagged_dumps.st
@@ -2,7 +2,7 @@
 <head>
   <title>dump.fm - $page_title$</title>
 $head()$
-  <link rel="stylesheet" type="text/css" href="/static/css/log.css">
+  <link rel="stylesheet" type="text/css" href="/static/css/directory.css">
   <script>
      jQuery(document).ready(initLog);
   </script>
@@ -31,11 +31,11 @@ $else$
 $endif$
         <div id="pnav">
 $if(next)$
-          <div id="pnavn"><a href="/$page_url$/$next$">next &#9758;</a></div> 
+          <div id="pnavo"><a href="/$page_url$/$next$">MOAR!</a></div> 
 $endif$
             &nbsp;
 $if(prev)$
-          <div id="pnavo">  <a href="/$page_url$/$prev$">&#9756; prev</a>          </div>
+          <div id="pnavn">  <a href="/$page_url$/$prev$">BACK</a>          </div>
 $endif$
           <br><br>
         </div>