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-04-03 23:17:27 -07:00
commit af156714ee
6 changed files with 181 additions and 184 deletions
Download patch file Download diff file Expand all files Collapse all files

7
ApiClient.js
View file

@ -572,9 +572,12 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout) {
/**
* Gets a list of plugins that are available to be installed
*/
self.getAvailablePlugins = function () {
self.getAvailablePlugins = function (options) {
var url = self.getUrl("Packages", { PackageType: "UserInstalled" });
options = $.extend({}, options || {});
options.PackageType = "UserInstalled";
var url = self.getUrl("Packages", options);
return self.ajax({
type: "GET",

10
dashboard-ui/boxsets.html
View file

@ -4,14 +4,14 @@
<title>Media Browser</title>
</head>
<body>
<div id="boxsetsPage" data-role="page" class="page libraryPage noLogoPage" data-theme="a">
<div id="boxsetsPage" data-role="page" class="page libraryPage noLogoPage" data-theme="a">
<h1 class="libraryPageHeader"><a href="index.html" class="imageLink">
<img src="css/images/home.png"></a>Box Sets</h1>
<img src="css/images/home.png"></a>Movies</h1>
<div data-role="content">
<div data-role="controlgroup" data-type="horizontal" class="libraryViewNav" data-mini="true">
<a href="moviesrecommended.html" data-role="button">Recommended</a>
<a href="movies.html" data-role="button" class="ui-btn-active">Movies</a>
<a href="boxsets.html" data-role="button">Box Sets</a>
<a href="movies.html" data-role="button">Movies</a>
<a href="boxsets.html" data-role="button" class="ui-btn-active">Box Sets</a>
<a href="#" data-role="button">Genres</a>
<a href="#" data-role="button">Actors</a>
<a href="#" data-role="button">Directors</a>
@ -72,6 +72,6 @@
</fieldset>
</form>
</div>
</div>
</div>
</body>
</html>

12
dashboard-ui/plugincatalog.html
View file

@ -8,7 +8,7 @@
<div data-role="content">
<div class="content-primary">
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true">
<div data-role="controlgroup" data-type="horizontal" data-mini="true">
<a href="plugins.html" data-role="button">Installed Plugins</a>
<a href="plugincatalog.html" data-role="button" class="ui-btn-active">Plugin Catalog</a>
<a href="pluginupdates.html" data-role="button">Automatic Updates</a>
@ -28,18 +28,18 @@
<h3>Application:</h3>
</legend>
<input class="chkStandardFilter" type="checkbox" name="chkServer" id="chkServer" data-theme="c" data-filter="Server">
<label for="chkServer">Media Browser Server</label>
<label for="chkServer">MB Server</label>
<input class="chkStandardFilter" type="checkbox" name="chkTheatre" id="chkTheatre" data-theme="c" data-filter="MBTheatre">
<label for="chkTheatre">Media Browser Theatre</label>
<input class="chkStandardFilter" type="checkbox" name="chkTheatre" id="chkTheatre" data-theme="c" data-filter="MBTheater">
<label for="chkTheatre">MB Theater</label>
<input class="chkStandardFilter" type="checkbox" name="chkClassic" id="chkClassic" data-theme="c" data-filter="MBClassic">
<label for="chkClassic">Media Browser Classic</label>
<label for="chkClassic">MB Classic</label>
</fieldset>
<fieldset data-role="controlgroup">
<legend>
<h3> </h3>
<h3>Pricing:</h3>
</legend>
<input class="chkPremiumFilter" type="checkbox" name="chkPremium" id="chkPremium" data-theme="c" data-filter="IsPremium">
<label for="chkPremium">Premium</label>

22
dashboard-ui/scripts/plugincatalogpage.js
View file

@ -2,11 +2,9 @@
// The base query options
var query = {
IsPremium: false,
TargetSystems: ""
};
function reloadList() {
function reloadList(page) {
Dashboard.showLoadingMsg();
@ -14,15 +12,14 @@
var promise2 = ApiClient.getInstalledPlugins();
$.when(promise1, promise2).done(function (response1, response2) {
populateList(response1[0], response2[0]);
populateList(page, response1[0], response2[0]);
});
Dashboard.hideLoadingMsg();
}
function populateList(availablePlugins, installedPlugins) {
function populateList(page, availablePlugins, installedPlugins) {
var page = $($.mobile.activePage);
availablePlugins = availablePlugins.filter(function (p) {
return p.type == "UserInstalled";
}).sort(function (a, b) {
@ -82,7 +79,6 @@
var page = this;
$('.chkStandardFilter', this).on('change', function () {
var filterName = this.getAttribute('data-filter');
@ -96,25 +92,23 @@
query.TargetSystems = filters;
reloadList();
reloadList(page);
});
$('.chkPremiumFilter', this).on('change', function () {
var filterName = this.getAttribute('data-filter');
if (this.checked) {
query.IsPremium = true;
}else {
query.IsPremium = false;
} else {
query.IsPremium = null;
}
reloadList();
reloadList(page);
});
}).on('pageshow', "#pluginCatalogPage", function () {
reloadList();
reloadList(this);
// Reset form values using the last used query

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

@ -1009,7 +1009,7 @@ var Dashboard = {
type: "Primary"
});
if (!item.Id || !data.icon) {
if (!item.Id || !data.icon || data.icon == "undefined") {
alert("bad image url: " + JSON.stringify(item));
console.log("bad image url: " + JSON.stringify(item));

6
packages.config
View file

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.70" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.42" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.42" targetFramework="net45" />
<package id="MediaBrowser.ApiClient.Javascript" version="3.0.71" targetFramework="net45" />
<package id="ServiceStack.Common" version="3.9.43" targetFramework="net45" />
<package id="ServiceStack.Text" version="3.9.43" targetFramework="net45" />
</packages>