mirror of
https://github.com/jellyfin/jellyfin-web.git
synced 2024-11-17 19:08:18 -07:00
update detail page
This commit is contained in:
parent
f5323ff3c2
commit
dc87e4ccc2
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "paper-tabs",
|
"name": "paper-tabs",
|
||||||
"version": "1.0.1",
|
"version": "1.0.2",
|
||||||
"license": "http://polymer.github.io/LICENSE.txt",
|
"license": "http://polymer.github.io/LICENSE.txt",
|
||||||
"description": "Material design tabs",
|
"description": "Material design tabs",
|
||||||
"private": true,
|
"private": true,
|
||||||
@ -32,17 +32,18 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
|
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
|
||||||
|
"iron-test-helpers": "polymerelements/iron-test-helpers#^1.0.0",
|
||||||
"paper-toolbar": "polymerelements/paper-toolbar#^1.0.0",
|
"paper-toolbar": "polymerelements/paper-toolbar#^1.0.0",
|
||||||
"test-fixture": "polymerelements/test-fixture#^1.0.0",
|
"test-fixture": "polymerelements/test-fixture#^1.0.0",
|
||||||
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
|
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
|
||||||
"web-component-tester": "*"
|
"web-component-tester": "*"
|
||||||
},
|
},
|
||||||
"homepage": "https://github.com/PolymerElements/paper-tabs",
|
"homepage": "https://github.com/PolymerElements/paper-tabs",
|
||||||
"_release": "1.0.1",
|
"_release": "1.0.2",
|
||||||
"_resolution": {
|
"_resolution": {
|
||||||
"type": "version",
|
"type": "version",
|
||||||
"tag": "v1.0.1",
|
"tag": "v1.0.2",
|
||||||
"commit": "6403be53eeef5f9e7a7a7ccd9251f551d26c7548"
|
"commit": "61abed79e3c4e7c87dd826f7f81ef9c7ecb5df78"
|
||||||
},
|
},
|
||||||
"_source": "git://github.com/PolymerElements/paper-tabs.git",
|
"_source": "git://github.com/PolymerElements/paper-tabs.git",
|
||||||
"_target": "~1.0.0",
|
"_target": "~1.0.0",
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "paper-tabs",
|
"name": "paper-tabs",
|
||||||
"version": "1.0.1",
|
"version": "1.0.2",
|
||||||
"license": "http://polymer.github.io/LICENSE.txt",
|
"license": "http://polymer.github.io/LICENSE.txt",
|
||||||
"description": "Material design tabs",
|
"description": "Material design tabs",
|
||||||
"private": true,
|
"private": true,
|
||||||
@ -32,6 +32,7 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
|
"iron-component-page": "PolymerElements/iron-component-page#^1.0.0",
|
||||||
|
"iron-test-helpers": "polymerelements/iron-test-helpers#^1.0.0",
|
||||||
"paper-toolbar": "polymerelements/paper-toolbar#^1.0.0",
|
"paper-toolbar": "polymerelements/paper-toolbar#^1.0.0",
|
||||||
"test-fixture": "polymerelements/test-fixture#^1.0.0",
|
"test-fixture": "polymerelements/test-fixture#^1.0.0",
|
||||||
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
|
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
|
||||||
|
@ -12,6 +12,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
|||||||
<link rel="import" href="../iron-flex-layout/classes/iron-flex-layout.html">
|
<link rel="import" href="../iron-flex-layout/classes/iron-flex-layout.html">
|
||||||
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
|
<link rel="import" href="../iron-flex-layout/iron-flex-layout.html">
|
||||||
<link rel="import" href="../iron-behaviors/iron-control-state.html">
|
<link rel="import" href="../iron-behaviors/iron-control-state.html">
|
||||||
|
<link rel="import" href="../iron-behaviors/iron-button-state.html">
|
||||||
<link rel="import" href="../paper-ripple/paper-ripple.html">
|
<link rel="import" href="../paper-ripple/paper-ripple.html">
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
@ -120,7 +121,8 @@ Custom property | Description | Default
|
|||||||
is: 'paper-tab',
|
is: 'paper-tab',
|
||||||
|
|
||||||
behaviors: [
|
behaviors: [
|
||||||
Polymer.IronControlState
|
Polymer.IronControlState,
|
||||||
|
Polymer.IronButtonState
|
||||||
],
|
],
|
||||||
|
|
||||||
properties: {
|
properties: {
|
||||||
@ -142,7 +144,11 @@ Custom property | Description | Default
|
|||||||
},
|
},
|
||||||
|
|
||||||
listeners: {
|
listeners: {
|
||||||
down: '_onDown'
|
down: '_updateNoink'
|
||||||
|
},
|
||||||
|
|
||||||
|
attached: function() {
|
||||||
|
this._updateNoink();
|
||||||
},
|
},
|
||||||
|
|
||||||
get _parentNoink () {
|
get _parentNoink () {
|
||||||
@ -150,7 +156,7 @@ Custom property | Description | Default
|
|||||||
return !!parent && !!parent.noink;
|
return !!parent && !!parent.noink;
|
||||||
},
|
},
|
||||||
|
|
||||||
_onDown: function(e) {
|
_updateNoink: function() {
|
||||||
this.noink = !!this.noink || !!this._parentNoink;
|
this.noink = !!this.noink || !!this._parentNoink;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
@ -21,6 +21,7 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
|||||||
<script src="../../test-fixture/test-fixture-mocha.js"></script>
|
<script src="../../test-fixture/test-fixture-mocha.js"></script>
|
||||||
|
|
||||||
<link rel="import" href="../paper-tabs.html">
|
<link rel="import" href="../paper-tabs.html">
|
||||||
|
<link rel="import" href="../../iron-test-helpers/iron-test-helpers.html">
|
||||||
<link rel="import" href="../../test-fixture/test-fixture.html">
|
<link rel="import" href="../../test-fixture/test-fixture.html">
|
||||||
|
|
||||||
</head>
|
</head>
|
||||||
@ -149,10 +150,11 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
|||||||
suite('select tab via click', function() {
|
suite('select tab via click', function() {
|
||||||
|
|
||||||
var tabs, index = 1;
|
var tabs, index = 1;
|
||||||
|
var tab;
|
||||||
|
|
||||||
setup(function () {
|
setup(function () {
|
||||||
tabs = fixture('basic');
|
tabs = fixture('basic');
|
||||||
var tab = tabs.querySelectorAll('paper-tab')[index];
|
tab = tabs.querySelectorAll('paper-tab')[index];
|
||||||
tab.dispatchEvent(new CustomEvent('click', {bubbles: true}));
|
tab.dispatchEvent(new CustomEvent('click', {bubbles: true}));
|
||||||
});
|
});
|
||||||
|
|
||||||
@ -172,6 +174,18 @@ subject to an additional IP rights grant found at http://polymer.github.io/PATEN
|
|||||||
}, 1000);
|
}, 1000);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
test('pressing enter on tab causes a click', function(done) {
|
||||||
|
var clickCount = 0;
|
||||||
|
tab.addEventListener('click', function onTabClick() {
|
||||||
|
clickCount++;
|
||||||
|
tab.removeEventListener('click', onTabClick);
|
||||||
|
|
||||||
|
expect(clickCount).to.be.equal(1);
|
||||||
|
done();
|
||||||
|
});
|
||||||
|
|
||||||
|
MockInteractions.pressEnter(tab);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
@ -387,6 +387,12 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
|
|||||||
margin-left: 1.25em;
|
margin-left: 1.25em;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.userDataIcons paper-fab {
|
||||||
|
background: #444;
|
||||||
|
width: 40px;
|
||||||
|
height: 40px;
|
||||||
|
}
|
||||||
|
|
||||||
.itemBackdrop {
|
.itemBackdrop {
|
||||||
background-size: cover;
|
background-size: cover;
|
||||||
background-position: center 15%;
|
background-position: center 15%;
|
||||||
|
@ -375,10 +375,6 @@
|
|||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
.libraryDocument .lnkManageServer {
|
|
||||||
display: none !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dashboardDocument .headerVoiceButton {
|
.dashboardDocument .headerVoiceButton {
|
||||||
display: none !important;
|
display: none !important;
|
||||||
}
|
}
|
||||||
|
@ -54,6 +54,7 @@
|
|||||||
<paper-button raised class="subdued btnSync hide"><iron-icon icon="refresh"></iron-icon><span>${ButtonSync}</span></paper-button>
|
<paper-button raised class="subdued btnSync hide"><iron-icon icon="refresh"></iron-icon><span>${ButtonSync}</span></paper-button>
|
||||||
<paper-button raised class="subdued btnShare notext hide"><iron-icon icon="share"></iron-icon></paper-button>
|
<paper-button raised class="subdued btnShare notext hide"><iron-icon icon="share"></iron-icon></paper-button>
|
||||||
<paper-button raised class="subdued btnMoreCommands hide notext"><iron-icon icon="more-vert"></iron-icon></paper-button>
|
<paper-button raised class="subdued btnMoreCommands hide notext"><iron-icon icon="more-vert"></iron-icon></paper-button>
|
||||||
|
<span class="userDataIcons" style="display:inline-block;margin-left:1em;"></span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -74,6 +75,7 @@
|
|||||||
<paper-button raised class="subdued btnSync hide"><iron-icon icon="refresh"></iron-icon><span>${ButtonSync}</span></paper-button>
|
<paper-button raised class="subdued btnSync hide"><iron-icon icon="refresh"></iron-icon><span>${ButtonSync}</span></paper-button>
|
||||||
<paper-button raised class="subdued btnShare notext hide"><iron-icon icon="share"></iron-icon></paper-button>
|
<paper-button raised class="subdued btnShare notext hide"><iron-icon icon="share"></iron-icon></paper-button>
|
||||||
<paper-button raised class="subdued btnMoreCommands hide notext"><iron-icon icon="more-vert"></iron-icon></paper-button>
|
<paper-button raised class="subdued btnMoreCommands hide notext"><iron-icon icon="more-vert"></iron-icon></paper-button>
|
||||||
|
<div class="userDataIcons" style="margin-top:1em;"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div data-role="content" style="padding-top:0;clear:both;">
|
<div data-role="content" style="padding-top:0;clear:both;">
|
||||||
|
@ -56,6 +56,14 @@
|
|||||||
<div class="upcomingSportsItems itemsContainer"></div>
|
<div class="upcomingSportsItems itemsContainer"></div>
|
||||||
<br />
|
<br />
|
||||||
</div>
|
</div>
|
||||||
|
<div id="upcomingKids" class="homePageSection">
|
||||||
|
<div>
|
||||||
|
<h1 class="listHeader" style="display:inline-block;vertical-align:middle;">${HeaderUpcomingForKids}</h1>
|
||||||
|
<a href="livetvitems.html?type=kids" class="clearLink" style="margin-left:1em;vertical-align:middle;"><paper-button raised class="more mini noIcon">${ButtonMoreItems}</paper-button></a>
|
||||||
|
</div>
|
||||||
|
<div class="upcomingKidsItems itemsContainer"></div>
|
||||||
|
<br />
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</neon-animatable>
|
</neon-animatable>
|
||||||
<neon-animatable>
|
<neon-animatable>
|
||||||
|
@ -41,19 +41,13 @@
|
|||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
<div>
|
<div>
|
||||||
<fieldset data-role="controlgroup">
|
<label>${LabelEnableInternetMetadataForTvPrograms}</label>
|
||||||
<legend>${LabelEnableInternetMetadataForTvPrograms}</legend>
|
<paper-checkbox id="chkMovies">${OptionTVMovies}</paper-checkbox>
|
||||||
<label for="chkMovies">${OptionTVMovies}</label>
|
|
||||||
<input type="checkbox" id="chkMovies" />
|
|
||||||
</fieldset>
|
|
||||||
</div>
|
</div>
|
||||||
<div>
|
<div>
|
||||||
<br />
|
<br />
|
||||||
<label for="txtRecordingPath">${LabelRecordingPath}</label>
|
<paper-input id="txtRecordingPath" label="${LabelRecordingPath}" style="width:80%;display:inline-block;"></paper-input>
|
||||||
<div style="display: inline-block; width: 85%;">
|
<paper-icon-button id="btnSelectRecordingPath" icon="search"></paper-icon-button>
|
||||||
<input type="text" id="txtRecordingPath" />
|
|
||||||
</div>
|
|
||||||
<button id="btnSelectRecordingPath" type="button" data-icon="search" data-iconpos="notext" data-inline="true">${ButtonSelectDirectory}</button>
|
|
||||||
<div class="fieldDescription">${LabelRecordingPathHelp}</div>
|
<div class="fieldDescription">${LabelRecordingPathHelp}</div>
|
||||||
</div>
|
</div>
|
||||||
<br />
|
<br />
|
||||||
|
@ -113,7 +113,7 @@
|
|||||||
shape: "detailPagePortrait",
|
shape: "detailPagePortrait",
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
overlayPlayButton: true
|
overlayMoreButton: true
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -142,7 +142,8 @@
|
|||||||
}, {
|
}, {
|
||||||
shape: "detailPagePortrait",
|
shape: "detailPagePortrait",
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
centerText: true
|
centerText: true,
|
||||||
|
overlayMoreButton: true
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|
||||||
@ -171,7 +172,8 @@
|
|||||||
}, {
|
}, {
|
||||||
shape: "detailPagePortrait",
|
shape: "detailPagePortrait",
|
||||||
showTitle: true,
|
showTitle: true,
|
||||||
centerText: true
|
centerText: true,
|
||||||
|
overlayMoreButton: true
|
||||||
});
|
});
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
@ -3101,11 +3101,11 @@
|
|||||||
miscInfo.push(Globalize.translate('LabelHDProgram'));
|
miscInfo.push(Globalize.translate('LabelHDProgram'));
|
||||||
}
|
}
|
||||||
|
|
||||||
if (item.Audio) {
|
//if (item.Audio) {
|
||||||
|
|
||||||
miscInfo.push(item.Audio);
|
// miscInfo.push(item.Audio);
|
||||||
|
|
||||||
}
|
//}
|
||||||
|
|
||||||
if (item.Video3DFormat) {
|
if (item.Video3DFormat) {
|
||||||
miscInfo.push("3D");
|
miscInfo.push("3D");
|
||||||
|
@ -50,7 +50,7 @@
|
|||||||
if (view == "Poster") {
|
if (view == "Poster") {
|
||||||
html = LibraryBrowser.getPosterViewHtml({
|
html = LibraryBrowser.getPosterViewHtml({
|
||||||
items: result.Items,
|
items: result.Items,
|
||||||
shape: "portrait",
|
shape: "auto",
|
||||||
context: 'livetv',
|
context: 'livetv',
|
||||||
showTitle: false,
|
showTitle: false,
|
||||||
centerText: true,
|
centerText: true,
|
||||||
@ -153,6 +153,7 @@
|
|||||||
|
|
||||||
query.IsMovie = getParameterByName('type') == 'movies' ? true : null;
|
query.IsMovie = getParameterByName('type') == 'movies' ? true : null;
|
||||||
query.IsSports = getParameterByName('type') == 'sports' ? true : null;
|
query.IsSports = getParameterByName('type') == 'sports' ? true : null;
|
||||||
|
query.IsKids = getParameterByName('type') == 'kids' ? true : null;
|
||||||
|
|
||||||
var viewkey = getSavedQueryKey();
|
var viewkey = getSavedQueryKey();
|
||||||
|
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
|
|
||||||
$('#selectGuideDays', page).val(config.GuideDays || '').selectmenu('refresh');
|
$('#selectGuideDays', page).val(config.GuideDays || '').selectmenu('refresh');
|
||||||
|
|
||||||
$('#chkMovies', page).checked(config.EnableMovieProviders).checkboxradio("refresh");
|
$('#chkMovies', page).checked(config.EnableMovieProviders);
|
||||||
|
|
||||||
$('#txtRecordingPath', page).val(config.RecordingPath || '');
|
$('#txtRecordingPath', page).val(config.RecordingPath || '');
|
||||||
|
|
||||||
|
@ -119,6 +119,31 @@
|
|||||||
elem.innerHTML = html;
|
elem.innerHTML = html;
|
||||||
ImageLoader.lazyChildren(elem);
|
ImageLoader.lazyChildren(elem);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
ApiClient.getLiveTvRecommendedPrograms({
|
||||||
|
|
||||||
|
userId: Dashboard.getCurrentUserId(),
|
||||||
|
IsAiring: false,
|
||||||
|
HasAired: false,
|
||||||
|
limit: 8,
|
||||||
|
IsKids: true
|
||||||
|
|
||||||
|
}).done(function (result) {
|
||||||
|
|
||||||
|
var html = LibraryBrowser.getPosterViewHtml({
|
||||||
|
items: result.Items,
|
||||||
|
shape: "auto",
|
||||||
|
showTitle: false,
|
||||||
|
coverImage: true,
|
||||||
|
overlayText: false,
|
||||||
|
lazy: true,
|
||||||
|
overlayMoreButton: true
|
||||||
|
});
|
||||||
|
|
||||||
|
var elem = page.querySelector('.upcomingKidsItems');
|
||||||
|
elem.innerHTML = html;
|
||||||
|
ImageLoader.lazyChildren(elem);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function renderSuggestedTab(page, tabContent) {
|
function renderSuggestedTab(page, tabContent) {
|
||||||
|
@ -1523,5 +1523,6 @@
|
|||||||
"OptionSyncLosslessAudioOriginal": "Sync lossless audio at original quality",
|
"OptionSyncLosslessAudioOriginal": "Sync lossless audio at original quality",
|
||||||
"HeaderMetadata": "Metadata",
|
"HeaderMetadata": "Metadata",
|
||||||
"HeaderRecordingOptions": "Recording Options",
|
"HeaderRecordingOptions": "Recording Options",
|
||||||
"ButtonShare": "Share"
|
"ButtonShare": "Share",
|
||||||
|
"HeaderUpcomingForKids": "Upcoming for Kids"
|
||||||
}
|
}
|
||||||
|
@ -384,6 +384,10 @@ paper-menu-item {
|
|||||||
color: #858585 !important;
|
color: #858585 !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.ui-page-theme-a .label-is-highlighted label {
|
||||||
|
color: green !important;
|
||||||
|
}
|
||||||
|
|
||||||
.ui-page-theme-b .label-is-highlighted label {
|
.ui-page-theme-b .label-is-highlighted label {
|
||||||
color: #52B54B !important;
|
color: #52B54B !important;
|
||||||
}
|
}
|
||||||
@ -392,7 +396,7 @@ paper-menu-item {
|
|||||||
color: #fff !important;
|
color: #fff !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
paper-input .focused-line, .ui-page-theme-b paper-textarea .focused-line {
|
paper-input .focused-line, paper-textarea .focused-line {
|
||||||
background-color: #52B54B !important;
|
background-color: #52B54B !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -15753,7 +15753,8 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
|
|||||||
is: 'paper-tab',
|
is: 'paper-tab',
|
||||||
|
|
||||||
behaviors: [
|
behaviors: [
|
||||||
Polymer.IronControlState
|
Polymer.IronControlState,
|
||||||
|
Polymer.IronButtonState
|
||||||
],
|
],
|
||||||
|
|
||||||
properties: {
|
properties: {
|
||||||
@ -15775,7 +15776,11 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
|
|||||||
},
|
},
|
||||||
|
|
||||||
listeners: {
|
listeners: {
|
||||||
down: '_onDown'
|
down: '_updateNoink'
|
||||||
|
},
|
||||||
|
|
||||||
|
attached: function() {
|
||||||
|
this._updateNoink();
|
||||||
},
|
},
|
||||||
|
|
||||||
get _parentNoink () {
|
get _parentNoink () {
|
||||||
@ -15783,7 +15788,7 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
|
|||||||
return !!parent && !!parent.noink;
|
return !!parent && !!parent.noink;
|
||||||
},
|
},
|
||||||
|
|
||||||
_onDown: function(e) {
|
_updateNoink: function() {
|
||||||
this.noink = !!this.noink || !!this._parentNoink;
|
this.noink = !!this.noink || !!this._parentNoink;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
Loading…
Reference in New Issue
Block a user