From 9fd7bb2df6ea4ec14ab4b53f403738a7fc83f570 Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Tue, 4 May 2010 13:00:32 -0400 Subject: sostler prod commit --- static/css/index.css | 11 +- static/css/profile.css | 6 - static/img/idontgetit.jpg | Bin 6798391 -> 0 bytes static/index.html | 5 +- template/banner.st | 2 +- template/butt.st | 466 +++++++++++++++++----------------------------- template/chat.st | 4 +- template/directory.st | 2 +- template/log_dump.st | 2 +- template/logged_dump.st | 2 +- template/profile.st | 2 +- 11 files changed, 191 insertions(+), 311 deletions(-) delete mode 100644 static/img/idontgetit.jpg diff --git a/static/css/index.css b/static/css/index.css index e3c3cd6..1b99c1e 100644 --- a/static/css/index.css +++ b/static/css/index.css @@ -139,6 +139,7 @@ color:#fff; width:420px; margin:30px auto -1px auto; opacity:0.9; +z-index:4500; vertical-align: bottom; text-align:center; width:100%; @@ -234,11 +235,15 @@ line-height:-1; } label { - display: block; + display:inline-block; width: 300px; text-align: right; - font-size: 16px; + font-size: 12px; color: #222; +line-height:1.5; +margin-top:-3px; +margin-bottom:7px; } - +#remember{margin-top:-6px;} +#remember a{text-decoration:none;font-size:13px;margin-left:14px;color:#f0e;} diff --git a/static/css/profile.css b/static/css/profile.css index ee2566e..231cda0 100755 --- a/static/css/profile.css +++ b/static/css/profile.css @@ -104,12 +104,6 @@ margin-top:0; margin-left:auto; margin-right: auto ; - -#cats{ -background-image:url(/static/img/dumpcats2.png); -} - - } #upload{ diff --git a/static/img/idontgetit.jpg b/static/img/idontgetit.jpg deleted file mode 100644 index e8bd2c3..0000000 Binary files a/static/img/idontgetit.jpg and /dev/null differ diff --git a/static/index.html b/static/index.html index 1f6930f..5607607 100755 --- a/static/index.html +++ b/static/index.html @@ -60,10 +60,9 @@ $(document).ready(function() {
-
+
- Forgot your password?
+ Lost password?
diff --git a/template/banner.st b/template/banner.st index c954584..d67e36d 100644 --- a/template/banner.st +++ b/template/banner.st @@ -13,7 +13,7 @@ Log - $if(user_avatar)$$else$$endif$ Profile + $if(user_avatar)$$else$$endif$ Profile Directory Image Search diff --git a/template/butt.st b/template/butt.st index e97390e..b3f118f 100644 --- a/template/butt.st +++ b/template/butt.st @@ -1,302 +1,184 @@ - - - -dump.fm image vortex - - - - - - -$if(!user_nick)$ - -$endif$ + + + $nick$'s dump.fm + $head()$ + + + + + + + + $banner()$ +
+
-$if(isadmin)$ - - - - -$endif$ -$if(!user_avatar)$ - -$endif$ - - - - - -$if(user_nick)$ - +
+
+
+
+
+ +
+ $if(dumps)$ +
+ +
+ + $dumps:{ d | $profile_dump(dump=d)$ }$ +
+ +

$nick$

+ + $if(isadmin)$ + + $endif$ + + $if(avatar)$ + + $else$ + + $endif$ + + $if(is_home)$ + + $endif$ + +

contact info

+ $if(contact)$ +
$contact$
+ $else$ +
+ $endif$ +
+ +

bio

+ $if(bio)$ +
$bio$
+ $else$ +
+ $endif$ + + $if(is_home)$ +
+ + $endif$ + +
+ + $nick$'s
Favorite Pix + +
+
+
+ + $else$ + + +
You have 27 new favs!
+
You have 27 new favs!
+
blah blah

blah blah

blah blah

blah blah

blah blah

blah blah

blah blah

blah blah

+
+
+
+ $nick$'s first dump.fm post! +
+ +
+$if(dump.avatar)$ + +$else$ + $endif$ - +
+
+$share_buttons()$ +
+ +
+ +

$nick$

+ + $if(isadmin)$ + + $endif$ + + $if(avatar)$ + + $else$ + + $endif$ + + $if(is_home)$ + + $endif$ + +

contact info

+ $if(contact)$ +
$contact$
+ $else$ +
+ $endif$ +
+ +

bio

+ $if(bio)$ +
$bio$
+ $else$ +
+ $endif$ - - - - - - -
-$messages: { m | -$m.nick$ - }$ +
+ + $nick$'s
Favorite Pix + +
+
+
+ $endif$ + +

 

+
+ $if(next)$ + + $endif$ -
+   + $if(prev)$ + + $endif$ + +

+
- -Loading... - - - - + +
+
+ diff --git a/template/chat.st b/template/chat.st index 8c290b7..0b4ad10 100644 --- a/template/chat.st +++ b/template/chat.st @@ -46,7 +46,7 @@ $banner()$
$users: { u | -
+
$if(u.avatar)$ $else$ @@ -61,7 +61,7 @@ $banner()$ $messages: { m |