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

update sync progress display

Browse source
This commit is contained in:
Luke Pulverenti 2015-10-02 14:30:27 -04:00
parent ee8e4e5e0a
commit db4ed3c645
4 changed files with 31 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/mysync.html
View file

@ -10,13 +10,13 @@
<div class="supporterPromotionContainer" style="display:none;text-align: right;"> <div class="supporterPromotionContainer" style="display:none;text-align: right;">
<div class="customSupporterPromotion supporterPromotion inlineSupporterPromotion"> <div class="customSupporterPromotion supporterPromotion inlineSupporterPromotion">
<a class="btn btnActionAccent" href="http://emby.media/premiere" target="_blank" style="font-size:14px;"> <paper-button raised class="accent block btnSyncSupporter">
<div class="mainText"> <div class="mainText">
</div> </div>
<div class="btnLearnMore" style="font-weight: normal; font-size: 90%; margin-top: 5px;"> <div class="btnLearnMore" style="font-weight: normal; font-size: 90%; margin-top: 5px;">
${ButtonLearnMore} ${ButtonLearnMore}
</div> </div>
</a> </paper-button>
</div> </div>
</div> </div>
<div class="ehsContent" style="clear:both;"> <div class="ehsContent" style="clear:both;">

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

@ -165,6 +165,12 @@
}); });
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) { $('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
if (layout == 'Timeline') {
getQuery().SortBy = 'PremiereDate,SortName';
getQuery().SortOrder = 'Descending';
}
getPageData().view = layout; getPageData().view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout); LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout);
reloadItems(page, viewPanel); reloadItems(page, viewPanel);

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

@ -61,7 +61,8 @@
addLayoutButton: true, addLayoutButton: true,
currentLayout: view, currentLayout: view,
updatePageSizeSetting: false, updatePageSizeSetting: false,
viewIcon: 'filter-list' viewIcon: 'filter-list',
layouts: 'List,Poster,PosterCard,Timeline'
}); });
page.querySelector('.listTopPaging').innerHTML = pagingHtml; page.querySelector('.listTopPaging').innerHTML = pagingHtml;
@ -128,6 +129,12 @@
}); });
$('.btnChangeLayout', page).on('layoutchange', function (e, layout) { $('.btnChangeLayout', page).on('layoutchange', function (e, layout) {
if (layout == 'Timeline') {
getQuery().SortBy = 'PremiereDate,SortName';
getQuery().SortOrder = 'Descending';
}
getPageData().view = layout; getPageData().view = layout;
LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout); LibraryBrowser.saveViewSetting(getSavedQueryKey(), layout);
reloadItems(page, viewPanel); reloadItems(page, viewPanel);

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

@ -392,7 +392,20 @@
} }
$(document).on('pageshow', ".syncActivityPage", function () { $(document).on('pageinit', ".syncActivityPage", function () {
var page = this;
$('.btnSyncSupporter', page).on('click', function () {
requirejs(["scripts/registrationservices"], function () {
RegistrationServices.validateFeature('sync').done(function () {
});
});
});
$('.supporterPromotion .mainText', page).html(Globalize.translate('HeaderSyncRequiresSupporterMembership'));
}).on('pageshow', ".syncActivityPage", function () {
var page = this; var page = this;
@ -402,16 +415,6 @@
$('.supporterPromotionContainer', page).hide(); $('.supporterPromotionContainer', page).hide();
} else { } else {
$('.supporterPromotionContainer', page).show(); $('.supporterPromotionContainer', page).show();
if (AppInfo.enableSupporterMembership) {
$('.supporterPromotion a', page).attr('href', 'http://emby.media/premiere');
$('.supporterPromotion .btnLearnMore', page).show();
$('.supporterPromotion .mainText', page).html(Globalize.translate('HeaderSyncRequiresSupporterMembership'));
} else {
$('.supporterPromotion a', page).attr('href', '#');
$('.supporterPromotion .btnLearnMore', page).hide();
$('.supporterPromotion .mainText', page).html(Globalize.translate('HeaderSyncRequiresSupporterMembershipAppVersion'));
}
} }
}); });