diff --git a/INSTALL b/INSTALL index 23fd574..1e250b7 100644 --- a/INSTALL +++ b/INSTALL @@ -11,7 +11,7 @@ python setup.py develop easy_install repoze.what-quickstart easy_install repoze.what-pylons easy_install mutagen -apt-get install python-dev +apt-get install python-dev easy_install psycopg2 apt-get install libxslt1-dev pip install lxml diff --git a/migrations/003-load-mbdump/generate_drop_constraints.sql b/migrations/003-load-mbdump/generate_drop_constraints.sql index 01c52a3..318256e 100644 --- a/migrations/003-load-mbdump/generate_drop_constraints.sql +++ b/migrations/003-load-mbdump/generate_drop_constraints.sql @@ -1,6 +1,6 @@ SELECT 'ALTER TABLE '||nspname||'.'||relname||' DROP CONSTRAINT '||conname||';' - FROM pg_constraint - INNER JOIN pg_class ON conrelid=pg_class.oid - INNER JOIN pg_namespace ON pg_namespace.oid=pg_class.relnamespace + FROM pg_constraint + INNER JOIN pg_class ON conrelid=pg_class.oid + INNER JOIN pg_namespace ON pg_namespace.oid=pg_class.relnamespace ORDER BY CASE WHEN contype='f' THEN 0 ELSE 1 END,contype,nspname,relname,conname diff --git a/public/static/ben/#player.js# b/public/static/ben/#player.js# index 4c9a02a..e363850 100644 --- a/public/static/ben/#player.js# +++ b/public/static/ben/#player.js# @@ -15,25 +15,25 @@ function showPlayBtn() function playTrack(t,n) { $("#jquery_jplayer").jPlayer("setFile", t).jPlayer("play"); - + showPauseBtn(); - + $("#trackname").fadeOut(function(){ $("#trackname").text(n); $("#trackname").fadeIn(); }); - + $("#pcent").fadeOut(function(){ $("#pcent").fadeIn(); }); - + return false; } $(document).ready(function(){ - + $("#jquery_jplayer").jPlayer({ ready: function () { } @@ -41,62 +41,62 @@ $(document).ready(function(){ .jPlayer("onProgressChange", function(lp,ppr,ppa,pt,tt) { $("#pcent").text(parseInt(ppa)+"%"); }); - - + + $("#pause").hide(); - + $('a[name|=trklisting]').click(function() { console.log($(this).text()) return(playTrack($(this).title(),$(this).text() )); }); - + $("#theseparation").click(function() { return(playTrack("http://www.miaowmusic.com/mp3/Miaow-05-The-separation.mp3",$("#theseparation").text())); }); - + $("#lismore").click(function() { return(playTrack("http://www.miaowmusic.com/mp3/Miaow-04-Lismore.mp3",$("#lismore").text())); }); - + $("#thinice").click(function() { return(playTrack("http://www.miaowmusic.com/mp3/Miaow-10-Thin-ice.mp3",$("#thinice").text())); }); - + $("#play").click(function() { $("#jquery_jplayer").jPlayer("play"); showPauseBtn(); return false; }); - + $("#pause").click(function() { $("#jquery_jplayer").jPlayer("pause"); showPlayBtn(); return false; }); - + $("#stop").click(function() { $("#jquery_jplayer").jPlayer("stop"); showPlayBtn(); return false; }); - + $("#vmax").click(function() { $("#jquery_jplayer").jPlayer("volume", 100); return false; }); - + $("#vmute").click(function() { $("#jquery_jplayer").jPlayer("volume", 0); return false; }); - + $("#vhalf").click(function() { $("#jquery_jplayer").jPlayer("volume", 50); return false; }); - + }); diff --git a/public/static/ben/columnizer/autocolumn.js b/public/static/ben/columnizer/autocolumn.js index 7104bb8..020c123 100644 --- a/public/static/ben/columnizer/autocolumn.js +++ b/public/static/ben/columnizer/autocolumn.js @@ -20,7 +20,7 @@ overflow : false, // this function is called after content is columnized doneFunc : function(){}, - // if the content should be columnized into a + // if the content should be columnized into a // container node other than it's own node target : false, // re-columnizing when images reload might make things @@ -40,7 +40,7 @@ var lastWidth = 0; var columnizing = false; $cache.append($(this).children().clone(true)); - + // images loading after dom load // can screw up the column heights, // so recolumnize after images load @@ -63,11 +63,11 @@ } } } - + $inBox.empty(); - + columnizeIt(); - + if(!options.buildOnce){ $(window).resize(function() { if(!options.buildOnce && $.browser.msie){ @@ -82,7 +82,7 @@ } }); } - + /** * return a node that has a height * less than or equal to height @@ -96,14 +96,14 @@ $putInHere.append($pullOutHere[0].childNodes[0]); } if($putInHere[0].childNodes.length == 0) return; - + // now we're too tall, undo the last one var kids = $putInHere[0].childNodes; var lastKid = kids[kids.length-1]; $putInHere[0].removeChild(lastKid); var $item = $(lastKid); - - + + if($item[0].nodeType == 3){ // it's a text node, split it up var oText = $item[0].nodeValue; @@ -120,7 +120,7 @@ } latestTextNode = document.createTextNode(columnText); $putInHere.append(latestTextNode); - + if(oText.length > counter2){ oText = oText.substring(oText.indexOf(' ', counter2)); }else{ @@ -138,21 +138,21 @@ return false; // we ate the whole text node, move on to the next node } } - + if($pullOutHere.children().length){ $pullOutHere.prepend($item); }else{ $pullOutHere.append($item); } - + return $item[0].nodeType == 3; } - + function split($putInHere, $pullOutHere, $parentColumn, height){ if($pullOutHere.children().length){ $cloneMe = $pullOutHere.children(":first"); $clone = $cloneMe.clone(true); - if($clone.attr("nodeType") == 1 && !$clone.hasClass("dontend")){ + if($clone.attr("nodeType") == 1 && !$clone.hasClass("dontend")){ $putInHere.append($clone); if($clone.is("img") && $parentColumn.height() < height + 20){ $cloneMe.remove(); @@ -175,15 +175,15 @@ } } } - - + + function singleColumnizeIt() { if ($inBox.data("columnized") && $inBox.children().length == 1) { return; } $inBox.data("columnized", true); $inBox.data("columnizing", true); - + $inBox.empty(); $inBox.append($("
")); //" $col = $inBox.children().eq($inBox.children().length-1); @@ -195,7 +195,7 @@ if(!$destroyable.children().find(":first-child").hasClass("dontend")){ split($col, $destroyable, $col, targetHeight); } - + while(checkDontEndColumn($col.children(":last").length && $col.children(":last").get(0))){ var $lastKid = $col.children(":last"); $lastKid.remove(); @@ -222,24 +222,24 @@ $col.append($destroyable); } $inBox.data("columnizing", false); - + if(options.overflow){ options.overflow.doneFunc(); } - + } - + function checkDontEndColumn(dom){ if(dom.nodeType != 1) return false; if($(dom).hasClass("dontend")) return true; if(dom.childNodes.length == 0) return false; return checkDontEndColumn(dom.childNodes[dom.childNodes.length-1]); } - + function columnizeIt() { if(lastWidth == $inBox.width()) return; lastWidth = $inBox.width(); - + var numCols = Math.round($inBox.width() / options.width); if(options.columns) numCols = options.columns; // if ($inBox.data("columnized") && numCols == $inBox.children().length) { @@ -251,14 +251,14 @@ if($inBox.data("columnizing")) return; $inBox.data("columnized", true); $inBox.data("columnizing", true); - + $inBox.empty(); $inBox.append($("
")); //" $col = $inBox.children(":last"); $col.append($cache.clone()); maxHeight = $col.height(); $inBox.empty(); - + var targetHeight = maxHeight / numCols; var firstTime = true; var maxLoops = 3; @@ -271,7 +271,7 @@ targetHeight = options.height; scrollHorizontally = true; } - + for(var loopCount=0;loopCount")); //" } - + // fill all but the last column (unless overflowing) var i = 0; while(i < numCols - (options.overflow ? 0 : 1) || scrollHorizontally && $destroyable.children().length){ @@ -305,7 +305,7 @@ }else{ // alert("not splitting a dontend"); } - + while(checkDontEndColumn($col.children(":last").length && $col.children(":last").get(0))){ var $lastKid = $col.children(":last"); $lastKid.remove(); diff --git a/public/static/ben/columnizer/index.html b/public/static/ben/columnizer/index.html index 4bff791..2c6d534 100644 --- a/public/static/ben/columnizer/index.html +++ b/public/static/ben/columnizer/index.html @@ -1,6 +1,6 @@

Columnizer JQuery Plugin

About

-

Columnizer will automatically split your 1 div of content into as many columns as will fit the user's browser! If +

Columnizer will automatically split your 1 div of content into as many columns as will fit the user's browser! If the browser is resized, columns will be automatically added or removed appropriately.

For documentation, samples, and latest news, visit the project homepage at http://welcome.totheinter.net/columnizer-jquery-plugin/

diff --git a/public/static/ben/columnizer/sample6.html b/public/static/ben/columnizer/sample6.html index 550177f..696d7c2 100644 --- a/public/static/ben/columnizer/sample6.html +++ b/public/static/ben/columnizer/sample6.html @@ -18,7 +18,7 @@ .wide, .thin { clear:both; } img{ float: left; padding:5px;} blockquote { font-style: italic; margin-left: 10px; border-left:2px solid #EFEFEF; padding-left: 8px;} - + @@ -26,7 +26,7 @@ $(function(){ $('#hidden-wrapper a').click(function(){ alert("boo!"); }); $('#hidden-wrapper').columnize({ - columns:4, + columns:4, target: "#target", doneFunc: function(){ $('.first.column').css("color", "blue"); diff --git a/public/static/ben/display2.css b/public/static/ben/display2.css index 593c204..749c80c 100644 --- a/public/static/ben/display2.css +++ b/public/static/ben/display2.css @@ -12,7 +12,7 @@ body { margin:0; padding:0; border-width:0; - + } #main_display{ @@ -44,7 +44,7 @@ body { float:left; } #wrapper2 { -} +} .iscrolled_list{ color:#FF5600 } @@ -76,7 +76,7 @@ FF5600 height:30px; top:0px; bottom:0px; - + } /*Some IPOD SPECIFIC STUFF/*/ diff --git a/public/static/ben/initView.js b/public/static/ben/initView.js index a24df1a..b1b46f7 100644 --- a/public/static/ben/initView.js +++ b/public/static/ben/initView.js @@ -53,8 +53,8 @@ function viewHeight(){ } function initShared(){ - var headID = document.getElementsByTagName("head")[0]; - var cssNode = document.createElement('link'); + var headID = document.getElementsByTagName("head")[0]; + var cssNode = document.createElement('link'); cssNode.type = 'text/css'; cssNode.rel = 'stylesheet'; cssNode.href = '/ben/display2.css'; @@ -65,8 +65,8 @@ function initShared(){ function initSmallView(){ - var headID = document.getElementsByTagName("head")[0]; - var meta = document.createElement('meta'); + var headID = document.getElementsByTagName("head")[0]; + var meta = document.createElement('meta'); meta.name="viewport"; meta.content="width=device-width,minimum-scale=1.0, maximum-scale=1.0"; headID.appendChild(meta); diff --git a/public/static/ben/js_utils/requests.js b/public/static/ben/js_utils/requests.js index 6eeea91..bab4843 100644 --- a/public/static/ben/js_utils/requests.js +++ b/public/static/ben/js_utils/requests.js @@ -8,7 +8,7 @@ function makeRequest(url, parameters) { //http_request.overrideMimeType('text/xml'); http_request.overrideMimeType('text/html'); } - } + } if (!http_request) { alert('Cannot create XMLHTTP instance'); return false; @@ -16,7 +16,7 @@ function makeRequest(url, parameters) { http_request.onreadystatechange = alertContents; http_request.open('GET', url + parameters, true); http_request.send(null); - //this is not at all efficient as it pauses all + //this is not at all efficient as it pauses all } function alertContents() { @@ -24,7 +24,7 @@ function alertContents() { if (http_request.status == 200) { //alert(http_request.responseText); result = http_request.responseText; - document.getElementById('myspan').innerHTML = result; + document.getElementById('myspan').innerHTML = result; } else { alert('There was a problem with the request'); } diff --git a/public/static/ben/player.js b/public/static/ben/player.js index fb7b189..dc6f63d 100644 --- a/public/static/ben/player.js +++ b/public/static/ben/player.js @@ -15,25 +15,25 @@ function showPlayBtn() function playTrack(t,n) { $("#jquery_jplayer").jPlayer("setFile", t).jPlayer("play"); - + showPauseBtn(); - + $("#trackname").fadeOut(function(){ $("#trackname").text(n); $("#trackname").fadeIn(); }); - + $("#pcent").fadeOut(function(){ $("#pcent").fadeIn(); }); - + return false; } $(document).ready(function(){ - + $("#jquery_jplayer").jPlayer({ ready: function () { } @@ -41,62 +41,62 @@ $(document).ready(function(){ .jPlayer("onProgressChange", function(lp,ppr,ppa,pt,tt) { $("#pcent").text(parseInt(ppa)+"%"); }); - - + + $("#pause").hide(); - + $('a[name|=trklisting]').click(function() { console.log($(this).text()) return(playTrack($(this).title(),$(this).text() )); }); - + $("#theseparation").click(function() { return(playTrack("http://www.miaowmusic.com/mp3/Miaow-05-The-separation.mp3",$("#theseparation").text())); }); - + $("#lismore").click(function() { return(playTrack("http://www.miaowmusic.com/mp3/Miaow-04-Lismore.mp3",$("#lismore").text())); }); - + $("#thinice").click(function() { return(playTrack("http://www.miaowmusic.com/mp3/Miaow-10-Thin-ice.mp3",$("#thinice").text())); }); - + $("#play").click(function() { $("#jquery_jplayer").jPlayer("play"); showPauseBtn(); return false; }); - + $("#pause").click(function() { $("#jquery_jplayer").jPlayer("pause"); showPlayBtn(); return false; }); - + $("#stop").click(function() { $("#jquery_jplayer").jPlayer("stop"); showPlayBtn(); return false; }); - + $("#vmax").click(function() { $("#jquery_jplayer").jPlayer("volume", 100); return false; }); - + $("#vmute").click(function() { $("#jquery_jplayer").jPlayer("volume", 0); return false; }); - + $("#vhalf").click(function() { $("#jquery_jplayer").jPlayer("volume", 50); return false; }); - + }); diff --git a/public/static/ben/playerFuncs.js b/public/static/ben/playerFuncs.js index 5f6da66..d8b7e0f 100644 --- a/public/static/ben/playerFuncs.js +++ b/public/static/ben/playerFuncs.js @@ -30,9 +30,9 @@ function playerShowTracks(data) link.append(br) le.append(link) ue.append(le) - + }); - + $(tldiv).append(ue) //newdiv=$(tldiv).makeacolumnlists({cols: 3, colWidth: 0, equalHeight: 'li', startN: 1}); @@ -46,7 +46,7 @@ function playerShowTracks(data) }); $('a[name|=trklisting]').click(function() { - $.getJSON("/getlocal/trackArtistAlbumsLOCAL",{trackid:$(this).attr("id")},playerShowRelatedAlbums); + $.getJSON("/getlocal/trackArtistAlbumsLOCAL",{trackid:$(this).attr("id")},playerShowRelatedAlbums); $.getJSON("/getlocal/trackArtistAlbumsMB",{trackid:$(this).attr("id")},playerShowRelatedMB); return(playTrack($(this).attr('title'),$(this).text() )); }); @@ -59,7 +59,7 @@ function playerShowRelatedAlbums(data){ ue.append(le); }); $("#rel_albums").children().remove(); - $("#rel_albums").append(ue); + $("#rel_albums").append(ue); } function playerShowRelatedMB(data){ @@ -70,16 +70,16 @@ function playerShowRelatedMB(data){ ue.append(le); }); $("#mb_albums").children().remove(); - $("#mb_albums").append(ue); + $("#mb_albums").append(ue); } function playerShowTrackRelations(data){ - + ue=$("