diff --git a/dashboard-ui/about.html b/dashboard-ui/about.html index cf366b418f..ed9ed08855 100644 --- a/dashboard-ui/about.html +++ b/dashboard-ui/about.html @@ -23,7 +23,7 @@
${VersionNumber}

-
${HeaderCredits}
+
${HeaderCredits}

${PismoMessage} diff --git a/dashboard-ui/css/card.css b/dashboard-ui/css/card.css index 2864ab55b2..c1dfea62d8 100644 --- a/dashboard-ui/css/card.css +++ b/dashboard-ui/css/card.css @@ -159,7 +159,7 @@ background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* W3C */ left: 0; right: 0; - color: #fff; + color: inherit; } .cardText { @@ -173,7 +173,7 @@ } .cardOverlayInner { - color: #fff; + color: inherit; } .cardTextCentered { @@ -189,7 +189,7 @@ } .libraryPage .cardDefaultText, .libraryPage .cardText { - color: #fff; + color: inherit; } .cardContent .cardText { diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 3bf9fc5b92..5b8766c24f 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -814,23 +814,12 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { font-weight: bold; } -.scenePosterViewItem img { - max-width: 150px !important; -} - @media all and (min-width: 650px) { .libraryTabs .ui-btn-inner { padding: .5em 15px !important; } } -@media all and (min-width: 1200px) { - - .scenePosterViewItem img { - max-width: 200px !important; - } -} - /* All HTML5 progress enabled browsers */ .itemProgressBar { /* Turns off styling - not usually needed, but good to know. */ diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index cbf0e756cc..2dbe75aef5 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -337,7 +337,7 @@ h1 .imageLink { display: block; padding: .6em 20px .6em 20px; text-decoration: none; - color: #333 !important; + color: inherit !important; text-shadow: none !important; font-weight: 500 !important; font-size: 14px; @@ -356,9 +356,11 @@ h1 .imageLink { } .sidebarDivider { - height: 1px; - background: #ddd; + height: 0; + border-width: 1px 0 0; + border-style: solid; margin: .25em 0; + border-radius: 0; } .invalidEntry { @@ -527,39 +529,6 @@ h1 .imageLink { border-radius: 5px; } -/* - List Vew Items - */ - -.posterViewItem { - display: inline-block; - margin: 5px; - text-align: center; - padding: 0; - position: relative; - padding-bottom: 28px; -} - -.posterViewItemWithDualText { - padding-bottom: 56px; -} - -.posterViewItemWithNoText { - padding-bottom: 0 !important; -} - -.posterViewItem a { - color: white !important; - font-weight: normal !important; - text-decoration: none; -} - -.posterViewItem img { - max-width: 155px; - max-height: 110px; - vertical-align: bottom; -} - .premiumBanner img { position: absolute; text-align: right; @@ -569,84 +538,6 @@ h1 .imageLink { height: 60px; } -.posterViewItemText { - text-overflow: ellipsis; - overflow: hidden; - text-wrap: none; - white-space: nowrap; - margin: 0; - padding: 4px 5px 0; - position: absolute; - bottom: 0; - left: 0; - right: 0; - height: 24px; - background: #181818; - text-shadow: none; -} - -.posterViewItemWithDualText .posterViewItemText { - text-align: left; - color: #fff; - padding-top: 5px; - height: 23px; -} - -.posterViewItemPrimaryText { - bottom: 28px; -} - -.posterViewItem:hover, .userItem:hover, .tileItem:hover { - -moz-box-shadow: 0 0 0 5px #38c; - -webkit-box-shadow: 0 0 0 5px #38c; - box-shadow: 0 0 0 5px #38c; -} - -@media all and (min-width: 750px) { - - .posterViewItem img { - max-width: 190px; - max-height: 130px; - } -} - -@media all and (min-width: 1200px) { - - .posterViewItem { - font-size: 15px; - } - - .posterViewItem img { - max-width: 270px; - max-height: 160px; - } -} - -@media all and (min-width: 1920px) { - - .posterViewItemText { - height: 25px !important; - } - - .posterViewItem { - font-size: 17px; - padding-bottom: 29px; - } - - .posterViewItemWithDualText { - padding-bottom: 60px; - } - - .posterViewItemPrimaryText { - bottom: 30px; - } - - .posterViewItem img { - max-width: 310px; - max-height: 210px; - } -} - .wizardContent { max-width: 800px; padding: .5em 2em 1em; diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html index 0e648a0ad0..ed911d7b58 100644 --- a/dashboard-ui/dlnaprofile.html +++ b/dashboard-ui/dlnaprofile.html @@ -494,6 +494,7 @@

diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index 7cccb157ca..4e23c5835d 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -678,7 +678,7 @@ var Dashboard = { } if (link.divider) { - html += "
"; + html += "
"; } if (link.href) { diff --git a/dashboard-ui/scripts/usernew.js b/dashboard-ui/scripts/usernew.js index e0b45f5809..0e94d2701c 100644 --- a/dashboard-ui/scripts/usernew.js +++ b/dashboard-ui/scripts/usernew.js @@ -16,7 +16,7 @@ var checkedAttribute = ' checked="checked"'; - html += ''; + html += ''; html += ''; } @@ -41,7 +41,7 @@ var checkedAttribute = ' checked="checked"'; - html += ''; + html += ''; html += ''; } @@ -83,16 +83,23 @@ user.Policy.BlockedMediaFolders = $('.chkMediaFolder:not(:checked)', page).map(function () { - return this.getAttribute('data-foldername'); + return this.getAttribute('data-id'); }).get(); - user.Policy.BlockedChannels = $('.chkChannel:not(:checked)', page).map(function () { + var allChannels = $('.chkChannel', page); + var enabledChannels = $('.chkChannel:checked', page).map(function () { - return this.getAttribute('data-foldername'); + return this.getAttribute('data-id'); }).get(); + user.Policy.EnableAllChannels = enabledChannels.length == allChannels.length; + + if (!user.Policy.EnableAllChannels) { + user.Policy.EnabledChannels = enabledChannels; + } + ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () { Dashboard.navigate("useredit.html?userId=" + user.Id); });