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

added IHasImages and IHasUserData

Browse source
This commit is contained in:
Luke Pulverenti 2013-12-19 16:51:32 -05:00
parent b0d84e5046
commit 736a8233a3
23 changed files with 121 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dashboard-ui/addplugin.html
View file

@ -11,7 +11,7 @@
<p> <p>
<a data-role="button" data-icon="arrow-left" data-inline="true" data-mini="true" data-theme="b" href="plugincatalog.html">Plugin Catalog</a> <a data-role="button" data-icon="arrow-left" data-inline="true" data-mini="true" data-theme="b" href="plugincatalog.html">Plugin Catalog</a>
</p> </p>
<form id="addPluginForm"> <form class="addPluginForm">
<p id="tagline" style="font-style: italic;"></p> <p id="tagline" style="font-style: italic;"></p>
<p id="pPreviewImage" style="text-align: center; margin: 2em 0;"></p> <p id="pPreviewImage" style="text-align: center; margin: 2em 0;"></p>
@ -105,7 +105,7 @@
</div> </div>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$('#addPluginForm').on('submit', AddPluginPage.onSubmit); $('.addPluginForm').off('submit', AddPluginPage.onSubmit).on('submit', AddPluginPage.onSubmit);
</script> </script>
</div> </div>
</body> </body>

4
dashboard-ui/advancedmetadata.html
View file

@ -21,12 +21,12 @@
<li> <li>
<input type="checkbox" id="chkEnableTmdbPersonUpdates" name="chkEnableTmdbPersonUpdates" data-mini="true" /> <input type="checkbox" id="chkEnableTmdbPersonUpdates" name="chkEnableTmdbPersonUpdates" data-mini="true" />
<label for="chkEnableTmdbPersonUpdates">Enable automatic updates from TheMovieDB.org</label> <label for="chkEnableTmdbPersonUpdates">Enable automatic updates from TheMovieDB.org</label>
<div class="fieldDescription">If enabled, movies and people will be updated automatically as they are updated on the TheMovieDB.org.</div> <div class="fieldDescription">If enabled, movies and people will be updated automatically as they are updated on the TheMovieDB.org. This may replace some existing metadata.</div>
</li> </li>
<li> <li>
<input type="checkbox" id="chkEnableTvdbUpdates" name="chkEnableTvdbUpdates" data-mini="true" /> <input type="checkbox" id="chkEnableTvdbUpdates" name="chkEnableTvdbUpdates" data-mini="true" />
<label for="chkEnableTvdbUpdates">Enable automatic updates from TheTVDB.com</label> <label for="chkEnableTvdbUpdates">Enable automatic updates from TheTVDB.com</label>
<div class="fieldDescription">If enabled, tv series and episodes will be updated automatically as they are updated on the TheTVDB.com.</div> <div class="fieldDescription">If enabled, tv series and episodes will be updated automatically as they are updated on the TheTVDB.com. This may replace some existing metadata.</div>
</li> </li>
<li> <li>
<button type="submit" data-theme="b" data-icon="ok" data-mini="true"> <button type="submit" data-theme="b" data-icon="ok" data-mini="true">

10
dashboard-ui/librarysettings.html
View file

@ -17,7 +17,7 @@
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<input type="checkbox" id="chkEnableCustomIBNPath" name="chkEnableCustomIBNPath" /> <input type="checkbox" id="chkEnableCustomIBNPath" name="chkEnableCustomIBNPath" data-mini="true" />
<label for="chkEnableCustomIBNPath">Use custom images by name path</label> <label for="chkEnableCustomIBNPath">Use custom images by name path</label>
<div class="fieldDescription"> <div class="fieldDescription">
This folder contains actor, artist, genre and studio images. This folder contains actor, artist, genre and studio images.
@ -26,7 +26,7 @@
<li id="fieldEnterIBNPath" style="display: none;"> <li id="fieldEnterIBNPath" style="display: none;">
<label for="txtItemsByNamePath">Images by name path: </label> <label for="txtItemsByNamePath">Images by name path: </label>
<div style="display: inline-block; width: 92%;"> <div style="display: inline-block; width: 92%;">
<input type="text" id="txtItemsByNamePath" name="txtItemsByNamePath" /> <input type="text" id="txtItemsByNamePath" name="txtItemsByNamePath" data-mini="true" />
</div> </div>
<button id="btnSelectIBNPath" type="button" data-icon="folder-close" data-iconpos="notext" data-inline="true">Select Directory</button> <button id="btnSelectIBNPath" type="button" data-icon="folder-close" data-iconpos="notext" data-inline="true">Select Directory</button>
<div class="fieldDescription"> <div class="fieldDescription">
@ -35,13 +35,13 @@
</li> </li>
<li> <li>
<label for="txtSeasonZeroName">Season 0 display name: </label> <label for="txtSeasonZeroName">Season 0 display name: </label>
<input type="text" id="txtSeasonZeroName" name="txtSeasonZeroName" required="required" /> <input type="text" id="txtSeasonZeroName" name="txtSeasonZeroName" required="required" data-mini="true" />
</li> </li>
<li> <li>
<button type="submit" data-theme="b" data-icon="ok"> <button type="submit" data-theme="b" data-icon="ok" data-mini="true">
Save Save
</button> </button>
<button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete"> <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete" data-mini="true">
Cancel Cancel
</button> </button>
</li> </li>

4
dashboard-ui/livetvchannel.html
View file

@ -9,8 +9,8 @@
<a href="livetvguide.html">Guide</a> <a href="livetvguide.html">Guide</a>
<a href="livetvchannels.html" class="ui-btn-active">Channels</a> <a href="livetvchannels.html" class="ui-btn-active">Channels</a>
<a href="livetvrecordings.html">Recordings</a> <a href="livetvrecordings.html">Recordings</a>
<a href="livetvtimers.html">Upcoming Recordings</a> <a href="livetvtimers.html">Schedule</a>
<a href="livetvseriestimers.html">Series Recordings</a> <a href="livetvseriestimers.html">Series</a>
</div> </div>
<div id="itemBackdrop" class="itemBackdrop noBackdrop"> <div id="itemBackdrop" class="itemBackdrop noBackdrop">
<div class="itemBackdropContent"> <div class="itemBackdropContent">

4
dashboard-ui/livetvchannels.html
View file

@ -9,8 +9,8 @@
<a href="livetvguide.html">Guide</a> <a href="livetvguide.html">Guide</a>
<a href="livetvchannels.html" class="ui-btn-active">Channels</a> <a href="livetvchannels.html" class="ui-btn-active">Channels</a>
<a href="livetvrecordings.html">Recordings</a> <a href="livetvrecordings.html">Recordings</a>
<a href="livetvtimers.html">Upcoming Recordings</a> <a href="livetvtimers.html">Schedule</a>
<a href="livetvseriestimers.html">Series Recordings</a> <a href="livetvseriestimers.html">Series</a>
</div> </div>
<div data-role="content"> <div data-role="content">
<div class="viewSettings"> <div class="viewSettings">

4
dashboard-ui/livetvguide.html
View file

@ -9,8 +9,8 @@
<a href="livetvguide.html" class="ui-btn-active">Guide</a> <a href="livetvguide.html" class="ui-btn-active">Guide</a>
<a href="livetvchannels.html">Channels</a> <a href="livetvchannels.html">Channels</a>
<a href="livetvrecordings.html">Recordings</a> <a href="livetvrecordings.html">Recordings</a>
<a href="livetvtimers.html">Upcoming Recordings</a> <a href="livetvtimers.html">Schedule</a>
<a href="livetvseriestimers.html">Series Recordings</a> <a href="livetvseriestimers.html">Series</a>
</div> </div>
<div data-role="content"> <div data-role="content">
</div> </div>

16
dashboard-ui/livetvnewrecording.html
View file

@ -9,11 +9,11 @@
<a href="livetvguide.html">Guide</a> <a href="livetvguide.html">Guide</a>
<a href="livetvchannels.html">Channels</a> <a href="livetvchannels.html">Channels</a>
<a href="livetvrecordings.html" class="ui-btn-active">Recordings</a> <a href="livetvrecordings.html" class="ui-btn-active">Recordings</a>
<a href="livetvtimers.html">Upcoming Recordings</a> <a href="livetvtimers.html">Schedule</a>
<a href="livetvseriestimers.html">Series Recordings</a> <a href="livetvseriestimers.html">Series</a>
</div> </div>
<div data-role="content"> <div data-role="content">
<form id="liveTvNewRecordingForm" style="margin: 0 auto;"> <form class="liveTvNewRecordingForm" style="margin: 0 auto;">
<p><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p> <p><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p>
<p class="itemEpisodeName"></p> <p class="itemEpisodeName"></p>
<p> <p>
@ -80,8 +80,8 @@
<br /> <br />
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<label for="txtPrePaddingSeconds">Pre-padding seconds: </label> <label for="txtPrePaddingSeconds">Pre-padding minutes: </label>
<input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" /> <input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="5" step=".5" />
</li> </li>
<li> <li>
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" /> <input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@ -91,8 +91,8 @@
<div style="height: .5em;"></div> <div style="height: .5em;"></div>
</li> </li>
<li> <li>
<label for="txtPostPaddingSeconds">Post-padding seconds: </label> <label for="txtPostPaddingSeconds">Post-padding minutes: </label>
<input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" /> <input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="5" step=".5" />
</li> </li>
<li> <li>
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" /> <input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />
@ -116,7 +116,7 @@
</form> </form>
</div> </div>
<script type="text/javascript"> <script type="text/javascript">
$('#liveTvNewRecordingForm').on('submit', LiveTvNewRecordingPage.onSubmit); $('.liveTvNewRecordingForm').off('submit', LiveTvNewRecordingPage.onSubmit).on('submit', LiveTvNewRecordingPage.onSubmit);
</script> </script>
</div> </div>
</body> </body>

4
dashboard-ui/livetvrecording.html
View file

@ -9,8 +9,8 @@
<a href="livetvguide.html">Guide</a> <a href="livetvguide.html">Guide</a>
<a href="livetvchannels.html">Channels</a> <a href="livetvchannels.html">Channels</a>
<a href="livetvrecordings.html" class="ui-btn-active">Recordings</a> <a href="livetvrecordings.html" class="ui-btn-active">Recordings</a>
<a href="livetvtimers.html">Upcoming Recordings</a> <a href="livetvtimers.html">Schedule</a>
<a href="livetvseriestimers.html">Series Recordings</a> <a href="livetvseriestimers.html">Series</a>
</div> </div>
<div id="itemBackdrop" class="itemBackdrop noBackdrop"> <div id="itemBackdrop" class="itemBackdrop noBackdrop">
<div class="itemBackdropContent"> <div class="itemBackdropContent">

4
dashboard-ui/livetvrecordings.html
View file

@ -9,8 +9,8 @@
<a href="livetvguide.html">Guide</a> <a href="livetvguide.html">Guide</a>
<a href="livetvchannels.html">Channels</a> <a href="livetvchannels.html">Channels</a>
<a href="livetvrecordings.html" class="ui-btn-active">Recordings</a> <a href="livetvrecordings.html" class="ui-btn-active">Recordings</a>
<a href="livetvtimers.html">Upcoming Recordings</a> <a href="livetvtimers.html">Schedule</a>
<a href="livetvseriestimers.html">Series Recordings</a> <a href="livetvseriestimers.html">Series</a>
</div> </div>
<div data-role="content"> <div data-role="content">
<div class="itemsContainer"> <div class="itemsContainer">

10
dashboard-ui/livetvseriestimer.html
View file

@ -9,8 +9,8 @@
<a href="livetvguide.html">Guide</a> <a href="livetvguide.html">Guide</a>
<a href="livetvchannels.html">Channels</a> <a href="livetvchannels.html">Channels</a>
<a href="livetvrecordings.html">Recordings</a> <a href="livetvrecordings.html">Recordings</a>
<a href="livetvtimers.html">Upcoming Recordings</a> <a href="livetvtimers.html">Schedule</a>
<a href="livetvseriestimers.html" class="ui-btn-active">Series Recordings</a> <a href="livetvseriestimers.html" class="ui-btn-active">Series</a>
</div> </div>
<div data-role="content"> <div data-role="content">
<form id="liveTvSeriesTimerForm" style="margin: 0 auto;"> <form id="liveTvSeriesTimerForm" style="margin: 0 auto;">
@ -73,7 +73,7 @@
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<label for="txtPrePaddingSeconds">Pre-padding seconds: </label> <label for="txtPrePaddingSeconds">Pre-padding seconds: </label>
<input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" /> <input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="5" step=".5" />
</li> </li>
<li> <li>
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" /> <input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@ -83,8 +83,8 @@
<div style="height: .5em;"></div> <div style="height: .5em;"></div>
</li> </li>
<li> <li>
<label for="txtPostPaddingSeconds">Post-padding seconds: </label> <label for="txtPostPaddingSeconds">Post-padding minutes: </label>
<input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" /> <input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="5" step=".5" />
</li> </li>
<li> <li>
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" /> <input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />

4
dashboard-ui/livetvseriestimers.html
View file

@ -9,8 +9,8 @@
<a href="livetvguide.html">Guide</a> <a href="livetvguide.html">Guide</a>
<a href="livetvchannels.html">Channels</a> <a href="livetvchannels.html">Channels</a>
<a href="livetvrecordings.html">Recordings</a> <a href="livetvrecordings.html">Recordings</a>
<a href="livetvtimers.html">Upcoming Recordings</a> <a href="livetvtimers.html">Schedule</a>
<a href="livetvseriestimers.html" class="ui-btn-active">Series Recordings</a> <a href="livetvseriestimers.html" class="ui-btn-active">Series</a>
</div> </div>
<div data-role="content"> <div data-role="content">
<br /> <br />

24
dashboard-ui/livetvtimer.html
View file

@ -9,19 +9,23 @@
<a href="livetvguide.html">Guide</a> <a href="livetvguide.html">Guide</a>
<a href="livetvchannels.html">Channels</a> <a href="livetvchannels.html">Channels</a>
<a href="livetvrecordings.html">Recordings</a> <a href="livetvrecordings.html">Recordings</a>
<a href="livetvtimers.html" class="ui-btn-active">Upcoming Recordings</a> <a href="livetvtimers.html" class="ui-btn-active">Schedule</a>
<a href="livetvseriestimers.html">Series Recordings</a> <a href="livetvseriestimers.html">Series</a>
</div> </div>
<div data-role="content"> <div data-role="content">
<form id="liveTvTimerForm" style="margin: 0 auto;"> <form id="liveTvTimerForm" style="margin: 0 auto;">
<p><span class="itemName inlineItemName program"></span><span class="itemMiscInfo" style="display: inline;"></span></p> <p><span class="itemName inlineItemName"></span><span class="itemMiscInfo" style="display: inline;"></span></p>
<p class="itemEpisodeName"></p>
<p class="channel"></p> <p>
<p class="overview"></p> <span class="itemCommunityRating"></span>
</p>
<p class="itemChannelNumber"></p>
<p class="itemGenres"></p>
<p class="itemOverview"></p>
<p style="margin-top: 2em;"> <p style="margin-top: 2em;">
<span class="status"></span> <span class="status"></span>
<a id="btnCancelTimer" href="#" style="margin-left: 2em;">Cancel Timer</a> <a id="btnCancelTimer" href="#" style="margin-left: 2em;">Cancel Recording</a>
<span class="seriesTimerLink" style="margin-left: 2em;"></span> <span class="seriesTimerLink" style="margin-left: 2em;"></span>
</p> </p>
@ -34,7 +38,7 @@
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<label for="txtPrePaddingSeconds">Pre-padding seconds: </label> <label for="txtPrePaddingSeconds">Pre-padding seconds: </label>
<input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" /> <input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" max="5" step=".5" />
</li> </li>
<li> <li>
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" /> <input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@ -44,8 +48,8 @@
<div style="height: .5em;"></div> <div style="height: .5em;"></div>
</li> </li>
<li> <li>
<label for="txtPostPaddingSeconds">Post-padding seconds: </label> <label for="txtPostPaddingSeconds">Post-padding minutes: </label>
<input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" /> <input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" max="5" step=".5" />
</li> </li>
<li> <li>
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" /> <input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />

4
dashboard-ui/livetvtimers.html
View file

@ -9,8 +9,8 @@
<a href="livetvguide.html">Guide</a> <a href="livetvguide.html">Guide</a>
<a href="livetvchannels.html">Channels</a> <a href="livetvchannels.html">Channels</a>
<a href="livetvrecordings.html">Recordings</a> <a href="livetvrecordings.html">Recordings</a>
<a href="livetvtimers.html" class="ui-btn-active">Upcoming Recordings</a> <a href="livetvtimers.html" class="ui-btn-active">Schedule</a>
<a href="livetvseriestimers.html">Series Recordings</a> <a href="livetvseriestimers.html">Series</a>
</div> </div>
<div data-role="content"> <div data-role="content">
<br /> <br />

4
dashboard-ui/metadataimageextraction.html
View file

@ -41,10 +41,10 @@
</div> </div>
</li> </li>
<li> <li>
<button type="submit" data-theme="b" data-icon="ok"> <button type="submit" data-theme="b" data-icon="ok" data-mini="true">
Save Save
</button> </button>
<button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete"> <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete" data-mini="true">
Cancel Cancel
</button> </button>
</li> </li>

4
dashboard-ui/metadataimages.html
View file

@ -135,10 +135,10 @@
<br /> <br />
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<button type="submit" data-theme="b" data-icon="ok"> <button type="submit" data-theme="b" data-icon="ok" data-mini="true">
Save Save
</button> </button>
<button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete"> <button type="button" onclick="Dashboard.navigate('dashboard.html');" data-icon="delete" data-mini="true">
Cancel Cancel
</button> </button>
</li> </li>

14
dashboard-ui/scripts/librarybrowser.js
View file

@ -1724,6 +1724,20 @@
type: "Primary" type: "Primary"
}); });
} }
else if (item.Type == "Recording") {
url = ApiClient.getUrl("LiveTV/Recordings/" + item.Id + "/Images/Primary", {
maxheight: imageHeight,
tag: imageTags.Primary,
type: "Primary"
});
}
else if (item.Type == "Program") {
url = ApiClient.getUrl("LiveTV/Programs/" + item.Id + "/Images/Primary", {
maxheight: imageHeight,
tag: imageTags.Primary,
type: "Primary"
});
}
else if (item.Type == "Person") { else if (item.Type == "Person") {
url = ApiClient.getPersonImageUrl(item.Name, { url = ApiClient.getPersonImageUrl(item.Name, {
maxheight: imageHeight, maxheight: imageHeight,

22
dashboard-ui/scripts/livetvnewrecording.js
View file

@ -32,8 +32,8 @@
$('#chkAllChannels', page).checked(defaultTimer.RecordAnyChannel).checkboxradio('refresh'); $('#chkAllChannels', page).checked(defaultTimer.RecordAnyChannel).checkboxradio('refresh');
$('#chkAnyTime', page).checked(defaultTimer.RecordAnyTime).checkboxradio('refresh'); $('#chkAnyTime', page).checked(defaultTimer.RecordAnyTime).checkboxradio('refresh');
$('#txtPrePaddingSeconds', page).val(defaultTimer.PrePaddingSeconds); $('#txtPrePaddingSeconds', page).val(defaultTimer.PrePaddingSeconds / 60);
$('#txtPostPaddingSeconds', page).val(defaultTimer.PostPaddingSeconds); $('#txtPostPaddingSeconds', page).val(defaultTimer.PostPaddingSeconds / 60);
$('#chkPrePaddingRequired', page).checked(defaultTimer.IsPrePaddingRequired).checkboxradio('refresh'); $('#chkPrePaddingRequired', page).checked(defaultTimer.IsPrePaddingRequired).checkboxradio('refresh');
$('#chkPostPaddingRequired', page).checked(defaultTimer.IsPostPaddingRequired).checkboxradio('refresh'); $('#chkPostPaddingRequired', page).checked(defaultTimer.IsPostPaddingRequired).checkboxradio('refresh');
@ -105,10 +105,12 @@
var form = this; var form = this;
apiClient.getNewLiveTvTimerDefaults({ programId: currentProgram.Id }).done(function (item) { var programId = getParameterByName('programid');
item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val(); apiClient.getNewLiveTvTimerDefaults({ programId: programId }).done(function (item) {
item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val();
item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val() * 60;
item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val() * 60;
item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked(); item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked();
item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked(); item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked();
@ -142,15 +144,11 @@
return false; return false;
} }
function liveTvNewRecordingPage() { window.LiveTvNewRecordingPage = {
var self = this; onSubmit: onSubmit
self.onSubmit = onSubmit; };
}
window.LiveTvNewRecordingPage = new liveTvNewRecordingPage();
$(document).on('pageinit', "#liveTvNewRecordingPage", function () { $(document).on('pageinit', "#liveTvNewRecordingPage", function () {

2
dashboard-ui/scripts/livetvrecordings.js
View file

@ -35,7 +35,7 @@
html += '<td>'; html += '<td>';
html += '<a href="livetvrecording.html?id=' + recording.Id + '">'; html += '<a href="livetvrecording.html?id=' + recording.Id + '">';
html += recording.Name; html += recording.Name || '(blank)';
html += '</a>'; html += '</a>';
html += '</td>'; html += '</td>';

12
dashboard-ui/scripts/livetvseriestimer.js
View file

@ -4,7 +4,7 @@
function deleteTimer(page, id) { function deleteTimer(page, id) {
Dashboard.confirm("Are you sure you wish to cancel this series?", "Confirm Series Timer Cancellation", function (result) { Dashboard.confirm("Are you sure you wish to cancel this series?", "Confirm Series Cancellation", function (result) {
if (result) { if (result) {
@ -12,7 +12,7 @@
ApiClient.cancelLiveTvSeriesTimer(id).done(function () { ApiClient.cancelLiveTvSeriesTimer(id).done(function () {
Dashboard.alert('Timer cancelled.'); Dashboard.alert('Series cancelled.');
reload(page); reload(page);
}); });
@ -28,8 +28,8 @@
$('.itemName', page).html(item.Name); $('.itemName', page).html(item.Name);
$('.overview', page).html(item.Overview || ''); $('.overview', page).html(item.Overview || '');
$('#txtPrePaddingSeconds', page).val(item.PrePaddingSeconds); $('#txtPrePaddingSeconds', page).val(item.PrePaddingSeconds / 60);
$('#txtPostPaddingSeconds', page).val(item.PostPaddingSeconds); $('#txtPostPaddingSeconds', page).val(item.PostPaddingSeconds / 60);
$('#chkPrePaddingRequired', page).checked(item.IsPrePaddingRequired).checkboxradio('refresh'); $('#chkPrePaddingRequired', page).checked(item.IsPrePaddingRequired).checkboxradio('refresh');
$('#chkPostPaddingRequired', page).checked(item.IsPostPaddingRequired).checkboxradio('refresh'); $('#chkPostPaddingRequired', page).checked(item.IsPostPaddingRequired).checkboxradio('refresh');
@ -97,8 +97,8 @@
apiClient.getLiveTvSeriesTimer(currentItem.Id).done(function (item) { apiClient.getLiveTvSeriesTimer(currentItem.Id).done(function (item) {
item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val(); item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val() * 60;
item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val(); item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val() * 60;
item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked(); item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked();
item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked(); item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked();

4
dashboard-ui/scripts/livetvseriestimers.js
View file

@ -2,7 +2,7 @@
function deleteTimer(page, id) { function deleteTimer(page, id) {
Dashboard.confirm("Are you sure you wish to cancel this series?", "Confirm Series Timer Cancellation", function (result) { Dashboard.confirm("Are you sure you wish to cancel this series?", "Confirm Series Cancellation", function (result) {
if (result) { if (result) {
@ -10,7 +10,7 @@
ApiClient.cancelLiveTvSeriesTimer(id).done(function () { ApiClient.cancelLiveTvSeriesTimer(id).done(function () {
Dashboard.alert('Series Timer deleted'); Dashboard.alert('Series cancelled.');
reload(page); reload(page);
}); });

36
dashboard-ui/scripts/livetvtimer.js
View file

@ -4,7 +4,7 @@
function deleteTimer(page, id) { function deleteTimer(page, id) {
Dashboard.confirm("Are you sure you wish to cancel this timer?", "Confirm Timer Cancellation", function (result) { Dashboard.confirm("Are you sure you wish to cancel this recording?", "Confirm Recording Cancellation", function (result) {
if (result) { if (result) {
@ -12,7 +12,7 @@
ApiClient.cancelLiveTvTimer(id).done(function () { ApiClient.cancelLiveTvTimer(id).done(function () {
Dashboard.alert('Timer cancelled.'); Dashboard.alert('Recording cancelled.');
reload(page); reload(page);
}); });
@ -23,18 +23,34 @@
function renderTimer(page, item) { function renderTimer(page, item) {
var context = 'livetv';
currentItem = item; currentItem = item;
$('.program', page).html(item.Name); $('.itemName', page).html(item.Name);
$('.channel', page).html('<a href="livetvchannel.html?id=' + item.ChannelId + '">' + item.ChannelName + '</a>').trigger('create'); $('.itemChannelNumber', page).html('Channel:&nbsp;&nbsp;&nbsp;<a href="livetvchannel.html?id=' + item.ChannelId + '">' + item.ChannelName + '</a>').trigger('create');
$('.overview', page).html(item.Overview || '');
$('#txtPrePaddingSeconds', page).val(item.PrePaddingSeconds); if (item.EpisodeTitle) {
$('#txtPostPaddingSeconds', page).val(item.PostPaddingSeconds); $('.itemEpisodeName', page).html('Episode:&nbsp;&nbsp;&nbsp;' + item.EpisodeTitle);
} else {
$('.itemEpisodeName', page).html('');
}
if (item.CommunityRating) {
$('.itemCommunityRating', page).html(LibraryBrowser.getRatingHtml(item)).show();
} else {
$('.itemCommunityRating', page).hide();
}
LibraryBrowser.renderGenres($('.itemGenres', page), item, context);
LibraryBrowser.renderOverview($('.itemOverview', page), item);
$('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item));
$('#txtPrePaddingSeconds', page).val(item.PrePaddingSeconds / 60);
$('#txtPostPaddingSeconds', page).val(item.PostPaddingSeconds / 60);
$('#chkPrePaddingRequired', page).checked(item.IsPrePaddingRequired).checkboxradio('refresh'); $('#chkPrePaddingRequired', page).checked(item.IsPrePaddingRequired).checkboxradio('refresh');
$('#chkPostPaddingRequired', page).checked(item.IsPostPaddingRequired).checkboxradio('refresh'); $('#chkPostPaddingRequired', page).checked(item.IsPostPaddingRequired).checkboxradio('refresh');
$('.itemMiscInfo', page).html(LibraryBrowser.getMiscInfoHtml(item));
$('.status', page).html('Status:&nbsp;&nbsp;&nbsp;' + item.Status); $('.status', page).html('Status:&nbsp;&nbsp;&nbsp;' + item.Status);
if (item.SeriesTimerId) { if (item.SeriesTimerId) {
@ -56,8 +72,8 @@
apiClient.getLiveTvTimer(currentItem.Id).done(function (item) { apiClient.getLiveTvTimer(currentItem.Id).done(function (item) {
item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val(); item.PrePaddingSeconds = $('#txtPrePaddingSeconds', form).val() * 60;
item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val(); item.PostPaddingSeconds = $('#txtPostPaddingSeconds', form).val() * 60;
item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked(); item.IsPrePaddingRequired = $('#chkPrePaddingRequired', form).checked();
item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked(); item.IsPostPaddingRequired = $('#chkPostPaddingRequired', form).checked();

4
dashboard-ui/scripts/livetvtimers.js
View file

@ -2,7 +2,7 @@
function deleteTimer(page, id) { function deleteTimer(page, id) {
Dashboard.confirm("Are you sure you wish to cancel this timer?", "Confirm Timer Cancellation", function (result) { Dashboard.confirm("Are you sure you wish to cancel this recording?", "Confirm Recording Cancellation", function (result) {
if (result) { if (result) {
@ -10,7 +10,7 @@
ApiClient.cancelLiveTvTimer(id).done(function () { ApiClient.cancelLiveTvTimer(id).done(function () {
Dashboard.alert('Timer deleted'); Dashboard.alert('Recording cancelled.');
reload(page); reload(page);
}); });

8
dashboard-ui/scripts/pluginupdatespage.js
View file

@ -35,16 +35,16 @@
var options = PluginUpdatesPage.getHtmlOptions(["Off", "On"], (plugin.EnableAutoUpdate ? "On" : "Off")); var options = PluginUpdatesPage.getHtmlOptions(["Off", "On"], (plugin.EnableAutoUpdate ? "On" : "Off"));
html += "<td>"; html += "<td style='vertical-align:middle;text-align:left;'>";
html += "<select data-id='" + plugin.Id + "' onchange='PluginUpdatesPage.setAutoUpdate(this);' data-role='slider' id='" + fieldId + "' name='" + fieldId + "'>" + options + "</select>"; html += "<select data-mini='true' data-id='" + plugin.Id + "' onchange='PluginUpdatesPage.setAutoUpdate(this);' data-role='slider' id='" + fieldId + "' name='" + fieldId + "'>" + options + "</select>";
html += "</td>"; html += "</td>";
fieldId = "liPluginUpdateFieldb" + fieldIndex; fieldId = "liPluginUpdateFieldb" + fieldIndex;
options = PluginUpdatesPage.getHtmlOptions(["Release", "Beta", "Dev"], plugin.UpdateClass); options = PluginUpdatesPage.getHtmlOptions(["Release", "Beta", "Dev"], plugin.UpdateClass);
html += "<td>"; html += "<td style='vertical-align:middle;text-align:left;'>";
html += "<select data-id='" + plugin.Id + "' onchange='PluginUpdatesPage.setUpdateClass(this);' data-inline='true' id='" + fieldId + "' name='" + fieldId + "'>" + options + "</select>"; html += "<select data-mini='true' data-id='" + plugin.Id + "' onchange='PluginUpdatesPage.setUpdateClass(this);' data-inline='true' id='" + fieldId + "' name='" + fieldId + "'>" + options + "</select>";
html += "</td>"; html += "</td>";
html += "</tr>"; html += "</tr>";