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-09-07 13:17:26 -04:00
parent 4ffca7a9df
commit ab738fae14
21 changed files with 95 additions and 70 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

@ -14,12 +14,12 @@
}, },
"devDependencies": {}, "devDependencies": {},
"ignore": [], "ignore": [],
"version": "1.4.225", "version": "1.4.226",
"_release": "1.4.225", "_release": "1.4.226",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.225", "tag": "1.4.226",
"commit": "d3651f587ddad96e72c9b34ccf2d93cf7e2fafd3" "commit": "0fcbd95af7b5bbb0e4000f48174961460d0f30f4"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

11
dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js vendored
View file

@ -6,6 +6,11 @@ define(['browser'], function (browser) {
} }
function canPlayH265() { function canPlayH265() {
if (browser.tizen) {
return true;
}
return false; return false;
} }
@ -193,8 +198,12 @@ define(['browser'], function (browser) {
function getMaxBitrate() { function getMaxBitrate() {
if (browser.edgeUwp) {
return 14000000;
}
// 10mbps // 10mbps
if (browser.xboxOne || browser.edgeUwp) { if (browser.xboxOne) {
return 10000000; return 10000000;
} }

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

@ -85,5 +85,5 @@
} }
.dialogBackdropOpened { .dialogBackdropOpened {
opacity: .6; opacity: .7;
} }

16
dashboard-ui/bower_components/emby-webcomponents/guide/guide-settings.template.html vendored
View file

@ -7,12 +7,24 @@
<div class="formDialogContent smoothScrollY"> <div class="formDialogContent smoothScrollY">
<form class="dialogContentInner dialog-content-centered" style="padding-top:2em;"> <form class="dialogContentInner dialog-content-centered" style="padding-top:2em;">
<h3>${ShowIndicatorsFor}</h3> <h3 class="checkboxListLabel">${ShowIndicatorsFor}</h3>
<div class="checkboxContainer"> <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> <label>
<input type="checkbox" is="emby-checkbox" class="chkIndicator" data-type="new" /> <input type="checkbox" is="emby-checkbox" class="chkIndicator" data-type="new" />
<span>${NewEpisodes}</span> <span>${NewEpisodes}</span>
</label> </label>
<label>
<input type="checkbox" is="emby-checkbox" class="chkIndicator" data-type="premiere" />
<span>${Premieres}</span>
</label>
</div> </div>
</form> </form>
</div> </div>

14
dashboard-ui/bower_components/emby-webcomponents/guide/guide.css vendored
View file

@ -50,7 +50,7 @@
margin-right: .5em; margin-right: .5em;
color: #fff; color: #fff;
font-size: 82%; font-size: 82%;
padding: .25em; padding: .2em .25em;
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
@ -250,11 +250,7 @@
@media all and (min-width: 1600px) { @media all and (min-width: 1600px) {
.guideDateText { .guideDateText {
display: flex; font-size: 92%;
}
.guideDateTextDate {
margin-left: .25em;
} }
} }
@ -377,9 +373,9 @@
.programIcon { .programIcon {
margin-left: auto; margin-left: auto;
margin-right: .5em; margin-right: .5em;
height: 3.5vh; height: auto;
width: 3.5vh; width: auto;
font-size: 3.5vh; font-size: 1.6em;
color: #ddd; color: #ddd;
flex-shrink: 0; flex-shrink: 0;
} }

10
dashboard-ui/bower_components/emby-webcomponents/guide/guide.js vendored
View file

@ -425,13 +425,13 @@
// Normally we'd want to just let responsive css handle this, // Normally we'd want to just let responsive css handle this,
// but since mobile browsers are often underpowered, // but since mobile browsers are often underpowered,
// it can help performance to get them out of the markup // it can help performance to get them out of the markup
var showIndicators = true; var allowIndicators = dom.getWindowSize().innerWidth >= 600;
var options = { var options = {
showHdIcon: showIndicators, showHdIcon: allowIndicators && userSettings.get('guide-indicator-hd') == 'true',
showLiveIndicator: showIndicators, showLiveIndicator: allowIndicators && userSettings.get('guide-indicator-live') == 'true',
showPremiereIndicator: showIndicators, showPremiereIndicator: allowIndicators && userSettings.get('guide-indicator-premiere') == 'true',
showNewIndicator: userSettings.get('guide-indicator-new') == 'true' showNewIndicator: allowIndicators && userSettings.get('guide-indicator-new') == 'true'
}; };
for (var i = 0, length = channels.length; i < length; i++) { for (var i = 0, length = channels.length; i < length; i++) {

2
dashboard-ui/bower_components/emby-webcomponents/itemidentifier/itemidentifier.template.html vendored
View file

@ -22,7 +22,6 @@
<div class="formDialogFooter"> <div class="formDialogFooter">
<button is="emby-button" type="submit" class="raised submit block formDialogFooterItem"> <button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">
<i class="md-icon">search</i>
<span>${Search}</span> <span>${Search}</span>
</button> </button>
</div> </div>
@ -45,7 +44,6 @@
<div class="formDialogFooter"> <div class="formDialogFooter">
<button is="emby-button" type="submit" class="raised submit block btnSubmit formDialogFooterItem"> <button is="emby-button" type="submit" class="raised submit block btnSubmit formDialogFooterItem">
<i class="md-icon">check</i>
<span>${ButtonOk}</span> <span>${ButtonOk}</span>
</button> </button>
</div> </div>

1
dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.template.html vendored
View file

@ -30,7 +30,6 @@
<div class="formDialogFooter"> <div class="formDialogFooter">
<button is="emby-button" type="submit" class="raised submit block formDialogFooterItem"> <button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">
<i class="md-icon">check</i>
<span>${Save}</span> <span>${Save}</span>
</button> </button>
</div> </div>

1
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.template.html vendored
View file

@ -101,7 +101,6 @@
<div class="supporterContainer hide formDialogFooterItem"> <div class="supporterContainer hide formDialogFooterItem">
<p>${MessageActiveSubscriptionRequiredSeriesRecordings}</p> <p>${MessageActiveSubscriptionRequiredSeriesRecordings}</p>
<button is="emby-button" type="button" class="btnSupporter hide raised accent block"> <button is="emby-button" type="button" class="btnSupporter hide raised accent block">
<i class="md-icon">check</i>
<span>${HeaderBecomeProjectSupporter}</span> <span>${HeaderBecomeProjectSupporter}</span>
</button> </button>
</div> </div>

1
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingeditor.template.html vendored
View file

@ -34,7 +34,6 @@
<div class="formDialogFooter"> <div class="formDialogFooter">
<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem" autofocus> <button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem" autofocus>
<i class="md-icon recordingDialogSubmitIcon">fiber_manual_record</i>
<span>${Save}</span> <span>${Save}</span>
</button> </button>
</div> </div>

5
dashboard-ui/bower_components/emby-webcomponents/strings/en-US.json vendored
View file

@ -278,5 +278,8 @@
"HeaderEditImages": "Edit Images", "HeaderEditImages": "Edit Images",
"Settings": "Settings", "Settings": "Settings",
"ShowIndicatorsFor": "Show indicators for:", "ShowIndicatorsFor": "Show indicators for:",
"NewEpisodes": "New episodes" "NewEpisodes": "New episodes",
"HDPrograms": "HD programs",
"LiveBroadcasts": "Live broadcasts",
"Premieres": "Premieres"
} }

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

@ -409,7 +409,7 @@
html += '<div class="formFields"></div>'; html += '<div class="formFields"></div>';
html += '<div class="formDialogFooter">'; 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 += '</div>';
html += '</form>'; html += '</form>';

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

@ -32,14 +32,14 @@
"web-component-tester": "^4.0.0", "web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.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", "_release": "1.0.10",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.0.10", "tag": "v1.0.10",
"commit": "f4e146da4982ff96bb25db85290c09e8de4ec734" "commit": "f4e146da4982ff96bb25db85290c09e8de4ec734"
}, },
"_source": "git://github.com/polymerelements/iron-icon.git", "_source": "git://github.com/PolymerElements/iron-icon.git",
"_target": "^1.0.0", "_target": "^1.0.0",
"_originalSource": "polymerelements/iron-icon" "_originalSource": "PolymerElements/iron-icon"
} }

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

@ -27,14 +27,14 @@
}, },
"main": "iron-meta.html", "main": "iron-meta.html",
"ignore": [], "ignore": [],
"homepage": "https://github.com/PolymerElements/iron-meta", "homepage": "https://github.com/polymerelements/iron-meta",
"_release": "1.1.2", "_release": "1.1.2",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.1.2", "tag": "v1.1.2",
"commit": "bae96531b63ea6d4ce982f5592248aea849c0f5a" "commit": "bae96531b63ea6d4ce982f5592248aea849c0f5a"
}, },
"_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"
} }

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

@ -32,14 +32,14 @@
"iron-component-page": "polymerElements/iron-component-page#^1.1.6" "iron-component-page": "polymerElements/iron-component-page#^1.1.6"
}, },
"private": true, "private": true,
"homepage": "https://github.com/polymer/polymer", "homepage": "https://github.com/Polymer/polymer",
"_release": "1.6.1", "_release": "1.6.1",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "v1.6.1", "tag": "v1.6.1",
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc" "commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
}, },
"_source": "git://github.com/polymer/polymer.git", "_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.1.0", "_target": "^1.1.0",
"_originalSource": "polymer/polymer" "_originalSource": "Polymer/polymer"
} }

7
dashboard-ui/components/directorybrowser/directorybrowser.css
View file

@ -13,11 +13,4 @@
padding: 1em; padding: 1em;
border-radius: 5px; border-radius: 5px;
margin-top: 2em; margin-top: 2em;
}
.directoryPicker paper-item {
min-height: 36px;
border-bottom: 1px solid #eee;
outline: none;
cursor: pointer;
} }

44
dashboard-ui/components/directorybrowser/directorybrowser.js
View file

@ -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; var systemInfo;
function getSystemInfo() { function getSystemInfo() {
@ -107,6 +107,9 @@
var html = ''; var html = '';
html += '<div class="formDialogContent smoothScrollY">';
html += '<div class="dialogContentInner dialog-content-centered">';
var instruction = options.instruction ? options.instruction + '<br/><br/>' : ''; var instruction = options.instruction ? options.instruction + '<br/><br/>' : '';
html += '<p class="directoryPickerHeadline">'; html += '<p class="directoryPickerHeadline">';
@ -133,7 +136,7 @@
html += '</p>'; 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 class="inputContainer" style="display: flex; align-items: center;">';
html += '<div style="flex-grow:1;">'; 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 += '<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>';
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 += '<div class="formDialogFooter">';
html += '<button is="emby-button" type="submit" class="raised submit block">' + Globalize.translate('ButtonOk') + '</button>'; html += '<button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">' + Globalize.translate('ButtonOk') + '</button>';
html += '</div>'; html += '</div>';
html += '</form>'; html += '</form>';
html += '</div>'; html += '</div>';
html += '</div>';
html += '</div>';
return html; return html;
} }
@ -227,30 +233,32 @@
var initialPath = responses[1]; var initialPath = responses[1];
var dlg = dialogHelper.createDialog({ var dlg = dialogHelper.createDialog({
size: 'medium', size: 'medium-tall',
removeOnClose: true removeOnClose: true,
scrollY: false
}); });
dlg.classList.add('ui-body-a'); dlg.classList.add('ui-body-a');
dlg.classList.add('background-theme-a'); dlg.classList.add('background-theme-a');
dlg.classList.add('directoryPicker'); dlg.classList.add('directoryPicker');
dlg.classList.add('formDialog');
var html = ''; var html = '';
html += '<h2 class="dialogHeader">'; html += '<div class="formDialogHeader">';
html += '<button type="button" is="emby-button" icon="arrow-back" class="fab mini btnCloseDialog autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>'; html += '<button is="paper-icon-button-light" class="btnCloseDialog autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
html += '<div style="display:inline-block;margin-left:.6em;vertical-align:middle;">' + (options.header || Globalize.translate('HeaderSelectPath')) + '</div>'; html += '<div class="formDialogHeaderTitle">';
html += '</h2>'; html += options.header || Globalize.translate('HeaderSelectPath');
html += '<div class="editorContent" style="max-width:800px;margin:auto;">';
html += getEditorHtml(options, systemInfo);
html += '</div>'; html += '</div>';
html += '</div>';
html += getEditorHtml(options, systemInfo);
dlg.innerHTML = html; dlg.innerHTML = html;
document.body.appendChild(dlg); document.body.appendChild(dlg);
var editorContent = dlg.querySelector('.editorContent'); initEditor(dlg, options, fileOptions);
initEditor(editorContent, options, fileOptions);
// Has to be assigned a z-index after the call to .open() // Has to be assigned a z-index after the call to .open()
$(dlg).on('iron-overlay-opened', function () { $(dlg).on('iron-overlay-opened', function () {
@ -267,9 +275,9 @@
currentDialog = dlg; currentDialog = dlg;
var txtCurrentPath = editorContent.querySelector('#txtDirectoryPickerPath'); var txtCurrentPath = dlg.querySelector('#txtDirectoryPickerPath');
txtCurrentPath.value = initialPath; txtCurrentPath.value = initialPath;
refreshDirectoryBrowser(editorContent, txtCurrentPath.value); refreshDirectoryBrowser(dlg, txtCurrentPath.value);
}); });
}; };

6
dashboard-ui/components/medialibrarycreator/medialibrarycreator.js
View file

@ -214,17 +214,19 @@
var template = this.response; var template = this.response;
var dlg = dialogHelper.createDialog({ var dlg = dialogHelper.createDialog({
size: 'small', size: 'medium',
// In (at least) chrome this is causing the text field to not be editable // In (at least) chrome this is causing the text field to not be editable
modal: false, modal: false,
removeOnClose: true removeOnClose: true,
scrollY: false
}); });
dlg.classList.add('ui-body-a'); dlg.classList.add('ui-body-a');
dlg.classList.add('background-theme-a'); dlg.classList.add('background-theme-a');
dlg.classList.add('dlg-librarycreator'); dlg.classList.add('dlg-librarycreator');
dlg.classList.add('formDialog');
dlg.innerHTML = Globalize.translateDocument(template); dlg.innerHTML = Globalize.translateDocument(template);
document.body.appendChild(dlg); document.body.appendChild(dlg);

6
dashboard-ui/components/medialibrarycreator/medialibrarycreator.template.html
View file

@ -28,9 +28,9 @@
<br /> <br />
<div class="libraryOptions"></div> <div class="libraryOptions"></div>
<br /> <br />
<div>
<button is="emby-button" type="submit" class="raised submit block"> <div class="formDialogFooter">
<i class="md-icon">check</i> <button is="emby-button" type="submit" class="raised submit block formDialogFooterItem">
<span>${ButtonOk}</span> <span>${ButtonOk}</span>
</button> </button>
</div> </div>

6
dashboard-ui/components/medialibraryeditor/medialibraryeditor.js
View file

@ -170,16 +170,18 @@
var template = this.response; var template = this.response;
var dlg = dialogHelper.createDialog({ var dlg = dialogHelper.createDialog({
size: 'small', size: 'medium',
// In (at least) chrome this is causing the text field to not be editable // In (at least) chrome this is causing the text field to not be editable
modal: false, modal: false,
removeOnClose: true removeOnClose: true,
scrollY: false
}); });
dlg.classList.add('dlg-libraryeditor'); dlg.classList.add('dlg-libraryeditor');
dlg.classList.add('ui-body-a'); dlg.classList.add('ui-body-a');
dlg.classList.add('background-theme-a'); dlg.classList.add('background-theme-a');
dlg.classList.add('formDialog');
dlg.innerHTML = Globalize.translateDocument(template); dlg.innerHTML = Globalize.translateDocument(template);

5
dashboard-ui/thirdparty/paper-button-style.css vendored
View file

@ -151,6 +151,11 @@ div.dialogHeader {
color: #fff; color: #fff;
} }
.ui-body-a div.formDialogFooter {
background-color: #ddd;
color: inherit;
}
.ui-body-a .formDialogHeader a { .ui-body-a .formDialogHeader a {
color: #fff !important; color: #fff !important;
text-transform: uppercase; text-transform: uppercase;