1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update dialogs

This commit is contained in:
Luke Pulverenti 2016-05-16 13:11:49 -04:00
parent f00fc6ad15
commit 3cc014002e
20 changed files with 71 additions and 90 deletions

View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.3.37", "version": "1.3.39",
"_release": "1.3.37", "_release": "1.3.39",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.3.37", "tag": "1.3.39",
"commit": "43c74d495f1fbdae6d86ac6608e934d396069806" "commit": "51bc3e7758132f864fa17488be6f233a55537087"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

View file

@ -35,6 +35,10 @@
max-width: 700px; max-width: 700px;
} }
.formDialog .dialogContentTitle {
margin-top: 1em;
}
@media all and (min-width: 1000px) { @media all and (min-width: 1000px) {
.layout-tv .formDialog .centeredContent { .layout-tv .formDialog .centeredContent {
@ -42,6 +46,13 @@
} }
} }
@media all and (max-height: 1400px) {
.itemOverview {
display: none;
}
}
.layout-tv .formDialog .dialogHeader { .layout-tv .formDialog .dialogHeader {
padding-top: 1.5em; padding-top: 1.5em;
padding-bottom: 1.5em; padding-bottom: 1.5em;

View file

@ -1,5 +1,5 @@
.recordingDialog .btnSubmit { .recordingDialog .btnSubmit iron-icon {
background-color: #cc3333; color: #cc3333;
} }
.layout-tv .btnHeaderSave { .layout-tv .btnHeaderSave {

View file

@ -7,7 +7,7 @@
<div class="dialogContent smoothScrollY"> <div class="dialogContent smoothScrollY">
<form class="dialogContentInner centeredContent"> <form class="dialogContentInner centeredContent">
<h1 class="itemName"></h1> <h1 class="itemName dialogContentTitle"></h1>
<p class="itemEpisodeName"></p> <p class="itemEpisodeName"></p>
<p class="itemMiscInfoPrimary" style="display: flex; align-items: center;"></p> <p class="itemMiscInfoPrimary" style="display: flex; align-items: center;"></p>
<p class="itemMiscInfoSecondary" style="display: flex; align-items: center;"></p> <p class="itemMiscInfoSecondary" style="display: flex; align-items: center;"></p>
@ -68,10 +68,7 @@
<p class="supporterTrial hide">${HeaderEnjoyDayTrial}</p> <p class="supporterTrial hide">${HeaderEnjoyDayTrial}</p>
<a class="clearLink btnSupporter hide" href="http://emby.media/premiere" target="_blank"><paper-button raised class="accent block"><iron-icon icon="nav:check"></iron-icon><span>${HeaderBecomeProjectSupporter}</span></paper-button></a> <a class="clearLink btnSupporter hide" href="http://emby.media/premiere" target="_blank"><paper-button raised class="accent block"><iron-icon icon="nav:check"></iron-icon><span>${HeaderBecomeProjectSupporter}</span></paper-button></a>
</div> </div>
<paper-button raised class="btnSubmit block"><iron-icon icon="mediainfo:fiber-manual-record"></iron-icon><span>${Record}</span></paper-button> <paper-button raised class="btnSubmit block" autofocus><iron-icon icon="mediainfo:fiber-manual-record"></iron-icon><span>${Record}</span></paper-button>
</div> </div>
<br />
<br />
<br />
</form> </form>
</div> </div>

View file

@ -13,7 +13,7 @@
<div class="dialogContent smoothScrollY"> <div class="dialogContent smoothScrollY">
<div class="dialogContentInner centeredContent"> <div class="dialogContentInner centeredContent">
<h1 class="itemName"></h1> <h1 class="itemName dialogContentTitle"></h1>
<p class="itemEpisodeName"></p> <p class="itemEpisodeName"></p>
<p class="itemMiscInfoPrimary" style="display: flex; align-items: center;"></p> <p class="itemMiscInfoPrimary" style="display: flex; align-items: center;"></p>
<p class="itemMiscInfoSecondary" style="display: flex; align-items: center;"></p> <p class="itemMiscInfoSecondary" style="display: flex; align-items: center;"></p>
@ -24,7 +24,6 @@
</p> </p>
<form> <form>
<br />
<div> <div>
<paper-input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}"></paper-input> <paper-input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPrePaddingMinutes}"></paper-input>
</div> </div>
@ -33,11 +32,7 @@
<paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"></paper-input> <paper-input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" label="${LabelPostPaddingMinutes}"></paper-input>
</div> </div>
<br /> <br />
<br /> <paper-button raised class="btnSubmit block" autofocus><iron-icon icon="mediainfo:fiber-manual-record"></iron-icon><span>${Save}</span></paper-button>
<paper-button raised class="btnSubmit block"><iron-icon icon="mediainfo:fiber-manual-record"></iron-icon><span>${Save}</span></paper-button>
<br />
<br />
<br />
</form> </form>
</div> </div>
</div> </div>

View file

@ -30,14 +30,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/iron-a11y-keys-behavior", "homepage": "https://github.com/PolymerElements/iron-a11y-keys-behavior",
"_release": "1.1.2", "_release": "1.1.2",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.2", "tag": "v1.1.2",
"commit": "0c2330c229a6fd3d200e2b84147ec6f94f17c22d" "commit": "0c2330c229a6fd3d200e2b84147ec6f94f17c22d"
}, },
"_source": "git://github.com/polymerelements/iron-a11y-keys-behavior.git", "_source": "git://github.com/PolymerElements/iron-a11y-keys-behavior.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-a11y-keys-behavior" "_originalSource": "PolymerElements/iron-a11y-keys-behavior"
} }

View file

@ -34,6 +34,6 @@
"commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514" "commit": "11c987b2eb3c73b388a79fc8aaea8ca01624f514"
}, },
"_source": "git://github.com/Polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.0.0", "_target": "^1.2.0",
"_originalSource": "Polymer/polymer" "_originalSource": "Polymer/polymer"
} }

View file

@ -76,7 +76,7 @@
var mdlTabs = page.querySelector('.libraryViewNav'); var mdlTabs = page.querySelector('.libraryViewNav');
libraryBrowser.configurePaperLibraryTabs(page, mdlTabs, page.querySelectorAll('.pageTabContent'), true); libraryBrowser.configurePaperLibraryTabs(page, mdlTabs, page.querySelectorAll('.pageTabContent'), [0, 1]);
mdlTabs.addEventListener('tabchange', function (e) { mdlTabs.addEventListener('tabchange', function (e) {
loadTab(page, parseInt(e.detail.selectedTabIndex)); loadTab(page, parseInt(e.detail.selectedTabIndex));

View file

@ -9,13 +9,9 @@
function loadNextUp(page) { function loadNextUp(page) {
var limit = AppInfo.hasLowImageBandwidth ?
16 :
24;
var query = { var query = {
Limit: limit, Limit: 24,
Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo", Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo",
UserId: Dashboard.getCurrentUserId(), UserId: Dashboard.getCurrentUserId(),
ImageTypeLimit: 1, ImageTypeLimit: 1,

View file

@ -3,13 +3,9 @@
function loadUpcoming(page) { function loadUpcoming(page) {
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var limit = AppInfo.hasLowImageBandwidth && !enableScrollX() ?
24 :
40;
var query = { var query = {
Limit: limit, Limit: 40,
Fields: "AirTime,UserData,SeriesStudio,SyncInfo", Fields: "AirTime,UserData,SeriesStudio,SyncInfo",
UserId: Dashboard.getCurrentUserId(), UserId: Dashboard.getCurrentUserId(),
ImageTypeLimit: 1, ImageTypeLimit: 1,

View file

@ -249,7 +249,7 @@
var mdlTabs = view.querySelector('.libraryViewNav'); var mdlTabs = view.querySelector('.libraryViewNav');
libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), true); libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0,1,2,3]);
var tabControllers = []; var tabControllers = [];
var renderedTabs = []; var renderedTabs = [];

View file

@ -13,6 +13,21 @@
return elem; return elem;
} }
function fadeInRight(elem) {
var pct = browserInfo.mobile ? '2%' : '1%';
var keyframes = [
{ opacity: '0', transform: 'translate3d(' + pct + ', 0, 0)', offset: 0 },
{ opacity: '1', transform: 'none', offset: 1 }];
elem.animate(keyframes, {
duration: 300,
iterations: 1,
easing: 'ease-out'
});
}
var libraryBrowser = (function (window, document, screen) { var libraryBrowser = (function (window, document, screen) {
// Regular Expressions for parsing tags and attributes // Regular Expressions for parsing tags and attributes
@ -225,7 +240,7 @@
}); });
}, },
configurePaperLibraryTabs: function (ownerpage, tabs, panels, animate) { configurePaperLibraryTabs: function (ownerpage, tabs, panels, animateTabs) {
if (!browserInfo.safari) { if (!browserInfo.safari) {
LibraryBrowser.configureSwipeTabs(ownerpage, tabs); LibraryBrowser.configureSwipeTabs(ownerpage, tabs);
@ -241,21 +256,6 @@
tabs.classList.add('hiddenScrollX'); tabs.classList.add('hiddenScrollX');
function fadeInRight(elem) {
var pct = browserInfo.mobile ? '1.5%' : '0.5%';
var keyframes = [
{ opacity: '0', transform: 'translate3d(' + pct + ', 0, 0)', offset: 0 },
{ opacity: '1', transform: 'none', offset: 1 }];
elem.animate(keyframes, {
duration: 300,
iterations: 1,
easing: 'ease-out'
});
}
tabs.addEventListener('click', function (e) { tabs.addEventListener('click', function (e) {
var current = tabs.querySelector('.is-active'); var current = tabs.querySelector('.is-active');
@ -267,24 +267,28 @@
current.classList.remove('is-active'); current.classList.remove('is-active');
panels[parseInt(current.getAttribute('data-index'))].classList.remove('is-active'); panels[parseInt(current.getAttribute('data-index'))].classList.remove('is-active');
} }
link.classList.add('is-active'); link.classList.add('is-active');
var index = parseInt(link.getAttribute('data-index')); var index = parseInt(link.getAttribute('data-index'));
var newPanel = panels[index];
if (animateTabs && animateTabs.indexOf(index) != -1 && /*browserInfo.animate &&*/ newPanel.animate) {
fadeInRight(newPanel);
}
// If toCenter is called syncronously within the click event, it sometimes ends up canceling it
setTimeout(function () {
tabs.dispatchEvent(new CustomEvent("tabchange", { tabs.dispatchEvent(new CustomEvent("tabchange", {
detail: { detail: {
selectedTabIndex: index selectedTabIndex: index
} }
})); }));
panels[index].classList.add('is-active'); newPanel.classList.add('is-active');
if (browserInfo.animate && animate) { //scrollHelper.toCenter(tabs, link, true);
fadeInRight(panels[index]); }, 100);
}
// If toCenter is called syncronously within the click event, it sometimes ends up canceling it
//setTimeout(function() {
// scrollHelper.toCenter(tabs, link, true);
//}, 10);
} }
}); });
@ -1722,7 +1726,7 @@
if (AppInfo.hasLowImageBandwidth) { if (AppInfo.hasLowImageBandwidth) {
if (!AppInfo.isNativeApp) { if (!AppInfo.isNativeApp) {
screenWidth *= .7; screenWidth *= .75;
} }
} else { } else {
screenWidth *= 1.2; screenWidth *= 1.2;

View file

@ -204,7 +204,7 @@
baseUrl += '?topParentId=' + topParentId; baseUrl += '?topParentId=' + topParentId;
} }
libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), true); libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0, 2, 3, 4]);
mdlTabs.addEventListener('tabchange', function (e) { mdlTabs.addEventListener('tabchange', function (e) {
loadTab(view, parseInt(e.detail.selectedTabIndex)); loadTab(view, parseInt(e.detail.selectedTabIndex));

View file

@ -303,7 +303,7 @@
baseUrl += '?topParentId=' + topParentId; baseUrl += '?topParentId=' + topParentId;
} }
libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent')); libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0, 4, 5]);
var tabControllers = []; var tabControllers = [];
var renderedTabs = []; var renderedTabs = [];

View file

@ -331,7 +331,7 @@
baseUrl += '?topParentId=' + topParentId; baseUrl += '?topParentId=' + topParentId;
} }
libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent')); libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0, 4, 5, 6]);
mdlTabs.addEventListener('tabchange', function (e) { mdlTabs.addEventListener('tabchange', function (e) {
loadTab(view, parseInt(e.detail.selectedTabIndex)); loadTab(view, parseInt(e.detail.selectedTabIndex));

View file

@ -246,13 +246,9 @@
function loadRecentlyAdded(elem, user) { function loadRecentlyAdded(elem, user) {
var limit = AppInfo.hasLowImageBandwidth ?
16 :
20;
var options = { var options = {
Limit: limit, Limit: 20,
Fields: "PrimaryImageAspectRatio,SyncInfo", Fields: "PrimaryImageAspectRatio,SyncInfo",
ImageTypeLimit: 1, ImageTypeLimit: 1,
EnableImageTypes: "Primary,Backdrop,Thumb" EnableImageTypes: "Primary,Backdrop,Thumb"

View file

@ -1166,7 +1166,7 @@ var Dashboard = {
// The native app can handle a little bit more than safari // The native app can handle a little bit more than safari
if (AppInfo.isNativeApp) { if (AppInfo.isNativeApp) {
quality -= 5; quality -= 10;
} else { } else {

View file

@ -13,16 +13,10 @@
var parentId = params.topParentId; var parentId = params.topParentId;
var limit = 30;
if (AppInfo.hasLowImageBandwidth) {
limit = 16;
}
var options = { var options = {
IncludeItemTypes: "Episode", IncludeItemTypes: "Episode",
Limit: limit, Limit: 30,
Fields: "PrimaryImageAspectRatio,SyncInfo", Fields: "PrimaryImageAspectRatio,SyncInfo",
ParentId: parentId, ParentId: parentId,
ImageTypeLimit: 1, ImageTypeLimit: 1,

View file

@ -24,13 +24,9 @@
function loadNextUp() { function loadNextUp() {
var limit = AppInfo.hasLowImageBandwidth ?
16 :
24;
var query = { var query = {
Limit: limit, Limit: 24,
Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo", Fields: "PrimaryImageAspectRatio,SeriesInfo,DateCreated,SyncInfo",
UserId: Dashboard.getCurrentUserId(), UserId: Dashboard.getCurrentUserId(),
ImageTypeLimit: 1, ImageTypeLimit: 1,
@ -258,7 +254,7 @@
view.querySelector('#resumableItems').classList.remove('hiddenScrollX'); view.querySelector('#resumableItems').classList.remove('hiddenScrollX');
} }
libraryBrowser.createCardMenus(view.querySelector('#resumableItems')); libraryBrowser.createCardMenus(view.querySelector('#resumableItems'));
libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent')); libraryBrowser.configurePaperLibraryTabs(view, mdlTabs, view.querySelectorAll('.pageTabContent'), [0, 1, 2, 4, 5, 6]);
mdlTabs.addEventListener('tabchange', function (e) { mdlTabs.addEventListener('tabchange', function (e) {
loadTab(view, parseInt(e.detail.selectedTabIndex)); loadTab(view, parseInt(e.detail.selectedTabIndex));

View file

@ -4,13 +4,9 @@
Dashboard.showLoadingMsg(); Dashboard.showLoadingMsg();
var limit = AppInfo.hasLowImageBandwidth && !enableScrollX() ?
24 :
40;
var query = { var query = {
Limit: limit, Limit: 40,
Fields: "AirTime,UserData,SeriesStudio,SyncInfo", Fields: "AirTime,UserData,SeriesStudio,SyncInfo",
UserId: Dashboard.getCurrentUserId(), UserId: Dashboard.getCurrentUserId(),
ImageTypeLimit: 1, ImageTypeLimit: 1,