Index: server/HTML/EN/settings/footer.html =================================================================== --- server/HTML/EN/settings/footer.html (revision 14887) +++ server/HTML/EN/settings/footer.html (working copy) @@ -1,5 +1,5 @@ - +[% IF menu != 'main' %] [%- IF versionInfo -%]
@@ -41,6 +41,7 @@ +[% END %] [%- IF NOT ajaxUpdate -%] Index: server/HTML/EN/settings/index.html =================================================================== --- server/HTML/EN/settings/index.html (revision 14887) +++ server/HTML/EN/settings/index.html (working copy) @@ -0,0 +1,93 @@ +[%- IF menu == 'ADVANCED_SETTINGS'; + PROCESS setting_chooser.html useTabList=1 style='list'; +%] + +[%- ELSIF menu == 'PLAYER'; + + PROCESS settings/header.html menu = 'main'; + + stringkeys = playersetup.keys; + USE Clients; players = Clients.get("id") + %] +

 

+
+ [% IF players.size > 1 %] +
+ + + +
+ [% END %] +
+

 

+ [% + + IF playerid; + PROCESS setting_chooser.html useTabList=1 style='list' needsClient = 1 target='subSettings'; + + END %] + [% PROCESS settings/footer.html nosubmit=1 menu='main' %] + +[%- ELSIF menu == 'main'; + IF playerid && needsClient; pagetitle='PLAYER_SETTINGS' | string; ELSE; pagetitle = 'SERVER_SETTINGS' | string; END; + pageicon = 'settings'; + noSpacer = 1; + + pageHeaderMenu = BLOCK; + FOREACH stringkey = firstLevelItems; + link = additionalLinks.setup.$stringkey; + IF !link; link = path _ '?sub=' _ stringkey _ '&'; END %] + [% stringkey | string | html %][% IF style == "list" %][% END %] + [% IF !loop.last %]|[% END %] + [%- END; END; + + PROCESS settings/header.html; + + PROCESS settings/footer.html nosubmit=1 %] + +[%- ELSIF sub == 'PLAYER' && !playerid; + PROCESS settings/header.html %] +


[% "NO_PLAYER_FOUND" | string %]

+ [% PROCESS settings/footer.html %] + +[%- ELSIF sub -%] + + [% IF !subPage && sub == 'PLAYER'; + subPage = "BASIC_PLAYER_SETTINGS"; + ELSIF !subPage; + subPage = "FORMATTING_SETTINGS"; + END %] + + [% id = playerid | uri %] + [% IF additionalLinks.setup.$subPage; + myPage = additionalLinks.setup.$subPage; + ELSIF playersetup.$subPage; + myPage = playersetup.$subPage _ "?player=" _ playerURI _ "&playerid=" _ id; + ELSIF sub == 'player'; + myPage = webroot _ "settings/player/basic.html?player=" _ playerURI _ "&playerid=" _ id; + ELSE; + myPage = webroot _ "settings/server/formatting.html?player=" _ playerURI; + END %] + + + + +[%- ELSE -%] + + + + + [% "SERVER_SETTINGS" | string %] + + + + + + + + +[% END %] \ No newline at end of file Index: server/HTML/EN/settings/header.html =================================================================== --- server/HTML/EN/settings/header.html (revision 14887) +++ server/HTML/EN/settings/header.html (working copy) @@ -1,13 +1,9 @@ -[% IF NOT ajaxUpdate %] - -[% FILTER null %] - - [% IF NOT useTabList; pwd_list = BLOCK %] - [%- PROCESS setting_chooser.html setting_chooser_noHome = 1 %] - [% END; END %] - - [% pageHeaderScripts = BLOCK %] - [% pageHeaderScripts %] + + + + [% PROCESS standardheader.html %] + @@ -17,33 +13,35 @@ new Event.observe(window, 'load', function(){ initSettingsForm(); }); [%- END %] - [% END %] + + +
+ [% SET pwd_list = pageHeaderMenu IF pageHeaderMenu and not pwd_list -%] + [%- PROCESS crumblist IF pwd_list %] +
+
+ [% pageHeaderInfo %] +
+[% IF menu != 'main' %] +
- [% IF useTabList; pageHeaderInfo = BLOCK %] - [%- PROCESS setting_chooser.html setting_chooser_noHome = 1 %] - [% END; END %] - -[% END %] +
+ [%- IF warning %] + [% warning %] + [% END -%] +
+ +
-[% IF playerid && needsClient; pagetitle='PLAYER_SETTINGS' | string; ELSE; pagetitle = 'SERVER_SETTINGS' | string; END %] -[% pageicon = 'settings'; noSpacer = 1; PROCESS pageheader.html %] - -
- [%- IF warning %] - [% warning %] - [% END -%] -
- -
-[% END %] -
-
- - - - - - [% IF playerid && needsClient %][% END %] - [% IF player %][% END %] - - + +
+ + + + + + [% IF playerid && needsClient %][% END %] + [% IF player %][% END %] + + +[% END %] \ No newline at end of file Index: server/HTML/Default/settings/index.html =================================================================== --- server/HTML/Default/settings/index.html (revision 14887) +++ server/HTML/Default/settings/index.html (working copy) @@ -1,16 +1,4 @@ -[%- firstLevelItems = [ - 'BASIC_SERVER_SETTINGS', - 'ITUNES', - 'PLUGIN_PODCAST', - 'SQUEEZENETWORK_SETTINGS', - 'INTERFACE_SETTINGS', - 'SETUP_GROUP_PLUGINS', - 'SERVER_STATUS', - 'PLUGINS', - 'BEHAVIOR_SETTINGS' - ]; - -BLOCK settingsPage -%] +[%- BLOCK settingsPage -%]
Index: server/Slim/Web/Settings/Server/Index.pm =================================================================== --- server/Slim/Web/Settings/Server/Index.pm (revision 14887) +++ server/Slim/Web/Settings/Server/Index.pm (working copy) @@ -18,6 +18,7 @@ my ($class, $client, $paramRef) = @_; $paramRef->{additionalLinks} = \%Slim::Web::Pages::additionalLinks; + $paramRef->{additionalLinks}->{setup}->{MY_MUSIC} = $paramRef->{additionalLinks}->{setup}->{BEHAVIOR_SETTINGS}; my @sortedLinks = map { $_->[1] } @@ -27,6 +28,19 @@ $paramRef->{sortedLinks} = \@sortedLinks; + $paramRef->{firstLevelItems} = [ + 'BASIC_SERVER_SETTINGS', + 'PLAYER', + 'MY_MUSIC', + 'SQUEEZENETWORK_SETTINGS', + 'ITUNES', + 'INTERFACE_SETTINGS', + 'PLUGINS', + 'PLUGIN_PODCAST', + 'ADVANCED_SETTINGS', + 'SERVER_STATUS', + ]; + $paramRef->{iTunesEnabled} = Slim::Utils::PluginManager->isEnabled('Slim::Plugin::iTunes::Plugin'); $paramRef->{podcastEnabled} = Slim::Utils::PluginManager->isEnabled('Slim::Plugin::Podcast::Plugin'); Index: server/HTML/EN/setting_chooser.html =================================================================== --- server/HTML/EN/setting_chooser.html (revision 14887) +++ server/HTML/EN/setting_chooser.html (working copy) @@ -10,7 +10,7 @@ [%- IF style == "list" %]
  • [%- ELSIF loop.index > 0%]|[% END %] - [% stringkey | string | html %][% IF style == "list" %]
    • [% END %] + [% stringkey | string | html %][% IF style == "list" %][% END %] [%- END -%] [%- IF style == "list" %]
    [% END %] [%- END -%]