From c4041b4766f8afa0c462fbea2963b61bc43f0e08 Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Wed, 23 Jun 2010 15:33:32 -0400 Subject: sostler prod commit --- static/css/dump.css | 39 +++++++--- static/form_login/front.css | 17 +++-- static/img/grey.gif | Bin 0 -> 43 bytes static/index.html | 5 +- static/js/jquery.lazyload.js | 164 +++++++++++++++++++++++++++++++++++++++++++ template/dealwithit.st | 54 ++++++++++++-- template/fame.st | 3 +- template/log.st | 4 +- template/profile.st | 16 ++++- template/profilelog.st | 122 ++++++++++++++++++++++++++++++++ template/single_message.st | 5 +- template/slothgoth.st | 34 +++++++-- template/tagged_dumps.st | 3 +- template/userlog.st | 5 +- template/vortex.st | 8 ++- 15 files changed, 433 insertions(+), 46 deletions(-) create mode 100644 static/img/grey.gif create mode 100644 static/js/jquery.lazyload.js create mode 100644 template/profilelog.st diff --git a/static/css/dump.css b/static/css/dump.css index 706dbd3..c149794 100755 --- a/static/css/dump.css +++ b/static/css/dump.css @@ -1779,7 +1779,7 @@ padding-top:1px; text-transform:capitalize; } #middash{ -top:60px; +top:50px; position:absolute; margin-left:230px; } @@ -1837,23 +1837,24 @@ width:550px; #favstxt{ -margin-top:-55px; +margin-top:-70px; margin-left:-10; font-family: 'HelveticaNeue-Light','Helvetica Neue Light','Helvetica Neue',Arial,Helvetica,sans-serif; font-size:11px; background-color:white; +border:1px solid black; padding:7px; color:#000; position:absolute; text-transform:uppercase; -border:1px solid black; - border-radius: 5px; - box-shadow:5px 5px 5px #d8dbde; - -webkit-box-shadow:5px 5px 5px #d8dbde; - -moz-box-shadow:5px 5px 5px #d8dbde; - border-radius:5px; - -webkit-border-radius:5px; - -moz-border-radius:5px; +background-color:white; + box-shadow:2px 2px 2px #d8dbde; + -webkit-box-shadow:2px 2px 2px #d8dbde; + -moz-box-shadow:2px 2px 2px #d8dbde; + border-radius:10px; + -webkit-border-radius:10px; + -moz-border-radius:10px; + font-weight:bold; } #dashavatarPic img{ @@ -1886,4 +1887,22 @@ padding:1px; } .profiledash{ overflow:auto; +} +#mostrecentdumps{ +display:inline-block; +width:595px; +max-height:98px; +margin-left:-10px; +margin-top:-20px; +overflow:hidden; +} +#mostrecentdumps img{ +max-height:94px; +overflow:hidden; +border:1px solid #000; +} +#likebutton{ +position:absolute; +height:30px;left:255px; +bottom:30px; } \ No newline at end of file diff --git a/static/form_login/front.css b/static/form_login/front.css index 444c54b..8542a20 100644 --- a/static/form_login/front.css +++ b/static/form_login/front.css @@ -29,18 +29,20 @@ filter:alpha(opacity=90); text-shadow: #000 0px 0px 0px; padding:5px 5px 5px 5px; text-decoration:none; - background-color:#eee; + background-color:#fff; + -webkit-border-radius:4px;font-size:11px; -moz-border-radius:4px; border-radius:4px; - *background:transparent url("images/signin-nav-bg-ie.png") no-repeat 0 0; + *padding:4px 12px 6px; filter:alpha(opacity=80); } #login-container .topnav a.signin:hover { - *background:transparent url("images/signin-nav-bg-hover-ie.png") no-repeat 0 0; - *padding:4px 12px 6px;background-color:#ccc; + + *padding:4px 12px 16px; background-color:#ccc; + } #login-container .topnav a.signin, #login-container .topnav a.signin:hover { *background-position:0 3px!important;color:#000; @@ -48,25 +50,26 @@ filter:alpha(opacity=90); a.signin { position:relative; +cursor:pointer; margin-left:3px; } a.signin span { background-image:url("images/toggle_down_light.png"); background-repeat:no-repeat; background-position:100% 50%; - padding:4px 16px 6px 0; + padding:4px 16px 6px 0;cursor:pointer; } #login-container .topnav a.menu-open { background:#ddeef6!important; color:#666!important; text-shadow: #000 0px 0px 0px; - outline:none;box-shadow: 3px 2px 2px #ccc; + outline:none;box-shadow: 3px 2px 2px #ccc;cursor:pointer; -webkit-box-shadow: 3px 2px 2px #ccc; -moz-box-shadow: 3px 2px 2px #ccc; filter: progid:DXImageTransform.Microsoft.dropShadow(color=#ccc, offX=3, offY=4, positive=true); } -a.signin.menu-open span { +a.signin.menu-open span {cursor:pointer; background-image:url("images/toggle_up_dark.png"); color:#789; } diff --git a/static/img/grey.gif b/static/img/grey.gif new file mode 100644 index 0000000..8d74456 Binary files /dev/null and b/static/img/grey.gif differ diff --git a/static/index.html b/static/index.html index c8301b2..a9044ee 100644 --- a/static/index.html +++ b/static/index.html @@ -38,6 +38,7 @@ jQuery(window).load(function() { diff --git a/static/js/jquery.lazyload.js b/static/js/jquery.lazyload.js new file mode 100644 index 0000000..276e988 --- /dev/null +++ b/static/js/jquery.lazyload.js @@ -0,0 +1,164 @@ +/* + * Lazy Load - jQuery plugin for lazy loading images + * + * Copyright (c) 2007-2009 Mika Tuupola + * + * Licensed under the MIT license: + * http://www.opensource.org/licenses/mit-license.php + * + * Project home: + * http://www.appelsiini.net/projects/lazyload + * + * Version: 1.5.0 + * + */ +(function($) { + + $.fn.lazyload = function(options) { + var settings = { + threshold : 0, + failurelimit : 0, + event : "scroll", + effect : "show", + container : window + }; + + if(options) { + $.extend(settings, options); + } + + /* Fire one scroll event per scroll. Not one scroll event per image. */ + var elements = this; + if ("scroll" == settings.event) { + $(settings.container).bind("scroll", function(event) { + + var counter = 0; + elements.each(function() { + if ($.abovethetop(this, settings) || + $.leftofbegin(this, settings)) { + /* Nothing. */ + } else if (!$.belowthefold(this, settings) && + !$.rightoffold(this, settings)) { + $(this).trigger("appear"); + } else { + if (counter++ > settings.failurelimit) { + return false; + } + } + }); + /* Remove image from array so it is not looped next time. */ + var temp = $.grep(elements, function(element) { + return !element.loaded; + }); + elements = $(temp); + }); + } + + this.each(function() { + var self = this; + + /* Save original only if it is not defined in HTML. */ + if (undefined == $(self).attr("original")) { + $(self).attr("original", $(self).attr("src")); + } + + if ("scroll" != settings.event || + undefined == $(self).attr("src") || + settings.placeholder == $(self).attr("src") || + ($.abovethetop(self, settings) || + $.leftofbegin(self, settings) || + $.belowthefold(self, settings) || + $.rightoffold(self, settings) )) { + + if (settings.placeholder) { + $(self).attr("src", settings.placeholder); + } else { + $(self).removeAttr("src"); + } + self.loaded = false; + } else { + self.loaded = true; + } + + /* When appear is triggered load original image. */ + $(self).one("appear", function() { + if (!this.loaded) { + $("") + .bind("load", function() { + $(self) + .hide() + .attr("src", $(self).attr("original")) + [settings.effect](settings.effectspeed); + self.loaded = true; + }) + .attr("src", $(self).attr("original")); + }; + }); + + /* When wanted event is triggered load original image */ + /* by triggering appear. */ + if ("scroll" != settings.event) { + $(self).bind(settings.event, function(event) { + if (!self.loaded) { + $(self).trigger("appear"); + } + }); + } + }); + + /* Force initial check if images should appear. */ + $(settings.container).trigger(settings.event); + + return this; + + }; + + /* Convenience methods in jQuery namespace. */ + /* Use as $.belowthefold(element, {threshold : 100, container : window}) */ + + $.belowthefold = function(element, settings) { + if (settings.container === undefined || settings.container === window) { + var fold = $(window).height() + $(window).scrollTop(); + } else { + var fold = $(settings.container).offset().top + $(settings.container).height(); + } + return fold <= $(element).offset().top - settings.threshold; + }; + + $.rightoffold = function(element, settings) { + if (settings.container === undefined || settings.container === window) { + var fold = $(window).width() + $(window).scrollLeft(); + } else { + var fold = $(settings.container).offset().left + $(settings.container).width(); + } + return fold <= $(element).offset().left - settings.threshold; + }; + + $.abovethetop = function(element, settings) { + if (settings.container === undefined || settings.container === window) { + var fold = $(window).scrollTop(); + } else { + var fold = $(settings.container).offset().top; + } + return fold >= $(element).offset().top + settings.threshold + $(element).height(); + }; + + $.leftofbegin = function(element, settings) { + if (settings.container === undefined || settings.container === window) { + var fold = $(window).scrollLeft(); + } else { + var fold = $(settings.container).offset().left; + } + return fold >= $(element).offset().left + settings.threshold + $(element).width(); + }; + /* Custom selectors for your convenience. */ + /* Use as $("img:below-the-fold").something() */ + + $.extend($.expr[':'], { + "below-the-fold" : "$.belowthefold(a, {threshold : 0, container: window})", + "above-the-fold" : "!$.belowthefold(a, {threshold : 0, container: window})", + "right-of-fold" : "$.rightoffold(a, {threshold : 0, container: window})", + "left-of-fold" : "!$.rightoffold(a, {threshold : 0, container: window})" + }); + +})(jQuery); diff --git a/template/dealwithit.st b/template/dealwithit.st index 903ad71..00472a5 100644 --- a/template/dealwithit.st +++ b/template/dealwithit.st @@ -1,6 +1,7 @@ - + + dump.fm - deal with it + + + + + -
deal with it on dump.fm

A Collection of images that 'deal with it' by users of dump.fm.

Click Here to download the deal with it photoshop template.

Return Home
+
deal with it on dump.fm

A Collection of images that 'deal with it' by users of dump.fm.

Click Here to download the deal with it photoshop template.

Return Home

+ + +
+ +
+


+
+
+

+


- - +
+


+
+
+
+
+
+





+



@@ -112,7 +148,7 @@ text-decoration:none;


-
+


@@ -138,6 +174,10 @@ text-decoration:none; + \ No newline at end of file diff --git a/template/fame.st b/template/fame.st index 52bceb3..9742362 100644 --- a/template/fame.st +++ b/template/fame.st @@ -10,9 +10,8 @@ $banner()$
-
-
+
diff --git a/template/log.st b/template/log.st index 9e1c140..5c44f4e 100644 --- a/template/log.st +++ b/template/log.st @@ -10,9 +10,7 @@ $banner()$
-
-
-
+
diff --git a/template/profile.st b/template/profile.st index c36a803..97fcfa8 100644 --- a/template/profile.st +++ b/template/profile.st @@ -1,6 +1,9 @@ $nick$'s dump.fm + + + $head()$ @@ -67,7 +70,8 @@ $endif$
-
+
+

$dump_cnt$ dumps ➡

$dumps_user_faved_cnt$ dumps Faved ➡

@@ -75,11 +79,19 @@

$if(score_ent)$ $score$ $else$ 0 $endif$ of $if(is_home)$ your $else$ $nick$'s$endif$ dumps Faved

-
$nick$'s most recent dumps
+
$if(is_home)$ your $else$ $nick$'s$endif$ most recent dumps
$dumps: { d | $dash_dump(dump=d)$ }$
+ +
+ +
+
+
$footer()$ diff --git a/template/profilelog.st b/template/profilelog.st new file mode 100644 index 0000000..7189377 --- /dev/null +++ b/template/profilelog.st @@ -0,0 +1,122 @@ + + + $nick$'s dump.fm + $head()$ + + + + + + + + + $banner()$ +
+ + +
+

$if(is_home)$
$endif$ +

+ $if(avatar)$ + + $else$

+ + $endif$ + + $nick$


+ $if(score_ent)$ + + fav score: $score$ + $score_ent$ + $endif$ + $if(isadmin)$

+ + $endif$ + +
dumps posted: $dump_cnt$
+
dumps $nick$ faved: $dumps_user_faved_cnt$
+ + $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 + +
+
+
+ +
+
+ + $if(dumps)$ + $dumps:{ d | $profile_dump(dump=d)$ }$ + + + + + + + + $else$ + no dumps + $endif$ +
+ + + +
+
+ + $if(prev)$ + + $else$ + + $endif$ + + $if(next)$ + + $else$ + + $endif$ + + +
+
+ $footer()$ +
+
+
+ + diff --git a/template/single_message.st b/template/single_message.st index 8e694e6..79ef06f 100644 --- a/template/single_message.st +++ b/template/single_message.st @@ -13,10 +13,7 @@ $banner()$
-
-
-
- +

$if(message.avatar)$ diff --git a/template/slothgoth.st b/template/slothgoth.st index 7bfbd5b..127fcd2 100644 --- a/template/slothgoth.st +++ b/template/slothgoth.st @@ -8,9 +8,12 @@ + + body{margin:0px; background-color:#fff; font-family:Arial, Helvetica, sans-serif; background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x; + background-attachment:fixed; } .memes{overflow:auto;} #rapper{ @@ -38,10 +41,11 @@ color:#000; font-size:11px; word-spacing:30px; margin: 0 auto 0 auto; -background-color:#eff5fb; -margin-top:250px; width:798px; } +#footer a{ +text-decoration:none; +} #infotxt{ font-family: 'courier new', typewriter, matrix, monospace; line-height:15px; @@ -77,10 +81,32 @@ text-decoration:none; } + + + + + + - +
Sloth Goth on dump.fm

A Collection of Sloth Goth Related images made by users of dump.fm

Return Home

+
+ +
+ +

@@ -142,7 +168,7 @@ text-decoration:none;
-