Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
Conflicts: MediaBrowser.WebDashboard/dashboard-ui/edititemmetadata.html
This commit is contained in:
commit
657eb2e0a9
1 changed files with 10 additions and 9 deletions
|
@ -95,7 +95,7 @@
|
|||
<label for="selectAirDays">Air Days:</label>
|
||||
<div data-role="editableListviewContainer" style="width: 78%; display: inline-block;">
|
||||
<div>
|
||||
<select name="selectAirDays" id="selectAirDays" data-mini="true">
|
||||
<select name="selectAirDays" Id="selectAirDays" data-mini="true">
|
||||
<option value=''></option>
|
||||
<option value='Monday'>Monday</option>
|
||||
<option value='Tuesday'>Tuesday</option>
|
||||
|
@ -105,7 +105,7 @@
|
|||
<option value='Saturday'>Saturday</option>
|
||||
<option value='Sunday'>Sunday</option>
|
||||
</select>
|
||||
<a data-role="button" data-theme="b" data-inline="true" data-mini="true" data-icon="plus" onclick="EditItemMetadataPage.addElementToEditableListview(this,EditItemMetadataPage.sortDaysOfTheWeek)">Add</a>
|
||||
<a data-role="button" data-theme="b" data-inline="true" data-mini="true" data-icon="plus" onclick="EditItemMetadataPage.addElementToEditableListview(this,EditItemMetadataPage.sortDaysOfTheWeek)">Add</a>
|
||||
</div>
|
||||
<ul data-role="listview" data-inset="true" data-split-icon="delete" id="listAirDays"></ul>
|
||||
</div>
|
||||
|
@ -150,7 +150,7 @@
|
|||
<div data-role="editableListviewContainer">
|
||||
<div data-role="fieldcontain">
|
||||
<input type="text" data-mini="true" />
|
||||
<a data-role="button" data-theme="b" data-inline="true" data-mini="true" data-icon="plus" onclick="editItemMetadataPage.addElementToEditableListview(this)">Add</a>
|
||||
<a data-role="button" data-theme="b" data-inline="true" data-mini="true" data-icon="plus" onclick="EditItemMetadataPage.addElementToEditableListview(this)">Add</a>
|
||||
</div>
|
||||
<ul data-role="listview" data-inset="true" data-split-icon="delete" id="listGenres"></ul>
|
||||
</div>
|
||||
|
@ -216,10 +216,11 @@
|
|||
<h3>Internet Provider Settings</h3>
|
||||
<div>
|
||||
<div data-role="fieldcontain">
|
||||
<input type="checkbox" name="enableInternetProviders" id="enableInternetProviders" onchange="EditItemMetadataPage.setProviderSettingsContainerVisibility(this)" />
|
||||
<input type="checkbox" name="enableInternetProviders" id="enableInternetProviders" onchange="EditItemMetadataPage.setProviderSettingsContainerVisibility(this)"/>
|
||||
<label for="enableInternetProviders">Enable internet metadata providers for this item.</label>
|
||||
</div>
|
||||
<div id="providerSettingsContainer" style="display: none">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue