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

reduce image indicator sizes

This commit is contained in:
Luke Pulverenti 2014-01-01 22:53:27 -05:00
parent 7743b36bc9
commit bcb4b9da33
11 changed files with 46 additions and 28 deletions

View file

@ -395,10 +395,10 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
throw new Error("null id"); throw new Error("null id");
} }
var options = { var options = {
}; };
if (userId) { if (userId) {
options.userId = userId; options.userId = userId;
} }
@ -456,6 +456,21 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
}); });
}; };
self.getLiveTvRecordingGroup = function (id) {
if (!id) {
throw new Error("null id");
}
var url = self.getUrl("LiveTv/Recordings/Groups/" + id);
return self.ajax({
type: "GET",
url: url,
dataType: "json"
});
};
self.getLiveTvRecording = function (id, userId) { self.getLiveTvRecording = function (id, userId) {
if (!id) { if (!id) {
@ -559,7 +574,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
self.getNewLiveTvTimerDefaults = function (options) { self.getNewLiveTvTimerDefaults = function (options) {
options = options || {}; options = options || {};
var url = self.getUrl("LiveTv/Timers/Defaults", options); var url = self.getUrl("LiveTv/Timers/Defaults", options);
return self.ajax({ return self.ajax({

View file

@ -408,7 +408,7 @@ h1 .imageLink {
@media all and (min-width: 900px) { @media all and (min-width: 900px) {
.page:not(.wizardPage) .header { .page:not(.standalonePage) .header {
padding-top: 0; padding-top: 0;
} }
} }

View file

@ -106,7 +106,7 @@
} }
.tileName { .tileName {
font-weight: bold; font-size: 14px;
white-space: nowrap; white-space: nowrap;
text-overflow: ellipsis; text-overflow: ellipsis;
overflow: hidden; overflow: hidden;

View file

@ -19,7 +19,6 @@
</td> </td>
<td style="vertical-align: top; padding: 0;"> <td style="vertical-align: top; padding: 0;">
<p><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p> <p><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p>
<p class="itemChannelNumber"></p>
<p style="margin: 2em 0;"> <p style="margin: 2em 0;">
<span class="userDataIcons"></span> <span class="userDataIcons"></span>
</p> </p>

View file

@ -13,6 +13,7 @@
<a href="livetvseriestimers.html">Series</a> <a href="livetvseriestimers.html">Series</a>
</div> </div>
<div data-role="content"> <div data-role="content">
<h1 class="listName" style="text-align: center;"></h1>
<div class="viewSettings"> <div class="viewSettings">
<div class="viewControls"> <div class="viewControls">
</div> </div>

View file

@ -522,15 +522,17 @@
function renderChildren(page, item, user) { function renderChildren(page, item, user) {
var sortBy = item.Type == "BoxSet" ? "ProductionYear,SortName" : "SortName";
var fields = "ItemCounts,DateCreated,AudioInfo,PrimaryImageAspectRatio"; var fields = "ItemCounts,DateCreated,AudioInfo,PrimaryImageAspectRatio";
var query = { var query = {
ParentId: item.Id, ParentId: item.Id,
SortBy: sortBy,
Fields: fields Fields: fields
}; };
// Let the server pre-sort boxsets
if (item.Type !== "BoxSet") {
query.SortBy = "SortName";
}
var promise; var promise;

View file

@ -3,14 +3,6 @@
var currentItem; var currentItem;
var programs; var programs;
function cancelRecording(page, id) {
}
function scheduleRecording(page, id) {
}
function renderPrograms(page, result) { function renderPrograms(page, result) {
var html = ''; var html = '';
@ -136,8 +128,7 @@
Dashboard.setPageTitle(name); Dashboard.setPageTitle(name);
$('.itemName', page).html(name); $('.itemName', page).html(item.Number + ' ' + name);
$('.itemChannelNumber', page).html(item.Number);
$('.userDataIcons', page).html(LibraryBrowser.getUserDataIconsHtml(item)); $('.userDataIcons', page).html(LibraryBrowser.getUserDataIconsHtml(item));

View file

@ -33,9 +33,7 @@
html += '<div class="tileContent">'; html += '<div class="tileContent">';
html += '<div class="tileName">' + channel.Name + '</div>'; html += '<div class="tileName">' + channel.Number + '&nbsp;' + channel.Name + '</div>';
html += '<p class="itemMiscInfo">' + channel.Number + '</p>';
html += '<p class="userDataIcons">' + LibraryBrowser.getUserDataIconsHtml(channel) + '</p>'; html += '<p class="userDataIcons">' + LibraryBrowser.getUserDataIconsHtml(channel) + '</p>';

View file

@ -23,7 +23,7 @@
updateFilterControls(); updateFilterControls();
html += LibraryBrowser.getPosterViewHtml({ html += LibraryBrowser.getPosterViewHtml({
items: result.Items, items: result.Items,
shape: "square", shape: "square",
showTitle: true, showTitle: true,
@ -77,6 +77,8 @@
}).on('pagebeforeshow', "#liveTvRecordingListPage", function () { }).on('pagebeforeshow', "#liveTvRecordingListPage", function () {
var page = this;
var limit = LibraryBrowser.getDefaultPageSize(); var limit = LibraryBrowser.getDefaultPageSize();
// If the default page size has changed, the start index will have to be reset // If the default page size has changed, the start index will have to be reset
@ -92,7 +94,17 @@
query.GroupId = groupId; query.GroupId = groupId;
} }
reloadItems(this); reloadItems(page);
if (query.GroupId) {
ApiClient.getLiveTvRecordingGroup(query.GroupId).done(function (group) {
$('.listName', page).show().html(group.Name);
});
} else {
$('.listName', page).hide();
}
}).on('pageshow', "#liveTvRecordingListPage", function () { }).on('pageshow', "#liveTvRecordingListPage", function () {

View file

@ -135,9 +135,9 @@
html += '<div class="posterItemImage" style="background-color:' + background + ';"></div>'; html += '<div class="posterItemImage" style="background-color:' + background + ';"></div>';
} }
html += '<div class="posterItemText">' + user.Name + '</div>'; html += '<div class="posterItemText" style="color:#000;">' + user.Name + '</div>';
html += '<div class="posterItemText">'; html += '<div class="posterItemText" style="color:#000;">';
var lastSeen = LoginPage.getLastSeenText(user.LastActivityDate); var lastSeen = LoginPage.getLastSeenText(user.LastActivityDate);
if (lastSeen != "") { if (lastSeen != "") {
html += lastSeen; html += lastSeen;

View file

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<packages> <packages>
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.216" targetFramework="net45" /> <package id="MediaBrowser.ApiClient.Javascript" version="3.0.217" targetFramework="net45" />
</packages> </packages>