milas/jellyfish-web
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Conflicts:
	MediaBrowser.WebDashboard/dashboard-ui/edititemmetadata.html
This commit is contained in:
Luke Pulverenti 2013-06-27 14:41:40 -04:00
commit 657eb2e0a9
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
dashboard-ui/edititemmetadata.html
View file

@ -95,7 +95,7 @@
<label for="selectAirDays">Air Days:</label> <label for="selectAirDays">Air Days:</label>
<div data-role="editableListviewContainer" style="width: 78%; display: inline-block;"> <div data-role="editableListviewContainer" style="width: 78%; display: inline-block;">
<div> <div>
<select name="selectAirDays" id="selectAirDays" data-mini="true"> <select name="selectAirDays" Id="selectAirDays" data-mini="true">
<option value=''></option> <option value=''></option>
<option value='Monday'>Monday</option> <option value='Monday'>Monday</option>
<option value='Tuesday'>Tuesday</option> <option value='Tuesday'>Tuesday</option>
@ -150,7 +150,7 @@
<div data-role="editableListviewContainer"> <div data-role="editableListviewContainer">
<div data-role="fieldcontain"> <div data-role="fieldcontain">
<input type="text" data-mini="true" /> <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> </div>
<ul data-role="listview" data-inset="true" data-split-icon="delete" id="listGenres"></ul> <ul data-role="listview" data-inset="true" data-split-icon="delete" id="listGenres"></ul>
</div> </div>
@ -220,6 +220,7 @@
<label for="enableInternetProviders">Enable internet metadata providers for this item.</label> <label for="enableInternetProviders">Enable internet metadata providers for this item.</label>
</div> </div>
<div id="providerSettingsContainer" style="display: none"> <div id="providerSettingsContainer" style="display: none">
</div> </div>
</div> </div>
</div> </div>