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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse source 
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/scripts/boxset.js
This commit is contained in:
Techywarrior 2013-04-04 22:27:27 -07:00
commit aa1ddf55e7
2 changed files with 42 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

52
dashboard-ui/boxset.html
View file

@ -1,40 +1,40 @@
<!DOCTYPE html> <!DOCTYPE html>
<html> <html>
<head> <head>
<title></title> <title></title>
</head> </head>
<body> <body>
<div id="boxsetPage" data-role="page" class="page libraryPage" data-theme="a"> <div id="boxsetPage" data-role="page" class="page libraryPage" data-theme="a">
<div data-role="content" style="padding-top: 0;"> <div data-role="content" style="padding-top: 0;">
<h1 id="seriesName" style="padding-left: 10px; margin: 0;" class="hide"></h1> <h1 id="seriesName" style="padding-left: 10px; margin: 0;" class="hide"></h1>
<h1 id="itemName" style="padding-left: 10px; margin: 0;"></h1> <h1 id="itemName" style="padding-left: 10px; margin: 0;"></h1>
<div style="padding: 10px;"> <div style="padding: 10px;">
<div class="itemImageBlock"> <div class="itemImageBlock">
<div id="itemMedia" style="position: relative;"> <div id="itemMedia" style="position: relative;">
<div id="itemImage"></div> <div id="itemImage"></div>
</div> </div>
</div> </div>
<div class="itemDetailBlock"> <div class="itemDetailBlock">
<p id="itemTagline" style="font-style: italic;"></p> <p id="itemTagline" style="font-style: italic;"></p>
<p id="itemOverview"></p> <p id="itemOverview"></p>
<p id="itemCommunityRating"></p> <p id="itemCommunityRating"></p>
<p id="itemMiscInfo" style="color: #ddd; font-size: 14px;"></p> <p id="itemMiscInfo" style="color: #ddd; font-size: 14px;"></p>
<p id="itemGenres"> <p id="itemGenres">
</p> </p>
<p id="itemStudios"> <p id="itemStudios">
</p> </p>
<p id="itemRatings"> <p id="itemRatings">
</p> </p>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</body> </body>
</html> </html>

32
dashboard-ui/scripts/boxset.js
View file

@ -255,28 +255,28 @@
var userData = item.UserData || {}; var userData = item.UserData || {};
//played/unplayed if (typeof userData.Likes == "undefined") {
if (userData.Played) { html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/thumbs_down_off.png" alt="Dislike" title="Dislike" onclick="BoxsetPage.setDislike();" /></div>';
html += '<img class="imgUserItemRating" src="css/images/userdata/played.png" alt="Played" title="Played" onclick="BoxsetPage.setPlayed();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/thumbs_up_off.png" alt="Like" title="Like" onclick="BoxsetPage.setLike();" /></div>';
} else {
html += '<img class="imgUserItemRating" src="css/images/userdata/unplayed.png" alt="Unplayed" title="Unplayed" onclick="BoxsetPage.setPlayed();" />';
}
if (typeof userData.Likes == "undefined") {
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_down_off.png" alt="Dislike" title="Dislike" onclick="BoxsetPage.setDislike();" />';
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_up_off.png" alt="Like" title="Like" onclick="BoxsetPage.setLike();" />';
} 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="BoxsetPage.setDislike();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/thumbs_down_off.png" alt="Dislike" title="Dislike" onclick="BoxsetPage.setDislike();" /></div>';
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_up_on.png" alt="Liked" title="Like" onclick="BoxsetPage.clearLike();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/thumbs_up_on.png" alt="Liked" title="Like" onclick="BoxsetPage.clearLike();" /></div>';
} else { } else {
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_down_on.png" alt="Dislike" title="Dislike" onclick="BoxsetPage.clearLike();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/thumbs_down_on.png" alt="Dislike" title="Dislike" onclick="BoxsetPage.clearLike();" /></div>';
html += '<img class="imgUserItemRating" src="css/images/userdata/thumbs_up_off.png" alt="Like" title="Like" onclick="BoxsetPage.setLike();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/thumbs_up_off.png" alt="Like" title="Like" onclick="BoxsetPage.setLike();" /></div>';
} }
if (userData.IsFavorite) { if (userData.IsFavorite) {
html += '<img class="imgUserItemRating" src="css/images/userdata/heart_on.png" alt="Favorite" title="Favorite" onclick="BoxsetPage.setFavorite();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/heart_on.png" alt="Favorite" title="Favorite" onclick="BoxsetPage.setFavorite();" /></div>';
} else { } else {
html += '<img class="imgUserItemRating" src="css/images/userdata/heart_off.png" alt="Favorite" title="Favorite" onclick="BoxsetPage.setFavorite();" />'; html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/heart_off.png" alt="Favorite" title="Favorite" onclick="BoxsetPage.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="BoxsetPage.setPlayed();" /></div>';
} else {
html += '<div class="userItemRating"><img class="imgUserItemRating" src="css/images/userdata/unplayed.png" alt="Unplayed" title="Unplayed" onclick="BoxsetPage.setPlayed();" /></div>';
} }
$('#itemRatings', page).html(html); $('#itemRatings', page).html(html);