Index: songinfo.html =================================================================== --- songinfo.html (revision 11207) +++ songinfo.html (revision 12145) @@ -56,7 +56,7 @@ [% FOREACH contributor = contributors %] - [% contributorHTMLFrag = "$contributor.name" %] + [% contributorHTMLFrag = "$contributor.name" %] [% contributorsHTML.push(contributorHTMLFrag) %] @@ -73,7 +73,7 @@ [% "ALBUM" | string %][% "COLON" | string %] - [% itemobj.album.title %] + [% itemobj.album.title %] [% END %] @@ -119,7 +119,7 @@ [% "YEAR" | string %][% "COLON" | string %] - [% itemobj.year %] + [% itemobj.year| html %] [% END %] [% IF itemobj.replay_gain.defined %] Index: cmdwrappers =================================================================== --- cmdwrappers (revision 11207) +++ cmdwrappers (revision 12145) @@ -2,7 +2,11 @@ [% statusroot = 'status.html' %] [% noHomeLink = 1 %] [% controlGraphics = 1 %] +[% notarget = 1 %] +[%# Default to no targets for links %] +[% notarget = 1 %] + [% BLOCK cmdlink %]

[% cmdtitle | string | ucfirst %] @@ -175,7 +179,7 @@ [% item.text | html %][% IF showYear && item.year %] ([% item.year %])[% END %] [% IF verbose %] [% "FROM" | string %] - [% item.album.title | html %] + [% item.itemobj.album.title | html %] [% PROCESS artistsAsHTML.html %] [% END %] [%# IF includeArtist && artist; PROCESS artistsAsHTML.html; END %] Index: status.js =================================================================== --- status.js (revision 11207) +++ status.js (revision 12145) @@ -7,6 +7,7 @@ var intervalID = false; [% PROCESS html/global.js %] +[% PROCESS skin_global.js %] var args = 'player='+player+'&ajaxRequest=1'; // Update the progress dialog with the current state @@ -288,7 +289,6 @@ //songinfoArray[songinfoArray.length] = {name: 'artist', stub:'browsedb.html?hierarchy=album,track&level=1&contributor.id='}; songinfoArray[songinfoArray.length] = {name: 'album', stub:'browsedb.html?hierarchy=album,track&level=2&album.id='}; songinfoArray[songinfoArray.length] = {name: 'genre', stub:'browsedb.html?hierarchy=genre,contributor,album,track&level=1&genre.id='}; - refreshElement('artist',parsedData['artisthtml']) refreshElement('artist',parsedData['artisthtml']); songinfoArray.each(function(key) { Index: galleryselect.html =================================================================== --- galleryselect.html (revision 11207) +++ galleryselect.html (revision 12145) @@ -19,7 +19,7 @@ [% IF NOT noLabel %][% END %] - [% FOREACH orderType = orderByList.keys.sort %] Index: html/help.html =================================================================== --- html/help.html (revision 11207) +++ html/help.html (revision 12145) @@ -10,18 +10,9 @@ [% "GETTING_STARTED" | string %]

  • - [% "PLAYER_SETUP" | string %] + [% "HELP_REMOTE" | string %]
  • - [% "USING_REMOTE" | string %] -
    • -
  • - [% "HELP_REMOTE" | string %] -
    • -
  • - [% "RADIO" | string %] -
    • -
  • [% "FAQ" | string %]
  • [% "TECHNICAL_INFORMATION" | string %] Index: browsedb.html =================================================================== --- browsedb.html (revision 11207) +++ browsedb.html (revision 12145) @@ -131,10 +131,10 @@
    - Play + [% "PLAY" | string %] - Next + [% "ADD" | string %]
    Index: browse.js =================================================================== --- browse.js (revision 11207) +++ browse.js (revision 12145) @@ -1,6 +1,7 @@ var url = 'status.html'; [% PROCESS html/global.js %] +[% PROCESS skin_global.js %] function addItem(args) { getStatusData(args, showAdded); @@ -28,16 +29,6 @@ } } -function chooseAlbumOrderBy(value, option) -{ - var url = '[% webroot %]browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %][% IF artwork %]&artwork=1[% END %]&player=[% playerURI %]'; - if (option) { - url = url + '&orderBy=' + option; - } - setCookie( 'SlimServer-orderBy', option ); - window.location = url; -} - function setCookie(name, value) { var expires = new Date(); expires.setTime(expires.getTime() + 1000*60*60*24*365); Index: slimserver.css =================================================================== --- slimserver.css (revision 11207) +++ slimserver.css (revision 12145) @@ -369,7 +369,7 @@ border: 1px solid black; } -div#systemWorking{ +div#systemWorking { position: fixed; left: 0; top: 25; @@ -378,6 +378,7 @@ background-color: white; z-index: 12; } + div#systemNotWorking{ position: fixed; left: 0; Index: home.html =================================================================== --- home.html (revision 11207) +++ home.html (revision 12145) @@ -251,7 +251,7 @@ [% BLOCK albums %] [% INCLUDE link_head %] - + album [% INCLUDE link_foot title = 'ALBUMS' %] [% END %] Index: skin_global.js =================================================================== --- skin_global.js (revision 11207) +++ skin_global.js (revision 12145) @@ -1,10 +1,10 @@ var thumbSize = [% IF thumbSize %][% thumbSize %][% ELSE %]250[% END %]; function chooseAlbumOrderBy(value, option, artwork) { - if (!artwork) { + if (!artwork && artwork != 0) { artwork = 1; } - var url = '[% webroot %]browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %][% IF artwork %]&artwork='+artwork+'[% END %]&player=[% playerURI %]'; + var url = '[% webroot %]browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %][% IF artwork OR artwork == '0' %]&artwork='+artwork+'[% END %]&player=[% playerURI %]'; if (option) { url = url + '&orderBy=' + option; } @@ -19,3 +19,17 @@ name + "=" + escape(value) + ((expires == null) ? "" : ("; expires=" + expires.toGMTString())); } + +function resize(src,width) { + if (!width) { + // special case for IE (argh) + if (document.all) { //if IE 4+ + width = document.body.clientWidth*0.5; + } else if (document.getElementById) { //else if NS6+ + width = window.innerWidth*0.5; + } + } + if (src.width > width ) { + src.width = width; + } +} Index: playlist.js =================================================================== --- playlist.js (revision 11207) +++ playlist.js (revision 12145) @@ -16,6 +16,7 @@ var previousState = new Object(); [% PROCESS html/global.js %] +[% PROCESS skin_global.js %] // parses the data if it has not been done already function fillDataHash(theData) { @@ -86,7 +87,8 @@ $(thisId).innerHTML = innerText; } } - refreshElement('artist_' + r.toString(),parsedData['artist_0']); + var artist_elem = 'artist_' + r.toString(); + refreshElement('artist_' + r.toString(),parsedData[artist_elem]); refreshItemClass(parsedData, r); }