diff options
| author | sostler <sbostler@gmail.com> | 2010-03-26 15:40:51 -0400 |
|---|---|---|
| committer | sostler <sbostler@gmail.com> | 2010-03-26 15:40:51 -0400 |
| commit | da30c6c48e646efd38e8042370664115b99d6b1e (patch) | |
| tree | ba7d0e881f227296202b7a70bd5a313f51ee1909 /static | |
| parent | 42150227b1f6fa6798862e0ef92e7ee3a8bcafc1 (diff) | |
| parent | 27afb7560d470782f81523f7dff3242c8f31dbdd (diff) | |
Merge Share indent
Diffstat (limited to 'static')
| -rwxr-xr-x | static/browser.html | 264 | ||||
| -rw-r--r-- | static/directory.css | 26 | ||||
| -rw-r--r-- | static/dumpnewuser.css | 26 | ||||
| -rwxr-xr-x | static/header.css | 77 | ||||
| -rwxr-xr-x | static/js/pichat.js | 4 | ||||
| -rw-r--r-- | static/log.css | 21 | ||||
| -rw-r--r-- | static/pages.css | 83 | ||||
| -rwxr-xr-x | static/profile.css | 8 | ||||
| -rw-r--r-- | static/uploadstuff.png | bin | 28421 -> 18830 bytes | |||
| -rw-r--r-- | static/userlisthelp.png | bin | 26649 -> 26365 bytes | |||
| -rw-r--r-- | static/webcamhelp.png | bin | 19250 -> 19159 bytes |
11 files changed, 96 insertions, 413 deletions
diff --git a/static/browser.html b/static/browser.html deleted file mode 100755 index ed384b9..0000000 --- a/static/browser.html +++ /dev/null @@ -1,264 +0,0 @@ -<html> -<head> -<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> -<title>dump.fm - image search</title> - - -<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.3.2/jquery.min.js"></script> - <script src="dumpsearch.js" type="text/javascript"></script> - <script type="text/javascript" src="all.js"></script> - <script type="text/javascript" src="cufon-yui.js"></script> - <script src="/static/js-global/FancyZoom.js" type="text/javascript"></script> -<script src="/static/js-global/FancyZoomHTML.js" type="text/javascript"></script> - <script type="text/javascript" src="futura.js"></script> -</head> -<body> - -<div id="ish"> -<form onSubmit="searchImages(); return false;" > -<div align="left"> -<img src="/static/browsertool.gif"> - - <tr> - <td colspan="2"><br> - <input name="q" type="text" id="q" onChange="searchImages();" size="10%"> - <input type="submit" name="submit" id="submit" class="msgSubmit"value="Search Images"> - - <label> - </label> - </td> - <div align="left"> - <div align="left"> - <table class="search" width="425" border="0" cellpadding="5" cellspacing="0"> - - - <a href="#" id="about">options</a></div> - </table> - - - </div> -</div> - <div id="description"> - <div align="left"><a href="#" class="closeinfo"></a> - </p> - - </div> - <div> - - - <div align="left"> - <table class="search" width="425" border="0" cellpadding="5" cellspacing="0"> - <tr> - <td colspan="2"> - <p> - <label>where: - <select name="site" id="site" onChange="searchImages();"> - <option value="flickr.com" selected>flickr</option> - <option value="zooomr.com">zooomr</option> - <option value="photobucket.com">photobucket</option> - <option value="myspace.com">myspace</option> - <option value="wordpress.com">wordpress</option> - <option value="blogger.com">blogger</option> - <option value="typepad.com">typepad</option> - <option value="picsearch.com">picsearch</option> - <option value="webshots.com">webshots</option> - <option value="http://i.walmartimages.com/">walmart</option> - <option value="http://www.ibiblio.org">ibiblio</option> - <option value="gov">US Government</option> - <option value="deviantart.com">deviant art</option> - <option value="corbis.com">corbis</option> - <option value="msn.com">msn</option> - - <option value="made-in-china.com">made in china</option> - <option value="0" selected>EVERYWHERE</option> - </select> - </label> - <label> - <input name="showFaces" type="checkbox" onClick="searchImages();"> - Only Faces</label> - ★<label> hot shit</label>★ - <input type="radio" name="safeSearch" id="safeSearch2" value="off" onClick="searchImages();"checked> - Always ON - </p></td> - </tr> - - <tr> - - </tr> - <tr> - <td colspan="2"><p> - <label>File Type</label> - <input type="radio" name="type" value="jpg" onClick="searchImages();"> - JPG - <input name="type" type="radio" value="png" onClick="searchImages();"> - PNG - <input name="type" type="radio" value="bmp" onClick="searchImages();"> - BMP - <input type="radio" name="type" value="gif" onClick="searchImages();"> - GIF - <input type="radio" name="type" value="0" checked onClick="searchImages();"> - Any</p></td> - </tr> - <tr> - <td colspan="2"><p> - <label>Image Size</label> - <input type="radio" name="size" value="small" onClick="searchImages();"> - Small - <input name="size" type="radio" value="medium" onClick="searchImages();"> - Medium - <input type="radio" name="size" value="large" onClick="searchImages();"> - Large - <input type="radio" name="size" value="xlarge" onClick="searchImages();"> - Extra Large - <input type="radio" name="size" value="0" checked onClick="searchImages();"> - All Sizes</p></td> - </tr> - <tr> - <td colspan="2"><p> - <label>Image Color</label> - <input type="radio" name="color" value="bw" onClick="searchImages();"> - Black & White - <input name="color" type="radio" value="gray" onClick="searchImages();"> - Gray - <input type="radio" name="color" value="color" onClick="searchImages();"> - Color - <input type="radio" name="color" value="0" checked onClick="searchImages();"> - Whateva</p></td> - </tr> - </table> - - </div> - </div> - </div> - - <tr> - <td colspan="2"><div id="searchControl"> - <div align="left">Loading... - </div> - </div></td> - </tr> - <div align="left"> - </table> - </div> -</form> -<div align="left"> -</div> </div> -</div></div> -<script type="text/javascript"> - google.load('search', '1'); - google.setOnLoadCallback(searchImages, true); - - function searchImages() { - var control = new google.search.SearchControl(); - control.setResultSetSize(google.search.Search.LARGE_RESULTSET); - control.setNoResultsString("Sorry but no images match your search criteria. Please modify your search query and try again."); - control.setLinkTarget(google.search.Search.LINK_TARGET_BLANK); - - var options = new google.search.SearcherOptions(); - options.setExpandMode(google.search.SearchControl.EXPAND_MODE_OPEN); - - var searcher = new google.search.ImageSearch(); - - for (var i = 0; i < document.forms[0].safeSearch.length; i++) { - if (document.forms[0].safeSearch[i].checked) { - if (document.forms[0].safeSearch[i].value == "off") - searcher.setRestriction(GSearch.RESTRICT_SAFESEARCH, google.search.Search.SAFESEARCH_OFF); - else if (document.forms[0].safeSearch[i].value == "moderate") - searcher.setRestriction(GSearch.RESTRICT_SAFESEARCH, google.search.Search.SAFESEARCH_MODERATE); - else if (document.forms[0].safeSearch[i].value == "strict") - searcher.setRestriction(GSearch.RESTRICT_SAFESEARCH, google.search.Search.SAFESEARCH_STRICT); - else - searcher.setRestriction(GSearch.RESTRICT_SAFESEARCH, null); - break; - } - } - - for (var i = 0; i < document.forms[0].size.length; i++) { - if (document.forms[0].size[i].checked) { - if (document.forms[0].size[i].value == "small") - searcher.setRestriction(GimageSearch.RESTRICT_IMAGESIZE, google.search.ImageSearch.IMAGESIZE_SMALL); - else if (document.forms[0].size[i].value == "medium") - searcher.setRestriction(GimageSearch.RESTRICT_IMAGESIZE, google.search.ImageSearch.IMAGESIZE_MEDIUM); - else if (document.forms[0].size[i].value == "large") - searcher.setRestriction(GimageSearch.RESTRICT_IMAGESIZE, google.search.ImageSearch.IMAGESIZE_LARGE); - else if (document.forms[0].size[i].value == "xlarge") - searcher.setRestriction(GimageSearch.RESTRICT_IMAGESIZE, google.search.ImageSearch.IMAGESIZE_EXTRA_LARGE); - else - searcher.setRestriction(GimageSearch.RESTRICT_IMAGESIZE, null); - break; - } - } - - for (var i = 0; i < document.forms[0].type.length; i++) { - if (document.forms[0].type[i].checked) { - if (document.forms[0].type[i].value == "bmp") - searcher.setRestriction(GimageSearch.RESTRICT_FILETYPE, google.search.ImageSearch.FILETYPE_BMP); - else if (document.forms[0].type[i].value == "jpg") - searcher.setRestriction(GimageSearch.RESTRICT_FILETYPE, google.search.ImageSearch.FILETYPE_JPG); - else if (document.forms[0].type[i].value == "png") - searcher.setRestriction(GimageSearch.RESTRICT_FILETYPE, google.search.ImageSearch.FILETYPE_PNG); - else if (document.forms[0].type[i].value == "gif") - searcher.setRestriction(GimageSearch.RESTRICT_FILETYPE, google.search.ImageSearch.FILETYPE_GIF); - else - searcher.setRestriction(GimageSearch.RESTRICT_FILETYPE, null); - break; - } - } - - for (var i = 0; i < document.forms[0].color.length; i++) { - if (document.forms[0].color[i].checked) { - if (document.forms[0].color[i].value == "bw") - searcher.setRestriction(GimageSearch.RESTRICT_COLORIZATION, google.search.ImageSearch.COLORIZATION_BLACK_AND_WHITE ); - else if (document.forms[0].color[i].value == "gray") - searcher.setRestriction(GimageSearch.RESTRICT_COLORIZATION, google.search.ImageSearch.COLORIZATION_GRAYSCALE); - else if (document.forms[0].color[i].value == "color") - searcher.setRestriction(GimageSearch.RESTRICT_COLORIZATION, google.search.ImageSearch.COLORIZATION_COLOR); - else - searcher.setRestriction(GimageSearch.RESTRICT_COLORIZATION, null); - break; - } - } - - var list = document.forms[0].site; - if (list.options[list.selectedIndex].value == 0) - searcher.setSiteRestriction(null); - else - searcher.setSiteRestriction(list.options[list.selectedIndex].value); - - for (var i = 0; i < document.forms[0].site.length; i++) { - if (document.forms[0].site[i].checked) { - if (document.forms[0].site[i].value == 0) - searcher.setSiteRestriction(null); - else - searcher.setSiteRestriction(document.forms[0].site[i].value); - break; - } - } - - if (document.forms[0].showFaces.checked) - searcher.setRestriction(GimageSearch.RESTRICT_IMAGETYPE, GimageSearch.IMAGETYPE_FACES); - else - searcher.setRestriction(GimageSearch.RESTRICT_IMAGETYPE); - - control.addSearcher(searcher, options); - - function keepResult(res) { - $.ajax({ - type: 'POST', - timeout: 5000, - url: '/msg', - data: { 'room': 'dumpfm', 'content': res.unescapedUrl }, - cache: false, - dataType: 'json' - }); - }; - - control.setOnKeepCallback(this, keepResult, 'DUMP THIS'); - control.draw(document.getElementById("searchControl")); - - control.execute(document.getElementById('q').value); - return false; - } - </script> -</body> -</html> diff --git a/static/directory.css b/static/directory.css index e639703..d9be85b 100644 --- a/static/directory.css +++ b/static/directory.css @@ -140,6 +140,26 @@ text-transform:capitalize; } + +a { + font-size: 12px; + color: #000; +} +a:link { + text-decoration: none; +} +a:visited { + text-decoration: none; + color: #000; +} +.logged-dump a:hover { + text-decoration: none; + color: #00F; +} +a:active { + text-decoration: none; + color: #000; +} #pnavn{ position:absolute; top:-17; @@ -186,10 +206,7 @@ text-shadow: blue 2px 2px 0, red -20px -2px 0, green 6px 4px 0; } -a:active { - text-decoration: none; - color: #000; -} + #footer { text-align:center; @@ -199,6 +216,7 @@ a:active { line-height:1; font-size:11px; word-spacing:6px; +padding-bottom:4; color: #000; } diff --git a/static/dumpnewuser.css b/static/dumpnewuser.css index 09ca175..c15f432 100644 --- a/static/dumpnewuser.css +++ b/static/dumpnewuser.css @@ -14,7 +14,7 @@ overflow:hidden; position:fixed; z-index:2000; bottom:50px; -left:110px; +left:20px; } #webcamhelp{ position:fixed; @@ -30,16 +30,16 @@ z-index:2000; } #imageboard{ position:fixed; -top:20px; +top:27px; left:-10px; -z-index:2000; +z-index:3455; } #uploadstuff{ position:fixed; -display:none; -bottom:40px; -right:160px; -z-index:2000; + +bottom:50px; +right:180px; +z-index:444; } #signinblurb{ position:absolute; @@ -54,6 +54,18 @@ top:27px; left:180px; z-index:2000; } +#dumppreview{ +position:fixed; +top:30%; +left:15%; +z-index:100; +} +#beingpostednow{ +position:fixed; +bottom:127px; +left:180px; +z-index:2000; +} a { font-size: 12px; color: #000; diff --git a/static/header.css b/static/header.css index 1c53bf7..275d536 100755 --- a/static/header.css +++ b/static/header.css @@ -39,16 +39,18 @@ margin-right:80%; background-attachment:inherit; margin: 0px auto -1px auto; top: 0px; -height:38; +height:49; position:fixed; +background-position:7 -14; background-repeat:repeat-x; width:100%; left: 0px; } #bar7{ - top:12px; + top:8px; position:absolute; + word-spacing:-1; font-size: 16px; height:22; width:455; @@ -63,20 +65,23 @@ font-weight:bold; z-index: 999; } #bar7 img{ -margin-top:2; +margin-top:4; + vertical-align: top; } #bar7 a{ text-decoration: none; text-shadow: 1px 1px 1px #000; font-size:13; - +padding:6; color: #fff; } #bar7 a:hover{ text-decoration: none; - text-shadow: 1px 1px 1px #000; - + text-shadow: 1px 1px 1px #000,2px 2px 1px #f0e; +padding:6; +background-image:url(/static/upload.png); color: #fff; + } #logout7{ top:-1px; @@ -84,7 +89,7 @@ margin-top:2; font-size:12px; margin-right: 5px; float:right; - z-index: 999; + z-index: 9999999999999999; font-family: Arial, Helvetica, sans-serif; font-weight: normal; @@ -246,56 +251,14 @@ font-weight:bold; letter-spacing:.2px; z-index: 999; } -#banner-menu { - position: relative; height: 26px; -} - -#banner-menu li { - float: left; height: 26px; -} - -#banner-menu li.back { - background-image:url(/static/upload.png); -background-position:top; -background-color:#e3e3e3; - width: 1px; -border:px solid #000; - height: 26px; - position: absolute; - z-index: 10; -margin-top:0; -filter: progid:DXImageTransform.Microsoft.dropShadow(color=#c8cbce, offX=3, offY=4, positive=true); - border-top-left-radius:5px; - border-top-right-radius:5px; - -webkit-border-top-left-radius:5px; - -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; - margin-left: 10px; -} - -#banner-menu li a { - position: relative; - z-index: 20; - min-height: 22px; -} - -#banner-menu li img { - vertical-align: top; -} - -#lastli{ - -margin-left:-7000; -height:0.1; -} .no-cursor { cursor: none; } .invisible { display: none !important; } -#cursor-big { position: absolute; z-index: 1000; }
\ No newline at end of file +#cursor-big { position: absolute; z-index: 1000; } + +#iesucks{ +background-image:url(/static/ieburnbtn.gif); font-size:40;color:white;height:100%;width:100%;z-index:1000000000000000000000000000000;padding-top:100; +padding-right:400;padding-left:50; +font-weight:bold; + +}
\ No newline at end of file diff --git a/static/js/pichat.js b/static/js/pichat.js index bb75960..f643970 100755 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -23,7 +23,7 @@ function linkify(text) { // durty hack to use a global to check this... but otherwise i'd have to rewrite the String.replace function? :/ var LastMsgContainsImage = false -function linkReplace(url){ +function linkReplace(url) { var PicRegex = /\.(jpg|jpeg|png|gif|bmp)$/i; var urlWithoutParams = url.replace(/\?.*$/i, ""); @@ -573,7 +573,7 @@ Share = { "getMessage": function(button){ var message = $(button).parents(".logged-dump") var id = message.attr("id").substr(8) // cut "message-001" to "001" - var nick = message.find("a").attr("href").substr(3) // cut "/u/timb" to "timb" + var nick = message.attr("nick") // cut "/u/timb" to "timb" var link = "http://dump.fm/p/" + nick + "/" + id var content = message.find(".linkify") if (!content.length) content = message.find(".content") diff --git a/static/log.css b/static/log.css index a9669a3..79096e1 100644 --- a/static/log.css +++ b/static/log.css @@ -175,6 +175,7 @@ a:active { line-height:1; font-size:11px; word-spacing:6px; +padding-bottom:4; color: #000; } @@ -352,7 +353,25 @@ color:#f0e; } - +a { + font-size: 12px; + color: #000; +} +a:link { + text-decoration: none; +} +a:visited { + text-decoration: none; + color: #000; +} +.logged-dump a:hover { + text-decoration: none; + color: #00F; +} +a:active { + text-decoration: none; + color: #000; +} #newuser h1{font-size:20; letter-spacing:-2; color:#fff; diff --git a/static/pages.css b/static/pages.css index 2e8f5da..c5fcf3a 100644 --- a/static/pages.css +++ b/static/pages.css @@ -1,76 +1,7 @@ - #profile { - float: right; - padding: 20px; -width:auto; - position:absolute; - top:29px; -left:545; -max-width:230; - margin-top:34px; -background-color:#fff; - - overflow: hidden; - text-overflow: ellipsis; - - height:auto; - text-overflow: ellipsis-word; - background-position:top; - z-index:999; - min-height:600px; - - - line-height:1.5; - } -#lolbanner{ -position:absolute; -top:5; -margin-left:22; -} -#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:-5; -margin-bottom:15; -} -#logavatar{ -margin-left:-49; -height:22; -background-image:url(/static/leftarrow.png); - - background-repeat:no-repeat; - background-position:22 1; -margin-top:-22; - -} -#edit-toggle{ -position:absolute; -top:2; -right:2%; - -} -#edit-toggle a{font-size:12; -letter-spacing:; -color:#999; -} -#edit-toggle a:hover{font-size:12; -letter-spacing:; -color:#f0e; -} -#logavatar img{ - max-width:20px; - width: expression(this.width > 20 ? 20: true); - max-height:20px; - height: expression(this.width > 20 ? 20: true); - max-width:20px; -margin-top:0; - box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #d8dbde; - -webkit-box-shadow: 0 0 10px #d8dbde, 0px 0px 5px #d8dbde; - -moz-box-shadow: 0 0 10px #d8dbde, 2px 2px 5px #d8dbde; + #hugescreen{ +position:fixed; +left:1700; +top:150; } #chatrap{ width:610; @@ -205,17 +136,17 @@ height:28px; color: #000; } -#footerc a { +#footer a { font-size: 11px; color: #000; } -#footerc a:link { +#footer a:link { text-decoration: none; font-size: 11px; color:000; } -#footerc a:hover { +#footer a:hover { text-decoration:none; font-size: 11px; color: #f0e; diff --git a/static/profile.css b/static/profile.css index fba0164..25a0eaa 100755 --- a/static/profile.css +++ b/static/profile.css @@ -207,7 +207,8 @@ a:active { text-align:center; position:absolute; width:100%; - bottom:-55px; + bottom:-50px; +padding-bottom:4; line-height:1; font-size:11px; word-spacing:6px; @@ -386,7 +387,10 @@ color:#f0e; } - +.logged-dump a:hover { + text-decoration: none; + color: #00F; +} #newuser h1{font-size:20; letter-spacing:-2; color:#fff; diff --git a/static/uploadstuff.png b/static/uploadstuff.png Binary files differindex 405b463..8a4c30c 100644 --- a/static/uploadstuff.png +++ b/static/uploadstuff.png diff --git a/static/userlisthelp.png b/static/userlisthelp.png Binary files differindex bb2a559..db0fc24 100644 --- a/static/userlisthelp.png +++ b/static/userlisthelp.png diff --git a/static/webcamhelp.png b/static/webcamhelp.png Binary files differindex d3137e4..4c7daf2 100644 --- a/static/webcamhelp.png +++ b/static/webcamhelp.png |
