From ee524f6861dcdca7ea12a960f60f8b3bf817358d Mon Sep 17 00:00:00 2001 From: root Date: Mon, 26 Nov 2012 12:09:06 -0500 Subject: s/scannerjammer.com/scannerjammer.fm/ replacement --- backend/templates/redirect.html | 6 +-- backend/templates/stats.html | 6 +-- backend/views.py | 4 +- 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 7936 -> 7935 bytes .../calendar.sassc | Bin 11052 -> 11051 bytes .../diornights.sassc | Bin 12635 -> 12631 bytes .../disaro.sassc | Bin 3784 -> 3783 bytes .../embed.sassc | Bin 12864 -> 12863 bytes .../feederbleeder.sassc | Bin 3791 -> 3790 bytes .../frederick.sassc | Bin 1127 -> 1126 bytes .../gallery-white.sassc | Bin 27222 -> 27221 bytes .../glitter.sassc | Bin 6170 -> 6169 bytes .../profile.sassc | 8 ++-- .../roomlist.sassc | Bin 14117 -> 14116 bytes .../screen.sassc | 10 ++-- .../sexydj_main.sassc | Bin 9076 -> 9073 bytes .../sexydj_player.sassc | Bin 2463 -> 2462 bytes .../test.sassc | Bin 31936 -> 31932 bytes .../tiny.sassc | Bin 5630 -> 5629 bytes .../top.sassc | Bin 7594 -> 7593 bytes .../vtest1.sassc | Bin 23656 -> 23655 bytes .../vtest2.sassc | Bin 23769 -> 23768 bytes .../vtest3.sassc | Bin 27659 -> 27658 bytes .../_utilities.scssc | Bin 12355 -> 12353 bytes .../avatar.sassc | Bin 8368 -> 8366 bytes .../calendar.sassc | Bin 10788 -> 10786 bytes .../diornights.sassc | Bin 11790 -> 11788 bytes .../embed.sassc | Bin 11424 -> 11422 bytes .../feederbleeder.sassc | Bin 4451 -> 4449 bytes .../frederick.sassc | Bin 2007 -> 2005 bytes .../gallery-white.sassc | Bin 21201 -> 21199 bytes .../glitter.sassc | Bin 8322 -> 8320 bytes .../ie.scssc | Bin 1879 -> 1877 bytes .../main.sassc | Bin 1242 -> 1240 bytes .../print.scssc | Bin 1764 -> 1762 bytes .../profile.sassc | Bin 56391 -> 56389 bytes .../roomlist.sassc | Bin 13756 -> 13754 bytes .../screen.sassc | Bin 91568 -> 91566 bytes .../screen.scssc | Bin 1981 -> 1979 bytes .../sewergreats.sassc | Bin 1249 -> 1247 bytes .../sexydj_main.sassc | Bin 8408 -> 8406 bytes .../sexydj_player.sassc | Bin 3052 -> 3050 bytes .../test.sassc | Bin 28008 -> 28006 bytes .../tiny.sassc | Bin 4877 -> 4875 bytes .../top.sassc | Bin 8350 -> 8348 bytes .../vtest.sassc | Bin 20266 -> 20264 bytes .../vtest1.sassc | Bin 22814 -> 22812 bytes .../vtest2.sassc | Bin 22930 -> 22928 bytes .../vtest3.sassc | Bin 26807 -> 26805 bytes .../_reset.scssc | Bin 1129 -> 1127 bytes .../avatar.sassc | Bin 8989 -> 8988 bytes .../calendar.sassc | Bin 12538 -> 12537 bytes .../diornights.sassc | Bin 13266 -> 13265 bytes .../disaro.sassc | Bin 4230 -> 4229 bytes .../embed.sassc | Bin 14899 -> 14898 bytes .../feederbleeder.sassc | Bin 4237 -> 4236 bytes .../frederick.sassc | Bin 1230 -> 1229 bytes .../gallery-white.sassc | Bin 30769 -> 30768 bytes .../glitter.sassc | Bin 7018 -> 7017 bytes .../profile.sassc | Bin 67495 -> 67494 bytes .../roomlist.sassc | Bin 15907 -> 15906 bytes .../screen.sassc | Bin 113202 -> 113201 bytes .../test.sassc | Bin 35070 -> 35069 bytes .../tiny.sassc | Bin 6656 -> 6655 bytes .../top.sassc | Bin 8543 -> 8542 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/topvideos.html | 2 +- scannerjammer/settings.py | 4 +- www/static/js/auth.js | 6 +-- www/static/js/avatar.js | 8 ++-- www/static/js/chat.js | 2 +- www/static/js/player.js | 2 +- www/static/js/profile.js | 4 +- www/static/js/register.js | 4 +- www/static/js/room.js | 20 ++++---- www/static/js/roomlist.js | 2 +- www/static/js/sj6.js | 30 ++++++------ www/static/js/test-admin.js | 4 +- 110 files changed, 277 insertions(+), 277 deletions(-) diff --git a/backend/templates/redirect.html b/backend/templates/redirect.html index d83886c..3920520 100644 --- a/backend/templates/redirect.html +++ b/backend/templates/redirect.html @@ -3,14 +3,14 @@ SCANNERJAMMER - - + + - SCANNERJAMMER + SCANNERJAMMER diff --git a/backend/templates/stats.html b/backend/templates/stats.html index dfa2146..a4f993b 100644 --- a/backend/templates/stats.html +++ b/backend/templates/stats.html @@ -12,19 +12,19 @@ rooms {{ rooms_total }}
in main room now {% for user in users_in_main_room %} -  {{ user.username }} +  {{ user.username }} {% endfor %}
main room peak {{ main_room_peak }}

new today
{% for user in new_users_today %} -  {{ user.username }} +  {{ user.username }} {% endfor %}

visitors today
{% for user in users_today %} -  {{ user.username }} +  {{ user.username }} {% endfor %}


diff --git a/backend/views.py b/backend/views.py index e610bbd..992b273 100644 --- a/backend/views.py +++ b/backend/views.py @@ -52,7 +52,7 @@ BANDCAMP_API_URL = "http://api.bandcamp.com/api/url/1/info?key="+BANDCAMP_KEY+"& BANDCAMP_API_BAND = "http://api.bandcamp.com/api/band/3/discography?key="+BANDCAMP_KEY+"&band_id=" BANDCAMP_API_ALBUM = "http://api.bandcamp.com/api/album/2/info?key="+BANDCAMP_KEY+"&album_id=" BANDCAMP_API_TRACK = "http://api.bandcamp.com/api/track/1/info?key="+BANDCAMP_KEY+"&track_id=" -DEFAULT_BG = "http://scannerjammer.com/bgz/gridzy9.jpg" +DEFAULT_BG = "http://scannerjammer.fm/bgz/gridzy9.jpg" # # Common funtions @@ -1109,7 +1109,7 @@ def stats(request): def redirect(request): """ Permanent redirect """ - response = HttpResponsePermanentRedirect(redirect_to='http://scannerjammer.com') + response = HttpResponsePermanentRedirect(redirect_to='http://scannerjammer.fm') template = loader.get_template('redirect.html') response.write(template.render(Context())) return response diff --git a/frontend/static/bgz/index.html b/frontend/static/bgz/index.html index d0264c5..59b82ea 100644 --- a/frontend/static/bgz/index.html +++ b/frontend/static/bgz/index.html @@ -1,12 +1,12 @@ + content="0; URL=http://scannerjammer.fm:17769/">
Sending you through to - Scanner Jammer..! + Scanner Jammer..!
diff --git a/frontend/static/faq/index.html b/frontend/static/faq/index.html index fd76e86..9f1d937 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 a0c667d..bb2d304 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.com;max-age=1086400" + document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.fm;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.com;max-age=1086400" + document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.fm;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.com;max-age=0" + document.cookie = "session=false;path=/;domain=.scannerjammer.fm;max-age=0" Auth.session = "" Auth.load() }, diff --git a/frontend/static/js/avatar.js b/frontend/static/js/avatar.js index 11d39d4..ce97617 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.com/profile") !== -1) + else if (word.indexOf("scannerjammer.fm/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 822e1ee..099f6da 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.com/profile") !== -1) + else if (word.indexOf("scannerjammer.fm/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 87973a4..55250ab 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.com/" + var vidurl = "http://scannerjammer.fm/" 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 6005e79..d545e8b 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.com/img/runner.gif", - bg: "http://scannerjammer.com/bgz/scannerjammer_cyberspace.jpg", + avatar: "http://scannerjammer.fm/img/runner.gif", + bg: "http://scannerjammer.fm/bgz/scannerjammer_cyberspace.jpg", }, open: function () { diff --git a/frontend/static/js/register.js b/frontend/static/js/register.js index 24e8fa0..5098dd7 100644 --- a/frontend/static/js/register.js +++ b/frontend/static/js/register.js @@ -22,7 +22,7 @@ var API = HEADER: "#@scanjam 0.2", LIKE_STRING: "like", HAS_LOCAL_STORAGE: supports_html5_storage(), - BASE_URL: "http://scannerjammer.com:19898", + BASE_URL: "http://scannerjammer.fm:19898", 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.com;max-age=1086400" + document.cookie = "session="+u[2]+";path=/;domain=.scannerjammer.fm;max-age=1086400" $("#register").fadeOut(1000, function () { diff --git a/frontend/static/js/room.js b/frontend/static/js/room.js index 48924d9..a5e70d0 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.com;max-age=86400" + document.cookie = "room="+Room.name+";path=/;domain=.scannerjammer.fm;max-age=86400" if (Room.loadCallback) Room.loadCallback() }, @@ -285,13 +285,13 @@ var Rooms = { loaded: false, queue: [ - [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'], + [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'], [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.com/profile/'+Auth.username) + $("#your-profile").attr('href', 'http://scannerjammer.fm/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 1b6c6d8..a1d737c 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.com/img/sjd.jpg"]) + //roomz['sjd'] = Roomlist.newRecord([0,"sjd",0,0,"http://scannerjammer.fm/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 7da01a0..878279f 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.com;max-age=1086400" + document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.fm;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.com;max-age=1086400" + document.cookie = "session="+Auth.session+";path=/;domain=.scannerjammer.fm;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.com;max-age=0" + document.cookie = "session=false;path=/;domain=.scannerjammer.fm;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.com/" + var vidurl = "http://scannerjammer.fm/" if (Room.name !== "main") vidurl += Room.name+"/" vidurl += "#v="+video.id @@ -5203,7 +5203,7 @@ var Chat = { s += '' } - else if (word.indexOf("scannerjammer.com/profile") !== -1) + else if (word.indexOf("scannerjammer.fm/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.com;max-age=86400" + document.cookie = "room="+Room.name+";path=/;domain=.scannerjammer.fm;max-age=86400" if (Room.loadCallback) Room.loadCallback() }, @@ -5669,13 +5669,13 @@ var Rooms = { loaded: false, queue: [ - [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'], + [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'], [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.com/profile/'+Auth.username) + $("#your-profile").attr('href', 'http://scannerjammer.fm/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 5c34099..ebae8f4 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.com/"+Room.name+"/read") + $("#pnp").attr("src", "http://scannerjammer.fm/"+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.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 += "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 = 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 4ec4a31..1213780 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 313eec1..ad7ec08 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 6069fcc..59eca26 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 3e7bb5d..dae7054 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 70d35f1..f01decd 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 f9329d4..86c86aa 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.com/

- +

http://scannerjammer.fm/

+ -

http://scannerjammer.com:17769/

- +

http://scannerjammer.fm:17769/

+ -

http://www.scannerjammer.com/

- +

http://www.scannerjammer.fm/

+ -

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

- +

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

+

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

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

JAVASCRIPT

-

http://scannerjammer.com/

- +

http://scannerjammer.fm/

+ -

http://scannerjammer.com:17769/

- +

http://scannerjammer.fm:17769/

+ -

http://www.scannerjammer.com/

- +

http://www.scannerjammer.fm/

+ -

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

- +

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

+ -

http://scannerjammer.com

- +

http://scannerjammer.fm

+ -

http://scannerjammer.com:17769

- +

http://scannerjammer.fm:17769

+ -

http://www.scannerjammer.com

- +

http://www.scannerjammer.fm

+ -

http://www.scannerjammer.com:17769

- +

http://www.scannerjammer.fm: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 549f151..f265bbc 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 8a0db6b..6d61376 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 e889bee..b46f968 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 da9d4c0..477fd59 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 69cbe30..e0af9fe 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 55466ce..2863e4d 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 5a70484..fa950ef 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 2ca0e38..098d852 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 815beae..b782349 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 f3c2034..db9d4b6 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 ad2a2bb..abfa13e 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.com/sandbox/sass/src/profile.sass: +: @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: @linei; [o:Sass::Tree::MixinDefNode : @name" rounded;@;T: @args[[o:Sass::Script::Variable;" width;{:project_name" sass/: -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: +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@ : -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" +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" 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 5bbfb43..1dd88a9 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 5f6fba9..192a235 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.com/sandbox/sass/src/screen.sass: +: @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: @linei; [o:Sass::Tree::MixinDefNode : @name" rounded;@;T: @args[[o:Sass::Script::Variable;" width;{:project_name" sass/: -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" +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" 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 c8dcae6..753650f 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 73f3239..f1b185a 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 1440dd7..6503b81 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 711c906..18e6a5a 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 7b69797..2ba22e9 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 f78709a..5755ae0 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 4271e7a..abf21d1 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 d0c3dd9..e26d3cf 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 ba33dbc..19cc72b 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 9f8407f..7a17ebd 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 c085577..45491b4 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 0270bf2..1bbbbca 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 6afd6ac..61d9fe0 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 6773b0a..cf26190 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 d4aa292..f69b72e 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 c8953b3..62ffb64 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 125a8a5..1985eed 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 cc5a38b..7ed024a 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 bb6fc74..5d4e72c 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 20cafa3..4574cd7 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 e9c2f25..ee1ec5c 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 040b28f..1bff00a 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 c7aa667..e62ed2e 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 f438403..d302ec5 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 804a3e8..d0a3497 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 4101611..679c56c 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 e91b803..431e1d3 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 a72448f..b1e6298 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 8adb51c..9bfdd5f 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 a8989a9..2c976ae 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 f366092..b464954 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 fb08d9c..81522d0 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 8b0d65e..5d16223 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 3ef990f..4300bcc 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 8704630..9122132 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 ed51a72..47b8fe4 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 30d9763..4edc512 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 e206d30..fe5ddea 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 b1a4a56..51eb934 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 e43306a..c11ed6d 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 ea64774..37d453e 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 3c26800..7fac10b 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 b8bd078..e784b6a 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 63f4007..4b47485 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 283640e..b7c8dbd 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 5db7588..a967e98 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 102f29a..a28d989 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 c76d494..3f6f6c8 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 41c4f29..100ebdc 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 c625e12..3f08dd9 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 9ac8bdc..b66b498 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.com/httpdocs/sass/src/screen.sass + on line 524 of /var/www/scannerjammer.fm/httpdocs/sass/src/screen.sass Backtrace: -/var/www/scannerjammer.com/httpdocs/sass/src/screen.sass:524 +/var/www/scannerjammer.fm/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.com/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.fm/httpdocs/sass/src/screen.sass"; } diff --git a/frontend/static/template/directory.html b/frontend/static/template/directory.html index 9622fe1..672c2ab 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 2a3e7aa..797e898 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 aa22c96..b458f1c 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 25c4e23..78bb6cd 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.com/js/sj6.js?t=' + new Date().getTime().toString() + sj.src = 'http://scannerjammer.fm/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 3128c8f..19582bd 100644 --- a/frontend/static/template/roomlist.html +++ b/frontend/static/template/roomlist.html @@ -4,12 +4,12 @@ SCANNERJAMMER - + - - + + @@ -27,9 +27,9 @@