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
This commit is contained in:
Techywarrior 2013-03-31 15:45:18 -07:00
commit a846178a02
6 changed files with 30 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

10
dashboard-ui/index.html
View file

@ -6,7 +6,7 @@
<body> <body>
<div id="indexPage" data-role="page" class="page type-home libraryPage" data-theme="a"> <div id="indexPage" data-role="page" class="page type-home libraryPage" data-theme="a">
<div data-role="content"> <div data-role="content">
<h1>What's New <a href="itemlist.html?IsRecentlyAdded=true&Recursive=true&Title=Recently Added Items" class="imageLink"> <h1>What's New <a href="itemlist.html?SortBy=DateCreated&SortOrder=Descending&Recursive=true&Title=Recently Added" class="imageLink">
<img src="css/images/rightarrow.png" /></a></h1> <img src="css/images/rightarrow.png" /></a></h1>
<div id="divWhatsNew"></div> <div id="divWhatsNew"></div>
@ -18,13 +18,7 @@
<div id="divResumableItems"></div> <div id="divResumableItems"></div>
</div> </div>
<h1>My Library <a href="itemlist.html" class="imageLink"> <h1>Collections</h1>
<img src="css/images/rightarrow.png" /></a></h1>
<div id="divMyLibrary"></div>
<h1>Collections <a href="itemlist.html" class="imageLink">
<img src="css/images/rightarrow.png" /></a></h1>
<div id="divCollections"></div> <div id="divCollections"></div>
</div> </div>

4
dashboard-ui/itemdetails.html
View file

@ -24,6 +24,8 @@
<div class="itemDetailBlock"> <div class="itemDetailBlock">
<p id="itemRatings" style="text-align: right;">
</p>
<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>
@ -35,8 +37,6 @@
<p id="itemStudios"> <p id="itemStudios">
</p> </p>
<p id="itemRatings">
</p>
</div> </div>
</div> </div>

27
dashboard-ui/itemlist.html
View file

@ -34,28 +34,28 @@
<h3>Sort By:</h3> <h3>Sort By:</h3>
</legend> </legend>
<input data-theme="c" type="radio" name="radioSortBy" id="radioName" value="on" checked="checked"> <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioSortName" value="on" checked="checked">
<label for="radioName" onclick="ItemListPage.sortBy('SortName');">Name</label> <label for="radioSortName" onclick="ItemListPage.sortBy('SortName');">Name</label>
<input data-theme="c" type="radio" name="radioSortBy" id="radioCommunityRating" value="other"> <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioCommunityRating" value="other">
<label for="radioCommunityRating" onclick="ItemListPage.sortBy('CommunityRating');">Community Rating</label> <label for="radioCommunityRating" onclick="ItemListPage.sortBy('CommunityRating');">Community Rating</label>
<input data-theme="c" type="radio" name="radioSortBy" id="radioDateAdded" value="other"> <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioDateCreated" value="other">
<label for="radioDateAdded" onclick="ItemListPage.sortBy('DateCreated');">Date Added</label> <label for="radioDateCreated" onclick="ItemListPage.sortBy('DateCreated');">Date Added</label>
<input data-theme="c" type="radio" name="radioSortBy" id="radioDatePlayed" value="other"> <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioDatePlayed" value="other">
<label for="radioDatePlayed" onclick="ItemListPage.sortBy('DatePlayed');">Date Played</label> <label for="radioDatePlayed" onclick="ItemListPage.sortBy('DatePlayed');">Date Played</label>
<input data-theme="c" type="radio" name="radioSortBy" id="radioPremiereDate" value="other"> <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioPremiereDate" value="other">
<label for="radioPremiereDate" onclick="ItemListPage.sortBy('PremiereDate');">Date Released</label> <label for="radioPremiereDate" onclick="ItemListPage.sortBy('PremiereDate');">Date Released</label>
<input data-theme="c" type="radio" name="radioSortBy" id="radioPlayCount" value="off"> <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioPlayCount" value="off">
<label for="radioPlayCount" onclick="ItemListPage.sortBy('PlayCount');">Play Count</label> <label for="radioPlayCount" onclick="ItemListPage.sortBy('PlayCount');">Play Count</label>
<input data-theme="c" type="radio" name="radioSortBy" id="radioRandom" value="off"> <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioRandom" value="off">
<label for="radioRandom" onclick="ItemListPage.sortBy('Random');">Random</label> <label for="radioRandom" onclick="ItemListPage.sortBy('Random');">Random</label>
<input data-theme="c" type="radio" name="radioSortBy" id="radioRuntime" value="off"> <input class="radioSortBy" data-theme="c" type="radio" name="radioSortBy" id="radioRuntime" value="off">
<label for="radioRuntime" onclick="ItemListPage.sortBy('Runtime');">Runtime</label> <label for="radioRuntime" onclick="ItemListPage.sortBy('Runtime');">Runtime</label>
</fieldset> </fieldset>
@ -64,10 +64,10 @@
<h3>Sort Order:</h3> <h3>Sort Order:</h3>
</legend> </legend>
<input data-theme="c" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked"> <input class="radioSortOrder" data-theme="c" type="radio" name="radioSortOrder" id="radioAscending" value="on" checked="checked">
<label for="radioAscending" onclick="ItemListPage.sortOrder('Ascending');">Ascending</label> <label for="radioAscending" onclick="ItemListPage.sortOrder('Ascending');">Ascending</label>
<input data-theme="c" type="radio" name="radioSortOrder" id="radioDescending" value="other"> <input class="radioSortOrder" data-theme="c" type="radio" name="radioSortOrder" id="radioDescending" value="other">
<label for="radioDescending" onclick="ItemListPage.sortOrder('Descending');">Descending</label> <label for="radioDescending" onclick="ItemListPage.sortOrder('Descending');">Descending</label>
</fieldset> </fieldset>
</div> </div>
@ -92,9 +92,6 @@
<input type="checkbox" name="chkDislikes" id="chkDislikes" onchange="ItemListPage.filter('Dislikes', this.checked);" data-theme="c"> <input type="checkbox" name="chkDislikes" id="chkDislikes" onchange="ItemListPage.filter('Dislikes', this.checked);" data-theme="c">
<label for="chkDislikes">Dislikes</label> <label for="chkDislikes">Dislikes</label>
<input type="checkbox" name="chkRecentlyAdded" id="chkRecentlyAdded" onchange="ItemListPage.filter('IsRecentlyAdded', this.checked);" data-theme="c">
<label for="chkRecentlyAdded">Recently added</label>
<input type="checkbox" name="chkResumable" id="chkResumable" onchange="ItemListPage.filter('IsResumable', this.checked);" data-theme="c"> <input type="checkbox" name="chkResumable" id="chkResumable" onchange="ItemListPage.filter('IsResumable', this.checked);" data-theme="c">
<label for="chkResumable">Resumable</label> <label for="chkResumable">Resumable</label>
</fieldset> </fieldset>

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

@ -731,9 +731,9 @@
} }
if (userData.IsFavorite) { if (userData.IsFavorite) {
html += '<img class="imgUserItemRating" src="css/images/userdata/heart_on.png" alt="Favorite" title="Remove favorite" onclick="ItemDetailPage.setFavorite();" />'; html += '<img class="imgUserItemRating" src="css/images/userdata/heart_on.png" alt="Favorite" title="Favorite" onclick="ItemDetailPage.setFavorite();" />';
} else { } else {
html += '<img class="imgUserItemRating" src="css/images/userdata/heart_off.png" alt="Favorite" title="Mark favorite" onclick="ItemDetailPage.setFavorite();" />'; html += '<img class="imgUserItemRating" src="css/images/userdata/heart_off.png" alt="Favorite" title="Favorite" onclick="ItemDetailPage.setFavorite();" />';
} }
$('#itemRatings', page).html(html); $('#itemRatings', page).html(html);

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

@ -70,37 +70,6 @@
})); }));
}); });
IndexPage.loadMyLibrary(userId, page);
},
loadMyLibrary: function (userId, page) {
var items = [{
Name: "Recently Played",
IsFolder: true
}, {
Name: "Favorites",
IsFolder: true,
url: "itemlist.html?IsFavorite=true&Recursive=true&Title=Favorites"
}, {
Name: "Genres",
IsFolder: true
}, {
Name: "Studios",
IsFolder: true
}, {
Name: "Performers",
IsFolder: true
}, {
Name: "Directors",
IsFolder: true
}];
$('#divMyLibrary', page).html(Dashboard.getPosterViewHtml({
items: items,
showTitle: true
}));
} }
}; };

15
dashboard-ui/scripts/itemlistpage.js
View file

@ -13,7 +13,6 @@
var query = { var query = {
Fields: "PrimaryImageAspectRatio", Fields: "PrimaryImageAspectRatio",
SortBy: "SortName",
Recursive: getParameterByName('Recursive') == 'true' Recursive: getParameterByName('Recursive') == 'true'
}; };
@ -34,7 +33,19 @@
$('#chkRecentlyAdded', page).checked(true).checkboxradio("refresh"); $('#chkRecentlyAdded', page).checked(true).checkboxradio("refresh");
} }
var sortBy = getParameterByName('SortBy') || 'SortName';
query.SortBy = sortBy;
$('.radioSortBy', page).checked(false).checkboxradio("refresh");
$('#radio' + sortBy, page).checked(true).checkboxradio("refresh");
var order = getParameterByName('SortOrder') || 'Ascending';
query.SortOrder = order;
$('.radioSortOrder', page).checked(false).checkboxradio("refresh");
$('#radio' + order, page).checked(true).checkboxradio("refresh");
query.Filters = filters.join(','); query.Filters = filters.join(',');
//query.limit = 100;
if (parentId) { if (parentId) {
query.parentId = parentId; query.parentId = parentId;
@ -112,8 +123,6 @@
query.Filters = filters; query.Filters = filters;
query.Recursive = filters.length ? true : false;
ItemListPage.refreshItems(query); ItemListPage.refreshItems(query);
}, },