mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
sync updates
This commit is contained in:
parent
e3091927f0
commit
3cd1cab51f
8 changed files with 87 additions and 3 deletions
BIN
dashboard-ui/css/images/clients/androidtv-tile.png
Normal file
BIN
dashboard-ui/css/images/clients/androidtv-tile.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 30 KiB |
|
@ -76,8 +76,7 @@
|
||||||
|
|
||||||
var keys = new bindKeys(self);
|
var keys = new bindKeys(self);
|
||||||
|
|
||||||
$(window).on("keydown", keys.keyBinding);
|
$(window).on("keydown", keys.keyBinding).on("keypress keyup", keys.keyPrevent);
|
||||||
$(window).on("keypress keyup", keys.keyPrevent);
|
|
||||||
|
|
||||||
self.registerPlayer = function (player) {
|
self.registerPlayer = function (player) {
|
||||||
|
|
||||||
|
|
|
@ -68,7 +68,6 @@ var Dashboard = {
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
Dashboard.hideLoadingMsg();
|
Dashboard.hideLoadingMsg();
|
||||||
|
|
||||||
if (!Dashboard.suppressAjaxErrors) {
|
if (!Dashboard.suppressAjaxErrors) {
|
||||||
|
|
|
@ -121,3 +121,47 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
$(document).on('pageshow', "#supporterKeyPage", SupporterKeyPage.onPageShow);
|
$(document).on('pageshow', "#supporterKeyPage", SupporterKeyPage.onPageShow);
|
||||||
|
|
||||||
|
(function () {
|
||||||
|
|
||||||
|
function loadConnectSupporters(page) {
|
||||||
|
|
||||||
|
$('.linkSupporterKeyMessage', page).html(Globalize.translate('MessageLinkYourSupporterKey', 5));
|
||||||
|
|
||||||
|
Dashboard.suppressAjaxErrors = true;
|
||||||
|
|
||||||
|
ApiClient.ajax({
|
||||||
|
type: "GET",
|
||||||
|
url: ApiClient.getUrl('Connect/Supporters'),
|
||||||
|
dataType: "json",
|
||||||
|
|
||||||
|
error: function () {
|
||||||
|
// Don't show normal dashboard errors
|
||||||
|
},
|
||||||
|
|
||||||
|
enableGlobalAjaxListener: false
|
||||||
|
|
||||||
|
}).done(function () {
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}).fail(function () {
|
||||||
|
|
||||||
|
$('.supporters', page).html('<p>' + Globalize.translate('MessageErrorLoadingSupporterInfo') + '</p>');
|
||||||
|
|
||||||
|
}).always(function () {
|
||||||
|
|
||||||
|
Dashboard.suppressAjaxErrors = false;
|
||||||
|
|
||||||
|
});
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
$(document).on('pageshow', "#supporterKeyPage", function () {
|
||||||
|
|
||||||
|
var page = this;
|
||||||
|
loadConnectSupporters(page);
|
||||||
|
});
|
||||||
|
|
||||||
|
})();
|
|
@ -51,6 +51,16 @@
|
||||||
var page = this;
|
var page = this;
|
||||||
|
|
||||||
reloadList(page);
|
reloadList(page);
|
||||||
|
|
||||||
|
Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {
|
||||||
|
|
||||||
|
if (pluginSecurityInfo.IsMBSupporter) {
|
||||||
|
$('.syncPromotion', page).hide();
|
||||||
|
} else {
|
||||||
|
$('.syncPromotion', page).show();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
})(jQuery, document);
|
})(jQuery, document);
|
|
@ -86,6 +86,19 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<br />
|
||||||
|
<h1>${HeaderSupporterBenefits}</h1>
|
||||||
|
<p class="linkSupporterKeyMessage"></p>
|
||||||
|
<a href="https://play.google.com/store/apps/details?id=tv.mediabrowser.mediabrowsertv" target="_blank" title="Android TV">
|
||||||
|
<img src="css/images/clients/androidtv-tile.png" style="height:60px;" />
|
||||||
|
</a>
|
||||||
|
<br />
|
||||||
|
<br />
|
||||||
|
<div class="supporters">
|
||||||
|
|
||||||
|
</div>
|
||||||
|
<button type="button" id="btnAddConnectUser" data-icon="plus">Add User</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -23,6 +23,19 @@
|
||||||
<div class="detailSectionHeader">${HeaderAvailableServices}</div>
|
<div class="detailSectionHeader">${HeaderAvailableServices}</div>
|
||||||
<div class="catalog"></div>
|
<div class="catalog"></div>
|
||||||
|
|
||||||
|
<div class="supporterPromotion syncPromotion" style="display:none;">
|
||||||
|
<a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;">
|
||||||
|
<div>
|
||||||
|
${HeaderSyncRequiresSupporterMembership}
|
||||||
|
</div>
|
||||||
|
<div>
|
||||||
|
${HeaderEnjoyDayTrial}
|
||||||
|
</div>
|
||||||
|
<div style="font-weight:normal;font-size:90%;margin-top:5px;">
|
||||||
|
${ButtonLearnMore}
|
||||||
|
</div>
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -18,6 +18,12 @@
|
||||||
</h3>
|
</h3>
|
||||||
</div>
|
</div>
|
||||||
<div class="localUsers" style="text-align:left;margin-top:.5em;"></div>
|
<div class="localUsers" style="text-align:left;margin-top:.5em;"></div>
|
||||||
|
<!--<div style="position:relative;margin-top:1em;">
|
||||||
|
<a href="http://mediabrowser.tv/connect" target="_blank">
|
||||||
|
<div class="playedIndicator" style="left:5px;right:inherit;top:0;"><div class="ui-icon-cloud ui-btn-icon-notext"></div></div>
|
||||||
|
</a>
|
||||||
|
<span style="padding-left:33px;vertical-align:middle;">${LinkedToMediaBrowserConnect}</span>
|
||||||
|
</div>-->
|
||||||
|
|
||||||
<div class="detailSectionHeader" style="margin-top:2.5em;">
|
<div class="detailSectionHeader" style="margin-top:2.5em;">
|
||||||
<h3 style="margin:.6em 0;">
|
<h3 style="margin:.6em 0;">
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue