diff options
| author | Scott Ostler <sostler@deathmachine.local> | 2010-03-17 22:51:27 -0400 |
|---|---|---|
| committer | Scott Ostler <sostler@deathmachine.local> | 2010-03-17 22:51:27 -0400 |
| commit | 859df13e5ba9dcc693952ece60eb1d16b5388201 (patch) | |
| tree | 5e4fe50ed56a8b676d006a0623fd997ac399ba88 /template | |
| parent | b5a74b56baed8b0ad2eed96857ba99ebcb041dca (diff) | |
| parent | f6ec036fd3614cdefe43535a8410e0b5455ae2ea (diff) | |
Merge branch 'master' of ssh://dump.fm/pichat/repo
Diffstat (limited to 'template')
| -rw-r--r-- | template/about_us.st | 10 | ||||
| -rwxr-xr-x | template/banner.st | 6 | ||||
| -rwxr-xr-x | template/chat.st | 12 | ||||
| -rw-r--r-- | template/directory.st | 12 | ||||
| -rwxr-xr-x | template/head.st | 25 | ||||
| -rwxr-xr-x | template/log.st | 3 | ||||
| -rwxr-xr-x | template/logged_dump.st | 67 | ||||
| -rwxr-xr-x | template/profile.st | 216 | ||||
| -rw-r--r-- | template/share_buttons.st | 6 | ||||
| -rw-r--r-- | template/single_message.st | 41 |
10 files changed, 179 insertions, 219 deletions
diff --git a/template/about_us.st b/template/about_us.st index e324a82..23265c4 100644 --- a/template/about_us.st +++ b/template/about_us.st @@ -43,13 +43,7 @@ DUMP.FM is a <img src="/static/newanim.gif"> experiment in communication and web </center><br></div></h5> </div></div> - <div style="display:none;"id="archive"> - <div style="padding:0px" id="content" name="content"> - <div><input type=button value="Back" onClick="history.go(-1)"> - - </div> - <iframe src="http://night-falls.net/archive" style="width:99%" height="650px"></iframe> - </div> + <div style="display:none;"id="link"> <div id="content" name="content"style="background-image:url(/static/hearts.gif);background-repeat:repeat;"> @@ -57,7 +51,7 @@ DUMP.FM is a <img src="/static/newanim.gif"> experiment in communication and web <h1><br> <a href="/u/ryder">Ryder Ripps</a> - screams, rapping<br></h1> <h2> <img src="/static/dot.gif"> Ryder is also the founder of <a href="http://www.internetarchaeology.org" target="_blank">Internet Archaeology</a></h2> - <h1><a href="/u/scottbot">Scott Van Damme</a> - clean vocals <br></h1> + <h1><a href="/u/scottbot">Scott Ostler</a> - clean vocals <br></h1> <h2> <img src="/static/dot.gif"> Scott also worked on the development of <a href="http://www.simile-widgets.org/exhibit/"target="_blank">MIT Exhibit</a></h2> <h1><a href="/u/timb">Tim Baker</a> - synths, guitars, beats, backing vocals <br></h1> <h2> <img src="/static/dot.gif"> Tim was also a core developer of <a href="http://www.delicious.com" target="_blank">Delicious</a></h2> diff --git a/template/banner.st b/template/banner.st index 4b19bad..aa5ae50 100755 --- a/template/banner.st +++ b/template/banner.st @@ -15,9 +15,9 @@ <ul id="banner-menu"> <li><div id="lastli"><a href="/">.</a></div></li> <li><a href="/log"><img src="/static/text.gif" > Log</a></li> - <li><a href="/u/$user_nick$"><img src="/static/home4.gif"/> Profile</a></li> - <li><a href="/directory"><img src="/static/directory.gif"/> Directory</a></li> - <li><a href="/browser"><img src="/static/image_draw.gif" /> Image Search</a></li> + <li><a href="/u/$user_nick$">$if(user_avatar)$<img src="$user_avatar$" width="19px" height="19px" />$else$<img src="/static/home4.gif"width="22px" height="22px" />$endif$ Profile</a></li> + <li><a href="/directory"><img src="/static/directory.gif"width="20px" height="20px" /> Directory</a></li> + <li><a href="/browser"><img src="/static/image_draw.gif"/> Image Search</a></li> </ul> $else$ <div id="register" style="display:none;"> <a href="/register"><img src="/static/answer_good.gif" />Register</a></div> diff --git a/template/chat.st b/template/chat.st index 5ad8113..f44c383 100755 --- a/template/chat.st +++ b/template/chat.st @@ -2,7 +2,7 @@ <head> <title>dump.fm</title> $head()$ - <link rel="stylesheet" type="text/css" href="/static/pichat.css"> + <link rel="stylesheet" type="text/css" href="/static/dump.css"> <script type="text/javascript" src="/static/webcam/webcam.js"></script> <script type="text/javascript" src="/static/js/tooltip.js"></script> <script> @@ -29,16 +29,8 @@ function pop(url) { newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0'); if (window.focus) {newwindow.focus()} -} - +} </script> - <style> - #topic { - z-index: 5000; - display: inline; - background-color: white; - } - </style> </head> <body onload="MM_preloadImages('/static/thumbs_up_sm.gif')"> $banner()$ diff --git a/template/directory.st b/template/directory.st index 464013e..b21d2ad 100644 --- a/template/directory.st +++ b/template/directory.st @@ -17,7 +17,7 @@ <div id="loghead"></div> <br> - <div id="posts"> + <div id="posts"> <br> <center> <h2>✭ ✭ DUMP STARS ✭ ✭</h2> @@ -27,7 +27,7 @@ </center> $if(users)$ $users:{ u | - <div class="logged-dump"> + <div class="logged-dump" id="message-$u.message_id$"> <a href="/u/$u.nick$"> <b>$u.nick$</b> $if(u.avatar)$ @@ -45,11 +45,9 @@ <div id="infotxt"><b>last post</b></div> <span class="linkify">$u.content$</span> <hr /> - </div> - <a href="http://www.facebook.com/share.php?u=$u.content$&t=via dump.fm" target="_blank"><img src="/static/fbbutton.png"></a> - <a href="http://twitter.com/home?status=via dump.fm $u.content$" target="_blank"><img src="/static/twittericon.png"></a> - <a href="http://delicious.com/save?url=$u.content$¬es=via dump.fm&title=$u.content$" target="_blank"><img src="/static/delishicon.png"></a> - </div> + </div> + $share_buttons()$ + </div> }$ $else$ <span>No more users!</span> diff --git a/template/head.st b/template/head.st index e78ee8f..da1c3f5 100755 --- a/template/head.st +++ b/template/head.st @@ -43,28 +43,3 @@ jQuery(document).ready(function () { MM_preloadImages('/static/mouseover.gif'); jQuery(function() { jQuery("#banner-menu").lavaLamp({ fx: "backout", speed: 700 })}); </script> - -<style type="text/css"> -<!-- -a { - font-size: 12px; - color: #000; -} -a:link { - text-decoration: none; -} -a:visited { - text-decoration: none; - color: #000; -} -a:hover { - text-decoration: none; - color: #00F; -} -a:active { - text-decoration: none; - color: #000; -} - ---> -</style> diff --git a/template/log.st b/template/log.st index 65f149e..145f8c6 100755 --- a/template/log.st +++ b/template/log.st @@ -3,9 +3,6 @@ <title>dump.fm log</title> $head()$ <link rel="stylesheet" type="text/css" href="/static/log.css"> - <style> - - </style> <script> jQuery(document).ready(initLog); </script> diff --git a/template/logged_dump.st b/template/logged_dump.st index a927323..3b8336a 100755 --- a/template/logged_dump.st +++ b/template/logged_dump.st @@ -1,69 +1,20 @@ -<head> <script> - - function urlencode(turl) - { - var enurl=encodeURI(turl); - var stem="http://www.tumblr.com/share?v=3&u="; - var url = stem+enurl; - - newwindow=window.open(url,'name','height=400,width=200'); - if (window.focus) {newwindow.focus()} - - - } +<div class="logged-dump" id="message-$dump.message_id$"> + <div>$dump.created_on$ -- by <b><a href="/u/$dump.nick$">$dump.nick$</a></b></div> -</script> - - <style type="text/css"> + <a href="/u/$dump.nick$"> - .logged-dump { -img{ - max-width:650px; - width: expression(this.width > 650 ? 650: true); - max-height:400px; - height: expression(this.width > 400 ? 400: true); - max-width:400px; - } - .content { -img{ - max-width:650px; - width: expression(this.width > 650 ? 650: true); - max-height:400px; - height: expression(this.width > 400 ? 400: true); - max-width:400px; - } - -img{ - max-width:650px; - width: expression(this.width > 650 ? 650: true); - max-height:400px; - height: expression(this.width > 400 ? 400: true); - max-width:400px; - body { - background-image: url(static/bg4.png); -} - body,td,th { - font-family: Arial, Helvetica, sans-serif; -} - </style> - - </head> -<div class="logged-dump"> - <div>$dump.created_on$ -- by <b><a href="/u/$dump.nick$">$dump.nick$</a></b></div> - <a href="/u/$dump.nick$"> <div id="logavatar"> - $if(dump.avatar)$ - <img height="50" width="50" src="$dump.avatar$"> + + $if(dump.avatar)$<img height="50" width="50" src="$dump.avatar$" /> + $else$ + <img height="50" width="50" src="/static/noinfo.png"> + $endif$ </div></a> <div class="content">$dump.content$</div> <hr /> - <div style="display:none;"> -<a href="#" target="_blank" onclick:"urlencode('$dump.content$');"><img src="/static/tumblricon.png"></a></div> - <a href="http://www.facebook.com/share.php?u=$dump.content$&t=via dump.fm" target="_blank"><img src="/static/fbbutton.png"></a> -<a href="http://twitter.com/home?status=via dump.fm $dump.content$" target="_blank"><img src="/static/twittericon.png"></a> -<a href="http://delicious.com/save?url=$dump.content$¬es=via dump.fm&title=$dump.content$" target="_blank"><img src="/static/delishicon.png"></a> + $share_buttons()$ </div> diff --git a/template/profile.st b/template/profile.st index f6308b5..bca6a8b 100755 --- a/template/profile.st +++ b/template/profile.st @@ -7,137 +7,143 @@ <script src="/static/jquery.editinplace.1.0.1.packed.js" type="text/javascript"></script> <script src="/static/js/ajaxupload.js"></script> + <script type="text/javascript" src="/static/jquery.editinplace.1.0.1.packed.js"></script> + <script> jQuery(document).ready(initProfile); </script> - + </head> <body> $banner()$ <div id="chatrap"> - <div id="headerbar"></div> + <div id="headerbar"></div> <div id="log"> <div id="loghead"> </div> <br> - <div id="posts"> + <div id="posts"> + <div id="cats"> - $if(dumps)$ - <div id="lolbanner"> - <img src="/static/welcomebanner.gif"> + $if(dumps)$ + + <div id="lolbanner"> + <img src="/static/welcomebanner.gif"> </div> $dumps:{ d | $logged_dump(dump=d)$ }$ - <div id="profile"> - <h2>$nick$</h2> - $if(avatar)$ - <img id="avatarPic" src="$avatar$" width="150px"/> - $else$ - <b id="avatarPic"><img src="/static/noinfo.png"></b> - $endif$ - - $if(is_home)$ - <div id="avatar-editing" style="display: none"> - <div id="avatar" class="editable">$avatar$</div> - <input id="upload" value="Upload Icon" type="submit"> - <img id="spinner" src="/static/spinner.gif" style="display: none" /> - </div> - $endif$ - - <h3>contact info</h3> - $if(contact)$ - <div id="contact" class="linkify">$contact$</div> - $else$ - <div><img id="contact" src="/static/noinfo.png"></div> - $endif$ - <br> - - <h3>bio</h3> - $if(bio)$ - <div id="bio" class="linkify">$bio$</div> - $else$ - <div><img id="bio" src="/static/noinfo.png"></div> - $endif$ - - $if(is_home)$ - <br> - <div id="edit-toggle"><a href="#">edit profile</a></div> - $endif$ - - <br> - </div> + <div id="profile"> - $else$ - <h3> </h3> - <h3> </h3> - <h3> </h3> - <h3> </h3> - <h3> </h3> - <h3> </h3> - <div id="newuser"> - <h2>Welcome to dump.fm</h2> - <br><br> - - <h1>Step ❶</h1> - <h3>☟ Find a sweet image for your avatar, paste the URL below ☟</h3> - $if(avatar)$ - <img id="avatarPic" src="$avatar$" width="150px"/> - $else$ - <b id="avatarPic"></b> - $endif$ - - $if(is_home)$ - <div id="avatar-editing"> - <div id="avatar" class="editable">$avatar$</div> - <input id="upload" value="Upload Icon" type="submit"> - <img id="spinner" src="/static/spinner.gif" style="display: none" /> - </div> - $endif$ - - <h1>Step ❷</h1> - <h3>☟ Enter some contact info below ☟</h3> - <div id="contact" class="$if(is_home)$editable$else$linkify$endif$">$contact$</div> - <br> - - <h1>Step ❸</h1> - <h3>☟ Enter some personal info below ☟</h3> - <div id="bio" class="$if(is_home)$editable$else$linkify$endif$">$bio$</div> - <br> - <h1>Step ❹</h1> - - <h3> <a href="/chat">Join the ♣ and start posting pictures!</a></h3> - <h3> </h3> + <h2>$nick$</h2> + $if(avatar)$ + <img id="avatarPic" src="$avatar$" width="150px"/> + $else$ + <img id="avatarPic"><img src="/static/noinfo.png"> + $endif$ + + $if(is_home)$ + <div id="avatar-editing" style="display: none"> + <div id="avatar" class="editable">$avatar$</div> + <input id="upload" value="Upload Icon" type="submit"> + <img id="spinner" src="/static/spinner.gif" style="display: none" /> </div> - <h3> </h3> - <h3> </h3> - <h3> </h3> - <h3> </h3> - <h3> </h3> - $endif$ + $endif$ + + <h3>contact info</h3> + $if(contact)$ + <div id="contact" class="linkify">$contact$</div> + $else$ + <div><img id="contact" src="/static/noinfo.png"></div> + $endif$ + <br> - <p> </p> - <div id="pnav"> + <h3>bio</h3> + $if(bio)$ + <div id="bio" class="linkify">$bio$</div> + $else$ + <div><img id="bio" src="/static/noinfo.png"></div> + $endif$ - $if(next)$ - <div id="pnavn"><a href="/u/$nick$/$next$">next ☞</a></div> - $endif$ + $if(is_home)$ + <br> + <div id="edit-toggle"><a href="#">edit profile</a></div> + $endif$ - - $if(prev)$ - <div id="pnavo"> <a href="/u/$nick$/$prev$">☜ prev</a></div> - $endif$ - - <br><br> - </div> + <br> + <div id="date"> + <div type="text" id="datepicker"></div></div> + </div> - <div id="footer"> - $footer()$ + $else$ + <h3> </h3> + <h3> </h3> + <h3> </h3> + <h3> </h3> + <h3> </h3> + <h3> </h3> + <div id="newuser"> + <h2>Welcome to dump.fm</h2> + <br><br> + + <h1>Step ❶</h1> + <h3>☟ Find a sweet image for your avatar, paste the URL below ☟</h3> + $if(avatar)$ + <img id="avatarPic" src="$avatar$" width="150px"/> + $else$ + <b id="avatarPic"></b> + $endif$ + + $if(is_home)$ + <div id="avatar-editing"> + <div id="avatar" class="editable">$avatar$</div> + <input id="upload" value="Upload Icon" type="submit"> + <img id="spinner" src="/static/spinner.gif" style="display: none" /> </div> + $endif$ + + <h1>Step ❷</h1> + <h3>☟ Enter some contact info below ☟</h3> + <div id="contact" class="$if(is_home)$editable$else$linkify$endif$">$contact$</div> + <br> + + <h1>Step ❸</h1> + <h3>☟ Enter some personal info below ☟</h3> + <div id="bio" class="$if(is_home)$editable$else$linkify$endif$">$bio$</div> + <br> + <h1>Step ❹</h1> + + <h3> <a href="/chat">Join the ♣ and start posting pictures!</a></h3> + <h3> </h3></div> + <h3> </h3> + <h3> </h3> + <h3> </h3> + <h3> </h3> + <h3> </h3> + $endif$ + + <p> </p> + <div id="pnav"> + + $if(next)$ + <div id="pnavn"><a href="/u/$nick$/$next$">next ☞</a></div> + $endif$ + + + $if(prev)$ + <div id="pnavo"> <a href="/u/$nick$/$prev$">☜ prev</a></div> + $endif$ + + <br><br> </div> + + <div id="footer"> + $footer()$ + </div> + </div> </div></div></div> - $preload()$ +$preload()$ </body> </html> diff --git a/template/share_buttons.st b/template/share_buttons.st new file mode 100644 index 0000000..eeaae92 --- /dev/null +++ b/template/share_buttons.st @@ -0,0 +1,6 @@ +<div class="share-buttons"> +<img src="/static/fbbutton.png" class="share-button" onclick="Share.facebook(this)"> +<img src="/static/tumblricon.png" class="share-button" onclick="Share.tumblr(this)"> +<img src="/static/twittericon.png" class="share-button" onclick="Share.twitter(this)"> +<img src="/static/delishicon.png" class="share-button" onclick="Share.delicious(this)"> +</div>
\ No newline at end of file diff --git a/template/single_message.st b/template/single_message.st new file mode 100644 index 0000000..7047cbd --- /dev/null +++ b/template/single_message.st @@ -0,0 +1,41 @@ +<html> + <head> + + <title>dump.fm</title> + $head()$ + <link rel="stylesheet" type="text/css" href="/static/directory.css"> + <script> + jQuery(document).ready(initDirectory); + </script> + + + </head> + <body> + $banner()$ + <div id="chatrap"> + <div id="log"> + <div id="loghead"></div> + <br> + <div id="posts"> + <br> + <div class="logged-dump" id="message-$message.message_id$"> + <a href="/u/$message.nick$"> + <b>$message.nick$</b> + $if(message.avatar)$ + <div style="border-image:url($message.avatar$)"> + <div id="logavatar"> + <img height="50" width="50" src="$message.avatar$"></img> + </div> + $endif$ + </a> + <span class="linkify">$message.content$</span> + <hr /> + </div> + $share_buttons()$ + </div> + <!--<div id="footer"> + $footer()$ + </div>--> + </div> + </body> +</html> |