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

View file

@ -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",

View file

@ -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;
}

View file

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

View file

@ -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>

View file

@ -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;
}

View file

@ -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++) {

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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>

View file

@ -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"
}

View file

@ -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>';