cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

update dialogs

Browse Source
This commit is contained in:
Luke Pulverenti 2016-09-09 12:58:08 -04:00
parent 7bc57e287a
commit f17942c1cd
19 changed files with 68 additions and 55 deletions
Show Stats 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.234", "version": "1.4.235",
"_release": "1.4.234", "_release": "1.4.235",
"_resolution": { "_resolution": {
"type": "version", "type": "version",
"tag": "1.4.234", "tag": "1.4.235",
"commit": "6e3e3425ec8e10a968bc92be565f62166da4ae18" "commit": "228f893d3748b11d61946cf48fc78a018599be93"
}, },
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git", "_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1", "_target": "^1.2.1",

9
dashboard-ui/bower_components/emby-webcomponents/browserdeviceprofile.js vendored
View File

@ -285,9 +285,12 @@ define(['browser'], function (browser) {
hlsVideoAudioCodecs.push('mp3'); hlsVideoAudioCodecs.push('mp3');
} }
if (browser.tizen) {
videoAudioCodecs.push('dca');
videoAudioCodecs.push('dts');
}
if (browser.edgeUwp) { if (browser.edgeUwp) {
//videoAudioCodecs.push('dca');
//videoAudioCodecs.push('dts');
//videoAudioCodecs.push('truehd'); //videoAudioCodecs.push('truehd');
} }
@ -484,7 +487,7 @@ define(['browser'], function (browser) {
}] }]
}); });
var videoAudioChannels = '6'; var videoAudioChannels = browser.tizen ? '8' : '6';
// Handle he-aac not supported // Handle he-aac not supported
if (!videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.40.5"').replace(/no/, '')) { if (!videoTestElement.canPlayType('video/mp4; codecs="avc1.640029, mp4a.40.5"').replace(/no/, '')) {

8
dashboard-ui/bower_components/emby-webcomponents/cardbuilder/cardbuilder.js vendored
View File

@ -1247,7 +1247,9 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
actionAttribute = ''; actionAttribute = '';
} }
className += ' card-withuserdata'; if (item.Type != 'MusicAlbum' && item.Type != 'MusicArtist' && item.Type != 'Audio') {
className += ' card-withuserdata';
}
var positionTicksData = item.UserData && item.UserData.PlaybackPositionTicks ? (' data-positionticks="' + item.UserData.PlaybackPositionTicks + '"') : ''; var positionTicksData = item.UserData && item.UserData.PlaybackPositionTicks ? (' data-positionticks="' + item.UserData.PlaybackPositionTicks + '"') : '';
var collectionIdData = options.collectionId ? (' data-collectionid="' + options.collectionId + '"') : ''; var collectionIdData = options.collectionId ? (' data-collectionid="' + options.collectionId + '"') : '';
@ -1346,13 +1348,13 @@ define(['datetime', 'imageLoader', 'connectionManager', 'itemHelper', 'mediaInfo
return indicatorsElem; return indicatorsElem;
} }
indicatorsElem = card.querySelector('.indicators'); indicatorsElem = card.querySelector('.cardIndicators');
if (!indicatorsElem) { if (!indicatorsElem) {
var cardImageContainer = card.querySelector('.cardImageContainer'); var cardImageContainer = card.querySelector('.cardImageContainer');
indicatorsElem = document.createElement('div'); indicatorsElem = document.createElement('div');
indicatorsElem.classList.add('indicators'); indicatorsElem.classList.add('cardIndicators');
cardImageContainer.appendChild(indicatorsElem); cardImageContainer.appendChild(indicatorsElem);
} }

4
dashboard-ui/bower_components/emby-webcomponents/dialoghelper/dialoghelper.js vendored
View File

@ -79,7 +79,9 @@
} }
} }
activeElement.focus(); if (layoutManager.tv) {
activeElement.focus();
}
if (dlg.getAttribute('data-removeonclose') != 'false') { if (dlg.getAttribute('data-removeonclose') != 'false') {
removeCenterFocus(dlg); removeCenterFocus(dlg);

2
dashboard-ui/bower_components/emby-webcomponents/guide/guide.css vendored
View File

@ -49,7 +49,7 @@
border-radius: 2px; border-radius: 2px;
margin-right: .5em; margin-right: .5em;
color: #fff; color: #fff;
font-size: 80%; font-size: 74%;
padding: .2em .25em; padding: .2em .25em;
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;

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

8
dashboard-ui/itemdetails.html
View File

@ -147,11 +147,11 @@
<p id="awardSummary"></p> <p id="awardSummary"></p>
<div class="paperList" id="criticRatingSummary"> <div class="paperList" id="criticRatingSummary">
<div class="listItem"> <div class="listItem">
<button is="emby-button" type="button" class="mini fab" style="background-color: transparent; background-repeat: no-repeat; background-position: center center; background-size: cover; background-image: url(css/images/fresh.png);" item-icon></button> <button is="emby-button" type="button" class="mini fab" style="flex-shrink:0;width:40px;height:40px;background-color: transparent; background-repeat: no-repeat; background-position: center center; background-size: cover; background-image: url(css/images/fresh.png);"></button>
<div class="listItemBody three-line"> <div class="listItemBody three-line">
<div>TOMATOMETER®</div> <h3 class="listItemBodyText">TOMATOMETER®</h3>
<div class="criticRatingScore"></div> <div class="listItemBodyText criticRatingScore"></div>
<div class="criticRatingSummaryText secondary" style="white-space: normal;"></div> <div class="listItemBodyText criticRatingSummaryText secondary" style="white-space: normal;"></div>
</div> </div>
</div> </div>
</div> </div>

10
dashboard-ui/scripts/itemdetailpage.js
View File

@ -1455,15 +1455,15 @@
else if (review.Likes != null) { else if (review.Likes != null) {
if (review.Likes) { if (review.Likes) {
html += '<div style="background-color:transparent;background-image:url(\'css/images/fresh.png\');background-repeat:no-repeat;background-position:center center;background-size: cover;width:40px;height:40px;"></div>'; html += '<div style="flex-shrink:0;background-color:transparent;background-image:url(\'css/images/fresh.png\');background-repeat:no-repeat;background-position:center center;background-size: cover;width:40px;height:40px;"></div>';
} else { } else {
html += '<div style="background-color:transparent;background-image:url(\'css/images/rotten.png\');background-repeat:no-repeat;background-position:center center;background-size: cover;width:40px;height:40px;"></div>'; html += '<div style="flex-shrink:0;background-color:transparent;background-image:url(\'css/images/rotten.png\');background-repeat:no-repeat;background-position:center center;background-size: cover;width:40px;height:40px;"></div>';
} }
} }
html += '<div class="listItemBody two-line">'; html += '<div class="listItemBody two-line">';
html += '<div style="white-space:normal;">' + review.Caption + '</div>'; html += '<h3 class="listItemBodyText" style="white-space:normal;">' + review.Caption + '</h3>';
var vals = []; var vals = [];
@ -1474,7 +1474,7 @@
vals.push(review.Publisher); vals.push(review.Publisher);
} }
html += '<div class="secondary">' + vals.join(', ') + '.'; html += '<div class="secondary listItemBodyText">' + vals.join(', ') + '.';
if (review.Date) { if (review.Date) {
try { try {
@ -1491,7 +1491,7 @@
html += '</div>'; html += '</div>';
if (review.Url) { if (review.Url) {
html += '<div class="secondary"><a class="textlink" href="' + review.Url + '" target="_blank">' + Globalize.translate('ButtonFullReview') + '</a></div>'; html += '<div class="secondary listItemBodyText"><a class="textlink" href="' + review.Url + '" target="_blank">' + Globalize.translate('ButtonFullReview') + '</a></div>';
} }
html += '</div>'; html += '</div>';

26
dashboard-ui/scripts/registrationservices.js
View File

@ -90,22 +90,27 @@
function showPlaybackOverlay(resolve, reject) { function showPlaybackOverlay(resolve, reject) {
require(['dialogHelper', 'listViewStyle', 'emby-button'], function (dialogHelper) { require(['dialogHelper', 'listViewStyle', 'emby-button', 'formDialogStyle'], function (dialogHelper) {
var dlg = dialogHelper.createDialog({ var dlg = dialogHelper.createDialog({
size: 'fullscreen-border', size: 'fullscreen-border',
removeOnClose: true removeOnClose: true,
scrollY: false
}); });
dlg.classList.add('ui-body-b'); dlg.classList.add('formDialog');
dlg.classList.add('background-theme-b');
var html = ''; var html = '';
html += '<h2 class="dialogHeader">'; html += '<div class="formDialogHeader">';
html += '<button is="emby-button" type="button" class="fab mini btnCancelSupporterInfo" tabindex="-1"><i class="md-icon">arrow_back</i></button>'; html += '<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>';
html += '</h2>'; html += '<h3 class="formDialogHeaderTitle">';
html += '</h3>';
html += '<div class="readOnlyContent" style="margin:0 auto 0;color:#fff;padding:0 1em 1em;">'; html += '</div>';
html += '<div class="formDialogContent smoothScrollY">';
html += '<div class="dialogContentInner dialog-content-centered">';
html += '<h1>' + Globalize.translate('HeaderTryEmbyPremiere') + '</h1>'; html += '<h1>' + Globalize.translate('HeaderTryEmbyPremiere') + '</h1>';
@ -122,9 +127,10 @@
html += '<br/>'; html += '<br/>';
html += '<a class="clearLink" href="http://emby.media/premiere" target="_blank"><button is="emby-button" type="button" class="raised submit block" autoFocus><i class="md-icon">check</i><span>' + Globalize.translate('ButtonBecomeSupporter') + '</span></button></a>'; html += '<a class="clearLink" href="http://emby.media/premiere" target="_blank"><button is="emby-button" type="button" class="raised button-submit block" autoFocus><span>' + Globalize.translate('ButtonBecomeSupporter') + '</span></button></a>';
html += '<button is="emby-button" type="button" class="raised subdued block btnCancelSupporterInfo" style="background:#444;"><i class="md-icon">close</i><span>' + Globalize.translate('ButtonClosePlayVideo') + '</span></button>'; html += '<button is="emby-button" type="button" class="raised subdued block btnCancelSupporterInfo" style="background:#444;"><span>' + Globalize.translate('ButtonClosePlayVideo') + '</span></button>';
html += '</div>';
html += '</div>'; html += '</div>';
dlg.innerHTML = html; dlg.innerHTML = html;

4
dashboard-ui/wizardagreement.html
View File

@ -18,11 +18,11 @@
</div> </div>
<div class="wizardNavigation"> <div class="wizardNavigation">
<button is="emby-button" type="button" onclick="history.back();" class="raised"> <button is="emby-button" type="button" onclick="history.back();" class="raised button-cancel">
<i class="md-icon">arrow_back</i> <i class="md-icon">arrow_back</i>
<span>${LabelPrevious}</span> <span>${LabelPrevious}</span>
</button> </button>
<button is="emby-button" type="submit" class="raised button-accent"> <button is="emby-button" type="submit" class="raised button-submit">
<span>${LabelNext}</span> <span>${LabelNext}</span>
<i class="md-icon">arrow_forward</i> <i class="md-icon">arrow_forward</i>
</button> </button>

4
dashboard-ui/wizardcomponents.html
View File

@ -51,11 +51,11 @@
</div> </div>
<div class="wizardNavigation"> <div class="wizardNavigation">
<button is="emby-button" type="button" onclick="history.back();" class="raised"> <button is="emby-button" type="button" onclick="history.back();" class="raised button-cancel">
<i class="md-icon">arrow_back</i> <i class="md-icon">arrow_back</i>
<span>${LabelPrevious}</span> <span>${LabelPrevious}</span>
</button> </button>
<button is="emby-button" type="submit" class="raised button-accent"> <button is="emby-button" type="submit" class="raised button-submit">
<span>${LabelNext}</span> <span>${LabelNext}</span>
<i class="md-icon">arrow_forward</i> <i class="md-icon">arrow_forward</i>
</button> </button>

4
dashboard-ui/wizardfinish.html
View File

@ -37,8 +37,8 @@
</p> </p>
<div class="wizardNavigation"> <div class="wizardNavigation">
<button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button> <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
<button is="emby-button" type="button" class="raised btnWizardNext button-accent"><i class="md-icon">check</i><span>${LabelFinish}</span></button> <button is="emby-button" type="button" class="raised btnWizardNext button-submit"><i class="md-icon">check</i><span>${LabelFinish}</span></button>
</div> </div>
</div> </div>

4
dashboard-ui/wizardlibrary.html
View File

@ -16,8 +16,8 @@
<br /> <br />
<br /> <br />
<div class="wizardNavigation"> <div class="wizardNavigation">
<button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button> <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
<button is="emby-button" type="button" class="raised button-accent" onclick="WizardLibraryPage.next();"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button> <button is="emby-button" type="button" class="raised button-submit" onclick="WizardLibraryPage.next();"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
</div> </div>
</div> </div>

6
dashboard-ui/wizardlivetvguide.html
View File

@ -27,9 +27,9 @@
<br /> <br />
<br /> <br />
<div class="wizardNavigation"> <div class="wizardNavigation">
<button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button> <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
<button is="emby-button" type="button" class="raised btnNext button-accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button> <button is="emby-button" type="button" class="raised btnNext button-submit"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
<button is="emby-button" type="button" class="raised btnSkip" style="background: #888; color: #fff;"><span>${ButtonSkip}</span><i class="md-icon">arrow_forward</i></button> <button is="emby-button" type="button" class="raised btnSkip button-cancel" style="background: #888; color: #fff;"><span>${ButtonSkip}</span><i class="md-icon">arrow_forward</i></button>
</div> </div>
</div> </div>

6
dashboard-ui/wizardlivetvtuner.html
View File

@ -27,9 +27,9 @@
</div> </div>
<br /> <br />
<div class="wizardNavigation"> <div class="wizardNavigation">
<button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button> <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
<button is="emby-button" type="submit" class="raised button-accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button> <button is="emby-button" type="submit" class="raised button-submit"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
<button is="emby-button" type="button" class="btnSkip raised" style="background: #888; color: #fff;"><span>${ButtonSkip}</span><i class="md-icon">arrow_forward</i></button> <button is="emby-button" type="button" class="btnSkip raised button-cancel" style="background: #888; color: #fff;"><span>${ButtonSkip}</span><i class="md-icon">arrow_forward</i></button>
</div> </div>
</form> </form>
</div> </div>

4
dashboard-ui/wizardservice.html
View File

@ -14,8 +14,8 @@
<p>${WindowsServiceIntro2}</p> <p>${WindowsServiceIntro2}</p>
<div class="wizardNavigation"> <div class="wizardNavigation">
<button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button> <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
<button is="emby-button" type="button" id="btnNextPage" class="raised button-accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button> <button is="emby-button" type="button" id="btnNextPage" class="raised button-submit"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
</div> </div>
</div> </div>

4
dashboard-ui/wizardsettings.html
View File

@ -29,8 +29,8 @@
</div> </div>
<div class="wizardNavigation"> <div class="wizardNavigation">
<button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button> <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
<button is="emby-button" type="submit" class="raised button-accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button> <button is="emby-button" type="submit" class="raised button-submit"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
</div> </div>
</form> </form>
</div> </div>

2
dashboard-ui/wizardstart.html
View File

@ -22,7 +22,7 @@
<br /> <br />
<div class="wizardNavigation" style="text-align:right;"> <div class="wizardNavigation" style="text-align:right;">
<button is="emby-button" type="submit" class="raised button-accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button> <button is="emby-button" type="submit" class="raised button-submit"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
</div> </div>
</form> </form>
</div> </div>

4
dashboard-ui/wizarduser.html
View File

@ -24,8 +24,8 @@
</div> </div>
<br /> <br />
<div class="wizardNavigation"> <div class="wizardNavigation">
<button is="emby-button" type="button" class="raised" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button> <button is="emby-button" type="button" class="raised button-cancel" onclick="history.back();"><i class="md-icon">arrow_back</i><span>${LabelPrevious}</span></button>
<button is="emby-button" type="submit" class="raised button-accent"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button> <button is="emby-button" type="submit" class="raised button-submit"><span>${LabelNext}</span><i class="md-icon">arrow_forward</i></button>
</div> </div>
</form> </form>
</div> </div>