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 similar

Browse source
This commit is contained in:
Luke Pulverenti 2015-08-20 23:21:27 -04:00
parent 06d5ac40fa
commit ec5a50ea20
10 changed files with 52 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -716,7 +716,7 @@ paper-input + .fieldDescription {
} }
.ui-page-theme-a { .ui-page-theme-a {
background: #f2f2f2; background: #f4f4f4;
} }
.ui-page-theme-a .content-secondary { .ui-page-theme-a .content-secondary {

31
dashboard-ui/scripts/devices.js
View file

@ -27,44 +27,45 @@
var html = ''; var html = '';
html += '<ul data-role="listview" data-inset="true" data-split-icon="minus">'; html += '<div class="paperList">';
html += devices.map(function (d) { html += devices.map(function (d) {
var deviceHtml = ''; var deviceHtml = '';
deviceHtml += '<li>'; deviceHtml += '<paper-icon-item>';
deviceHtml += '<a href="device.html?id=' + d.Id + '">'; deviceHtml += '<paper-fab class="listAvatar" style="background:#999;" icon="tablet-android" item-icon></paper-fab>';
deviceHtml += '<h3>'; deviceHtml += '<paper-item-body three-line>';
deviceHtml += '<a class="clearLink" href="device.html?id=' + d.Id + '">';
deviceHtml += '<div>';
deviceHtml += d.Name; deviceHtml += d.Name;
deviceHtml += '</h3>'; deviceHtml += '</div>';
if (d.AppName) { if (d.AppName) {
deviceHtml += '<p style="color:blue;">'; deviceHtml += '<div secondary>';
deviceHtml += d.AppName; deviceHtml += d.AppName;
deviceHtml += '</p>'; deviceHtml += '</div>';
} }
if (d.LastUserName) { if (d.LastUserName) {
deviceHtml += '<p style="color:green;">'; deviceHtml += '<div secondary>';
deviceHtml += Globalize.translate('DeviceLastUsedByUserName', d.LastUserName); deviceHtml += Globalize.translate('DeviceLastUsedByUserName', d.LastUserName);
deviceHtml += '</p>'; deviceHtml += '</div>';
} }
deviceHtml += '</a>'; deviceHtml += '</a>';
deviceHtml += '</paper-item-body>';
deviceHtml += '<a href="#" data-icon="minus" class="btnDeleteDevice" data-id="' + d.Id + '">'; deviceHtml += '<paper-icon-button icon="delete" data-id="' + d.Id + '" title="' + Globalize.translate('ButtonDelete') + '" class="btnDeleteDevice"></paper-icon-button>';
deviceHtml += Globalize.translate('Delete'); deviceHtml += '</paper-icon-item>';
deviceHtml += '</a>';
deviceHtml += '</li>';
return deviceHtml; return deviceHtml;
}).join(''); }).join('');
html += '</ul>'; html += '</div>';
var elem = $('.devicesList', page).html(html).trigger('create'); var elem = $('.devicesList', page).html(html).trigger('create');

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

@ -60,7 +60,7 @@
if (result.TotalRecordCount > result.Items.length) { if (result.TotalRecordCount > result.Items.length) {
var href = "secondaryitems.html?type=" + section.types + "&filters=IsFavorite&titlekey=" + section.name; var href = "secondaryitems.html?type=" + section.types + "&filters=IsFavorite&titlekey=" + section.name;
html += '<a class="clearLink" href="' + href + '" style="margin-left:2em;"><paper-button raised class="more">' + Globalize.translate('ButtonMore') + '</paper-button></a>'; html += '<a class="clearLink" href="' + href + '" style="margin-left:2em;"><paper-button raised class="more mini">' + Globalize.translate('ButtonMore') + '</paper-button></a>';
} }
html += '</div>'; html += '</div>';

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

@ -80,7 +80,7 @@
html += '<h1 class="listHeader" style="display:inline-block;vertical-align:middle;">'; html += '<h1 class="listHeader" style="display:inline-block;vertical-align:middle;">';
html += section.name; html += section.name;
html += '</h1>'; html += '</h1>';
html += '<a href="#" class="clearLink hide" style="margin-left:1em;vertical-align:middle;"><paper-button raised class="more noIcon">' + Globalize.translate('ButtonMore') + '</paper-button></a>'; html += '<a href="#" class="clearLink hide" style="margin-left:1em;vertical-align:middle;"><paper-button raised class="more mini noIcon">' + Globalize.translate('ButtonMore') + '</paper-button></a>';
html += '</div>'; html += '</div>';
html += '<div class="itemsContainer">'; html += '<div class="itemsContainer">';
@ -216,7 +216,7 @@
IncludeItemTypes: "Audio", IncludeItemTypes: "Audio",
PersonTypes: "", PersonTypes: "",
ArtistIds: "", ArtistIds: "",
Limit: 50 Limit: 30
}, { }, {
playFromHere: true, playFromHere: true,
defaultAction: 'playallfromhere', defaultAction: 'playallfromhere',

10
dashboard-ui/scripts/itemdetailpage.js
View file

@ -373,8 +373,8 @@
$('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item)); $('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item));
LibraryBrowser.renderGenres($('.itemGenres', page), item, context, null, isStatic); LibraryBrowser.renderGenres($('.itemGenres', page), item, null, isStatic);
LibraryBrowser.renderStudios($('.itemStudios', page), item, context, isStatic); LibraryBrowser.renderStudios($('.itemStudios', page), item, isStatic);
renderUserDataIcons(page, item); renderUserDataIcons(page, item);
LibraryBrowser.renderLinks(page.querySelector('.itemExternalLinks'), item); LibraryBrowser.renderLinks(page.querySelector('.itemExternalLinks'), item);
@ -504,7 +504,7 @@
var artist = artists[i]; var artist = artists[i];
html.push('<a class="textlink" href="itemdetails.html?context=' + context + '&id=' + artist.Id + '">' + artist.Name + '</a>'); html.push('<a class="textlink" href="itemdetails.html?id=' + artist.Id + '">' + artist.Name + '</a>');
} }
@ -649,7 +649,7 @@
} }
if (item.Studios.length) { if (item.Studios.length) {
html += ' on <a class="textlink" href="itemdetails.html?context=' + context + '&id=' + item.Studios[0].Id + '">' + item.Studios[0].Name + '</a>'; html += ' on <a class="textlink" href="itemdetails.html?id=' + item.Studios[0].Id + '">' + item.Studios[0].Name + '</a>';
} }
if (html) { if (html) {
@ -1485,7 +1485,7 @@
} }
var cast = casts[i]; var cast = casts[i];
var href = isStatic ? '#' : 'itemdetails.html?context=' + context + '&id=' + cast.Id + ''; var href = isStatic ? '#' : 'itemdetails.html?id=' + cast.Id + '';
html += '<a class="tileItem smallPosterTileItem" href="' + href + '">'; html += '<a class="tileItem smallPosterTileItem" href="' + href + '">';
var imgUrl; var imgUrl;

43
dashboard-ui/scripts/librarybrowser.js
View file

@ -428,7 +428,7 @@
var artist = artists[i]; var artist = artists[i];
var css = cssClass ? (' class="' + cssClass + '"') : ''; var css = cssClass ? (' class="' + cssClass + '"') : '';
html.push('<a' + css + ' href="itemdetails.html?context=music&id=' + artist.Id + '">' + artist.Name + '</a>'); html.push('<a' + css + ' href="itemdetails.html?id=' + artist.Id + '">' + artist.Name + '</a>');
} }
@ -745,8 +745,6 @@
return item.url; return item.url;
} }
var contextSuffix = context ? ('&context=' + context) : '';
// Handle search hints // Handle search hints
var id = item.Id || item.ItemId; var id = item.Id || item.ItemId;
@ -808,41 +806,42 @@
if (item.Type == "Program") { if (item.Type == "Program") {
return "itemdetails.html?id=" + id; return "itemdetails.html?id=" + id;
} }
if (item.Type == "Series") {
return "itemdetails.html?id=" + id + contextSuffix;
}
if (item.Type == "Season") {
return "itemdetails.html?id=" + id + contextSuffix;
}
if (item.Type == "BoxSet") { if (item.Type == "BoxSet") {
return "itemdetails.html?id=" + id + contextSuffix; return "itemdetails.html?id=" + id;
} }
if (item.Type == "MusicAlbum") { if (item.Type == "MusicAlbum") {
return "itemdetails.html?id=" + id + contextSuffix; return "itemdetails.html?id=" + id;
} }
if (item.Type == "GameSystem") { if (item.Type == "GameSystem") {
return "itemdetails.html?id=" + id + contextSuffix; return "itemdetails.html?id=" + id;
} }
if (item.Type == "Genre") { if (item.Type == "Genre") {
return "itemdetails.html?id=" + id + contextSuffix; return "itemdetails.html?id=" + id;
} }
if (item.Type == "MusicGenre") { if (item.Type == "MusicGenre") {
return "itemdetails.html?id=" + id + contextSuffix; return "itemdetails.html?id=" + id;
} }
if (item.Type == "GameGenre") { if (item.Type == "GameGenre") {
return "itemdetails.html?id=" + id + contextSuffix; return "itemdetails.html?id=" + id;
} }
if (item.Type == "Studio") { if (item.Type == "Studio") {
return "itemdetails.html?id=" + id + contextSuffix; return "itemdetails.html?id=" + id;
} }
if (item.Type == "Person") { if (item.Type == "Person") {
return "itemdetails.html?id=" + id + contextSuffix; return "itemdetails.html?id=" + id;
} }
if (item.Type == "Recording") { if (item.Type == "Recording") {
return "itemdetails.html?id=" + id; return "itemdetails.html?id=" + id;
} }
if (item.Type == "MusicArtist") { if (item.Type == "MusicArtist") {
return "itemdetails.html?id=" + id;
}
var contextSuffix = context ? ('&context=' + context) : '';
if (item.Type == "Series" || item.Type == "Season" || item.Type == "Episode") {
return "itemdetails.html?id=" + id + contextSuffix; return "itemdetails.html?id=" + id + contextSuffix;
} }
@ -850,7 +849,7 @@
return id ? "itemlist.html?parentId=" + id : "#"; return id ? "itemlist.html?parentId=" + id : "#";
} }
return "itemdetails.html?id=" + id + contextSuffix; return "itemdetails.html?id=" + id;
}, },
getImageUrl: function (item, type, index, options) { getImageUrl: function (item, type, index, options) {
@ -3166,7 +3165,7 @@
}, },
renderStudios: function (elem, item, context, isStatic) { renderStudios: function (elem, item, isStatic) {
if (item.Studios && item.Studios.length && item.Type != "Series") { if (item.Studios && item.Studios.length && item.Type != "Series") {
@ -3181,7 +3180,7 @@
if (isStatic) { if (isStatic) {
html += item.Studios[i].Name; html += item.Studios[i].Name;
} else { } else {
html += '<a class="textlink" href="itemdetails.html?context=' + context + '&id=' + item.Studios[i].Id + '">' + item.Studios[i].Name + '</a>'; html += '<a class="textlink" href="itemdetails.html?id=' + item.Studios[i].Id + '">' + item.Studios[i].Name + '</a>';
} }
} }
@ -3197,7 +3196,7 @@
} }
}, },
renderGenres: function (elem, item, context, limit, isStatic) { renderGenres: function (elem, item, limit, isStatic) {
var html = ''; var html = '';
@ -3222,7 +3221,7 @@
if (isStatic) { if (isStatic) {
html += genres[i]; html += genres[i];
} else { } else {
html += '<a class="textlink" href="itemdetails.html?context=' + context + '&' + param + '=' + ApiClient.encodeName(genres[i]) + '">' + genres[i] + '</a>'; html += '<a class="textlink" href="itemdetails.html?' + param + '=' + ApiClient.encodeName(genres[i]) + '">' + genres[i] + '</a>';
} }
} }

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

@ -129,7 +129,7 @@
$(this).off("popupafterclose").off("mouseenter").off("mouseleave").remove(); $(this).off("popupafterclose").off("mouseenter").off("mouseleave").remove();
}); });
LibraryBrowser.renderGenres($('.itemGenres', popup), item, 'livetv', 3); LibraryBrowser.renderGenres($('.itemGenres', popup), item, 3);
$('.miscTvProgramInfo', popup).html(LibraryBrowser.getMiscInfoHtml(item)).trigger('create'); $('.miscTvProgramInfo', popup).html(LibraryBrowser.getMiscInfoHtml(item)).trigger('create');
popup.parents().prev('.ui-popup-screen').remove(); popup.parents().prev('.ui-popup-screen').remove();

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

@ -6,15 +6,13 @@
currentProgram = program; currentProgram = program;
var context = 'livetv';
$('.itemName', page).html(program.Name); $('.itemName', page).html(program.Name);
$('.itemEpisodeName', page).html(program.EpisodeTitle || ''); $('.itemEpisodeName', page).html(program.EpisodeTitle || '');
$('.itemCommunityRating', page).html(LibraryBrowser.getRatingHtml(program)); $('.itemCommunityRating', page).html(LibraryBrowser.getRatingHtml(program));
LibraryBrowser.renderGenres($('.itemGenres', page), program, context); LibraryBrowser.renderGenres($('.itemGenres', page), program);
LibraryBrowser.renderOverview(page.querySelectorAll('.itemOverview'), program); LibraryBrowser.renderOverview(page.querySelectorAll('.itemOverview'), program);
$('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(program)); $('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(program));

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

@ -210,7 +210,7 @@
html += '</a>'; html += '</a>';
html += '</paper-item-body>'; html += '</paper-item-body>';
html += '<paper-icon-button icon="cancel" data-id="' + device.Id + '" title="' + Globalize.translate('ButtonDelete') + '" class="btnDeleteDevice"></paper-icon-button>'; html += '<paper-icon-button icon="delete" data-id="' + device.Id + '" title="' + Globalize.translate('ButtonDelete') + '" class="btnDeleteDevice"></paper-icon-button>';
html += '</paper-icon-item>'; html += '</paper-icon-item>';
} }
@ -300,7 +300,7 @@
var provider = providers[i]; var provider = providers[i];
html += '<paper-icon-item>'; html += '<paper-icon-item>';
html += '<paper-fab class="listAvatar" icon="dvr" item-icon></paper-fab>'; html += '<paper-fab class="listAvatar" style="background:#52B54B;" icon="dvr" item-icon></paper-fab>';
html += '<paper-item-body two-line>'; html += '<paper-item-body two-line>';
@ -312,7 +312,7 @@
html += '</a>'; html += '</a>';
html += '</paper-item-body>'; html += '</paper-item-body>';
html += '<paper-icon-button icon="cancel" data-id="' + provider.Id + '" title="' + Globalize.translate('ButtonDelete') + '" class="btnDelete"></paper-icon-button>'; html += '<paper-icon-button icon="delete" data-id="' + provider.Id + '" title="' + Globalize.translate('ButtonDelete') + '" class="btnDelete"></paper-icon-button>';
html += '</paper-icon-item>'; html += '</paper-icon-item>';
} }

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

@ -23,7 +23,6 @@
function renderTimer(page, item) { function renderTimer(page, item) {
var context = 'livetv';
currentItem = item; currentItem = item;
var programInfo = item.ProgramInfo || {}; var programInfo = item.ProgramInfo || {};
@ -34,7 +33,7 @@
$('.itemCommunityRating', page).html(LibraryBrowser.getRatingHtml(programInfo)); $('.itemCommunityRating', page).html(LibraryBrowser.getRatingHtml(programInfo));
LibraryBrowser.renderGenres($('.itemGenres', page), programInfo, context); LibraryBrowser.renderGenres($('.itemGenres', page), programInfo);
LibraryBrowser.renderOverview(page.querySelectorAll('.itemOverview'), programInfo); LibraryBrowser.renderOverview(page.querySelectorAll('.itemOverview'), programInfo);
if (programInfo.ImageTags && programInfo.ImageTags.Primary) { if (programInfo.ImageTags && programInfo.ImageTags.Primary) {