[% "SQUEEZEBOX_SERVER" | string %] - [% "HELP"

\ No newline at end of file +

diff -ru squeezeboxserver/HTML.orig/Default/settings/header.html squeezeboxserver/HTML/Default/settings/header.html --- squeezeboxserver/HTML.orig/Default/settings/header.html 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/Default/settings/header.html 2011-10-06 01:12:37.000000000 +0200 @@ -11,7 +11,7 @@ [% "SQUEEZEBOX_SERVER" | string %] - + diff -ru squeezeboxserver/HTML.orig/Default/settings/index.html squeezeboxserver/HTML/Default/settings/index.html --- squeezeboxserver/HTML.orig/Default/settings/index.html 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/Default/settings/index.html 2011-10-06 01:12:49.000000000 +0200 @@ -5,7 +5,7 @@ [% "SERVER_SETTINGS" | string %] - + diff -ru squeezeboxserver/HTML.orig/Default/slimserver.css squeezeboxserver/HTML/Default/slimserver.css --- squeezeboxserver/HTML.orig/Default/slimserver.css 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/Default/slimserver.css 2011-10-06 01:12:11.000000000 +0200 @@ -1350,7 +1350,7 @@ .x-tree-node-leaf .x-tree-node-alwayscollapsed { - background-image:url(/html/ext/resources/images/default/tree/folder.gif); + background-image:url(html/ext/resources/images/default/tree/folder.gif); } .x-tree-node .x-tree-selected { diff -ru squeezeboxserver/HTML.orig/Default/status_header.html squeezeboxserver/HTML/Default/status_header.html --- squeezeboxserver/HTML.orig/Default/status_header.html 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/Default/status_header.html 2011-10-06 01:10:15.000000000 +0200 @@ -4,7 +4,7 @@ - + diff -ru squeezeboxserver/HTML.orig/Default/status_list.html squeezeboxserver/HTML/Default/status_list.html --- squeezeboxserver/HTML.orig/Default/status_list.html 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/Default/status_list.html 2011-10-06 01:18:28.000000000 +0200 @@ -25,7 +25,7 @@

[% END %] [% ELSE %] -

[% END %] [% IF item.itemobj.album.id %][% END %] Only in squeezeboxserver/HTML.orig: Default-fixed diff -ru squeezeboxserver/HTML.orig/EN/hreftemplate squeezeboxserver/HTML/EN/hreftemplate --- squeezeboxserver/HTML.orig/EN/hreftemplate 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/EN/hreftemplate 2011-10-06 00:59:57.000000000 +0200 @@ -4,7 +4,7 @@ albumHRef = BLOCK %]href="[% webroot %]clixmlbrowser/clicmd=browselibrary+items&mode=tracks&linktitle=[% 'ALBUM' | string %]%20([% itemobj.album.title | uri %])&album_id=[% itemobj.album.id %]&player=[% playerURI %]/"[% END; yearHRef = BLOCK %]href="[% webroot %]clixmlbrowser/clicmd=browselibrary+items&mode=albums&linktitle=[% 'YEAR' | string %]%20([% itemobj.year %])&year=[% itemobj.year %]&player=[% playerURI %]/"[% END; songinfoHRef = "href=\"${webroot}songinfo.html?item=$itemobj.id&player=$playerURI\""; -coverArtHRef = "href=\"/music/$coverArt/cover.jpg\""; +coverArtHRef = "href=\"${webroot}music/$coverArt/cover.jpg\""; MoveUp = "%2D1"; # -1 minusOne = "%2D1"; # -1 plusOne = "%2B1"; # +1 @@ -39,7 +39,7 @@ [%# img tag for album thumbnail in the now playing status context %] [% BLOCK statusImg -%][% IF NOT height; height = thumbSize || 100; END %][% IF NOT width; width = height; END %] - [% "

$\"";IF$ " -%] @@ -47,7 +47,7 @@ [%# img tag for cover art in browsedb context %] [% BLOCK coverImg -%] -[% "

" -%] +[% "

" -%] [%- END %] @@ -141,7 +141,7 @@ [%# this is the href to the cover art for item %] [% BLOCK coverArtItemHRef -%] -href="/music/[% item.coverArt %]/cover.jpg" +href="[% webroot %]music/[% item.coverArt %]/cover.jpg" [%- END %] [%# this is the link tree for the setup pages %] @@ -178,7 +178,7 @@ [% IF item.image %] "[% item.image | resizeimage(height, height, '-', webroot) %]" [% ELSIF item.coverThumb %] - "/music/[% item.coverThumb %]/cover_[% height %]x[% height %]_[% resizeParam %][% IF bgcolor %]_[% bgcolor %][% END %][% IF fileSuffix %].[% fileSuffix %][% END %]" + "[% webroot %]music/[% item.coverThumb %]/cover_[% height %]x[% height %]_[% resizeParam %][% IF bgcolor %]_[% bgcolor %][% END %][% IF fileSuffix %].[% fileSuffix %][% END %]" [% ELSIF item.icon %] "[% item.icon | resizeimage(height, height, '-', webroot) %]" [% END %] @@ -198,7 +198,7 @@ [% itemobj=item.itemobj %] [% artistlist = PROCESS artistsAsText.html %] [% END %] -

[% item.text | html %] [% artistlist | html %]
[% IF item.year %]
diff -ru squeezeboxserver/HTML.orig/EN/html/fileselector.js squeezeboxserver/HTML/EN/html/fileselector.js
--- squeezeboxserver/HTML.orig/EN/html/fileselector.js 2011-10-06 00:51:05.000000000 +0200
+++ squeezeboxserver/HTML/EN/html/fileselector.js 2011-10-06 01:13:08.000000000 +0200
@@ -222,7 +222,7 @@
if (SqueezeJS && SqueezeJS.strings && SqueezeJS.strings('browse'))
tpl = new Ext.Template(' <input type=

'); else - tpl = new Ext.Template('

'); + tpl = new Ext.Template('

'); tpl.compile(); diff -ru squeezeboxserver/HTML.orig/EN/html/settings.js squeezeboxserver/HTML/EN/html/settings.js --- squeezeboxserver/HTML.orig/EN/html/settings.js 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/EN/html/settings.js 2011-10-06 00:54:36.000000000 +0200 @@ -53,7 +53,7 @@ } function prefValidate(myPref, namespace) { - new Ajax.Request('/jsonrpc.js', { + new Ajax.Request('[% webroot %]jsonrpc.js', { method: 'post', postBody: Object.toJSON({ @@ -198,4 +198,4 @@ $('alarm' + alarmId).hide(); $('button' + alarmId).show(); -} \ No newline at end of file +} diff -ru squeezeboxserver/HTML.orig/EN/html/SqueezeJS/Base.js squeezeboxserver/HTML/EN/html/SqueezeJS/Base.js --- squeezeboxserver/HTML.orig/EN/html/SqueezeJS/Base.js 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/EN/html/SqueezeJS/Base.js 2011-10-06 01:14:22.000000000 +0200 @@ -1,4 +1,4 @@ -Ext.BLANK_IMAGE_URL = '/html/images/spacer.gif'; +Ext.BLANK_IMAGE_URL = webroot + 'html/images/spacer.gif'; // hack to fake IE8 into IE7 mode - let's consider them the same Ext.isIE7 = Ext.isIE7 || Ext.isIE8; @@ -279,7 +279,7 @@ this.showBriefly(config.showBriefly); Ext.Ajax.request({ - url: this.getBaseUrl() + (config.url || '/jsonrpc.js'), + url: this.getBaseUrl() + (config.url || webroot + 'jsonrpc.js'), method: config.method ? config.method : 'POST', params: config.url ? null : Ext.util.JSON.encode({ id: 1, @@ -781,7 +781,7 @@ }, defaultCoverart : function(coverid, width) { - return SqueezeJS.Controller.getBaseUrl() + '/music/' + (coverid || 0) + '/cover' + (width ? '_' + width + 'x' + width + '_p.' : '.') + SqueezeJS.coverFileSuffix; + return SqueezeJS.Controller.getBaseUrl() + webroot + 'music/' + (coverid || 0) + '/cover' + (width ? '_' + width + 'x' + width + '_p.' : '.') + SqueezeJS.coverFileSuffix; } }; diff -ru squeezeboxserver/HTML.orig/EN/html/SqueezeJS/UI.js squeezeboxserver/HTML/EN/html/SqueezeJS/UI.js --- squeezeboxserver/HTML.orig/EN/html/SqueezeJS/UI.js 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/EN/html/SqueezeJS/UI.js 2011-10-06 01:13:56.000000000 +0200 @@ -482,7 +482,7 @@ SqueezeJS.UI.FileTreeLoader = function(filter) { Ext.apply(this, { - dataUrl: '/jsonrpc.js', + dataUrl: webroot + 'jsonrpc.js', filter: filter }); SqueezeJS.UI.FileTreeLoader.superclass.constructor.call(this); @@ -1633,9 +1633,9 @@ SqueezeJS.UI.PlaytimeProgress.superclass.initComponent.call(this); var el = Ext.get(this.applyTo); - el.update( '

' - + '

' ); + el.update( '

' + + '

' ); // store the DOM elements to reduce flicker this.remaining = Ext.get(Ext.DomQuery.selectNode('.progressFillRight', el.dom)); diff -ru squeezeboxserver/HTML.orig/EN/search.html squeezeboxserver/HTML/EN/search.html --- squeezeboxserver/HTML.orig/EN/search.html 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/EN/search.html 2011-10-06 01:14:51.000000000 +0200 @@ -1,7 +1,7 @@ [% pagetitle = 'Search'; pageicon = icons.SEARCHMUSIC %] [% pageHeaderScripts = BLOCK %] - + [% END %] [% bodyscript = 'onload="document.searchForm.query.focus();"' %] diff -ru squeezeboxserver/HTML.orig/EN/settings/header.html squeezeboxserver/HTML/EN/settings/header.html --- squeezeboxserver/HTML.orig/EN/settings/header.html 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/EN/settings/header.html 2011-10-06 01:17:05.000000000 +0200 @@ -44,7 +44,7 @@

- + diff -ru squeezeboxserver/HTML.orig/EN/settings/player/basic.html squeezeboxserver/HTML/EN/settings/player/basic.html --- squeezeboxserver/HTML.orig/EN/settings/player/basic.html 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/EN/settings/player/basic.html 2011-10-06 01:17:05.000000000 +0200 @@ -42,7 +42,7 @@ [% IF prefs %] [% WRAPPER setting title="SETUP_PLAYERNAME" desc="SETUP_PLAYERNAME_DESC" %] - [%- IF playericon %]

[% END %] + [%- IF playericon %]

[% END %] [% END %] diff -ru squeezeboxserver/HTML.orig/EN/settings/server/wizard.html squeezeboxserver/HTML/EN/settings/server/wizard.html --- squeezeboxserver/HTML.orig/EN/settings/server/wizard.html 2011-10-06 00:51:05.000000000 +0200 +++ squeezeboxserver/HTML/EN/settings/server/wizard.html 2011-10-06 01:17:04.000000000 +0200 @@ -4,8 +4,8 @@ [% "SQUEEZEBOX_SERVER" | string %] - - + +