diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html index eec31292f5..0154deb492 100644 --- a/dashboard-ui/autoorganizelog.html +++ b/dashboard-ui/autoorganizelog.html @@ -1,7 +1,7 @@  - Auto-Organize + ${TitleAutoOrganize}
@@ -10,8 +10,8 @@
- Activity Log - TV Settings + ${TabActivityLog} + ${TabTV}
@@ -25,9 +25,9 @@ - Date - Source - Destination + ${HeaderDate} + ${HeaderSource} + ${HeaderDestination} @@ -36,11 +36,11 @@
- Completed + ${LabelCompleted}
- Failed + ${LabelFailed}
- Skipped + ${LabelSkipped}
@@ -50,7 +50,7 @@
-

Episode Organization

+

${HeaderEpisodeOrganization}

@@ -59,33 +59,29 @@

- +
- +
- +
- + -
Only required for multi-episode files
+
${LabelEndingEpisodeNumberHelp}
-
- - -

diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html index 3b24b7afbe..46b0cbed60 100644 --- a/dashboard-ui/autoorganizetv.html +++ b/dashboard-ui/autoorganizetv.html @@ -1,7 +1,7 @@  - Auto-Organize + ${TitleAutoOrganize}
@@ -9,70 +9,70 @@
- Activity Log - TV Settings + ${TabActivityLog} + ${TabTV}
-

Auto-organize monitors your download folders for new files and moves them to your media directories.

+

${AutoOrganizeHelp}

-

TV file organizing will only add episodes to existing series. It will not create new series folders.

+

${AutoOrganizeTvHelp}

  • - +
  • - +
    - The server will poll this folder during the "Organize new media files" scheduled task. +
    ${LabelWatchFolderHelp}
  • - + -
    Files under this size will be ignored.
    +
    ${LabelMinFileSizeForOrganizeHelp}
  • - +
  • - +
-

Episode file pattern

+

${HeaderEpisodeFilePattern}


- +

- +

-

Supported Patterns

+

${HeaderSupportedPatterns}

- - - + + + @@ -144,36 +144,36 @@
  • - + -
    Copy or move files from the watch folder
    +
    ${LabelTransferMethodHelp}
  • - +
  • - + -
    Separate with ;. For example: .nfo;.txt
    +
    ${LabelDeleteLeftOverFilesHelp}
  • - -
    Enable this to keep the download directory clean.
    + +
    ${LabelDeleteEmptyFoldersHelp}
    • diff --git a/dashboard-ui/css/images/nowplayingdefault.jpg b/dashboard-ui/css/images/nowplayingdefault.jpg new file mode 100644 index 0000000000..4ee4a7a9b3 Binary files /dev/null and b/dashboard-ui/css/images/nowplayingdefault.jpg differ diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 232898f141..a318b45544 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -655,24 +655,6 @@ h1 .imageLink { top: -3px; } -/* Dashboard home */ -.tblConnections td { - padding: 1em 0 1em .75em; - vertical-align: top; -} - - .tblConnections td:first-child { - padding-left: 0; - } - -.tblConnections img:not(.clientNowPlayingImage) { - height: 28px; -} - -.clientNowPlayingImage { - height: 52px; -} - /* Footer */ #footer { position: fixed; @@ -870,3 +852,142 @@ progress { .btnShowStatusMessage:hover { text-decoration: underline; } + +.activeSession { + display: inline-block; + position: relative; + margin: 5px; + width: 250px; + height: 140.625px; +} + +.sessionNowPlayingContent { + background-size: cover; + background-repeat: no-repeat; + background-position: center center; + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + border-radius: 3px; +} + +.sessionNowPlayingInnerContent { + background-color: rgba(0, 0, 0, .6); + position: absolute; + top: 0; + left: 0; + right: 0; + bottom: 0; + color: #fff; + font-weight: 400; + border-radius: 3px; +} + +.sessionAppInfo { + padding: .5em; + overflow: hidden; +} + +.sessionAppName { + vertical-align: top; + max-width: 200px; +} + +.sessionUserInfo { + position: absolute; + right: 0; + bottom: 7px; + padding: .5em; + text-align: right; +} + + .sessionUserInfo img { + height: 24px; + } + +.sessionNowPlayingInfo { + position: absolute; + left: 0; + bottom: 7px; + padding: .5em; + max-width: 150px; + overflow: hidden; + text-overflow: ellipsis; +} + +.sessionAppInfo img { + max-width: 32px; + max-height: 32px; + margin-right: 5px; +} + +.activeSession progress { + position: absolute; + right: 0; + bottom: 0; + left: 0; + height: 7px; + width: 100%; + opacity: .95; +} + +.notPlayingSession .sessionNowPlayingContent { + display: none; +} + +.notPlayingSession .sessionNowPlayingInnerContent { + background-color: #f0f0f0; + color: #000; +} + +.notPlayingSession .sessionUserInfo, .notPlayingSession .sessionNowPlayingInfo { + bottom: 0; +} + +.activeSession:hover { + -moz-box-shadow: 0 0 20px 1px #38c; + -webkit-box-shadow: 0 0 20px 1px #38c; + box-shadow: 0 0 20px 1px #38c; +} + +@media all and (max-width: 1000px) { + + .activeSession { + width: 230px; + height: 129.375px; + } +} + +@media all and (max-width: 550px) { + + .activeSession { + width: 210px; + height: 118.125px; + } + + .sessionAppName { + max-width: 160px; + } +} + +@media all and (max-width: 500px) { + + .activeSession { + width: 200px; + height: 112.5px; + } + + .sessionAppName { + max-width: 150px; + } +} + +@media all and (max-width: 400px) { + + .activeSession { + width: 250px; + height: 140.625px; + } +} diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index ed2dc6071b..d337ca2c8f 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -19,67 +19,63 @@
    -

    Server Information

    +

    ${HeaerServerInformation}

    -

    - Version +

    - +

    - - + +
    -

    Active Devices

    -
    -
TermPatternResult${HeaderTerm}${HeaderPattern}${HeaderResult}
-
+

${HeaderActiveDevices}

+