diff options
| author | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2010-07-02 11:10:49 -0400 |
|---|---|---|
| committer | dumpfmprod <dumpfmprod@ubuntu.(none)> | 2010-07-02 11:10:49 -0400 |
| commit | e591afe4d4453e10344068dd5becd5aa4ed052c4 (patch) | |
| tree | e1f784ccd984abb412f9d8d83fd2a4e964398a03 /template | |
| parent | 2b19a20b2b9b6ce15c41c523bb10aa27a836eecc (diff) | |
sostler prod commit
Diffstat (limited to 'template')
| -rw-r--r-- | template/about_us.st | 2 | ||||
| -rw-r--r-- | template/banner.st | 9 | ||||
| -rw-r--r-- | template/cal.st | 14 | ||||
| -rw-r--r-- | template/dealwithit.st | 17 | ||||
| -rw-r--r-- | template/head.st | 21 | ||||
| -rw-r--r-- | template/help.st | 2 | ||||
| -rw-r--r-- | template/privacy.st | 2 | ||||
| -rw-r--r-- | template/req_reset.st | 8 | ||||
| -rw-r--r-- | template/search_files.st | 2 | ||||
| -rw-r--r-- | template/single_message.st | 2 | ||||
| -rw-r--r-- | template/terms.st | 7 |
11 files changed, 65 insertions, 21 deletions
diff --git a/template/about_us.st b/template/about_us.st index 93d1408..c731c77 100644 --- a/template/about_us.st +++ b/template/about_us.st @@ -73,7 +73,7 @@ You can shoot us an email at </div> <div id="hugescreen"><img src="/static/img/hugescreen.png"></div> - <div id="footer"> + <div id="footerc"> $footer()$ </div> </body> diff --git a/template/banner.st b/template/banner.st index cbd4639..ead29f2 100644 --- a/template/banner.st +++ b/template/banner.st @@ -12,6 +12,7 @@ <div style="float: left;"> <div align="center"> $if(user_nick)$ + <a href="$domain$/chat/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> <a href="$domain$/log" onclick="pageTracker._trackEvent('button', 'banner-log'); return true;"> <img src="$domain$/static/img/thumbs/logbaricon.png"/> Log</a> <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> @@ -24,6 +25,7 @@ </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> + $else$ <a href="/register" id="registerlink">The coolest way to share pictures. Click here to get started!</a> $endif$ @@ -71,3 +73,10 @@ $if(isadmin)$ $search_script()$ </script> $endif$ + +<div class="apple_overlay black" id="overlay"> +<center> + <iframe src ="http://dump.fm/static/cal.html"width="100%" height="100%" frameborder="1"> +</iframe> +</center> +</div>
\ No newline at end of file diff --git a/template/cal.st b/template/cal.st new file mode 100644 index 0000000..20781ea --- /dev/null +++ b/template/cal.st @@ -0,0 +1,14 @@ +<html><head> + <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <title>dump.fm - july calendar</title> + $head()$ + +</head> + +<body onload='window.focus();' class="profile"> $banner()$ + +<div id="chatrap"><div id="dcontent"><div id="messagePane"> +<iframe src="http://dump.fm/static/cal.html" width="100%"height="100%"></iframe></div></div></div> + <div id="footerc"> + $footer()$ + </div> +</body></html>
\ No newline at end of file diff --git a/template/dealwithit.st b/template/dealwithit.st index 91e268e..19f0127 100644 --- a/template/dealwithit.st +++ b/template/dealwithit.st @@ -108,19 +108,24 @@ text-decoration:none; </div> <div id="rapper"><center> <img src="http://dump.fm/images/20100622/1277238939818-dumpfm-ryder-dealwithitbanner.gif" class="slothbanner"><br> + <img src="http://dump.fm/images/20100625/1277486771560-dumpfm-neue-iphonedeal.gif"><br> <img src="http://dump.fm/images/20100601/1275432708585-dumpfm-noisia-teal-with-it.gif"><br> <img src="http://dump.fm/images/20100601/1275428600528-dumpfm-jeanette-marinadeal.gif"><br> <img src="http://dump.fm/images/20100623/1277314604000-dumpfm-ryder-beiberdealwirthit.gif"><br> - <img src="http://imgh.us/dill_with_it.gif"><br> + <img src="http://dump.fm/images/20100625/1277497030340-dumpfm-thekraken-untitled_vuvuzelawithit.gif"><br> <img src="http://dump.fm/images/20100601/1275428903719-dumpfm-noisia-deal-with-it-misplaced.gif"><br> <img src="http://dump.fm/images/20100601/1275384875039-dumpfm-jertronic-tuttl.gif"><br> + <img src="http://dump.fm/images/20100625/1277490581536-dumpfm-arielrebel-mealwithit.gif"><br> + <img src="http://dump.fm/images/20100625/1277488480570-dumpfm-haydiroket-deal.gif"><br> + <img src="http://dump.fm/images/20100625/1277490691498-dumpfm-capnskull-30_broken_wagon_wheel.gif"><br> + <img src="http://dump.fm/images/20100625/1277488846759-dumpfm-pixelfuck-Untitled-25.gif"><br> <img src="http://dump.fm/images/20100604/1275637155979-dumpfm-ryder-1275428499992-dumpfm-noisia-deal-with-it-pondercat.gif"><br> <img src="http://dump.fm/images/20100602/1275501379140-dumpfm-noisia-deal-with-it-twins.gif"><br> <img src="http://dump.fm/images/20100623/1277305489561-dumpfm-AGT528-faildealloop.gif"><br> <img src="http://dump.fm/images/20100623/1277304924854-dumpfm-ryder-rhiannadealwithit.gif"><br> <img src="http://dump.fm/images/20100601/1275429111424-dumpfm-noisia-deal-with-it-premie-pout.gif"><br> - + <img src="http://dump.fm/images/20100625/1277490499514-dumpfm-blubbyfort-double_down_deal.gif"><br> <img src="http://dump.fm/images/20100623/1277324893609-dumpfm-glasspopcorn-heelwithit.gif"><br> <img src="http://dump.fm/images/20100623/1277325063273-dumpfm-glasspopcorn-congealwithit.gif"><br> <img src="http://dump.fm/images/20100623/1277324378232-dumpfm-glasspopcorn-peelwithit.gif"><br> @@ -151,7 +156,7 @@ text-decoration:none; <img src="http://dump.fm/images/20100602/1275514162391-dumpfm-CelineDion-deadbabydealwithit.gif"><br> <img src="http://dump.fm/images/20100601/1275383910833-dumpfm-ryder-idgidealwithit.gif"><br> <img src="http://dump.fm/images/20100601/1275429723422-dumpfm-ryder-dealwithitbug.gif"><br> - + <img src="http://dump.fm/images/20100625/1277488125856-dumpfm-pixelfuck-Untitled-24.gif"><br> <img src="http://dump.fm/images/20100601/1275386468425-dumpfm-ryder-paypaldealwithit.gif"><br> <img src="http://dump.fm/images/20100411/1271039975904-dumpfm-stultissimus-dealwithityoshi.gif"><br> <img src="http://dump.fm/images/20100601/1275386117129-dumpfm-ryder-brokebackdealwithit.gif"><br> @@ -160,9 +165,10 @@ text-decoration:none; <img src="http://dump.fm/images/20100601/1275431434247-dumpfm-noisia-pauline-kael-with-it.gif"><br> <img src="http://dump.fm/images/20100620/1277091350600-dumpfm-soupykatz-tealwithitjerry.gif"><br> <img src="http://dump.fm/images/20100611/1276277188144-dumpfm-ryder-deawithit.gif"><br> - + <img src="http://dump.fm/images/20100625/1277481518395-dumpfm-haydiroket-billwithit.gif"><br> <img src="http://dump.fm/images/20100606/1275803751624-dumpfm-ryder-eelwithit.gif"><br> + <img src="http://dump.fm/images/20100606/1275803228991-dumpfm-ryder-NEILWITHIT.gif"><br> <img src="http://dump.fm/images/20100601/1275429882637-dumpfm-ryder-ALLYBEALWITHIT.gif"><br> <img src="http://dump.fm/images/20100604/1275631983360-dumpfm-ryder-SEALWITHIT.gif"><br> @@ -174,10 +180,7 @@ text-decoration:none; </center> </div> - <div id="footer" style="display:none;"> - $footer()$ - </div> <div id="footer"> $footer()$ diff --git a/template/head.st b/template/head.st index 1ebb8f8..7ff5828 100644 --- a/template/head.st +++ b/template/head.st @@ -3,8 +3,29 @@ <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 src="http://cdn.jquerytools.org/1.1.2/full/jquery.tools.min.js"></script> --> + +<script> +/* +jQuery(function() { + jQuery("a[rel]").overlay({ + expose: '#eee', + effect: 'apple', + onBeforeLoad: function() { + var wrap = this.getContent().find(".contentWrap"); + wrap.load(this.getTrigger().attr("href")); + } + + }); +}); +jQuery(function() { + jQuery("#triggers img[rel]").overlay({effect: 'apple'}); +}); +*/ +</script> <script type="text/javascript" src="$domain$/static/js/pichat.js"></script> <link rel="stylesheet" type="text/css" href="$domain$/static/css/dump.css"> + $if(!user_nick)$ <link href="$domain$/static/form_login/front.css" media="screen, projection" rel="stylesheet" type="text/css"> $endif$ diff --git a/template/help.st b/template/help.st index 3576d6f..e38bab7 100644 --- a/template/help.st +++ b/template/help.st @@ -64,7 +64,7 @@ background-attachment:fixed;" onload=" <div id="hugescreen"><img src="/static/img/hugescreen.png"></div> - <div id="footer"> + <div id="footerc"> $footer()$ </div> </body> diff --git a/template/privacy.st b/template/privacy.st index ef225c8..0bd8191 100644 --- a/template/privacy.st +++ b/template/privacy.st @@ -63,7 +63,7 @@ background-attachment:fixed;" onload=" </div> <div id="hugescreen"><img src="/static/hugescreen.png"></div> - <div id="footer"> + <div id="footerc"> $footer()$ </div> </body> diff --git a/template/req_reset.st b/template/req_reset.st index 936bc73..3ae73b9 100644 --- a/template/req_reset.st +++ b/template/req_reset.st @@ -6,7 +6,7 @@ $head()$ <style> #main { - padding: 100px 2em 0px 2em; + padding: 10px 2em 0px 2em; } label { float: left; @@ -54,14 +54,14 @@ $head()$ </head> <body> -<div id="rapper"></div> -<div id="content" style="z-index:77;"> +<div id="rapper"> + <div id="main" align="center"> <div id="passwordreset"> <div id="logo-and-text"> - <a href="/"><img src="/static/img/dumpclearlogo2.png"></a> + <a href="/"><img src="http://dump.fm/static/img/dumppixellarge3.png"></a> <div align="center"> diff --git a/template/search_files.st b/template/search_files.st index d3deea5..f49e7fb 100644 --- a/template/search_files.st +++ b/template/search_files.st @@ -7,7 +7,7 @@ h1 { width: 40%; display:inline-block; margin: 20px; font-size: 30px;} </style> </head> - <body> + <body class="profile"> <center>search dumps: <input type="text" name="search-query" id="search-query" /></center><br><br> <center><div id="message"></div><br><br></center> diff --git a/template/single_message.st b/template/single_message.st index 13c3ac0..e017b6f 100644 --- a/template/single_message.st +++ b/template/single_message.st @@ -11,7 +11,7 @@ </head> <body class="permalink"> $banner()$ - <div class="content"> + <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)$ diff --git a/template/terms.st b/template/terms.st index 9ca6067..d37a28c 100644 --- a/template/terms.st +++ b/template/terms.st @@ -50,10 +50,7 @@ background-attachment:fixed;" onload=" </div> </div> <div style="display:none;"id="link"> - <div id="content" name="content"> - - - </div> + </div> </div> @@ -61,7 +58,7 @@ background-attachment:fixed;" onload=" </div> <div id="hugescreen"><img src="/static/img/hugescreen.png"></div> - <div id="footer"> + <div id="footerc"> $footer()$ </div> </body> |
