mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
update user data icons
This commit is contained in:
Luke Pulverenti
parent
f3bdc1163e
commit
3d31aa2470
11 changed files with 86 additions and 51 deletions
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.3 KiB After Width: | Height: | Size: 2.6 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.6 KiB After Width: | Height: | Size: 2.7 KiB |
|
|
@ -750,6 +750,16 @@ progress {
|
|||
background-position: right center;
|
||||
}
|
||||
|
||||
.imgUserItemRating {
|
||||
height: 24px;
|
||||
margin-right: 1em;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.imgUserItemRating:hover {
|
||||
opacity: .5;
|
||||
}
|
||||
|
||||
@media all and (min-width: 650px) {
|
||||
.itemImageBlock {
|
||||
display: inline-block;
|
||||
|
|
@ -822,13 +832,20 @@ progress {
|
|||
position: relative;
|
||||
width: 270px;
|
||||
}
|
||||
|
||||
#nowPlayingBar #mediaInfo, #nowPlayingBar #mediaInfo div {
|
||||
margin-left: 10px;
|
||||
display: inline-block;
|
||||
}
|
||||
#nowPlayingBar #mediaInfo {display:none;}
|
||||
|
||||
#nowPlayingBar #mediaInfo {
|
||||
display: none;
|
||||
}
|
||||
|
||||
@media all and (min-width: 650px) {
|
||||
#nowPlayingBar #mediaInfo {display:inline-block;}
|
||||
#nowPlayingBar #mediaInfo {
|
||||
display: inline-block;
|
||||
}
|
||||
}
|
||||
|
||||
.mediaButton img {
|
||||
|
|
@ -855,10 +872,10 @@ progress {
|
|||
width: auto !important;
|
||||
}
|
||||
|
||||
.vjs-quality-button div {
|
||||
width: auto !important;
|
||||
background: none !important;
|
||||
}
|
||||
.vjs-quality-button div {
|
||||
width: auto !important;
|
||||
background: none !important;
|
||||
}
|
||||
|
||||
.vjs-chapter-button div {
|
||||
background-position: -100px -75px !important;
|
||||
|
|
@ -870,26 +887,27 @@ progress {
|
|||
overflow-y: scroll;
|
||||
}
|
||||
|
||||
.vjs-chapter-button.vjs-menu-button ul li {
|
||||
width: auto;
|
||||
white-space: nowrap;
|
||||
font-size: 1.1em;
|
||||
padding-right: 10px;
|
||||
}
|
||||
.vjs-chapter-button.vjs-menu-button ul li {
|
||||
width: auto;
|
||||
white-space: nowrap;
|
||||
font-size: 1.1em;
|
||||
padding-right: 10px;
|
||||
}
|
||||
|
||||
.vjs-default-skin .vjs-menu-button.vjs-stop-button {
|
||||
float: left;
|
||||
background: none;
|
||||
border: 0;
|
||||
}
|
||||
.vjs-default-skin .vjs-menu-button.vjs-stop-button div {
|
||||
background: url("images/media/stop.png");
|
||||
height: 26px;
|
||||
width: 26px;
|
||||
margin: -.7em .5em auto 0;
|
||||
}
|
||||
|
||||
.vjs-default-skin .vjs-menu-button.vjs-stop-button div {
|
||||
background: url("images/media/stop.png");
|
||||
height: 26px;
|
||||
width: 26px;
|
||||
margin: -.7em .5em auto 0;
|
||||
}
|
||||
|
||||
#itemFav img {
|
||||
width: 64px;
|
||||
cursor: pointer;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,12 +18,12 @@
|
|||
<div id="divResumableItems"></div>
|
||||
</div>
|
||||
|
||||
<h1>My Library <a href="#" class="imageLink">
|
||||
<h1>My Library <a href="itemlist.html" class="imageLink">
|
||||
<img src="css/images/rightarrow.png" /></a></h1>
|
||||
|
||||
<div id="divMyLibrary"></div>
|
||||
|
||||
<h1>Collections <a href="#" class="imageLink">
|
||||
<h1>Collections <a href="itemlist.html" class="imageLink">
|
||||
<img src="css/images/rightarrow.png" /></a></h1>
|
||||
|
||||
<div id="divCollections"></div>
|
||||
|
|
|
|||
|
|
@ -34,6 +34,9 @@
|
|||
|
||||
<p id="itemStudios">
|
||||
</p>
|
||||
|
||||
<p id="itemRatings">
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
|
|
@ -57,7 +57,7 @@
|
|||
|
||||
if (!item.MediaStreams || !item.MediaStreams.length) {
|
||||
$('#mediaInfoCollapsible', page).hide();
|
||||
}else {
|
||||
} else {
|
||||
$('#mediaInfoCollapsible', page).show();
|
||||
}
|
||||
if (!item.Chapters || !item.Chapters.length) {
|
||||
|
|
@ -173,8 +173,8 @@
|
|||
var overview = item.OverviewHtml || item.Overview;
|
||||
|
||||
$('#itemOverview', page).html(overview).show();
|
||||
$('#itemOverview a').each(function(){
|
||||
$(this).attr("target","_blank");
|
||||
$('#itemOverview a').each(function () {
|
||||
$(this).attr("target", "_blank");
|
||||
});
|
||||
} else {
|
||||
$('#itemOverview', page).hide();
|
||||
|
|
@ -242,7 +242,7 @@
|
|||
html += ' / ';
|
||||
}
|
||||
|
||||
html += '<a href="itembynamedetails.html?genre='+item.Genres[i]+'">' + item.Genres[i] + '</a>';
|
||||
html += '<a href="itembynamedetails.html?genre=' + item.Genres[i] + '">' + item.Genres[i] + '</a>';
|
||||
}
|
||||
|
||||
elem.html(html).trigger('create');
|
||||
|
|
@ -268,7 +268,7 @@
|
|||
html += ' / ';
|
||||
}
|
||||
|
||||
html += '<a href="itembynamedetails.html?studio='+item.Studios[i]+'">' + item.Studios[i] + '</a>';
|
||||
html += '<a href="itembynamedetails.html?studio=' + item.Studios[i] + '">' + item.Studios[i] + '</a>';
|
||||
}
|
||||
|
||||
elem.html(html).trigger('create');
|
||||
|
|
@ -484,31 +484,31 @@
|
|||
|
||||
html += '<tr>';
|
||||
html += '<td>' + type + '</td>';
|
||||
html += '<td>' + stream.Codec +'</td>';
|
||||
html += '<td>' + stream.Codec + '</td>';
|
||||
|
||||
if (stream.Language) {
|
||||
hasLanguage = true;
|
||||
html += '<td class="language">' + stream.Language +'</td>';
|
||||
html += '<td class="language">' + stream.Language + '</td>';
|
||||
} else html += '<td class="language"></td>';
|
||||
|
||||
if (stream.Type == "Video") {
|
||||
html += '<td class="resolution">'+ stream.Width +'/'+ stream.Height +' ('+ stream.AspectRatio +')</td>';
|
||||
}else {
|
||||
html += '<td class="resolution">' + stream.Width + '/' + stream.Height + ' (' + stream.AspectRatio + ')</td>';
|
||||
} else {
|
||||
html += '<td class="resolution"></td>';
|
||||
}
|
||||
|
||||
if (stream.Channels) {
|
||||
html += '<td>'+ stream.Channels +'ch '+ stream.SampleRate +' khz</td>';
|
||||
}else {
|
||||
html += '<td>' + stream.Channels + 'ch ' + stream.SampleRate + ' khz</td>';
|
||||
} else {
|
||||
html += '<td></td>';
|
||||
}
|
||||
|
||||
html += '<td>' + stream.BitRate +'</td>';
|
||||
html += '<td>' + stream.BitRate + '</td>';
|
||||
|
||||
if (stream.Type == "Video") {
|
||||
var framerate = stream.AverageFrameRate || stream.RealFrameRate;
|
||||
html += '<td class="framerate">'+ framerate +'</td>';
|
||||
}else {
|
||||
html += '<td class="framerate">' + framerate + '</td>';
|
||||
} else {
|
||||
html += '<td></td>';
|
||||
}
|
||||
|
||||
|
|
@ -564,7 +564,7 @@
|
|||
html += '<a href="#play-Trailer-' + i + '" onclick="ItemDetailPage.playTrailer(' + i + ');">';
|
||||
|
||||
var imageTags = trailer.ImageTags || {};
|
||||
|
||||
|
||||
if (imageTags.Primary) {
|
||||
|
||||
var imgUrl = ApiClient.getImageUrl(trailer.Id, {
|
||||
|
|
@ -687,7 +687,7 @@
|
|||
var cast = casts[i];
|
||||
var role = cast.Role || cast.Type;
|
||||
|
||||
html += '<a href="itembynamedetails.html?person='+cast.Name+'">';
|
||||
html += '<a href="itembynamedetails.html?person=' + cast.Name + '">';
|
||||
html += '<div class="posterViewItem posterViewItemWithDualText">';
|
||||
|
||||
if (cast.PrimaryImageTag) {
|
||||
|
|
@ -717,29 +717,33 @@
|
|||
var html = '';
|
||||
var page = $.mobile.activePage;
|
||||
|
||||
if (typeof(item.UserData.Likes) == "undefined") {
|
||||
html += '<img src="css/images/userdata/thumbs_down_off.png" alt="Set Did Not Like" title="Set Did Not Like" onclick="ItemDetailPage.setDislike();" />';
|
||||
html += '<img src="css/images/userdata/thumbs_up_off.png" alt="Set Liked" title="Set Liked" onclick="ItemDetailPage.setLike();" />';
|
||||
} else if (item.UserData.Likes) {
|
||||
html += '<img src="css/images/userdata/thumbs_down_off.png" alt="Set Did Not Like" title="Set Did Not Like" onclick="ItemDetailPage.setDislike();" />';
|
||||
html += '<img src="css/images/userdata/thumbs_up_on.png" alt="Liked" title="Liked" onclick="ItemDetailPage.clearLike();" />';
|
||||
var userData = item.UserData || {};
|
||||
|
||||
if (typeof userData.Likes == "undefined") {
|
||||
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_down_off.png" alt="Dislike" title="Dislike" onclick="ItemDetailPage.setDislike();" />';
|
||||
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_up_off.png" alt="Like" title="Like" onclick="ItemDetailPage.setLike();" />';
|
||||
} else if (userData.Likes) {
|
||||
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_down_off.png" alt="Dislike" title="Dislike" onclick="ItemDetailPage.setDislike();" />';
|
||||
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_up_on.png" alt="Liked" title="Like" onclick="ItemDetailPage.clearLike();" />';
|
||||
} else {
|
||||
html += '<img src="css/images/userdata/thumbs_down_on.png" alt="Did Not Like" title="Did Not Like" onclick="ItemDetailPage.clearLike();" />';
|
||||
html += '<img src="css/images/userdata/thumbs_up_off.png" alt="Set Liked" title="Set Liked" onclick="ItemDetailPage.setLike();" />';
|
||||
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_down_on.png" alt="Dislike" title="Dislike" onclick="ItemDetailPage.clearLike();" />';
|
||||
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_up_off.png" alt="Like" title="Like" onclick="ItemDetailPage.setLike();" />';
|
||||
}
|
||||
|
||||
if (item.UserData.IsFavorite) {
|
||||
html += '<img class="favorite" src="css/images/userdata/heart_on.png" alt="Make Not Favorite" title="Make Not Favorite" onclick="ItemDetailPage.setFavorite();" />';
|
||||
}else {
|
||||
html += '<img class="favorite" src="css/images/userdata/heart_off.png" alt="Make Favorite" title="Make Favorite" onclick="ItemDetailPage.setFavorite();" />';
|
||||
if (userData.IsFavorite) {
|
||||
html += '<img class="imgUserItemRating" src="css/images/userdata/heart_on.png" alt="Remove favorite" title="Remove favorite" onclick="ItemDetailPage.setFavorite();" />';
|
||||
} else {
|
||||
html += '<img class="imgUserItemRating" src="css/images/userdata/heart_off.png" alt="Mark favorite" title="Mark favorite" onclick="ItemDetailPage.setFavorite();" />';
|
||||
}
|
||||
|
||||
$('#itemFav', page).html(html);
|
||||
$('#itemRatings', page).html(html);
|
||||
},
|
||||
|
||||
setFavorite: function () {
|
||||
var item = ItemDetailPage.item;
|
||||
|
||||
item.UserData = item.UserData || {};
|
||||
|
||||
var setting = !item.UserData.IsFavorite;
|
||||
item.UserData.IsFavorite = setting;
|
||||
|
||||
|
|
@ -749,8 +753,11 @@
|
|||
},
|
||||
|
||||
setLike: function () {
|
||||
|
||||
var item = ItemDetailPage.item;
|
||||
|
||||
item.UserData = item.UserData || {};
|
||||
|
||||
item.UserData.Likes = true;
|
||||
|
||||
ApiClient.updateUserItemRating(Dashboard.getCurrentUserId(), item.Id, true);
|
||||
|
|
@ -759,9 +766,12 @@
|
|||
},
|
||||
|
||||
clearLike: function () {
|
||||
|
||||
var item = ItemDetailPage.item;
|
||||
|
||||
delete item.UserData.Likes;
|
||||
item.UserData = item.UserData || {};
|
||||
|
||||
item.UserData.Likes = undefined;
|
||||
|
||||
ApiClient.clearUserItemRating(Dashboard.getCurrentUserId(), item.Id);
|
||||
|
||||
|
|
@ -771,6 +781,8 @@
|
|||
setDislike: function () {
|
||||
var item = ItemDetailPage.item;
|
||||
|
||||
item.UserData = item.UserData || {};
|
||||
|
||||
item.UserData.Likes = false;
|
||||
|
||||
ApiClient.updateUserItemRating(Dashboard.getCurrentUserId(), item.Id, false);
|
||||
|
|
|
|||
|
|
@ -18,6 +18,8 @@
|
|||
query.parentId = parentId;
|
||||
|
||||
ApiClient.getItem(Dashboard.getCurrentUserId(), parentId).done(ItemListPage.renderTitle);
|
||||
} else {
|
||||
$('#itemName', $.mobile.activePage).html("Media Library");
|
||||
}
|
||||
|
||||
ItemListPage.refreshItems(query);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue