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 detail page

Browse Source
This commit is contained in:
Luke Pulverenti 2015-08-19 02:12:58 -04:00
parent f5323ff3c2
commit dc87e4ccc2
17 changed files with 102 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
dashboard-ui/bower_components/paper-tabs/.bower.json vendored
View File

@ -1,6 +1,6 @@
{
"name": "paper-tabs",
"version": "1.0.1",
"version": "1.0.2",
"license": "http://polymer.github.io/LICENSE.txt",
"description": "Material design tabs",
"private": true,
@ -32,17 +32,18 @@
},
"devDependencies": {
"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",
"test-fixture": "polymerelements/test-fixture#^1.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",
"web-component-tester": "*"
},
"homepage": "https://github.com/PolymerElements/paper-tabs",
"_release": "1.0.1",
"_release": "1.0.2",
"_resolution": {
"type": "version",
"tag": "v1.0.1",
"commit": "6403be53eeef5f9e7a7a7ccd9251f551d26c7548"
"tag": "v1.0.2",
"commit": "61abed79e3c4e7c87dd826f7f81ef9c7ecb5df78"
},
"_source": "git://github.com/PolymerElements/paper-tabs.git",
"_target": "~1.0.0",

3
dashboard-ui/bower_components/paper-tabs/bower.json vendored
View File

@ -1,6 +1,6 @@
{
"name": "paper-tabs",
"version": "1.0.1",
"version": "1.0.2",
"license": "http://polymer.github.io/LICENSE.txt",
"description": "Material design tabs",
"private": true,
@ -32,6 +32,7 @@
},
"devDependencies": {
"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",
"test-fixture": "polymerelements/test-fixture#^1.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0",

12
dashboard-ui/bower_components/paper-tabs/paper-tab.html vendored
View File

@ -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/iron-flex-layout.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">
<!--
@ -120,7 +121,8 @@ Custom property | Description | Default
is: 'paper-tab',
behaviors: [
Polymer.IronControlState
Polymer.IronControlState,
Polymer.IronButtonState
],
properties: {
@ -142,7 +144,11 @@ Custom property | Description | Default
},
listeners: {
down: '_onDown'
down: '_updateNoink'
},
attached: function() {
this._updateNoink();
},
get _parentNoink () {
@ -150,7 +156,7 @@ Custom property | Description | Default
return !!parent && !!parent.noink;
},
_onDown: function(e) {
_updateNoink: function() {
this.noink = !!this.noink || !!this._parentNoink;
}
});

16
dashboard-ui/bower_components/paper-tabs/test/basic.html vendored
View File

@ -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>
<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">
</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() {
var tabs, index = 1;
var tab;
setup(function () {
tabs = fixture('basic');
var tab = tabs.querySelectorAll('paper-tab')[index];
tab = tabs.querySelectorAll('paper-tab')[index];
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);
});
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>

6
dashboard-ui/css/librarybrowser.css
View File

@ -387,6 +387,12 @@ span.itemCommunityRating:not(:empty) + .userDataIcons {
margin-left: 1.25em;
}
.userDataIcons paper-fab {
background: #444;
width: 40px;
height: 40px;
}
.itemBackdrop {
background-size: cover;
background-position: center 15%;

4
dashboard-ui/css/librarymenu.css
View File

@ -375,10 +375,6 @@
display: none !important;
}
.libraryDocument .lnkManageServer {
display: none !important;
}
.dashboardDocument .headerVoiceButton {
display: none !important;
}

2
dashboard-ui/itemdetails.html
View File

@ -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 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>
<span class="userDataIcons" style="display:inline-block;margin-left:1em;"></span>
</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 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>
<div class="userDataIcons" style="margin-top:1em;"></div>
</div>
</div>
<div data-role="content" style="padding-top:0;clear:both;">

8
dashboard-ui/livetv.html
View File

@ -56,6 +56,14 @@
<div class="upcomingSportsItems itemsContainer"></div>
<br />
</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>
</neon-animatable>
<neon-animatable>

14
dashboard-ui/livetvsettings.html
View File

@ -41,19 +41,13 @@
</li>
</ul>
<div>
<fieldset data-role="controlgroup">
<legend>${LabelEnableInternetMetadataForTvPrograms}</legend>
<label for="chkMovies">${OptionTVMovies}</label>
<input type="checkbox" id="chkMovies" />
</fieldset>
<label>${LabelEnableInternetMetadataForTvPrograms}</label>
<paper-checkbox id="chkMovies">${OptionTVMovies}</paper-checkbox>
</div>
<div>
<br />
<label for="txtRecordingPath">${LabelRecordingPath}</label>
<div style="display: inline-block; width: 85%;">
<input type="text" id="txtRecordingPath" />
</div>
<button id="btnSelectRecordingPath" type="button" data-icon="search" data-iconpos="notext" data-inline="true">${ButtonSelectDirectory}</button>
<paper-input id="txtRecordingPath" label="${LabelRecordingPath}" style="width:80%;display:inline-block;"></paper-input>
<paper-icon-button id="btnSelectRecordingPath" icon="search"></paper-icon-button>
<div class="fieldDescription">${LabelRecordingPathHelp}</div>
</div>
<br />

8
dashboard-ui/scripts/itembynamedetailpage.js
View File

@ -113,7 +113,7 @@
shape: "detailPagePortrait",
showTitle: true,
centerText: true,
overlayPlayButton: true
overlayMoreButton: true
});
break;
@ -142,7 +142,8 @@
}, {
shape: "detailPagePortrait",
showTitle: true,
centerText: true
centerText: true,
overlayMoreButton: true
});
break;
@ -171,7 +172,8 @@
}, {
shape: "detailPagePortrait",
showTitle: true,
centerText: true
centerText: true,
overlayMoreButton: true
});
break;

6
dashboard-ui/scripts/librarybrowser.js
View File

@ -3101,11 +3101,11 @@
miscInfo.push(Globalize.translate('LabelHDProgram'));
}
if (item.Audio) {
//if (item.Audio) {
miscInfo.push(item.Audio);
// miscInfo.push(item.Audio);
}
//}
if (item.Video3DFormat) {
miscInfo.push("3D");

3
dashboard-ui/scripts/livetvitems.js
View File

@ -50,7 +50,7 @@
if (view == "Poster") {
html = LibraryBrowser.getPosterViewHtml({
items: result.Items,
shape: "portrait",
shape: "auto",
context: 'livetv',
showTitle: false,
centerText: true,
@ -153,6 +153,7 @@
query.IsMovie = getParameterByName('type') == 'movies' ? true : null;
query.IsSports = getParameterByName('type') == 'sports' ? true : null;
query.IsKids = getParameterByName('type') == 'kids' ? true : null;
var viewkey = getSavedQueryKey();

2
dashboard-ui/scripts/livetvsettings.js
View File

@ -7,7 +7,7 @@
$('#selectGuideDays', page).val(config.GuideDays || '').selectmenu('refresh');
$('#chkMovies', page).checked(config.EnableMovieProviders).checkboxradio("refresh");
$('#chkMovies', page).checked(config.EnableMovieProviders);
$('#txtRecordingPath', page).val(config.RecordingPath || '');

25
dashboard-ui/scripts/livetvsuggested.js
View File

@ -119,6 +119,31 @@
elem.innerHTML = html;
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) {

3
dashboard-ui/strings/html/server.json
View File

@ -1523,5 +1523,6 @@
"OptionSyncLosslessAudioOriginal": "Sync lossless audio at original quality",
"HeaderMetadata": "Metadata",
"HeaderRecordingOptions": "Recording Options",
"ButtonShare": "Share"
"ButtonShare": "Share",
"HeaderUpcomingForKids": "Upcoming for Kids"
}

6
dashboard-ui/thirdparty/paper-button-style.css vendored
View File

@ -384,6 +384,10 @@ paper-menu-item {
color: #858585 !important;
}
.ui-page-theme-a .label-is-highlighted label {
color: green !important;
}
.ui-page-theme-b .label-is-highlighted label {
color: #52B54B !important;
}
@ -392,7 +396,7 @@ paper-menu-item {
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;
}

11
dashboard-ui/vulcanize-out.html
View File

@ -15753,7 +15753,8 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
is: 'paper-tab',
behaviors: [
Polymer.IronControlState
Polymer.IronControlState,
Polymer.IronButtonState
],
properties: {
@ -15775,7 +15776,11 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
},
listeners: {
down: '_onDown'
down: '_updateNoink'
},
attached: function() {
this._updateNoink();
},
get _parentNoink () {
@ -15783,7 +15788,7 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
return !!parent && !!parent.noink;
},
_onDown: function(e) {
_updateNoink: function() {
this.noink = !!this.noink || !!this._parentNoink;
}
});