first commit in a while

11 files changed, 48 insertions, 47 deletions

diff --git a/frontend/templates/admin.html b/frontend/templates/admin.html
index 79a019d..c486260 100644..100755
--- a/frontend/templates/admin.html
+++ b/frontend/templates/admin.html
@@ -60,14 +60,14 @@
 	roomName = window.location.pathname.split("/")[1]
 	retrograde = false
 </script> 
-<script type="text/javascript" src="{{STATIC_PREFIX}}js/jquery-1.5.2.min.js"></script> 
-<script type="text/javascript" src="{{STATIC_PREFIX}}js/jquery.md5.js"></script> 
-<script type="text/javascript" src="{{STATIC_PREFIX}}js/swfobject.js"></script> 
-<script type="text/javascript" src="{{STATIC_PREFIX}}js/debug.js"></script>
-<script type="text/javascript" src="{{STATIC_PREFIX}}js/api.js"></script>
+<script type="text/javascript" src="{{STATIC_PREFIX}}js/src/jquery-1.5.2.min.js"></script> 
+<script type="text/javascript" src="{{STATIC_PREFIX}}js/src/jquery.md5.js"></script> 
+<script type="text/javascript" src="{{STATIC_PREFIX}}js/src/swfobject.js"></script> 
+<script type="text/javascript" src="{{STATIC_PREFIX}}js/src/debug.js"></script>
+<script type="text/javascript" src="{{STATIC_PREFIX}}js/src/api.js"></script>
 <script type="text/javascript" src="{{STATIC_PREFIX}}js/admin.js"></script>
 <script type="text/javascript" src="{{STATIC_PREFIX}}js/like.js"></script>
-<script type="text/javascript" src="{{STATIC_PREFIX}}js/auth.js"></script>
+<script type="text/javascript" src="{{STATIC_PREFIX}}js/src/auth.js"></script>
 <script type="text/javascript" src="{{STATIC_PREFIX}}js/chat.js"></script>
 <script type="text/javascript" src="{{STATIC_PREFIX}}js/room.js"></script>
 <script type="text/javascript" src="{{STATIC_PREFIX}}js/player.js"></script>
diff --git a/frontend/templates/backgrounds.html b/frontend/templates/backgrounds.html
index 967a833..ab237ec 100644..100755
--- a/frontend/templates/backgrounds.html
+++ b/frontend/templates/backgrounds.html
@@ -170,7 +170,7 @@ a.r
 {% endfor %}
 <a href='?start={{ lowest_id }}&limit={{backgrounds|length }}' class='nextpage'>Next page ...</a>
 </body>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/jquery-1.5.2.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/jquery-1.5.2.min.js"></script>
 <script type="text/javascript">
 var Dump =
 	{
@@ -261,11 +261,11 @@ Main.init()
 	var serverHost = "{{ SERVER_HOST }}";
 	var serverPort = {{ SERVER_PORT }};
 </script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/jquery-1.5.2.min.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/jquery.md5.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/swfobject.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/debug.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/api.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/auth.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/jquery-1.5.2.min.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/jquery.md5.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/swfobject.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/debug.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/api.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/auth.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}js/poll.js"></script> 
 </html>
diff --git a/frontend/templates/calendar.html b/frontend/templates/calendar.html
index d3ee9af..306ef5a 100644..100755
--- a/frontend/templates/calendar.html
+++ b/frontend/templates/calendar.html
@@ -70,14 +70,14 @@
 	serverHost = "{{SERVER_HOST}}";
 	serverPort = {{SERVER_PORT}}
 </script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/jquery-1.5.2.min.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/jquery.md5.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery-1.5.2.min.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery.md5.js"></script>
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/datepicker/datepicker.js"></script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/swfobject.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/swfobject.js"></script>
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/soundmanager2.js"></script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/debug.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/api.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/auth.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/debug.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/api.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/auth.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/like.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/chat.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/player.js"></script> 
diff --git a/frontend/templates/directory.html b/frontend/templates/directory.html
index 89c9373..89c9373 100644..100755
--- a/frontend/templates/directory.html
+++ b/frontend/templates/directory.html
diff --git a/frontend/templates/faq.html b/frontend/templates/faq.html
index b8d18d0..40b5b0b 100644..100755
--- a/frontend/templates/faq.html
+++ b/frontend/templates/faq.html
@@ -232,7 +232,7 @@ All profiles can be accessed by clicking on a username. also check out the <a hr
 
 <h3>who made this?</h3>
 <p>
-it was made by Pepper DaStroyer (Andrew Fenlon) who is a crazed American Idol reject, Jules Welter (asdf.us), one of the operators of Rotten dot com, and Peter Le Bek (vokoda).
+it was made by Pepper, and Jules (asdf.us) with some help from Peter Le Bek. you can email pepper or jules respectively at scannerjammer.com.
 </p>
 
 <h3>are the creators of the website alive or dead?</h3>
diff --git a/frontend/templates/profile.html b/frontend/templates/profile.html
index 2990086..233bf5d 100644..100755
--- a/frontend/templates/profile.html
+++ b/frontend/templates/profile.html
@@ -128,14 +128,14 @@ var likeContentQueueTitle = "jams i like"
 var userProfile = {{PROFILE|safe}}
 var now = {{NOW}}
 </script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/jquery-1.5.2.min.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/jquery.md5.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/swfobject.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery-1.5.2.min.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery.md5.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/swfobject.js"></script>
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/soundmanager2.js"></script>
 <!--not sure what debug is -->
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/debug.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/api.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/auth.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/debug.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/api.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/auth.js"></script> 
 <!--really not sure why chat and like are here -->
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/like.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/chat.js"></script> 
diff --git a/frontend/templates/profile_img.html b/frontend/templates/profile_img.html
index 4b2feb3..65db188 100644..100755
--- a/frontend/templates/profile_img.html
+++ b/frontend/templates/profile_img.html
@@ -125,14 +125,14 @@ var likeContentQueueTitle = "jams i like"
 var userProfile = {{PROFILE|safe}}
 var now = {{NOW}}
 </script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/jquery-1.5.2.min.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/jquery.md5.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/swfobject.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery-1.5.2.min.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery.md5.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/swfobject.js"></script>
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/soundmanager2.js"></script>
 <!--not sure what debug is -->
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/debug.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/api.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/auth.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/debug.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/api.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/auth.js"></script> 
 <!--really not sure why chat and like are here -->
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/like.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/chat.js"></script> 
diff --git a/frontend/templates/register.html b/frontend/templates/register.html
index f041a50..f041a50 100644..100755
--- a/frontend/templates/register.html
+++ b/frontend/templates/register.html
diff --git a/frontend/templates/room.html b/frontend/templates/room.html
index 3c3f961..85ee451 100644..100755
--- a/frontend/templates/room.html
+++ b/frontend/templates/room.html
@@ -4,12 +4,14 @@
 <html>
 <head>
 <title>{{ UCROOM }}</title>
-<link href="{{ STATIC_PREFIX }}/css/sasscss/screen.css" media="screen, projection" rel="stylesheet" type="text/css" />
+<link href="{{ STATIC_PREFIX }}/css/sasscss/screen.css?v=2" media="screen, projection" rel="stylesheet" type="text/css" />
 <link href="{{ STATIC_PREFIX }}/css/sasscss/tiny.css" media="screen, projection" rel="alternate stylesheet" type="text/css" title="tiny" disabled="disabled" /> 
 <link href="{{ STATIC_PREFIX }}/css/sasscss/{{ ROOM }}.css" media="screen, projection" rel="alternate stylesheet" type="text/css" title="{{ ROOM }}" disabled="disabled" /> 
 <link href="{{ STATIC_PREFIX }}/css/{{ ROOM }}.css" media="screen, projection" rel="alternate stylesheet" type="text/css" title="custom" disabled="disabled" /> 
 <link href="{{ STATIC_PREFIX }}/css/sasscss/gallery-white.css" media="screen, projection" rel="alternate stylesheet" type="text/css" title="white" disabled="disabled" /> 
 <link rel="shortcut icon" href="{{ STATIC_PREFIX }}/favicon.ico" /> 
+
+<link href='http://fonts.googleapis.com/css?family=Lekton' rel='stylesheet' type='text/css'>
 <meta http-equiv="Content-Type" content="text/html; charset=iso=8859-1" /> 
 <meta property="og:url" content="{{ STATIC_PREFIX }}/{{ ROOM }}/"/> 
 <meta property="og:type" content="website"/> 
@@ -195,7 +197,6 @@
 
 </body>
 <script type="text/javascript">if (navigator.userAgent.indexOf("MSIE") !== -1) { document.getElementById("lunacy").style.display="block" }</script> 
-<script src="http://staging.tokbox.com/v0.91/js/TB.min.js" type="text/javascript" charset="utf-8"></script>
 <script type="text/javascript"> 
 	serverHost = "{{ SERVER_HOST }}"
 	serverPort = {{ SERVER_PORT }}
@@ -208,7 +209,7 @@
 	var sj = document.createElement('script')
 	sj.type = 'text/javascript'
 	sj.async = 'true'
-	sj.src = '{{ STATIC_PREFIX }}/js/sj6.js?t=' + new Date().getTime().toString()
+	sj.src = '{{ STATIC_PREFIX }}/js/sj_compiled.js?t=' + new Date().getTime().toString()
 
 	var scripts = document.getElementsByTagName('script')
 	scripts[scripts.length-1].parentNode.insertBefore(sj, scripts[scripts.length-1])
diff --git a/frontend/templates/roomlist.html b/frontend/templates/roomlist.html
index 60bb8cf..e0fb255 100644..100755
--- a/frontend/templates/roomlist.html
+++ b/frontend/templates/roomlist.html
@@ -71,12 +71,12 @@
 	var ROOM_LIST = {{ROOM_LIST|safe}};
 </script>
 <script type="text/javascript">if (navigator.userAgent.indexOf("MSIE") !== -1) { document.getElementById("lunacy").style.display="block" }</script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/jquery-1.5.2.min.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/jquery.md5.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/swfobject.js"></script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/debug.js"></script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/api.js"></script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/auth.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery-1.5.2.min.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/jquery.md5.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/swfobject.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/debug.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/api.js"></script>
+<script type="text/javascript" src="{{ STATIC_PREFIX }}/js/src/auth.js"></script>
 <script type="text/javascript" src="{{ STATIC_PREFIX }}/js/roomlist.js"></script>
 <!--
 <script async src="http://connect.facebook.net/en_US/all.js#xfbml=1"></script>
diff --git a/frontend/templates/topvideos.html b/frontend/templates/topvideos.html
index e269ac4..5684a68 100644..100755
--- a/frontend/templates/topvideos.html
+++ b/frontend/templates/topvideos.html
@@ -109,13 +109,13 @@ var yesterdayVideoQueueTitle = "Yesterday"
 var topVideoQueue = {{ top_alltime|safe }}
 var topVideoQueueTitle = "All Time"
 </script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/jquery-1.5.2.min.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/jquery.md5.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/swfobject.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/jquery-1.5.2.min.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/jquery.md5.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/swfobject.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}js/soundmanager2.js"></script>
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/debug.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/api.js"></script> 
-<script type="text/javascript" src="{{ STATIC_PREFIX }}js/auth.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/debug.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/api.js"></script> 
+<script type="text/javascript" src="{{ STATIC_PREFIX }}js/src/auth.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}js/like.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}js/chat.js"></script> 
 <script type="text/javascript" src="{{ STATIC_PREFIX }}js/player.js"></script>