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 setup wizard

Browse Source
This commit is contained in:
Luke Pulverenti 2015-08-21 15:25:35 -04:00
parent 1e871a165c
commit 2c391ac1a0
8 changed files with 101 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dashboard-ui/bower_components/iron-flex-layout/.bower.json vendored
View File

@ -23,14 +23,14 @@
"paper-styles": "polymerelements/paper-styles#^1.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/PolymerElements/iron-flex-layout",
"homepage": "https://github.com/polymerelements/iron-flex-layout",
"_release": "1.0.3",
"_resolution": {
"type": "version",
"tag": "v1.0.3",
"commit": "e6c2cfec18354973ac03e70dcd8afcc3c72d09b9"
},
"_source": "git://github.com/PolymerElements/iron-flex-layout.git",
"_source": "git://github.com/polymerelements/iron-flex-layout.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-flex-layout"
"_originalSource": "polymerelements/iron-flex-layout"
}

6
dashboard-ui/bower_components/iron-meta/.bower.json vendored
View File

@ -25,14 +25,14 @@
"web-component-tester": "*",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"homepage": "https://github.com/PolymerElements/iron-meta",
"homepage": "https://github.com/polymerelements/iron-meta",
"_release": "1.0.3",
"_resolution": {
"type": "version",
"tag": "v1.0.3",
"commit": "91529259262b0d8f33fed44bc3fd47aedf35cb04"
},
"_source": "git://github.com/PolymerElements/iron-meta.git",
"_source": "git://github.com/polymerelements/iron-meta.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/iron-meta"
"_originalSource": "polymerelements/iron-meta"
}

4
dashboard-ui/bower_components/paper-behaviors/.bower.json vendored
View File

@ -42,7 +42,7 @@
"tag": "v1.0.3",
"commit": "90b54de14264c19693601b9fc16af6b68a9d48e4"
},
"_source": "git://github.com/PolymerElements/paper-behaviors.git",
"_source": "git://github.com/polymerelements/paper-behaviors.git",
"_target": "^1.0.0",
"_originalSource": "PolymerElements/paper-behaviors"
"_originalSource": "polymerelements/paper-behaviors"
}

8
dashboard-ui/livetvnewrecording.html
View File

@ -73,7 +73,13 @@
<br />
<br />
<div>
<button type="submit" data-role="none" class="clearButton">
<div class="supporterContainer hide">
<p>${MessageActiveSupporterMembershipRequiredSeriesRecordings}</p>
<p class="supporterTrial hide">${HeaderEnjoyDayTrial}</p>
<a class="clearLink btnSupporter hide" href="http://emby.media/donate" target="_blank"><paper-button raised class="accent block"><iron-icon icon="check"></iron-icon><span>${HeaderBecomeProjectSupporter}</span></paper-button></a>
<br/>
</div>
<button type="submit" data-role="none" class="clearButton btnSubmitContainer">
<paper-button raised class="submit block" style="background:#cc3333;"><iron-icon icon="videocam"></iron-icon><span>${ButtonRecord}</span></paper-button>
</button>

2
dashboard-ui/nowplaying.html
View File

@ -12,9 +12,9 @@
<div style="float:right;position:relative;top:5px;right:5px;text-align:right;">
<div>
<span class="nowPlayingSelectedPlayer"></span>
<paper-fab mini icon="slideshow" class="btnSlideshow" style="vertical-align:middle;background:#888;z-index:1;margin-right:.5em;"></paper-fab>
<paper-fab mini icon="cast" class="blue nowPlayingCastIcon" onclick="MediaController.showPlayerSelection();" style="vertical-align:middle;"></paper-fab>
</div>
<div style="margin-top:1em;"><paper-fab mini icon="slideshow" class="btnSlideshow" style="vertical-align:middle;background:#888;z-index:1;"></paper-fab></div>
</div>
<neon-animated-pages selected="{{selected}}">

86
dashboard-ui/scripts/livetvnewrecording.js
View File

@ -1,6 +1,44 @@
(function ($, document) {
var currentProgram;
var registrationInfo;
var lastRegId;
function getRegistration(programId) {
var deferred = DeferredBuilder.Deferred();
if (registrationInfo && lastRegId == programId) {
deferred.resolveWith(null, [registrationInfo]);
}
registrationInfo = null;
lastRegId = programId;
Dashboard.showLoadingMsg();
ApiClient.getJSON(ApiClient.getUrl('LiveTv/Registration', {
ProgramId: programId,
Feature: 'seriesrecordings'
})).done(function (result) {
lastRegId = programId;
registrationInfo = result;
deferred.resolveWith(null, [registrationInfo]);
Dashboard.hideLoadingMsg();
}).fail(function () {
deferred.resolveWith(null, [
{
TrialVersion: true,
IsValid: true,
IsRegistered: false
}]);
Dashboard.hideLoadingMsg();
});
return deferred.promise();
}
function renderRecording(page, defaultTimer, program) {
@ -141,6 +179,47 @@
return false;
}
function hideSeriesRecordingFields(page) {
$('#seriesFields', page).hide();
page.querySelector('.btnSubmitContainer').classList.remove('hide');
page.querySelector('.supporterContainer').classList.add('hide');
}
function showSeriesRecordingFields(page) {
$('#seriesFields', page).show();
page.querySelector('.btnSubmitContainer').classList.remove('hide');
getRegistration(getParameterByName('programid')).done(function (regInfo) {
if (regInfo.IsValid) {
page.querySelector('.btnSubmitContainer').classList.remove('hide');
} else {
page.querySelector('.btnSubmitContainer').classList.add('hide');
}
if (regInfo.IsRegistered) {
page.querySelector('.supporterContainer').classList.add('hide');
} else {
page.querySelector('.supporterContainer').classList.remove('hide');
if (AppInfo.enableSupporterMembership) {
page.querySelector('.btnSupporter').classList.remove('hide');
} else {
page.querySelector('.btnSupporter').classList.add('hide');
}
if (regInfo.TrialVersion) {
page.querySelector('.supporterTrial').classList.remove('hide');
} else {
page.querySelector('.supporterTrial').classList.add('hide');
}
}
});
}
$(document).on('pageinitdepends', "#liveTvNewRecordingPage", function () {
var page = this;
@ -148,11 +227,10 @@
$('#chkRecordSeries', page).on('change', function () {
if (this.checked) {
$('#seriesFields', page).show();
showSeriesRecordingFields(page);
} else {
$('#seriesFields', page).hide();
hideSeriesRecordingFields(page);
}
});
$('#btnCancel', page).on('click', function () {
@ -168,7 +246,7 @@
}).on('pagebeforeshowready', "#liveTvNewRecordingPage", function () {
var page = this;
hideSeriesRecordingFields(page);
reload(page);
}).on('pagebeforehide', "#liveTvNewRecordingPage", function () {

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

@ -1527,5 +1527,6 @@
"HeaderUpcomingForKids": "Upcoming for Kids",
"HeaderSetupLiveTV": "Setup Live TV",
"LabelTunerType": "Tuner type:",
"HelpMoreTunersCanBeAdded": "More tuners can be added later within the Live TV section."
"HelpMoreTunersCanBeAdded": "More tuners can be added later within the Live TV section.",
"MessageActiveSupporterMembershipRequiredSeriesRecordings": "An active Emby Supporter membership is required in order to create automated series recordings."
}

1
dashboard-ui/wizardlivetvtuner.html
View File

@ -25,6 +25,7 @@
<option value="hdhomerun">HDHomerun</option>
</select>
</div>
<br />
<div>
<paper-input class="txtDevicePath" label="${LabelTunerIpAddress}" required="required"></paper-input>
<div class="fieldDescription">${HelpMoreTunersCanBeAdded}</div>