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

sync updates

Browse source
This commit is contained in:
Luke Pulverenti 2015-01-24 17:33:26 -05:00
parent 543d70fdf6
commit a1a3326761
6 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1047,7 +1047,7 @@ h1 + .accentButton {
margin: 1em 0; margin: 1em 0;
} }
@media all and (min-width: 1200px) { @media all and (min-width: 800px) {
.supporterPromotion { .supporterPromotion {
position: absolute; position: absolute;

2
dashboard-ui/dashboard.html
View file

@ -15,7 +15,7 @@
</div> </div>
<div class="dashboardContent"> <div class="dashboardContent">
<div class="supporterPromotion" style="display:none;"> <div class="supporterPromotion" style="display:none;">
<a class="btn btnActionAccent" href="supporter.html"> <a class="btn btnActionAccent" href="supporter.html" style="font-size:14px;">
<div> <div>
${HeaderBecomeMediaBrowserSupporter} ${HeaderBecomeMediaBrowserSupporter}
</div> </div>

14
dashboard-ui/scripts/channelsettings.js
View file

@ -29,13 +29,7 @@
$('.channelDownloadingList', page).html(html).trigger('create'); $('.channelDownloadingList', page).html(html).trigger('create');
} }
function loadPage(page, config, allChannelFeatures, supporterInfo) { function loadPage(page, config, allChannelFeatures) {
if (supporterInfo.IsMBSupporter) {
$('#txtDownloadSizeLimit', page).attr('max', '100');
} else {
$('#txtDownloadSizeLimit', page).attr('max', '.5');
}
if (allChannelFeatures.length) { if (allChannelFeatures.length) {
$('.noChannelsHeader', page).hide(); $('.noChannelsHeader', page).hide();
@ -92,15 +86,13 @@
var promise1 = ApiClient.getNamedConfiguration("channels"); var promise1 = ApiClient.getNamedConfiguration("channels");
var promise2 = ApiClient.getJSON(ApiClient.getUrl("Channels/Features")); var promise2 = ApiClient.getJSON(ApiClient.getUrl("Channels/Features"));
var promise3 = Dashboard.getPluginSecurityInfo();
$.when(promise1, promise2, promise3).done(function (response1, response2, response3) { $.when(promise1, promise2).done(function (response1, response2) {
var config = response1[0]; var config = response1[0];
var allFeatures = response2[0]; var allFeatures = response2[0];
var supporterInfo = response3;
loadPage(page, config, allFeatures, supporterInfo); loadPage(page, config, allFeatures);
}); });

6
dashboard-ui/scripts/moviecollections.js
View file

@ -232,13 +232,15 @@
if (context == 'movies') { if (context == 'movies') {
$('.collectionTabs', page).hide(); $('.collectionTabs', page).hide();
$('.movieTabs', page).show(); $('.movieTabs', page).show();
// TODO: Improve in the future to limit scope
query.ParentId = null;
} else { } else {
$('.collectionTabs', page).show(); $('.collectionTabs', page).show();
$('.movieTabs', page).hide(); $('.movieTabs', page).hide();
query.ParentId = LibraryMenu.getTopParentId();
} }
//query.ParentId = LibraryMenu.getTopParentId();
var limit = LibraryBrowser.getDefaultPageSize(); var limit = LibraryBrowser.getDefaultPageSize();
// If the default page size has changed, the start index will have to be reset // If the default page size has changed, the start index will have to be reset

9
dashboard-ui/scripts/syncactivity.js
View file

@ -246,6 +246,15 @@
var page = this; var page = this;
Dashboard.getPluginSecurityInfo().done(function (pluginSecurityInfo) {
if (pluginSecurityInfo.IsMBSupporter) {
$('.syncPromotion', page).hide();
} else {
$('.syncPromotion', page).show();
}
});
reloadData(page); reloadData(page);
// on here // on here

13
dashboard-ui/syncactivity.html
View file

@ -19,6 +19,19 @@
<progress max="100" min="0" style="width:100px;display:none;" class="syncProgress"></progress> <progress max="100" min="0" style="width:100px;display:none;" class="syncProgress"></progress>
</div> </div>
<br /> <br />
<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 class="syncActivity"> <div class="syncActivity">
</div> </div>