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

fix merge conflicts

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-20 13:22:34 -04:00
parent 8bf9a6f51e
commit d2773d5fec
2 changed files with 144 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

33
dashboard-ui/metadataadvanced.html
View file

@ -21,10 +21,12 @@
<ul data-role="listview" class="ulForm">
<li>
<paper-input id="txtMetadataPath" label="${LabelMetadataPath}" style="width:85%;display:inline-block;"></paper-input>
<paper-icon-button id="btnSelectMetadataPath" icon="search"></paper-icon-button>
<label for="txtMetadataPath">${LabelMetadataPath}</label>
<div style="display: inline-block; width: 85%;">
<input type="text" id="txtMetadataPath" />
</div>
<button id="btnSelectMetadataPath" type="button" data-icon="search" data-iconpos="notext" data-inline="true">${ButtonSelectDirectory}</button>
<div class="fieldDescription">${LabelMetadataPathHelp}</div>
<br />
</li>
<li>
<label for="chkSaveMetadataHidden">${OptionSaveMetadataAsHidden}</label>
@ -62,6 +64,29 @@
<h2>${HeaderChapters}</h2>
<div>
<br />
<div style="display: none;">
<p>${HeaderChapterDownloadingHelp}</p>
<div class="chapterDownloadSettings" style="display: none;">
<fieldset data-role="controlgroup">
<legend>${HeaderDownloadChaptersFor}</legend>
<input type="checkbox" id="chkDownloadChapterMovies" />
<label for="chkDownloadChapterMovies">${OptionMovies}</label>
<input type="checkbox" id="chkDownloadChapterEpisodes" />
<label for="chkDownloadChapterEpisodes">${OptionEpisodes}</label>
</fieldset>
<br />
<div class="chapterFetchers">
</div>
<br />
<br />
</div>
<div class="noChapterProviders" style="display: none; color: green;">
<p>${MessageNoChapterProviders}</p>
<br />
</div>
</div>
<ul data-role="listview" class="ulForm" style="margin-bottom:0!important;">
<li>
<label>${HeaderExtractChapterImagesFor}</label>
@ -171,4 +196,4 @@
</div>
</div>
</body>
</html>
</html>