From 41825781d214999bfaa4b566653fede8b7babca4 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 3 Jul 2014 22:22:57 -0400 Subject: [PATCH] fixes #762 - Marking unwatched doesn't update display --- dashboard-ui/about.html | 2 +- dashboard-ui/advanced.html | 1 + dashboard-ui/advancedpaths.html | 11 +-- dashboard-ui/advancedserversettings.html | 2 + dashboard-ui/allusersettings.html | 54 ----------- dashboard-ui/appsplayback.html | 12 ++- dashboard-ui/appsweather.html | 51 ---------- dashboard-ui/branding.html | 56 +++++++++++ dashboard-ui/channelsettings.html | 2 +- dashboard-ui/css/librarybrowser.css | 4 +- dashboard-ui/css/mediaplayer-video.css | 2 +- dashboard-ui/css/mediaplayer.css | 4 +- dashboard-ui/css/site.css | 3 +- dashboard-ui/dashboard.html | 1 + dashboard-ui/dashboardgeneral.html | 1 + dashboard-ui/dashboardinfopage.html | 1 + dashboard-ui/edititemmetadata.html | 44 ++++++++- dashboard-ui/encodingsettings.html | 14 ++- dashboard-ui/librarypathmapping.html | 24 ++--- dashboard-ui/livetvstatus.html | 4 +- dashboard-ui/log.html | 19 ++-- dashboard-ui/login.html | 26 +---- dashboard-ui/metadata.html | 4 +- dashboard-ui/metadataadvanced.html | 4 +- dashboard-ui/metadatachapters.html | 4 +- dashboard-ui/metadataimages.html | 8 +- dashboard-ui/metadatasubtitles.html | 4 +- dashboard-ui/metadataxbmc.html | 9 +- dashboard-ui/notificationsetting.html | 1 + dashboard-ui/notificationsettings.html | 1 + dashboard-ui/scripts/advancedpaths.js | 22 ----- dashboard-ui/scripts/allusersettings.js | 48 ---------- dashboard-ui/scripts/appsweather.js | 41 -------- dashboard-ui/scripts/branding.js | 45 +++++++++ dashboard-ui/scripts/channelsettings.js | 2 +- dashboard-ui/scripts/edititemmetadata.js | 73 ++++++++++---- dashboard-ui/scripts/encodingsettings.js | 28 +++++- dashboard-ui/scripts/librarybrowser.js | 32 +++---- dashboard-ui/scripts/librarylist.js | 26 +++-- dashboard-ui/scripts/loginpage.js | 72 +++++--------- dashboard-ui/scripts/logpage.js | 105 +++++++-------------- dashboard-ui/scripts/mediaplayer-video.js | 41 ++++---- dashboard-ui/scripts/metadataimagespage.js | 2 +- dashboard-ui/scripts/metadataxbmc.js | 2 + dashboard-ui/scripts/site.js | 29 +++--- dashboard-ui/support.html | 2 +- dashboard-ui/supporter.html | 2 +- dashboard-ui/supporterkey.html | 2 +- dashboard-ui/userprofiles.html | 1 - 49 files changed, 443 insertions(+), 505 deletions(-) delete mode 100644 dashboard-ui/allusersettings.html delete mode 100644 dashboard-ui/appsweather.html create mode 100644 dashboard-ui/branding.html delete mode 100644 dashboard-ui/scripts/allusersettings.js delete mode 100644 dashboard-ui/scripts/appsweather.js create mode 100644 dashboard-ui/scripts/branding.js diff --git a/dashboard-ui/about.html b/dashboard-ui/about.html index 882afc365..1c6ac557c 100644 --- a/dashboard-ui/about.html +++ b/dashboard-ui/about.html @@ -11,7 +11,7 @@
${TabGeneral} - ${TabLog} + ${TabLogs} ${TabBecomeSupporter} ${TabSupporterKey} ${TabAbout} diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html index 944cd40f0..6cd85ffaf 100644 --- a/dashboard-ui/advanced.html +++ b/dashboard-ui/advanced.html @@ -13,6 +13,7 @@ ${TabGeneral} ${TabNotifications} ${TabPaths} + ${TabResume} ${TabServer} ${TabTranscoding}
diff --git a/dashboard-ui/advancedpaths.html b/dashboard-ui/advancedpaths.html index 8a2cada31..cd760b91f 100644 --- a/dashboard-ui/advancedpaths.html +++ b/dashboard-ui/advancedpaths.html @@ -13,6 +13,7 @@ ${TabGeneral} ${TabNotifications} ${TabPaths} + ${TabResume} ${TabServer} ${TabTranscoding}
@@ -45,16 +46,6 @@
${LabelMetadataPathHelp}
-
  • - -
    - -
    - -
    - ${LabelTranscodingTempPathHelp} -
    -

    • +
    - - - - - - - - diff --git a/dashboard-ui/appsplayback.html b/dashboard-ui/appsplayback.html index 77c09758d..640a610f5 100644 --- a/dashboard-ui/appsplayback.html +++ b/dashboard-ui/appsplayback.html @@ -1,16 +1,20 @@  - ${TitleAppSettings} + ${TitleAdvanced} -
    +
    - ${TabResume} - ${TabWeather} + ${TabGeneral} + ${TabNotifications} + ${TabPaths} + ${TabResume} + ${TabServer} + ${TabTranscoding}
    diff --git a/dashboard-ui/appsweather.html b/dashboard-ui/appsweather.html deleted file mode 100644 index ccc75a1d8..000000000 --- a/dashboard-ui/appsweather.html +++ /dev/null @@ -1,51 +0,0 @@ - - - - ${TitleAppSettings} - - -
    - -
    -
    -
    - ${TabResume} - ${TabWeather} -
    - - -
      -
    • - - -
      - ${LabelWeatherDisplayLocationHelp} -
      -
      • -
    • - - -
      • -
    • - - -
      • -
    - - -
    -
    - - -
    - - diff --git a/dashboard-ui/branding.html b/dashboard-ui/branding.html new file mode 100644 index 000000000..047b38d6b --- /dev/null +++ b/dashboard-ui/branding.html @@ -0,0 +1,56 @@ + + + + ${TitleDashboard} + + +
    + +
    +
    + +
    + ${TabHome} + ${TabGeneral} + ${TabInfo} + ${TabBranding} +
    + +
    + +

    ${HeaderBrandingHelp}

    +
    + +
      +
    • + + +
      ${LabelLoginDisclaimerHelp}
      +
      • +
    +
      +
    • + + +
      • + +
    +
    + +
    +
    + + + + +
    + + diff --git a/dashboard-ui/channelsettings.html b/dashboard-ui/channelsettings.html index 10318503a..dd01308c3 100644 --- a/dashboard-ui/channelsettings.html +++ b/dashboard-ui/channelsettings.html @@ -14,7 +14,7 @@
    • - diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index b5292fb7a..e7c424a74 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -782,7 +782,7 @@ a.itemTag:hover { background: rgba(248, 58, 34, .8); } -.unplayedIndicator, .playedIndicator { +.playedIndicator { display: block; position: absolute; top: 5px; @@ -798,7 +798,7 @@ a.itemTag:hover { background: rgba(82, 181, 75, .8); } - .unplayedIndicator div:after, .playedIndicator div:after { + .playedIndicator div:after { background-color: transparent !important; } diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css index 639278b00..065010075 100644 --- a/dashboard-ui/css/mediaplayer-video.css +++ b/dashboard-ui/css/mediaplayer-video.css @@ -133,7 +133,7 @@ height: 2px!important; } -#videoPlayer.fullscreenVideo .inactive { +#videoPlayer .inactive { display: none!important; } diff --git a/dashboard-ui/css/mediaplayer.css b/dashboard-ui/css/mediaplayer.css index f3868c4d7..7d7dd8330 100644 --- a/dashboard-ui/css/mediaplayer.css +++ b/dashboard-ui/css/mediaplayer.css @@ -1,7 +1,8 @@ /* Now playing bar */ .nowPlayingBar { padding: 6px 0 14px 0; - border-top: 1px solid green; + border-top: 2px solid green; + text-align: center; } .nowPlayingBarImage { @@ -148,6 +149,7 @@ input[type="range"]::-ms-fill-upper { .nowPlayingBar { padding: 10px 5px 10px 0; + text-align: left; } } diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 296972458..34d3bf17f 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -170,7 +170,6 @@ pre, textarea.pre { .imgLogoText { height: 45px; - display: none; margin-left: 5px; } @@ -409,7 +408,6 @@ h1 .imageLink { .imgLogoText { height: 50px; - display: inline; } .header { @@ -689,6 +687,7 @@ h1 .imageLink { z-index: 1097; color: #fff; border: 0 !important; + background-color: #111; } .footerNotification { diff --git a/dashboard-ui/dashboard.html b/dashboard-ui/dashboard.html index faf8058c1..3c0cae6e0 100644 --- a/dashboard-ui/dashboard.html +++ b/dashboard-ui/dashboard.html @@ -13,6 +13,7 @@ ${TabHome} ${TabGeneral} ${TabInfo} + ${TabBranding}
    diff --git a/dashboard-ui/dashboardgeneral.html b/dashboard-ui/dashboardgeneral.html index d49eda2d2..a49595d3f 100644 --- a/dashboard-ui/dashboardgeneral.html +++ b/dashboard-ui/dashboardgeneral.html @@ -13,6 +13,7 @@ ${TabHome} ${TabGeneral} ${TabInfo} + ${TabBranding}
    diff --git a/dashboard-ui/dashboardinfopage.html b/dashboard-ui/dashboardinfopage.html index 997b1e2f6..e3f9cdc6e 100644 --- a/dashboard-ui/dashboardinfopage.html +++ b/dashboard-ui/dashboardinfopage.html @@ -14,6 +14,7 @@ ${TabHome} ${TabGeneral} ${TabInfo} + ${TabBranding}
    diff --git a/dashboard-ui/edititemmetadata.html b/dashboard-ui/edititemmetadata.html index 316beee9d..fd17fd503 100644 --- a/dashboard-ui/edititemmetadata.html +++ b/dashboard-ui/edititemmetadata.html @@ -43,8 +43,8 @@
    @@ -507,11 +507,53 @@
    +
    + +
    +

    Refresh Metadata

    +
    + +
    + + +
    +
    + + +
    +
    +
    + + +
    +
    +

    + + +

    + +
    + +
    +
    diff --git a/dashboard-ui/encodingsettings.html b/dashboard-ui/encodingsettings.html index 626dfcebc..d7518574d 100644 --- a/dashboard-ui/encodingsettings.html +++ b/dashboard-ui/encodingsettings.html @@ -1,5 +1,4 @@ - - + ${TitleAdvanced} @@ -14,6 +13,7 @@ ${TabGeneral} ${TabNotifications} ${TabPaths} + ${TabResume} ${TabServer} ${TabTranscoding}
    @@ -42,6 +42,16 @@