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
parent
4ffca7a9df
commit
ab738fae14
21 changed files with 95 additions and 70 deletions
|
|
@ -14,12 +14,12 @@
|
|||
},
|
||||
"devDependencies": {},
|
||||
"ignore": [],
|
||||
"version": "1.4.225",
|
||||
"_release": "1.4.225",
|
||||
"version": "1.4.226",
|
||||
"_release": "1.4.226",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "1.4.225",
|
||||
"commit": "d3651f587ddad96e72c9b34ccf2d93cf7e2fafd3"
|
||||
"tag": "1.4.226",
|
||||
"commit": "0fcbd95af7b5bbb0e4000f48174961460d0f30f4"
|
||||
},
|
||||
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
|
||||
"_target": "^1.2.1",
|
||||
|
|
|
|||
|
|
@ -6,6 +6,11 @@ define(['browser'], function (browser) {
|
|||
}
|
||||
|
||||
function canPlayH265() {
|
||||
|
||||
if (browser.tizen) {
|
||||
return true;
|
||||
}
|
||||
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -193,8 +198,12 @@ define(['browser'], function (browser) {
|
|||
|
||||
function getMaxBitrate() {
|
||||
|
||||
if (browser.edgeUwp) {
|
||||
return 14000000;
|
||||
}
|
||||
|
||||
// 10mbps
|
||||
if (browser.xboxOne || browser.edgeUwp) {
|
||||
if (browser.xboxOne) {
|
||||
return 10000000;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -85,5 +85,5 @@
|
|||
}
|
||||
|
||||
.dialogBackdropOpened {
|
||||
opacity: .6;
|
||||
opacity: .7;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,12 +7,24 @@
|
|||
<div class="formDialogContent smoothScrollY">
|
||||
<form class="dialogContentInner dialog-content-centered" style="padding-top:2em;">
|
||||
|
||||
<h3>${ShowIndicatorsFor}</h3>
|
||||
<div class="checkboxContainer">
|
||||
<h3 class="checkboxListLabel">${ShowIndicatorsFor}</h3>
|
||||
<div class="checkboxList">
|
||||
<label>
|
||||
<input type="checkbox" is="emby-checkbox" class="chkIndicator" data-type="hd" />
|
||||
<span>${HDPrograms}</span>
|
||||
</label>
|
||||
<label>
|
||||
<input type="checkbox" is="emby-checkbox" class="chkIndicator" data-type="live" />
|
||||
<span>${LiveBroadcasts}</span>
|
||||
</label>
|
||||
<label>
|
||||
<input type="checkbox" is="emby-checkbox" class="chkIndicator" data-type="new" />
|
||||
<span>${NewEpisodes}</span>
|
||||
</label>
|
||||
<label>
|
||||
<input type="checkbox" is="emby-checkbox" class="chkIndicator" data-type="premiere" />
|
||||
<span>${Premieres}</span>
|
||||
</label>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
|
|
@ -50,7 +50,7 @@
|
|||
margin-right: .5em;
|
||||
color: #fff;
|
||||
font-size: 82%;
|
||||
padding: .25em;
|
||||
padding: .2em .25em;
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
|
|
@ -250,11 +250,7 @@
|
|||
@media all and (min-width: 1600px) {
|
||||
|
||||
.guideDateText {
|
||||
display: flex;
|
||||
}
|
||||
|
||||
.guideDateTextDate {
|
||||
margin-left: .25em;
|
||||
font-size: 92%;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -377,9 +373,9 @@
|
|||
.programIcon {
|
||||
margin-left: auto;
|
||||
margin-right: .5em;
|
||||
height: 3.5vh;
|
||||
width: 3.5vh;
|
||||
font-size: 3.5vh;
|
||||
height: auto;
|
||||
width: auto;
|
||||
font-size: 1.6em;
|
||||
color: #ddd;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -425,13 +425,13 @@
|
|||
// Normally we'd want to just let responsive css handle this,
|
||||
// but since mobile browsers are often underpowered,
|
||||
// it can help performance to get them out of the markup
|
||||
var showIndicators = true;
|
||||
var allowIndicators = dom.getWindowSize().innerWidth >= 600;
|
||||
|
||||
var options = {
|
||||
showHdIcon: showIndicators,
|
||||
showLiveIndicator: showIndicators,
|
||||
showPremiereIndicator: showIndicators,
|
||||
showNewIndicator: userSettings.get('guide-indicator-new') == 'true'
|
||||
showHdIcon: allowIndicators && userSettings.get('guide-indicator-hd') == 'true',
|
||||
showLiveIndicator: allowIndicators && userSettings.get('guide-indicator-live') == 'true',
|
||||
showPremiereIndicator: allowIndicators && userSettings.get('guide-indicator-premiere') == 'true',
|
||||
showNewIndicator: allowIndicators && userSettings.get('guide-indicator-new') == 'true'
|
||||
};
|
||||
|
||||
for (var i = 0, length = channels.length; i < length; i++) {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@
|
|||
|
||||
<div class="formDialogFooter">
|
||||
<button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">
|
||||
<i class="md-icon">search</i>
|
||||
<span>${Search}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
@ -45,7 +44,6 @@
|
|||
|
||||
<div class="formDialogFooter">
|
||||
<button is="emby-button" type="submit" class="raised submit block btnSubmit formDialogFooterItem">
|
||||
<i class="md-icon">check</i>
|
||||
<span>${ButtonOk}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -30,7 +30,6 @@
|
|||
|
||||
<div class="formDialogFooter">
|
||||
<button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">
|
||||
<i class="md-icon">check</i>
|
||||
<span>${Save}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -101,7 +101,6 @@
|
|||
<div class="supporterContainer hide formDialogFooterItem">
|
||||
<p>${MessageActiveSubscriptionRequiredSeriesRecordings}</p>
|
||||
<button is="emby-button" type="button" class="btnSupporter hide raised accent block">
|
||||
<i class="md-icon">check</i>
|
||||
<span>${HeaderBecomeProjectSupporter}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@
|
|||
|
||||
<div class="formDialogFooter">
|
||||
<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem" autofocus>
|
||||
<i class="md-icon recordingDialogSubmitIcon">fiber_manual_record</i>
|
||||
<span>${Save}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -278,5 +278,8 @@
|
|||
"HeaderEditImages": "Edit Images",
|
||||
"Settings": "Settings",
|
||||
"ShowIndicatorsFor": "Show indicators for:",
|
||||
"NewEpisodes": "New episodes"
|
||||
"NewEpisodes": "New episodes",
|
||||
"HDPrograms": "HD programs",
|
||||
"LiveBroadcasts": "Live broadcasts",
|
||||
"Premieres": "Premieres"
|
||||
}
|
||||
|
|
@ -409,7 +409,7 @@
|
|||
html += '<div class="formFields"></div>';
|
||||
|
||||
html += '<div class="formDialogFooter">';
|
||||
html += '<button is="emby-button" type="submit" class="raised submit block formDialogFooterItem"><i class="md-icon">sync</i><span>' + globalize.translate('sharedcomponents#Sync') + '</span></button>';
|
||||
html += '<button is="emby-button" type="submit" class="raised submit block formDialogFooterItem"><span>' + globalize.translate('sharedcomponents#Sync') + '</span></button>';
|
||||
html += '</div>';
|
||||
|
||||
html += '</form>';
|
||||
|
|
|
|||
|
|
@ -32,14 +32,14 @@
|
|||
"web-component-tester": "^4.0.0",
|
||||
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
|
||||
},
|
||||
"homepage": "https://github.com/polymerelements/iron-icon",
|
||||
"homepage": "https://github.com/PolymerElements/iron-icon",
|
||||
"_release": "1.0.10",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v1.0.10",
|
||||
"commit": "f4e146da4982ff96bb25db85290c09e8de4ec734"
|
||||
},
|
||||
"_source": "git://github.com/polymerelements/iron-icon.git",
|
||||
"_source": "git://github.com/PolymerElements/iron-icon.git",
|
||||
"_target": "^1.0.0",
|
||||
"_originalSource": "polymerelements/iron-icon"
|
||||
"_originalSource": "PolymerElements/iron-icon"
|
||||
}
|
||||
|
|
@ -27,14 +27,14 @@
|
|||
},
|
||||
"main": "iron-meta.html",
|
||||
"ignore": [],
|
||||
"homepage": "https://github.com/PolymerElements/iron-meta",
|
||||
"homepage": "https://github.com/polymerelements/iron-meta",
|
||||
"_release": "1.1.2",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v1.1.2",
|
||||
"commit": "bae96531b63ea6d4ce982f5592248aea849c0f5a"
|
||||
},
|
||||
"_source": "git://github.com/PolymerElements/iron-meta.git",
|
||||
"_source": "git://github.com/polymerelements/iron-meta.git",
|
||||
"_target": "^1.0.0",
|
||||
"_originalSource": "PolymerElements/iron-meta"
|
||||
"_originalSource": "polymerelements/iron-meta"
|
||||
}
|
||||
|
|
@ -32,14 +32,14 @@
|
|||
"iron-component-page": "polymerElements/iron-component-page#^1.1.6"
|
||||
},
|
||||
"private": true,
|
||||
"homepage": "https://github.com/polymer/polymer",
|
||||
"homepage": "https://github.com/Polymer/polymer",
|
||||
"_release": "1.6.1",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v1.6.1",
|
||||
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
|
||||
},
|
||||
"_source": "git://github.com/polymer/polymer.git",
|
||||
"_source": "git://github.com/Polymer/polymer.git",
|
||||
"_target": "^1.1.0",
|
||||
"_originalSource": "polymer/polymer"
|
||||
"_originalSource": "Polymer/polymer"
|
||||
}
|
||||
|
|
@ -14,10 +14,3 @@
|
|||
border-radius: 5px;
|
||||
margin-top: 2em;
|
||||
}
|
||||
|
||||
.directoryPicker paper-item {
|
||||
min-height: 36px;
|
||||
border-bottom: 1px solid #eee;
|
||||
outline: none;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
define(['dialogHelper', 'jQuery', 'listViewStyle', 'emby-input', 'emby-button', 'paper-icon-button-light', 'css!./directorybrowser'], function (dialogHelper, $) {
|
||||
define(['dialogHelper', 'jQuery', 'listViewStyle', 'emby-input', 'emby-button', 'paper-icon-button-light', 'css!./directorybrowser', 'formDialogStyle'], function (dialogHelper, $) {
|
||||
|
||||
var systemInfo;
|
||||
function getSystemInfo() {
|
||||
|
|
@ -107,6 +107,9 @@
|
|||
|
||||
var html = '';
|
||||
|
||||
html += '<div class="formDialogContent smoothScrollY">';
|
||||
html += '<div class="dialogContentInner dialog-content-centered">';
|
||||
|
||||
var instruction = options.instruction ? options.instruction + '<br/><br/>' : '';
|
||||
|
||||
html += '<p class="directoryPickerHeadline">';
|
||||
|
|
@ -133,7 +136,7 @@
|
|||
|
||||
html += '</p>';
|
||||
|
||||
html += '<form style="max-width:100%;">';
|
||||
html += '<form style="margin:auto;">';
|
||||
|
||||
html += '<div class="inputContainer" style="display: flex; align-items: center;">';
|
||||
html += '<div style="flex-grow:1;">';
|
||||
|
|
@ -142,15 +145,18 @@
|
|||
html += '<button type="button" is="paper-icon-button-light" class="btnRefreshDirectories" title="' + Globalize.translate('ButtonRefresh') + '"><i class="md-icon">search</i></button>';
|
||||
html += '</div>';
|
||||
|
||||
html += '<div class="results paperList" style="height: 180px; overflow-y: auto;"></div>';
|
||||
html += '<div class="results paperList" style="max-height: 300px; overflow-y: auto;"></div>';
|
||||
|
||||
html += '<div>';
|
||||
html += '<button is="emby-button" type="submit" class="raised submit block">' + Globalize.translate('ButtonOk') + '</button>';
|
||||
html += '<div class="formDialogFooter">';
|
||||
html += '<button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">' + Globalize.translate('ButtonOk') + '</button>';
|
||||
html += '</div>';
|
||||
|
||||
html += '</form>';
|
||||
html += '</div>';
|
||||
|
||||
html += '</div>';
|
||||
html += '</div>';
|
||||
|
||||
return html;
|
||||
}
|
||||
|
||||
|
|
@ -227,30 +233,32 @@
|
|||
var initialPath = responses[1];
|
||||
|
||||
var dlg = dialogHelper.createDialog({
|
||||
size: 'medium',
|
||||
removeOnClose: true
|
||||
size: 'medium-tall',
|
||||
removeOnClose: true,
|
||||
scrollY: false
|
||||
});
|
||||
|
||||
dlg.classList.add('ui-body-a');
|
||||
dlg.classList.add('background-theme-a');
|
||||
|
||||
dlg.classList.add('directoryPicker');
|
||||
dlg.classList.add('formDialog');
|
||||
|
||||
var html = '';
|
||||
html += '<h2 class="dialogHeader">';
|
||||
html += '<button type="button" is="emby-button" icon="arrow-back" class="fab mini btnCloseDialog autoSize" tabindex="-1"><i class="md-icon"></i></button>';
|
||||
html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + (options.header || Globalize.translate('HeaderSelectPath')) + '</div>';
|
||||
html += '</h2>';
|
||||
|
||||
html += '<div class="editorContent" style="max-width:800px;margin:auto;">';
|
||||
html += getEditorHtml(options, systemInfo);
|
||||
html += '<div class="formDialogHeader">';
|
||||
html += '<button is="paper-icon-button-light" class="btnCloseDialog autoSize" tabindex="-1"><i class="md-icon"></i></button>';
|
||||
html += '<div class="formDialogHeaderTitle">';
|
||||
html += options.header || Globalize.translate('HeaderSelectPath');
|
||||
html += '</div>';
|
||||
|
||||
html += '</div>';
|
||||
|
||||
html += getEditorHtml(options, systemInfo);
|
||||
|
||||
dlg.innerHTML = html;
|
||||
document.body.appendChild(dlg);
|
||||
|
||||
var editorContent = dlg.querySelector('.editorContent');
|
||||
initEditor(editorContent, options, fileOptions);
|
||||
initEditor(dlg, options, fileOptions);
|
||||
|
||||
// Has to be assigned a z-index after the call to .open()
|
||||
$(dlg).on('iron-overlay-opened', function () {
|
||||
|
|
@ -267,9 +275,9 @@
|
|||
|
||||
currentDialog = dlg;
|
||||
|
||||
var txtCurrentPath = editorContent.querySelector('#txtDirectoryPickerPath');
|
||||
var txtCurrentPath = dlg.querySelector('#txtDirectoryPickerPath');
|
||||
txtCurrentPath.value = initialPath;
|
||||
refreshDirectoryBrowser(editorContent, txtCurrentPath.value);
|
||||
refreshDirectoryBrowser(dlg, txtCurrentPath.value);
|
||||
|
||||
});
|
||||
};
|
||||
|
|
|
|||
|
|
@ -214,17 +214,19 @@
|
|||
|
||||
var template = this.response;
|
||||
var dlg = dialogHelper.createDialog({
|
||||
size: 'small',
|
||||
size: 'medium',
|
||||
|
||||
// In (at least) chrome this is causing the text field to not be editable
|
||||
modal: false,
|
||||
|
||||
removeOnClose: true
|
||||
removeOnClose: true,
|
||||
scrollY: false
|
||||
});
|
||||
|
||||
dlg.classList.add('ui-body-a');
|
||||
dlg.classList.add('background-theme-a');
|
||||
dlg.classList.add('dlg-librarycreator');
|
||||
dlg.classList.add('formDialog');
|
||||
|
||||
dlg.innerHTML = Globalize.translateDocument(template);
|
||||
document.body.appendChild(dlg);
|
||||
|
|
|
|||
|
|
@ -28,9 +28,9 @@
|
|||
<br />
|
||||
<div class="libraryOptions"></div>
|
||||
<br />
|
||||
<div>
|
||||
<button is="emby-button" type="submit" class="raised submit block">
|
||||
<i class="md-icon">check</i>
|
||||
|
||||
<div class="formDialogFooter">
|
||||
<button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">
|
||||
<span>${ButtonOk}</span>
|
||||
</button>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -170,16 +170,18 @@
|
|||
|
||||
var template = this.response;
|
||||
var dlg = dialogHelper.createDialog({
|
||||
size: 'small',
|
||||
size: 'medium',
|
||||
|
||||
// In (at least) chrome this is causing the text field to not be editable
|
||||
modal: false,
|
||||
removeOnClose: true
|
||||
removeOnClose: true,
|
||||
scrollY: false
|
||||
});
|
||||
|
||||
dlg.classList.add('dlg-libraryeditor');
|
||||
dlg.classList.add('ui-body-a');
|
||||
dlg.classList.add('background-theme-a');
|
||||
dlg.classList.add('formDialog');
|
||||
|
||||
dlg.innerHTML = Globalize.translateDocument(template);
|
||||
|
||||
|
|
|
|||
|
|
@ -151,6 +151,11 @@ div.dialogHeader {
|
|||
color: #fff;
|
||||
}
|
||||
|
||||
.ui-body-a div.formDialogFooter {
|
||||
background-color: #ddd;
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.ui-body-a .formDialogHeader a {
|
||||
color: #fff !important;
|
||||
text-transform: uppercase;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue