cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

added default padding settings

Browse Source
This commit is contained in:
Luke Pulverenti 2015-08-23 22:08:20 -04:00
parent 66df4658eb
commit dbf4cb3d23
25 changed files with 102 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
dashboard-ui/css/librarybrowser.css
View File

@ -611,30 +611,10 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
margin-left: 1em;
}
.itemOverview {
text-overflow: ellipsis;
max-height: 100px;
padding-right: .5em;
}
.desktopOverview {
min-width: 500px;
}
.mobileOverview {
display: none;
padding: 0 1em;
}
.empty {
margin: 0;
}
.mobileGenres {
display: none;
padding: 0 1em;
}
.darkScrollbars ::-webkit-scrollbar {
width: 10px;
height: 10px;
@ -865,14 +845,6 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
max-width: 120px;
}
.mobileOverview:not(.hide), .mobileGenres {
display: block;
}
.desktopOverview, .desktopGenres {
display: none;
}
.inlineItemName {
font-size: 22px;
}

3
dashboard-ui/itemdetails.html
View File

@ -91,7 +91,7 @@
<p id="itemDeathDate"></p>
<p id="seriesAirTime"></p>
<p class="airDate"></p>
<p class="itemOverview smoothScrollY"></p>
<p class="itemOverview topOverview"></p>
</div>
<div class="collectionItems"></div>
<div id="childrenCollapsible" class="hide detailSection">
@ -177,6 +177,7 @@
</h1>
<div>
<div class="tabDetails">
<p class="itemOverview bottomOverview"></p>
<p id="players"></p>
<p class="itemExternalLinks"></p>
<p class="itemStudios"></p>

8
dashboard-ui/livetv.html
View File

@ -35,12 +35,12 @@
<div class="activeProgramItems itemsContainer"></div>
<br />
</div>
<div id="upcomingPrograms" class="homePageSection">
<div id="upcomingPrograms" class="homePageSection" style="margin-top:1em;">
<h1 class="listHeader">${HeaderUpcomingPrograms}</h1>
<div class="upcomingProgramItems itemsContainer"></div>
<br />
</div>
<div id="upcomingTvMovies" class="homePageSection">
<div id="upcomingTvMovies" class="homePageSection" style="margin-top:1em;">
<div>
<h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderUpcomingMovies}</h1>
<a href="livetvitems.html?type=movies" class="clearLink" style="margin-left:1em;vertical-align:middle;"><paper-button raised class="more mini noIcon">${ButtonMoreItems}</paper-button></a>
@ -48,7 +48,7 @@
<div class="upcomingTvMovieItems itemsContainer"></div>
<br />
</div>
<div id="upcomingSports" class="homePageSection">
<div id="upcomingSports" class="homePageSection" style="margin-top:1em;">
<div>
<h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderUpcomingSports}</h1>
<a href="livetvitems.html?type=sports" class="clearLink" style="margin-left:1em;vertical-align:middle;"><paper-button raised class="more mini noIcon">${ButtonMoreItems}</paper-button></a>
@ -56,7 +56,7 @@
<div class="upcomingSportsItems itemsContainer"></div>
<br />
</div>
<div id="upcomingKids" class="homePageSection">
<div id="upcomingKids" class="homePageSection" style="margin-top:1em;">
<div>
<h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderUpcomingForKids}</h1>
<a href="livetvitems.html?type=kids" class="clearLink" style="margin-left:1em;vertical-align:middle;"><paper-button raised class="more mini noIcon">${ButtonMoreItems}</paper-button></a>

6
dashboard-ui/livetvnewrecording.html
View File

@ -58,15 +58,9 @@
<li>
<paper-input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}"></paper-input>
</li>
<li>
<paper-checkbox id="chkPrePaddingRequired">${OptionPrePaddingRequired}</paper-checkbox>
</li>
<li>
<paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"></paper-input>
</li>
<li>
<paper-checkbox id="chkPostPaddingRequired">${OptionPostPaddingRequired}</paper-checkbox>
</li>
</ul>
</div>
</div>

6
dashboard-ui/livetvseriestimer.html
View File

@ -53,15 +53,9 @@
<li>
<paper-input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}"></paper-input>
</li>
<li>
<paper-checkbox id="chkPrePaddingRequired">${OptionPrePaddingRequired}</paper-checkbox>
</li>
<li>
<paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"></paper-input>
</li>
<li>
<paper-checkbox id="chkPostPaddingRequired">${OptionPostPaddingRequired}</paper-checkbox>
</li>
</ul>
</div>
</div>

12
dashboard-ui/livetvsettings.html
View File

@ -58,6 +58,18 @@
</div>
<br />
<br />
<div>
<h1>${HeaderDefaultPadding}</h1>
<div>
<paper-input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}"></paper-input>
</div>
<div>
<paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"></paper-input>
</div>
</div>
<br />
<br />
<ul data-role="listview" class="ulForm">
<li>
<button type="submit" data-role="none" class="clearButton">

6
dashboard-ui/livetvtimer.html
View File

@ -41,15 +41,9 @@
<li>
<paper-input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}"></paper-input>
</li>
<li>
<paper-checkbox id="chkPrePaddingRequired">${OptionPrePaddingRequired}</paper-checkbox>
</li>
<li>
<paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"></paper-input>
</li>
<li>
<paper-checkbox id="chkPostPaddingRequired">${OptionPostPaddingRequired}</paper-checkbox>
</li>
</ul>
</div>
</div>

2
dashboard-ui/scripts/homeupcoming.js
View File

@ -77,7 +77,7 @@
}
currentGroupName = dateText;
currentGroup = [];
currentGroup = [item];
} else {
currentGroup.push(item);
}

21
dashboard-ui/scripts/itemdetailpage.js
View File

@ -250,6 +250,11 @@
LibraryBrowser.renderDetailImage(page.querySelector('.detailImageContainer'), item, imageHref);
}
function refreshImage(page, item, user) {
LibraryBrowser.refreshDetailImageUserData(page.querySelector('.detailImageContainer'), item);
}
function onWebSocketMessage(e, data) {
var msg = data;
@ -272,7 +277,7 @@
Dashboard.getCurrentUser().done(function (user) {
renderImage(page, currentItem, user);
refreshImage(page, currentItem, user);
});
}
}
@ -401,7 +406,18 @@
$('.tagline', page).hide();
}
LibraryBrowser.renderOverview(page.querySelectorAll('.itemOverview'), item);
var topOverview = page.querySelector('.topOverview');
var bottomOverview = page.querySelector('.bottomOverview');
if (item.Type == 'MusicAlbum' || item.Type == 'MusicArtist') {
LibraryBrowser.renderOverview([bottomOverview], item);
topOverview.classList.add('hide');
bottomOverview.classList.remove('hide');
} else {
LibraryBrowser.renderOverview([topOverview], item);
topOverview.classList.remove('hide');
bottomOverview.classList.add('hide');
}
$('.itemCommunityRating', page).html(LibraryBrowser.getRatingHtml(item));
@ -830,7 +846,6 @@
showTitle: false,
centerText: true,
context: context,
overlayText: true,
lazy: true
});
}

13
dashboard-ui/scripts/librarybrowser.js
View File

@ -2890,11 +2890,11 @@
var progressHtml = item.IsFolder || !item.UserData ? '' : LibraryBrowser.getItemProgressBarHtml((item.Type == 'Recording' ? item : item.UserData));
html += '<div class="detailImageProgressContainer">';
if (progressHtml) {
html += '<div class="detailImageProgressContainer">';
html += progressHtml;
html += "</div>";
}
html += "</div>";
html += "</div>";
@ -2918,6 +2918,15 @@
ImageLoader.lazyChildren(elem);
},
refreshDetailImageUserData: function (elem, item) {
var progressHtml = item.IsFolder || !item.UserData ? '' : LibraryBrowser.getItemProgressBarHtml((item.Type == 'Recording' ? item : item.UserData));
var detailImageProgressContainer = elem.querySelector('.detailImageProgressContainer');
detailImageProgressContainer.innerHTML = progressHtml || '';
},
getDisplayTime: function (date) {
if ((typeof date).toString().toLowerCase() === 'string') {

2
dashboard-ui/scripts/livetvitems.js
View File

@ -50,7 +50,7 @@
if (view == "Poster") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "auto",
shape: query.IsMovie ? 'portrait' : "auto",
context: 'livetv',
showTitle: false,
centerText: true,

4
dashboard-ui/scripts/livetvnewrecording.js
View File

@ -63,8 +63,6 @@
$('#txtPrePaddingMinutes', page).val(defaultTimer.PrePaddingSeconds / 60);
$('#txtPostPaddingMinutes', page).val(defaultTimer.PostPaddingSeconds / 60);
$('#chkPrePaddingRequired', page).checked(defaultTimer.IsPrePaddingRequired);
$('#chkPostPaddingRequired', page).checked(defaultTimer.IsPostPaddingRequired);
if (program.IsSeries) {
$('#eligibleForSeriesFields', page).show();
@ -148,8 +146,6 @@
item.PrePaddingSeconds = $('#txtPrePaddingMinutes', form).val() * 60;
item.PostPaddingSeconds = $('#txtPostPaddingMinutes', form).val() * 60;
item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked();
item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked();
item.RecordNewOnly = $('#chkNewOnly', form).checked();
item.RecordAnyChannel = $('#chkAllChannels', form).checked();

6
dashboard-ui/scripts/livetvseriestimer.js
View File

@ -29,8 +29,6 @@
$('#txtPrePaddingMinutes', page).val(item.PrePaddingSeconds / 60);
$('#txtPostPaddingMinutes', page).val(item.PostPaddingSeconds / 60);
$('#chkPrePaddingRequired', page).checked(item.IsPrePaddingRequired);
$('#chkPostPaddingRequired', page).checked(item.IsPostPaddingRequired);
$('#chkNewOnly', page).checked(item.RecordNewOnly);
$('#chkAllChannels', page).checked(item.RecordAnyChannel);
@ -109,8 +107,6 @@
item.PrePaddingSeconds = $('#txtPrePaddingMinutes', form).val() * 60;
item.PostPaddingSeconds = $('#txtPostPaddingMinutes', form).val() * 60;
item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked();
item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked();
item.RecordNewOnly = $('#chkNewOnly', form).checked();
item.RecordAnyChannel = $('#chkAllChannels', form).checked();
@ -135,7 +131,7 @@
items: result.Items,
shape: "detailPageSquare",
showTitle: true,
overlayText: true,
centerText: true,
coverImage: true
}));

6
dashboard-ui/scripts/livetvsettings.js
View File

@ -12,6 +12,9 @@
$('#txtRecordingPath', page).val(config.RecordingPath || '');
$('#txtPrePaddingMinutes', page).val(config.PrePaddingSeconds / 60);
$('#txtPostPaddingMinutes', page).val(config.PostPaddingSeconds / 60);
Dashboard.hideLoadingMsg();
}
@ -28,6 +31,9 @@
config.EnableAutoOrganize = $('#chkOrganize', form).checked();
config.RecordingPath = $('#txtRecordingPath', form).val() || null;
config.PrePaddingSeconds = $('#txtPrePaddingMinutes', form).val() * 60;
config.PostPaddingSeconds = $('#txtPostPaddingMinutes', form).val() * 60;
ApiClient.updateNamedConfiguration("livetv", config).done(Dashboard.processServerConfigurationUpdateResult);
});

4
dashboard-ui/scripts/livetvstatus.js
View File

@ -360,7 +360,7 @@
switch (providerId) {
case 'm3u':
return 'M3U';
return 'M3U Playlist';
case 'hdhomerun':
return 'HDHomerun';
default:
@ -436,7 +436,7 @@
});
menuItems.push({
name: 'M3U',
name: getTunerName('m3u'),
id: 'm3u'
});

17
dashboard-ui/scripts/livetvsuggested.js
View File

@ -19,7 +19,7 @@
shape: "auto",
showTitle: true,
showParentTitle: true,
overlayText: true,
centerText: true,
coverImage: true,
lazy: true,
overlayPlayButton: true
@ -58,7 +58,7 @@
shape: "auto",
showTitle: true,
showParentTitle: true,
overlayText: true,
centerText: true,
coverImage: true,
lazy: true,
overlayMoreButton: true
@ -75,15 +75,16 @@
userId: Dashboard.getCurrentUserId(),
IsAiring: false,
HasAired: false,
limit: 8,
limit: 9,
IsMovie: true
}).done(function (result) {
var html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "auto",
showTitle: false,
shape: "portrait",
showTitle: true,
centerText: true,
coverImage: true,
overlayText: false,
lazy: true,
@ -108,7 +109,8 @@
var html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "auto",
showTitle: false,
showTitle: true,
centerText: true,
coverImage: true,
overlayText: false,
lazy: true,
@ -133,7 +135,8 @@
var html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "auto",
showTitle: false,
showTitle: true,
centerText: true,
coverImage: true,
overlayText: false,
lazy: true,

4
dashboard-ui/scripts/livetvtimer.js
View File

@ -56,8 +56,6 @@
$('#txtPrePaddingMinutes', page).val(item.PrePaddingSeconds / 60);
$('#txtPostPaddingMinutes', page).val(item.PostPaddingSeconds / 60);
$('#chkPrePaddingRequired', page).checked(item.IsPrePaddingRequired);
$('#chkPostPaddingRequired', page).checked(item.IsPostPaddingRequired);
if (item.Status == 'New') {
$('.timerStatus', page).hide();
@ -78,8 +76,6 @@
item.PrePaddingSeconds = $('#txtPrePaddingMinutes', form).val() * 60;
item.PostPaddingSeconds = $('#txtPostPaddingMinutes', form).val() * 60;
item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked();
item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked();
ApiClient.updateLiveTvTimer(item).done(function () {
Dashboard.hideLoadingMsg();

2
dashboard-ui/scripts/movies.js
View File

@ -76,7 +76,6 @@
shape: "backdrop",
preferThumb: true,
lazy: true,
overlayText: true,
showDetailsMenu: true
});
}
@ -117,7 +116,6 @@
shape: "portrait",
centerText: true,
lazy: true,
overlayText: true,
showDetailsMenu: true
});
}

1
dashboard-ui/scripts/moviesrecommended.js
View File

@ -191,7 +191,6 @@
shape: getPortraitShape(),
centerText: true,
lazy: true,
overlayText: true,
showDetailsMenu: true
});
}

22
dashboard-ui/scripts/pluginspage.js
View File

@ -108,16 +108,16 @@
return html;
}
function renderPlugins(page, plugins) {
function renderPlugins(page, plugins, showNoPluginsMessage) {
ApiClient.getJSON(ApiClient.getUrl("dashboard/configurationpages") + "?pageType=PluginConfiguration").done(function (configPages) {
populateList(page, plugins, configPages);
populateList(page, plugins, configPages, showNoPluginsMessage);
});
}
function populateList(page, plugins, pluginConfigurationPages) {
function populateList(page, plugins, pluginConfigurationPages, showNoPluginsMessage) {
plugins = plugins.sort(function (plugin1, plugin2) {
@ -132,12 +132,14 @@
if (!plugins.length) {
html += '<div style="padding:5px;">';
html += '<p>' + Globalize.translate('MessageNoPluginsInstalled') + '</p>';
html += '<p><a href="plugincatalog.html">';
html += Globalize.translate('BrowsePluginCatalogMessage');
html += '</a></p>';
html += '</div>';
if (showNoPluginsMessage) {
html += '<div style="padding:5px;">';
html += '<p>' + Globalize.translate('MessageNoPluginsInstalled') + '</p>';
html += '<p><a href="plugincatalog.html">';
html += Globalize.translate('BrowsePluginCatalogMessage');
html += '</a></p>';
html += '</div>';
}
$('.installedPlugins', page).html(html).trigger('create');
} else {
@ -213,7 +215,7 @@
ApiClient.getInstalledPlugins().done(function (plugins) {
renderPlugins(page, plugins);
renderPlugins(page, plugins, true);
});
}

3
dashboard-ui/scripts/secondaryitems.js
View File

@ -121,8 +121,7 @@
items: result.Items,
shape: "auto",
centerText: true,
lazy: true,
overlayText: true
lazy: true
};
if (query.IncludeItemTypes == "MusicAlbum") {

37
dashboard-ui/scripts/site.js
View File

@ -483,42 +483,37 @@ var Dashboard = {
console.log('showLoadingMsg');
require(['paperbuttonstyle'], function () {
var elem = document.querySelector('.docspinner');
var elem = document.querySelector('.docspinner');
if (elem) {
if (elem) {
// This is just an attempt to prevent the fade-in animation from running repeating and causing flickering
elem.active = true;
// This is just an attempt to prevent the fade-in animation from running repeating and causing flickering
elem.active = true;
} else {
} else {
elem = document.createElement("paper-spinner");
elem.classList.add('docspinner');
elem = document.createElement("paper-spinner");
elem.classList.add('docspinner');
document.body.appendChild(elem);
elem.active = true;
}
});
document.body.appendChild(elem);
elem.active = true;
}
},
hideLoadingMsg: function () {
console.log('hideLoadingMsg');
require(['paperbuttonstyle'], function () {
var elem = document.querySelector('.docspinner');
var elem = document.querySelector('.docspinner');
if (elem) {
if (elem) {
elem.active = false;
setTimeout(function () {
elem.active = false;
setTimeout(function () {
elem.active = false;
}, 100);
}
});
}, 100);
}
},
getModalLoadingMsg: function () {

6
dashboard-ui/scripts/tvshows.js
View File

@ -67,8 +67,7 @@
shape: "backdrop",
preferThumb: true,
context: 'tv',
lazy: true,
overlayText: true
lazy: true
});
}
@ -123,8 +122,7 @@
shape: "portrait",
context: 'tv',
centerText: true,
lazy: true,
overlayText: true
lazy: true
});
}

2
dashboard-ui/scripts/tvupcoming.js
View File

@ -81,7 +81,7 @@
}
currentGroupName = dateText;
currentGroup = [];
currentGroup = [item];
} else {
currentGroup.push(item);
}

3
dashboard-ui/strings/html/server.json
View File

@ -1532,5 +1532,6 @@
"HeaderSetupTVGuide": "Setup TV Guide",
"LabelDataProvider": "Data provider:",
"OptionSendRecordingsToAutoOrganize": "Enable Auto-Organize for new recordings",
"OptionSendRecordingsToAutoOrganizeHelp": "New recordings will be sent to the Auto-Organize feature and imported into your media library."
"OptionSendRecordingsToAutoOrganizeHelp": "New recordings will be sent to the Auto-Organize feature and imported into your media library.",
"HeaderDefaultPadding": "Default Padding"
}