diff --git a/dashboard-ui/autoorganizelog.html b/dashboard-ui/autoorganizelog.html index 6949a2de6..6d5ec56f5 100644 --- a/dashboard-ui/autoorganizelog.html +++ b/dashboard-ui/autoorganizelog.html @@ -64,15 +64,15 @@
- +
- +
- +
${LabelEndingEpisodeNumberHelp}
diff --git a/dashboard-ui/autoorganizetv.html b/dashboard-ui/autoorganizetv.html index df8a1dea0..febd2762a 100644 --- a/dashboard-ui/autoorganizetv.html +++ b/dashboard-ui/autoorganizetv.html @@ -35,17 +35,17 @@
  • - +
    ${LabelMinFileSizeForOrganizeHelp}
  • - +
  • - +
  • @@ -54,13 +54,13 @@
    - +

    - +
    @@ -157,7 +157,7 @@
  • - +
    ${LabelDeleteLeftOverFilesHelp}
  • diff --git a/dashboard-ui/channelsettings.html b/dashboard-ui/channelsettings.html index 6efa73bfb..cd7d37656 100644 --- a/dashboard-ui/channelsettings.html +++ b/dashboard-ui/channelsettings.html @@ -42,19 +42,19 @@
  • - +
    ${LabelChannelDownloadPathHelp}
  • - +
    ${LabelChannelDownloadSizeLimitHelpText}
  • - +
    ${LabelChannelDownloadAgeHelp}
  • diff --git a/dashboard-ui/cinemamodeconfiguration.html b/dashboard-ui/cinemamodeconfiguration.html index 3efe1806b..48c52a6f1 100644 --- a/dashboard-ui/cinemamodeconfiguration.html +++ b/dashboard-ui/cinemamodeconfiguration.html @@ -58,7 +58,7 @@
  • - +
  • diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index df844892c..7112e22c6 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -255,21 +255,11 @@ } .cardProgress .itemProgressBar { - height: 6px; + height: 7px; width: 100%; opacity: .8; } -.miniCardProgress { - /* Make sure it's on top of the fade gradient '*/ - z-index: 1000; -} - - .miniCardProgress .itemProgressBar { - height: 6px; - opacity: 1; - } - @media all and (max-width: 1200px) { .portraitCard .cardOverlayInner { diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 1c690ce30..d39bdc1fc 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -367,7 +367,7 @@ a.itemTag:hover { left: .8em; } -.itemCommunityRating:not(:empty) + .userDataIcons { +span.itemCommunityRating:not(:empty) + .userDataIcons { margin-left: 1.25em; } diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html index 3a8579b25..15df0a3a5 100644 --- a/dashboard-ui/dashboardgeneral.html +++ b/dashboard-ui/dashboardgeneral.html @@ -20,7 +20,7 @@
  • @@ -239,15 +239,15 @@
    - +
    - +
    - +
    @@ -270,7 +270,7 @@
    @@ -288,7 +288,7 @@
    - +
    ${ButtonAdd}
    @@ -300,7 +300,7 @@
    - +
    ${ButtonAdd}
    @@ -321,7 +321,7 @@
    - +
    ${ButtonAdd}
    @@ -333,7 +333,7 @@
    @@ -345,7 +345,7 @@
    @@ -406,11 +406,11 @@
    - +
    - +
    @@ -445,7 +445,7 @@
    - +
    @@ -463,7 +463,7 @@
    - +
    ${LabelPersonRoleHelp}

    diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html index 050d60f4e..eb18b79b4 100644 --- a/dashboard-ui/encodingsettings.html +++ b/dashboard-ui/encodingsettings.html @@ -55,7 +55,7 @@
  • - +
    ${LabelDownMixAudioScaleHelp}
  • diff --git a/dashboard-ui/metadataimages.html b/dashboard-ui/metadataimages.html index 2741de500..46ba0b02d 100644 --- a/dashboard-ui/metadataimages.html +++ b/dashboard-ui/metadataimages.html @@ -42,24 +42,24 @@ diff --git a/dashboard-ui/metadatasubtitles.html b/dashboard-ui/metadatasubtitles.html index 949af3b93..8890ea120 100644 --- a/dashboard-ui/metadatasubtitles.html +++ b/dashboard-ui/metadatasubtitles.html @@ -48,12 +48,12 @@
  • - +
  • - +
    • diff --git a/dashboard-ui/notificationsetting.html b/dashboard-ui/notificationsetting.html index 5fe3ab1e4..f5e0c35d0 100644 --- a/dashboard-ui/notificationsetting.html +++ b/dashboard-ui/notificationsetting.html @@ -65,7 +65,7 @@
      • - +
        ${LabelAvailableTokens}
        diff --git a/dashboard-ui/scripts/edititemmetadata.js b/dashboard-ui/scripts/edititemmetadata.js index 9c48e904a..2f04cf044 100644 --- a/dashboard-ui/scripts/edititemmetadata.js +++ b/dashboard-ui/scripts/edititemmetadata.js @@ -156,7 +156,7 @@ var value = providerIds[idInfo.Key] || ''; - html += ''; + html += ''; html += '
        '; diff --git a/dashboard-ui/scripts/librarylist.js b/dashboard-ui/scripts/librarylist.js index e71d056bd..bc89bac57 100644 --- a/dashboard-ui/scripts/librarylist.js +++ b/dashboard-ui/scripts/librarylist.js @@ -87,15 +87,21 @@ if (!isMiniItem) { html += '
        '; - html += ''; - html += LibraryBrowser.getRatingHtml(item, false); - html += ''; if (isPortrait) { - html += ''; + html += '
        '; + html += LibraryBrowser.getRatingHtml(item, false); + html += '
        '; + + html += '
        '; html += LibraryBrowser.getUserDataIconsHtml(item); - html += ''; + html += '
        '; } else { + + html += ''; + html += LibraryBrowser.getRatingHtml(item, false); + html += ''; + html += ''; html += LibraryBrowser.getUserDataIconsHtml(item); html += ''; @@ -622,7 +628,13 @@ var item = response1[0]; var user = response2[0]; - innerElem.html(getOverlayHtml(item, user, elem, commands)).trigger('create'); + var card = $(elem); + + if (!card.hasClass('card')) { + card = card.parents('.card'); + } + + innerElem.html(getOverlayHtml(item, user, card[0], commands)).trigger('create'); $('.btnPlayItem', innerElem).on('click', onPlayItemButtonClick); $('.btnPlayTrailer', innerElem).on('click', onTrailerButtonClick); diff --git a/dashboard-ui/scripts/livetvguide.js b/dashboard-ui/scripts/livetvguide.js index f5aa84aee..25ccf1988 100644 --- a/dashboard-ui/scripts/livetvguide.js +++ b/dashboard-ui/scripts/livetvguide.js @@ -483,9 +483,9 @@ html += '

        '; html += '

        '; - html += '

        '; + html += ''; html += LibraryBrowser.getRatingHtml(item); - html += '
        '; + html += '
        '; html += ''; html += LibraryBrowser.getUserDataIconsHtml(item); html += ''; diff --git a/dashboard-ui/scripts/sync.js b/dashboard-ui/scripts/sync.js index f50a31cf4..4311d1599 100644 --- a/dashboard-ui/scripts/sync.js +++ b/dashboard-ui/scripts/sync.js @@ -143,7 +143,7 @@ html += '
        '; html += '
        '; html += ''; - html += ''; + html += ''; html += '
        ' + Globalize.translate('LabelItemLimitHelp') + '
        '; html += '
        '; } diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js index 8d19e548a..c835c71bc 100644 --- a/dashboard-ui/scripts/syncjob.js +++ b/dashboard-ui/scripts/syncjob.js @@ -45,7 +45,7 @@ html += '
        '; html += '
        '; html += ''; - html += ''; + html += ''; html += '
        ' + Globalize.translate('LabelItemLimitHelp') + '
        '; html += '
        '; } diff --git a/dashboard-ui/userparentalcontrol.html b/dashboard-ui/userparentalcontrol.html index 5209c0ec8..959ea5ae7 100644 --- a/dashboard-ui/userparentalcontrol.html +++ b/dashboard-ui/userparentalcontrol.html @@ -79,7 +79,7 @@
        • - +