mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

rework stub seasons

Browse source
This commit is contained in:
Luke Pulverenti 2015-01-13 23:20:30 -05:00
parent b0a735dccf
commit dd9184c35a
7 changed files with 23 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/about.html
View file

@ -23,7 +23,7 @@
<br /> <br />
<div id="appVersionNumber">${VersionNumber}</div> <div id="appVersionNumber">${VersionNumber}</div>
<br /> <br />
<div class="ui-bar-a" style="padding: 1em;">${HeaderCredits}</div> <div class="ui-bar-inherit" style="padding: 1em;">${HeaderCredits}</div>
<div style="padding: 0 .5em;"> <div style="padding: 0 .5em;">
<p> <p>
<a href="http://www.pismotechnic.com/pfm/" target="_blank">${PismoMessage}</a> <a href="http://www.pismotechnic.com/pfm/" target="_blank">${PismoMessage}</a>

6
dashboard-ui/css/card.css
View file

@ -159,7 +159,7 @@
background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* W3C */ background: linear-gradient(to bottom, rgba(0,0,0,0) 0%,rgba(0,0,0,0.7) 100%); /* W3C */
left: 0; left: 0;
right: 0; right: 0;
color: #fff; color: inherit;
} }
.cardText { .cardText {
@ -173,7 +173,7 @@
} }
.cardOverlayInner { .cardOverlayInner {
color: #fff; color: inherit;
} }
.cardTextCentered { .cardTextCentered {
@ -189,7 +189,7 @@
} }
.libraryPage .cardDefaultText, .libraryPage .cardText { .libraryPage .cardDefaultText, .libraryPage .cardText {
color: #fff; color: inherit;
} }
.cardContent .cardText { .cardContent .cardText {

11
dashboard-ui/css/librarybrowser.css
View file

@ -814,23 +814,12 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
font-weight: bold; font-weight: bold;
} }
.scenePosterViewItem img {
max-width: 150px !important;
}
@media all and (min-width: 650px) { @media all and (min-width: 650px) {
.libraryTabs .ui-btn-inner { .libraryTabs .ui-btn-inner {
padding: .5em 15px !important; padding: .5em 15px !important;
} }
} }
@media all and (min-width: 1200px) {
.scenePosterViewItem img {
max-width: 200px !important;
}
}
/* All HTML5 progress enabled browsers */ /* All HTML5 progress enabled browsers */
.itemProgressBar { .itemProgressBar {
/* Turns off styling - not usually needed, but good to know. */ /* Turns off styling - not usually needed, but good to know. */

119
dashboard-ui/css/site.css
View file

@ -337,7 +337,7 @@ h1 .imageLink {
display: block; display: block;
padding: .6em 20px .6em 20px; padding: .6em 20px .6em 20px;
text-decoration: none; text-decoration: none;
color: #333 !important; color: inherit !important;
text-shadow: none !important; text-shadow: none !important;
font-weight: 500 !important; font-weight: 500 !important;
font-size: 14px; font-size: 14px;
@ -356,9 +356,11 @@ h1 .imageLink {
} }
.sidebarDivider { .sidebarDivider {
height: 1px; height: 0;
background: #ddd; border-width: 1px 0 0;
border-style: solid;
margin: .25em 0; margin: .25em 0;
border-radius: 0;
} }
.invalidEntry { .invalidEntry {
@ -527,39 +529,6 @@ h1 .imageLink {
border-radius: 5px; 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 { .premiumBanner img {
position: absolute; position: absolute;
text-align: right; text-align: right;
@ -569,84 +538,6 @@ h1 .imageLink {
height: 60px; 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 { .wizardContent {
max-width: 800px; max-width: 800px;
padding: .5em 2em 1em; padding: .5em 2em 1em;

1
dashboard-ui/dlnaprofile.html
View file

@ -494,6 +494,7 @@
<div style="margin: 1em 0;"> <div style="margin: 1em 0;">
<label for="selectContainerProfileType">${LabelType}</label> <label for="selectContainerProfileType">${LabelType}</label>
<select id="selectContainerProfileType" data-mini="true"> <select id="selectContainerProfileType" data-mini="true">
<option value="Audio">${OptionProfileAudio}</option>
<option value="Photo">${OptionProfilePhoto}</option> <option value="Photo">${OptionProfilePhoto}</option>
<option value="Video">${OptionProfileVideo}</option> <option value="Video">${OptionProfileVideo}</option>
</select> </select>

2
dashboard-ui/scripts/site.js
View file

@ -678,7 +678,7 @@ var Dashboard = {
} }
if (link.divider) { if (link.divider) {
html += "<div class='sidebarDivider'></div>"; html += "<div class='sidebarDivider ui-bar-inherit'></div>";
} }
if (link.href) { if (link.href) {

17
dashboard-ui/scripts/usernew.js
View file

@ -16,7 +16,7 @@
var checkedAttribute = ' checked="checked"'; var checkedAttribute = ' checked="checked"';
html += '<input class="chkMediaFolder" data-foldername="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />'; html += '<input class="chkMediaFolder" data-id="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />';
html += '<label for="' + id + '">' + folder.Name + '</label>'; html += '<label for="' + id + '">' + folder.Name + '</label>';
} }
@ -41,7 +41,7 @@
var checkedAttribute = ' checked="checked"'; var checkedAttribute = ' checked="checked"';
html += '<input class="chkChannel" data-foldername="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />'; html += '<input class="chkChannel" data-id="' + folder.Id + '" type="checkbox" id="' + id + '"' + checkedAttribute + ' />';
html += '<label for="' + id + '">' + folder.Name + '</label>'; html += '<label for="' + id + '">' + folder.Name + '</label>';
} }
@ -83,16 +83,23 @@
user.Policy.BlockedMediaFolders = $('.chkMediaFolder:not(:checked)', page).map(function () { user.Policy.BlockedMediaFolders = $('.chkMediaFolder:not(:checked)', page).map(function () {
return this.getAttribute('data-foldername'); return this.getAttribute('data-id');
}).get(); }).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(); }).get();
user.Policy.EnableAllChannels = enabledChannels.length == allChannels.length;
if (!user.Policy.EnableAllChannels) {
user.Policy.EnabledChannels = enabledChannels;
}
ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () { ApiClient.updateUserPolicy(user.Id, user.Policy).done(function () {
Dashboard.navigate("useredit.html?userId=" + user.Id); Dashboard.navigate("useredit.html?userId=" + user.Id);
}); });