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 dialogs

Browse source
This commit is contained in:
Luke Pulverenti 2016-05-18 13:02:56 -04:00
parent 4107231554
commit c00d7cba09
10 changed files with 49 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -16,12 +16,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.3.43", "version": "1.3.44",
"_release": "1.3.43", "_release": "1.3.44",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.3.43", "tag": "1.3.44",
"commit": "201076c748374aa6fed4be70ec43198099854aa8" "commit": "7634be33759be48574ff2531df4d111fa1177e54"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0", "_target": "^1.2.0",

2
dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js vendored
View file

@ -360,7 +360,7 @@
dlg.exitAnimation = 'fade-out-animation'; dlg.exitAnimation = 'fade-out-animation';
// If it's not fullscreen then lower the default animation speed to make it open really fast // If it's not fullscreen then lower the default animation speed to make it open really fast
var entryAnimationDuration = options.entryAnimationDuration || (options.size ? 240 : 300); var entryAnimationDuration = options.entryAnimationDuration || (options.size ? 200 : 300);
dlg.animationConfig = { dlg.animationConfig = {
// scale up // scale up

6
dashboard-ui/bower_components/iron-meta/.bower.json vendored
View file

@ -26,14 +26,14 @@
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
}, },
"main": "iron-meta.html", "main": "iron-meta.html",
"homepage": "https://github.com/polymerelements/iron-meta", "homepage": "https://github.com/PolymerElements/iron-meta",
"_release": "1.1.1", "_release": "1.1.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.1", "tag": "v1.1.1",
"commit": "e171ee234b482219c9514e6f9551df48ef48bd9f" "commit": "e171ee234b482219c9514e6f9551df48ef48bd9f"
}, },
"_source": "git://github.com/polymerelements/iron-meta.git", "_source": "git://github.com/PolymerElements/iron-meta.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-meta" "_originalSource": "PolymerElements/iron-meta"
} }

4
dashboard-ui/bower_components/paper-behaviors/.bower.json vendored
View file

@ -45,7 +45,7 @@
"tag": "v1.0.11", "tag": "v1.0.11",
"commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5" "commit": "e3c1ab0c72905b58fb4d9adc2921ea73b5c085a5"
}, },
"_source": "git://github.com/polymerelements/paper-behaviors.git", "_source": "git://github.com/PolymerElements/paper-behaviors.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/paper-behaviors" "_originalSource": "PolymerElements/paper-behaviors"
} }

6
dashboard-ui/bower_components/paper-ripple/.bower.json vendored
View file

@ -32,14 +32,14 @@
"iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0" "iron-test-helpers": "PolymerElements/iron-test-helpers#^1.0.0"
}, },
"ignore": [], "ignore": [],
"homepage": "https://github.com/polymerelements/paper-ripple", "homepage": "https://github.com/PolymerElements/paper-ripple",
"_release": "1.0.5", "_release": "1.0.5",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.5", "tag": "v1.0.5",
"commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5" "commit": "d72e7a9a8ab518b901ed18dde492df3b87a93be5"
}, },
"_source": "git://github.com/polymerelements/paper-ripple.git", "_source": "git://github.com/PolymerElements/paper-ripple.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/paper-ripple" "_originalSource": "PolymerElements/paper-ripple"
} }

2
dashboard-ui/components/subtitleeditor/subtitleeditor.template.html
View file

@ -12,7 +12,7 @@
<label for="selectLanguage" class="selectLabel">${LabelLanguage}</label> <label for="selectLanguage" class="selectLabel">${LabelLanguage}</label>
<select autofocus id="selectLanguage" required="required" data-mini="true"></select> <select autofocus id="selectLanguage" required="required" data-mini="true"></select>
</div> </div>
<button type="button" is="paper-icon-button-light" title="${ButtonSearch}" class="btnSearchSubtitles"><iron-icon icon="search"></iron-icon></button> <button type="submit" is="paper-icon-button-light" title="${ButtonSearch}" class="btnSearchSubtitles"><iron-icon icon="search"></iron-icon></button>
</form> </form>
<br /> <br />
<div class="subtitleResults"></div> <div class="subtitleResults"></div>

8
dashboard-ui/css/librarybrowser.css
View file

@ -836,14 +836,14 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
min-height: 60px; min-height: 60px;
} }
.itemMiscInfo { .mobileDetails .itemMiscInfo {
text-align: center; text-align: center;
justify-content: center; justify-content: center;
} }
.itemMiscInfo .endsAt { .itemMiscInfo .endsAt {
display: none; display: none;
} }
} }
@media all and (min-width: 750px) { @media all and (min-width: 750px) {

27
dashboard-ui/css/librarymenu.css
View file

@ -242,20 +242,21 @@
color: #fff !important; color: #fff !important;
} }
.pageTabButtonSelectionBar { .pageTabButtonSelectionBar {
position: absolute; position: absolute;
left: 0; left: 0;
border: 0; border: 0;
bottom: 0; /* Need this or it will be partially covered by the drop-shadow on android */
height: 2px; bottom: 1px;
right: 0; height: 2px;
border-radius: 0; right: 0;
z-index: 1; border-radius: 0;
} z-index: 1000;
}
.pageTabButton.is-active .pageTabButtonSelectionBar { .pageTabButton.is-active .pageTabButtonSelectionBar {
background: #52B54B; background: #52B54B;
} }
.viewMenuBar, .libraryViewNav { .viewMenuBar, .libraryViewNav {
background-color: #020202; background-color: #020202;

31
dashboard-ui/scripts/librarybrowser.js
View file

@ -213,14 +213,11 @@
if (selected == null) { if (selected == null) {
var elem = tabs.querySelector('.pageTabButton.is-active'); return tabs.selectedTabIndex || 0;
if (elem) {
return parseInt(elem.getAttribute('data-index'));
}
return 0;
} }
var current = LibraryBrowser.selectedTab(tabs); var current = LibraryBrowser.selectedTab(tabs);
tabs.selectedTabIndex = selected;
if (current == selected) { if (current == selected) {
tabs.dispatchEvent(new CustomEvent("tabchange", { tabs.dispatchEvent(new CustomEvent("tabchange", {
detail: { detail: {
@ -268,13 +265,13 @@
LibraryBrowser.configureSwipeTabs(ownerpage, tabs); LibraryBrowser.configureSwipeTabs(ownerpage, tabs);
} }
var buttons = tabs.querySelectorAll('.pageTabButton'); if (!browserInfo.safari || !AppInfo.isNativeApp) {
for (var i = 0, length = buttons.length; i < length; i++) { var buttons = tabs.querySelectorAll('.pageTabButton');
//buttons[i].classList.add('mdl-button'); for (var i = 0, length = buttons.length; i < length; i++) {
//buttons[i].classList.add('mdl-js-button'); var div = document.createElement('div');
var div = document.createElement('div'); div.classList.add('pageTabButtonSelectionBar');
div.classList.add('pageTabButtonSelectionBar'); buttons[i].appendChild(div);
buttons[i].appendChild(div); }
} }
tabs.classList.add('hiddenScrollX'); tabs.classList.add('hiddenScrollX');
@ -1787,20 +1784,20 @@
var isSquareAspectRatio = primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1) < .33 || var isSquareAspectRatio = primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1) < .33 ||
primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.3333334) < .01; primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 1.3333334) < .01;
if (options.shape == 'auto' || options.shape == 'autohome') { if (options.shape == 'auto' || options.shape == 'autohome' || options.shape == 'autooverflow') {
if (isThumbAspectRatio) { if (isThumbAspectRatio) {
options.shape = options.shape == 'auto' ? 'backdrop' : 'backdrop'; options.shape = options.shape == 'autooverflow' ? 'overflowBackdrop' : 'backdrop';
} else if (isSquareAspectRatio) { } else if (isSquareAspectRatio) {
options.coverImage = true; options.coverImage = true;
options.shape = 'square'; options.shape = options.shape == 'autooverflow' ? 'overflowSquare' : 'square';
} else if (primaryImageAspectRatio && primaryImageAspectRatio > 1.9) { } else if (primaryImageAspectRatio && primaryImageAspectRatio > 1.9) {
options.shape = 'banner'; options.shape = 'banner';
options.coverImage = true; options.coverImage = true;
} else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 0.6666667) < .2) { } else if (primaryImageAspectRatio && Math.abs(primaryImageAspectRatio - 0.6666667) < .2) {
options.shape = options.shape == 'auto' ? 'portrait' : 'portrait'; options.shape = options.shape == 'autooverflow' ? 'overflowPortrait' : 'portrait';
} else { } else {
options.shape = options.defaultShape || (options.shape == 'auto' ? 'square' : 'square'); options.shape = options.defaultShape || (options.shape == 'autooverflow' ? 'overflowSquare' : 'square');
} }
} }

12
dashboard-ui/scripts/livetvrecordings.js
View file

@ -54,10 +54,6 @@
Dashboard.hideLoadingMsg(); Dashboard.hideLoadingMsg();
} }
function getSquareShape() {
return enableScrollX() ? 'overflowSquare' : 'square';
}
function enableScrollX() { function enableScrollX() {
return browserInfo.mobile && AppInfo.enableAppLayouts; return browserInfo.mobile && AppInfo.enableAppLayouts;
} }
@ -80,14 +76,12 @@
recordingItems.innerHTML = LibraryBrowser.getPosterViewHtml({ recordingItems.innerHTML = LibraryBrowser.getPosterViewHtml({
items: recordings, items: recordings,
shape: (enableScrollX() ? getSquareShape() : 'auto'), shape: (enableScrollX() ? 'autooverflow' : 'auto'),
showTitle: true, showTitle: true,
showParentTitle: true, showParentTitle: true,
centerText: true,
coverImage: true, coverImage: true,
lazy: true, lazy: true,
overlayPlayButton: true cardLayout: true
}); });
ImageLoader.lazyChildren(recordingItems); ImageLoader.lazyChildren(recordingItems);
@ -113,7 +107,7 @@
ApiClient.getLiveTvRecordings({ ApiClient.getLiveTvRecordings({
userId: Dashboard.getCurrentUserId(), userId: Dashboard.getCurrentUserId(),
limit: 4, limit: enableScrollX() ? 12 : 4,
IsInProgress: false, IsInProgress: false,
Fields: 'CanDelete,PrimaryImageAspectRatio' Fields: 'CanDelete,PrimaryImageAspectRatio'