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

update xmltv config page

Browse source
This commit is contained in:
Luke Pulverenti 2016-06-06 17:12:44 -04:00
parent 8b5889ea3c
commit b449d37d84
12 changed files with 64 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

13
dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css vendored
View file

@ -35,6 +35,7 @@
}
[is="emby-button"].fab {
display: inline-flex;
border-radius: 50%;
min-width: 56px;
min-height: 56px;
@ -43,7 +44,6 @@
background-color: #444;
padding: .6em;
box-sizing: border-box;
display: inline-flex;
align-items: center;
justify-content: center;
text-align: center;
@ -51,11 +51,16 @@
margin: 0;
}
[is="emby-button"].noflex {
display: inline-block;
}
[is="emby-button"].fab.mini {
min-width: 40px !important;
min-height: 40px !important;
height: 3.3vh !important;
width: 3.3vh !important;
padding: .4em;
}
[is="emby-button"].fab iron-icon {
@ -129,14 +134,18 @@
/* Make sure its on top of the ripple */
position: relative;
z-index: 1;
vertical-align: middle;
}
[is=paper-icon-button-light] img {
width: 100%;
height: 100%;
/* Can't use 100% height or it will stretch past the boundaries in safari */
/*height: 100%;*/
max-height: 100%;
/* Make sure its on top of the ripple */
position: relative;
z-index: 1;
vertical-align: middle;
}
[is=paper-icon-button-light]:after {

4
dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.js vendored
View file

@ -53,6 +53,10 @@
this.setAttribute('data-embybutton', 'true');
if (browser.safari) {
this.classList.add('noflex');
}
this.addEventListener('keydown', onKeyDown);
if (browser.safari) {
this.addEventListener('click', animateButton);

2
dashboard-ui/bower_components/emby-webcomponents/emby-input/emby-input.css vendored
View file

@ -33,7 +33,7 @@
transition: all .2s ease-out;
}
.inputLabel.blank {
.inputLabel.blank:not(.nofloat) {
transform-origin: left top;
transform: scale(1.4,1.4) translateY(80%);
}

15
dashboard-ui/bower_components/emby-webcomponents/emby-input/emby-input.js vendored
View file

@ -3,6 +3,7 @@
var EmbyInputPrototype = Object.create(HTMLInputElement.prototype);
var inputId = 0;
var supportsFloatingLabel = false;
if (Object.getOwnPropertyDescriptor && Object.defineProperty) {
@ -19,6 +20,7 @@
}
Object.defineProperty(HTMLInputElement.prototype, 'value', descriptor);
supportsFloatingLabel = true;
}
}
@ -43,6 +45,10 @@
label.innerHTML = this.getAttribute('label') || '';
label.classList.add('inputLabel');
if (!supportsFloatingLabel) {
label.classList.add('nofloat');
}
label.htmlFor = this.id;
parentNode.insertBefore(label, this);
@ -74,15 +80,6 @@
onChange.call(this);
};
EmbyInputPrototype.detachedCallback = function () {
var observer = this.observer;
if (observer) {
observer.disconnect();
this.observer = null;
}
};
document.registerElement('emby-input', {
prototype: EmbyInputPrototype,
extends: 'input'

9
dashboard-ui/components/metadataeditor/metadataeditor.js
View file

@ -133,7 +133,6 @@
CriticRating: $('#txtCriticRating', form).val(),
CriticRatingSummary: $('#txtCriticRatingSummary', form).val(),
IndexNumber: $('#txtIndexNumber', form).val() || null,
DisplaySpecialsWithSeasons: form.querySelector('#chkDisplaySpecialsInline').checked,
AbsoluteEpisodeNumber: $('#txtAbsoluteEpisodeNumber', form).val(),
DvdEpisodeNumber: $('#txtDvdEpisodeNumber', form).val(),
DvdSeasonNumber: $('#txtDvdSeasonNumber', form).val(),
@ -739,12 +738,6 @@
$('#fldParentIndexNumber', context).hide();
}
if (item.Type == "Series") {
$('#fldDisplaySpecialsInline', context).show();
} else {
$('#fldDisplaySpecialsInline', context).hide();
}
if (item.Type == "BoxSet") {
$('#fldDisplayOrder', context).show();
@ -812,8 +805,6 @@
}
populateInternetProviderSettings(context, item, item.LockedFields);
context.querySelector('#chkDisplaySpecialsInline').checked = item.DisplaySpecialsWithSeasons || false;
$('#txtPath', context).val(item.Path || '');
$('#txtName', context).val(item.Name || "");
$('#txtOriginalName', context).val(item.OriginalTitle || "");

4
dashboard-ui/components/metadataeditor/metadataeditor.template.html
View file

@ -208,10 +208,6 @@
<div id="fldSourceType" style="display: none;" class="fldDisplaySetting">
<paper-input id="txtDisplayMediaType" type="text" label="${LabelTreatImageAs}"></paper-input>
</div>
<div id="fldDisplaySpecialsInline" class="fldDisplaySetting">
<br />
<paper-checkbox id="chkDisplaySpecialsInline">${LabelDisplaySpecialsWithinSeasons}</paper-checkbox>
</div>
<div id="fldDisplayOrder" class="fldDisplaySetting">
<label for="selectDisplayOrder" class="selectLabel" id="labelDisplayOrder">${LabelDisplayOrder}</label>
<select id="selectDisplayOrder" data-mini="true"></select>

11
dashboard-ui/components/tvproviders/xmltv.js
View file

@ -7,9 +7,16 @@
function getListingProvider(config, id) {
if (config && id) {
return config.ListingProviders.filter(function (i) {
var result = config.ListingProviders.filter(function(i) {
return i.Id == id;
})[0] || getListingProvider();
})[0];
if (result) {
return Promise.resolve(result);
}
return getListingProvider();
}
return ApiClient.getJSON(ApiClient.getUrl('LiveTv/ListingProviders/Default'));

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

@ -600,7 +600,7 @@ progress {
.btnUserItemRating {
vertical-align: middle;
color: #aaa;
color: #aaa !important;
display: inline-block !important;
}

4
dashboard-ui/librarydisplay.html
View file

@ -13,6 +13,10 @@
<div class="fieldDescription paperCheckboxFieldDescription">${LabelGroupMoviesIntoCollectionsHelp}</div>
</div>
<br />
<div>
<paper-checkbox class="chkDisplaySpecialsWithinSeasons">${LabelDisplaySpecialsWithinSeasons}</paper-checkbox>
</div>
<br />
<br />
<button is="emby-button" type="submit" class="raised submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></button>

5
dashboard-ui/scripts/librarydisplay.js
View file

@ -33,7 +33,9 @@
ApiClient.getServerConfiguration().then(function (config) {
config.EnableFolderView = form.querySelector('.chkFolderView').checked;
config.EnableGroupingIntoCollections = form.querySelector('.chkGroupMoviesIntoCollections').checked;
config.EnableGroupingIntoCollections = form.querySelector('.chkDisplaySpecialsWithinSeasons').checked;
config.DisplaySpecialsWithinSeasons = form.querySelector('.chkGroupMoviesIntoCollections').checked;
ApiClient.updateServerConfiguration(config).then(Dashboard.processServerConfigurationUpdateResult);
});
@ -45,6 +47,7 @@
ApiClient.getServerConfiguration().then(function (config) {
view.querySelector('.chkFolderView').checked = config.EnableFolderView;
view.querySelector('.chkGroupMoviesIntoCollections').checked = config.EnableGroupingIntoCollections;
view.querySelector('.chkDisplaySpecialsWithinSeasons').checked = config.DisplaySpecialsWithinSeasons;
});
}

11
dashboard-ui/scripts/livetvguideprovider.js
View file

@ -1,4 +1,9 @@
define(['jQuery'], function ($) {
define(['events'], function (events) {
function onListingsSubmitted() {
Dashboard.navigate('livetvstatus.html');
}
function init(page, type, providerId) {
@ -9,6 +14,8 @@
var instance = new factory(page, providerId, {
});
events.on(instance, 'submitted', onListingsSubmitted);
instance.init();
});
}
@ -30,7 +37,7 @@
xhr.send();
}
$(document).on('pageshow', "#liveTvGuideProviderPage", function () {
pageIdOn('pageshow', "liveTvGuideProviderPage", function () {
Dashboard.showLoadingMsg();

19
dashboard-ui/thirdparty/paper-button-style.css vendored
View file

@ -122,19 +122,11 @@ button[is="emby-button"].iconRight iron-icon {
color: inherit !important;
}
button[is="emby-button"].mini {
min-width: initial;
}
button[is="emby-button"].mini {
button[is="emby-button"].mini:not(.fab) {
padding: 0.4em 0.7em;
}
button[is="emby-button"].mini.noIcon {
padding: 0.4em 0.7em;
}
button[is="emby-button"].mini iron-icon {
button[is="emby-button"].mini:not(.fab) iron-icon {
height: 20px;
width: 20px;
}
@ -145,13 +137,10 @@ paper-toast {
button[is="emby-button"].notext {
min-width: 2.8em;
padding-left: .25em !important;
padding-right: .25em !important;
}
button[is="emby-button"].notext .content {
padding-left: 0 !important;
padding-right: 0 !important;
}
button[is="emby-button"].notext iron-icon {
margin-right: 0;
}