From 2b6c2cef9a3398dbafb1f6cfbc0323c0b83e2053 Mon Sep 17 00:00:00 2001 From: dumpfmprod Date: Sun, 21 Feb 2010 18:57:29 -0500 Subject: Added PROD changes --- static/browsertool.gif | Bin 4583 -> 6231 bytes static/cloudbar.png | Bin 0 -> 56423 bytes static/cloudbar2.png | Bin 0 -> 27560 bytes static/cloudbar3.png | Bin 0 -> 88316 bytes static/header.css | 6 +- static/index.html | 4 +- static/noinfo.png | Bin 0 -> 52768 bytes static/pichat.css | 57 ++++++----- static/profile.css | 15 ++- static/search/browser.html | 2 +- static/webcam/register.html | 233 ++++++++++++++++++++++++++++++++++++++++++++ static/webcam/webcam.js | 3 + template/banner.st | 2 +- template/browser.st | 2 +- template/chat.st | 31 ------ template/form_login.st | 2 +- template/profile.st | 23 ++--- 17 files changed, 304 insertions(+), 76 deletions(-) create mode 100644 static/cloudbar.png create mode 100644 static/cloudbar2.png create mode 100644 static/cloudbar3.png create mode 100644 static/noinfo.png create mode 100644 static/webcam/register.html diff --git a/static/browsertool.gif b/static/browsertool.gif index e3dc960..9777d27 100644 Binary files a/static/browsertool.gif and b/static/browsertool.gif differ diff --git a/static/cloudbar.png b/static/cloudbar.png new file mode 100644 index 0000000..e4e6893 Binary files /dev/null and b/static/cloudbar.png differ diff --git a/static/cloudbar2.png b/static/cloudbar2.png new file mode 100644 index 0000000..ac4d1c8 Binary files /dev/null and b/static/cloudbar2.png differ diff --git a/static/cloudbar3.png b/static/cloudbar3.png new file mode 100644 index 0000000..aca0f05 Binary files /dev/null and b/static/cloudbar3.png differ diff --git a/static/header.css b/static/header.css index 1aa1d1c..5ad2fbc 100755 --- a/static/header.css +++ b/static/header.css @@ -73,17 +73,17 @@ margin-top:2; color: #fff; } #logout7{ - top:-2px; + top:-1px; position:relative; font-size:12px; - margin-right: 3px; + margin-right: 5px; float:right; z-index: 999; font-family: Arial, Helvetica, sans-serif; font-weight: normal; } -#logout7 a{font-size:11px;text-shadow: 1px 1px 4px #000; +#logout7 a{font-size:11px; } #logout7 a:hover{font-size:11px; } diff --git a/static/index.html b/static/index.html index c3006af..a7e896a 100755 --- a/static/index.html +++ b/static/index.html @@ -76,8 +76,8 @@ body { } #customer { position: absolute; - left: -80px; - top: -65px; + left: -90px; + top: -75px; z-index: 10; } diff --git a/static/noinfo.png b/static/noinfo.png new file mode 100644 index 0000000..a80724a Binary files /dev/null and b/static/noinfo.png differ diff --git a/static/pichat.css b/static/pichat.css index 1e4a4f3..f01a150 100755 --- a/static/pichat.css +++ b/static/pichat.css @@ -117,22 +117,16 @@ filter: progid:DXImageTransform.Microsoft.dropShadow(color=#eee, offX=3, offY=4, z-index:100; } #msginputrapper{ -margin-right:359; +margin-right:374; } #msgSubmit { - 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; + position:absolute; display:inline-block; width:120px; height:35px; -right:240px; +right:255px; font-size:20px; background-image:url(/static/urlbutton.png); text-indent:27; @@ -159,7 +153,7 @@ top:15px; width:120px; height:35px; background-position:center; -right:0; +right:15; top:15px; padding-bottom:1; text-indent:28; @@ -186,17 +180,16 @@ background-image:url(/static/cambutton.png); width:120px; height:35px; background-position:center; -right:0; +right:15; top:15px; -padding-bottom:1; +padding-bottom:4; text-align:center; z-index:100; cursor:pointer; background-color:yellow; - font-size:16px; + font-size:17px; color:#fff; background-image:url(/static/bg-btn-red.png); - text-shadow:1px 1px 3px rgba(0,0,0,1); } #webcam-button-snap.blink{ @@ -206,17 +199,37 @@ background-image:url(/static/bg-btn-red.png); #webcam-button-close { /* 16 x 14 */ position: fixed; - bottom: 300px; /* 240 + 68 - (16 / 2) */ - right: 313px; /* 320 - (14 / 2) */ + bottom: 330px; /* 240 + 68 - (16 / 2) */ + right: 335px; /* 320 - (14 / 2) */ z-index: 5001; +border:1px solid #000; + box-shadow: 3px 4px 4px #c8cbce; +-webkit-box-shadow: 3px 4px 4px #c8cbce; +-moz-box-shadow: 3px 4px 4px #c8cbce; cursor: pointer; } #webcam-preview { position:fixed; - bottom: 68px; - right:0; - z-index:5000 + bottom: 82; +opacity:0.9; + right:30; + box-shadow: 3px 4px 4px #c8cbce; +-webkit-box-shadow: 3px 4px 4px #c8cbce; +-moz-box-shadow: 3px 3px 4px #c8cbce; + border-top-right-radius:5px; + background-color:#FFF; + -webkit-border-top-right-radius:5px; + -moz-border-radius-topleft:5px; + -moz-border-radius-topright:5px; + border-bottom-left-radius:5px; + border-bottom-right-radius:5px; + -webkit-border-bottom-left-radius:5px; + -webkit-border-bottom-right-radius:5px; + -moz-border-radius-bottomleft:5px; + -moz-border-radius-bottomright:5px; +border:1px solid #999; + z-index:5000; } #upload { border-top-right-radius:10px; @@ -231,7 +244,7 @@ background-image:url(/static/bg-btn-red.png); width:120px; height:35px; background-position:center; -right:120; +right:135; top:15px; padding-bottom:1; text-indent:24; @@ -268,10 +281,10 @@ margin:-2; position: absolute; padding: 5px; top:85px; - min-width: 190px; + min-width: 200px; width:11%; float:right; - right: 6%; + right: 6.2%; font-family: Arial, Helvetica, sans-serif; font-size: 14px; font-weight:420; diff --git a/static/profile.css b/static/profile.css index 8aaafa8..8ee09d3 100755 --- a/static/profile.css +++ b/static/profile.css @@ -17,6 +17,18 @@ background-color:#fff; line-height:1.5; } +#profile h3{ +margin-top:12; +line-height:2; +color:#fff; +text-shadow: blue -2px -2px 0, red 2px 2px 0, green -6px 4px 0; +} +#profile h2{ +text-indent:-10; +margin-top:-7; +margin-bottom:15; +} + #chatrap{ width:720; @@ -309,6 +321,7 @@ font-size:60%; top:80; background-image:url(/static/welcomebar.gif); } +.invisible { display: none !important; } body,td,th { font-family: Arial, Helvetica, sans-serif; background-color:#ffffee; @@ -320,4 +333,4 @@ background-attachment:fixed; -}@charset "UTF-8"; \ No newline at end of file +}@charset "UTF-8"; diff --git a/static/search/browser.html b/static/search/browser.html index c3f4766..11223ca 100755 --- a/static/search/browser.html +++ b/static/search/browser.html @@ -107,7 +107,7 @@ background-image:url(/static/bg-btn-blue.png); - optionz + options
diff --git a/static/webcam/register.html b/static/webcam/register.html new file mode 100644 index 0000000..4458f9c --- /dev/null +++ b/static/webcam/register.html @@ -0,0 +1,233 @@ + + + + + + + + + + + dump.fm + + + + + +
+
+
+
+
+
+ +
+

+
+
+ +
+

+Sorry, registration is closed, come back tomorrow +

+
+ + + + + + + + diff --git a/static/webcam/webcam.js b/static/webcam/webcam.js index f5a5536..3e3b4fd 100644 --- a/static/webcam/webcam.js +++ b/static/webcam/webcam.js @@ -37,6 +37,9 @@ window.webcam = { }, uploadCompleted: function(){ + if (typeof pageTracker !== 'undefined') { + pageTracker._trackEvent('Message', 'Webcam', typeof Room !== 'undefined' ? Room : 'UnknownRoom'); + } $("#webcam-button-snap").attr("value", "Send Pic") webcam.reset(); }, diff --git a/template/banner.st b/template/banner.st index a857628..c67bafa 100755 --- a/template/banner.st +++ b/template/banner.st @@ -15,7 +15,7 @@
  • Log
  • Profile
    • -
  • Browser Tool
    • +
  • Image Search
    • $else$    Register diff --git a/template/browser.st b/template/browser.st index 26dcb8b..e172d15 100755 --- a/template/browser.st +++ b/template/browser.st @@ -1,6 +1,6 @@ - dump.fm | Browser Tool Beta + dump.fm | Image Search Beta $head()$ diff --git a/template/chat.st b/template/chat.st index 4d792ae..2c0f15f 100755 --- a/template/chat.st +++ b/template/chat.st @@ -37,37 +37,6 @@ }); } - $if(isadminroom)$ - - - - - $endif$ $banner()$ diff --git a/template/form_login.st b/template/form_login.st index 8b126ff..ad61bbb 100644 --- a/template/form_login.st +++ b/template/form_login.st @@ -18,7 +18,7 @@

    diff --git a/template/profile.st b/template/profile.st index c3d77e2..04a28fb 100755 --- a/template/profile.st +++ b/template/profile.st @@ -10,16 +10,11 @@ - - + @@ -46,7 +41,7 @@ $if(avatar)$ $else$ - No avatar + $endif$ $if(is_home)$ @@ -61,20 +56,21 @@

    contact info

    $contact$
    $else$ -
    No contact info
    +

    +
    $endif$
    $if(is_home)$ -

    biography

    +

    bio

    $bio$
    - $elseif(contact)$ -

    biography

    + $elseif(bio)$ +

    bio

    $bio$
    $else$ -
    No bio
    +
    $endif$ @@ -144,6 +140,7 @@ $footer()$ - + +$preload()$ -- cgit v1.2.3-70-g09d2