summaryrefslogtreecommitdiff
path: root/template
diff options
context:
space:
mode:
authorsostler <sbostler@gmail.com>2010-02-27 18:28:23 -0500
committersostler <sbostler@gmail.com>2010-02-27 18:28:23 -0500
commit99fa8c4569988c27203dc821809f408491fc76e0 (patch)
tree0377c3335cf9aff9bdfa95c8d46986fcc39241a5 /template
parent28df6c268853e12e04975f217222a61e118050bf (diff)
parentfa8c89b543bb6e23cc7cac5983cb61818a4e3139 (diff)
Merge branch 'master' of ssh://sostler@192.168.0.194/~/dumpfm
Diffstat (limited to 'template')
-rw-r--r--template/about_us.st7
-rwxr-xr-xtemplate/banner.st6
-rwxr-xr-xtemplate/chat.st2
-rw-r--r--template/goodies.st8
-rwxr-xr-xtemplate/head.st4
-rw-r--r--template/help.st7
-rwxr-xr-xtemplate/log.st7
-rwxr-xr-xtemplate/logged_dump.st4
-rw-r--r--template/privacy.st7
-rwxr-xr-xtemplate/profile.st179
-rw-r--r--template/terms.st7
11 files changed, 138 insertions, 100 deletions
diff --git a/template/about_us.st b/template/about_us.st
new file mode 100644
index 0000000..b8ee9f9
--- /dev/null
+++ b/template/about_us.st
@@ -0,0 +1,7 @@
+<html>
+ <head>
+ <title>About Us</title>
+ $head()$
+ </head>
+ <body></body>
+</html>
diff --git a/template/banner.st b/template/banner.st
index c67bafa..dd7a7b3 100755
--- a/template/banner.st
+++ b/template/banner.st
@@ -18,7 +18,7 @@
<li><a href="/browser"><img src="/static/image_draw.gif" /> Image Search</a></li>
</ul>
$else$&nbsp; &nbsp;
- <a href="/register"><img src="/static/answer_good.gif" />Register</a>
+ <div id="register"> <a href="/register"><img src="/static/answer_good.gif" />Register</a></div>
<div id="landscape"> <img src="/static/const_landscape.gif" /> </div>
<div id="welcomeinternet"> <img src="/static/welcome.gif" /> </div>
$endif$
@@ -28,7 +28,9 @@
</div>
</div>
-
+
+ <div id="topic"></div>
+
$if(isadmin)$
<div id="vippp">
<a href="/VIP/chat"> &#x2605; VIP &#x2605; </a>
diff --git a/template/chat.st b/template/chat.st
index 2c0f15f..9122c93 100755
--- a/template/chat.st
+++ b/template/chat.st
@@ -49,7 +49,7 @@
</div>
<div id="userList">
$users: { u |
- <div class="username"><a href="/u/$u.nick$">
+ <div class="username"><a href="/u/$u.nick$" target="_blank">
$if(u.avatar)$<img src="$u.avatar$" width="50" height="50">$endif$
$u.nick$</a><br>
</div>
diff --git a/template/goodies.st b/template/goodies.st
new file mode 100644
index 0000000..a7c0824
--- /dev/null
+++ b/template/goodies.st
@@ -0,0 +1,8 @@
+<html>
+ <head>
+ <title>Goodies</title>
+ $head()$
+ </head>
+ <body></body>
+</html>
+ \ No newline at end of file
diff --git a/template/head.st b/template/head.st
index 46ce6a5..e83e687 100755
--- a/template/head.st
+++ b/template/head.st
@@ -1,7 +1,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
-<!-- <script type="text/javascript" src="/static/jquery-1.3.2.min.js"></script> -->
+<script type="text/javascript" src="/static/jquery-1.3.2.min.js"></script>
+<!-- <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script> -->
<!--<script type="text/javascript" src="/static/js/underscore-min.js"></script> -->
<script type="text/javascript" src="/static/js/sha1.js"></script>
<script type="text/javascript" src="/static/js/pichat.js"></script>
diff --git a/template/help.st b/template/help.st
new file mode 100644
index 0000000..0d41e21
--- /dev/null
+++ b/template/help.st
@@ -0,0 +1,7 @@
+<html>
+ <head>
+ <title>Help</title>
+ $head()$
+ </head>
+ <body></body>
+</html>
diff --git a/template/log.st b/template/log.st
index 97eaa78..65f149e 100755
--- a/template/log.st
+++ b/template/log.st
@@ -1,8 +1,8 @@
<html>
<head>
- <title>$roomname$ Log</title>
+ <title>dump.fm log</title>
$head()$
- <link rel="stylesheet" type="text/css" href="/static/profile.css">
+ <link rel="stylesheet" type="text/css" href="/static/log.css">
<style>
</style>
@@ -20,6 +20,9 @@
<br>
<div id="posts">
+ <div id="lolbanner">
+ <img src="/static/welcomebanner.gif">
+ </div>
$if(dumps)$
$dumps: { d | $logged_dump(dump=d)$ }$
$else$
diff --git a/template/logged_dump.st b/template/logged_dump.st
index 01700b5..86465e3 100755
--- a/template/logged_dump.st
+++ b/template/logged_dump.st
@@ -31,8 +31,8 @@ img{
}
</style>
<div class="logged-dump">
- <a href="/u/$dump.nick$"><img height="50" width="50" src="$dump.avatar$" /></a>
- <div>$dump.created_on$ -- by <a href="/u/$dump.nick$">$dump.nick$</a></div>
+ <div>$dump.created_on$ -- by <b><a href="/u/$dump.nick$">$dump.nick$</a></b></div>
+ <a href="/u/$dump.nick$"><div id="logavatar"><img height="50" width="50" src="$dump.avatar$" /></div></a>
<div class="content">$dump.content$</div>
<hr />
</div>
diff --git a/template/privacy.st b/template/privacy.st
new file mode 100644
index 0000000..513eca3
--- /dev/null
+++ b/template/privacy.st
@@ -0,0 +1,7 @@
+<html>
+ <head>
+ <title>Privacy</title>
+ $head()$
+ </head>
+ <body></body>
+</html> \ No newline at end of file
diff --git a/template/profile.st b/template/profile.st
index b5d3f38..46e8cb4 100755
--- a/template/profile.st
+++ b/template/profile.st
@@ -11,12 +11,9 @@
<script type="text/javascript" src="/static/jquery.editinplace.1.0.1.packed.js"></script>
<link type="text/css" href="http://jqueryui.com/latest/themes/base/ui.all.css" rel="stylesheet" />
-
<script>
- jQuery(document).ready(function(){
- initProfile();
- });
- </script>
+ jQuery(document).ready(initProfile);
+ </script>
</head>
<body>
@@ -28,114 +25,114 @@
<div id="loghead">
</div>
<br>
- <div id="posts"> <div id="cats">
+ <div id="posts">
+ <div id="cats">
$if(dumps)$
$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" type="submit">
+ <img id="spinner" src="/static/spinner.gif" style="display: none" />
+ </div>
+ $endif$
- <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" class="editable">$avatar$</div>
- <input id="upload" value="Upload" type="submit">
- <img id="spinner" src="/static/spinner.gif" style="display: none" />
- $endif$
-
-
- $if(is_home)$
- <h3>contact info</h3>
- <div id="contact" class="editable">$contact$</div>
- $elseif(contact)$
- <h3>contact info</h3>
- <div id="contact" class="linkify">$contact$</div>
- $else$
- <br><br>
- <div><img src="/static/noinfo.png"></div>
- $endif$
-
-
- <br>
+ <h3>contact info</h3>
+ $if(contact)$
+ <div id="contact" class="linkify">$contact$</div>
+ $else$
+ <br><br>
+ <div><img src="/static/noinfo.png"></div>
+ $endif$
+ <br>
+
+ <h3>bio</h3>
+ $if(bio)$
+ <div id="bio" class="linkify">$bio$</div>
+ $else$
+ <div><img src="/static/noinfo.png"></div>
+ $endif$
- $if(is_home)$
- <h3>bio</h3>
- <div id="bio" class="editable">$bio$</div>
- $elseif(bio)$
- <h3>bio</h3>
- <div id="bio" class="linkify">$bio$</div>
- $else$
- <div><img src="/static/noinfo.png"></div>
- $endif$
+ $if(is_home)$
+ <br>
+ <div id="edit-toggle"><a href="#">--> Edit your information <--</a></div>
+ $endif$
+ <br>
+ <div id="date">
+ <div type="text" id="datepicker"></div></div>
+ </div>
- <br>
- <div id="date">
- <div type="text" id="datepicker"></div></div>
- </div>
$else$
<h3>&nbsp;</h3>
<h3>&nbsp;</h3>
- <h3>&nbsp;</h3> <h3>&nbsp;</h3>
<h3>&nbsp;</h3>
- <h3>&nbsp;</h3><div id="newuser">
-<h2>&#x263A;&#x270C; Welcome to dump.fm &#x270C;&#x263A;</h2>
-
-<br><br>
-
-<h1>Step &#x2776;</h1>
-<h3>&#x261F; Find a sweet image for your avatar, paste the URL below &#x261F;</h3>
- $if(avatar)$
- <img id="avatarPic" src="$avatar$" width="150px"/>
- $else$
- <b id="avatarPic"></b>
- $endif$
-
- $if(is_home)$
- <div id="avatar" class="editable">$avatar$</div>
- $endif$
-
-<h1>Step &#x2777;</h1>
-<h3>&#x261F; Enter some contact info below &#x261F;</h3>
- <div id="contact" class="$if(is_home)$editable$else$linkify$endif$">$contact$</div>
- <br>
-
-<h1>Step &#x2778;</h1>
-<h3>&#x261F; Enter some personal info below &#x261F;</h3>
- <div id="bio" class="$if(is_home)$editable$else$linkify$endif$">$bio$</div>
- <br>
- <h1>Step &#x2779;</h1>
-
- <h3> <a href="/chat">Join the &#x2663; and start posting pictures!</a></h3>
- <h3>&nbsp;</h3></div>
+ <h3>&nbsp;</h3>
+ <h3>&nbsp;</h3>
+ <h3>&nbsp;</h3>
+ <div id="newuser">
+ <h2>&#x263A;&#x270C; Welcome to dump.fm &#x270C;&#x263A;</h2>
+ <br><br>
+
+ <h1>Step &#x2776;</h1>
+ <h3>&#x261F; Find a sweet image for your avatar, paste the URL below &#x261F;</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" type="submit">
+ <img id="spinner" src="/static/spinner.gif" style="display: none" />
+ </div>
+ $endif$
+
+ <h1>Step &#x2777;</h1>
+ <h3>&#x261F; Enter some contact info below &#x261F;</h3>
+ <div id="contact" class="$if(is_home)$editable$else$linkify$endif$">$contact$</div>
+ <br>
+
+ <h1>Step &#x2778;</h1>
+ <h3>&#x261F; Enter some personal info below &#x261F;</h3>
+ <div id="bio" class="$if(is_home)$editable$else$linkify$endif$">$bio$</div>
+ <br>
+ <h1>Step &#x2779;</h1>
+
+ <h3> <a href="/chat">Join the &#x2663; and start posting pictures!</a></h3>
+ <h3>&nbsp;</h3></div>
<h3>&nbsp;</h3>
<h3>&nbsp;</h3>
<h3>&nbsp;</h3>
<h3>&nbsp;</h3>
<h3>&nbsp;</h3>
$endif$
-
+
<p>&nbsp;</p>
<div id="pnav">
- $if(next)$
- <div id="pnavn"><a href="/u/$nick$/$next$">next &#9758;</a></div>
- $endif$
-
- &nbsp;
- $if(prev)$
- <div id="pnavo"> <a href="/u/$nick$/$prev$">&#9756; prev</a> </div>
- $endif$
-
+ $if(next)$
+ <div id="pnavn"><a href="/u/$nick$/$next$">next &#9758;</a></div>
+ $endif$
- <br><br>
+ &nbsp;
+ $if(prev)$
+ <div id="pnavo"> <a href="/u/$nick$/$prev$">&#9756; prev</a></div>
+ $endif$
+
+ <br><br>
</div>
<div id="footer">
diff --git a/template/terms.st b/template/terms.st
new file mode 100644
index 0000000..29a41cc
--- /dev/null
+++ b/template/terms.st
@@ -0,0 +1,7 @@
+<html>
+ <head>
+ <title>Terms and Conditions</title>
+ $head()$
+ </head>
+ <body></body>
+</html>