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

Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

Browse source 
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/livetvnewrecording.html
	MediaBrowser.WebDashboard/dashboard-ui/livetvseriestimer.html
	MediaBrowser.WebDashboard/dashboard-ui/livetvtimer.html
This commit is contained in:
Sven Van den brande 2014-11-12 19:21:14 +01:00
commit 1470e95c3b
15 changed files with 95 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

8
dashboard-ui/livetvtimer.html
View file

@ -45,8 +45,8 @@
<br />
<ul data-role="listview" class="ulForm">
<li>
<label for="txtPrePaddingSeconds">${LabelPrePaddingMinutes}</label>
<input type="number" id="txtPrePaddingSeconds" pattern="[0-9]*" required="required" min="0" step="1" />
<label for="txtPrePaddingMinutes">${LabelPrePaddingMinutes}</label>
<input type="number" id="txtPrePaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" />
</li>
<li>
<input type="checkbox" data-mini="true" id="chkPrePaddingRequired" />
@ -56,8 +56,8 @@
<div style="height: .5em;"></div>
</li>
<li>
<label for="txtPostPaddingSeconds">${LabelPostPaddingMinutes}</label>
<input type="number" id="txtPostPaddingSeconds" pattern="[0-9]*" required="required" min="0" step="1" />
<label for="txtPostPaddingMinutes">${LabelPostPaddingMinutes}</label>
<input type="number" id="txtPostPaddingMinutes" pattern="[0-9]*" required="required" min="0" step="1" />
</li>
<li>
<input type="checkbox" data-mini="true" id="chkPostPaddingRequired" />