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

fixed series/album title in now playing bar, played/unplayed toggle

Browse source
This commit is contained in:
Techywarrior 2013-04-01 13:26:13 -07:00
parent 10aacca355
commit 51e8bf14c7
3 changed files with 40 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -701,15 +701,21 @@ progress {
background-position: right center; background-position: right center;
} }
.userItemRating {
height: 24px;
width: 24px;
margin-right: 1em;
overflow: hidden;
display: inline-block;
}
.imgUserItemRating { .imgUserItemRating {
height: 24px; height: 24px;
margin-right: 1em;
cursor: pointer; cursor: pointer;
} }
.imgUserItemRating:hover { .imgUserItemRating:hover {
opacity: .5; opacity: .5;
} }
@media all and (min-width: 650px) { @media all and (min-width: 650px) {
.itemImageBlock { .itemImageBlock {

36
dashboard-ui/scripts/Itemdetailpage.js
View file

@ -722,20 +722,27 @@
var userData = item.UserData || {}; var userData = item.UserData || {};
if (typeof userData.Likes == "undefined") { 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 += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/thumbs_down_off.png" alt="Dislike" title="Dislike" onclick="ItemDetailPage.setDislike();" /></div>';
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_up_off.png" alt="Like" title="Like" onclick="ItemDetailPage.setLike();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/thumbs_up_off.png" alt="Like" title="Like" onclick="ItemDetailPage.setLike();" /></div>';
} else if (userData.Likes) { } else if (userData.Likes) {
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_down_off.png" alt="Dislike" title="Dislike" onclick="ItemDetailPage.setDislike();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/thumbs_down_off.png" alt="Dislike" title="Dislike" onclick="ItemDetailPage.setDislike();" /></div>';
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_up_on.png" alt="Liked" title="Like" onclick="ItemDetailPage.clearLike();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/thumbs_up_on.png" alt="Liked" title="Like" onclick="ItemDetailPage.clearLike();" /></div>';
} else { } else {
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_down_on.png" alt="Dislike" title="Dislike" onclick="ItemDetailPage.clearLike();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/thumbs_down_on.png" alt="Dislike" title="Dislike" onclick="ItemDetailPage.clearLike();" /></div>';
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_up_off.png" alt="Like" title="Like" onclick="ItemDetailPage.setLike();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/thumbs_up_off.png" alt="Like" title="Like" onclick="ItemDetailPage.setLike();" /></div>';
} }
if (userData.IsFavorite) { if (userData.IsFavorite) {
html += '<img class="imgUserItemRating" src="css/images/userdata/heart_on.png" alt="Favorite" title="Favorite" onclick="ItemDetailPage.setFavorite();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/heart_on.png" alt="Favorite" title="Favorite" onclick="ItemDetailPage.setFavorite();" /></div>';
} else { } else {
html += '<img class="imgUserItemRating" src="css/images/userdata/heart_off.png" alt="Favorite" title="Favorite" onclick="ItemDetailPage.setFavorite();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/heart_off.png" alt="Favorite" title="Favorite" onclick="ItemDetailPage.setFavorite();" /></div>';
}
//played/unplayed
if (userData.Played) {
html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/played.png" alt="Played" title="Played" onclick="ItemDetailPage.setPlayed();" /></div>';
} else {
html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/unplayed.png" alt="Unplayed" title="Unplayed" onclick="ItemDetailPage.setPlayed();" /></div>';
} }
$('#itemRatings', page).html(html); $('#itemRatings', page).html(html);
@ -789,6 +796,19 @@
ApiClient.updateUserItemRating(Dashboard.getCurrentUserId(), item.Id, false); ApiClient.updateUserItemRating(Dashboard.getCurrentUserId(), item.Id, false);
ItemDetailPage.renderFav(item);
},
setPlayed: function () {
var item = ItemDetailPage.item;
item.UserData = item.UserData || {};
var setting = !item.UserData.Played;
item.UserData.Played = setting;
ApiClient.updatePlayedStatus(Dashboard.getCurrentUserId(), item.Id, setting);
ItemDetailPage.renderFav(item); ItemDetailPage.renderFav(item);
} }

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

@ -114,7 +114,7 @@
} }
html += "<div><img class='nowPlayingBarImage ' alt='' title='' src='" + url + "' style='height:36px;display:inline-block;' /></div>"; html += "<div><img class='nowPlayingBarImage ' alt='' title='' src='" + url + "' style='height:36px;display:inline-block;' /></div>";
html += '<div>' + name + '<br/>' + series_name + '</div>'; html += '<div>' + series_name + '<br/>' + name + '</div>';
$('#mediaInfo', nowPlayingBar).html(html); $('#mediaInfo', nowPlayingBar).html(html);
}, },