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

reduce recording failures

Browse source
This commit is contained in:
Luke Pulverenti 2016-09-15 02:23:39 -04:00
parent 274dbafef5
commit 8d12e05583
16 changed files with 60 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/bower_components/emby-apiclient/.bower.json vendored
View file

@ -16,12 +16,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.1.80",
"_release": "1.1.80",
"version": "1.1.81",
"_release": "1.1.81",
"_resolution": {
"type": "version",
"tag": "1.1.80",
"commit": "e5081536baafdd98851376288133d55f7adb1fdb"
"tag": "1.1.81",
"commit": "22bc455d3ac39889799e0baf3223c93da7f34c50"
},
"_source": "https://github.com/MediaBrowser/Emby.ApiClient.Javascript.git",
"_target": "^1.1.51",

7
dashboard-ui/bower_components/emby-apiclient/apiclient.js vendored
View file

@ -940,6 +940,13 @@
return self.getJSON(url);
};
self.getLiveTvRecordingSeries = function (options) {
var url = self.getUrl("LiveTv/Recordings/Series", options || {});
return self.getJSON(url);
};
self.getLiveTvRecordingGroups = function (options) {
var url = self.getUrl("LiveTv/Recordings/Groups", options || {});

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View file

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.244",
"_release": "1.4.244",
"version": "1.4.245",
"_release": "1.4.245",
"_resolution": {
"type": "version",
"tag": "1.4.244",
"commit": "5f86563c8bb109824f6acd8ffe725cbb58725589"
"tag": "1.4.245",
"commit": "cbd3d75f0ee42828276ecf512205a3087c63baba"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

5
dashboard-ui/bower_components/emby-webcomponents/emby-button/emby-button.css vendored
View file

@ -4,7 +4,6 @@
align-items: center;
box-sizing: border-box;
margin: 0 .29em;
background: transparent;
text-align: center;
font-size: inherit;
font-family: inherit;
@ -32,6 +31,10 @@
-webkit-tap-highlight-color: rgba(0,0,0,0);
}
.emby-button:not(.raised) {
background: transparent;
}
.emby-button.raised, .emby-button.fab {
box-shadow: 0 2px 2px 0 rgba(0, 0, 0, 0.14), 0 1px 5px 0 rgba(0, 0, 0, 0.12), 0 3px 1px -2px rgba(0, 0, 0, 0.2);
}

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

@ -58,22 +58,6 @@
color: #fff;
}
.newTvProgram {
background: #64A239;
}
.liveTvProgram {
background: #EC407A;
}
.premiereTvProgram {
background: #EF6C00;
}
.repeatTvProgram {
background: #009688;
}
.programAccent {
position: absolute;
bottom: 0;

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

@ -1,4 +1,4 @@
define(['require', 'browser', 'globalize', 'connectionManager', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'registrationservices', 'dom', 'clearButtonStyle', 'css!./guide.css', 'material-icons', 'scrollStyles', 'emby-button', 'paper-icon-button-light'], function (require, browser, globalize, connectionManager, serverNotifications, loading, datetime, focusManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, registrationServices, dom) {
define(['require', 'browser', 'globalize', 'connectionManager', 'serverNotifications', 'loading', 'datetime', 'focusManager', 'userSettings', 'imageLoader', 'events', 'layoutManager', 'itemShortcuts', 'registrationservices', 'dom', 'clearButtonStyle', 'css!./guide.css', 'programStyles', 'material-icons', 'scrollStyles', 'emby-button', 'paper-icon-button-light'], function (require, browser, globalize, connectionManager, serverNotifications, loading, datetime, focusManager, userSettings, imageLoader, events, layoutManager, itemShortcuts, registrationServices, dom) {
function showViewSettings(instance) {

15
dashboard-ui/bower_components/emby-webcomponents/guide/programs.css vendored Normal file
View file

@ -0,0 +1,15 @@
.newTvProgram {
background: #64A239;
}
.liveTvProgram {
background: #EC407A;
}
.premiereTvProgram {
background: #EF6C00;
}
.repeatTvProgram {
background: #009688;
}

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

@ -54,7 +54,6 @@
.mediaInfoProgramAttribute {
color: #fff;
text-transform: uppercase;
background: #EF6C00;
padding: .16em .6em;
border-radius: .15em;
font-size: 80%;

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

@ -1,4 +1,4 @@
define(['datetime', 'globalize', 'embyRouter', 'itemHelper', 'material-icons', 'css!./mediainfo.css'], function (datetime, globalize, embyRouter, itemHelper) {
define(['datetime', 'globalize', 'embyRouter', 'itemHelper', 'material-icons', 'css!./mediainfo.css', 'programStyles'], function (datetime, globalize, embyRouter, itemHelper) {
function getProgramInfoHtml(item, options) {
var html = '';
@ -159,22 +159,22 @@ define(['datetime', 'globalize', 'embyRouter', 'itemHelper', 'material-icons', '
if (item.IsLive) {
miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('sharedcomponents#Live') + '</div>'
html: '<div class="mediaInfoProgramAttribute mediaInfoItem liveTvProgram">' + globalize.translate('sharedcomponents#Live') + '</div>'
});
}
else if (item.IsPremiere) {
miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('sharedcomponents#Premiere') + '</div>'
html: '<div class="mediaInfoProgramAttribute mediaInfoItem premiereTvProgram">' + globalize.translate('sharedcomponents#Premiere') + '</div>'
});
}
else if (item.IsSeries && !item.IsRepeat) {
miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('sharedcomponents#AttributeNew') + '</div>'
html: '<div class="mediaInfoProgramAttribute mediaInfoItem newTvProgram">' + globalize.translate('sharedcomponents#AttributeNew') + '</div>'
});
}
else if (item.IsSeries && item.IsRepeat) {
miscInfo.push({
html: '<div class="mediaInfoProgramAttribute mediaInfoItem">' + globalize.translate('sharedcomponents#Repeat') + '</div>'
html: '<div class="mediaInfoProgramAttribute mediaInfoItem repeatTvProgram">' + globalize.translate('sharedcomponents#Repeat') + '</div>'
});
}

4
dashboard-ui/bower_components/emby-webcomponents/recordingcreator/recordingcreator.css vendored
View file

@ -24,6 +24,10 @@
margin-top: .5em;
}
.recordingDialog-btnRecord {
background-color: #cc3333;
}
@media all and (max-width: 800px) {
.programDialog-itemName {

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

@ -65,7 +65,7 @@
<button is="emby-button" type="button" class="raised btnPlay btnPlay-notplayable hide block formDialogFooterItem button-submit">
<span>${Play}</span>
</button>
<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit" style="background:#cc3333;">
<button is="emby-button" type="submit" class="raised btnSubmit block formDialogFooterItem button-submit recordingDialog-btnRecord">
<span>${Record}</span>
</button>
</div>

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

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

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

3
dashboard-ui/scripts/itemdetailpage.js
View file

@ -1810,8 +1810,7 @@
var html = cardBuilder.getCardsHtml({
items: items,
shape: "backdrop",
preferThumb: true,
shape: "auto",
showTitle: true,
action: 'play',
overlayText: true,

3
dashboard-ui/scripts/site.js
View file

@ -1250,7 +1250,8 @@ var AppInfo = {};
define("peoplecardbuilder", [embyWebComponentsBowerPath + "/cardbuilder/peoplecardbuilder"], returnFirstDependency);
define("chaptercardbuilder", [embyWebComponentsBowerPath + "/cardbuilder/chaptercardbuilder"], returnFirstDependency);
define("tvguide", [embyWebComponentsBowerPath + "/guide/guide", 'embyRouter'], returnFirstDependency);
define("tvguide", [embyWebComponentsBowerPath + "/guide/guide"], returnFirstDependency);
define("programStyles", ['css!' + embyWebComponentsBowerPath + "/guide/programs"], returnFirstDependency);
define("guide-settings-dialog", [embyWebComponentsBowerPath + "/guide/guide-settings"], returnFirstDependency);
define("syncDialog", [embyWebComponentsBowerPath + "/sync/sync"], returnFirstDependency);
define("voiceDialog", [embyWebComponentsBowerPath + "/voice/voicedialog"], returnFirstDependency);

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

@ -1,10 +1,10 @@
.ui-body-a .raised {
background: #3388cc;
.raised {
background: #404040;
color: #fff;
}
.ui-body-b .raised {
background: #404040;
.ui-body-a .raised {
background: #3388cc;
color: #fff;
}
@ -18,7 +18,7 @@
color: inherit;
}
.ui-body-b .button-submit {
.button-submit {
background: #52B54B;
color: #fff;
}
@ -28,7 +28,7 @@
color: #fff;
}
.ui-body-b .button-accent {
.button-accent {
background: #52B54B;
color: #fff;
}