From 54ed08ef75dbd005ecb8d0ac37073b1a74a985c0 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 17 Dec 2012 13:20:17 -0500 Subject: s/scannerjammer.fm/scannerjammer.com/ migration --- frontend/static/bgz/index.html | 4 +- frontend/static/faq/index.html | 12 ++--- frontend/static/js/auth.js | 6 +-- frontend/static/js/avatar.js | 8 ++-- frontend/static/js/chat.js | 2 +- frontend/static/js/player.js | 2 +- frontend/static/js/profile.js | 4 +- frontend/static/js/register.js | 4 +- frontend/static/js/room.js | 20 ++++---- frontend/static/js/roomlist.js | 2 +- frontend/static/js/sj6.js | 30 ++++++------ frontend/static/js/test-admin.js | 4 +- frontend/static/other_rooms/admin.html | 32 ++++++------- frontend/static/other_rooms/calendar.html | 16 +++---- frontend/static/other_rooms/embed-test.html | 2 +- frontend/static/other_rooms/embed-test2.html | 2 +- frontend/static/other_rooms/embed.html | 38 +++++++-------- frontend/static/other_rooms/liketest.html | 52 ++++++++++----------- frontend/static/other_rooms/topvids.html | 20 ++++---- frontend/static/radio/default.html | 10 ++-- frontend/static/radio/disaro.html | 10 ++-- frontend/static/radio/glasspopcorn.html | 12 ++--- frontend/static/radio/sewergreats.html | 12 ++--- frontend/static/register/index.html | 12 ++--- .../avatar.sassc | Bin 7935 -> 7936 bytes .../calendar.sassc | Bin 11051 -> 11052 bytes .../diornights.sassc | Bin 12631 -> 12635 bytes .../disaro.sassc | Bin 3783 -> 3784 bytes .../embed.sassc | Bin 12863 -> 12864 bytes .../feederbleeder.sassc | Bin 3790 -> 3791 bytes .../frederick.sassc | Bin 1126 -> 1127 bytes .../gallery-white.sassc | Bin 27221 -> 27222 bytes .../glitter.sassc | Bin 6169 -> 6170 bytes .../profile.sassc | 8 ++-- .../roomlist.sassc | Bin 14116 -> 14117 bytes .../screen.sassc | 10 ++-- .../sexydj_main.sassc | Bin 9073 -> 9076 bytes .../sexydj_player.sassc | Bin 2462 -> 2463 bytes .../test.sassc | Bin 31932 -> 31936 bytes .../tiny.sassc | Bin 5629 -> 5630 bytes .../top.sassc | Bin 7593 -> 7594 bytes .../vtest1.sassc | Bin 23655 -> 23656 bytes .../vtest2.sassc | Bin 23768 -> 23769 bytes .../vtest3.sassc | Bin 27658 -> 27659 bytes .../_utilities.scssc | Bin 12353 -> 12355 bytes .../avatar.sassc | Bin 8366 -> 8368 bytes .../calendar.sassc | Bin 10786 -> 10788 bytes .../diornights.sassc | Bin 11788 -> 11790 bytes .../embed.sassc | Bin 11422 -> 11424 bytes .../feederbleeder.sassc | Bin 4449 -> 4451 bytes .../frederick.sassc | Bin 2005 -> 2007 bytes .../gallery-white.sassc | Bin 21199 -> 21201 bytes .../glitter.sassc | Bin 8320 -> 8322 bytes .../ie.scssc | Bin 1877 -> 1879 bytes .../main.sassc | Bin 1240 -> 1242 bytes .../print.scssc | Bin 1762 -> 1764 bytes .../profile.sassc | Bin 56389 -> 56391 bytes .../roomlist.sassc | Bin 13754 -> 13756 bytes .../screen.sassc | Bin 91566 -> 91568 bytes .../screen.scssc | Bin 1979 -> 1981 bytes .../sewergreats.sassc | Bin 1247 -> 1249 bytes .../sexydj_main.sassc | Bin 8406 -> 8408 bytes .../sexydj_player.sassc | Bin 3050 -> 3052 bytes .../test.sassc | Bin 28006 -> 28008 bytes .../tiny.sassc | Bin 4875 -> 4877 bytes .../top.sassc | Bin 8348 -> 8350 bytes .../vtest.sassc | Bin 20264 -> 20266 bytes .../vtest1.sassc | Bin 22812 -> 22814 bytes .../vtest2.sassc | Bin 22928 -> 22930 bytes .../vtest3.sassc | Bin 26805 -> 26807 bytes .../_reset.scssc | Bin 1127 -> 1129 bytes .../avatar.sassc | Bin 8988 -> 8989 bytes .../calendar.sassc | Bin 12537 -> 12538 bytes .../diornights.sassc | Bin 13265 -> 13266 bytes .../disaro.sassc | Bin 4229 -> 4230 bytes .../embed.sassc | Bin 14898 -> 14899 bytes .../feederbleeder.sassc | Bin 4236 -> 4237 bytes .../frederick.sassc | Bin 1229 -> 1230 bytes .../gallery-white.sassc | Bin 30768 -> 30769 bytes .../glitter.sassc | Bin 7017 -> 7018 bytes .../profile.sassc | Bin 67494 -> 67495 bytes .../roomlist.sassc | Bin 15906 -> 15907 bytes .../screen.sassc | Bin 113201 -> 113202 bytes .../test.sassc | Bin 35069 -> 35070 bytes .../tiny.sassc | Bin 6655 -> 6656 bytes .../top.sassc | Bin 8542 -> 8543 bytes frontend/static/stylesheets/src/screen.css | 6 +-- frontend/static/template/directory.html | 4 +- frontend/static/template/index.html | 28 +++++------ frontend/static/template/profile.html | 20 ++++---- frontend/static/template/redir.html | 4 +- frontend/static/template/register.html | 10 ++-- frontend/static/template/room.html | 24 +++++----- frontend/static/template/roomlist.html | 18 +++---- frontend/static/tumblrplay/input.html | 2 +- frontend/templates/directory.html | 2 +- frontend/templates/profile.html | 2 +- frontend/templates/room.html | 4 +- frontend/templates/roomlist.html | 2 +- frontend/templates/topvideos.html | 2 +- frontend/views.py | 8 ++-- 101 files changed, 235 insertions(+), 235 deletions(-) (limited to 'frontend') diff --git a/frontend/static/bgz/index.html b/frontend/static/bgz/index.html index 59b82ea..d0264c5 100644 --- a/frontend/static/bgz/index.html +++ b/frontend/static/bgz/index.html @@ -1,12 +1,12 @@ + content="0; URL=http://scannerjammer.com:17769/">
Sending you through to - Scanner Jammer..! + Scanner Jammer..!
diff --git a/frontend/static/faq/index.html b/frontend/static/faq/index.html index 9f1d937..fd76e86 100644 --- a/frontend/static/faq/index.html +++ b/frontend/static/faq/index.html @@ -163,7 +163,7 @@ a
@@ -224,8 +224,8 @@ All profiles can be accessed by clicking on a username. also check out the
-
- +
+

who made this?

@@ -255,7 +255,7 @@ yes. we can play any Vimeo or Soundcloud url.

how can I help scannerjammer, I like this site!

- +

click the like button. it's crucial ------------------> @@ -266,12 +266,12 @@ yes. we can play any Vimeo or Soundcloud url. post the best video you can find and cross your fingers

-
+

what does the flower mean?

the flower means you liked something

-
+

what does the glittery plant mean?

the plant means someone liked a video you posted <3 diff --git a/frontend/static/js/auth.js b/frontend/static/js/auth.js index bb2d304..a0c667d 100644 --- a/frontend/static/js/auth.js +++ b/frontend/static/js/auth.js @@ -33,7 +33,7 @@ var Auth = Auth.session = u[2] Auth.access = u[3] - document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.fm;max-age=1086400" + document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.com;max-age=1086400" Auth.success() }, checkin: function () @@ -80,7 +80,7 @@ var Auth = d.warn(lines[1]) if (! Auth.session) return - document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.fm;max-age=1086400" + document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.com;max-age=1086400" Auth.success() }, logout: function () @@ -92,7 +92,7 @@ var Auth = Auth.username = false Local.set('userid', false) Local.set('username', false) - document.cookie = "session=false;path=/;domain=.scannerjammer.fm;max-age=0" + document.cookie = "session=false;path=/;domain=.scannerjammer.com;max-age=0" Auth.session = "" Auth.load() }, diff --git a/frontend/static/js/avatar.js b/frontend/static/js/avatar.js index ce97617..11d39d4 100644 --- a/frontend/static/js/avatar.js +++ b/frontend/static/js/avatar.js @@ -86,8 +86,8 @@ Chat.say = function () // $("#chat").append(newdiv) // if (newdiv.indexOf("' } - else if (word.indexOf("scannerjammer.fm/profile") !== -1) + else if (word.indexOf("scannerjammer.com/profile") !== -1) { var username = word.substr( word.indexOf("profile")+8 ).replace("/","") s += 'ScannerJammer: '+username+'' diff --git a/frontend/static/js/chat.js b/frontend/static/js/chat.js index 099f6da..822e1ee 100644 --- a/frontend/static/js/chat.js +++ b/frontend/static/js/chat.js @@ -99,7 +99,7 @@ var Chat = { s += '' } - else if (word.indexOf("scannerjammer.fm/profile") !== -1) + else if (word.indexOf("scannerjammer.com/profile") !== -1) { var username = word.substr( word.indexOf("profile")+8 ).replace("/","") s += '@'+username+'' diff --git a/frontend/static/js/player.js b/frontend/static/js/player.js index 55250ab..87973a4 100644 --- a/frontend/static/js/player.js +++ b/frontend/static/js/player.js @@ -306,7 +306,7 @@ var Player = { d.warn("UPDATING LINK") $("#video-link").attr("href", video.src) - var vidurl = "http://scannerjammer.fm/" + var vidurl = "http://scannerjammer.com/" if (Room.name !== "main") vidurl += Room.name+"/" vidurl += "#v="+video.id diff --git a/frontend/static/js/profile.js b/frontend/static/js/profile.js index addce07..4a57d6b 100644 --- a/frontend/static/js/profile.js +++ b/frontend/static/js/profile.js @@ -163,8 +163,8 @@ var Settings = eventSet: false, defaults: { - avatar: "http://scannerjammer.fm/img/runner.gif", - bg: "http://scannerjammer.fm/bgz/scannerjammer_cyberspace.jpg", + avatar: "http://scannerjammer.com/img/runner.gif", + bg: "http://scannerjammer.com/bgz/scannerjammer_cyberspace.jpg", }, open: function () { diff --git a/frontend/static/js/register.js b/frontend/static/js/register.js index 87923b5..d4854bf 100644 --- a/frontend/static/js/register.js +++ b/frontend/static/js/register.js @@ -22,7 +22,7 @@ var API = HEADER: "#@scanjam 0.3b", LIKE_STRING: "like", HAS_LOCAL_STORAGE: supports_html5_storage(), - BASE_URL: "http://scannerjammer.fm", + BASE_URL: "http://scannerjammer.com", URL: { auth: @@ -126,7 +126,7 @@ var Register = var u = lines[1].split("\t") Local.userid(u[0]) Local.username(u[1]) - document.cookie = "session="+u[2]+";path=/;domain=.scannerjammer.fm;max-age=1086400" + document.cookie = "session="+u[2]+";path=/;domain=.scannerjammer.com;max-age=1086400" $("#register").fadeOut(1000, function () { diff --git a/frontend/static/js/room.js b/frontend/static/js/room.js index a5e70d0..48924d9 100644 --- a/frontend/static/js/room.js +++ b/frontend/static/js/room.js @@ -259,7 +259,7 @@ var Room = // $("#chat").append(div) setTimeout(Player.start, 2000) Room.loaded = true - document.cookie = "room="+Room.name+";path=/;domain=.scannerjammer.fm;max-age=86400" + document.cookie = "room="+Room.name+";path=/;domain=.scannerjammer.com;max-age=86400" if (Room.loadCallback) Room.loadCallback() }, @@ -285,13 +285,13 @@ var Rooms = { loaded: false, queue: [ - [0, "rooms", "/", "http://scannerjammer.fm/bgz/gridzy9.jpg", "→ SEE ALL OPEN ROOMS"], - [1, "main", "/main", "http://scannerjammer.fm/bgz/1302474305250-dumpfm-GucciSoFlosy-pattern4.gif", "MAIN ROOM"], - [12, "FEEDERBLEEDER", "/feederbleeder", "http://scannerjammer.fm/img/Tropic_Of_Cancer__The_Sorrow_Of_Two_Blooms_1308602037.jpg", "FEEDERBLEEDER"], - [2, "avatar", "/avatar", "http://scannerjammer.fm/img/avatar2.png", "avatar"], - [3, "glitter", "/glitter", "http://scannerjammer.fm/bgz/argus.gif", "glitter"], - [10, 'jono', '/jonomilo', 'http://scannerjammer.fm/bgz/whitesquare.gif', 'jònò mì lò'], - //[11, 'SJD', 'http://lolz.biz/sjd', 'http://scannerjammer.fm/img/idgiguy2.png', 'SJD'], + [0, "rooms", "/", "http://scannerjammer.com/bgz/gridzy9.jpg", "→ SEE ALL OPEN ROOMS"], + [1, "main", "/main", "http://scannerjammer.com/bgz/1302474305250-dumpfm-GucciSoFlosy-pattern4.gif", "MAIN ROOM"], + [12, "FEEDERBLEEDER", "/feederbleeder", "http://scannerjammer.com/img/Tropic_Of_Cancer__The_Sorrow_Of_Two_Blooms_1308602037.jpg", "FEEDERBLEEDER"], + [2, "avatar", "/avatar", "http://scannerjammer.com/img/avatar2.png", "avatar"], + [3, "glitter", "/glitter", "http://scannerjammer.com/bgz/argus.gif", "glitter"], + [10, 'jono', '/jonomilo', 'http://scannerjammer.com/bgz/whitesquare.gif', 'jònò mì lò'], + //[11, 'SJD', 'http://lolz.biz/sjd', 'http://scannerjammer.com/img/idgiguy2.png', 'SJD'], [4, "waterfall", "/waterfall", "http://i.imgur.com/QEZRF.gif", "waterfall"], ], list: function () @@ -332,7 +332,7 @@ var About = loaded: false, init: function () { - $("#your-profile").attr('href', 'http://scannerjammer.fm/profile/'+Auth.username) + $("#your-profile").attr('href', 'http://scannerjammer.com/profile/'+Auth.username) About.loaded = true } } @@ -412,7 +412,7 @@ var VideoChat = }, open: function () { - // $("#tokbox-embed").html('') + // $("#tokbox-embed").html('') // $("#tokbox-embed").show() // $(window).trigger('resize') VideoChat.isOpen = true diff --git a/frontend/static/js/roomlist.js b/frontend/static/js/roomlist.js index a1d737c..1b6c6d8 100644 --- a/frontend/static/js/roomlist.js +++ b/frontend/static/js/roomlist.js @@ -88,7 +88,7 @@ var Roomlist = var presortMap = {} for (var i = 0; i < presortOrder.length; i++) presortMap[presortOrder[i]] = true - //roomz['sjd'] = Roomlist.newRecord([0,"sjd",0,0,"http://scannerjammer.fm/img/sjd.jpg"]) + //roomz['sjd'] = Roomlist.newRecord([0,"sjd",0,0,"http://scannerjammer.com/img/sjd.jpg"]) for (var i = 0; i < ROOM_LIST.length; i++) { var row = ROOM_LIST[i] diff --git a/frontend/static/js/sj6.js b/frontend/static/js/sj6.js index 73d2880..8aef9a8 100644 --- a/frontend/static/js/sj6.js +++ b/frontend/static/js/sj6.js @@ -3380,7 +3380,7 @@ var Auth = Auth.session = u[2] Auth.access = u[3] - document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.fm;max-age=1086400" + document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.com;max-age=1086400" Auth.success() }, checkin: function () @@ -3427,7 +3427,7 @@ var Auth = d.warn(lines[1]) if (! Auth.session) return - document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.fm;max-age=1086400" + document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.com;max-age=1086400" Auth.success() }, logout: function () @@ -3439,7 +3439,7 @@ var Auth = Auth.username = false Local.set('userid', false) Local.set('username', false) - document.cookie = "session=false;path=/;domain=.scannerjammer.fm;max-age=0" + document.cookie = "session=false;path=/;domain=.scannerjammer.com;max-age=0" Auth.session = "" Auth.load() }, @@ -4107,7 +4107,7 @@ var Player = { d.warn("UPDATING LINK") $("#video-link").attr("href", video.src) - var vidurl = "http://scannerjammer.fm/" + var vidurl = "http://scannerjammer.com/" if (Room.name !== "main") vidurl += Room.name+"/" vidurl += "#v="+video.id @@ -5203,7 +5203,7 @@ var Chat = { s += '' } - else if (word.indexOf("scannerjammer.fm/profile") !== -1) + else if (word.indexOf("scannerjammer.com/profile") !== -1) { var username = word.substr( word.indexOf("profile")+8 ).replace("/","") s += '@'+username+'' @@ -5643,7 +5643,7 @@ var Room = // $("#chat").append(div) setTimeout(Player.start, 2000) Room.loaded = true - document.cookie = "room="+Room.name+";path=/;domain=.scannerjammer.fm;max-age=86400" + document.cookie = "room="+Room.name+";path=/;domain=.scannerjammer.com;max-age=86400" if (Room.loadCallback) Room.loadCallback() }, @@ -5669,13 +5669,13 @@ var Rooms = { loaded: false, queue: [ - [0, "rooms", "/", "http://scannerjammer.fm/bgz/gridzy9.jpg", "→ SEE ALL OPEN ROOMS"], - [1, "main", "/main", "http://scannerjammer.fm/bgz/1302474305250-dumpfm-GucciSoFlosy-pattern4.gif", "MAIN ROOM"], - [12, "FEEDERBLEEDER", "/feederbleeder", "http://scannerjammer.fm/img/Tropic_Of_Cancer__The_Sorrow_Of_Two_Blooms_1308602037.jpg", "FEEDERBLEEDER"], - [2, "avatar", "/avatar", "http://scannerjammer.fm/img/avatar2.png", "avatar"], - [3, "glitter", "/glitter", "http://scannerjammer.fm/bgz/argus.gif", "glitter"], - [10, 'jono', '/jonomilo', 'http://scannerjammer.fm/bgz/whitesquare.gif', 'jònò mì lò'], - //[11, 'SJD', 'http://lolz.biz/sjd', 'http://scannerjammer.fm/img/idgiguy2.png', 'SJD'], + [0, "rooms", "/", "http://scannerjammer.com/bgz/gridzy9.jpg", "→ SEE ALL OPEN ROOMS"], + [1, "main", "/main", "http://scannerjammer.com/bgz/1302474305250-dumpfm-GucciSoFlosy-pattern4.gif", "MAIN ROOM"], + [12, "FEEDERBLEEDER", "/feederbleeder", "http://scannerjammer.com/img/Tropic_Of_Cancer__The_Sorrow_Of_Two_Blooms_1308602037.jpg", "FEEDERBLEEDER"], + [2, "avatar", "/avatar", "http://scannerjammer.com/img/avatar2.png", "avatar"], + [3, "glitter", "/glitter", "http://scannerjammer.com/bgz/argus.gif", "glitter"], + [10, 'jono', '/jonomilo', 'http://scannerjammer.com/bgz/whitesquare.gif', 'jònò mì lò'], + //[11, 'SJD', 'http://lolz.biz/sjd', 'http://scannerjammer.com/img/idgiguy2.png', 'SJD'], [4, "waterfall", "/waterfall", "http://i.imgur.com/QEZRF.gif", "waterfall"], ], list: function () @@ -5716,7 +5716,7 @@ var About = loaded: false, init: function () { - $("#your-profile").attr('href', 'http://scannerjammer.fm/profile/'+Auth.username) + $("#your-profile").attr('href', 'http://scannerjammer.com/profile/'+Auth.username) About.loaded = true } } @@ -5796,7 +5796,7 @@ var VideoChat = }, open: function () { - // $("#tokbox-embed").html('') + // $("#tokbox-embed").html('') // $("#tokbox-embed").show() // $(window).trigger('resize') VideoChat.isOpen = true diff --git a/frontend/static/js/test-admin.js b/frontend/static/js/test-admin.js index ebae8f4..5c34099 100644 --- a/frontend/static/js/test-admin.js +++ b/frontend/static/js/test-admin.js @@ -66,7 +66,7 @@ var AdminTest = $("#room-name").html(Room.name) $("#return-link").attr("href", "/"+Room.name) $("#room-lastlog").val(Lastlog.old) - $("#pnp").attr("src", "http://scannerjammer.fm/"+Room.name+"/read") + $("#pnp").attr("src", "http://scannerjammer.com/"+Room.name+"/read") }, statsLoad: function () { @@ -78,7 +78,7 @@ var AdminTest = greetings += ">>> Need to fix someone's password?" greetings += "

" greetings += "Congratulations, %%USERNAME%%! You, on the basis of your score, have been selected to be a SCANNERJAMMER MODERATOR!

" - greetings += "This means we are asking you to be a part of our team. As a moderator, your responsibility is to clear all of the crap videos from the playlist. If something seems like it doesn't belong, do not hesitate to remove it. We care about the content of our site. Soon we will also be adding a mute feature.

Another power you have been granted is to make your OWN SCANNERJAMMER ROOM. Only mods can do this! All you need to do is add the name of your new room to the end of the URL. For example, type scannerjammer.fm/whatupdoe into the address bar and lo and behold, the SCANNERJAMMER \"whatupdoe\" room has been created!

This is a great way to have a more private SCANNERJAMMER experience, should you want to talk to friends. Feel free to create as many rooms as you want.

Thank you, we love you! -Pepper and ryz" + greetings += "This means we are asking you to be a part of our team. As a moderator, your responsibility is to clear all of the crap videos from the playlist. If something seems like it doesn't belong, do not hesitate to remove it. We care about the content of our site. Soon we will also be adding a mute feature.

Another power you have been granted is to make your OWN SCANNERJAMMER ROOM. Only mods can do this! All you need to do is add the name of your new room to the end of the URL. For example, type scannerjammer.com/whatupdoe into the address bar and lo and behold, the SCANNERJAMMER \"whatupdoe\" room has been created!

This is a great way to have a more private SCANNERJAMMER experience, should you want to talk to friends. Feel free to create as many rooms as you want.

Thank you, we love you! -Pepper and ryz" greetings = greetings.replace("%%USERNAME%%", Auth.username) if (html) greetings += "

STATS TODAY
"+html diff --git a/frontend/static/other_rooms/admin.html b/frontend/static/other_rooms/admin.html index 1213780..4ec4a31 100644 --- a/frontend/static/other_rooms/admin.html +++ b/frontend/static/other_rooms/admin.html @@ -40,7 +40,7 @@

@@ -53,26 +53,26 @@
- - - - - - - - - - - - + + + + + + + + + + + + - + diff --git a/frontend/static/other_rooms/calendar.html b/frontend/static/other_rooms/calendar.html index ad7ec08..313eec1 100644 --- a/frontend/static/other_rooms/calendar.html +++ b/frontend/static/other_rooms/calendar.html @@ -5,12 +5,12 @@ - + - - + + @@ -19,10 +19,10 @@
@@ -43,7 +43,7 @@ [link] - + @@ -58,14 +58,14 @@
-
+
please enable javascript
diff --git a/frontend/static/other_rooms/embed-test.html b/frontend/static/other_rooms/embed-test.html index 59eca26..6069fcc 100644 --- a/frontend/static/other_rooms/embed-test.html +++ b/frontend/static/other_rooms/embed-test.html @@ -42,7 +42,7 @@ background-image: -moz-linear-gradient( } - + diff --git a/frontend/static/other_rooms/embed-test2.html b/frontend/static/other_rooms/embed-test2.html index dae7054..3e7bb5d 100644 --- a/frontend/static/other_rooms/embed-test2.html +++ b/frontend/static/other_rooms/embed-test2.html @@ -42,7 +42,7 @@ background-image: -moz-linear-gradient( } - + diff --git a/frontend/static/other_rooms/embed.html b/frontend/static/other_rooms/embed.html index f01decd..70d35f1 100644 --- a/frontend/static/other_rooms/embed.html +++ b/frontend/static/other_rooms/embed.html @@ -4,12 +4,12 @@ RADIO - + - - + + @@ -29,7 +29,7 @@ [link] Use arrow keys to switch videos - + @@ -40,25 +40,25 @@
- + - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/frontend/static/other_rooms/liketest.html b/frontend/static/other_rooms/liketest.html index 86c86aa..f9329d4 100644 --- a/frontend/static/other_rooms/liketest.html +++ b/frontend/static/other_rooms/liketest.html @@ -5,8 +5,8 @@ - - + + @@ -15,17 +15,17 @@

IFRAME

-

http://scannerjammer.fm/

- +

http://scannerjammer.com/

+ -

http://scannerjammer.fm:17769/

- +

http://scannerjammer.com:17769/

+ -

http://www.scannerjammer.fm/

- +

http://www.scannerjammer.com/

+ -

http://www.scannerjammer.fm:17769/

- +

http://www.scannerjammer.com:17769/

+

http://www.facebook.com/pages/ScannerJammer/191565564214855

@@ -35,29 +35,29 @@

JAVASCRIPT

-

http://scannerjammer.fm/

- +

http://scannerjammer.com/

+ -

http://scannerjammer.fm:17769/

- +

http://scannerjammer.com:17769/

+ -

http://www.scannerjammer.fm/

- +

http://www.scannerjammer.com/

+ -

http://www.scannerjammer.fm:17769/

- +

http://www.scannerjammer.com:17769/

+ -

http://scannerjammer.fm

- +

http://scannerjammer.com

+ -

http://scannerjammer.fm:17769

- +

http://scannerjammer.com:17769

+ -

http://www.scannerjammer.fm

- +

http://www.scannerjammer.com

+ -

http://www.scannerjammer.fm:17769

- +

http://www.scannerjammer.com:17769

+

http://www.facebook.com/pages/ScannerJammer/191565564214855

diff --git a/frontend/static/other_rooms/topvids.html b/frontend/static/other_rooms/topvids.html index f265bbc..549f151 100644 --- a/frontend/static/other_rooms/topvids.html +++ b/frontend/static/other_rooms/topvids.html @@ -2,12 +2,12 @@ TOP VIDEOS ON SCANNERJAMMER - + - - + + @@ -36,15 +36,15 @@ background-image: -moz-linear-gradient(
-
+
-
-
+
+
@@ -60,7 +60,7 @@ background-image: -moz-linear-gradient( [x] - +
@@ -77,7 +77,7 @@ background-image: -moz-linear-gradient( directory .
- +
@@ -98,7 +98,7 @@ background-image: -moz-linear-gradient( +
- +
- + +
- +
- + +
- +
- + +
- +
And you might also enjoy ... - +
- + diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/avatar.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/avatar.sassc index 6d61376..8a0db6b 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/avatar.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/avatar.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/calendar.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/calendar.sassc index b46f968..e889bee 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/calendar.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/calendar.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/diornights.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/diornights.sassc index 477fd59..da9d4c0 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/diornights.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/diornights.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/disaro.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/disaro.sassc index e0af9fe..69cbe30 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/disaro.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/disaro.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/embed.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/embed.sassc index 2863e4d..55466ce 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/embed.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/embed.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/feederbleeder.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/feederbleeder.sassc index fa950ef..5a70484 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/feederbleeder.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/feederbleeder.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/frederick.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/frederick.sassc index 098d852..2ca0e38 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/frederick.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/frederick.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/gallery-white.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/gallery-white.sassc index b782349..815beae 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/gallery-white.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/gallery-white.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/glitter.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/glitter.sassc index db9d4b6..f3c2034 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/glitter.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/glitter.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/profile.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/profile.sassc index abfa13e..ad2a2bb 100644 --- a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/profile.sassc +++ b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/profile.sassc @@ -514,16 +514,16 @@ nav border-bottom: 4px solid transparent display: inline-block -: @options{:@has_childrenT:@children[o:Sass::Tree::ImportNode ;0:@imported_filename"compass/reset;@:@filename"D/var/www/vhosts/scannerjammer.fm/sandbox/sass/src/profile.sass: +: @options{:@has_childrenT:@children[o:Sass::Tree::ImportNode ;0:@imported_filename"compass/reset;@:@filename"D/var/www/vhosts/scannerjammer.com/sandbox/sass/src/profile.sass: @linei; [o:Sass::Tree::MixinDefNode : @name" rounded;@;T: @args[[o:Sass::Script::Variable;" width;{:project_name" sass/: -cacheT:cache_location"?/var/www/vhosts/scannerjammer.fm/sandbox/sass/.sass-cache: importero: Sass::Importers::Filesystem: -@root"7/var/www/vhosts/scannerjammer.fm/sandbox/sass/src:line_commentsT:original_filename@ :output_style:compressed:filesystem_importerc Sass::Importers::Filesystem:cache_storeo:Sass::CacheStores::Chain: @caches[u:Sass::CacheStores::Memoryo:"Sass::CacheStores::Filesystem:@cache_location"?/var/www/vhosts/scannerjammer.com/sandbox/sass/.sass-cache: +cacheT:cache_location"?/var/www/vhosts/scannerjammer.com/sandbox/sass/.sass-cache: importero: Sass::Importers::Filesystem: +@root"7/var/www/vhosts/scannerjammer.com/sandbox/sass/src:line_commentsT:original_filename@ :output_style:compressed:filesystem_importerc Sass::Importers::Filesystem:cache_storeo:Sass::CacheStores::Chain: @caches[u:Sass::CacheStores::Memoryo:"Sass::CacheStores::Filesystem:@cache_location"?/var/www/vhosts/scannerjammer.com/sandbox/sass/.sass-cache: style;: filename@ : -quietT: syntax: sass:property_syntax0: loud[:identical:overwrite: create:load_paths[ o;;"7/var/www/vhosts/scannerjammer.fm/sandbox/sass/srco;;"V/usr/local/lib/ruby/gems/1.8/gems/compass-0.11.5/frameworks/blueprint/stylesheetso;;"T/usr/local/lib/ruby/gems/1.8/gems/compass-0.11.5/frameworks/compass/stylesheetso:Compass::SpriteImporter: @uri";{:@underscored_name" +quietT: syntax: sass:property_syntax0: loud[:identical:overwrite: create:load_paths[ o;;"7/var/www/vhosts/scannerjammer.com/sandbox/sass/srco;;"V/usr/local/lib/ruby/gems/1.8/gems/compass-0.11.5/frameworks/blueprint/stylesheetso;;"T/usr/local/lib/ruby/gems/1.8/gems/compass-0.11.5/frameworks/compass/stylesheetso:Compass::SpriteImporter: @uri";{:@underscored_name" width0; @ ; i; [ o:Sass::Tree::PropNode : @tabsi;["-moz-border-radius;@:@prop_syntax:new; @ : @valueo; ;" width;@;0" diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/roomlist.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/roomlist.sassc index 1dd88a9..5bbfb43 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/roomlist.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/roomlist.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/screen.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/screen.sassc index 192a235..5f6fba9 100644 --- a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/screen.sassc +++ b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/screen.sassc @@ -886,16 +886,16 @@ button background: black opacity: 1.0 -: @options{:@has_childrenT:@children[5o:Sass::Tree::ImportNode ;0:@imported_filename"compass/reset;@:@filename"C/var/www/vhosts/scannerjammer.fm/sandbox/sass/src/screen.sass: +: @options{:@has_childrenT:@children[5o:Sass::Tree::ImportNode ;0:@imported_filename"compass/reset;@:@filename"C/var/www/vhosts/scannerjammer.com/sandbox/sass/src/screen.sass: @linei; [o:Sass::Tree::MixinDefNode : @name" rounded;@;T: @args[[o:Sass::Script::Variable;" width;{:project_name" sass/: -cacheT:cache_location"?/var/www/vhosts/scannerjammer.fm/sandbox/sass/.sass-cache: importero: Sass::Importers::Filesystem: -@root"7/var/www/vhosts/scannerjammer.fm/sandbox/sass/src:line_commentsT:original_filename@ :output_style:compressed:filesystem_importerc Sass::Importers::Filesystem:cache_storeo:Sass::CacheStores::Chain: @caches[u:Sass::CacheStores::Memoryo:"Sass::CacheStores::Filesystem:@cache_location"?/var/www/vhosts/scannerjammer.com/sandbox/sass/.sass-cache: -style;: filename@ :css_filename"J/var/www/vhosts/scannerjammer.fm/sandbox/sass/stylesheets/screen.css: -quietT: syntax: sass:property_syntax0: loud[:identical:overwrite: create:load_paths[ o;;"7/var/www/vhosts/scannerjammer.fm/sandbox/sass/srco;;"V/usr/local/lib/ruby/gems/1.8/gems/compass-0.11.5/frameworks/blueprint/stylesheetso;;"T/usr/local/lib/ruby/gems/1.8/gems/compass-0.11.5/frameworks/compass/stylesheetso:Compass::SpriteImporter: @uri";{:@underscored_name" +cacheT:cache_location"?/var/www/vhosts/scannerjammer.com/sandbox/sass/.sass-cache: importero: Sass::Importers::Filesystem: +@root"7/var/www/vhosts/scannerjammer.com/sandbox/sass/src:line_commentsT:original_filename@ :output_style:compressed:filesystem_importerc Sass::Importers::Filesystem:cache_storeo:Sass::CacheStores::Chain: @caches[u:Sass::CacheStores::Memoryo:"Sass::CacheStores::Filesystem:@cache_location"?/var/www/vhosts/scannerjammer.com/sandbox/sass/.sass-cache: +style;: filename@ :css_filename"J/var/www/vhosts/scannerjammer.com/sandbox/sass/stylesheets/screen.css: +quietT: syntax: sass:property_syntax0: loud[:identical:overwrite: create:load_paths[ o;;"7/var/www/vhosts/scannerjammer.com/sandbox/sass/srco;;"V/usr/local/lib/ruby/gems/1.8/gems/compass-0.11.5/frameworks/blueprint/stylesheetso;;"T/usr/local/lib/ruby/gems/1.8/gems/compass-0.11.5/frameworks/compass/stylesheetso:Compass::SpriteImporter: @uri";{:@underscored_name" width0; @ ; i; [ o:Sass::Tree::PropNode : @tabsi;["-moz-border-radius;@:@prop_syntax:new; @ : @valueo; ;" width;@;1" diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/sexydj_main.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/sexydj_main.sassc index 753650f..c8dcae6 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/sexydj_main.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/sexydj_main.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/sexydj_player.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/sexydj_player.sassc index f1b185a..73f3239 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/sexydj_player.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/sexydj_player.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/test.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/test.sassc index 6503b81..1440dd7 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/test.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/test.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/tiny.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/tiny.sassc index 18e6a5a..711c906 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/tiny.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/tiny.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/top.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/top.sassc index 2ba22e9..7b69797 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/top.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/top.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/vtest1.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/vtest1.sassc index 5755ae0..f78709a 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/vtest1.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/vtest1.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/vtest2.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/vtest2.sassc index abf21d1..4271e7a 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/vtest2.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/vtest2.sassc differ diff --git a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/vtest3.sassc b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/vtest3.sassc index e26d3cf..d0c3dd9 100644 Binary files a/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/vtest3.sassc and b/frontend/static/sass/.sass-cache/644f2f2d5fca6dddf0ddfc92ac7e786fa6152755/vtest3.sassc differ diff --git a/frontend/static/sass/.sass-cache/979cb0604153df91b26ad31e4a3968c997fc15e0/_utilities.scssc b/frontend/static/sass/.sass-cache/979cb0604153df91b26ad31e4a3968c997fc15e0/_utilities.scssc index 19cc72b..ba33dbc 100644 Binary files a/frontend/static/sass/.sass-cache/979cb0604153df91b26ad31e4a3968c997fc15e0/_utilities.scssc and b/frontend/static/sass/.sass-cache/979cb0604153df91b26ad31e4a3968c997fc15e0/_utilities.scssc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/avatar.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/avatar.sassc index 7a17ebd..9f8407f 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/avatar.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/avatar.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/calendar.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/calendar.sassc index 45491b4..c085577 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/calendar.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/calendar.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/diornights.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/diornights.sassc index 1bbbbca..0270bf2 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/diornights.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/diornights.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/embed.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/embed.sassc index 61d9fe0..6afd6ac 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/embed.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/embed.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/feederbleeder.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/feederbleeder.sassc index cf26190..6773b0a 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/feederbleeder.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/feederbleeder.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/frederick.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/frederick.sassc index f69b72e..d4aa292 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/frederick.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/frederick.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/gallery-white.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/gallery-white.sassc index 62ffb64..c8953b3 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/gallery-white.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/gallery-white.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/glitter.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/glitter.sassc index 1985eed..125a8a5 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/glitter.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/glitter.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/ie.scssc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/ie.scssc index 7ed024a..cc5a38b 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/ie.scssc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/ie.scssc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/main.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/main.sassc index 5d4e72c..bb6fc74 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/main.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/main.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/print.scssc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/print.scssc index 4574cd7..20cafa3 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/print.scssc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/print.scssc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/profile.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/profile.sassc index ee1ec5c..e9c2f25 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/profile.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/profile.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/roomlist.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/roomlist.sassc index 1bff00a..040b28f 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/roomlist.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/roomlist.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/screen.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/screen.sassc index e62ed2e..c7aa667 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/screen.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/screen.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/screen.scssc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/screen.scssc index d302ec5..f438403 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/screen.scssc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/screen.scssc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/sewergreats.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/sewergreats.sassc index d0a3497..804a3e8 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/sewergreats.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/sewergreats.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/sexydj_main.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/sexydj_main.sassc index 679c56c..4101611 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/sexydj_main.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/sexydj_main.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/sexydj_player.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/sexydj_player.sassc index 431e1d3..e91b803 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/sexydj_player.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/sexydj_player.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/test.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/test.sassc index b1e6298..a72448f 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/test.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/test.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/tiny.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/tiny.sassc index 9bfdd5f..8adb51c 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/tiny.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/tiny.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/top.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/top.sassc index 2c976ae..a8989a9 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/top.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/top.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest.sassc index b464954..f366092 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest1.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest1.sassc index 81522d0..fb08d9c 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest1.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest1.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest2.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest2.sassc index 5d16223..8b0d65e 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest2.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest2.sassc differ diff --git a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest3.sassc b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest3.sassc index 4300bcc..3ef990f 100644 Binary files a/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest3.sassc and b/frontend/static/sass/.sass-cache/aaa7be21d89e0c59dac401ea2fc1869bdfa76e53/vtest3.sassc differ diff --git a/frontend/static/sass/.sass-cache/e708b27684b7743d4ded18d0ddc82a270ca22e62/_reset.scssc b/frontend/static/sass/.sass-cache/e708b27684b7743d4ded18d0ddc82a270ca22e62/_reset.scssc index 9122132..8704630 100644 Binary files a/frontend/static/sass/.sass-cache/e708b27684b7743d4ded18d0ddc82a270ca22e62/_reset.scssc and b/frontend/static/sass/.sass-cache/e708b27684b7743d4ded18d0ddc82a270ca22e62/_reset.scssc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/avatar.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/avatar.sassc index 47b8fe4..ed51a72 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/avatar.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/avatar.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/calendar.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/calendar.sassc index 4edc512..30d9763 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/calendar.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/calendar.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/diornights.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/diornights.sassc index fe5ddea..e206d30 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/diornights.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/diornights.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/disaro.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/disaro.sassc index 51eb934..b1a4a56 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/disaro.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/disaro.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/embed.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/embed.sassc index c11ed6d..e43306a 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/embed.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/embed.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/feederbleeder.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/feederbleeder.sassc index 37d453e..ea64774 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/feederbleeder.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/feederbleeder.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/frederick.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/frederick.sassc index 7fac10b..3c26800 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/frederick.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/frederick.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/gallery-white.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/gallery-white.sassc index e784b6a..b8bd078 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/gallery-white.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/gallery-white.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/glitter.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/glitter.sassc index 4b47485..63f4007 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/glitter.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/glitter.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/profile.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/profile.sassc index b7c8dbd..283640e 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/profile.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/profile.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/roomlist.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/roomlist.sassc index a967e98..5db7588 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/roomlist.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/roomlist.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/screen.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/screen.sassc index a28d989..102f29a 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/screen.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/screen.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/test.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/test.sassc index 3f6f6c8..c76d494 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/test.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/test.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/tiny.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/tiny.sassc index 100ebdc..41c4f29 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/tiny.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/tiny.sassc differ diff --git a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/top.sassc b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/top.sassc index 3f08dd9..c625e12 100644 Binary files a/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/top.sassc and b/frontend/static/sass/.sass-cache/f4fe17d0b25f3c47a894db7e72560c19b9e43ba3/top.sassc differ diff --git a/frontend/static/stylesheets/src/screen.css b/frontend/static/stylesheets/src/screen.css index b66b498..9ac8bdc 100644 --- a/frontend/static/stylesheets/src/screen.css +++ b/frontend/static/stylesheets/src/screen.css @@ -1,9 +1,9 @@ /* Syntax error: Invalid CSS after "10px": expected expression (e.g. 1px, bold), was ";" - on line 524 of /var/www/scannerjammer.fm/httpdocs/sass/src/screen.sass + on line 524 of /var/www/scannerjammer.com/httpdocs/sass/src/screen.sass Backtrace: -/var/www/scannerjammer.fm/httpdocs/sass/src/screen.sass:524 +/var/www/scannerjammer.com/httpdocs/sass/src/screen.sass:524 /var/lib/gems/1.9.1/gems/sass-3.2.1/lib/sass/scss/parser.rb:1130:in `expected' /var/lib/gems/1.9.1/gems/sass-3.2.1/lib/sass/script/lexer.rb:199:in `expected!' /var/lib/gems/1.9.1/gems/sass-3.2.1/lib/sass/script/parser.rb:486:in `assert_done' @@ -59,4 +59,4 @@ Backtrace: body:before { white-space: pre; font-family: monospace; - content: "Syntax error: Invalid CSS after \"10px\": expected expression (e.g. 1px, bold), was \";\"\A on line 524 of /var/www/scannerjammer.fm/httpdocs/sass/src/screen.sass"; } + content: "Syntax error: Invalid CSS after \"10px\": expected expression (e.g. 1px, bold), was \";\"\A on line 524 of /var/www/scannerjammer.com/httpdocs/sass/src/screen.sass"; } diff --git a/frontend/static/template/directory.html b/frontend/static/template/directory.html index 672c2ab..9622fe1 100644 --- a/frontend/static/template/directory.html +++ b/frontend/static/template/directory.html @@ -215,7 +215,7 @@ h2
@@ -223,7 +223,7 @@ h2
- +
diff --git a/frontend/static/template/index.html b/frontend/static/template/index.html index 797e898..2a3e7aa 100644 --- a/frontend/static/template/index.html +++ b/frontend/static/template/index.html @@ -3,11 +3,11 @@ SCANNERJAMMER - + - - + + @@ -17,13 +17,13 @@ NOTE: SCANNERJAMMER ONLY WORKS IN FIREFOX AND CHROME. DO NOT TRY THIS WITH INTERNET EXPLORER
- +
-
-
+
+
-
+



@@ -31,9 +31,9 @@
@@ -56,7 +56,7 @@
- +
@@ -88,9 +88,9 @@ - - - - + + + + diff --git a/frontend/static/template/profile.html b/frontend/static/template/profile.html index b458f1c..aa22c96 100644 --- a/frontend/static/template/profile.html +++ b/frontend/static/template/profile.html @@ -2,11 +2,11 @@ scanners jammed by %%NAME%% - + - + @@ -20,7 +20,7 @@
-
+
@@ -46,7 +46,7 @@ [link] - +
@@ -57,9 +57,9 @@
- +

- +
@@ -74,9 +74,9 @@
- +
@@ -115,7 +115,7 @@ diff --git a/frontend/static/template/room.html b/frontend/static/template/room.html index 78bb6cd..25c4e23 100644 --- a/frontend/static/template/room.html +++ b/frontend/static/template/room.html @@ -7,9 +7,9 @@ - + - + @@ -40,13 +40,13 @@
- +
-
-
+
+
-
+



@@ -54,13 +54,13 @@
- +
@@ -207,7 +207,7 @@ var sj = document.createElement('script') sj.type = 'text/javascript' sj.async = 'true' - sj.src = 'http://scannerjammer.fm/js/sj6.js?t=' + new Date().getTime().toString() + sj.src = 'http://scannerjammer.com/js/sj6.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/static/template/roomlist.html b/frontend/static/template/roomlist.html index 19582bd..3128c8f 100644 --- a/frontend/static/template/roomlist.html +++ b/frontend/static/template/roomlist.html @@ -4,12 +4,12 @@ SCANNERJAMMER - + - - + + @@ -27,9 +27,9 @@
diff --git a/frontend/templates/profile.html b/frontend/templates/profile.html index 7deb845..e4c8665 100644 --- a/frontend/templates/profile.html +++ b/frontend/templates/profile.html @@ -78,7 +78,7 @@ - + diff --git a/frontend/templates/room.html b/frontend/templates/room.html index a75cc85..b9846c5 100644 --- a/frontend/templates/room.html +++ b/frontend/templates/room.html @@ -60,9 +60,9 @@

Post urls into the chat!
Use arrow keys to switch videos
Hit L key to LIKE
Hit ESC to switch views

- +
diff --git a/frontend/templates/roomlist.html b/frontend/templates/roomlist.html index 071f4d0..99bfda4 100644 --- a/frontend/templates/roomlist.html +++ b/frontend/templates/roomlist.html @@ -57,7 +57,7 @@ - + diff --git a/frontend/templates/topvideos.html b/frontend/templates/topvideos.html index 6bcf749..e269ac4 100644 --- a/frontend/templates/topvideos.html +++ b/frontend/templates/topvideos.html @@ -62,7 +62,7 @@ background-image: -moz-linear-gradient( [x] - + diff --git a/frontend/views.py b/frontend/views.py index 5fb9db6..f59d7b2 100644 --- a/frontend/views.py +++ b/frontend/views.py @@ -116,7 +116,7 @@ def directory(request): return response def get_thumbnail(user): - STOCK_THUMBNAIL = 'http://scannerjammer.fm/img/runner.gif' + STOCK_THUMBNAIL = 'http://scannerjammer.com/img/runner.gif' """ FIXME if user.access and 'http' in user.access: # what was those fields? @@ -200,11 +200,11 @@ def room(request, roomname): jsPath = "/js/sj6.js" title = sjroom.name.capitalize() + " room on ScannerJammer" - thumbnail = "http://scannerjammer.fm/img/plant.gif" + thumbnail = "http://scannerjammer.com/img/plant.gif" if sjroom.name == "glitter": - thumbnail = "http://scannerjammer.fm/img/glitter_flower.gif" + thumbnail = "http://scannerjammer.com/img/glitter_flower.gif" elif sjroom.name == "glasspopcorn": - thumbnail = "http://scannerjammer.fm/img/glasspopthumb.gif" + thumbnail = "http://scannerjammer.com/img/glasspopthumb.gif" title = "GlassPopcorn TV" elif room == "adult": #serverPort = 6969 -- cgit v1.2.3-70-g09d2