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

add option to merge metadata and IBN paths

Browse source
This commit is contained in:
Luke Pulverenti 2015-01-26 11:47:15 -05:00
parent 3969693dad
commit 2bcfc0f0ba
13 changed files with 31 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/dashboard.html
View file

@ -17,10 +17,10 @@
<div class="supporterPromotion" style="display:none;">
<a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;">
<div>
${HeaderBecomeMediaBrowserSupporter}
${HeaderSupportTheTeam}
</div>
<div style="font-weight:normal;font-size:90%;margin-top:5px;">
${TextAccessPremiumFeatures}
${TextEnjoyBonusFeatures}
</div>
</a>
</div>

2
dashboard-ui/librarysettings.html
View file

@ -17,7 +17,7 @@
<form id="librarySettingsForm">
<ul data-role="listview" class="ulForm">
<li>
<li class="fldImagesByName" style="display:none;">
<label for="txtItemsByNamePath">${LabelImagesByNamePath}</label>
<div style="display: inline-block; width: 92%;">
<input type="text" id="txtItemsByNamePath" name="txtItemsByNamePath" />

2
dashboard-ui/metadata.html
View file

@ -13,7 +13,7 @@
<a href="#" data-role="button" class="ui-btn-active">${TabBasics}</a>
<a href="metadataimages.html" data-role="button">${TabServices}</a>
<a href="metadatasubtitles.html" data-role="button">${TabSubtitles}</a>
<a href="metadatakodi.html" data-role="button">${TabKodiMetadata}</a>
<a href="metadatanfo.html" data-role="button">${TabNfo}</a>
<a href="metadataadvanced.html" data-role="button">${TabAdvanced}</a>
</div>

2
dashboard-ui/metadataadvanced.html
View file

@ -13,7 +13,7 @@
<a href="metadata.html" data-role="button">${TabBasics}</a>
<a href="metadataimages.html" data-role="button">${TabServices}</a>
<a href="metadatasubtitles.html" data-role="button">${TabSubtitles}</a>
<a href="metadatakodi.html" data-role="button">${TabKodiMetadata}</a>
<a href="metadatanfo.html" data-role="button">${TabNfo}</a>
<a href="#" data-role="button" class="ui-btn-active">${TabAdvanced}</a>
</div>

2
dashboard-ui/metadataimages.html
View file

@ -13,7 +13,7 @@
<a href="metadata.html" data-role="button">${TabBasics}</a>
<a href="#" data-role="button" class="ui-btn-active">${TabServices}</a>
<a href="metadatasubtitles.html" data-role="button">${TabSubtitles}</a>
<a href="metadatakodi.html" data-role="button">${TabKodiMetadata}</a>
<a href="metadatanfo.html" data-role="button">${TabNfo}</a>
<a href="metadataadvanced.html" data-role="button">${TabAdvanced}</a>
</div>

11
dashboard-ui/metadatakodi.html → dashboard-ui/metadatanfo.html
View file

@ -4,7 +4,7 @@
<title>${TitleMetadata}</title>
</head>
<body>
<div id="metadataKodiPage" data-role="page" class="page type-interior metadataConfigurationPage">
<div id="metadataNfoPage" data-role="page" class="page type-interior metadataConfigurationPage">
<div data-role="content">
@ -13,11 +13,11 @@
<a href="metadata.html" data-role="button">${TabBasics}</a>
<a href="metadataimages.html" data-role="button">${TabServices}</a>
<a href="metadatasubtitles.html" data-role="button">${TabSubtitles}</a>
<a href="#" class="ui-btn-active" data-role="button">${TabKodiMetadata}</a>
<a href="#" class="ui-btn-active" data-role="button">${TabNfo}</a>
<a href="metadataadvanced.html" data-role="button">${TabAdvanced}</a>
</div>
<form class="metadataKodiForm">
<form class="metadataNfoForm">
<p>${HeaderKodiMetadataHelp}</p>
<br />
@ -25,8 +25,7 @@
<li>
<label for="selectUser">${LabelKodiMetadataUser}</label>
<select name="selectUser" id="selectUser" data-mini="true">
</select>
<select name="selectUser" id="selectUser" data-mini="true"></select>
<div class="fieldDescription">${LabelKodiMetadataUserHelp}</div>
</li>
@ -73,7 +72,7 @@
</div>
<script type="text/javascript">
$('.metadataKodiForm').off('submit', KodiMetadataPage.onSubmit).on('submit', KodiMetadataPage.onSubmit);
$('.metadataNfoForm').off('submit', NfoMetadataPage.onSubmit).on('submit', NfoMetadataPage.onSubmit);
</script>
</div>
</body>

2
dashboard-ui/metadatasubtitles.html
View file

@ -13,7 +13,7 @@
<a href="metadata.html" data-role="button">${TabBasics}</a>
<a href="metadataimages.html" data-role="button">${TabServices}</a>
<a href="#" class="ui-btn-active" data-role="button">${TabSubtitles}</a>
<a href="metadatakodi.html" data-role="button">${TabKodiMetadata}</a>
<a href="metadatanfo.html" data-role="button">${TabNfo}</a>
<a href="metadataadvanced.html" data-role="button">${TabAdvanced}</a>
</div>

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

@ -62,7 +62,7 @@
html += '</div>';
}
elem = $(elem).html(html).lazyChildren();
elem = $(elem).html(html).trigger('create').lazyChildren();
elem.createCardMenus();
});
}

3
dashboard-ui/scripts/itembynamedetailpage.js
View file

@ -433,7 +433,6 @@
playFromHere: true,
defaultAction: 'playallfromhere'
});
}
else if (query.IncludeItemTypes == "Movie" || query.IncludeItemTypes == "Trailer") {
@ -489,7 +488,7 @@
html += LibraryBrowser.getPagingHtml(query, result.TotalRecordCount);
$('#items', page).html(html).lazyChildren();
$('#items', page).html(html).trigger('create').lazyChildren();
$('.btnNextPage', page).on('click', function () {

6
dashboard-ui/scripts/librarysettings.js
View file

@ -2,6 +2,12 @@
function loadPage(page, config) {
if (config.MergeMetadataAndImagesByName) {
$('.fldImagesByName', page).hide();
} else {
$('.fldImagesByName', page).show();
}
$('#txtSeasonZeroName', page).val(config.SeasonZeroDisplayName);
$('#chkEnableRealtimeMonitor', page).checked(config.EnableRealtimeMonitor).checkboxradio("refresh");

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

@ -15,7 +15,7 @@
if (showManualForm) {
LoginPage.showManualForm(page, false);
LoginPage.showManualForm(page, false, false);
} else {
LoginPage.showVisualForm(page);
@ -36,10 +36,15 @@
LoginPage.showVisualForm($.mobile.activePage);
},
showManualForm: function (page, showCancel) {
showManualForm: function (page, showCancel, focusPassword) {
$('.visualLoginForm', page).hide();
$('#manualLoginForm', page).show();
if (focusPassword) {
$('#txtManualPassword', page).focus();
} else {
$('#txtManualName', page).focus();
}
if (showCancel) {
$('.btnCancel', page).show();
@ -175,7 +180,7 @@
} else {
$('#txtManualName', page).val(name);
$('#txtManualPassword', '#loginPage').val('');
LoginPage.showManualForm(page, true);
LoginPage.showManualForm(page, true, true);
}
});
},

4
dashboard-ui/scripts/metadatakodi.js → dashboard-ui/scripts/metadatanfo.js
View file

@ -19,7 +19,7 @@
Dashboard.hideLoadingMsg();
}
$(document).on('pageshow', "#metadataKodiPage", function () {
$(document).on('pageshow', "#metadataNfoPage", function () {
Dashboard.showLoadingMsg();
@ -34,7 +34,7 @@
});
});
window.KodiMetadataPage = {
window.NfoMetadataPage = {
onSubmit: function () {

1
dashboard-ui/scripts/musicrecommended.js
View file

@ -2,7 +2,6 @@
$(document).on('pagebeforeshow', "#musicRecommendedPage", function () {
var screenWidth = $(window).width();
var userId = Dashboard.getCurrentUserId();
var page = this;