diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html index e9d2d44d8..8994b352c 100644 --- a/dashboard-ui/autoorganizetv.html +++ b/dashboard-ui/autoorganizetv.html @@ -4,7 +4,7 @@ ${TitleAutoOrganize} -
+
@@ -20,8 +20,8 @@

${AutoOrganizeTvHelp}

  • - - +
    + ${OptionEnableEpisodeOrganization}
  • @@ -41,8 +41,8 @@
    • -
-
+
+

${HeaderEpisodeFilePattern}


@@ -133,7 +133,7 @@
-
+

  • @@ -144,17 +144,16 @@
    ${LabelTransferMethodHelp}
  • - - +
    + ${OptionOverwriteExistingEpisodes}
  • ${LabelDeleteLeftOverFilesHelp}
  • - - -
    ${LabelDeleteEmptyFoldersHelp}
    + ${LabelDeleteEmptyFolders} +
    ${LabelDeleteEmptyFoldersHelp}
diff --git a/dashboard-ui/components/remotecontrol.js b/dashboard-ui/components/remotecontrol.js index 2dc01a8f7..30351e74a 100644 --- a/dashboard-ui/components/remotecontrol.js +++ b/dashboard-ui/components/remotecontrol.js @@ -835,8 +835,6 @@ context.querySelector('.libraryViewNav').classList.remove('hide'); } - tabs.classList.add('bottom'); - tabs.alignBottom = true; tabs.noSlide = true; tabs.addEventListener('iron-select', function (e) { diff --git a/dashboard-ui/nowplaying.html b/dashboard-ui/nowplaying.html index f8d38aedc..18d7b15f4 100644 --- a/dashboard-ui/nowplaying.html +++ b/dashboard-ui/nowplaying.html @@ -4,7 +4,7 @@ Emby -
+
@@ -138,7 +138,7 @@
- + ${TabNowPlaying} ${TabControls} ${TabPlaylist} diff --git a/dashboard-ui/scripts/autoorganizetv.js b/dashboard-ui/scripts/autoorganizetv.js index b49ab05c0..cc7aa9c40 100644 --- a/dashboard-ui/scripts/autoorganizetv.js +++ b/dashboard-ui/scripts/autoorganizetv.js @@ -60,9 +60,9 @@ var tvOptions = config.TvOptions; - $('#chkEnableTvSorting', page).checked(tvOptions.IsEnabled).checkboxradio('refresh'); - $('#chkOverwriteExistingEpisodes', page).checked(tvOptions.OverwriteExistingEpisodes).checkboxradio('refresh'); - $('#chkDeleteEmptyFolders', page).checked(tvOptions.DeleteEmptyFolders).checkboxradio('refresh'); + $('#chkEnableTvSorting', page).checked(tvOptions.IsEnabled); + $('#chkOverwriteExistingEpisodes', page).checked(tvOptions.OverwriteExistingEpisodes); + $('#chkDeleteEmptyFolders', page).checked(tvOptions.DeleteEmptyFolders); $('#txtMinFileSize', page).val(tvOptions.MinFileSizeMb); $('#txtSeasonFolderPattern', page).val(tvOptions.SeasonFolderPattern).trigger('change'); diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index ed6540d65..1bb3d85f7 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1767,8 +1767,8 @@ var AppInfo = {}; // Put the version into the bower path since we can't easily put a query string param on html imports // Emby server will handle this - if (!Dashboard.isRunningInCordova()) { - //bowerPath += window.dashboardVersion; + if (Dashboard.isConnectMode() && !Dashboard.isRunningInCordova()) { + bowerPath += window.dashboardVersion; } return bowerPath;