From e03dedba4c113a87d35e5ddf00e8ccf9acfc760b Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Mon, 1 Feb 2010 15:14:30 -0500 Subject: timb merging ryder's changes --- static/bwdump.gif | Bin 0 -> 3309 bytes static/bwdump.png | Bin 0 -> 2213 bytes static/dumpfun.png | Bin 0 -> 27670 bytes static/dumpfunover.gif | Bin 0 -> 13818 bytes static/dumpmod1.png | Bin 0 -> 3004 bytes static/favicon.ico | Bin 1406 -> 1406 bytes static/flyhorse.gif | Bin 0 -> 145367 bytes static/fundump.png | Bin 0 -> 33408 bytes static/hugedump2.png | Bin 0 -> 20983 bytes static/index.html | 213 ++++++++++++++----------- static/jquery.editinplace.1.0.1.packed.js | 2 +- static/js/register.js | 2 +- static/modbar.png | Bin 0 -> 2309 bytes static/modbarover.png | Bin 0 -> 4540 bytes static/profile.css | 56 +++++-- static/register.html | 181 ++++++++++----------- static/register2.html | 256 ++++++++++++++++++++++++++++++ static/search/browser.html | 2 +- template/profile.st | 17 +- 19 files changed, 523 insertions(+), 206 deletions(-) create mode 100644 static/bwdump.gif create mode 100644 static/bwdump.png create mode 100644 static/dumpfun.png create mode 100644 static/dumpfunover.gif create mode 100644 static/dumpmod1.png mode change 100755 => 100644 static/favicon.ico create mode 100644 static/flyhorse.gif create mode 100644 static/fundump.png create mode 100644 static/hugedump2.png create mode 100644 static/modbar.png create mode 100644 static/modbarover.png mode change 100755 => 100644 static/register.html create mode 100755 static/register2.html diff --git a/static/bwdump.gif b/static/bwdump.gif new file mode 100644 index 0000000..4702c11 Binary files /dev/null and b/static/bwdump.gif differ diff --git a/static/bwdump.png b/static/bwdump.png new file mode 100644 index 0000000..a60e719 Binary files /dev/null and b/static/bwdump.png differ diff --git a/static/dumpfun.png b/static/dumpfun.png new file mode 100644 index 0000000..29a5f74 Binary files /dev/null and b/static/dumpfun.png differ diff --git a/static/dumpfunover.gif b/static/dumpfunover.gif new file mode 100644 index 0000000..25d5e77 Binary files /dev/null and b/static/dumpfunover.gif differ diff --git a/static/dumpmod1.png b/static/dumpmod1.png new file mode 100644 index 0000000..4e5fd6e Binary files /dev/null and b/static/dumpmod1.png differ diff --git a/static/favicon.ico b/static/favicon.ico old mode 100755 new mode 100644 index 6dd74d1..5d63dd0 Binary files a/static/favicon.ico and b/static/favicon.ico differ diff --git a/static/flyhorse.gif b/static/flyhorse.gif new file mode 100644 index 0000000..ae9d2ad Binary files /dev/null and b/static/flyhorse.gif differ diff --git a/static/fundump.png b/static/fundump.png new file mode 100644 index 0000000..e5db562 Binary files /dev/null and b/static/fundump.png differ diff --git a/static/hugedump2.png b/static/hugedump2.png new file mode 100644 index 0000000..8a15277 Binary files /dev/null and b/static/hugedump2.png differ diff --git a/static/index.html b/static/index.html index 8ee70db..38d4977 100755 --- a/static/index.html +++ b/static/index.html @@ -4,8 +4,29 @@ - @@ -15,6 +36,12 @@ @@ -181,8 +205,7 @@ body {
-


-

+
@@ -190,31 +213,35 @@ body {
-
+
+ +

-


-

-

 

-

 

-

Talk with pictures.

+
+

+ +

Talk with pictures!

+
+
+
Right now dump.fm is invite only...
+ If you have registration code, click here!
+
+

 

-


+



- +

 

 

-
-
- -
+
diff --git a/static/jquery.editinplace.1.0.1.packed.js b/static/jquery.editinplace.1.0.1.packed.js index 7b6fe5e..4f505b0 100755 --- a/static/jquery.editinplace.1.0.1.packed.js +++ b/static/jquery.editinplace.1.0.1.packed.js @@ -138,7 +138,7 @@ jQuery.fn.editInPlace = function(options) { if (settings.field_type == "textarea") { - var use_field_type = ''; + var use_field_type = ''; } else if(settings.field_type == "text") { diff --git a/static/js/register.js b/static/js/register.js index a2954e5..682efcb 100755 --- a/static/js/register.js +++ b/static/js/register.js @@ -14,7 +14,7 @@ function submitRegistration() { var password = $('#passwordInput').val() || ""; var code = $('#codeInput').val(); if ($.inArray(code.toUpperCase(), ValidCodes) == -1) { - alert("Bad registration code! Better ask someone cool for one." ); + alert("Bad registration code! Try again dude...." ); return; } if (nick.length < 3) { diff --git a/static/modbar.png b/static/modbar.png new file mode 100644 index 0000000..6522fb8 Binary files /dev/null and b/static/modbar.png differ diff --git a/static/modbarover.png b/static/modbarover.png new file mode 100644 index 0000000..3d3be48 Binary files /dev/null and b/static/modbarover.png differ diff --git a/static/profile.css b/static/profile.css index f146e60..0c6c71e 100755 --- a/static/profile.css +++ b/static/profile.css @@ -199,7 +199,6 @@ margin-top:20; } .editable { color: #0AA; - width:250px; } .editing { color: #F0F; @@ -207,19 +206,29 @@ margin-top:20; div#avatar { overflow: hidden; text-overflow: ellipsis; - max-width: 160px; - padding-bottom:40px; + + padding-bottom:20px; } - #contact { - max-width: 200px; - + #contact { + + text-overflow: ellipsis-word; } #bio { - max-width: 200px; + text-overflow: ellipsis-word; } + + input.inplace_field { + width: 100%; + } + + textarea.inplace_field { + width: 100%; + height: 50px; + } + h2 { letter-spacing:-1px; @@ -253,7 +262,7 @@ color:#087cff; #newuser - {height:400px; + {height:100%; border-top-left-radius:5px; border-top-right-radius:5px; @@ -269,22 +278,39 @@ color:#087cff; -moz-border-radius-bottomright:5px; box-shadow: 15px 15px 10px #c8cbce; -webkit-box-shadow: 15px 15px 10px #c8cbce; --moz-box-shadow: 5px 5px 10px #c8cbce; +-moz-box-shadow: 5px 5px 100px #c8cbce; padding:20; color:#; line-height:1.5; -margin-top:-80px; +margin-top:-100px; width:600; background:#EEF2FF url(/static/fade-blue.png) top center repeat-x; background-repeat:repeat-x; background-position:top; -margin-left:40} - #newuser a:link{text-size:30px;} -#newuser h1{font-size:30; +margin-left:70} + + #newuser a{font-size:20; +line-height:2; + +letter-spacing:-1; +color:#f0e; + +} + +#newuser h1{font-size:40; letter-spacing:-2; -color:f0e; +color:#000; +text-indent:-5; +text-align:left;font-family:serif; } - +#newuser h2{font-size:52; +margin-top:-10; +color:#fff; +text-transform:lowercase; +letter-spacing:-5; +text-align:center; + +} #date{ font-size:60%; } diff --git a/static/register.html b/static/register.html old mode 100755 new mode 100644 index b398b6f..ce222e1 --- a/static/register.html +++ b/static/register.html @@ -1,19 +1,25 @@ - - - - - - - + + + + + + dump.fm + + - -
-
-
-
-


-

-
-
-

+ + + + +
+
+
+
+
+ +
+

-


-

-
-

 

-

 

-

Talk with pictures. -


-

-
+

+ +

 

username @@ -225,32 +236,24 @@ body {

-

registration code +

regcode

-

 

+


- +
-
-
-
-
- -
- -
- \ No newline at end of file + diff --git a/static/register2.html b/static/register2.html new file mode 100755 index 0000000..b398b6f --- /dev/null +++ b/static/register2.html @@ -0,0 +1,256 @@ + + + + + + + + + + + + + dump.fm + + + +
+
+ +
+ + + +
+


+

+
+ +
+

+
+
+
+ +
+ +


+

+
+

 

+

 

+

Talk with pictures. +


+

+
+
+

 

+

username + +
+ + password + +

+

email + +

+ +

registration code + +

+ +

 

+


+ +

+
+ + +
+
+
+
+
+
+ + + + + + + + +
+ + + \ No newline at end of file diff --git a/static/search/browser.html b/static/search/browser.html index 917294f..f1fa8f6 100755 --- a/static/search/browser.html +++ b/static/search/browser.html @@ -319,7 +319,7 @@ background-image:url(/static/bg-btn-blue.png); function keepResult(res) { $.ajax({ - type: 'GET', + type: 'POST', timeout: 5000, url: '/msg', data: { 'room': 'RoomA', 'content': res.unescapedUrl }, diff --git a/template/profile.st b/template/profile.st index 20ba72c..e71e2bd 100755 --- a/template/profile.st +++ b/template/profile.st @@ -91,27 +91,32 @@

 

☺✌ Welcome to dump.fm ✌☺

-


+

-

❶ Find a cool image you want as your avatar

- To get started join in and post a few pictures. +

Step ❶

+

☟ Find a sweet image for your avatar, paste the URL below ☟

$if(avatar)$ $else$ - No avatar + $endif$ $if(is_home)$
$avatar$
$endif$ -

contact info

+

Step ❷

+

☟ Enter some contact info below ☟

$contact$

-

personal info

+

Step ❸

+

☟ Enter some personal info below ☟

$bio$

+

Step ❹

+ +

Join the ♣ and start posting pictures!

 

 

 

-- cgit v1.2.3-70-g09d2