milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

enable shared media info

Browse source
This commit is contained in:
Luke Pulverenti 2016-05-12 01:58:05 -04:00
parent 014d70f5d7
commit 3af73d4fde
23 changed files with 181 additions and 484 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": {},
"ignore": [],
"version": "1.2.75",
"_release": "1.2.75",
"version": "1.2.87",
"_release": "1.2.87",
"_resolution": {
"type": "version",
"tag": "1.2.75",
"commit": "122d3aaefc1fe36b22916f03dac5eea73fbb2ba7"
"tag": "1.2.87",
"commit": "21a6cacb0ec2cf301045a5fb35192753efd71025"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0",

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

@ -83,37 +83,6 @@
background-color: #0B487D;
}
.timerCircle {
display: inline-block;
width: 1em;
height: 1em;
border-radius: 50%;
background: #cc0000;
border: 1px solid #cc3333;
margin-left: 1em;
}
.seriesTimerCircle {
position: relative;
margin-left: 0;
left: 21px;
opacity: .3;
}
.itemMiscInfo .seriesTimerCircle:first-child {
margin-left: 1em;
}
.seriesTimerCircle + .seriesTimerCircle {
opacity: .65;
left: 0;
}
.seriesTimerCircle + .seriesTimerCircle + .seriesTimerCircle {
opacity: 1;
left: -21px;
}
.channelTimeslotHeader {
float: left;
}
@ -122,10 +91,6 @@
white-space: nowrap;
}
.mobileGuide .timeslotHeaders {
overflow-x: hidden;
}
.programContainer {
white-space: nowrap;
position: relative;

BIN
dashboard-ui/bower_components/emby-webcomponents/mediainfo/fresh.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 18 KiB

65
dashboard-ui/bower_components/emby-webcomponents/mediainfo/mediainfo.css vendored Normal file
View file

@ -0,0 +1,65 @@
.mediaInfoItem {
margin: 0 1em 0 0;
}
iron-icon.mediaInfoItem {
width: 3vh;
height: 3vh;
margin-right: .6em;
}
.mediaInfoItem:last-child {
margin-right: 0;
}
.starRatingContainer {
display: flex;
align-items: center;
justify-content: center;
vertical-align: middle;
padding-top: 0;
padding-bottom: 0;
}
.starRatingContainer iron-icon {
color: #CB272A;
width: 3vh;
height: 3vh;
}
.mediaInfoItem.criticRating {
padding-left: 3.15vh;
background-position: left center;
background-repeat: no-repeat;
background-size: auto 2.6vh;
min-height: 2.6vh;
display: flex;
align-items: center;
}
.mediaInfoItem.criticRatingFresh {
background-image: url(fresh.png);
}
.mediaInfoItem.criticRatingRotten {
background-image: url(rotten.png);
}
.mediaInfoItem.timerIcon {
color: #CB272A;
}
.mediaInfoProgramAttribute {
color: yellow;
text-transform: uppercase;
}
.layout-tv iron-icon.mediaInfoItem {
width: 4vh;
height: 4vh;
}
.layout-tv .starRatingContainer iron-icon {
width: 3.4vh;
height: 3.4vh;
}

55
dashboard-ui/bower_components/emby-webcomponents/mediainfo/mediainfo.js vendored
View file

@ -1,4 +1,4 @@
define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html'], function (datetime, globalize, embyRouter) {
define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html', 'css!./mediainfo.css'], function (datetime, globalize, embyRouter) {
function getProgramInfoHtml(item, options) {
var html = '';
@ -40,6 +40,17 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html']
miscInfo.push('CH ' + item.ChannelNumber);
}
if (item.SeriesTimerId) {
miscInfo.push({
html: '<iron-icon class="mediaInfoItem timerIcon" icon="mediainfo:fiber-smart-record"></iron-icon>'
});
}
else if (item.TimerId) {
miscInfo.push({
html: '<iron-icon class="mediaInfoItem timerIcon" icon="mediainfo:fiber-manual-record"></iron-icon>'
});
}
html += miscInfo.map(function (m) {
return getMediaInfoItem(m);
}).join('');
@ -145,6 +156,22 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html']
if (item.Type == 'Program') {
if (item.IsLive) {
miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('core#AttributeLive') + '</div>'
});
}
else if (item.IsPremiere) {
miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('core#AttributePremiere') + '</div>'
});
}
else if (item.IsSeries && !item.IsRepeat) {
miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('core#AttributeNew') + '</div>'
});
}
if (item.PremiereDate) {
try {
@ -201,12 +228,6 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html']
});
}
if (item.HasSubtitles && options.subtitles !== false) {
miscInfo.push({
html: '<iron-icon class="mediaInfoItem closedCaptionIcon" icon="core:closed-caption"></iron-icon>'
});
}
if (item.Video3DFormat) {
miscInfo.push("3D");
}
@ -221,6 +242,10 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html']
html += getStarIconsHtml(item);
if (item.HasSubtitles && options.subtitles !== false) {
html += '<iron-icon class="mediaInfoItem closedCaptionIcon" icon="mediainfo:closed-caption"></iron-icon>';
}
if (item.CriticRating && options.criticRating !== false) {
if (item.CriticRating >= 60) {
@ -295,20 +320,8 @@ define(['datetime', 'globalize', 'embyRouter', 'html!./../icons/mediainfo.html']
if (rating) {
html += '<div class="starRatingContainer mediaInfoItem">';
for (var i = 0; i < 5; i++) {
var starValue = (i + 1) * 2;
if (rating < starValue - 2) {
html += '<iron-icon icon="core:star" class="emptyStar"></iron-icon>';
}
else if (rating < starValue) {
html += '<iron-icon icon="core:star-half"></iron-icon>';
}
else {
html += '<iron-icon icon="core:star"></iron-icon>';
}
}
html += '<iron-icon icon="mediainfo:star"></iron-icon>';
html += rating;
html += '</div>';
}

BIN
dashboard-ui/bower_components/emby-webcomponents/mediainfo/rotten.png vendored Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 14 KiB

4
dashboard-ui/bower_components/emby-webcomponents/router.js vendored
View file

@ -490,7 +490,9 @@ define(['loading', 'viewManager', 'skinManager', 'pluginManager', 'backdrop', 'b
if (typeof (item) === 'string') {
require(['connectionManager'], function (connectionManager) {
var apiClient = serverId ? connectionManager.getApiClient(serverId) : connectionManager.currentApiClient();
apiClient.getItem(apiClient.getCurrentUserId(), item).then(showItem);
apiClient.getItem(apiClient.getCurrentUserId(), item).then(function (item) {
embyRouter.showItem(item);
});
});
} else {
skinManager.getCurrentSkin().showItem(item);