[Slim-Checkins] r8848 - in /branches/BRANCH_SN_API/server:
Changelog6.html
HTML/EN/favorites_list.html HTML/EN/galleryselect.html
HTML/EN/html/common.js HTML/EN/setting_chooser.html Slim/Utils/Prefs.pm
Slim/Web/Pages/BrowseDB.pm Slim/Web/Setup.pm strings.txt
andy at svn.slimdevices.com
andy at svn.slimdevices.com
Mon Aug 7 13:50:13 PDT 2006
Author: andy
Date: Mon Aug 7 13:50:08 2006
New Revision: 8848
URL: http://svn.slimdevices.com?rev=8848&view=rev
Log:
Merge from trunk: -r8846:8847
Modified:
branches/BRANCH_SN_API/server/Changelog6.html
branches/BRANCH_SN_API/server/HTML/EN/favorites_list.html (props changed)
branches/BRANCH_SN_API/server/HTML/EN/galleryselect.html
branches/BRANCH_SN_API/server/HTML/EN/html/common.js
branches/BRANCH_SN_API/server/HTML/EN/setting_chooser.html
branches/BRANCH_SN_API/server/Slim/Utils/Prefs.pm
branches/BRANCH_SN_API/server/Slim/Web/Pages/BrowseDB.pm
branches/BRANCH_SN_API/server/Slim/Web/Setup.pm
branches/BRANCH_SN_API/server/strings.txt
Modified: branches/BRANCH_SN_API/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/BRANCH_SN_API/server/Changelog6.html?rev=8848&r1=8847&r2=8848&view=diff
==============================================================================
--- branches/BRANCH_SN_API/server/Changelog6.html (original)
+++ branches/BRANCH_SN_API/server/Changelog6.html Mon Aug 7 13:50:08 2006
@@ -456,6 +456,7 @@
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3816">#3816</a> - basic search crasher</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3820">#3820</a> - DBD::mysql::st execute failed: Table 'slimserver.years' doesn't exist</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3824">#3824</a> - TRACKARTIST (and ALBUMARTIST) problems</li>
+ <li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3829">#3829</a> - browse by artwork order pref should be browse albums order</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3831">#3831</a> - help->faq open in new window</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3832">#3832</a> - Play All Songs on Player search</li>
<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=3833">#3833</a> - Clean install crashes with undefined value in Import.pm</li>
Propchange: branches/BRANCH_SN_API/server/HTML/EN/favorites_list.html
('svn:executable' removed)
Modified: branches/BRANCH_SN_API/server/HTML/EN/galleryselect.html
URL: http://svn.slimdevices.com/branches/BRANCH_SN_API/server/HTML/EN/galleryselect.html?rev=8848&r1=8847&r2=8848&view=diff
==============================================================================
--- branches/BRANCH_SN_API/server/HTML/EN/galleryselect.html (original)
+++ branches/BRANCH_SN_API/server/HTML/EN/galleryselect.html Mon Aug 7 13:50:08 2006
@@ -1,13 +1,40 @@
-[% IF levelName == 'album' || levelName == 'age' %]
-<div class="viewSelect">
- [% IF controlGraphics %]
- [% IF artwork %]<a href="javascript:toggleGalleryView(0);"><img src="html/images/list.png" alt='[% "SWITCH_TO_LIST" | string %]' title='[% "SWITCH_TO_LIST" | string %]'></a>
- [% ELSE %]<a href="javascript:toggleGalleryView(1);"><img src="html/images/gallery.png" alt='[% "SWITCH_TO_GALLERY" | string %]' title='[% "SWITCH_TO_GALLERY" | string %]'></a>
- [% END %]
- [% ELSE %]
- ([% IF artwork -%]<a href="javascript:toggleGalleryView(0);">[% "SWITCH_TO_LIST" | string %]</a>
- [%- ELSE -%]<a href="javascript:toggleGalleryView(1);">[% "SWITCH_TO_GALLERY" | string %]</a>
- [%- END %])
- [% END %]
-</div>
-[% END %]
+[% IF levelName == 'album' || levelName == 'age' %]
+
+<div class="viewSelect">
+
+[% IF levelName == 'album' %]
+
+ [% orderByList = {
+ 'album.titlesort' => 'ALBUM',
+ 'album.year,album.titlesort' => 'SORT_YEARALBUM',
+ 'album.year,contributor.namesort,album.titlesort' => 'SORT_YEARARTISTALBUM',
+ 'contributor.namesort,album.titlesort' => 'SORT_ARTISTALBUM',
+ 'contributor.namesort,album.year,album.titlesort' => 'SORT_ARTISTYEARALBUM',
+ 'genre.namesort,album.titlesort' => 'SORT_GENREALBUM',
+ 'genre.namesort,contributor.namesort,album.titlesort' => 'SORT_GENREARTISTALBUM',
+ } %]
+
+ <label for="orderBy" class="stdlabel">[% "SORT_BY" | string %]</label>
+
+ <select class="stdedit" name="orderBy" onChange="chooseAlbumOrderBy(selectedIndex,options[selectedIndex].value)">
+
+ [% FOREACH orderType = orderByList.keys.sort %]
+ <option [% IF orderType == orderBy %]selected[% END %] value="[% orderType %]">[% orderByList.$orderType | string %]</option>
+ [% END %]
+
+ </select>
+
+[% END %]
+
+ [% IF controlGraphics %]
+ [% IF artwork %]<a href="javascript:toggleGalleryView(0);"><img src="html/images/list.png" alt='[% "SWITCH_TO_LIST" | string %]' title='[% "SWITCH_TO_LIST" | string %]'></a>
+ [% ELSE %]<a href="javascript:toggleGalleryView(1);"><img src="html/images/gallery.png" alt='[% "SWITCH_TO_GALLERY" | string %]' title='[% "SWITCH_TO_GALLERY" | string %]'></a>
+ [% END %]
+ [% ELSE %]
+ ([% IF artwork -%]<a href="javascript:toggleGalleryView(0);">[% "SWITCH_TO_LIST" | string %]</a>
+ [%- ELSE -%]<a href="javascript:toggleGalleryView(1);">[% "SWITCH_TO_GALLERY" | string %]</a>
+ [%- END %])
+ [% END %]
+</div>
+
+[% END %]
Modified: branches/BRANCH_SN_API/server/HTML/EN/html/common.js
URL: http://svn.slimdevices.com/branches/BRANCH_SN_API/server/HTML/EN/html/common.js?rev=8848&r1=8847&r2=8848&view=diff
==============================================================================
--- branches/BRANCH_SN_API/server/HTML/EN/html/common.js (original)
+++ branches/BRANCH_SN_API/server/HTML/EN/html/common.js Mon Aug 7 13:50:08 2006
@@ -93,6 +93,17 @@
[% END %]
[% END %]
+function chooseAlbumOrderBy(value, option)
+{
+ var url = '[% webroot %]browsedb.html?hierarchy=[% hierarchy %]&level=[% level %][% attributes %]&player=[% playerURI %]';
+
+ if (option) {
+ url = url + '&orderBy=' + option;
+ }
+
+ window.location = url;
+}
+
function chooseSettings(value,option)
{
var url;
Modified: branches/BRANCH_SN_API/server/HTML/EN/setting_chooser.html
URL: http://svn.slimdevices.com/branches/BRANCH_SN_API/server/HTML/EN/setting_chooser.html?rev=8848&r1=8847&r2=8848&view=diff
==============================================================================
--- branches/BRANCH_SN_API/server/HTML/EN/setting_chooser.html (original)
+++ branches/BRANCH_SN_API/server/HTML/EN/setting_chooser.html Mon Aug 7 13:50:08 2006
@@ -1,7 +1,7 @@
[% BLOCK addSetupLinks %]
[% IF setuplinks %]
[% FOREACH link = setuplinks %]
- <OPTION [% IF page == link.key %]selected[% END %] value="[% link.key %]" label="[% link.key | string %]">[% link.key | string %]</OPTION>
+ <option [% IF page == link.key %]selected[% END %] value="[% link.key %]" label="[% link.key | string %]">[% link.key | string %]</option>
[% END %]
[% END %]
[% END %]
@@ -9,21 +9,21 @@
[% BLOCK addPluginLinks %]
[% IF setuplinks %]
[% FOREACH link = setuplinks %]
- <OPTION [% IF page == link.key %]selected[% END %] value="[% link.key %]" label="PLUGIN: [% link.key | string %]">PLUGIN: [% link.key | string %]</OPTION>
+ <option [% IF page == link.key %]selected[% END %] value="[% link.key %]" label="PLUGIN: [% link.key | string %]">PLUGIN: [% link.key | string %]</option>
[% END %]
[% END %]
[% END %]
-<FORM name="setup_chooser" method="Get" action="[% webroot %]setup.html" target="header">
- <SELECT NAME="browse" class="stdedit" style="width:17em;" onchange="chooseSettings(selectedIndex,options[selectedIndex].value)">
- [% UNLESS setting_chooser_noHome %]<OPTION [% IF page == "HOME" %]selected[% END %] value="HOME" label="[% "HOME" | string %]">[% "HOME" | string %]</OPTION>[% END %]
- [% IF playerid %]<OPTION [% IF page == "PLAYER_SETTINGS" %]selected[% END %] value="PLAYER_SETTINGS" label="[% "PLAYER_SETTINGS" | string %]">[% "PLAYER_SETTINGS" | string %]</OPTION>
- [% ELSE %]<OPTION [% IF page == "SERVER_SETTINGS" %]selected[% END %] value="SERVER_SETTINGS" label="[% "SERVER_SETTINGS" | string %]">[% "SERVER_SETTINGS" | string %]</OPTION>[% END %]
+<form name="setup_chooser" method="get" action="[% webroot %]setup.html" target="header">
+ <select NAME="browse" class="stdedit" style="width:17em;" onchange="chooseSettings(selectedIndex,options[selectedIndex].value)">
+ [% UNLESS setting_chooser_noHome %]<option [% IF page == "HOME" %]selected[% END %] value="HOME" label="[% "HOME" | string %]">[% "HOME" | string %]</option>[% END %]
+ [% IF playerid %]<option [% IF page == "PLAYER_SETTINGS" %]selected[% END %] value="PLAYER_SETTINGS" label="[% "PLAYER_SETTINGS" | string %]">[% "PLAYER_SETTINGS" | string %]</option>
+ [% ELSE %]<option [% IF page == "SERVER_SETTINGS" %]selected[% END %] value="SERVER_SETTINGS" label="[% "SERVER_SETTINGS" | string %]">[% "SERVER_SETTINGS" | string %]</option>[% END %]
[% IF playerid %][% PROCESS addSetupLinks setuplinks=additionalLinks.playersetup %]
[%# PROCESS addPluginLinks setuplinks=additionalLinks.playerplugin %]
[% ELSE %][% PROCESS addSetupLinks setuplinks=additionalLinks.setup %][% END %]
[%# PROCESS addPluginLinks setuplinks=additionalLinks.plugin %]
- </SELECT>
+ </select>
<input type=hidden value="[% page %]" name="page">
<input type=hidden value="[% playerid | uri %]" name="playerid">
-</FORM>
+</FORM>
Modified: branches/BRANCH_SN_API/server/Slim/Utils/Prefs.pm
URL: http://svn.slimdevices.com/branches/BRANCH_SN_API/server/Slim/Utils/Prefs.pm?rev=8848&r1=8847&r2=8848&view=diff
==============================================================================
--- branches/BRANCH_SN_API/server/Slim/Utils/Prefs.pm (original)
+++ branches/BRANCH_SN_API/server/Slim/Utils/Prefs.pm Mon Aug 7 13:50:08 2006
@@ -218,7 +218,6 @@
'upgrade-6.5b1-2006-02-03-script' => 1,
'upgrade-6.5b1-2006-03-31-script' => 1,
'rank-PLUGIN_PICKS_MODULE_NAME' => 4,
- 'sortBrowseArt' => 'album.titlesort',
'disabledextensionsaudio' => '',
'disabledextensionsplaylist' => '',
);
@@ -523,12 +522,6 @@
# Always Upgrade SQLite to MySQL
if ($prefs{'dbsource'} =~ /SQLite/) {
$prefs{'dbsource'} = $DEFAULT_DBSOURCE;
- }
-
- # Fixup old sortBrowseArt prefs. Ugh.
- if ($prefs{'sortBrowseArt'} !~ /\./) {
-
- $prefs{'sortBrowseArt'} = 'album.titlesort';
}
for my $version (sort keys %upgradeScripts) {
Modified: branches/BRANCH_SN_API/server/Slim/Web/Pages/BrowseDB.pm
URL: http://svn.slimdevices.com/branches/BRANCH_SN_API/server/Slim/Web/Pages/BrowseDB.pm?rev=8848&r1=8847&r2=8848&view=diff
==============================================================================
--- branches/BRANCH_SN_API/server/Slim/Web/Pages/BrowseDB.pm (original)
+++ branches/BRANCH_SN_API/server/Slim/Web/Pages/BrowseDB.pm Mon Aug 7 13:50:08 2006
@@ -65,12 +65,9 @@
my $levelName = $levels[$level];
# Set the orderBy if requested
- if ($levelName eq 'album' && $artwork) {
-
- if (Slim::Utils::Prefs::get('sortBrowseArt') && !$orderBy) {
-
- $orderBy = Slim::Utils::Prefs::get('sortBrowseArt');
- }
+ if ($levelName eq 'album') {
+
+ $orderBy ||= 'album.titlesort';
} elsif ($levelName ne 'track') {
@@ -455,8 +452,9 @@
# Give players a bit of time.
main::idleStreams();
- $params->{'descend'} = $descend;
- $params->{'levelName'} = lc($levelName);
+ $params->{'descend'} = $descend;
+ $params->{'levelName'} = lc($levelName);
+ $params->{'attributes'} = _attributesToKeyValuePair(\%attrs);
# Don't show stats when only showing playlists - extra queries that aren't needed.
#
Modified: branches/BRANCH_SN_API/server/Slim/Web/Setup.pm
URL: http://svn.slimdevices.com/branches/BRANCH_SN_API/server/Slim/Web/Setup.pm?rev=8848&r1=8847&r2=8848&view=diff
==============================================================================
--- branches/BRANCH_SN_API/server/Slim/Web/Setup.pm (original)
+++ branches/BRANCH_SN_API/server/Slim/Web/Setup.pm Mon Aug 7 13:50:08 2006
@@ -1397,10 +1397,9 @@
,'GroupOrder' => ['Default']
,'Groups' => {
'Default' => {
- 'PrefOrder' => ['skin','itemsPerPage','refreshRate','coverArt','coverThumb',
- 'artfolder','thumbSize','sortBrowseArt']
- }
- }
+ 'PrefOrder' => ['skin','itemsPerPage','refreshRate','coverArt','coverThumb','artfolder','thumbSize']
+ }
+ }
,'Prefs' => {
'skin' => {
'validate' => \&Slim::Utils::Validate::inHash
@@ -1441,19 +1440,6 @@
'validate' => \&Slim::Utils::Validate::isInt
,'validateArgs' => [25,250,1,1]
}
- ,'sortBrowseArt' => {
- 'validate' => \&Slim::Utils::Validate::inHash,
- 'validateArgs' => [sub {return getSetupOptions('INTERFACE_SETTINGS','sortBrowseArt');},1],
- 'options' => {
- 'album.titlesort' => 'SETUP_SORTBROWSEART_ALBUM',
- 'contributor.namesort,album.titlesort' => 'SETUP_SORTBROWSEART_ARTISTALBUM',
- 'contributor.namesort,album.year,album.titlesort' => 'SETUP_SORTBROWSEART_ARTISTYEARALBUM',
- 'album.year,album.titlesort' => 'SETUP_SORTBROWSEART_YEARALBUM',
- 'album.year,contributor.namesort,album.titlesort' => 'SETUP_SORTBROWSEART_YEARARTISTALBUM',
- 'genre.namesort,album.titlesort' => 'SETUP_SORTBROWSEART_GENREALBUM',
- 'genre.namesort,contributor.namesort,album.titlesort' => 'SETUP_SORTBROWSEART_GENREARTISTALBUM',
- },
- }
}
}# end of setup{'INTERFACE_SETTINGS'} hash
Modified: branches/BRANCH_SN_API/server/strings.txt
URL: http://svn.slimdevices.com/branches/BRANCH_SN_API/server/strings.txt?rev=8848&r1=8847&r2=8848&view=diff
==============================================================================
--- branches/BRANCH_SN_API/server/strings.txt (original)
+++ branches/BRANCH_SN_API/server/strings.txt Mon Aug 7 13:50:08 2006
@@ -12263,38 +12263,30 @@
IT Moderno
NL Modern
-SETUP_SORTBROWSEART
- DE Sortierreihenfolge für Plattenhüllen
- EN Browse By Artwork Order
-
-SETUP_SORTBROWSEART_DESC
- DE Wählen Sie die Standard Sortierreihenfolge, die beim Nachschlagen von Plattenhüllen verwendet werden soll.
- EN Choose the default order that the Artwork web page displays albums.
-
-SETUP_SORTBROWSEART_ALBUM
- EN Album
-
-SETUP_SORTBROWSEART_ARTISTALBUM
+SORT_BY
+ EN Sort By
+
+SORT_ARTISTALBUM
DE Interpret, Album
EN Artist, Album
-SETUP_SORTBROWSEART_ARTISTYEARALBUM
+SORT_ARTISTYEARALBUM
DE Interpret, Jahr, Album
EN Artist, Year, Album
-SETUP_SORTBROWSEART_YEARALBUM
+SORT_YEARALBUM
DE Jahr, Album
EN Year, Album
-SETUP_SORTBROWSEART_YEARARTISTALBUM
+SORT_YEARARTISTALBUM
DE Jahr, Artist, Album
EN Year, Artist, Album
-SETUP_SORTBROWSEART_GENREALBUM
+SORT_GENREALBUM
DE Stil, Album
EN Genre, Album
-SETUP_SORTBROWSEART_GENREARTISTALBUM
+SORT_GENREARTISTALBUM
DE Stil, Interpret, Album
EN Genre, Artist, Album
More information about the checkins
mailing list