From 640fc18b2123f7afaf0f1905417626dc66c9c999 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Sun, 20 Jul 2014 00:46:29 -0400 Subject: [PATCH] update translations --- dashboard-ui/advanced.html | 1 - dashboard-ui/advancedpaths.html | 70 ---- dashboard-ui/advancedserversettings.html | 61 --- dashboard-ui/appsplayback.html | 1 - dashboard-ui/channelitems.html | 149 ++++---- dashboard-ui/collections.html | 103 ++--- dashboard-ui/css/librarybrowser.css | 29 +- dashboard-ui/dashboard.html | 34 +- dashboard-ui/dashboardgeneral.html | 41 +- dashboard-ui/encodingsettings.html | 1 - dashboard-ui/episodes.html | 201 +++++----- dashboard-ui/gamegenres.html | 45 ++- dashboard-ui/games.html | 176 +++++---- dashboard-ui/gamestudios.html | 45 ++- dashboard-ui/itemdetails.html | 69 ++-- dashboard-ui/itemlist.html | 151 ++++---- dashboard-ui/librarysettings.html | 19 +- dashboard-ui/livetvchannels.html | 44 ++- dashboard-ui/livetvseriestimers.html | 6 +- dashboard-ui/metadataadvanced.html | 13 +- dashboard-ui/moviegenres.html | 45 ++- dashboard-ui/moviepeople.html | 62 +-- dashboard-ui/movies.html | 358 +++++++++--------- dashboard-ui/moviestudios.html | 45 ++- dashboard-ui/movietrailers.html | 139 ++++--- dashboard-ui/musicalbumartists.html | 57 ++- dashboard-ui/musicalbums.html | 116 +++--- dashboard-ui/musicartists.html | 56 ++- dashboard-ui/musicgenres.html | 45 ++- dashboard-ui/musicvideos.html | 187 ++++----- dashboard-ui/notificationlist.html | 1 - dashboard-ui/notificationsetting.html | 1 - dashboard-ui/notificationsettings.html | 1 - dashboard-ui/reports.html | 4 +- dashboard-ui/scripts/advancedpaths.js | 112 ------ .../scripts/advancedserversettings.js | 65 ---- dashboard-ui/scripts/channelitems.js | 28 +- dashboard-ui/scripts/dashboardgeneral.js | 39 +- dashboard-ui/scripts/episodes.js | 30 +- dashboard-ui/scripts/gamegenrepage.js | 25 +- dashboard-ui/scripts/gamespage.js | 25 +- dashboard-ui/scripts/gamestudiospage.js | 25 +- dashboard-ui/scripts/itemdetailpage.js | 11 + dashboard-ui/scripts/itemlistpage.js | 24 +- dashboard-ui/scripts/librarybrowser.js | 320 ++++++++++------ dashboard-ui/scripts/librarylist.js | 82 ++-- dashboard-ui/scripts/librarysettings.js | 27 ++ dashboard-ui/scripts/livetvchannels.js | 25 +- dashboard-ui/scripts/mediacontroller.js | 21 +- dashboard-ui/scripts/mediaplayer-video.js | 26 +- dashboard-ui/scripts/metadataadvanced.js | 29 +- dashboard-ui/scripts/moviecollections.js | 69 ++-- dashboard-ui/scripts/moviegenres.js | 25 +- dashboard-ui/scripts/moviepeople.js | 13 +- dashboard-ui/scripts/movies.js | 39 +- dashboard-ui/scripts/moviestudios.js | 25 +- dashboard-ui/scripts/movietrailers.js | 27 +- dashboard-ui/scripts/musicalbumartists.js | 25 +- dashboard-ui/scripts/musicalbums.js | 25 +- dashboard-ui/scripts/musicartists.js | 25 +- dashboard-ui/scripts/musicgenres.js | 25 +- dashboard-ui/scripts/musicvideos.js | 25 +- dashboard-ui/scripts/site.js | 20 +- dashboard-ui/scripts/songs.js | 24 +- dashboard-ui/scripts/sync.js | 8 +- dashboard-ui/scripts/tvgenres.js | 20 +- dashboard-ui/scripts/tvpeople.js | 13 +- dashboard-ui/scripts/tvshows.js | 27 +- dashboard-ui/scripts/tvstudios.js | 26 +- dashboard-ui/scripts/useredit.js | 2 + dashboard-ui/serversecurity.html | 7 +- dashboard-ui/songs.html | 123 +++--- dashboard-ui/thirdparty/jquery-2.1.1.min.js | 4 + dashboard-ui/tvgenres.html | 45 ++- dashboard-ui/tvpeople.html | 61 +-- dashboard-ui/tvshows.html | 211 +++++------ dashboard-ui/tvstudios.html | 45 ++- dashboard-ui/useredit.html | 10 +- dashboard-ui/userparentalcontrol.html | 4 +- dashboard-ui/userprofiles.html | 11 +- 80 files changed, 2365 insertions(+), 1909 deletions(-) delete mode 100644 dashboard-ui/advancedpaths.html delete mode 100644 dashboard-ui/advancedserversettings.html delete mode 100644 dashboard-ui/scripts/advancedpaths.js delete mode 100644 dashboard-ui/scripts/advancedserversettings.js create mode 100644 dashboard-ui/thirdparty/jquery-2.1.1.min.js diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html index 0672d621d8..3410330fc3 100644 --- a/dashboard-ui/advanced.html +++ b/dashboard-ui/advanced.html @@ -12,7 +12,6 @@
${TabGeneral} ${TabNotifications} - ${TabPaths} ${TabResume} ${TabTranscoding}
diff --git a/dashboard-ui/advancedpaths.html b/dashboard-ui/advancedpaths.html deleted file mode 100644 index 3476d4dc72..0000000000 --- a/dashboard-ui/advancedpaths.html +++ /dev/null @@ -1,70 +0,0 @@ - - - - ${TitleAdvanced} - - -
- -
-
- -
- ${TabGeneral} - ${TabNotifications} - ${TabPaths} - ${TabResume} - ${TabTranscoding} -
-
- -

${LabelCustomPaths}

-
-
    -
  • - -
    - -
    - -
    ${LabelCachePathHelp}
    -
    • -
  • - -
    - -
    - -
    ${LabelImagesByNamePathHelp}
    -
    • -
  • - -
    - -
    - -
    ${LabelMetadataPathHelp}
    -
    • -
-
-
    -
  • - - -
    • - -
-
-
-
- - -
- - diff --git a/dashboard-ui/advancedserversettings.html b/dashboard-ui/advancedserversettings.html deleted file mode 100644 index 2df49ebe5e..0000000000 --- a/dashboard-ui/advancedserversettings.html +++ /dev/null @@ -1,61 +0,0 @@ - - - - ${TitleServer} - - -
- -
-
- -
- ${TabDashboard} - ${TabGeneral} - ${TabAdvanced} - ${TabSecurity} -
-
- -
    -
  • - - -
    • - -
  • - - -
    ${LabelEnableAutomaticPortHelp}
    -
    • -
  • - - -
    ${LabelExternalDDNSHelp}
    -
    • -
-
-
    -
  • - - -
    • - -
-
-
-
- - -
- - diff --git a/dashboard-ui/appsplayback.html b/dashboard-ui/appsplayback.html index 03ff4abb63..e85a546f32 100644 --- a/dashboard-ui/appsplayback.html +++ b/dashboard-ui/appsplayback.html @@ -11,7 +11,6 @@
${TabGeneral} ${TabNotifications} - ${TabPaths} ${TabResume} ${TabTranscoding}
diff --git a/dashboard-ui/channelitems.html b/dashboard-ui/channelitems.html index eaadecfe64..a7b70469c5 100644 --- a/dashboard-ui/channelitems.html +++ b/dashboard-ui/channelitems.html @@ -18,10 +18,6 @@

-
- - -
@@ -32,88 +28,103 @@

${MessageLoadingChannels}

-
+
-
- - ${HeaderSortBy} - - - +
+ ${TabView} + ${TabSort} + ${TabFilter} +
-
- - +
+ +
+ +
-
- - -
- -
- - -
- -
- - -
- -
- - -
- -
- - -
- -
-
-
-
+
+
+
- ${HeaderSortOrder} + ${HeaderFilters} + + - - + + - - + + + + + + + + + + +
-
-
-
-
-
- - ${HeaderFilters} - - - +
+
+ + ${HeaderSortBy} + - - + + - - +
+ + +
- - +
+ + +
- - +
+ + +
- - -
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+
+
+
+ + ${HeaderSortOrder} + + + + + + + +
+
+
diff --git a/dashboard-ui/collections.html b/dashboard-ui/collections.html index 0cbed61681..487ae818ba 100644 --- a/dashboard-ui/collections.html +++ b/dashboard-ui/collections.html @@ -25,22 +25,9 @@
-
- -
- -
- - - -
 
-
-
- +
-
+ +
+ ${TabView} + ${TabSort} + ${TabFilter} +
+ +
+ +
+ + +
+
+
+ + +
+ +
+
+
+ ${HeaderFilters} + + + + + + + + +
+ +
+ ${LabelFeatures} + + + + + + + + + + +
+ +
+
- ${HeaderSortBy} + ${HeaderSortBy} @@ -92,7 +129,7 @@
- ${HeaderSortOrder} + ${HeaderSortOrder} @@ -104,36 +141,6 @@
-
-
-
- ${HeaderFilters} - - - - - - - - -
- -
- ${LabelFeatures} - - - - - - - - - - -
- -
-
diff --git a/dashboard-ui/moviestudios.html b/dashboard-ui/moviestudios.html index 3a3e8a5576..beccf3ec97 100644 --- a/dashboard-ui/moviestudios.html +++ b/dashboard-ui/moviestudios.html @@ -18,29 +18,44 @@
-
- -
-
+ +
-
- - ${HeaderFilters} - - - - - +
+ ${TabView} + ${TabFilter} +
- - -
+
+ +
+ + +
+ +
+
+
+ + ${HeaderFilters} + + + + + + + + + +
+ +
diff --git a/dashboard-ui/movietrailers.html b/dashboard-ui/movietrailers.html index 58f211fe70..c7c9b91269 100644 --- a/dashboard-ui/movietrailers.html +++ b/dashboard-ui/movietrailers.html @@ -10,90 +10,109 @@
-
- - -
-
+
-
- - ${HeaderSortBy} - - - +
+ ${TabView} + ${TabSort} + ${TabFilter} +
- - +
- - +
+ + +
+
+
+ + +
- - +
+
+
+ ${HeaderFilters} + + - - + + - - + + - - + + - - + + - - + + - - -
-
- - ${HeaderSortOrder} - +
- - +
+
+
+ + ${HeaderSortBy} + - - -
- -
-
-
-
- - ${HeaderFilters} - - - + + - - + + - - + + - - + + - - + + - - -
+ + + + + + + + + + + + + + +
+
+ + ${HeaderSortOrder} + + + + + + + +
+
diff --git a/dashboard-ui/musicalbumartists.html b/dashboard-ui/musicalbumartists.html index ec7776bc6e..70ce838675 100644 --- a/dashboard-ui/musicalbumartists.html +++ b/dashboard-ui/musicalbumartists.html @@ -19,35 +19,50 @@
-
- -
-
- -
-
+ +
-
- - ${HeaderFilters} - - - - - +
+ ${TabView} + ${TabFilter} +
- - -
+
+ +
+ + +
+
+
+ + +
+ +
+
+
+ ${HeaderFilters} + + + + + + + + +
+ +
diff --git a/dashboard-ui/musicalbums.html b/dashboard-ui/musicalbums.html index 53f5507fb2..37bee25fb6 100644 --- a/dashboard-ui/musicalbums.html +++ b/dashboard-ui/musicalbums.html @@ -18,77 +18,87 @@
-
-
- -
-
-
- - -
-
+
-
- - ${HeaderSortBy} - - - +
+ ${TabView} + ${TabSort} + ${TabFilter} +
- - +
- - +
+ + +
+
+
+ + +
- - +
+
+
+ ${HeaderFilters} + + - - + + -
+ + +
-
- - ${HeaderSortOrder} - +
+
+
+ + ${HeaderSortBy} + - - + + - - -
- -
-
-
-
- - ${HeaderFilters} - - - + + - - + + - - -
+ + + + + + + + +
+ + ${HeaderSortOrder} + + + + + + + +
+
diff --git a/dashboard-ui/musicartists.html b/dashboard-ui/musicartists.html index daff43837e..f885a6460f 100644 --- a/dashboard-ui/musicartists.html +++ b/dashboard-ui/musicartists.html @@ -19,35 +19,49 @@
-
- -
-
- -
-
+
-
- - ${HeaderFilters} - - - - - +
+ ${TabView} + ${TabFilter} +
- - -
+
+ +
+ + +
+
+
+ + +
+ +
+
+
+ ${HeaderFilters} + + + + + + + + +
+ +
diff --git a/dashboard-ui/musicgenres.html b/dashboard-ui/musicgenres.html index 53ff839723..f719a887e4 100644 --- a/dashboard-ui/musicgenres.html +++ b/dashboard-ui/musicgenres.html @@ -16,29 +16,44 @@
-
- -
-
+ +
-
- - ${HeaderFilters} - - - - - +
+ ${TabView} + ${TabFilter} +
- - -
+
+ +
+ + +
+ +
+
+
+ + ${HeaderFilters} + + + + + + + + + +
+ +
diff --git a/dashboard-ui/musicvideos.html b/dashboard-ui/musicvideos.html index ef3896714e..2a4d11a72e 100644 --- a/dashboard-ui/musicvideos.html +++ b/dashboard-ui/musicvideos.html @@ -20,131 +20,142 @@
-
- - -
-
+
-
- - ${HeaderSortBy} - - - +
+ ${TabView} + ${TabSort} + ${TabFilter} +
- - +
- - +
+ + +
- - +
+
+
+ + ${HeaderFilters} + + + - - + + - - + + - - + + - - + + - - + + +
+
+ + ${LabelVideoType} + - - + + - - -
+ + -
- - ${HeaderSortOrder} - + + - - + + +
- - -
-
-
-
-
-
- - ${HeaderFilters} - - - +
+ + ${LabelFeatures} + - - + + - - + + - - + + - - + + - - -
-
- - ${LabelVideoType} - +
- - +
+
+
+ + ${HeaderSortBy} + - - + + - - + + - - -
+ + -
- - ${LabelFeatures} - + + - - + + - - + + - - + + - - + + -
+ + + + + + + + + +
+ + ${HeaderSortOrder} + + + + + + + +
+
diff --git a/dashboard-ui/notificationlist.html b/dashboard-ui/notificationlist.html index a2d72c3247..4b8be1f30c 100644 --- a/dashboard-ui/notificationlist.html +++ b/dashboard-ui/notificationlist.html @@ -12,7 +12,6 @@
${TabGeneral} ${TabNotifications} - ${TabPaths} ${TabTranscoding}
diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html index 5ad3294f3e..7d84aabcd9 100644 --- a/dashboard-ui/notificationsetting.html +++ b/dashboard-ui/notificationsetting.html @@ -12,7 +12,6 @@
${TabGeneral} ${TabNotifications} - ${TabPaths} ${TabResume} ${TabTranscoding}
diff --git a/dashboard-ui/notificationsettings.html b/dashboard-ui/notificationsettings.html index d005ade6e2..a3cf803d37 100644 --- a/dashboard-ui/notificationsettings.html +++ b/dashboard-ui/notificationsettings.html @@ -12,7 +12,6 @@
${TabGeneral} ${TabNotifications} - ${TabPaths} ${TabResume} ${TabTranscoding}
diff --git a/dashboard-ui/reports.html b/dashboard-ui/reports.html index d524023a55..31168094ed 100644 --- a/dashboard-ui/reports.html +++ b/dashboard-ui/reports.html @@ -39,7 +39,7 @@ -
+
@@ -93,7 +93,7 @@
- ${HeaderManagement} + ${LabelManagement} diff --git a/dashboard-ui/scripts/advancedpaths.js b/dashboard-ui/scripts/advancedpaths.js deleted file mode 100644 index 8f66df273d..0000000000 --- a/dashboard-ui/scripts/advancedpaths.js +++ /dev/null @@ -1,112 +0,0 @@ -(function ($, document, window) { - - function loadPage(page, config) { - - $('#txtCachePath', page).val(config.CachePath || ''); - $('#txtItemsByNamePath', page).val(config.ItemsByNamePath || ''); - $('#txtMetadataPath', page).val(config.MetadataPath || ''); - - Dashboard.hideLoadingMsg(); - } - - $(document).on('pageshow', "#advancedPathsPage", function () { - - Dashboard.showLoadingMsg(); - - var page = this; - - ApiClient.getServerConfiguration().done(function (config) { - - loadPage(page, config); - - }); - - }).on('pageinit', "#advancedPathsPage", function () { - - var page = this; - - $('#btnSelectCachePath', page).on("click.selectDirectory", function () { - - var picker = new DirectoryBrowser(page); - - picker.show({ - - callback: function (path) { - - if (path) { - $('#txtCachePath', page).val(path); - } - picker.close(); - }, - - header: Globalize.translate('HeaderSelectServerCachePath'), - - instruction: Globalize.translate('HeaderSelectServerCachePathHelp') - }); - }); - - $('#btnSelectIBNPath', page).on("click.selectDirectory", function () { - - var picker = new DirectoryBrowser(page); - - picker.show({ - - callback: function (path) { - - if (path) { - $('#txtItemsByNamePath', page).val(path); - } - picker.close(); - }, - - header: Globalize.translate('HeaderSelectImagesByNamePath'), - - instruction: Globalize.translate('HeaderSelectImagesByNamePathHelp') - }); - }); - - $('#btnSelectMetadataPath', page).on("click.selectDirectory", function () { - - var picker = new DirectoryBrowser(page); - - picker.show({ - - callback: function (path) { - - if (path) { - $('#txtMetadataPath', page).val(path); - } - picker.close(); - }, - - header: Globalize.translate('HeaderSelectMetadataPath'), - - instruction: Globalize.translate('HeaderSelectMetadataPathHelp') - }); - }); - - }); - - window.AdvancedPathsPage = { - - onSubmit: function () { - - Dashboard.showLoadingMsg(); - - var form = this; - - ApiClient.getServerConfiguration().done(function (config) { - - config.CachePath = $('#txtCachePath', form).val(); - config.ItemsByNamePath = $('#txtItemsByNamePath', form).val(); - config.MetadataPath = $('#txtMetadataPath', form).val(); - - ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); - }); - - // Disable default form submission - return false; - } - }; - -})(jQuery, document, window); diff --git a/dashboard-ui/scripts/advancedserversettings.js b/dashboard-ui/scripts/advancedserversettings.js deleted file mode 100644 index 0cccc9eccd..0000000000 --- a/dashboard-ui/scripts/advancedserversettings.js +++ /dev/null @@ -1,65 +0,0 @@ -(function ($, document, window) { - - function loadPage(page, config, systemInfo) { - - if (systemInfo.SupportsNativeWebSocket) { - - $('#fldWebSocketPortNumber', page).hide(); - } else { - $('#fldWebSocketPortNumber', page).show(); - } - - $('#txtWebSocketPortNumber', page).val(config.LegacyWebSocketPortNumber); - - $('#txtPortNumber', page).val(config.HttpServerPortNumber); - - $('#txtDdns', page).val(config.WanDdns || ''); - - $('#chkEnableUpnp', page).checked(config.EnableUPnP).checkboxradio('refresh'); - - Dashboard.hideLoadingMsg(); - } - - $(document).on('pageshow', "#advancedServerSettingsPage", function () { - - Dashboard.showLoadingMsg(); - - var page = this; - - var promise1 = ApiClient.getServerConfiguration(); - - var promise2 = ApiClient.getSystemInfo(); - - $.when(promise1, promise2).done(function (response1, response2) { - - loadPage(page, response1[0], response2[0]); - - }); - - }); - - window.AdvancedServerSettingsPage = { - - onSubmit: function () { - Dashboard.showLoadingMsg(); - - var form = this; - - ApiClient.getServerConfiguration().done(function (config) { - - config.LegacyWebSocketPortNumber = $('#txtWebSocketPortNumber', form).val(); - config.HttpServerPortNumber = $('#txtPortNumber', form).val(); - config.EnableUPnP = $('#chkEnableUpnp', form).checked(); - - config.WanDdns = $('#txtDdns', form).val(); - - ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); - }); - - // Disable default form submission - return false; - } - - }; - -})(jQuery, document, window); diff --git a/dashboard-ui/scripts/channelitems.js b/dashboard-ui/scripts/channelitems.js index d86654430f..d528702d98 100644 --- a/dashboard-ui/scripts/channelitems.js +++ b/dashboard-ui/scripts/channelitems.js @@ -46,10 +46,10 @@ if (features.CanFilter) { - $('.btnFilter', page).show(); + $('.filterControls', page).show(); } else { - $('.btnFilter', page).hide(); + $('.filterControls', page).hide(); } if (features.SupportsSortOrderToggle) { @@ -128,8 +128,15 @@ var html = ''; - var pagingHtml = LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false, getPageSizes()); - + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false, + updatePageSizeSetting: false + }); + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -158,12 +165,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryId(), query); @@ -198,6 +199,7 @@ }).checkboxradio('refresh'); $('.alphabetPicker', page).alphaValue(query.NameStartsWith); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#channelItemsPage", function () { @@ -247,6 +249,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#channelItemsPage", function () { diff --git a/dashboard-ui/scripts/dashboardgeneral.js b/dashboard-ui/scripts/dashboardgeneral.js index 4c470dd0e8..35bc112a6d 100644 --- a/dashboard-ui/scripts/dashboardgeneral.js +++ b/dashboard-ui/scripts/dashboardgeneral.js @@ -12,6 +12,13 @@ })).val(config.UICulture).selectmenu('refresh'); + $('#txtPortNumber', page).val(config.HttpServerPortNumber); + + $('#txtDdns', page).val(config.WanDdns || ''); + + $('#chkEnableUpnp', page).checked(config.EnableUPnP).checkboxradio('refresh'); + $('#txtCachePath', page).val(config.CachePath || ''); + Dashboard.hideLoadingMsg(); } @@ -35,6 +42,30 @@ $('#txtLoginDisclaimer', page).val(config.LoginDisclaimer || ''); }); + + }).on('pageinit', "#dashboardGeneralPage", function () { + + var page = this; + + $('#btnSelectCachePath', page).on("click.selectDirectory", function () { + + var picker = new DirectoryBrowser(page); + + picker.show({ + + callback: function (path) { + + if (path) { + $('#txtCachePath', page).val(path); + } + picker.close(); + }, + + header: Globalize.translate('HeaderSelectServerCachePath'), + + instruction: Globalize.translate('HeaderSelectServerCachePathHelp') + }); + }); }); window.DashboardGeneralPage = { @@ -49,7 +80,13 @@ config.ServerName = $('#txtServerName', form).val(); config.UICulture = $('#selectLocalizationLanguage', form).val(); - ApiClient.updateServerConfiguration(config).done(function() { + config.HttpServerPortNumber = $('#txtPortNumber', form).val(); + config.EnableUPnP = $('#chkEnableUpnp', form).checked(); + + config.WanDdns = $('#txtDdns', form).val(); + config.CachePath = $('#txtCachePath', form).val(); + + ApiClient.updateServerConfiguration(config).done(function () { ApiClient.getNamedConfiguration(brandingConfigKey).done(function (brandingConfig) { diff --git a/dashboard-ui/scripts/episodes.js b/dashboard-ui/scripts/episodes.js index 6aa7c573f2..a6bbfeba91 100644 --- a/dashboard-ui/scripts/episodes.js +++ b/dashboard-ui/scripts/episodes.js @@ -31,7 +31,16 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false, + addSelectionButton: true + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(); @@ -58,11 +67,9 @@ }); } - $('.itemsContainer', page).removeClass('timelineItemsContainer'); + html += pagingHtml; - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); - - $('#items', page).html(html).trigger('create').createPosterItemMenus(); + $('.itemsContainer', page).html(html).trigger('create').createPosterItemMenus().trigger('itemsrendered'); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; @@ -74,12 +81,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -135,6 +136,7 @@ $('#chkFutureEpisode', page).checked(query.IsUnaired == true).checkboxradio('refresh'); $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#episodesPage", function () { @@ -296,6 +298,12 @@ LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#episodesPage", function () { var page = this; diff --git a/dashboard-ui/scripts/gamegenrepage.js b/dashboard-ui/scripts/gamegenrepage.js index b02d2efc57..b6e0a22d11 100644 --- a/dashboard-ui/scripts/gamegenrepage.js +++ b/dashboard-ui/scripts/gamegenrepage.js @@ -26,7 +26,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -40,7 +48,7 @@ lazy: true }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); @@ -54,12 +62,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -68,6 +70,7 @@ function updateFilterControls(page) { + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#gameGenresPage", function () { @@ -91,6 +94,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#gameGenresPage", function () { query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/scripts/gamespage.js b/dashboard-ui/scripts/gamespage.js index c426c709b2..0fff3c8e55 100644 --- a/dashboard-ui/scripts/gamespage.js +++ b/dashboard-ui/scripts/gamespage.js @@ -30,7 +30,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -54,7 +62,7 @@ }); } - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); @@ -68,12 +76,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -124,6 +126,7 @@ $('#chkThemeVideo', page).checked(query.HasThemeVideo == true).checkboxradio('refresh'); $('.alphabetPicker', page).alphaValue(query.NameStartsWith); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#gamesPage", function () { @@ -226,6 +229,12 @@ LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#gamesPage", function () { var page = this; diff --git a/dashboard-ui/scripts/gamestudiospage.js b/dashboard-ui/scripts/gamestudiospage.js index e4a20d226a..4c168bf197 100644 --- a/dashboard-ui/scripts/gamestudiospage.js +++ b/dashboard-ui/scripts/gamestudiospage.js @@ -27,7 +27,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -42,7 +50,7 @@ }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); @@ -56,12 +64,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -70,6 +72,7 @@ function updateFilterControls(page) { + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#gameStudiosPage", function () { @@ -93,6 +96,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#gameStudiosPage", function () { query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/scripts/itemdetailpage.js b/dashboard-ui/scripts/itemdetailpage.js index 6460a5ff49..5aecc6f663 100644 --- a/dashboard-ui/scripts/itemdetailpage.js +++ b/dashboard-ui/scripts/itemdetailpage.js @@ -80,6 +80,12 @@ $('.btnPlayTrailer', page).addClass('hide'); } + if (SyncManager.isAvailable(item, user)) { + $('.btnSync', page).removeClass('hide'); + } else { + $('.btnSync', page).addClass('hide'); + } + if (!item.LocalTrailerCount && item.RemoteTrailers.length && item.PlayAccess == 'Full') { $('.btnPlayExternalTrailer', page).removeClass('hide').attr('href', item.RemoteTrailers[0].Url); @@ -1482,6 +1488,11 @@ splitVersions(page); }); + $('.btnSync', page).on('click', function () { + + SyncManager.showMenu([currentItem]); + }); + }).on('pageshow', "#itemDetailPage", function () { var page = this; diff --git a/dashboard-ui/scripts/itemlistpage.js b/dashboard-ui/scripts/itemlistpage.js index 242719269c..cc20edb36e 100644 --- a/dashboard-ui/scripts/itemlistpage.js +++ b/dashboard-ui/scripts/itemlistpage.js @@ -26,7 +26,14 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -49,7 +56,7 @@ }); } - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create'); @@ -63,12 +70,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getParameterByName('parentId'), query); Dashboard.hideLoadingMsg(); @@ -140,6 +141,7 @@ $('#selectView', page).val(view).selectmenu('refresh'); $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#itemListPage", function () { @@ -203,6 +205,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pageshow', "#itemListPage", function () { var page = this; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index fa88adb12e..724827df6e 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -9,7 +9,6 @@ var defaultBackground = "#333"; return { - getDefaultPageSize: function () { var saved = store.getItem('pagesize_'); @@ -112,8 +111,7 @@ counts.push(childText); } - } - else if (options.context == "tv") { + } else if (options.context == "tv") { if (item.SeriesCount) { @@ -128,8 +126,7 @@ counts.push(childText); } - } - else if (options.context == "games") { + } else if (options.context == "games") { if (item.GameCount) { @@ -137,8 +134,7 @@ counts.push(childText); } - } - else if (options.context == "music") { + } else if (options.context == "music") { if (item.AlbumCount) { @@ -256,8 +252,7 @@ var artistLinksHtml = LibraryBrowser.getArtistLinksHtml(item.Artists); html += '' + artistLinksHtml + ''; - } - else { + } else { html += ''; } } @@ -492,14 +487,11 @@ if (type == 'Backdrop') { options.tag = item.BackdropImageTags[index]; - } - else if (type == 'Screenshot') { + } else if (type == 'Screenshot') { options.tag = item.ScreenshotImageTags[index]; - } - else if (type == 'Primary') { + } else if (type == 'Primary') { options.tag = item.PrimaryImageTag || item.ImageTags[type]; - } - else { + } else { options.tag = item.ImageTags[type]; } @@ -596,8 +588,16 @@ groupTitle = itemGroupTitle; } + var dataAttributes = LibraryBrowser.getItemDataAttributes(item, options); + + var cssClass = 'ui-li-has-thumb listItem'; + + if (item.UserData) { + cssClass += ' libraryItemUserData' + item.UserData.Key; + } + var href = LibraryBrowser.getHref(item, options.context); - html += '
  • '; + html += '
  • '; var imgUrl; @@ -629,8 +629,7 @@ if (item.Type == 'Episode') { textlines.push(item.SeriesName || 'Unknown Series'); - } - else if (item.Type == 'MusicAlbum') { + } else if (item.Type == 'MusicAlbum') { textlines.push(item.AlbumArtist || 'Unknown Artist'); } @@ -659,28 +658,13 @@ if (item.Type == 'Series' || item.Type == 'Season' || item.Type == 'BoxSet' || item.MediaType == 'Video') { if (item.UserData.UnplayedItemCount) { html += '' + item.UserData.UnplayedItemCount + ''; - } - else if (item.UserData.Played && item.Type != 'TvChannel') { + } else if (item.UserData.Played && item.Type != 'TvChannel') { html += '
    '; } } html += '    '; - var itemCommands = []; - - //if (MediaController.canPlay(item)) { - // itemCommands.push('playmenu'); - //} - - if (item.Type != "Recording" && item.Type != "Program") { - itemCommands.push('edit'); - } - - if (item.LocalTrailerCount) { - itemCommands.push('trailer'); - } - - html += ''; + html += ''; html += ''; html += '
    • '; @@ -695,6 +679,62 @@ return outerHtml; }, + getItemDataAttributes: function (item, options) { + + var atts = []; + + var itemCommands = LibraryBrowser.getItemCommands(item); + + atts.push('data-itemid="' + item.Id + '"'); + atts.push('data-commands="' + itemCommands.join(',') + '"'); + atts.push('data-context="' + (options.context || '') + '"'); + atts.push('data-itemtype="' + item.Type + '"'); + atts.push('data-mediatype="' + (item.MediaType || '') + '"'); + atts.push('data-positionticks="' + (item.UserData.PlaybackPositionTicks || 0) + '"'); + + atts.push('data-playaccess="' + (item.PlayAccess || '') + '"'); + atts.push('data-locationtype="' + (item.LocationType || '') + '"'); + + if (item.IsPlaceHolder) { + atts.push('data-placeholder="true"'); + } + + var html = atts.join(' '); + + if (html) { + html = ' ' + html; + } + + return html; + }, + + getItemCommands: function (item) { + + var itemCommands = []; + + //if (MediaController.canPlay(item)) { + // itemCommands.push('playmenu'); + //} + + if (item.Type != "Recording" && item.Type != "Program") { + itemCommands.push('edit'); + } + + if (item.LocalTrailerCount) { + itemCommands.push('trailer'); + } + + if (item.Type == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "MusicGenre") { + itemCommands.push('instantmix'); + } + + if (item.IsFolder || item.Type == "MusicArtist" || item.Type == "MusicGenre") { + itemCommands.push('shuffle'); + } + + return itemCommands; + }, + getPosterViewHtml: function (options) { var items = options.items; @@ -712,23 +752,18 @@ if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.777777778) < .3) { options.shape = options.shape == 'auto' ? 'backdrop' : 'smallBackdrop'; - } - else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1) < .33) { + } else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1) < .33) { options.coverImage = true; options.shape = 'square'; - } - else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.3333334) < .01) { + } else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.3333334) < .01) { options.coverImage = true; options.shape = 'square'; - } - else if (primaryImageAspectRatio && primaryImageAspectRatio > 1.9) { + } else if (primaryImageAspectRatio && primaryImageAspectRatio > 1.9) { options.shape = 'banner'; options.coverImage = true; - } - else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 0.6666667) < .2) { + } else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 0.6666667) < .2) { options.shape = 'portrait'; - } - else { + } else { options.shape = options.defaultShape || 'portrait'; } } @@ -760,8 +795,7 @@ html += '

    ' + val + '

    '; currentIndexValue = val; } - } - else if (options.timeline) { + } else if (options.timeline) { var year = item.ProductionYear || "Unknown Year"; if (year != currentIndexValue) { @@ -792,8 +826,7 @@ tag: item.ImageTags.Primary }); - } - else if (options.autoThumb && item.ImageTags && item.ImageTags.Thumb) { + } else if (options.autoThumb && item.ImageTags && item.ImageTags.Thumb) { imgUrl = ApiClient.getScaledImageUrl(item.Id, { type: "Thumb", @@ -801,8 +834,7 @@ tag: item.ImageTags.Thumb }); - } - else if (options.preferBackdrop && item.BackdropImageTags && item.BackdropImageTags.length) { + } else if (options.preferBackdrop && item.BackdropImageTags && item.BackdropImageTags.length) { imgUrl = ApiClient.getScaledImageUrl(item.Id, { type: "Backdrop", @@ -810,8 +842,7 @@ tag: item.BackdropImageTags[0] }); - } - else if (options.preferThumb && item.ImageTags && item.ImageTags.Thumb) { + } else if (options.preferThumb && item.ImageTags && item.ImageTags.Thumb) { imgUrl = ApiClient.getScaledImageUrl(item.Id, { type: "Thumb", @@ -819,8 +850,7 @@ tag: item.ImageTags.Thumb }); - } - else if (options.preferBanner && item.ImageTags && item.ImageTags.Banner) { + } else if (options.preferBanner && item.ImageTags && item.ImageTags.Banner) { imgUrl = ApiClient.getScaledImageUrl(item.Id, { type: "Banner", @@ -828,8 +858,7 @@ tag: item.ImageTags.Banner }); - } - else if (options.preferThumb && item.SeriesThumbImageTag && options.inheritThumb !== false) { + } else if (options.preferThumb && item.SeriesThumbImageTag && options.inheritThumb !== false) { imgUrl = ApiClient.getScaledImageUrl(item.SeriesId, { type: "Thumb", @@ -837,16 +866,14 @@ tag: item.SeriesThumbImageTag }); - } - else if (options.preferThumb && item.ParentThumbItemId && options.inheritThumb !== false) { + } else if (options.preferThumb && item.ParentThumbItemId && options.inheritThumb !== false) { imgUrl = ApiClient.getThumbImageUrl(item.ParentThumbItemId, { type: "Thumb", maxWidth: downloadHeight }); - } - else if (options.preferThumb && item.BackdropImageTags && item.BackdropImageTags.length) { + } else if (options.preferThumb && item.BackdropImageTags && item.BackdropImageTags.length) { imgUrl = ApiClient.getScaledImageUrl(item.Id, { type: "Backdrop", @@ -855,8 +882,7 @@ }); forceName = true; - } - else if (item.ImageTags && item.ImageTags.Primary) { + } else if (item.ImageTags && item.ImageTags.Primary) { height = 400; width = primaryImageAspectRatio ? Math.round(height * primaryImageAspectRatio) : null; @@ -868,8 +894,7 @@ tag: item.ImageTags.Primary }); - } - else if (item.AlbumId && item.AlbumPrimaryImageTag) { + } else if (item.AlbumId && item.AlbumPrimaryImageTag) { height = 220; width = primaryImageAspectRatio ? Math.round(height * primaryImageAspectRatio) : null; @@ -881,8 +906,7 @@ tag: item.AlbumPrimaryImageTag }); - } - else if (item.BackdropImageTags && item.BackdropImageTags.length) { + } else if (item.BackdropImageTags && item.BackdropImageTags.length) { imgUrl = ApiClient.getScaledImageUrl(item.Id, { type: "Backdrop", @@ -890,8 +914,7 @@ tag: item.BackdropImageTags[0] }); - } - else if (item.ImageTags && item.ImageTags.Thumb) { + } else if (item.ImageTags && item.ImageTags.Thumb) { imgUrl = ApiClient.getScaledImageUrl(item.Id, { type: "Thumb", @@ -899,8 +922,7 @@ tag: item.ImageTags.Thumb }); - } - else if (item.SeriesThumbImageTag) { + } else if (item.SeriesThumbImageTag) { imgUrl = ApiClient.getScaledImageUrl(item.SeriesId, { type: "Thumb", @@ -908,46 +930,40 @@ tag: item.SeriesThumbImageTag }); - } - else if (item.ParentThumbItemId) { + } else if (item.ParentThumbItemId) { imgUrl = ApiClient.getThumbImageUrl(item, { type: "Thumb", maxWidth: downloadHeight }); - } - else if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist") { + } else if (item.MediaType == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist") { if (item.Name && options.showTitle) { imgUrl = 'css/images/items/list/audio.png'; } background = defaultBackground; - } - else if (item.Type == "Recording" || item.Type == "Program" || item.Type == "TvChannel") { + } else if (item.Type == "Recording" || item.Type == "Program" || item.Type == "TvChannel") { if (item.Name && options.showTitle) { imgUrl = 'css/images/items/list/collection.png'; } background = defaultBackground; - } - else if (item.MediaType == "Video" || item.Type == "Season" || item.Type == "Series") { + } else if (item.MediaType == "Video" || item.Type == "Season" || item.Type == "Series") { if (item.Name && options.showTitle) { imgUrl = 'css/images/items/list/video.png'; } background = defaultBackground; - } - else if (item.Type == "Person") { + } else if (item.Type == "Person") { if (item.Name && options.showTitle) { imgUrl = 'css/images/items/list/person.png'; } background = defaultBackground; - } - else { + } else { if (item.Name && options.showTitle) { imgUrl = 'css/images/items/list/collection.png'; } @@ -971,7 +987,7 @@ var href = options.linkItem === false ? '#' : LibraryBrowser.getHref(item, options.context); if (item.UserData) { - cssClass += ' posterItemUserData' + item.UserData.Key; + cssClass += ' libraryItemUserData' + item.UserData.Key; } if (options.showChildCountIndicator && item.ChildCount) { @@ -982,25 +998,13 @@ } } - var itemCommands = []; - - //if (MediaController.canPlay(item)) { - // itemCommands.push('playmenu'); - //} - - if (item.Type != "Recording" && item.Type != "Program") { - itemCommands.push('edit'); - } - - if (item.LocalTrailerCount) { - itemCommands.push('trailer'); - } - if (options.showChildCountIndicator) { cssClass += ' groupingPosterItem'; } - html += ''; + var dataAttributes = LibraryBrowser.getItemDataAttributes(item, options); + + html += ''; var style = ""; @@ -1034,11 +1038,9 @@ if (options.showLocationTypeIndicator !== false) { html += LibraryBrowser.getOfflineIndicatorHtml(item); } - } - else if (options.showUnplayedIndicator !== false) { + } else if (options.showUnplayedIndicator !== false) { html += LibraryBrowser.getPlayedIndicatorHtml(item); - } - else if (options.showChildCountIndicator) { + } else if (options.showChildCountIndicator) { html += LibraryBrowser.getGroupCountIndicator(item); } @@ -1268,8 +1270,7 @@ name = "Special - " + name; - } - else if (item.Type == "Episode" && item.IndexNumber != null && item.ParentIndexNumber != null) { + } else if (item.Type == "Episode" && item.IndexNumber != null && item.ParentIndexNumber != null) { var displayIndexNumber = item.IndexNumber; @@ -1440,14 +1441,11 @@ if (item.AlbumArtist && item.Type == "Audio") { html.push('' + item.AlbumArtist + ''); - } - else if (item.AlbumArtist && item.Type == "MusicAlbum") { + } else if (item.AlbumArtist && item.Type == "MusicAlbum") { html.push('' + item.AlbumArtist + ''); - } - else if (item.Artists && item.Artists.length && item.Type == "MusicVideo") { + } else if (item.Artists && item.Artists.length && item.Type == "MusicVideo") { html.push('' + item.Artists[0] + ''); - } - else if (item.SeriesName && item.Type == "Episode") { + } else if (item.SeriesName && item.Type == "Episode") { html.push('' + item.SeriesName + ''); } @@ -1455,23 +1453,18 @@ if (item.SeriesName && item.Type == "Season") { html.push('' + item.SeriesName + ''); - } - else if (item.ParentIndexNumber != null && item.Type == "Episode") { + } else if (item.ParentIndexNumber != null && item.Type == "Episode") { html.push('Season ' + item.ParentIndexNumber + ''); - } - else if (item.Album && item.Type == "Audio" && (item.AlbumId || item.ParentId)) { + } else if (item.Album && item.Type == "Audio" && (item.AlbumId || item.ParentId)) { html.push('' + item.Album + ''); - } - else if (item.Album && item.Type == "MusicVideo" && item.AlbumId) { + } else if (item.Album && item.Type == "MusicVideo" && item.AlbumId) { html.push('' + item.Album + ''); - } - else if (item.AlbumArtist && item.Type == "MusicAlbum") { + } else if (item.AlbumArtist && item.Type == "MusicAlbum") { - } - else if (item.Album) { + } else if (item.Album) { html.push(item.Album); } @@ -1512,6 +1505,91 @@ } }, + getDefaultPageSizeSelections: function () { + + return [20, 50, 100, 200, 300, 400, 500]; + }, + + getQueryPagingHtml: function (options) { + + var startIndex = options.startIndex; + var limit = options.limit; + var totalRecordCount = options.totalRecordCount; + + if (limit && options.updatePageSizeSetting !== false) { + try { + store.setItem('pagesize_', limit); + } catch (e) { + + } + } + + var html = ''; + + var recordsEnd = Math.min(startIndex + limit, totalRecordCount); + + // 20 is the minimum page size + var showControls = totalRecordCount > 20 || limit < totalRecordCount; + + html += '
    '; + + html += ''; + + var startAtDisplay = totalRecordCount ? startIndex + 1 : 0; + html += startAtDisplay + '-' + recordsEnd + ' of ' + totalRecordCount; + + html += ''; + + if (showControls || options.viewButton || options.addSelectionButton || options.additionalButtonsHtml) { + + html += '
    '; + + if (showControls) { + + html += ''; + + html += ''; + } + + html += (options.additionalButtonsHtml || ''); + + if (options.addSelectionButton) { + html += ''; + } + + if (options.viewButton) { + + html += ''; + } + + html += '
    '; + + if (showControls && options.showLimit !== false) { + var id = "selectPageSize"; + + var pageSizes = options.pageSizes || LibraryBrowser.getDefaultPageSizeSelections(); + + var optionsHtml = pageSizes.map(function (val) { + + if (limit == val) { + + return ''; + + } else { + return ''; + } + }).join(''); + + // Add styles to defeat jquery mobile + html += '
    '; + } + } + + html += '
    '; + + return html; + }, + getPagingHtml: function (query, totalRecordCount, updatePageSizeSetting, pageSizes, showLimit) { if (query.Limit && updatePageSizeSetting !== false) { diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index 1b455fbbc7..fd2f363bed 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -222,18 +222,24 @@ $('.tapHoldMenu').popup("close").remove(); + var displayContextItem = posterItem; + + if ($(posterItem).hasClass('listviewMenuButton')) { + posterItem = $(posterItem).parents('.listItem')[0]; + } + var itemId = posterItem.getAttribute('data-itemid'); var commands = posterItem.getAttribute('data-commands').split(','); + var itemType = posterItem.getAttribute('data-itemtype'); + var mediaType = posterItem.getAttribute('data-mediatype'); + var playbackPositionTicks = parseInt(posterItem.getAttribute('data-positionticks') || '0'); + var playAccess = posterItem.getAttribute('data-playaccess'); + var locationType = posterItem.getAttribute('data-locationtype'); + var isPlaceHolder = posterItem.getAttribute('data-placeholder') == 'true'; $(posterItem).addClass('hasContextMenu'); - var promise1 = ApiClient.getItem(Dashboard.getCurrentUserId(), itemId); - var promise2 = Dashboard.getCurrentUser(); - - $.when(promise1, promise2).done(function (response1, response2) { - - var item = response1[0]; - var user = response2[0]; + Dashboard.getCurrentUser().done(function (user) { var html = '
    '; @@ -249,27 +255,27 @@ html += '
  • ' + Globalize.translate('ButtonEdit') + '
    • '; } - if (MediaController.canPlay(item)) { + if (MediaController.canPlayByAttributes(itemType, mediaType, playAccess, locationType, isPlaceHolder)) { html += '
  • ' + Globalize.translate('ButtonPlay') + '
    • '; } - if (item.UserData.PlaybackPositionTicks && item.MediaType != "Audio" && !item.IsFolder) { - html += '
  • ' + Globalize.translate('ButtonResume') + '
    • '; + if (playbackPositionTicks && mediaType != "Audio") { + html += '
  • ' + Globalize.translate('ButtonResume') + '
    • '; } if (commands.indexOf('trailer') != -1) { html += '
  • ' + Globalize.translate('ButtonPlayTrailer') + '
    • '; } - if (MediaController.canQueueMediaType(item.MediaType, item.Type)) { + if (MediaController.canQueueMediaType(mediaType, itemType)) { html += '
  • ' + Globalize.translate('ButtonQueue') + '
    • '; } - if (item.Type == "Audio" || item.Type == "MusicAlbum" || item.Type == "MusicArtist" || item.Type == "MusicGenre") { + if (commands.indexOf('instantmix') != -1) { html += '
  • ' + Globalize.translate('ButtonInstantMix') + '
    • '; } - if (item.IsFolder || item.Type == "MusicArtist" || item.Type == "MusicGenre") { + if (commands.indexOf('shuffle') != -1) { html += '
  • ' + Globalize.translate('ButtonShuffle') + '
    • '; } @@ -279,11 +285,10 @@ $($.mobile.activePage).append(html); - var elem = $('.tapHoldMenu').popup({ positionTo: posterItem }).trigger('create').popup("open").on("popupafterclose", function () { + var elem = $('.tapHoldMenu').popup({ positionTo: displayContextItem }).trigger('create').popup("open").on("popupafterclose", function () { $(this).off("popupafterclose").remove(); $(posterItem).removeClass('hasContextMenu'); - }); $('.btnPlay', elem).on('click', onPlayButtonClick); @@ -309,6 +314,7 @@ var posterItem = this; var itemId = posterItem.getAttribute('data-itemid'); + var context = posterItem.getAttribute('data-context'); $(posterItem).addClass('hasContextMenu'); @@ -340,7 +346,7 @@ if (!target.is('a,button')) { var first = latestItems[0]; - Dashboard.navigate(LibraryBrowser.getHref(first)); + Dashboard.navigate(LibraryBrowser.getHref(first, context)); return; } } @@ -351,7 +357,7 @@ html += '
    '; html += '
      '; - var href = posterItem.href || LibraryBrowser.getHref(item); + var href = posterItem.href || LibraryBrowser.getHref(item, context); var header = Globalize.translate('HeaderLatestFromChannel').replace('{0}', '' + item.Name + ''); html += '
    • ' + header + '
      • '; @@ -364,7 +370,7 @@ var itemHtml = ''; - href = LibraryBrowser.getHref(latestItem); + href = LibraryBrowser.getHref(latestItem, context); itemHtml += '
    • '; var imgUrl; @@ -609,10 +615,6 @@ var page = this; - $('.btnToggleSelections', page).on('click', function () { - toggleSelections(page); - }); - $('.btnMergeVersions', page).on('click', function () { combineVersions(page); }); @@ -621,11 +623,38 @@ addToCollection(page); }); + $('.viewTabButton', page).on('click', function () { + + $('.viewTabButton', page).removeClass('ui-btn-active'); + $(this).addClass('ui-btn-active'); + + $('.viewTab', page).hide(); + $('.' + this.getAttribute('data-tab'), page).show(); + }); + + var viewPanel = $('.viewPanel', page).panel('option', 'classes.modalOpen', 'viewPanelModelOpen ui-panel-dismiss-open'); + + $('#selectPageSize', viewPanel).html(LibraryBrowser.getDefaultPageSizeSelections().map(function (i) { + + return ''; + + }).join('')).selectmenu('refresh'); + + $('.itemsContainer', page).on('itemsrendered', function() { + + $('.btnToggleSelections', page).off('click.toggleselections').on('click.toggleselections', function () { + toggleSelections(page); + }); + + }); + }).on('pagebeforeshow', ".libraryPage", function () { var page = this; hideSelections(page); + + $('.viewTabButton:first', page).trigger('click'); }); function renderUserDataChanges(posterItem, userData) { @@ -659,8 +688,13 @@ function onUserDataChanged(userData) { - $('.posterItemUserData' + userData.Key).each(function () { - renderUserDataChanges(this, userData); + $('.libraryItemUserData' + userData.Key).each(function () { + + this.setAttribute('data-positionticks', (userData.PlaybackPositionTicks || 0)); + + if ($(this).hasClass('posterItem')) { + renderUserDataChanges(this, userData); + } }); } diff --git a/dashboard-ui/scripts/librarysettings.js b/dashboard-ui/scripts/librarysettings.js index 46315a35ff..e1b2275c1c 100644 --- a/dashboard-ui/scripts/librarysettings.js +++ b/dashboard-ui/scripts/librarysettings.js @@ -6,6 +6,8 @@ $('#chkEnableRealtimeMonitor', page).checked(config.EnableRealtimeMonitor).checkboxradio("refresh"); + $('#txtItemsByNamePath', page).val(config.ItemsByNamePath || ''); + Dashboard.hideLoadingMsg(); } @@ -21,6 +23,29 @@ }); + }).on('pageinit', "#librarySettingsPage", function () { + + var page = this; + + $('#btnSelectIBNPath', page).on("click.selectDirectory", function () { + + var picker = new DirectoryBrowser(page); + + picker.show({ + + callback: function (path) { + + if (path) { + $('#txtItemsByNamePath', page).val(path); + } + picker.close(); + }, + + header: Globalize.translate('HeaderSelectImagesByNamePath'), + + instruction: Globalize.translate('HeaderSelectImagesByNamePathHelp') + }); + }); }); function librarySettingsPage() { @@ -34,6 +59,8 @@ ApiClient.getServerConfiguration().done(function (config) { + config.ItemsByNamePath = $('#txtItemsByNamePath', form).val(); + config.SeasonZeroDisplayName = $('#txtSeasonZeroName', form).val(); config.EnableRealtimeMonitor = $('#chkEnableRealtimeMonitor', form).checked(); diff --git a/dashboard-ui/scripts/livetvchannels.js b/dashboard-ui/scripts/livetvchannels.js index b9fe6983c5..8b8a5c7e56 100644 --- a/dashboard-ui/scripts/livetvchannels.js +++ b/dashboard-ui/scripts/livetvchannels.js @@ -25,13 +25,21 @@ function renderChannels(page, result) { - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(this); var html = getChannelsHtml(result.Items); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); @@ -45,12 +53,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues('movies', query); } @@ -71,6 +73,7 @@ $('#chkFavorite', page).checked(query.IsFavorite == true).checkboxradio('refresh'); $('#chkLikes', page).checked(query.IsLiked == true).checkboxradio('refresh'); $('#chkDislikes', page).checked(query.IsDisliked == true).checkboxradio('refresh'); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#liveTvChannelsPage", function () { @@ -102,6 +105,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pageshow', "#liveTvChannelsPage", function () { // Can't use pagebeforeshow here or the loading popup won't center correctly diff --git a/dashboard-ui/scripts/mediacontroller.js b/dashboard-ui/scripts/mediacontroller.js index 0cdbdd3c88..ea91485b9a 100644 --- a/dashboard-ui/scripts/mediacontroller.js +++ b/dashboard-ui/scripts/mediacontroller.js @@ -188,19 +188,24 @@ self.canPlay = function (item) { - if (item.PlayAccess != 'Full') { + return self.canPlayByAttributes(item.Type, item.MediaType, item.PlayAccess, item.LocationType, item.IsPlaceHolder); + }; + + self.canPlayByAttributes = function (itemType, mediaType, playAccess, locationType, isPlaceHolder) { + + if (playAccess != 'Full') { return false; } - if (item.LocationType == "Virtual" || item.IsPlaceHolder) { + if (locationType == "Virtual" || isPlaceHolder) { return false; } - if (item.IsFolder || item.Type == "MusicGenre") { + if (itemType == "MusicGenre" || itemType == "Season" || itemType == "Series" || itemType == "BoxSet" || itemType == "MusicAlbum" || itemType == "MusicArtist") { return true; } - return self.getPlayerInfo().playableMediaTypes.indexOf(item.MediaType) != -1; + return self.getPlayerInfo().playableMediaTypes.indexOf(mediaType) != -1; }; self.canQueueMediaType = function (mediaType, itemType) { @@ -418,7 +423,7 @@ var html = ''; html += ''; - html += '

      Select Player:

      '; + html += '

      ' + Globalize.translate('HeaderSelectPlayer') + '

      '; html += '
      '; var checkedHtml; @@ -438,7 +443,7 @@ html += ''; @@ -460,12 +465,12 @@ var promise = MediaController.getTargets(); - var html = '
      '; + var html = ''; diff --git a/dashboard-ui/scripts/mediaplayer-video.js b/dashboard-ui/scripts/mediaplayer-video.js index 43e994ea2e..46c639b338 100644 --- a/dashboard-ui/scripts/mediaplayer-video.js +++ b/dashboard-ui/scripts/mediaplayer-video.js @@ -146,6 +146,7 @@ self.setSubtitleStreamIndex = function (index) { if (!self.supportsTextTracks()) { + self.changeStream(self.getCurrentTicks(), { SubtitleStreamIndex: index }); self.currentSubtitleStreamIndex = index; return; @@ -193,6 +194,7 @@ } self.setCurrentTrackElement(selectedTrackElementIndex); + self.currentSubtitleStreamIndex = index; }; @@ -202,17 +204,28 @@ return s.Type == 'Subtitle' && s.IsTextSubtitleStream; }); + var newStream = textStreams.filter(function (s) { + return s.Index == index; + })[0]; + + var trackIndex = newStream ? textStreams.indexOf(newStream) : -1; + + console.log('Setting new text track index to: ' + trackIndex); + var allTracks = self.currentMediaElement.textTracks; // get list of tracks for (var i = 0; i < allTracks.length; i++) { - var trackIndex = textStreams[i].Index; + var mode; - if (trackIndex == index) { - allTracks[i].mode = "showing"; // show this track + if (trackIndex == i) { + mode = "showing"; // show this track } else { - allTracks[i].mode = "disabled"; // hide all other tracks + mode = "disabled"; // hide all other tracks } + + console.log('Setting track ' + i + ' mode to: ' + mode); + allTracks[i].mode = mode; } }; @@ -382,13 +395,14 @@ $('.videoSubtitlePopup').on('click', '.mediaPopupOption', function () { + $('.videoSubtitlePopup').popup('close'); + if (!$(this).hasClass('selectedMediaPopupOption')) { + var index = parseInt(this.getAttribute('data-index')); self.setSubtitleStreamIndex(index); } - - $('.videoSubtitlePopup').popup('close'); }); $('.videoQualityPopup').on('click', '.mediaPopupOption', function () { diff --git a/dashboard-ui/scripts/metadataadvanced.js b/dashboard-ui/scripts/metadataadvanced.js index 2fe2f6440d..def67cb91a 100644 --- a/dashboard-ui/scripts/metadataadvanced.js +++ b/dashboard-ui/scripts/metadataadvanced.js @@ -13,11 +13,37 @@ }); }, + onPageInit: function () { + + var page = this; + + $('#btnSelectMetadataPath', page).on("click.selectDirectory", function () { + + var picker = new DirectoryBrowser(page); + + picker.show({ + + callback: function (path) { + + if (path) { + $('#txtMetadataPath', page).val(path); + } + picker.close(); + }, + + header: Globalize.translate('HeaderSelectMetadataPath'), + + instruction: Globalize.translate('HeaderSelectMetadataPathHelp') + }); + }); + }, + load: function (page, config) { $('#chkEnableTmdbPersonUpdates', page).checked(config.EnableTmdbUpdates).checkboxradio("refresh"); $('#chkEnableTvdbUpdates', page).checked(config.EnableTvDbUpdates).checkboxradio("refresh"); $('#chkEnableFanartUpdates', page).checked(config.EnableFanArtUpdates).checkboxradio("refresh"); + $('#txtMetadataPath', page).val(config.MetadataPath || ''); Dashboard.hideLoadingMsg(); }, @@ -32,6 +58,7 @@ config.EnableTvDbUpdates = $('#chkEnableTvdbUpdates', form).checked(); config.EnableTmdbUpdates = $('#chkEnableTmdbPersonUpdates', form).checked(); config.EnableFanArtUpdates = $('#chkEnableFanartUpdates', form).checked(); + config.MetadataPath = $('#txtMetadataPath', form).val(); ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); }); @@ -41,4 +68,4 @@ } }; -$(document).on('pageshow', "#advancedMetadataConfigurationPage", AdvancedMetadataConfigurationPage.onPageShow); \ No newline at end of file +$(document).on('pageinit', "#advancedMetadataConfigurationPage", AdvancedMetadataConfigurationPage.onPageInit).on('pageshow', "#advancedMetadataConfigurationPage", AdvancedMetadataConfigurationPage.onPageShow); \ No newline at end of file diff --git a/dashboard-ui/scripts/moviecollections.js b/dashboard-ui/scripts/moviecollections.js index a9f4336b3d..4fbc5fcf50 100644 --- a/dashboard-ui/scripts/moviecollections.js +++ b/dashboard-ui/scripts/moviecollections.js @@ -22,14 +22,33 @@ Dashboard.showLoadingMsg(); - ApiClient.getItems(Dashboard.getCurrentUserId(), query).done(function (result) { + var promise1 = ApiClient.getItems(Dashboard.getCurrentUserId(), query); + var promise2 = Dashboard.getCurrentUser(); + + $.when(promise1, promise2).done(function (response1, response2) { + + var result = response1[0]; + var user = response2[0]; // Scroll back up so they can see the results from the beginning $(document).scrollTop(0); var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var addiontalButtonsHtml = user.Configuration.IsAdministrator ? + ('') : + ''; + + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false, + additionalButtonsHtml: addiontalButtonsHtml + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -48,21 +67,21 @@ items: result.Items, shape: "portrait", context: 'movies', - showTitle: true, + showTitle: false, centerText: true, lazy: true }); } - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('.noItemsMessage', page).hide(); - + } else { $('.noItemsMessage', page).show(); } - $('#items', page).html(html).trigger('create').createPosterItemMenus(); + $('.itemsContainer', page).html(html).trigger('create').createPosterItemMenus().trigger('itemsrendered'); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; @@ -74,12 +93,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -117,6 +130,8 @@ $('#chkThemeVideo', page).checked(query.HasThemeVideo == true).checkboxradio('refresh'); $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater); + + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#boxsetsPage", function () { @@ -197,10 +212,16 @@ LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#boxsetsPage", function () { var page = this; - + var context = getParameterByName('context'); if (context == 'movies') { @@ -291,9 +312,13 @@ var page = this; - $('.btnNewCollection', page).on('click', function () { + $('.itemsContainer', page).on('itemsrendered', function () { + + $('.btnNewCollection', page).off('click.newcollectionpanel').on('click.newcollectionpanel', function () { + + showNewCollectionPanel(page, []); + }); - showNewCollectionPanel(page, []); }); $('#selectCollectionToAddTo', page).on('change', function () { @@ -306,20 +331,6 @@ $('#txtNewCollectionName', page).attr('required', 'required'); } }); - - }).on('pagebeforeshow', ".collectionEditorPage", function () { - - var page = this; - - Dashboard.getCurrentUser().done(function (user) { - - if (user.Configuration.IsAdministrator) { - $('.btnNewCollection', page).removeClass('hide'); - } else { - $('.btnNewCollection', page).addClass('hide'); - } - - }); }); function createCollection(page) { diff --git a/dashboard-ui/scripts/moviegenres.js b/dashboard-ui/scripts/moviegenres.js index 98310e02c5..2ee9a04068 100644 --- a/dashboard-ui/scripts/moviegenres.js +++ b/dashboard-ui/scripts/moviegenres.js @@ -27,7 +27,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -40,7 +48,7 @@ centerText: true }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create'); @@ -54,12 +62,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -68,6 +70,7 @@ function updateFilterControls(page) { + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#movieGenresPage", function () { @@ -91,6 +94,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#movieGenresPage", function () { query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/scripts/moviepeople.js b/dashboard-ui/scripts/moviepeople.js index 0d9f082724..04ad70655c 100644 --- a/dashboard-ui/scripts/moviepeople.js +++ b/dashboard-ui/scripts/moviepeople.js @@ -29,7 +29,16 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false, [], false)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false, + updatePageSizeSetting: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -43,7 +52,7 @@ lazy: true }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false, [], false); + html += pagingHtml; $('#items', page).html(html).trigger('create'); diff --git a/dashboard-ui/scripts/movies.js b/dashboard-ui/scripts/movies.js index 5be7e7ab4d..2660072b63 100644 --- a/dashboard-ui/scripts/movies.js +++ b/dashboard-ui/scripts/movies.js @@ -29,7 +29,16 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false, + addSelectionButton: true + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -69,7 +78,7 @@ items: result.Items, shape: "portrait", context: 'movies', - showTitle: true, + showTitle: false, centerText: true, selectionPanel: true, lazy: true @@ -90,9 +99,9 @@ $('.itemsContainer', page).addClass('timelineItemsContainer'); } - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; - $('#items', page).html(html).trigger('create').createPosterItemMenus(); + $('.itemsContainer', page).html(html).trigger('create').createPosterItemMenus().trigger('itemsrendered'); $('.btnNextPage', page).on('click', function () { query.StartIndex += query.Limit; @@ -104,12 +113,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -163,10 +166,10 @@ $('#chkMissingImdbId', page).checked(query.HasImdbId == false).checkboxradio('refresh'); $('#chkMissingTmdbId', page).checked(query.HasTmdbId == false).checkboxradio('refresh'); - $('#chkMissingOverview', page).checked(query.HasOverview == false).checkboxradio('refresh'); $('#chkYearMismatch', page).checked(query.IsYearMismatched == true).checkboxradio('refresh'); $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#moviesPage", function () { @@ -351,14 +354,6 @@ reloadItems(page); }); - $('#chkMissingOverview', this).on('change', function () { - - query.StartIndex = 0; - query.HasOverview = this.checked ? false : null; - - reloadItems(page); - }); - $('#chkYearMismatch', this).on('change', function () { query.StartIndex = 0; @@ -373,6 +368,12 @@ }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#moviesPage", function () { query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/scripts/moviestudios.js b/dashboard-ui/scripts/moviestudios.js index 414f4b794a..24fcd320d7 100644 --- a/dashboard-ui/scripts/moviestudios.js +++ b/dashboard-ui/scripts/moviestudios.js @@ -27,7 +27,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -40,7 +48,7 @@ centerText: true }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create'); @@ -54,12 +62,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -67,6 +69,7 @@ } function updateFilterControls(page) { + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#movieStudiosPage", function () { @@ -90,6 +93,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#movieStudiosPage", function () { query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/scripts/movietrailers.js b/dashboard-ui/scripts/movietrailers.js index c6ba2481b5..f977b0fd05 100644 --- a/dashboard-ui/scripts/movietrailers.js +++ b/dashboard-ui/scripts/movietrailers.js @@ -22,7 +22,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -30,11 +38,11 @@ items: result.Items, shape: "portrait", context: 'movies', - showTitle: true, + showTitle: false, centerText: true }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); @@ -48,12 +56,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues('movietrailers', query); Dashboard.hideLoadingMsg(); @@ -85,6 +87,7 @@ }).checkboxradio('refresh'); $('.alphabetPicker', page).alphaValue(query.NameStartsWith); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#movieTrailersPage", function () { @@ -134,6 +137,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#movieTrailersPage", function () { var limit = LibraryBrowser.getDefaultPageSize(); diff --git a/dashboard-ui/scripts/musicalbumartists.js b/dashboard-ui/scripts/musicalbumartists.js index 438af24f32..87478e93cc 100644 --- a/dashboard-ui/scripts/musicalbumartists.js +++ b/dashboard-ui/scripts/musicalbumartists.js @@ -28,7 +28,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -52,7 +60,7 @@ }); } - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); @@ -66,12 +74,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -92,6 +94,7 @@ $('#selectView', page).val(view).selectmenu('refresh'); $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#musicAlbumArtistsPage", function () { @@ -138,6 +141,12 @@ LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#musicAlbumArtistsPage", function () { var page = this; diff --git a/dashboard-ui/scripts/musicalbums.js b/dashboard-ui/scripts/musicalbums.js index c90e3d58f2..22ec2aa949 100644 --- a/dashboard-ui/scripts/musicalbums.js +++ b/dashboard-ui/scripts/musicalbums.js @@ -29,7 +29,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -66,7 +74,7 @@ $('.itemsContainer', page).addClass('timelineItemsContainer'); } - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); @@ -80,12 +88,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -110,6 +112,7 @@ }).checkboxradio('refresh'); $('.alphabetPicker', page).alphaValue(query.NameStartsWith); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#musicAlbumsPage", function () { @@ -196,6 +199,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#musicAlbumsPage", function () { query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/scripts/musicartists.js b/dashboard-ui/scripts/musicartists.js index ab8e846680..6daaccd5e5 100644 --- a/dashboard-ui/scripts/musicartists.js +++ b/dashboard-ui/scripts/musicartists.js @@ -28,7 +28,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -52,7 +60,7 @@ }); } - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); @@ -66,12 +74,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -92,6 +94,7 @@ $('#selectView', page).val(view).selectmenu('refresh'); $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#musicArtistsPage", function () { @@ -138,6 +141,12 @@ LibraryBrowser.saveViewSetting(getSavedQueryKey(), view); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#musicArtistsPage", function () { var page = this; diff --git a/dashboard-ui/scripts/musicgenres.js b/dashboard-ui/scripts/musicgenres.js index e2adb1c476..98eb8bbc7f 100644 --- a/dashboard-ui/scripts/musicgenres.js +++ b/dashboard-ui/scripts/musicgenres.js @@ -27,7 +27,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -41,7 +49,7 @@ lazy: true }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); @@ -55,12 +63,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -69,6 +71,7 @@ function updateFilterControls(page) { + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#musicGenresPage", function () { @@ -92,6 +95,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#musicGenresPage", function () { query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/scripts/musicvideos.js b/dashboard-ui/scripts/musicvideos.js index b9a64f3738..46faf41ee3 100644 --- a/dashboard-ui/scripts/musicvideos.js +++ b/dashboard-ui/scripts/musicvideos.js @@ -27,7 +27,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -39,7 +47,7 @@ centerText: true }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create'); @@ -53,12 +61,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -106,6 +108,7 @@ $('#chkThemeVideo', page).checked(query.HasThemeVideo == true).checkboxradio('refresh'); $('.alphabetPicker', page).alphaValue(query.NameStartsWithOrGreater); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#musicVideosPage", function () { @@ -213,6 +216,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#musicVideosPage", function () { query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 43cd584319..99feacdc95 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -176,7 +176,7 @@ var Dashboard = { Dashboard.lastSystemInfo = info; - Dashboard.ensureWebSocket(info); + Dashboard.ensureWebSocket(); if (!Dashboard.initialServerVersion) { Dashboard.initialServerVersion = info.Version; @@ -682,10 +682,6 @@ var Dashboard = { name: Globalize.translate('TabServer'), href: "dashboard.html", selected: page.hasClass("dashboardHomePage") - }, { - name: Globalize.translate('TabUsers'), - href: "userprofiles.html", - selected: page.hasClass("userProfilesConfigurationPage") || (pageElem.id == "mediaLibraryPage" && getParameterByName('userId')) }, { name: Globalize.translate('TabLibrary'), divider: true, @@ -728,7 +724,7 @@ var Dashboard = { }, - ensureWebSocket: function (systemInfo) { + ensureWebSocket: function () { if (!("WebSocket" in window)) { // Not supported by the browser @@ -739,20 +735,12 @@ var Dashboard = { return; } - systemInfo = systemInfo || Dashboard.lastSystemInfo; - var location = window.location; var webSocketUrl = "ws://" + location.hostname; - if (systemInfo.HttpServerPortNumber == systemInfo.WebSocketPortNumber) { - - if (location.port) { - webSocketUrl += ':' + location.port; - } - - } else { - webSocketUrl += ':' + systemInfo.WebSocketPortNumber; + if (location.port) { + webSocketUrl += ':' + location.port; } ApiClient.openWebSocket(webSocketUrl); diff --git a/dashboard-ui/scripts/songs.js b/dashboard-ui/scripts/songs.js index 6895f585e4..bd5a43d5fb 100644 --- a/dashboard-ui/scripts/songs.js +++ b/dashboard-ui/scripts/songs.js @@ -33,6 +33,7 @@ this.checked = (query.SortOrder || '').toLowerCase() == this.getAttribute('data-sortorder').toLowerCase(); }).checkboxradio('refresh'); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } function reloadItems(page) { @@ -46,7 +47,14 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -59,7 +67,7 @@ sortOrder: query.SortOrder }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false); + html += pagingHtml; $('#items', page).html(html).trigger('create'); @@ -73,12 +81,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - $('.lnkColumnSort', page).on('click', function () { var order = this.getAttribute('data-sortfield'); @@ -146,6 +148,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#songsPage", function () { query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js index e76813c629..d39f73c176 100644 --- a/dashboard-ui/scripts/sync.js +++ b/dashboard-ui/scripts/sync.js @@ -2,13 +2,19 @@ function showSyncMenu(items) { + Dashboard.alert('Coming soon.'); + } + function isAvailable(item, user) { + return true; } window.SyncManager = { - showMenu: showSyncMenu + showMenu: showSyncMenu, + + isAvailable: isAvailable }; diff --git a/dashboard-ui/scripts/tvgenres.js b/dashboard-ui/scripts/tvgenres.js index be5eaf8dc5..5d423ac1c5 100644 --- a/dashboard-ui/scripts/tvgenres.js +++ b/dashboard-ui/scripts/tvgenres.js @@ -27,7 +27,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -43,7 +51,7 @@ }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); @@ -79,6 +87,8 @@ this.checked = filters.indexOf(',' + filterName) != -1; }).checkboxradio('refresh'); + + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#tvGenresPage", function () { @@ -102,6 +112,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#tvGenresPage", function () { query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/scripts/tvpeople.js b/dashboard-ui/scripts/tvpeople.js index 2feb65eaa7..e020e062ff 100644 --- a/dashboard-ui/scripts/tvpeople.js +++ b/dashboard-ui/scripts/tvpeople.js @@ -29,7 +29,16 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false, [], false)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false, + updatePageSizeSetting: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -43,7 +52,7 @@ lazy: true }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, false, [], false); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); diff --git a/dashboard-ui/scripts/tvshows.js b/dashboard-ui/scripts/tvshows.js index 219fc213c5..91805d2ab0 100644 --- a/dashboard-ui/scripts/tvshows.js +++ b/dashboard-ui/scripts/tvshows.js @@ -29,7 +29,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -72,14 +80,14 @@ items: result.Items, shape: "portrait", context: 'tv', - showTitle: true, + showTitle: false, centerText: true, lazy: true }); $('.itemsContainer', page).removeClass('timelineItemsContainer'); } - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); @@ -93,12 +101,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -160,6 +162,7 @@ $('#chkYearMismatch', page).checked(query.IsYearMismatched == true).checkboxradio('refresh'); $('.alphabetPicker', page).alphaValue(query.NameStartsWith); + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#tvShowsPage", function () { @@ -341,6 +344,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#tvShowsPage", function () { query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/scripts/tvstudios.js b/dashboard-ui/scripts/tvstudios.js index 3c820a1c5c..b1e31d092b 100644 --- a/dashboard-ui/scripts/tvstudios.js +++ b/dashboard-ui/scripts/tvstudios.js @@ -27,7 +27,15 @@ var html = ''; - $('.listTopPaging', page).html(LibraryBrowser.getPagingHtml(query, result.TotalRecordCount, true)).trigger('create'); + var pagingHtml = LibraryBrowser.getQueryPagingHtml({ + startIndex: query.StartIndex, + limit: query.Limit, + totalRecordCount: result.TotalRecordCount, + viewButton: true, + showLimit: false + }); + + $('.listTopPaging', page).html(pagingHtml).trigger('create'); updateFilterControls(page); @@ -43,7 +51,7 @@ }); - html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount); + html += pagingHtml; $('#items', page).html(html).trigger('create').createPosterItemMenus(); @@ -57,12 +65,6 @@ reloadItems(page); }); - $('.selectPageSize', page).on('change', function () { - query.Limit = parseInt(this.value); - query.StartIndex = 0; - reloadItems(page); - }); - LibraryBrowser.saveQueryValues(getSavedQueryKey(), query); Dashboard.hideLoadingMsg(); @@ -79,6 +81,8 @@ this.checked = filters.indexOf(',' + filterName) != -1; }).checkboxradio('refresh'); + + $('#selectPageSize', page).val(query.Limit).selectmenu('refresh'); } $(document).on('pageinit', "#tvStudiosPage", function () { @@ -102,6 +106,12 @@ reloadItems(page); }); + $('#selectPageSize', page).on('change', function () { + query.Limit = parseInt(this.value); + query.StartIndex = 0; + reloadItems(page); + }); + }).on('pagebeforeshow', "#tvStudiosPage", function () { query.ParentId = LibraryMenu.getTopParentId(); diff --git a/dashboard-ui/scripts/useredit.js b/dashboard-ui/scripts/useredit.js index 5bf8147e34..2e19de5aeb 100644 --- a/dashboard-ui/scripts/useredit.js +++ b/dashboard-ui/scripts/useredit.js @@ -124,8 +124,10 @@ if (userId) { $('#userProfileNavigation', page).show(); + $('.serverNavigation', page).hide(); } else { $('#userProfileNavigation', page).hide(); + $('.serverNavigation', page).show(); } Dashboard.getCurrentUser().done(function (loggedInUser) { diff --git a/dashboard-ui/serversecurity.html b/dashboard-ui/serversecurity.html index ca25034532..157d554fd8 100644 --- a/dashboard-ui/serversecurity.html +++ b/dashboard-ui/serversecurity.html @@ -11,8 +11,8 @@
      ${TabDashboard} - ${TabGeneral} - ${TabAdvanced} + ${TabUsers} + ${TabSettings} ${TabSecurity}
      @@ -33,8 +33,7 @@ ${HeaderDateIssued} - - +
      diff --git a/dashboard-ui/songs.html b/dashboard-ui/songs.html index 04bfe8e291..9747f6eb00 100644 --- a/dashboard-ui/songs.html +++ b/dashboard-ui/songs.html @@ -16,85 +16,96 @@
    -
    - - -
    -
    +
    -
    - - ${HeaderSortBy} - - - +
    + ${TabView} + ${TabSort} + ${TabFilter} +
    - - +
    - - +
    + + +
    - - +
    +
    +
    + ${HeaderFilters} + + - - + + - - + + - - + + - - + + - - -
    +
    -
    - - ${HeaderSortOrder} - +
    +
    +
    + + ${HeaderSortBy} + - - + + - - -
    - -
    -
    -
    -
    - - ${HeaderFilters} - - - + + - - + + - - + + - - + + - - -
    + + + + + + + + + + + +
    + +
    + + ${HeaderSortOrder} + + + + + + + +
    +
    diff --git a/dashboard-ui/thirdparty/jquery-2.1.1.min.js b/dashboard-ui/thirdparty/jquery-2.1.1.min.js new file mode 100644 index 0000000000..e5ace116b6 --- /dev/null +++ b/dashboard-ui/thirdparty/jquery-2.1.1.min.js @@ -0,0 +1,4 @@ +/*! jQuery v2.1.1 | (c) 2005, 2014 jQuery Foundation, Inc. | jquery.org/license */ +!function(a,b){"object"==typeof module&&"object"==typeof module.exports?module.exports=a.document?b(a,!0):function(a){if(!a.document)throw new Error("jQuery requires a window with a document");return b(a)}:b(a)}("undefined"!=typeof window?window:this,function(a,b){var c=[],d=c.slice,e=c.concat,f=c.push,g=c.indexOf,h={},i=h.toString,j=h.hasOwnProperty,k={},l=a.document,m="2.1.1",n=function(a,b){return new n.fn.init(a,b)},o=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,p=/^-ms-/,q=/-([\da-z])/gi,r=function(a,b){return b.toUpperCase()};n.fn=n.prototype={jquery:m,constructor:n,selector:"",length:0,toArray:function(){return d.call(this)},get:function(a){return null!=a?0>a?this[a+this.length]:this[a]:d.call(this)},pushStack:function(a){var b=n.merge(this.constructor(),a);return b.prevObject=this,b.context=this.context,b},each:function(a,b){return n.each(this,a,b)},map:function(a){return this.pushStack(n.map(this,function(b,c){return a.call(b,c,b)}))},slice:function(){return this.pushStack(d.apply(this,arguments))},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},eq:function(a){var b=this.length,c=+a+(0>a?b:0);return this.pushStack(c>=0&&b>c?[this[c]]:[])},end:function(){return this.prevObject||this.constructor(null)},push:f,sort:c.sort,splice:c.splice},n.extend=n.fn.extend=function(){var a,b,c,d,e,f,g=arguments[0]||{},h=1,i=arguments.length,j=!1;for("boolean"==typeof g&&(j=g,g=arguments[h]||{},h++),"object"==typeof g||n.isFunction(g)||(g={}),h===i&&(g=this,h--);i>h;h++)if(null!=(a=arguments[h]))for(b in a)c=g[b],d=a[b],g!==d&&(j&&d&&(n.isPlainObject(d)||(e=n.isArray(d)))?(e?(e=!1,f=c&&n.isArray(c)?c:[]):f=c&&n.isPlainObject(c)?c:{},g[b]=n.extend(j,f,d)):void 0!==d&&(g[b]=d));return g},n.extend({expando:"jQuery"+(m+Math.random()).replace(/\D/g,""),isReady:!0,error:function(a){throw new Error(a)},noop:function(){},isFunction:function(a){return"function"===n.type(a)},isArray:Array.isArray,isWindow:function(a){return null!=a&&a===a.window},isNumeric:function(a){return!n.isArray(a)&&a-parseFloat(a)>=0},isPlainObject:function(a){return"object"!==n.type(a)||a.nodeType||n.isWindow(a)?!1:a.constructor&&!j.call(a.constructor.prototype,"isPrototypeOf")?!1:!0},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},type:function(a){return null==a?a+"":"object"==typeof a||"function"==typeof a?h[i.call(a)]||"object":typeof a},globalEval:function(a){var b,c=eval;a=n.trim(a),a&&(1===a.indexOf("use strict")?(b=l.createElement("script"),b.text=a,l.head.appendChild(b).parentNode.removeChild(b)):c(a))},camelCase:function(a){return a.replace(p,"ms-").replace(q,r)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,b,c){var d,e=0,f=a.length,g=s(a);if(c){if(g){for(;f>e;e++)if(d=b.apply(a[e],c),d===!1)break}else for(e in a)if(d=b.apply(a[e],c),d===!1)break}else if(g){for(;f>e;e++)if(d=b.call(a[e],e,a[e]),d===!1)break}else for(e in a)if(d=b.call(a[e],e,a[e]),d===!1)break;return a},trim:function(a){return null==a?"":(a+"").replace(o,"")},makeArray:function(a,b){var c=b||[];return null!=a&&(s(Object(a))?n.merge(c,"string"==typeof a?[a]:a):f.call(c,a)),c},inArray:function(a,b,c){return null==b?-1:g.call(b,a,c)},merge:function(a,b){for(var c=+b.length,d=0,e=a.length;c>d;d++)a[e++]=b[d];return a.length=e,a},grep:function(a,b,c){for(var d,e=[],f=0,g=a.length,h=!c;g>f;f++)d=!b(a[f],f),d!==h&&e.push(a[f]);return e},map:function(a,b,c){var d,f=0,g=a.length,h=s(a),i=[];if(h)for(;g>f;f++)d=b(a[f],f,c),null!=d&&i.push(d);else for(f in a)d=b(a[f],f,c),null!=d&&i.push(d);return e.apply([],i)},guid:1,proxy:function(a,b){var c,e,f;return"string"==typeof b&&(c=a[b],b=a,a=c),n.isFunction(a)?(e=d.call(arguments,2),f=function(){return a.apply(b||this,e.concat(d.call(arguments)))},f.guid=a.guid=a.guid||n.guid++,f):void 0},now:Date.now,support:k}),n.each("Boolean Number String Function Array Date RegExp Object Error".split(" "),function(a,b){h["[object "+b+"]"]=b.toLowerCase()});function s(a){var b=a.length,c=n.type(a);return"function"===c||n.isWindow(a)?!1:1===a.nodeType&&b?!0:"array"===c||0===b||"number"==typeof b&&b>0&&b-1 in a}var t=function(a){var b,c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u="sizzle"+-new Date,v=a.document,w=0,x=0,y=gb(),z=gb(),A=gb(),B=function(a,b){return a===b&&(l=!0),0},C="undefined",D=1<<31,E={}.hasOwnProperty,F=[],G=F.pop,H=F.push,I=F.push,J=F.slice,K=F.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1},L="checked|selected|async|autofocus|autoplay|controls|defer|disabled|hidden|ismap|loop|multiple|open|readonly|required|scoped",M="[\\x20\\t\\r\\n\\f]",N="(?:\\\\.|[\\w-]|[^\\x00-\\xa0])+",O=N.replace("w","w#"),P="\\["+M+"*("+N+")(?:"+M+"*([*^$|!~]?=)"+M+"*(?:'((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\"|("+O+"))|)"+M+"*\\]",Q=":("+N+")(?:\\((('((?:\\\\.|[^\\\\'])*)'|\"((?:\\\\.|[^\\\\\"])*)\")|((?:\\\\.|[^\\\\()[\\]]|"+P+")*)|.*)\\)|)",R=new RegExp("^"+M+"+|((?:^|[^\\\\])(?:\\\\.)*)"+M+"+$","g"),S=new RegExp("^"+M+"*,"+M+"*"),T=new RegExp("^"+M+"*([>+~]|"+M+")"+M+"*"),U=new RegExp("="+M+"*([^\\]'\"]*?)"+M+"*\\]","g"),V=new RegExp(Q),W=new RegExp("^"+O+"$"),X={ID:new RegExp("^#("+N+")"),CLASS:new RegExp("^\\.("+N+")"),TAG:new RegExp("^("+N.replace("w","w*")+")"),ATTR:new RegExp("^"+P),PSEUDO:new RegExp("^"+Q),CHILD:new RegExp("^:(only|first|last|nth|nth-last)-(child|of-type)(?:\\("+M+"*(even|odd|(([+-]|)(\\d*)n|)"+M+"*(?:([+-]|)"+M+"*(\\d+)|))"+M+"*\\)|)","i"),bool:new RegExp("^(?:"+L+")$","i"),needsContext:new RegExp("^"+M+"*[>+~]|:(even|odd|eq|gt|lt|nth|first|last)(?:\\("+M+"*((?:-\\d)?\\d*)"+M+"*\\)|)(?=[^-]|$)","i")},Y=/^(?:input|select|textarea|button)$/i,Z=/^h\d$/i,$=/^[^{]+\{\s*\[native \w/,_=/^(?:#([\w-]+)|(\w+)|\.([\w-]+))$/,ab=/[+~]/,bb=/'|\\/g,cb=new RegExp("\\\\([\\da-f]{1,6}"+M+"?|("+M+")|.)","ig"),db=function(a,b,c){var d="0x"+b-65536;return d!==d||c?b:0>d?String.fromCharCode(d+65536):String.fromCharCode(d>>10|55296,1023&d|56320)};try{I.apply(F=J.call(v.childNodes),v.childNodes),F[v.childNodes.length].nodeType}catch(eb){I={apply:F.length?function(a,b){H.apply(a,J.call(b))}:function(a,b){var c=a.length,d=0;while(a[c++]=b[d++]);a.length=c-1}}}function fb(a,b,d,e){var f,h,j,k,l,o,r,s,w,x;if((b?b.ownerDocument||b:v)!==n&&m(b),b=b||n,d=d||[],!a||"string"!=typeof a)return d;if(1!==(k=b.nodeType)&&9!==k)return[];if(p&&!e){if(f=_.exec(a))if(j=f[1]){if(9===k){if(h=b.getElementById(j),!h||!h.parentNode)return d;if(h.id===j)return d.push(h),d}else if(b.ownerDocument&&(h=b.ownerDocument.getElementById(j))&&t(b,h)&&h.id===j)return d.push(h),d}else{if(f[2])return I.apply(d,b.getElementsByTagName(a)),d;if((j=f[3])&&c.getElementsByClassName&&b.getElementsByClassName)return I.apply(d,b.getElementsByClassName(j)),d}if(c.qsa&&(!q||!q.test(a))){if(s=r=u,w=b,x=9===k&&a,1===k&&"object"!==b.nodeName.toLowerCase()){o=g(a),(r=b.getAttribute("id"))?s=r.replace(bb,"\\$&"):b.setAttribute("id",s),s="[id='"+s+"'] ",l=o.length;while(l--)o[l]=s+qb(o[l]);w=ab.test(a)&&ob(b.parentNode)||b,x=o.join(",")}if(x)try{return I.apply(d,w.querySelectorAll(x)),d}catch(y){}finally{r||b.removeAttribute("id")}}}return i(a.replace(R,"$1"),b,d,e)}function gb(){var a=[];function b(c,e){return a.push(c+" ")>d.cacheLength&&delete b[a.shift()],b[c+" "]=e}return b}function hb(a){return a[u]=!0,a}function ib(a){var b=n.createElement("div");try{return!!a(b)}catch(c){return!1}finally{b.parentNode&&b.parentNode.removeChild(b),b=null}}function jb(a,b){var c=a.split("|"),e=a.length;while(e--)d.attrHandle[c[e]]=b}function kb(a,b){var c=b&&a,d=c&&1===a.nodeType&&1===b.nodeType&&(~b.sourceIndex||D)-(~a.sourceIndex||D);if(d)return d;if(c)while(c=c.nextSibling)if(c===b)return-1;return a?1:-1}function lb(a){return function(b){var c=b.nodeName.toLowerCase();return"input"===c&&b.type===a}}function mb(a){return function(b){var c=b.nodeName.toLowerCase();return("input"===c||"button"===c)&&b.type===a}}function nb(a){return hb(function(b){return b=+b,hb(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function ob(a){return a&&typeof a.getElementsByTagName!==C&&a}c=fb.support={},f=fb.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?"HTML"!==b.nodeName:!1},m=fb.setDocument=function(a){var b,e=a?a.ownerDocument||a:v,g=e.defaultView;return e!==n&&9===e.nodeType&&e.documentElement?(n=e,o=e.documentElement,p=!f(e),g&&g!==g.top&&(g.addEventListener?g.addEventListener("unload",function(){m()},!1):g.attachEvent&&g.attachEvent("onunload",function(){m()})),c.attributes=ib(function(a){return a.className="i",!a.getAttribute("className")}),c.getElementsByTagName=ib(function(a){return a.appendChild(e.createComment("")),!a.getElementsByTagName("*").length}),c.getElementsByClassName=$.test(e.getElementsByClassName)&&ib(function(a){return a.innerHTML="
    ",a.firstChild.className="i",2===a.getElementsByClassName("i").length}),c.getById=ib(function(a){return o.appendChild(a).id=u,!e.getElementsByName||!e.getElementsByName(u).length}),c.getById?(d.find.ID=function(a,b){if(typeof b.getElementById!==C&&p){var c=b.getElementById(a);return c&&c.parentNode?[c]:[]}},d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){return a.getAttribute("id")===b}}):(delete d.find.ID,d.filter.ID=function(a){var b=a.replace(cb,db);return function(a){var c=typeof a.getAttributeNode!==C&&a.getAttributeNode("id");return c&&c.value===b}}),d.find.TAG=c.getElementsByTagName?function(a,b){return typeof b.getElementsByTagName!==C?b.getElementsByTagName(a):void 0}:function(a,b){var c,d=[],e=0,f=b.getElementsByTagName(a);if("*"===a){while(c=f[e++])1===c.nodeType&&d.push(c);return d}return f},d.find.CLASS=c.getElementsByClassName&&function(a,b){return typeof b.getElementsByClassName!==C&&p?b.getElementsByClassName(a):void 0},r=[],q=[],(c.qsa=$.test(e.querySelectorAll))&&(ib(function(a){a.innerHTML="",a.querySelectorAll("[msallowclip^='']").length&&q.push("[*^$]="+M+"*(?:''|\"\")"),a.querySelectorAll("[selected]").length||q.push("\\["+M+"*(?:value|"+L+")"),a.querySelectorAll(":checked").length||q.push(":checked")}),ib(function(a){var b=e.createElement("input");b.setAttribute("type","hidden"),a.appendChild(b).setAttribute("name","D"),a.querySelectorAll("[name=d]").length&&q.push("name"+M+"*[*^$|!~]?="),a.querySelectorAll(":enabled").length||q.push(":enabled",":disabled"),a.querySelectorAll("*,:x"),q.push(",.*:")})),(c.matchesSelector=$.test(s=o.matches||o.webkitMatchesSelector||o.mozMatchesSelector||o.oMatchesSelector||o.msMatchesSelector))&&ib(function(a){c.disconnectedMatch=s.call(a,"div"),s.call(a,"[s!='']:x"),r.push("!=",Q)}),q=q.length&&new RegExp(q.join("|")),r=r.length&&new RegExp(r.join("|")),b=$.test(o.compareDocumentPosition),t=b||$.test(o.contains)?function(a,b){var c=9===a.nodeType?a.documentElement:a,d=b&&b.parentNode;return a===d||!(!d||1!==d.nodeType||!(c.contains?c.contains(d):a.compareDocumentPosition&&16&a.compareDocumentPosition(d)))}:function(a,b){if(b)while(b=b.parentNode)if(b===a)return!0;return!1},B=b?function(a,b){if(a===b)return l=!0,0;var d=!a.compareDocumentPosition-!b.compareDocumentPosition;return d?d:(d=(a.ownerDocument||a)===(b.ownerDocument||b)?a.compareDocumentPosition(b):1,1&d||!c.sortDetached&&b.compareDocumentPosition(a)===d?a===e||a.ownerDocument===v&&t(v,a)?-1:b===e||b.ownerDocument===v&&t(v,b)?1:k?K.call(k,a)-K.call(k,b):0:4&d?-1:1)}:function(a,b){if(a===b)return l=!0,0;var c,d=0,f=a.parentNode,g=b.parentNode,h=[a],i=[b];if(!f||!g)return a===e?-1:b===e?1:f?-1:g?1:k?K.call(k,a)-K.call(k,b):0;if(f===g)return kb(a,b);c=a;while(c=c.parentNode)h.unshift(c);c=b;while(c=c.parentNode)i.unshift(c);while(h[d]===i[d])d++;return d?kb(h[d],i[d]):h[d]===v?-1:i[d]===v?1:0},e):n},fb.matches=function(a,b){return fb(a,null,null,b)},fb.matchesSelector=function(a,b){if((a.ownerDocument||a)!==n&&m(a),b=b.replace(U,"='$1']"),!(!c.matchesSelector||!p||r&&r.test(b)||q&&q.test(b)))try{var d=s.call(a,b);if(d||c.disconnectedMatch||a.document&&11!==a.document.nodeType)return d}catch(e){}return fb(b,n,null,[a]).length>0},fb.contains=function(a,b){return(a.ownerDocument||a)!==n&&m(a),t(a,b)},fb.attr=function(a,b){(a.ownerDocument||a)!==n&&m(a);var e=d.attrHandle[b.toLowerCase()],f=e&&E.call(d.attrHandle,b.toLowerCase())?e(a,b,!p):void 0;return void 0!==f?f:c.attributes||!p?a.getAttribute(b):(f=a.getAttributeNode(b))&&f.specified?f.value:null},fb.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},fb.uniqueSort=function(a){var b,d=[],e=0,f=0;if(l=!c.detectDuplicates,k=!c.sortStable&&a.slice(0),a.sort(B),l){while(b=a[f++])b===a[f]&&(e=d.push(f));while(e--)a.splice(d[e],1)}return k=null,a},e=fb.getText=function(a){var b,c="",d=0,f=a.nodeType;if(f){if(1===f||9===f||11===f){if("string"==typeof a.textContent)return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=e(a)}else if(3===f||4===f)return a.nodeValue}else while(b=a[d++])c+=e(b);return c},d=fb.selectors={cacheLength:50,createPseudo:hb,match:X,attrHandle:{},find:{},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(cb,db),a[3]=(a[3]||a[4]||a[5]||"").replace(cb,db),"~="===a[2]&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),"nth"===a[1].slice(0,3)?(a[3]||fb.error(a[0]),a[4]=+(a[4]?a[5]+(a[6]||1):2*("even"===a[3]||"odd"===a[3])),a[5]=+(a[7]+a[8]||"odd"===a[3])):a[3]&&fb.error(a[0]),a},PSEUDO:function(a){var b,c=!a[6]&&a[2];return X.CHILD.test(a[0])?null:(a[3]?a[2]=a[4]||a[5]||"":c&&V.test(c)&&(b=g(c,!0))&&(b=c.indexOf(")",c.length-b)-c.length)&&(a[0]=a[0].slice(0,b),a[2]=c.slice(0,b)),a.slice(0,3))}},filter:{TAG:function(a){var b=a.replace(cb,db).toLowerCase();return"*"===a?function(){return!0}:function(a){return a.nodeName&&a.nodeName.toLowerCase()===b}},CLASS:function(a){var b=y[a+" "];return b||(b=new RegExp("(^|"+M+")"+a+"("+M+"|$)"))&&y(a,function(a){return b.test("string"==typeof a.className&&a.className||typeof a.getAttribute!==C&&a.getAttribute("class")||"")})},ATTR:function(a,b,c){return function(d){var e=fb.attr(d,a);return null==e?"!="===b:b?(e+="","="===b?e===c:"!="===b?e!==c:"^="===b?c&&0===e.indexOf(c):"*="===b?c&&e.indexOf(c)>-1:"$="===b?c&&e.slice(-c.length)===c:"~="===b?(" "+e+" ").indexOf(c)>-1:"|="===b?e===c||e.slice(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d,e){var f="nth"!==a.slice(0,3),g="last"!==a.slice(-4),h="of-type"===b;return 1===d&&0===e?function(a){return!!a.parentNode}:function(b,c,i){var j,k,l,m,n,o,p=f!==g?"nextSibling":"previousSibling",q=b.parentNode,r=h&&b.nodeName.toLowerCase(),s=!i&&!h;if(q){if(f){while(p){l=b;while(l=l[p])if(h?l.nodeName.toLowerCase()===r:1===l.nodeType)return!1;o=p="only"===a&&!o&&"nextSibling"}return!0}if(o=[g?q.firstChild:q.lastChild],g&&s){k=q[u]||(q[u]={}),j=k[a]||[],n=j[0]===w&&j[1],m=j[0]===w&&j[2],l=n&&q.childNodes[n];while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if(1===l.nodeType&&++m&&l===b){k[a]=[w,n,m];break}}else if(s&&(j=(b[u]||(b[u]={}))[a])&&j[0]===w)m=j[1];else while(l=++n&&l&&l[p]||(m=n=0)||o.pop())if((h?l.nodeName.toLowerCase()===r:1===l.nodeType)&&++m&&(s&&((l[u]||(l[u]={}))[a]=[w,m]),l===b))break;return m-=e,m===d||m%d===0&&m/d>=0}}},PSEUDO:function(a,b){var c,e=d.pseudos[a]||d.setFilters[a.toLowerCase()]||fb.error("unsupported pseudo: "+a);return e[u]?e(b):e.length>1?(c=[a,a,"",b],d.setFilters.hasOwnProperty(a.toLowerCase())?hb(function(a,c){var d,f=e(a,b),g=f.length;while(g--)d=K.call(a,f[g]),a[d]=!(c[d]=f[g])}):function(a){return e(a,0,c)}):e}},pseudos:{not:hb(function(a){var b=[],c=[],d=h(a.replace(R,"$1"));return d[u]?hb(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)(f=g[h])&&(a[h]=!(b[h]=f))}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:hb(function(a){return function(b){return fb(a,b).length>0}}),contains:hb(function(a){return function(b){return(b.textContent||b.innerText||e(b)).indexOf(a)>-1}}),lang:hb(function(a){return W.test(a||"")||fb.error("unsupported lang: "+a),a=a.replace(cb,db).toLowerCase(),function(b){var c;do if(c=p?b.lang:b.getAttribute("xml:lang")||b.getAttribute("lang"))return c=c.toLowerCase(),c===a||0===c.indexOf(a+"-");while((b=b.parentNode)&&1===b.nodeType);return!1}}),target:function(b){var c=a.location&&a.location.hash;return c&&c.slice(1)===b.id},root:function(a){return a===o},focus:function(a){return a===n.activeElement&&(!n.hasFocus||n.hasFocus())&&!!(a.type||a.href||~a.tabIndex)},enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&!!a.checked||"option"===b&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},empty:function(a){for(a=a.firstChild;a;a=a.nextSibling)if(a.nodeType<6)return!1;return!0},parent:function(a){return!d.pseudos.empty(a)},header:function(a){return Z.test(a.nodeName)},input:function(a){return Y.test(a.nodeName)},button:function(a){var b=a.nodeName.toLowerCase();return"input"===b&&"button"===a.type||"button"===b},text:function(a){var b;return"input"===a.nodeName.toLowerCase()&&"text"===a.type&&(null==(b=a.getAttribute("type"))||"text"===b.toLowerCase())},first:nb(function(){return[0]}),last:nb(function(a,b){return[b-1]}),eq:nb(function(a,b,c){return[0>c?c+b:c]}),even:nb(function(a,b){for(var c=0;b>c;c+=2)a.push(c);return a}),odd:nb(function(a,b){for(var c=1;b>c;c+=2)a.push(c);return a}),lt:nb(function(a,b,c){for(var d=0>c?c+b:c;--d>=0;)a.push(d);return a}),gt:nb(function(a,b,c){for(var d=0>c?c+b:c;++db;b++)d+=a[b].value;return d}function rb(a,b,c){var d=b.dir,e=c&&"parentNode"===d,f=x++;return b.first?function(b,c,f){while(b=b[d])if(1===b.nodeType||e)return a(b,c,f)}:function(b,c,g){var h,i,j=[w,f];if(g){while(b=b[d])if((1===b.nodeType||e)&&a(b,c,g))return!0}else while(b=b[d])if(1===b.nodeType||e){if(i=b[u]||(b[u]={}),(h=i[d])&&h[0]===w&&h[1]===f)return j[2]=h[2];if(i[d]=j,j[2]=a(b,c,g))return!0}}}function sb(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function tb(a,b,c){for(var d=0,e=b.length;e>d;d++)fb(a,b[d],c);return c}function ub(a,b,c,d,e){for(var f,g=[],h=0,i=a.length,j=null!=b;i>h;h++)(f=a[h])&&(!c||c(f,d,e))&&(g.push(f),j&&b.push(h));return g}function vb(a,b,c,d,e,f){return d&&!d[u]&&(d=vb(d)),e&&!e[u]&&(e=vb(e,f)),hb(function(f,g,h,i){var j,k,l,m=[],n=[],o=g.length,p=f||tb(b||"*",h.nodeType?[h]:h,[]),q=!a||!f&&b?p:ub(p,m,a,h,i),r=c?e||(f?a:o||d)?[]:g:q;if(c&&c(q,r,h,i),d){j=ub(r,n),d(j,[],h,i),k=j.length;while(k--)(l=j[k])&&(r[n[k]]=!(q[n[k]]=l))}if(f){if(e||a){if(e){j=[],k=r.length;while(k--)(l=r[k])&&j.push(q[k]=l);e(null,r=[],j,i)}k=r.length;while(k--)(l=r[k])&&(j=e?K.call(f,l):m[k])>-1&&(f[j]=!(g[j]=l))}}else r=ub(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):I.apply(g,r)})}function wb(a){for(var b,c,e,f=a.length,g=d.relative[a[0].type],h=g||d.relative[" "],i=g?1:0,k=rb(function(a){return a===b},h,!0),l=rb(function(a){return K.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==j)||((b=c).nodeType?k(a,c,d):l(a,c,d))}];f>i;i++)if(c=d.relative[a[i].type])m=[rb(sb(m),c)];else{if(c=d.filter[a[i].type].apply(null,a[i].matches),c[u]){for(e=++i;f>e;e++)if(d.relative[a[e].type])break;return vb(i>1&&sb(m),i>1&&qb(a.slice(0,i-1).concat({value:" "===a[i-2].type?"*":""})).replace(R,"$1"),c,e>i&&wb(a.slice(i,e)),f>e&&wb(a=a.slice(e)),f>e&&qb(a))}m.push(c)}return sb(m)}function xb(a,b){var c=b.length>0,e=a.length>0,f=function(f,g,h,i,k){var l,m,o,p=0,q="0",r=f&&[],s=[],t=j,u=f||e&&d.find.TAG("*",k),v=w+=null==t?1:Math.random()||.1,x=u.length;for(k&&(j=g!==n&&g);q!==x&&null!=(l=u[q]);q++){if(e&&l){m=0;while(o=a[m++])if(o(l,g,h)){i.push(l);break}k&&(w=v)}c&&((l=!o&&l)&&p--,f&&r.push(l))}if(p+=q,c&&q!==p){m=0;while(o=b[m++])o(r,s,g,h);if(f){if(p>0)while(q--)r[q]||s[q]||(s[q]=G.call(i));s=ub(s)}I.apply(i,s),k&&!f&&s.length>0&&p+b.length>1&&fb.uniqueSort(i)}return k&&(w=v,j=t),r};return c?hb(f):f}return h=fb.compile=function(a,b){var c,d=[],e=[],f=A[a+" "];if(!f){b||(b=g(a)),c=b.length;while(c--)f=wb(b[c]),f[u]?d.push(f):e.push(f);f=A(a,xb(e,d)),f.selector=a}return f},i=fb.select=function(a,b,e,f){var i,j,k,l,m,n="function"==typeof a&&a,o=!f&&g(a=n.selector||a);if(e=e||[],1===o.length){if(j=o[0]=o[0].slice(0),j.length>2&&"ID"===(k=j[0]).type&&c.getById&&9===b.nodeType&&p&&d.relative[j[1].type]){if(b=(d.find.ID(k.matches[0].replace(cb,db),b)||[])[0],!b)return e;n&&(b=b.parentNode),a=a.slice(j.shift().value.length)}i=X.needsContext.test(a)?0:j.length;while(i--){if(k=j[i],d.relative[l=k.type])break;if((m=d.find[l])&&(f=m(k.matches[0].replace(cb,db),ab.test(j[0].type)&&ob(b.parentNode)||b))){if(j.splice(i,1),a=f.length&&qb(j),!a)return I.apply(e,f),e;break}}}return(n||h(a,o))(f,b,!p,e,ab.test(a)&&ob(b.parentNode)||b),e},c.sortStable=u.split("").sort(B).join("")===u,c.detectDuplicates=!!l,m(),c.sortDetached=ib(function(a){return 1&a.compareDocumentPosition(n.createElement("div"))}),ib(function(a){return a.innerHTML="","#"===a.firstChild.getAttribute("href")})||jb("type|href|height|width",function(a,b,c){return c?void 0:a.getAttribute(b,"type"===b.toLowerCase()?1:2)}),c.attributes&&ib(function(a){return a.innerHTML="",a.firstChild.setAttribute("value",""),""===a.firstChild.getAttribute("value")})||jb("value",function(a,b,c){return c||"input"!==a.nodeName.toLowerCase()?void 0:a.defaultValue}),ib(function(a){return null==a.getAttribute("disabled")})||jb(L,function(a,b,c){var d;return c?void 0:a[b]===!0?b.toLowerCase():(d=a.getAttributeNode(b))&&d.specified?d.value:null}),fb}(a);n.find=t,n.expr=t.selectors,n.expr[":"]=n.expr.pseudos,n.unique=t.uniqueSort,n.text=t.getText,n.isXMLDoc=t.isXML,n.contains=t.contains;var u=n.expr.match.needsContext,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^.[^:#\[\.,]*$/;function x(a,b,c){if(n.isFunction(b))return n.grep(a,function(a,d){return!!b.call(a,d,a)!==c});if(b.nodeType)return n.grep(a,function(a){return a===b!==c});if("string"==typeof b){if(w.test(b))return n.filter(b,a,c);b=n.filter(b,a)}return n.grep(a,function(a){return g.call(b,a)>=0!==c})}n.filter=function(a,b,c){var d=b[0];return c&&(a=":not("+a+")"),1===b.length&&1===d.nodeType?n.find.matchesSelector(d,a)?[d]:[]:n.find.matches(a,n.grep(b,function(a){return 1===a.nodeType}))},n.fn.extend({find:function(a){var b,c=this.length,d=[],e=this;if("string"!=typeof a)return this.pushStack(n(a).filter(function(){for(b=0;c>b;b++)if(n.contains(e[b],this))return!0}));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/,A=n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a),!c||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?"undefined"!=typeof y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))};A.prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){var d=[],e=void 0!==c;while((a=a[b])&&9!==a.nodeType)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}});function D(a,b){while((a=a[b])&&1!==a.nodeType);return a}n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};function G(a){var b=F[a]={};return n.each(a.match(E)||[],function(a,c){b[c]=!0}),b}n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(h[g].apply(l[0],l[1])===!1&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){var c;while((c=n.inArray(b,h,c))>-1)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}},i,j,k;if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(a===!0?--n.readyWait:n.isReady)||(n.isReady=!0,a!==!0&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}});function I(){l.removeEventListener("DOMContentLoaded",I,!1),a.removeEventListener("load",I,!1),n.ready()}n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType};function K(){Object.defineProperty(this.cache={},0,{get:function(){return{}}}),this.expando=n.expando+Math.random()}K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;while(c--)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;function P(a,b,c){var d;if(void 0===c&&1===a.nodeType)if(d="data-"+b.replace(O,"-$1").toLowerCase(),c=a.getAttribute(d),"string"==typeof c){try{c="true"===c?!0:"false"===c?!1:"null"===c?null:+c+""===c?+c:N.test(c)?n.parseJSON(c):c}catch(e){}M.set(a,b,c)}else c=void 0;return c}n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b) +},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){c=g.length;while(c--)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(c=M.get(f,a),void 0!==c)return c;if(c=M.get(f,d),void 0!==c)return c;if(c=P(f,d,void 0),void 0!==c)return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthx",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;function Z(){return!0}function $(){return!1}function _(){try{return l.activeElement}catch(a){}}n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r){c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;while(j--)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&l.setup.call(a,d,p,g)!==!1||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)}},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){b=(b||"").match(E)||[""],j=b.length;while(j--)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;while(f--)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&l.teardown.call(a,p,r.handle)!==!1||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||o.trigger.apply(d,c)!==!1)){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}f=0;while((g=p[f++])&&!b.isPropagationStopped())b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),m=k&&g[k],m&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),b.result===!1&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&o._default.apply(p.pop(),c)!==!1||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||k.preDispatch.call(this,a)!==!1){h=n.event.handlers.call(this,a,j),b=0;while((f=h[b++])&&!a.isPropagationStopped()){a.currentTarget=f.elem,c=0;while((g=f.handlers[c++])&&!a.isImmediatePropagationStopped())(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i),void 0!==e&&(a.result=e)===!1&&(a.preventDefault(),a.stopPropagation()))}return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(i.disabled!==!0||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,hb=/^\s*\s*$/g,ib={option:[1,""],thead:[1,"","
    "],col:[2,"","
    "],tr:[2,"","
    "],td:[3,"","
    "],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td;function jb(a,b){return n.nodeName(a,"table")&&n.nodeName(11!==b.nodeType?b:b.firstChild,"tr")?a.getElementsByTagName("tbody")[0]||a.appendChild(a.ownerDocument.createElement("tbody")):a}function kb(a){return a.type=(null!==a.getAttribute("type"))+"/"+a.type,a}function lb(a){var b=gb.exec(a.type);return b?a.type=b[1]:a.removeAttribute("type"),a}function mb(a,b){for(var c=0,d=a.length;d>c;c++)L.set(a[c],"globalEval",!b||L.get(b[c],"globalEval"))}function nb(a,b){var c,d,e,f,g,h,i,j;if(1===b.nodeType){if(L.hasData(a)&&(f=L.access(a),g=L.set(b,f),j=f.events)){delete g.handle,g.events={};for(e in j)for(c=0,d=j[e].length;d>c;c++)n.event.add(b,e,j[e][c])}M.hasData(a)&&(h=M.access(a),i=n.extend({},h),M.set(b,i))}}function ob(a,b){var c=a.getElementsByTagName?a.getElementsByTagName(b||"*"):a.querySelectorAll?a.querySelectorAll(b||"*"):[];return void 0===b||b&&n.nodeName(a,b)?n.merge([a],c):c}function pb(a,b){var c=b.nodeName.toLowerCase();"input"===c&&T.test(a.type)?b.checked=a.checked:("input"===c||"textarea"===c)&&(b.defaultValue=a.defaultValue)}n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if(e=a[m],e||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1>")+h[2],j=h[0];while(j--)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));k.textContent="",m=0;while(e=l[m++])if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c)){j=0;while(e=f[j++])fb.test(e.type||"")&&c.push(e)}return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando],e&&(b=L.cache[e]))){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null==a?!1:a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(hb,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={};function sb(b,c){var d,e=n(c.createElement(b)).appendTo(c.body),f=a.getDefaultComputedStyle&&(d=a.getDefaultComputedStyle(e[0]))?d.display:n.css(e[0],"display");return e.detach(),f}function tb(a){var b=l,c=rb[a];return c||(c=sb(a,b),"none"!==c&&c||(qb=(qb||n("