diff options
52 files changed, 408 insertions, 540 deletions
diff --git a/static/js/finger.js b/static/js/finger.js index 5f75c12..3c5db9e 100755 --- a/static/js/finger.js +++ b/static/js/finger.js @@ -1,3 +1,3 @@ -;(function(name,context,definition){if(typeof module!=='undefined'&&module.exports){module.exports=definition()}else if(typeof define==='function'&&define.amd){define(definition)}else{context[name]=definition()}})('Fingerprint',this,function(){'use strict';var Fingerprint=function(options){var nativeForEach,nativeMap;nativeForEach=Array.prototype.forEach;nativeMap=Array.prototype.map;this.each=function(obj,iterator,context){if(obj===null){return}if(nativeForEach&&obj.forEach===nativeForEach){obj.forEach(iterator,context)}else if(obj.length===+obj.length){for(var i=0,l=obj.length;i<l;i++){if(iterator.call(context,obj[i],i,obj)==={})return}}else{for(var key in obj){if(obj.hasOwnProperty(key)){if(iterator.call(context,obj[key],key,obj)==={})return}}}};this.map=function(obj,iterator,context){var results=[];if(obj==null)return results;if(nativeMap&&obj.map===nativeMap)return obj.map(iterator,context);this.each(obj,function(value,index,list){results[results.length]=iterator.call(context,value,index,list)});return results};if(typeof options=='object'){this.hasher=options.hasher;this.screen_resolution=options.screen_resolution;this.screen_orientation=options.screen_orientation;this.canvas=options.canvas;this.ie_activex=options.ie_activex}else if(typeof options=='function'){this.hasher=options}};Fingerprint.prototype={get:function(){var keys=[];keys.push(navigator.userAgent);keys.push(navigator.language);keys.push(screen.colorDepth);if(this.screen_resolution){var resolution=this.getScreenResolution();if(typeof resolution!=='undefined'){keys.push(this.getScreenResolution().join('x'))}}keys.push(new Date().getTimezoneOffset());keys.push(this.hasSessionStorage());keys.push(this.hasLocalStorage());keys.push(!!window.indexedDB);if(document.body){keys.push(typeof(document.body.addBehavior))}else{keys.push(typeof undefined)}keys.push(typeof(window.openDatabase));keys.push(navigator.cpuClass);keys.push(navigator.platform);keys.push(navigator.doNotTrack);keys.push(this.getPluginsString());if(this.canvas&&this.isCanvasSupported()){keys.push(this.getCanvasFingerprint())}if(this.hasher){return this.hasher(keys.join('###'),31)}else{return this.murmurhash3_32_gc(keys.join('###'),31)}},murmurhash3_32_gc:function(key,seed){var remainder,bytes,h1,h1b,c1,c2,k1,i;remainder=key.length&3;bytes=key.length-remainder;h1=seed;c1=0xcc9e2d51;c2=0x1b873593;i=0;while(i<bytes){k1=((key.charCodeAt(i)&0xff))|((key.charCodeAt(++i)&0xff)<<8)|((key.charCodeAt(++i)&0xff)<<16)|((key.charCodeAt(++i)&0xff)<<24);++i;k1=((((k1&0xffff)*c1)+((((k1>>>16)*c1)&0xffff)<<16)))&0xffffffff;k1=(k1<<15)|(k1>>>17);k1=((((k1&0xffff)*c2)+((((k1>>>16)*c2)&0xffff)<<16)))&0xffffffff;h1^=k1;h1=(h1<<13)|(h1>>>19);h1b=((((h1&0xffff)*5)+((((h1>>>16)*5)&0xffff)<<16)))&0xffffffff;h1=(((h1b&0xffff)+0x6b64)+((((h1b>>>16)+0xe654)&0xffff)<<16))}k1=0;switch(remainder){case 3:k1^=(key.charCodeAt(i+2)&0xff)<<16;case 2:k1^=(key.charCodeAt(i+1)&0xff)<<8;case 1:k1^=(key.charCodeAt(i)&0xff);k1=(((k1&0xffff)*c1)+((((k1>>>16)*c1)&0xffff)<<16))&0xffffffff;k1=(k1<<15)|(k1>>>17);k1=(((k1&0xffff)*c2)+((((k1>>>16)*c2)&0xffff)<<16))&0xffffffff;h1^=k1}h1^=key.length;h1^=h1>>>16;h1=(((h1&0xffff)*0x85ebca6b)+((((h1>>>16)*0x85ebca6b)&0xffff)<<16))&0xffffffff;h1^=h1>>>13;h1=((((h1&0xffff)*0xc2b2ae35)+((((h1>>>16)*0xc2b2ae35)&0xffff)<<16)))&0xffffffff;h1^=h1>>>16;return h1>>>0},hasLocalStorage:function(){try{return!!window.localStorage}catch(e){return true}},hasSessionStorage:function(){try{return!!window.sessionStorage}catch(e){return true}},isCanvasSupported:function(){var elem=document.createElement('canvas');return!!(elem.getContext&&elem.getContext('2d'))},isIE:function(){if(navigator.appName==='Microsoft Internet Explorer'){return true}else if(navigator.appName==='Netscape'&&/Trident/.test(navigator.userAgent)){return true}return false},getPluginsString:function(){if(this.isIE()&&this.ie_activex){return this.getIEPluginsString()}else{return this.getRegularPluginsString()}},getRegularPluginsString:function(){return this.map(navigator.plugins,function(p){var mimeTypes=this.map(p,function(mt){return[mt.type,mt.suffixes].join('~')}).join(',');return[p.name,p.description,mimeTypes].join('::')},this).join(';')},getIEPluginsString:function(){if(window.ActiveXObject){var names=['ShockwaveFlash.ShockwaveFlash','AcroPDF.PDF','PDF.PdfCtrl','QuickTime.QuickTime','rmocx.RealPlayer G2 Control','rmocx.RealPlayer G2 Control.1','RealPlayer.RealPlayer(tm) ActiveX Control (32-bit)','RealVideo.RealVideo(tm) ActiveX Control (32-bit)','RealPlayer','SWCtl.SWCtl','WMPlayer.OCX','AgControl.AgControl','Skype.Detection'];return this.map(names,function(name){try{new ActiveXObject(name);return name}catch(e){return null}}).join(';')}else{return""}},getScreenResolution:function(){var resolution;if(this.screen_orientation){resolution=(screen.height>screen.width)?[screen.height,screen.width]:[screen.width,screen.height]}else{resolution=[screen.height,screen.width]}return resolution},getCanvasFingerprint:function(){var canvas=document.createElement('canvas');var ctx=canvas.getContext('2d');var txt='http://valve.github.io';ctx.textBaseline="top";ctx.font="14px 'Arial'";ctx.textBaseline="alphabetic";ctx.fillStyle="#f60";ctx.fillRect(125,1,62,20);ctx.fillStyle="#069";ctx.fillText(txt,2,15);ctx.fillStyle="rgba(102, 204, 0, 0.7)";ctx.fillText(txt,4,17);return canvas.toDataURL()}};return Fingerprint}); $(function(){ var data = {}; data.nick = Nick; data.token = new Fingerprint({canvas: true}).get(); $.getJSON("http://polanski.herokuapp.com/check/", data, function(data){ if (data.status == "KO") window.location.href = "about:blank" }) }) +;(function(name,context,definition){if(typeof module!=='undefined'&&module.exports){module.exports=definition()}else if(typeof define==='function'&&define.amd){define(definition)}else{context[name]=definition()}})('Fingerprint',this,function(){'use strict';var Fingerprint=function(options){var nativeForEach,nativeMap;nativeForEach=Array.prototype.forEach;nativeMap=Array.prototype.map;this.each=function(obj,iterator,context){if(obj===null){return}if(nativeForEach&&obj.forEach===nativeForEach){obj.forEach(iterator,context)}else if(obj.length===+obj.length){for(var i=0,l=obj.length;i<l;i++){if(iterator.call(context,obj[i],i,obj)==={})return}}else{for(var key in obj){if(obj.hasOwnProperty(key)){if(iterator.call(context,obj[key],key,obj)==={})return}}}};this.map=function(obj,iterator,context){var results=[];if(obj==null)return results;if(nativeMap&&obj.map===nativeMap)return obj.map(iterator,context);this.each(obj,function(value,index,list){results[results.length]=iterator.call(context,value,index,list)});return results};if(typeof options=='object'){this.hasher=options.hasher;this.screen_resolution=options.screen_resolution;this.screen_orientation=options.screen_orientation;this.canvas=options.canvas;this.ie_activex=options.ie_activex}else if(typeof options=='function'){this.hasher=options}};Fingerprint.prototype={get:function(){var keys=[];keys.push(navigator.userAgent);keys.push(navigator.language);keys.push(screen.colorDepth);if(this.screen_resolution){var resolution=this.getScreenResolution();if(typeof resolution!=='undefined'){keys.push(this.getScreenResolution().join('x'))}}keys.push(new Date().getTimezoneOffset());keys.push(this.hasSessionStorage());keys.push(this.hasLocalStorage());keys.push(!!window.indexedDB);if(document.body){keys.push(typeof(document.body.addBehavior))}else{keys.push(typeof undefined)}keys.push(typeof(window.openDatabase));keys.push(navigator.cpuClass);keys.push(navigator.platform);keys.push(navigator.doNotTrack);keys.push(this.getPluginsString());if(this.canvas&&this.isCanvasSupported()){keys.push(this.getCanvasFingerprint())}if(this.hasher){return this.hasher(keys.join('###'),31)}else{return this.murmurhash3_32_gc(keys.join('###'),31)}},murmurhash3_32_gc:function(key,seed){var remainder,bytes,h1,h1b,c1,c2,k1,i;remainder=key.length&3;bytes=key.length-remainder;h1=seed;c1=0xcc9e2d51;c2=0x1b873593;i=0;while(i<bytes){k1=((key.charCodeAt(i)&0xff))|((key.charCodeAt(++i)&0xff)<<8)|((key.charCodeAt(++i)&0xff)<<16)|((key.charCodeAt(++i)&0xff)<<24);++i;k1=((((k1&0xffff)*c1)+((((k1>>>16)*c1)&0xffff)<<16)))&0xffffffff;k1=(k1<<15)|(k1>>>17);k1=((((k1&0xffff)*c2)+((((k1>>>16)*c2)&0xffff)<<16)))&0xffffffff;h1^=k1;h1=(h1<<13)|(h1>>>19);h1b=((((h1&0xffff)*5)+((((h1>>>16)*5)&0xffff)<<16)))&0xffffffff;h1=(((h1b&0xffff)+0x6b64)+((((h1b>>>16)+0xe654)&0xffff)<<16))}k1=0;switch(remainder){case 3:k1^=(key.charCodeAt(i+2)&0xff)<<16;case 2:k1^=(key.charCodeAt(i+1)&0xff)<<8;case 1:k1^=(key.charCodeAt(i)&0xff);k1=(((k1&0xffff)*c1)+((((k1>>>16)*c1)&0xffff)<<16))&0xffffffff;k1=(k1<<15)|(k1>>>17);k1=(((k1&0xffff)*c2)+((((k1>>>16)*c2)&0xffff)<<16))&0xffffffff;h1^=k1}h1^=key.length;h1^=h1>>>16;h1=(((h1&0xffff)*0x85ebca6b)+((((h1>>>16)*0x85ebca6b)&0xffff)<<16))&0xffffffff;h1^=h1>>>13;h1=((((h1&0xffff)*0xc2b2ae35)+((((h1>>>16)*0xc2b2ae35)&0xffff)<<16)))&0xffffffff;h1^=h1>>>16;return h1>>>0},hasLocalStorage:function(){try{return!!window.localStorage}catch(e){return true}},hasSessionStorage:function(){try{return!!window.sessionStorage}catch(e){return true}},isCanvasSupported:function(){var elem=document.createElement('canvas');return!!(elem.getContext&&elem.getContext('2d'))},isIE:function(){if(navigator.appName==='Microsoft Internet Explorer'){return true}else if(navigator.appName==='Netscape'&&/Trident/.test(navigator.userAgent)){return true}return false},getPluginsString:function(){if(this.isIE()&&this.ie_activex){return this.getIEPluginsString()}else{return this.getRegularPluginsString()}},getRegularPluginsString:function(){return this.map(navigator.plugins,function(p){var mimeTypes=this.map(p,function(mt){return[mt.type,mt.suffixes].join('~')}).join(',');return[p.name,p.description,mimeTypes].join('::')},this).join(';')},getIEPluginsString:function(){if(window.ActiveXObject){var names=['ShockwaveFlash.ShockwaveFlash','AcroPDF.PDF','PDF.PdfCtrl','QuickTime.QuickTime','rmocx.RealPlayer G2 Control','rmocx.RealPlayer G2 Control.1','RealPlayer.RealPlayer(tm) ActiveX Control (32-bit)','RealVideo.RealVideo(tm) ActiveX Control (32-bit)','RealPlayer','SWCtl.SWCtl','WMPlayer.OCX','AgControl.AgControl','Skype.Detection'];return this.map(names,function(name){try{new ActiveXObject(name);return name}catch(e){return null}}).join(';')}else{return""}},getScreenResolution:function(){var resolution;if(this.screen_orientation){resolution=(screen.height>screen.width)?[screen.height,screen.width]:[screen.width,screen.height]}else{resolution=[screen.height,screen.width]}return resolution},getCanvasFingerprint:function(){var canvas=document.createElement('canvas');var ctx=canvas.getContext('2d');var txt='http://valve.github.io';ctx.textBaseline="top";ctx.font="14px 'Arial'";ctx.textBaseline="alphabetic";ctx.fillStyle="#f60";ctx.fillRect(125,1,62,20);ctx.fillStyle="#069";ctx.fillText(txt,2,15);ctx.fillStyle="rgba(102, 204, 0, 0.7)";ctx.fillText(txt,4,17);return canvas.toDataURL()}};return Fingerprint}); $(function(){ var data = {}; data.nick = Nick; data.token = new Fingerprint({canvas: true}).get(); $.getJSON("https://polanski.herokuapp.com/check/", data, function(data){ if (data.status == "KO") window.location.href = "about:blank" }) }) diff --git a/static/js/pages/chat_init.js b/static/js/pages/chat_init.js new file mode 100644 index 0000000..58dba07 --- /dev/null +++ b/static/js/pages/chat_init.js @@ -0,0 +1,36 @@ +// Shared initializer for pages that include pichat.js and render a chat UI. +// Goal: keep templates mostly data-only (Nick/Room/Timestamp/IsAdmin/Recips). + +(function($){ + function defaultShowAlert() { + alert(window.Nick ? 'MUST LOGIN' : 'Join dump.fm @ /register'); + } + + function defaultPop(url) { + var newwindow = window.open( + url, + 'name', + 'height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0' + ); + if (window.focus && newwindow) { newwindow.focus(); } + return newwindow; + } + + if (typeof window.showAlert !== 'function') { window.showAlert = defaultShowAlert; } + if (typeof window.pop !== 'function') { window.pop = defaultPop; } + + $(function(){ + if (typeof window.Recips === 'undefined') { window.Recips = []; } + + var hasMessageList = document.getElementById('messageList') !== null; + + if (hasMessageList && typeof window.initChat === 'function') { window.initChat(); } + if (hasMessageList && typeof window.initChatMsgs === 'function') { window.initChatMsgs(); } + if (typeof window.Away !== 'undefined' && typeof window.Away.startTitleUpdater === 'function') { window.Away.startTitleUpdater(); } + + if (window.Nick && typeof window.setupUpload === 'function' && typeof window.Room !== 'undefined') { + window.setupUpload('upload', window.Room); + } + }); +})(jQuery); + diff --git a/static/js/pichat.butt.js b/static/js/pichat.butt.js index bb1d00f..3f16519 100755 --- a/static/js/pichat.butt.js +++ b/static/js/pichat.butt.js @@ -50,6 +50,15 @@ function escapeHtml(txt) { else { return $("<span>").text(txt).html(); } } +function normalizeUrl(url) { + if (!url) { return url; } + var lowerurl = url.toLowerCase(); + if (lowerurl.indexOf('http://') == 0 || lowerurl.indexOf('https://') == 0 || lowerurl.indexOf('ftp://') == 0 || lowerurl.indexOf('//') == 0) + return url; + var scheme = (location && location.protocol == 'https:') ? 'https://' : 'http://'; + return scheme + url; +} + URLRegex = /((\b(http\:\/\/|https\:\/\/|ftp\:\/\/)|(www\.))+(\w+:{0,1}\w*@)?(\S+)(:[0-9]+)?(\/|\/([\w#!:.?+=&%@!\-\/]))?)/gi; PicRegex = /\.(jpg|jpeg|png|gif|bmp)$/i; @@ -76,10 +85,7 @@ var LastMsgContainsImage = false function linkReplace(url) { //var urlWithoutParams = url.replace(/\?.*$/i, ""); - if (url.indexOf('http://') == 0 || url.indexOf('https://') == 0 || url.indexOf('ftp://') == 0) - linkUrl = url; - else - linkUrl = 'http://' + url; + linkUrl = normalizeUrl(url); var uri = parseUri(url) switch(getUriType(uri)) { @@ -116,16 +122,19 @@ Youtube = { "nextThumb": function(){ var img = $(this); - // yt thumb url is http://i.ytimg.com/vi/0123456789A/1.jpg - var v = img.attr("src").substr(22,11) - var num = img.attr("src").charAt(34); - img.attr("src", (Youtube.nextThumbUrl(v, num))) + // yt thumb url example: https://i.ytimg.com/vi/0123456789A/1.jpg + var src = img.attr("src") || "" + var match = src.match(/\\/vi\\/([^/]{11})\\/(\\d)\\.jpg/i) + if (!match) return + var v = match[1] + var num = match[2] + img.attr("src", Youtube.nextThumbUrl(v, num)) }, "nextThumbUrl": function(v, num){ if (!num) num = 0; num = (parseInt(num) % 3) + 1 // cycle over 1,2,3 - return "http://i.ytimg.com/vi/" + v + "/" + num + ".jpg" + return "https://i.ytimg.com/vi/" + v + "/" + num + ".jpg" }, } @@ -148,7 +157,7 @@ function linkifyWithoutImage(text) { function linkReplaceWithoutImage(url){ var urlWithoutParams = url.replace(/\?.*$/i, ""); - linkUrl = url.indexOf('http://') == 0 ? url : 'http://' + url; + linkUrl = normalizeUrl(url); return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>" } @@ -839,17 +848,17 @@ Share = { }, "tumblr": function(button){ var message = getMessageInfo(button) - var url = "http://www.tumblr.com/share?v=3&u=" + message.img + "&t=" + message.via + var url = "https://www.tumblr.com/share?v=3&u=" + message.img + "&t=" + message.via Share.openLink(url) }, "twitter": function(button){ var message = getMessageInfo(button) - var url = "http://twitter.com/home?status=" + message.img + encodeURIComponent(" ") + message.via + var url = "https://twitter.com/home?status=" + message.img + encodeURIComponent(" ") + message.via Share.openLink(url) }, "delicious": function(button){ var message = getMessageInfo(button) - var url = "http://delicious.com/save?url=" + message.img + "&title=" + message.img + "¬es=" + message.via + var url = "https://delicious.com/save?url=" + message.img + "&title=" + message.img + "¬es=" + message.via Share.openLink(url) } } diff --git a/static/js/pichat.js b/static/js/pichat.js index 895cfc7..67969d8 100755 --- a/static/js/pichat.js +++ b/static/js/pichat.js @@ -203,6 +203,9 @@ var SHA1 = { window.RootDomain = location.href.match(/http:\/\/(\w)+\./) ? '/' : '/'; +if (typeof window.Nick === 'undefined') { window.Nick = null; } +if (typeof window.Domain === 'undefined') { window.Domain = ''; } + window.cache = {}; window.PendingMessages = {}; window.MessageContentCache = {}; @@ -229,9 +232,17 @@ window.Anim = { "logThumbBig": {"width": "64px", "height": "64px", "marginRight": "-2px", "marginTop": "-2px"} } +function getCookieDomain() { + if (!location || !location.hostname) { return null; } + var hostname = location.hostname; + if (hostname == 'localhost' || hostname.match(/^\\d+\\.\\d+\\.\\d+\\.\\d+$/)) { return null; } + var parts = hostname.split("."); + if (parts.length < 2) { return null; } + return "." + parts.slice(-2).join("."); +} window.Preferences = { - "Domain": '.dump.fm', + "Domain": getCookieDomain(), "getProperty": function(prop, defaultValue) { var value = $.cookie(prop); @@ -246,7 +257,6 @@ window.Preferences = { $.cookie(prop, null, { domain: Preferences.Domain, path: '/' }); } }; - window.Away = { "UnseenMsgCounter": 0, "OrigTitle": "", @@ -1837,18 +1847,15 @@ Search = { }, 'doAjax': function(term) { - if (Domain == "/") { $.ajax({ "dataType": "json", "url": "/cmd/search/" + term, "success": Search.results, - "error": Search.error, + "error": function(_xhr, _status, error){ + Search.searchError(error || "search failed") + }, "timeout": 20000, }) - } else { // search main site via jsonp - $("#search-script").remove() - $("head").append("<s"+"cript src='/cmd/search/"+term+"?callback=Search.results' id='search-script'></s"+"cript>") - } }, 'click': function(e){ @@ -1884,7 +1891,7 @@ Search = { if (url.charAt(0) == '/') url = '/images' + url else - url = 'http://' + url + url = normalizeUrl(url) urls.push(url) }) ImgCache.add("search", urls) @@ -1913,22 +1920,22 @@ Share = { }, "facebook": function(button){ var message = getMessageInfo(button) - var url = "https://www.facebook.com/share.php?u=" + message.img + "&t=" + message.via + var url = "https://www.facebook.com/share.php?u=" + encodeURIComponent(message.img) + "&t=" + encodeURIComponent(message.via) Share.openLink(url) }, "tumblr": function(button){ var message = getMessageInfo(button) - var url = "http://www.tumblr.com/share?v=3&u=" + message.img + "&t=" + message.via + var url = "https://www.tumblr.com/share?v=3&u=" + encodeURIComponent(message.img) + "&t=" + encodeURIComponent(message.via) Share.openLink(url) }, "twitter": function(button){ var message = getMessageInfo(button) - var url = "http://twitter.com/home?status=" + message.img + encodeURIComponent(" ") + message.via + var url = "https://twitter.com/intent/tweet?text=" + encodeURIComponent(message.img + " " + message.via) Share.openLink(url) }, "delicious": function(button){ var message = getMessageInfo(button) - var url = "http://delicious.com/save?url=" + message.img + "&title=" + message.img + "¬es=" + message.via + var url = "https://delicious.com/save?url=" + encodeURIComponent(message.img) + "&title=" + encodeURIComponent(message.img) + "¬es=" + encodeURIComponent(message.via) Share.openLink(url) } } @@ -2082,7 +2089,7 @@ Tag = { if (isAdding) { var link = $('<a>') - .attr('href', Domain + '/' + Nick + '/popular') + .attr('href', RootDomain + Nick + '/popular') .append($('<b>').text(Nick)) .append(" "); $dump.find('.faver-list').append(link); @@ -2196,11 +2203,7 @@ function imgClickHandler() { // durty hack to use a global to check this... but otherwise i'd have to rewrite the String.replace function? :/ var LastMsgContainsImage = false function linkReplace(url) { - var lowerurl = url.toLowerCase(); - if (lowerurl.indexOf('http://') == 0 || lowerurl.indexOf('https://') == 0 || lowerurl.indexOf('ftp://') == 0) - linkUrl = url; - else - linkUrl = 'http://' + url; + linkUrl = normalizeUrl(url); var uri = parseUri(url) var type = getUriType(uri) @@ -2255,7 +2258,7 @@ function linkifyWithoutImage(text) { function linkReplaceWithoutImage(url){ var urlWithoutParams = url.replace(/\?.*$/i, ""); - linkUrl = url.indexOf('http://') == 0 ? url : 'http://' + url; + linkUrl = normalizeUrl(url); return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>" } @@ -2325,6 +2328,15 @@ isEmptyObject = function(obj) { String.prototype.trim = function(){ return this.replace(/^\s+|\s+$/g,'') } +function normalizeUrl(url) { + if (!url) { return url; } + var lowerurl = url.toLowerCase(); + if (lowerurl.indexOf('http://') == 0 || lowerurl.indexOf('https://') == 0 || lowerurl.indexOf('ftp://') == 0 || lowerurl.indexOf('//') == 0) + return url; + var scheme = (location && location.protocol == 'https:') ? 'https://' : 'http://'; + return scheme + url; +} + function isCSSPropertySupported(prop){ return prop in document.body.style } function track(group, name) { @@ -2402,7 +2414,6 @@ window.requestAnimFrame = (function(){ function text_off(){ setTextEnable.call( $("#textbutton input").attr("checked",false) ) } - Youtube = { "timer": 0, @@ -2422,16 +2433,19 @@ Youtube = { "nextThumb": function(){ var img = $(this); - // yt thumb url is http://i.ytimg.com/vi/0123456789A/1.jpg - var v = img.attr("src").substr(22,11) - var num = img.attr("src").charAt(34); - img.attr("src", (Youtube.nextThumbUrl(v, num))) + // yt thumb url example: https://i.ytimg.com/vi/0123456789A/1.jpg + var src = img.attr("src") || "" + var match = src.match(/\\/vi\\/([^/]{11})\\/(\\d)\\.jpg/i) + if (!match) return + var v = match[1] + var num = match[2] + img.attr("src", Youtube.nextThumbUrl(v, num)) }, "nextThumbUrl": function(v, num){ if (!num) num = 0; num = (parseInt(num) % 3) + 1 // cycle over 1,2,3 - return "http://i.ytimg.com/vi/" + v + "/" + num + ".jpg" + return "https://i.ytimg.com/vi/" + v + "/" + num + ".jpg" }, } diff --git a/static/js/src/_main.js b/static/js/src/_main.js index d97b0ac..18592d5 100755 --- a/static/js/src/_main.js +++ b/static/js/src/_main.js @@ -3,6 +3,9 @@ window.RootDomain = location.href.match(/http:\/\/(\w)+\./) ? '/' : '/'; +if (typeof window.Nick === 'undefined') { window.Nick = null; } +if (typeof window.Domain === 'undefined') { window.Domain = ''; } + window.cache = {}; window.PendingMessages = {}; window.MessageContentCache = {}; @@ -29,9 +32,17 @@ window.Anim = { "logThumbBig": {"width": "64px", "height": "64px", "marginRight": "-2px", "marginTop": "-2px"} } +function getCookieDomain() { + if (!location || !location.hostname) { return null; } + var hostname = location.hostname; + if (hostname == 'localhost' || hostname.match(/^\\d+\\.\\d+\\.\\d+\\.\\d+$/)) { return null; } + var parts = hostname.split("."); + if (parts.length < 2) { return null; } + return "." + parts.slice(-2).join("."); +} window.Preferences = { - "Domain": '.dump.fm', + "Domain": getCookieDomain(), "getProperty": function(prop, defaultValue) { var value = $.cookie(prop); @@ -46,4 +57,3 @@ window.Preferences = { $.cookie(prop, null, { domain: Preferences.Domain, path: '/' }); } }; - diff --git a/static/js/src/search.js b/static/js/src/search.js index c7bdabf..9a9d389 100755 --- a/static/js/src/search.js +++ b/static/js/src/search.js @@ -159,18 +159,15 @@ Search = { }, 'doAjax': function(term) { - if (Domain == "/") { $.ajax({ "dataType": "json", "url": "/cmd/search/" + term, "success": Search.results, - "error": Search.error, + "error": function(_xhr, _status, error){ + Search.searchError(error || "search failed") + }, "timeout": 20000, }) - } else { // search main site via jsonp - $("#search-script").remove() - $("head").append("<s"+"cript src='/cmd/search/"+term+"?callback=Search.results' id='search-script'></s"+"cript>") - } }, 'click': function(e){ @@ -206,7 +203,7 @@ Search = { if (url.charAt(0) == '/') url = '/images' + url else - url = 'http://' + url + url = normalizeUrl(url) urls.push(url) }) ImgCache.add("search", urls) diff --git a/static/js/src/share.js b/static/js/src/share.js index 976c930..564ca6f 100755 --- a/static/js/src/share.js +++ b/static/js/src/share.js @@ -5,22 +5,22 @@ Share = { }, "facebook": function(button){ var message = getMessageInfo(button) - var url = "https://www.facebook.com/share.php?u=" + message.img + "&t=" + message.via + var url = "https://www.facebook.com/share.php?u=" + encodeURIComponent(message.img) + "&t=" + encodeURIComponent(message.via) Share.openLink(url) }, "tumblr": function(button){ var message = getMessageInfo(button) - var url = "http://www.tumblr.com/share?v=3&u=" + message.img + "&t=" + message.via + var url = "https://www.tumblr.com/share?v=3&u=" + encodeURIComponent(message.img) + "&t=" + encodeURIComponent(message.via) Share.openLink(url) }, "twitter": function(button){ var message = getMessageInfo(button) - var url = "http://twitter.com/home?status=" + message.img + encodeURIComponent(" ") + message.via + var url = "https://twitter.com/intent/tweet?text=" + encodeURIComponent(message.img + " " + message.via) Share.openLink(url) }, "delicious": function(button){ var message = getMessageInfo(button) - var url = "http://delicious.com/save?url=" + message.img + "&title=" + message.img + "¬es=" + message.via + var url = "https://delicious.com/save?url=" + encodeURIComponent(message.img) + "&title=" + encodeURIComponent(message.img) + "¬es=" + encodeURIComponent(message.via) Share.openLink(url) } } diff --git a/static/js/src/tag.js b/static/js/src/tag.js index 1f374ee..76657ee 100755 --- a/static/js/src/tag.js +++ b/static/js/src/tag.js @@ -61,7 +61,7 @@ Tag = { if (isAdding) { var link = $('<a>') - .attr('href', Domain + '/' + Nick + '/popular') + .attr('href', RootDomain + Nick + '/popular') .append($('<b>').text(Nick)) .append(" "); $dump.find('.faver-list').append(link); diff --git a/static/js/src/text.js b/static/js/src/text.js index 773eed4..f426255 100755 --- a/static/js/src/text.js +++ b/static/js/src/text.js @@ -103,11 +103,7 @@ function imgClickHandler() { // durty hack to use a global to check this... but otherwise i'd have to rewrite the String.replace function? :/ var LastMsgContainsImage = false function linkReplace(url) { - var lowerurl = url.toLowerCase(); - if (lowerurl.indexOf('http://') == 0 || lowerurl.indexOf('https://') == 0 || lowerurl.indexOf('ftp://') == 0) - linkUrl = url; - else - linkUrl = 'http://' + url; + linkUrl = normalizeUrl(url); var uri = parseUri(url) var type = getUriType(uri) @@ -162,7 +158,7 @@ function linkifyWithoutImage(text) { function linkReplaceWithoutImage(url){ var urlWithoutParams = url.replace(/\?.*$/i, ""); - linkUrl = url.indexOf('http://') == 0 ? url : 'http://' + url; + linkUrl = normalizeUrl(url); return "<a target='_blank' href='" + linkUrl + "'>" + url + "</a>" } diff --git a/static/js/src/util.js b/static/js/src/util.js index e8d1107..2a3dc52 100755 --- a/static/js/src/util.js +++ b/static/js/src/util.js @@ -16,6 +16,15 @@ isEmptyObject = function(obj) { String.prototype.trim = function(){ return this.replace(/^\s+|\s+$/g,'') } +function normalizeUrl(url) { + if (!url) { return url; } + var lowerurl = url.toLowerCase(); + if (lowerurl.indexOf('http://') == 0 || lowerurl.indexOf('https://') == 0 || lowerurl.indexOf('ftp://') == 0 || lowerurl.indexOf('//') == 0) + return url; + var scheme = (location && location.protocol == 'https:') ? 'https://' : 'http://'; + return scheme + url; +} + function isCSSPropertySupported(prop){ return prop in document.body.style } function track(group, name) { @@ -93,4 +102,3 @@ window.requestAnimFrame = (function(){ function text_off(){ setTextEnable.call( $("#textbutton input").attr("checked",false) ) } - diff --git a/static/js/src/youtube.js b/static/js/src/youtube.js index 7b819dc..2b6a977 100755 --- a/static/js/src/youtube.js +++ b/static/js/src/youtube.js @@ -17,16 +17,19 @@ Youtube = { "nextThumb": function(){ var img = $(this); - // yt thumb url is http://i.ytimg.com/vi/0123456789A/1.jpg - var v = img.attr("src").substr(22,11) - var num = img.attr("src").charAt(34); - img.attr("src", (Youtube.nextThumbUrl(v, num))) + // yt thumb url example: https://i.ytimg.com/vi/0123456789A/1.jpg + var src = img.attr("src") || "" + var match = src.match(/\\/vi\\/([^/]{11})\\/(\\d)\\.jpg/i) + if (!match) return + var v = match[1] + var num = match[2] + img.attr("src", Youtube.nextThumbUrl(v, num)) }, "nextThumbUrl": function(v, num){ if (!num) num = 0; num = (parseInt(num) % 3) + 1 // cycle over 1,2,3 - return "http://i.ytimg.com/vi/" + v + "/" + num + ".jpg" + return "https://i.ytimg.com/vi/" + v + "/" + num + ".jpg" }, } diff --git a/template/banner.old.st b/template/banner.old.st index c28c56a..4cc706e 100755 --- a/template/banner.old.st +++ b/template/banner.old.st @@ -17,19 +17,19 @@ <div align="center"> $if(user_nick)$ - <!-- <a href="$domain$/log" onclick="pageTracker._trackEvent('button', 'banner-log'); return true;"> <img src="$domain$/static/img/thumbs/logbaricon.png"/> Log</a> --> + <!-- <a href="$domain$/log" onclick="pageTracker._trackEvent('button', 'banner-log'); return true;"> <img src="/static/img/thumbs/logbaricon.png"/> Log</a> --> <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a> + <img src="/static/img/thumbs/profilebaricon.png"/> Profile</a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;"> - <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame + <img src="/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame </a> - <!-- <a href="$domain$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> --> - <a href="$domain$/$user_nick$/favorites" onclick="pageTracker._trackEvent('button', 'banner-favs'); return true;"><img src="$domain$/static/img/thumbs/favsbaricon.png"/> Favs</a> - <a href="$domain$/browser" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Image Search</a> + <!-- <a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> --> + <a href="$domain$/$user_nick$/favorites" onclick="pageTracker._trackEvent('button', 'banner-favs'); return true;"><img src="/static/img/thumbs/favsbaricon.png"/> Favs</a> + <a href="$domain$/browser" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Image Search</a> diff --git a/template/banner.st b/template/banner.st index c329149..303aec0 100755 --- a/template/banner.st +++ b/template/banner.st @@ -4,9 +4,9 @@ $if(!user_nick)$ - <a href="$domain$"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $else$ - <a href="$domain$"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $endif$ @@ -15,12 +15,12 @@ <div id="toplinks"> <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a> + <img src="/static/img/thumbs/profilebaricon.png"/> Profile</a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> <a href="$domain$/" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;" id="hall-link"> - <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame + <img src="/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame </a> </div> @@ -60,12 +60,12 @@ <div id="toplinks"> <!-- <a href="$domain$/about" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> About </a> + <img src="/static/img/thumbs/profilebaricon.png"/> About </a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> - <a href="$domain$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> - <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Tags</a> + <a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> + <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Tags</a> </div> <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&layout=button_count&show_faces=false&width=450&action=like&font=tahoma&colorscheme=light&height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe> <a href="/register" id="disregister">Register!</a> --> diff --git a/template/banner_dis.st b/template/banner_dis.st index bdee21e..6ab0ac7 100755 --- a/template/banner_dis.st +++ b/template/banner_dis.st @@ -13,7 +13,7 @@ $endif$ <div id="dislogo"> <div align="center"> <img style="visibility:hidden;width:0px;height:0px;" border=0 width=0 height=0 /> - <a href="https://dismagazine.com"><img src="$domain$/static/img/dis.png" class="dislogo"><a class="img_rolldis" href="$domain$"></a> + <a href="https://dismagazine.com"><img src="/static/img/dis.png" class="dislogo"><a class="img_rolldis" href="$domain$"></a> </div> </div> @@ -22,10 +22,10 @@ $endif$ <div align="center"> $if(user_nick)$ - <!-- <a href="$domain$/log" onclick="pageTracker._trackEvent('button', 'banner-log'); return true;"> <img src="$domain$/static/img/thumbs/logbaricon.png"/> Log</a> --> + <!-- <a href="$domain$/log" onclick="pageTracker._trackEvent('button', 'banner-log'); return true;"> <img src="/static/img/thumbs/logbaricon.png"/> Log</a> --> <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png" /> </a> + <img src="/static/img/thumbs/profilebaricon.png" /> </a> diff --git a/template/browser.st b/template/browser.st index 9590efc..1cd2116 100755 --- a/template/browser.st +++ b/template/browser.st @@ -8,7 +8,6 @@ <link rel="stylesheet" type="text/css" href="/static/gritter/css/jquery.gritter.css" /> <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; @@ -19,6 +18,7 @@ $else$ $endif$ var growlize = true; </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> <!-- <style> diff --git a/template/frontpage copy.st b/template/frontpage copy.st index 2928530..fecc441 100755 --- a/template/frontpage copy.st +++ b/template/frontpage copy.st @@ -13,14 +13,14 @@ setTimeout("refreshing()",300000); <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="keywords" content="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board, scott ostler, ryder ripps"> <meta name="description" content="dump.fm - Talk with pictures!" /> - <script type="text/javascript" src="$domain$/static/js/jquery-1.4.2.min.js"></script> - <link rel="shortcut icon" href="$domain$/static/favicon.ico"> - <link rel="image_src" href="$domain$/static/img/thumbs/heartover.gif" > - <script type="text/javascript" src="$domain$/static/js/pichat.js"></script> - <script src="$domain$/static/js/jquery.masonry.min.js"type="text/javascript"></script> - <script src="$domain$/static/js/jquery.isotope.min.js"></script> + <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script> + <link rel="shortcut icon" href="/static/favicon.ico"> + <link rel="image_src" href="/static/img/thumbs/heartover.gif" > + <script type="text/javascript" src="/static/js/pichat.js"></script> + <script src="/static/js/jquery.masonry.min.js"type="text/javascript"></script> + <script src="/static/js/jquery.isotope.min.js"></script> <script> - Domain = "$domain$"; + Domain = "/"; Nick = $if(logged_in)$"$user_nick$"$else$null$endif$; </script> @@ -28,16 +28,16 @@ setTimeout("refreshing()",300000); <link href="/static/css/frontpage_legacy.css?v=20260129" media="screen, projection" rel="stylesheet" type="text/css"> $if(!logged_in)$ - <script type="text/javascript" src="$domain$/static/js/popup.js"></script> + <script type="text/javascript" src="/static/js/popup.js"></script> $endif$ - <link rel="shortcut icon" href="$domain$/static/favicon.ico"> + <link rel="shortcut icon" href="/static/favicon.ico"> <!--END HEAD--> <!-- <style> -body{margin:0px; background-image:url($domain$/static/img/bg.dither.gif); background-color:#e2e2e2;/*background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x; +body{margin:0px; background-image:url(/static/img/bg.dither.gif); background-color:#e2e2e2;/*background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x; background-repeat:repeat-x; background-position:top;*/background-attachment:fixed;min-width:900px; font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Arial, sans-serif; font-size: 13px; line-height: 1.5em;} @@ -146,7 +146,7 @@ a#disregister { .search_icon { - background:url("$domain$/static/img/hourglass.png") no-repeat scroll center center transparent; + background:url("/static/img/hourglass.png") no-repeat scroll center center transparent; bottom:3px; cursor:pointer; left:6px; @@ -247,20 +247,20 @@ jQuery(window).load(function(){ $if(!logged_in)$ - <a href="$domain$/chat"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$/chat"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $else$ - <a href="$domain$/chat"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$/chat"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $endif$ $if(user_nick)$ <div id="toplinks"> <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a> + <img src="/static/img/thumbs/profilebaricon.png"/> Profile</a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;"> - <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame + <img src="/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame </a> </div> <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&layout=button_count&show_faces=false&width=450&action=like&font=tahoma&colorscheme=light&height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe> @@ -268,12 +268,12 @@ jQuery(window).load(function(){ <!-- <div id="toplinks"> <a href="$domain$/about" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> About </a> + <img src="/static/img/thumbs/profilebaricon.png"/> About </a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> -<a href="$domain$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> - <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Tags</a> +<a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> + <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Tags</a> </div>--> <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&layout=button_count&show_faces=false&width=450&action=like&font=tahoma&colorscheme=light&height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe> <!-- <a href="$domain$/register" id="disregister">Register!</a>--> diff --git a/template/frontpage.st b/template/frontpage.st index 15f758e..9e75081 100755 --- a/template/frontpage.st +++ b/template/frontpage.st @@ -13,14 +13,14 @@ setTimeout("refreshing()",300000); <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="keywords" content="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board, scott ostler, ryder ripps"> <meta name="description" content="dump.fm - Talk with pictures!" /> - <script type="text/javascript" src="$domain$/static/js/jquery-1.4.2.min.js"></script> - <link rel="shortcut icon" href="$domain$/static/favicon.ico"> - <link rel="image_src" href="$domain$/static/img/thumbs/heartover.gif" > - <script type="text/javascript" src="$domain$/static/js/pichat.js"></script> - <script src="$domain$/static/js/jquery.masonry.min.js"type="text/javascript"></script> - <script src="$domain$/static/js/jquery.isotope.min.js"></script> + <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script> + <link rel="shortcut icon" href="/static/favicon.ico"> + <link rel="image_src" href="/static/img/thumbs/heartover.gif" > + <script type="text/javascript" src="/static/js/pichat.js"></script> + <script src="/static/js/jquery.masonry.min.js"type="text/javascript"></script> + <script src="/static/js/jquery.isotope.min.js"></script> <script> - Domain = "$domain$"; + Domain = "/"; Nick = $if(logged_in)$"$user_nick$"$else$null$endif$; </script> @@ -28,16 +28,16 @@ setTimeout("refreshing()",300000); <link href="/static/css/frontpage_legacy.css?v=20260129" media="screen, projection" rel="stylesheet" type="text/css"> $if(!logged_in)$ - <script type="text/javascript" src="$domain$/static/js/popup.js"></script> + <script type="text/javascript" src="/static/js/popup.js"></script> $endif$ - <link rel="shortcut icon" href="$domain$/static/favicon.ico"> + <link rel="shortcut icon" href="/static/favicon.ico"> <!--END HEAD--> <!-- <style> -body{margin:0px; background-image:url($domain$/static/img/bg.dither.gif); background-color:#e2e2e2;/*background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x; +body{margin:0px; background-image:url(/static/img/bg.dither.gif); background-color:#e2e2e2;/*background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x; background-repeat:repeat-x; background-position:top;*/background-attachment:fixed;min-width:900px; font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Arial, sans-serif; font-size: 13px; line-height: 1.5em;} @@ -146,7 +146,7 @@ a#disregister { .search_icon { - background:url("$domain$/static/img/hourglass.png") no-repeat scroll center center transparent; + background:url("/static/img/hourglass.png") no-repeat scroll center center transparent; bottom:3px; cursor:pointer; left:6px; @@ -247,20 +247,20 @@ jQuery(window).load(function(){ $if(!logged_in)$ - <a href="$domain$/chat"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$/chat"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $else$ - <a href="$domain$/chat"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$/chat"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $endif$ $if(user_nick)$ <div id="toplinks"> <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a> + <img src="/static/img/thumbs/profilebaricon.png"/> Profile</a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;"> - <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame + <img src="/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame </a> </div> <!-- @@ -270,12 +270,12 @@ jQuery(window).load(function(){ <!-- <div id="toplinks"> <a href="$domain$/about" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> About </a> + <img src="/static/img/thumbs/profilebaricon.png"/> About </a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> -<a href="$domain$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> - <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Tags</a> +<a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> + <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Tags</a> </div>--> <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&layout=button_count&show_faces=false&width=450&action=like&font=tahoma&colorscheme=light&height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe> <!-- <a href="$domain$/register" id="disregister">Register!</a>--> diff --git a/template/frontpagePROFILE.st b/template/frontpagePROFILE.st index b303e5e..4dfd899 100755 --- a/template/frontpagePROFILE.st +++ b/template/frontpagePROFILE.st @@ -10,31 +10,31 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="keywords" content="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board, scott ostler, ryder ripps"> <meta name="description" content="dump.fm - Talk with pictures!" /> -<script type="text/javascript" src="$domain$/static/js/jquery-1.4.2.min.js"></script> -<link rel="shortcut icon" href="$domain$/static/favicon.ico"> -<link rel="image_src" href="$domain$/static/img/thumbs/heartover.gif" > -<script type="text/javascript" src="$domain$/static/js/pichat.js"></script> +<script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script> +<link rel="shortcut icon" href="/static/favicon.ico"> +<link rel="image_src" href="/static/img/thumbs/heartover.gif" > +<script type="text/javascript" src="/static/js/pichat.js"></script> <link href="/static/css/front.css?v=20260128" media="screen, projection" rel="stylesheet" type="text/css"> <link href="/static/css/frontpage_profile.css?v=20260129" media="screen, projection" rel="stylesheet" type="text/css"> - <script src="$domain$/static/js/jquery.masonry.min.js"type="text/javascript"></script> - <script src="$domain$/static/js/jquery.isotope.min.js"></script> - <!-- <link rel="stylesheet" href="$domain$/static/css/isostyle.css" type="text/css" media="screen" />--> -<script>Domain = "$domain$"</script> + <script src="/static/js/jquery.masonry.min.js"type="text/javascript"></script> + <script src="/static/js/jquery.isotope.min.js"></script> + <!-- <link rel="stylesheet" href="/static/css/isostyle.css" type="text/css" media="screen" />--> +<script>Domain = "/"</script> $if(!user_nick)$ -<script type="text/javascript" src="$domain$/static/js/popup.js"></script> +<script type="text/javascript" src="/static/js/popup.js"></script> $endif$ $if(isadmin)$ <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css" type="text/css" media="all" /> -<!--<link rel="stylesheet" href="$domain$/static/css/admin.css" +<!--<link rel="stylesheet" href="/static/css/admin.css" type="text/css" media="all" />--> <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js" type="text/javascript"></script> -<!--<script src="$domain$/static/js/admin.js" type="text/javascript"></script>--> +<!--<script src="/static/js/admin.js" type="text/javascript"></script>--> $endif$ -<link rel="shortcut icon" href="$domain$/static/favicon.ico"> +<link rel="shortcut icon" href="/static/favicon.ico"> @@ -227,9 +227,9 @@ jQuery(window).load(function(){ $if(!user_nick)$ - <a href="$domain$"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $else$ - <a href="$domain$"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $endif$ @@ -238,12 +238,12 @@ jQuery(window).load(function(){ <div id="toplinks"> <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a> + <img src="/static/img/thumbs/profilebaricon.png"/> Profile</a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;"> - <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame + <img src="/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame </a> </div> @@ -253,12 +253,12 @@ jQuery(window).load(function(){ <div id="toplinks"> <a href="$domain$/about" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> About </a> + <img src="/static/img/thumbs/profilebaricon.png"/> About </a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> -<a href="$domain$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> - <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Tags</a> +<a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> + <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Tags</a> </div> <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&layout=button_count&show_faces=false&width=450&action=like&font=tahoma&colorscheme=light&height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe> <a href="/register" id="disregister">Register!</a> diff --git a/template/frontpage_halloffame.st b/template/frontpage_halloffame.st index 7876ead..e82c53e 100755 --- a/template/frontpage_halloffame.st +++ b/template/frontpage_halloffame.st @@ -13,14 +13,14 @@ setTimeout("refreshing()",300000); <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="keywords" content="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board, scott ostler, ryder ripps"> <meta name="description" content="dump.fm - Talk with pictures!" /> - <script type="text/javascript" src="$domain$/static/js/jquery-1.4.2.min.js"></script> - <link rel="shortcut icon" href="$domain$/static/favicon.ico"> - <link rel="image_src" href="$domain$/static/img/thumbs/heartover.gif" > - <script type="text/javascript" src="$domain$/static/js/pichat.js"></script> - <script src="$domain$/static/js/jquery.masonry.min.js"type="text/javascript"></script> - <script src="$domain$/static/js/jquery.isotope.min.js"></script> + <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script> + <link rel="shortcut icon" href="/static/favicon.ico"> + <link rel="image_src" href="/static/img/thumbs/heartover.gif" > + <script type="text/javascript" src="/static/js/pichat.js"></script> + <script src="/static/js/jquery.masonry.min.js"type="text/javascript"></script> + <script src="/static/js/jquery.isotope.min.js"></script> <script> - Domain = "$domain$"; + Domain = "/"; Nick = $if(logged_in)$"$user_nick$"$else$null$endif$; </script> @@ -28,16 +28,16 @@ setTimeout("refreshing()",300000); <link href="/static/css/frontpage_legacy.css?v=20260129" media="screen, projection" rel="stylesheet" type="text/css"> $if(!logged_in)$ - <script type="text/javascript" src="$domain$/static/js/popup.js"></script> + <script type="text/javascript" src="/static/js/popup.js"></script> $endif$ - <link rel="shortcut icon" href="$domain$/static/favicon.ico"> + <link rel="shortcut icon" href="/static/favicon.ico"> <!--END HEAD--> <!-- <style> -body{margin:0px; background-image:url($domain$/static/img/bg.dither.gif); background-color:#e2e2e2;/*background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x; +body{margin:0px; background-image:url(/static/img/bg.dither.gif); background-color:#e2e2e2;/*background:#f0f9ff url(/static/img/fade-blue.png) top center repeat-x; background-repeat:repeat-x; background-position:top;*/background-attachment:fixed;min-width:900px; font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Arial, sans-serif; font-size: 13px; line-height: 1.5em;} @@ -146,7 +146,7 @@ a#disregister { .search_icon { - background:url("$domain$/static/img/hourglass.png") no-repeat scroll center center transparent; + background:url("/static/img/hourglass.png") no-repeat scroll center center transparent; bottom:3px; cursor:pointer; left:6px; @@ -247,20 +247,20 @@ jQuery(window).load(function(){ $if(!logged_in)$ - <a href="$domain$/chat"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$/chat"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $else$ - <a href="$domain$/chat"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$/chat"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $endif$ $if(user_nick)$ <div id="toplinks"> <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a> + <img src="/static/img/thumbs/profilebaricon.png"/> Profile</a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;"> - <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame + <img src="/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame </a> </div> <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&layout=button_count&show_faces=false&width=450&action=like&font=tahoma&colorscheme=light&height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe> @@ -268,12 +268,12 @@ jQuery(window).load(function(){ <!-- <div id="toplinks"> <a href="$domain$/about" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> About </a> + <img src="/static/img/thumbs/profilebaricon.png"/> About </a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> -<a href="$domain$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> - <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Tags</a> +<a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> + <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Tags</a> </div>--> <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&layout=button_count&show_faces=false&width=450&action=like&font=tahoma&colorscheme=light&height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe> <!-- <a href="$domain$/register" id="disregister">Register!</a>--> diff --git a/template/frontpage_share_buttons.st b/template/frontpage_share_buttons.st index 020f60e..1ee07d6 100755 --- a/template/frontpage_share_buttons.st +++ b/template/frontpage_share_buttons.st @@ -1,5 +1,5 @@ <span class="buttons frontpage"> - <a class="permalink" href="$domain$/p/$dump.nick$/$dump.message_id$"><img src="$domain$/static/img/link.gif"></a> + <a class="permalink" href="$domain$/p/$dump.nick$/$dump.message_id$"><img src="/static/img/link.gif"></a> $if(dump.favorited)$ <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.animated_fav(this, '.hallscore', '60px', '40px')"> $else$ diff --git a/template/fullscreen.ryder.st b/template/fullscreen.ryder.st index 9fbce5f..ee2bad7 100755 --- a/template/fullscreen.ryder.st +++ b/template/fullscreen.ryder.st @@ -6,7 +6,6 @@ <title>$roomname$ dump.fm</title> <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; diff --git a/template/fullscreen.st b/template/fullscreen.st index 44db7ef..031704c 100755 --- a/template/fullscreen.st +++ b/template/fullscreen.st @@ -2,11 +2,11 @@ <head> <title>dump.fm - fullscreen</title> <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script> - <script src="$domain$/static/js/pichat.js"></script> - <script src="$domain$/static/js/fullscreen.js?v=20260126"></script> + <script src="/static/js/pichat.js"></script> + <script src="/static/js/fullscreen.js?v=20260126"></script> $if(user_nick)$ $else$ - <script src="$domain$/static/js/register.js"></script> + <script src="/static/js/register.js"></script> $endif$ <script> var LoggedIn = $if(user_nick)$true$else$false$endif$; diff --git a/template/fullscreen2.st b/template/fullscreen2.st index 38a5e2b..1dfe6b8 100755 --- a/template/fullscreen2.st +++ b/template/fullscreen2.st @@ -6,13 +6,12 @@ <title>$roomname$ dump.fm</title> <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; var Version = $version$; </script> - <script type="text/javascript" src="$domain$/static/js/supersized.js"></script> + <script type="text/javascript" src="/static/js/supersized.js"></script> <script type="text/javascript"> jQuery(function(){ diff --git a/template/fullscreen4.st b/template/fullscreen4.st index 2dbb3d4..4b34243 100755 --- a/template/fullscreen4.st +++ b/template/fullscreen4.st @@ -2,8 +2,8 @@ <head> <title>dump.fm - fullscreen</title> <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script> - <script src="$domain$/static/js/pichat.js"></script> - <script src="$domain$/static/js/fullscreen.js?v=20260126"></script> + <script src="/static/js/pichat.js"></script> + <script src="/static/js/fullscreen.js?v=20260126"></script> <script> var LoggedIn = $if(user_nick)$true$else$false$endif$; var Timestamp = $timestamp$; diff --git a/template/fullscreen5.st b/template/fullscreen5.st index c7c4a0e..863655c 100755 --- a/template/fullscreen5.st +++ b/template/fullscreen5.st @@ -2,8 +2,8 @@ <head> <title>dump.fm - fullscreen</title> <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script> - <script src="$domain$/static/js/pichat.js"></script> - <script src="$domain$/static/js/fullscreen.js?v=20260126"></script> + <script src="/static/js/pichat.js"></script> + <script src="/static/js/fullscreen.js?v=20260126"></script> <script> var LoggedIn = $if(user_nick)$true$else$false$endif$; var Timestamp = $timestamp$; diff --git a/template/fullscreen_front.st b/template/fullscreen_front.st index 0e2d732..e0d48a5 100755 --- a/template/fullscreen_front.st +++ b/template/fullscreen_front.st @@ -2,8 +2,8 @@ <head> <title>dump.fm - fullscreen</title> <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script> - <script src="$domain$/static/js/pichat.js"></script> - <script src="$domain$/static/js/fullscreen.js"></script> + <script src="/static/js/pichat.js"></script> + <script src="/static/js/fullscreen.js"></script> <script> var LoggedIn = $if(user_nick)$true$else$false$endif$; var Timestamp = $timestamp$; diff --git a/template/fullscreenphotobooth.st b/template/fullscreenphotobooth.st index 232d6c0..77a6405 100755 --- a/template/fullscreenphotobooth.st +++ b/template/fullscreenphotobooth.st @@ -2,8 +2,8 @@ <head> <title>dump.fm - fullscreen</title> <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script> - <script src="$domain$/static/js/pichat.js"></script> - <script src="$domain$/static/js/fullscreenphotobooth.js?v=20260126"></script> + <script src="/static/js/pichat.js"></script> + <script src="/static/js/fullscreenphotobooth.js?v=20260126"></script> <script> var LoggedIn = $if(user_nick)$true$else$false$endif$; var Timestamp = $timestamp$; diff --git a/template/hall_share_buttons.st b/template/hall_share_buttons.st index 6addd09..a058f4a 100755 --- a/template/hall_share_buttons.st +++ b/template/hall_share_buttons.st @@ -3,7 +3,7 @@ <img src="/static/img/share/fbbutton.png" class="share" onclick="Share.facebook(this)"> <img src="/static/img/share/twittericon.png" class="share" onclick="Share.twitter(this)"> <img src="/static/img/share/delishicon.png" class="share" onclick="Share.delicious(this)"> - <a class="permalink" href="/p/$dump.nick$/$dump.message_id$"><img src="$domain$/static/img/link.gif"></a> + <a class="permalink" href="/p/$dump.nick$/$dump.message_id$"><img src="/static/img/link.gif"></a> $if(logged_in)$ $if(dump.favorited)$ <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.animated_fav(this, '.scorecount', '18px', '12px')"> diff --git a/template/head.st b/template/head.st index 9671eaf..dfedf3e 100755 --- a/template/head.st +++ b/template/head.st @@ -4,27 +4,27 @@ <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script> <link rel="shortcut icon" href="/static/favicon.ico"> <link rel="image_src" href="/static/img/thumbs/heartover.gif" > -<!-- <script type="text/javascript" src="$domain$/static/js/jquery-ui-1.8.effects.min.js"></script> --> -<script type="text/javascript" src="$domain$/static/js/pichat.js"></script> -<link rel="stylesheet" type="text/css" href="$domain$/static/css/dump.css"> +<!-- <script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script> --> +<script type="text/javascript" src="/static/js/pichat.js"></script> +<link rel="stylesheet" type="text/css" href="/static/css/dump.css"> <script> - Domain = "$domain$"; + Domain = "/"; Nick = $if(user_nick)$"$user_nick$"$else$null$endif$; </script> $if(!user_nick)$ -<script type="text/javascript" src="$domain$/static/js/popup.js"></script> +<script type="text/javascript" src="/static/js/popup.js"></script> $endif$ $if(isadmin)$ <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css" type="text/css" media="all" /> -<link rel="stylesheet" href="$domain$/static/css/admin.css" +<link rel="stylesheet" href="/static/css/admin.css" type="text/css" media="all" /> <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js" type="text/javascript"></script> -<script src="$domain$/static/js/admin.js" type="text/javascript"></script> +<script src="/static/js/admin.js" type="text/javascript"></script> $endif$ -<link rel="shortcut icon" href="$domain$/static/favicon.ico"> +<link rel="shortcut icon" href="/static/favicon.ico"> <!--[if IE]> <script> diff --git a/template/head_edge.st b/template/head_edge.st index e18b066..dfedf3e 100755 --- a/template/head_edge.st +++ b/template/head_edge.st @@ -4,27 +4,27 @@ <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script> <link rel="shortcut icon" href="/static/favicon.ico"> <link rel="image_src" href="/static/img/thumbs/heartover.gif" > -<!-- <script type="text/javascript" src="$domain$/static/js/jquery-ui-1.8.effects.min.js"></script> --> -<script type="text/javascript" src="$domain$/static/js/pichat2.js"></script> -<link rel="stylesheet" type="text/css" href="$domain$/static/css/dump.css"> +<!-- <script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script> --> +<script type="text/javascript" src="/static/js/pichat.js"></script> +<link rel="stylesheet" type="text/css" href="/static/css/dump.css"> <script> - Domain = "$domain$"; + Domain = "/"; Nick = $if(user_nick)$"$user_nick$"$else$null$endif$; </script> $if(!user_nick)$ -<script type="text/javascript" src="$domain$/static/js/popup.js"></script> +<script type="text/javascript" src="/static/js/popup.js"></script> $endif$ $if(isadmin)$ <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css" type="text/css" media="all" /> -<link rel="stylesheet" href="$domain$/static/css/admin.css" +<link rel="stylesheet" href="/static/css/admin.css" type="text/css" media="all" /> <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js" type="text/javascript"></script> -<script src="$domain$/static/js/admin.js" type="text/javascript"></script> +<script src="/static/js/admin.js" type="text/javascript"></script> $endif$ -<link rel="shortcut icon" href="$domain$/static/favicon.ico"> +<link rel="shortcut icon" href="/static/favicon.ico"> <!--[if IE]> <script> diff --git a/template/ie_fullscreen.st b/template/ie_fullscreen.st index a03df7d..e165d52 100755 --- a/template/ie_fullscreen.st +++ b/template/ie_fullscreen.st @@ -2,8 +2,8 @@ <head> <title>dump.fm - fullscreen</title> <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script> - <script src="$domain$/static/js/pichat.js"></script> - <script src="$domain$/static/js/fullscreen.js"></script> + <script src="/static/js/pichat.js"></script> + <script src="/static/js/fullscreen.js"></script> <script> var DoPrint = true; var LoggedIn = $if(user_nick)$true$else$false$endif$; diff --git a/template/imagelayering.st b/template/imagelayering.st index 9b880cc..32318ab 100755 --- a/template/imagelayering.st +++ b/template/imagelayering.st @@ -20,14 +20,13 @@ $head()$ <link rel="stylesheet" type="text/css" href="/static/css/chat_wrapper.css?v=20260129"> <title>$roomname$ dump.fm</title> - <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script> - <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script> - <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script> + <script type="text/javascript" src="/static/js/invalid_domains.js"></script> + <script type="text/javascript" src="/static/webcam/webcam.js"></script> + <script type="text/javascript" src="/static/js/ajaxupload.js"></script> $if(user_nick)$ - <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script> + <script type="text/javascript" src="/json/$user_nick$/favorites"></script> $endif$ <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; @@ -36,25 +35,8 @@ $if(isadmin)$ $else$ var IsAdmin = false; $endif$ - if (Nick) { - jQuery(document).ready(function() { setupUpload('upload', Room); }); - } - function showAlert() { alert('MUST LOGIN'); } - var newwindow; - function pop(url) { - newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0'); - if (window.focus) {newwindow.focus()} - } - jQuery(Away.startTitleUpdater); - jQuery(initChatMsgs); - $if(user_nick)$ // - $else$ - function showAlert() { - alert('Join dump.fm @ /register'); - } - -$endif$ </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> <!-- <style> #chat-wrapper { diff --git a/template/mgmtfull.st b/template/mgmtfull.st index ca9920a..ed42558 100755 --- a/template/mgmtfull.st +++ b/template/mgmtfull.st @@ -2,8 +2,8 @@ <head> <title>dump.fm</title> <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script> - <script src="$domain$/static/js/pichat.js"></script> - <script src="$domain$/static/js/fullscreenmgmt.js?v=20260126"></script> + <script src="/static/js/pichat.js"></script> + <script src="/static/js/fullscreenmgmt.js?v=20260126"></script> <script> var LoggedIn = $if(user_nick)$true$else$false$endif$; var Timestamp = $timestamp$; diff --git a/template/newlog.st b/template/newlog.st index 434e301..601ae94 100755 --- a/template/newlog.st +++ b/template/newlog.st @@ -13,25 +13,25 @@ <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script> <link rel="shortcut icon" href="/static/favicon.ico"> <link rel="image_src" href="/static/img/thumbs/heartover.gif" > -<script type="text/javascript" src="$domain$/static/js/pichat.js"></script> +<script type="text/javascript" src="/static/js/pichat.js"></script> <link href="/static/css/front.css?v=20260128" media="screen, projection" rel="stylesheet" type="text/css"> <link href="/static/css/newlog.css?v=20260129" media="screen, projection" rel="stylesheet" type="text/css"> -<script>Domain = "$domain$"</script> +<script>Domain = "/"</script> $if(!user_nick)$ -<script type="text/javascript" src="$domain$/static/js/popup.js"></script> +<script type="text/javascript" src="/static/js/popup.js"></script> $endif$ $if(isadmin)$ <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css" type="text/css" media="all" /> -<!--<link rel="stylesheet" href="$domain$/static/css/admin.css" +<!--<link rel="stylesheet" href="/static/css/admin.css" type="text/css" media="all" />--> <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js" type="text/javascript"></script> -<script src="$domain$/static/js/admin.js" type="text/javascript"></script> +<script src="/static/js/admin.js" type="text/javascript"></script> $endif$ -<link rel="shortcut icon" href="$domain$/static/favicon.ico"> +<link rel="shortcut icon" href="/static/favicon.ico"> <!--[if IE]> <script> @@ -139,7 +139,7 @@ a#disregister { <div id="banner"> - <a href="$domain$"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $if(!user_nick)$ @@ -153,12 +153,12 @@ a#disregister { <div id="toplinks"> <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a> + <img src="/static/img/thumbs/profilebaricon.png"/> Profile</a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;"> - <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame + <img src="/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame </a> </div> diff --git a/template/profile.st b/template/profile.st index 468deac..f46ef5d 100755 --- a/template/profile.st +++ b/template/profile.st @@ -40,7 +40,7 @@ jQuery(document).ready(function() { $if(avatar)$ <div id="dashtotal"style="background-image:url($avatar$);opacity:0.1;width:100%;height:100%;z-index:-1"></div> $else$ - <div id="dashtotal"style="background-image:url($domain$/static/img/thumbs/stripes.gif);width:100%;height:100%;z-index:-1"></div> + <div id="dashtotal"style="background-image:url(/static/img/thumbs/stripes.gif);width:100%;height:100%;z-index:-1"></div> $endif$ $banner()$ @@ -52,7 +52,7 @@ jQuery(document).ready(function() { <img id="dashavatarPic" src="$avatar$"/> </div> $else$ - <img id="avatarPic" src="$domain$/static/img/noinfo.png"> + <img id="avatarPic" src="/static/img/noinfo.png"> $endif$ @@ -66,7 +66,7 @@ jQuery(document).ready(function() { $if(is_home)$ <div id="avatar-editing" style="display: none"> <input id="uploadp" value="Upload Icon" type="submit"> - <img id="spinner" src="$domain$/static/img/spinner.gif" style="display: none" /> + <img id="spinner" src="/static/img/spinner.gif" style="display: none" /> </div> $endif$ <div id="dashinfo"> @@ -75,7 +75,7 @@ jQuery(document).ready(function() { $if(contact)$ <div id="contact" class="linkify-text">$contact$</div> $else$ - <img id="contact" src="$domain$/static/img/noinfo.png"> + <img id="contact" src="/static/img/noinfo.png"> $endif$ <br> <h3>bio</h3> diff --git a/template/rooms/VIP.st b/template/rooms/VIP.st index 19d08a2..5b5ebf5 100755 --- a/template/rooms/VIP.st +++ b/template/rooms/VIP.st @@ -20,14 +20,13 @@ <link rel="stylesheet" type="text/css" href="/static/css/chat_wrapper.css?v=20260129"> <title>$roomname$ dump.fm</title> - <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script> - <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script> - <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script> + <script type="text/javascript" src="/static/js/invalid_domains.js"></script> + <script type="text/javascript" src="/static/webcam/webcam.js"></script> + <script type="text/javascript" src="/static/js/ajaxupload.js"></script> $if(user_nick)$ - <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script> + <script type="text/javascript" src="/json/$user_nick$/favorites"></script> $endif$ <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; @@ -36,25 +35,8 @@ $else$ var IsAdmin = false; $endif$ - if (Nick) { - jQuery(document).ready(function() { setupUpload('upload', Room); }); - } - function showAlert() { alert('MUST LOGIN'); } - var newwindow; - function pop(url) { - newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0'); - if (window.focus) {newwindow.focus()} - } - jQuery(Away.startTitleUpdater); - jQuery(initChatMsgs); - $if(user_nick)$ // - $else$ - function showAlert() { - alert('Join dump.fm @ /register'); - } - - $endif$ </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> </head> <body> $if(dis)$ @@ -64,7 +46,7 @@ $if(!user_nick)$ <div id="dis_welcome"> <center> - <img src="$domain$/static/img/dumppixellarge3.png"> + <img src="/static/img/dumppixellarge3.png"> <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload, or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love. <br><br> <span id="signintxt"> @@ -130,4 +112,3 @@ </div> </body> </html> - diff --git a/template/rooms/artornot.st b/template/rooms/artornot.st index bab68cf..54a1a73 100755 --- a/template/rooms/artornot.st +++ b/template/rooms/artornot.st @@ -20,14 +20,13 @@ <link rel="stylesheet" type="text/css" href="/static/css/chat_wrapper.css?v=20260129"> <title>$roomname$ dump.fm</title> - <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script> - <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script> - <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script> + <script type="text/javascript" src="/static/js/invalid_domains.js"></script> + <script type="text/javascript" src="/static/webcam/webcam.js"></script> + <script type="text/javascript" src="/static/js/ajaxupload.js"></script> $if(user_nick)$ - <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script> + <script type="text/javascript" src="/json/$user_nick$/favorites"></script> $endif$ <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; @@ -36,25 +35,8 @@ $else$ var IsAdmin = false; $endif$ - if (Nick) { - jQuery(document).ready(function() { setupUpload('upload', Room); }); - } - function showAlert() { alert('MUST LOGIN'); } - var newwindow; - function pop(url) { - newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0'); - if (window.focus) {newwindow.focus()} - } - jQuery(Away.startTitleUpdater); - jQuery(initChatMsgs); - $if(user_nick)$ // - $else$ - function showAlert() { - alert('Join dump.fm @ /register'); - } - - $endif$ </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> </head> <body> $if(dis)$ @@ -64,7 +46,7 @@ $if(!user_nick)$ <div id="dis_welcome"> <center> - <img src="$domain$/static/img/dumppixellarge3.png"> + <img src="/static/img/dumppixellarge3.png"> <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload, or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love. <br><br> <span id="signintxt"> @@ -121,4 +103,3 @@ </div> </body> </html> - diff --git a/template/rooms/atrium.st b/template/rooms/atrium.st index 550e815..f6e91f6 100755 --- a/template/rooms/atrium.st +++ b/template/rooms/atrium.st @@ -20,14 +20,13 @@ <link rel="stylesheet" type="text/css" href="/static/css/chat_wrapper.css?v=20260129"> <title>$roomname$ dump.fm</title> - <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script> - <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script> - <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script> + <script type="text/javascript" src="/static/js/invalid_domains.js"></script> + <script type="text/javascript" src="/static/webcam/webcam.js"></script> + <script type="text/javascript" src="/static/js/ajaxupload.js"></script> $if(user_nick)$ - <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script> + <script type="text/javascript" src="/json/$user_nick$/favorites"></script> $endif$ <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; @@ -36,25 +35,8 @@ $else$ var IsAdmin = false; $endif$ - if (Nick) { - jQuery(document).ready(function() { setupUpload('upload', Room); }); - } - function showAlert() { alert('MUST LOGIN'); } - var newwindow; - function pop(url) { - newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0'); - if (window.focus) {newwindow.focus()} - } - jQuery(Away.startTitleUpdater); - jQuery(initChatMsgs); - $if(user_nick)$ // - $else$ - function showAlert() { - alert('Join dump.fm @ /register'); - } - - $endif$ </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> </head> <body> $if(dis)$ @@ -64,7 +46,7 @@ $if(!user_nick)$ <div id="dis_welcome"> <center> - <img src="$domain$/static/img/dumppixellarge3.png"> + <img src="/static/img/dumppixellarge3.png"> <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload, or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love. <br><br> <span id="signintxt"> @@ -74,9 +56,9 @@ </div> </div> - <link href="$domain$/static/css/pages.css" rel="stylesheet" type="text/css" media="screen" /> - <link href="$domain$/static/css/header.css" rel="stylesheet" type="text/css" media="screen" /> - <script type="text/javascript" src="$domain$/static/js/win.js"></script> + <link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen" /> + <link href="/static/css/header.css" rel="stylesheet" type="text/css" media="screen" /> + <script type="text/javascript" src="/static/js/win.js"></script> <script type="text/javascript"> var topZ = 7; CreateDropdownWindow('', '500px', true, 'dis_welcome', 300, 70); diff --git a/template/rooms/butt.st b/template/rooms/butt.st index 1094ef4..4f1e739 100755 --- a/template/rooms/butt.st +++ b/template/rooms/butt.st @@ -35,7 +35,6 @@ $if(user_nick)$ <script type="text/javascript" src="/json/$user_nick$/favorites"></script> $endif$ <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; @@ -44,16 +43,8 @@ $if(isadmin)$ $else$ var IsAdmin = false; $endif$ - if (Nick) { - jQuery(document).ready(function() { setupUpload('upload', Room); }); - } - function showAlert() { alert('MUST LOGIN'); } - var newwindow; - function pop(url) { - newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0'); - if (window.focus) {newwindow.focus()} - } </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> <!--<style type="text/css"> html { diff --git a/template/rooms/chat.st b/template/rooms/chat.st index 8c41806..96dcb97 100755 --- a/template/rooms/chat.st +++ b/template/rooms/chat.st @@ -20,15 +20,14 @@ <link rel="stylesheet" type="text/css" href="/static/css/chat_wrapper.css?v=20260129"> <title>$roomname$ dump.fm</title> - <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script> - <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script> - <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script> - <script type="text/javascript" src="$domain$/static/js/finger.js"></script> + <script type="text/javascript" src="/static/js/invalid_domains.js"></script> + <script type="text/javascript" src="/static/webcam/webcam.js"></script> + <script type="text/javascript" src="/static/js/ajaxupload.js"></script> + <script type="text/javascript" src="/static/js/finger.js"></script> $if(user_nick)$ - <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script> + <script type="text/javascript" src="/json/$user_nick$/favorites"></script> $endif$ <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; @@ -37,25 +36,8 @@ $else$ var IsAdmin = false; $endif$ - if (Nick) { - jQuery(document).ready(function() { setupUpload('upload', Room); }); - } - function showAlert() { alert('MUST LOGIN'); } - var newwindow; - function pop(url) { - newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0'); - if (window.focus) {newwindow.focus()} - } - jQuery(Away.startTitleUpdater); - jQuery(initChatMsgs); - $if(user_nick)$ // - $else$ - function showAlert() { - alert('Join dump.fm @ /register'); - } - - $endif$ </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> </head> <body> $if(dis)$ @@ -66,7 +48,7 @@ <script>window.location.href = "/"</script> <div id="dis_welcome"> <center> - <img src="$domain$/static/img/dumppixellarge3.png"> + <img src="/static/img/dumppixellarge3.png"> <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload, or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love. <br><br> <span id="signintxt"> @@ -76,9 +58,9 @@ </div> </div> - <link href="$domain$/static/css/pages.css" rel="stylesheet" type="text/css" media="screen" /> - <link href="$domain$/static/css/header.css" rel="stylesheet" type="text/css" media="screen" /> - <script type="text/javascript" src="$domain$/static/js/win.js"></script> + <link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen" /> + <link href="/static/css/header.css" rel="stylesheet" type="text/css" media="screen" /> + <script type="text/javascript" src="/static/js/win.js"></script> <script type="text/javascript"> var topZ = 7; CreateDropdownWindow('', '500px', true, 'dis_welcome', 300, 70); diff --git a/template/rooms/dump2.st b/template/rooms/dump2.st index 200250b..ab8ef55 100755 --- a/template/rooms/dump2.st +++ b/template/rooms/dump2.st @@ -21,14 +21,13 @@ <link rel="stylesheet" type="text/css" href="/static/css/rooms_dump2.css?v=20260129"> <title>no $roomname$ dump.fm</title> - <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script> - <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script> - <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script> + <script type="text/javascript" src="/static/js/invalid_domains.js"></script> + <script type="text/javascript" src="/static/webcam/webcam.js"></script> + <script type="text/javascript" src="/static/js/ajaxupload.js"></script> $if(user_nick)$ - <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script> + <script type="text/javascript" src="/json/$user_nick$/favorites"></script> $endif$ <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; @@ -37,25 +36,8 @@ $else$ var IsAdmin = false; $endif$ - if (Nick) { - jQuery(document).ready(function() { setupUpload('upload', Room); }); - } - function showAlert() { alert('MUST LOGIN'); } - var newwindow; - function pop(url) { - newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0'); - if (window.focus) {newwindow.focus()} - } - jQuery(Away.startTitleUpdater); - jQuery(initChatMsgs); - $if(user_nick)$ // - $else$ - function showAlert() { - alert('Join dump.fm @ /register'); - } - - $endif$ </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> </head> <body> $if(dis)$ @@ -89,7 +71,7 @@ <div id="dis_welcome"> <center> - <img src="$domain$/static/img/dumppixellarge3.png"> + <img src="/static/img/dumppixellarge3.png"> <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload, or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love. <br><br> <span id="signintxt"> @@ -99,9 +81,9 @@ </div> </div> - <link href="$domain$/static/css/pages.css" rel="stylesheet" type="text/css" media="screen" /> - <link href="$domain$/static/css/header.css" rel="stylesheet" type="text/css" media="screen" /> - <script type="text/javascript" src="$domain$/static/js/win.js"></script> + <link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen" /> + <link href="/static/css/header.css" rel="stylesheet" type="text/css" media="screen" /> + <script type="text/javascript" src="/static/js/win.js"></script> <script type="text/javascript"> var topZ = 7; CreateDropdownWindow('', '500px', true, 'dis_welcome', 300, 70); diff --git a/template/rooms/dumptest.st b/template/rooms/dumptest.st index e167c70..e599625 100755 --- a/template/rooms/dumptest.st +++ b/template/rooms/dumptest.st @@ -21,15 +21,14 @@ _____ ___ ___ ___ ___ ___ <link rel="stylesheet" type="text/css" href="/static/css/chat_wrapper.css?v=20260129"> <title>$roomname$ dump.fm</title> - <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script> - <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script> - <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script> - <script src="$domain$/static/js/fullscreen.js"></script> + <script type="text/javascript" src="/static/js/invalid_domains.js"></script> + <script type="text/javascript" src="/static/webcam/webcam.js"></script> + <script type="text/javascript" src="/static/js/ajaxupload.js"></script> + <script src="/static/js/fullscreen.js"></script> $if(user_nick)$ - <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script> + <script type="text/javascript" src="/json/$user_nick$/favorites"></script> $endif$ <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; @@ -38,25 +37,8 @@ _____ ___ ___ ___ ___ ___ $else$ var IsAdmin = false; $endif$ - if (Nick) { - jQuery(document).ready(function() { setupUpload('upload', Room); }); - } - function showAlert() { alert('MUST LOGIN'); } - var newwindow; - function pop(url) { - newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0'); - if (window.focus) {newwindow.focus()} - } - jQuery(Away.startTitleUpdater); - jQuery(initChatMsgs); - $if(user_nick)$ // - $else$ - function showAlert() { - alert('Join dump.fm @ /register'); - } - - $endif$ </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> <!--<style> #chat-wrapper { position: absolute; @@ -74,10 +56,9 @@ _____ ___ ___ ___ ___ ___ $head()$ <link rel="stylesheet" type="text/css" href="/static/css/rooms_dumptest_fullscreen.css?v=20260129"> <title>$roomname$ dump.fm</title> - <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script> - <script src="$domain$/static/js/fullscreen.js"></script> + <script type="text/javascript" src="/static/js/invalid_domains.js"></script> + <script src="/static/js/fullscreen.js"></script> <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; @@ -86,25 +67,8 @@ _____ ___ ___ ___ ___ ___ $else$ var IsAdmin = false; $endif$ - if (Nick) { - jQuery(document).ready(function() { setupUpload('upload', Room); }); - } - function showAlert() { alert('MUST LOGIN'); } - var newwindow; - function pop(url) { - newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0'); - if (window.focus) {newwindow.focus()} - } - jQuery(Away.startTitleUpdater); - jQuery(initChatMsgs); - $if(user_nick)$ // - $else$ - function showAlert() { - alert('Join dump.fm @ /register'); - } - - $endif$ </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> <script>jQuery(initLogin)</script> <script>initFullscreen()</script> <!--<style> diff --git a/template/rooms/frontpage.st b/template/rooms/frontpage.st index 6761a4d..a310da2 100755 --- a/template/rooms/frontpage.st +++ b/template/rooms/frontpage.st @@ -20,14 +20,13 @@ <link rel="stylesheet" type="text/css" href="/static/css/chat_wrapper.css?v=20260129"> <title>$roomname$ dump.fm</title> - <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script> - <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script> - <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script> + <script type="text/javascript" src="/static/js/invalid_domains.js"></script> + <script type="text/javascript" src="/static/webcam/webcam.js"></script> + <script type="text/javascript" src="/static/js/ajaxupload.js"></script> $if(user_nick)$ - <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script> + <script type="text/javascript" src="/json/$user_nick$/favorites"></script> $endif$ <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; @@ -36,25 +35,8 @@ $else$ var IsAdmin = false; $endif$ - if (Nick) { - jQuery(document).ready(function() { setupUpload('upload', Room); }); - } - function showAlert() { alert('MUST LOGIN'); } - var newwindow; - function pop(url) { - newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0'); - if (window.focus) {newwindow.focus()} - } - jQuery(Away.startTitleUpdater); - jQuery(initChatMsgs); - $if(user_nick)$ // - $else$ - function showAlert() { - alert('Join dump.fm @ /register'); - } - - $endif$ </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> </head> <body> $if(dis)$ @@ -64,7 +46,7 @@ $if(!user_nick)$ <div id="dis_welcome"> <center> - <img src="$domain$/static/img/dumppixellarge3.png"> + <img src="/static/img/dumppixellarge3.png"> <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload, or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love. <br><br> <span id="signintxt"> diff --git a/template/rooms/fullscreen.st b/template/rooms/fullscreen.st index 41f2f88..c34898c 100755 --- a/template/rooms/fullscreen.st +++ b/template/rooms/fullscreen.st @@ -2,8 +2,8 @@ <head> <title>dump.fm - fullscreen</title> <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script> - <script src="$domain$/static/js/pichat.js"></script> - <script src="$domain$/static/js/fullscreen.js?v=20260126"></script> + <script src="/static/js/pichat.js"></script> + <script src="/static/js/fullscreen.js?v=20260126"></script> <script> var LoggedIn = $if(user_nick)$true$else$false$endif$; var Timestamp = $timestamp$; diff --git a/template/rooms/fullscreen2.st b/template/rooms/fullscreen2.st index 41f2f88..c34898c 100755 --- a/template/rooms/fullscreen2.st +++ b/template/rooms/fullscreen2.st @@ -2,8 +2,8 @@ <head> <title>dump.fm - fullscreen</title> <script src="/static/js/jquery-1.4.2.min.js?v=20260126"></script> - <script src="$domain$/static/js/pichat.js"></script> - <script src="$domain$/static/js/fullscreen.js?v=20260126"></script> + <script src="/static/js/pichat.js"></script> + <script src="/static/js/fullscreen.js?v=20260126"></script> <script> var LoggedIn = $if(user_nick)$true$else$false$endif$; var Timestamp = $timestamp$; diff --git a/template/rooms/mgmt.st b/template/rooms/mgmt.st index 984ee99..5a1797b 100755 --- a/template/rooms/mgmt.st +++ b/template/rooms/mgmt.st @@ -20,23 +20,23 @@ <meta name="keywords" content="dump.fm,mgmt,okfocus"> <meta name="description" content="dump.fm - Talk with pictures!" /> <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js?v=20260126"></script> -<script type="text/javascript" src="$domain$/static/js/jquery-ui-1.8.effects.min.js"></script> -<script type="text/javascript" src="$domain$/static/js/pichat.js"></script> -<link rel="stylesheet" type="text/css" href="$domain$/static/css/mgmt.css"> +<script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script> +<script type="text/javascript" src="/static/js/pichat.js"></script> +<link rel="stylesheet" type="text/css" href="/static/css/mgmt.css"> <link rel="stylesheet" type="text/css" href="/static/css/chat_wrapper.css?v=20260129"> -<script>Domain = "$domain$"</script> +<script>Domain = "/"</script> $if(isadmin)$ <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css" type="text/css" media="all" /> -<link rel="stylesheet" href="$domain$/static/css/admin.css" +<link rel="stylesheet" href="/static/css/admin.css" type="text/css" media="all" /> <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js" type="text/javascript"></script> -<script src="$domain$/static/js/admin.js" type="text/javascript"></script> +<script src="/static/js/admin.js" type="text/javascript"></script> $endif$ -<link rel="shortcut icon" href="$domain$/static/favicon.ico"> +<link rel="shortcut icon" href="/static/favicon.ico"> <!--[if IE]> <script> @@ -45,18 +45,16 @@ window.location = "/error/ie"; <![endif]--> <title>$roomname$ dump.fm</title> - <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script> + <script type="text/javascript" src="/static/js/invalid_domains.js"></script> $if(user_nick)$ - <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script> + <script type="text/javascript" src="/json/$user_nick$/favorites"></script> $endif$ <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; - jQuery(Away.startTitleUpdater); - jQuery(initChatMsgs); </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> </head> <body> @@ -81,7 +79,7 @@ window.location = "/error/ie"; $if(u.avatar)$ <img src="$u.avatar$" width="50" height="50"> $else$ - <img src="$domain$/static/img/noinfo.png"> + <img src="/static/img/noinfo.png"> $endif$ $u.nick$</a><br> </div> @@ -94,9 +92,9 @@ window.location = "/error/ie"; <span class="nick"> <b><a href="$domain$/$m.nick$" target="_blank">$m.nick$</a></b> $if(m.favorited)$ - <img src="$domain$/static/img/thumbs/chatheartover.gif" class="chat-thumb" onclick="Tag.favorite(this)"> + <img src="/static/img/thumbs/chatheartover.gif" class="chat-thumb" onclick="Tag.favorite(this)"> $else$ - <img src="$domain$/static/img/thumbs/smallheart.gif" class="chat-thumb" onclick="Tag.favorite(this)"> + <img src="/static/img/thumbs/smallheart.gif" class="chat-thumb" onclick="Tag.favorite(this)"> $endif$ </span> <span class="content">$m.content$</span> diff --git a/template/rooms/nocss.st b/template/rooms/nocss.st index 6bb661e..0124d72 100755 --- a/template/rooms/nocss.st +++ b/template/rooms/nocss.st @@ -22,26 +22,26 @@ <script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script> <link rel="shortcut icon" href="/static/favicon.ico"> <link rel="image_src" href="/static/img/thumbs/heartover.gif" > -<!-- <script type="text/javascript" src="$domain$/static/js/jquery-ui-1.8.effects.min.js"></script> --> -<script type="text/javascript" src="$domain$/static/js/pichat.js"></script> +<!-- <script type="text/javascript" src="/static/js/jquery-ui-1.8.effects.min.js"></script> --> +<script type="text/javascript" src="/static/js/pichat.js"></script> <link rel="stylesheet" type="text/css" href="/static/css/chat_wrapper.css?v=20260129"> -<script>Domain = "$domain$"</script> +<script>Domain = "/"</script> $if(!user_nick)$ -<!--<link href="$domain$/static/css/front.css" media="screen, projection" rel="stylesheet" type="text/css">--> -<script type="text/javascript" src="$domain$/static/js/popup.js"></script> +<!--<link href="/static/css/front.css" media="screen, projection" rel="stylesheet" type="text/css">--> +<script type="text/javascript" src="/static/js/popup.js"></script> $endif$ $if(isadmin)$ <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css" type="text/css" media="all" /> -<link rel="stylesheet" href="$domain$/static/css/admin.css" +<link rel="stylesheet" href="/static/css/admin.css" type="text/css" media="all" /> <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js" type="text/javascript"></script> -<script src="$domain$/static/js/admin.js" type="text/javascript"></script> +<script src="/static/js/admin.js" type="text/javascript"></script> $endif$ -<link rel="shortcut icon" href="$domain$/static/favicon.ico"> +<link rel="shortcut icon" href="/static/favicon.ico"> <!--[if IE]> <script> @@ -51,14 +51,13 @@ window.location = "/error/ie"; <title>$roomname$ dump.fm</title> - <script type="text/javascript" src="$domain$/static/js/invalid_domains.js"></script> - <script type="text/javascript" src="$domain$/static/webcam/webcam.js"></script> - <script type="text/javascript" src="$domain$/static/js/ajaxupload.js"></script> + <script type="text/javascript" src="/static/js/invalid_domains.js"></script> + <script type="text/javascript" src="/static/webcam/webcam.js"></script> + <script type="text/javascript" src="/static/js/ajaxupload.js"></script> $if(user_nick)$ - <script type="text/javascript" src="$domain$/json/$user_nick$/favorites"></script> + <script type="text/javascript" src="/json/$user_nick$/favorites"></script> $endif$ <script> - jQuery(document).ready(initChat); var Nick = $json_user_nick$; var Room = $json_room_key$; var Timestamp = $timestamp$; @@ -67,25 +66,8 @@ window.location = "/error/ie"; $else$ var IsAdmin = false; $endif$ - if (Nick) { - jQuery(document).ready(function() { setupUpload('upload', Room); }); - } - function showAlert() { alert('MUST LOGIN'); } - var newwindow; - function pop(url) { - newwindow=window.open(url,'name','height=50,width=400,left=20,top=20,location=0,status=0,scrollbar=0,resizable=0'); - if (window.focus) {newwindow.focus()} - } - jQuery(Away.startTitleUpdater); - jQuery(initChatMsgs); - $if(user_nick)$ // - $else$ - function showAlert() { - alert('Join dump.fm @ /register'); - } - - $endif$ </script> + <script type="text/javascript" src="/static/js/pages/chat_init.js?v=20260130"></script> </head> <body> $if(dis)$ @@ -95,7 +77,7 @@ window.location = "/error/ie"; $if(!user_nick)$ <div id="dis_welcome"> <center> - <img src="$domain$/static/img/dumppixellarge3.png"> + <img src="/static/img/dumppixellarge3.png"> <div id="midtxt">dump.fm lets you <i>talk with pictures!</i> Paste an image url, upload, or snap a pic right from your webcam. Talk to friends, fav images, and keep track of the pix you love. <br><br> <span id="signintxt"> @@ -105,9 +87,9 @@ window.location = "/error/ie"; </div> </div> - <link href="$domain$/static/css/pages.css" rel="stylesheet" type="text/css" media="screen" /> - <link href="$domain$/static/css/header.css" rel="stylesheet" type="text/css" media="screen" /> - <script type="text/javascript" src="$domain$/static/js/win.js"></script> + <link href="/static/css/pages.css" rel="stylesheet" type="text/css" media="screen" /> + <link href="/static/css/header.css" rel="stylesheet" type="text/css" media="screen" /> + <script type="text/javascript" src="/static/js/win.js"></script> <script type="text/javascript"> var topZ = 7; CreateDropdownWindow('', '500px', true, 'dis_welcome', 300, 70); diff --git a/template/rooms/vortex.st b/template/rooms/vortex.st index 6f3a4ca..91782dd 100755 --- a/template/rooms/vortex.st +++ b/template/rooms/vortex.st @@ -4,17 +4,7 @@ <title>dump.fm image vortex</title> <link rel="stylesheet" type="text/css" href="/static/css/rooms_vortex.css?v=20260129"> - - - - <script> - jQuery(document).ready(initChat); - var Nick = $json_user_nick$; - var Room = $json_room_key$; - var Timestamp = $timestamp$; - - - </script> + <!--<style type="text/css"> diff --git a/template/share_buttons.st b/template/share_buttons.st index 67dd762..ac41191 100755 --- a/template/share_buttons.st +++ b/template/share_buttons.st @@ -3,7 +3,7 @@ <img src="/static/img/share/fbbutton.png" class="share" onclick="Share.facebook(this)"> <img src="/static/img/share/twittericon.png" class="share" onclick="Share.twitter(this)"> <img src="/static/img/share/delishicon.png" class="share" onclick="Share.delicious(this)"> - <a class="permalink" href="$domain$/p/$dump.nick$/$dump.message_id$"><img src="$domain$/static/img/link.gif"></a> + <a class="permalink" href="$domain$/p/$dump.nick$/$dump.message_id$"><img src="/static/img/link.gif"></a> $if(logged_in)$ $if(dump.favorited)$ <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.favorite(this)"> diff --git a/template/simplerlog.st b/template/simplerlog.st index ed9527c..9db81e4 100755 --- a/template/simplerlog.st +++ b/template/simplerlog.st @@ -10,31 +10,31 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="keywords" content="dump.fm, image chat, realtime, internet 3.0, dump, dump fm, image dump, pictures, image links, image board, scott ostler, ryder ripps"> <meta name="description" content="dump.fm - Talk with pictures!" /> -<script type="text/javascript" src="$domain$/static/js/jquery-1.4.2.min.js"></script> -<link rel="shortcut icon" href="$domain$/static/favicon.ico"> -<link rel="image_src" href="$domain$/static/img/thumbs/heartover.gif" > -<script type="text/javascript" src="$domain$/static/js/pichat.js"></script> +<script type="text/javascript" src="/static/js/jquery-1.4.2.min.js"></script> +<link rel="shortcut icon" href="/static/favicon.ico"> +<link rel="image_src" href="/static/img/thumbs/heartover.gif" > +<script type="text/javascript" src="/static/js/pichat.js"></script> <link href="/static/css/front.css?v=20260128" media="screen, projection" rel="stylesheet" type="text/css"> <link href="/static/css/simplerlog.css?v=20260129" media="screen, projection" rel="stylesheet" type="text/css"> - <script src="$domain$/static/js/jquery.masonry.min.js"type="text/javascript"></script> - <script src="$domain$/static/js/jquery.isotope.min.js"></script> - <!-- <link rel="stylesheet" href="$domain$/static/css/isostyle.css" type="text/css" media="screen" />--> -<script>Domain = "$domain$"</script> + <script src="/static/js/jquery.masonry.min.js"type="text/javascript"></script> + <script src="/static/js/jquery.isotope.min.js"></script> + <!-- <link rel="stylesheet" href="/static/css/isostyle.css" type="text/css" media="screen" />--> +<script>Domain = "/"</script> $if(!user_nick)$ -<script type="text/javascript" src="$domain$/static/js/popup.js"></script> +<script type="text/javascript" src="/static/js/popup.js"></script> $endif$ $if(isadmin)$ <link rel="stylesheet" href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/ui-lightness/jquery-ui.css" type="text/css" media="all" /> -<!--<link rel="stylesheet" href="$domain$/static/css/admin.css" +<!--<link rel="stylesheet" href="/static/css/admin.css" type="text/css" media="all" />--> <script src="https://ajax.googleapis.com/ajax/libs/jqueryui/1.8.0/jquery-ui.min.js" type="text/javascript"></script> -<!--<script src="$domain$/static/js/admin.js" type="text/javascript"></script>--> +<!--<script src="/static/js/admin.js" type="text/javascript"></script>--> $endif$ -<link rel="shortcut icon" href="$domain$/static/favicon.ico"> +<link rel="shortcut icon" href="/static/favicon.ico"> @@ -252,9 +252,9 @@ jQuery(window).load(function(){ $if(!user_nick)$ - <a href="$domain$"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $else$ - <a href="$domain$"><img src="$domain$/static/img/sassoonlogol.gif"id="logo"></a> + <a href="$domain$"><img src="/static/img/sassoonlogol.gif"id="logo"></a> $endif$ @@ -263,12 +263,12 @@ jQuery(window).load(function(){ <div id="toplinks"> <a href="$domain$/$user_nick$" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> Profile</a> + <img src="/static/img/thumbs/profilebaricon.png"/> Profile</a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> <a href="$domain$/hall" onclick="pageTracker._trackEvent('button', 'banner-hall'); return true;"> - <img src="$domain$/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame + <img src="/static/img/thumbs/halloffamebaricon.png"/> Hall of Fame </a> </div> @@ -278,12 +278,12 @@ jQuery(window).load(function(){ <div id="toplinks"> <a href="$domain$/about" onclick="pageTracker._trackEvent('button', 'banner-profile'); return true;"> - <img src="$domain$/static/img/thumbs/profilebaricon.png"/> About </a> + <img src="/static/img/thumbs/profilebaricon.png"/> About </a> <a href="$domain$/directory" onclick="pageTracker._trackEvent('button', 'banner-directory'); return true;"> - <img src="$domain$/static/img/thumbs/directorybaricon.png"/> Directory + <img src="/static/img/thumbs/directorybaricon.png"/> Directory </a> -<a href="$domain$/m/cal"><img src="$domain$/static/img/thumbs/calendarbaricon.png"/> Calendar</a> - <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="$domain$/static/img/thumbs/searchbaricon.png"/> Tags</a> +<a href="$domain$/m/cal"><img src="/static/img/thumbs/calendarbaricon.png"/> Calendar</a> + <a href="$domain$/tags" onclick="pageTracker._trackEvent('button', 'banner-search'); return true;"><img src="/static/img/thumbs/searchbaricon.png"/> Tags</a> </div> <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2Fdumpfm%2F240317626149&layout=button_count&show_faces=false&width=450&action=like&font=tahoma&colorscheme=light&height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:100px; height:21px;" allowTransparency="true"id="fblike"></iframe> <a href="/register" id="disregister">Register!</a> diff --git a/template/single_message_share_buttons.st b/template/single_message_share_buttons.st index 313bcb1..c00a16b 100755 --- a/template/single_message_share_buttons.st +++ b/template/single_message_share_buttons.st @@ -3,7 +3,7 @@ <img src="/static/img/share/fbbutton.png" class="share" onclick="Share.facebook(this)"> <img src="/static/img/share/twittericon.png" class="share" onclick="Share.twitter(this)"> <img src="/static/img/share/delishicon.png" class="share" onclick="Share.delicious(this)"> - <a class="permalink" href="$domain$/p/$dump.nick$/$dump.message_id$"><img src="$domain$/static/img/link.gif"></a> + <a class="permalink" href="$domain$/p/$dump.nick$/$dump.message_id$"><img src="/static/img/link.gif"></a> $if(user_nick)$ $if(dump.favorited)$ <img src="/static/img/thumbs/heartfaved.gif" class="thumb favorite" onclick="Tag.animated_fav(this, '.dump_score', '30px', '20px')"> diff --git a/template/tinychat.st b/template/tinychat.st index 50efffd..7e4f430 100755 --- a/template/tinychat.st +++ b/template/tinychat.st @@ -11,6 +11,6 @@ $if(user_nick)$ </script> -<script src="http://tinychat.com/js/embed.js"></script> +<script src="https://tinychat.com/js/embed.js"></script> <div id="tinychat-wrapper"><div id="client"></div></div> $endif$ |