update forms

This commit is contained in:
Luke Pulverenti 2016-02-16 14:58:42 -05:00
parent c9bb9cc40a
commit e6ded08848
5 changed files with 17 additions and 20 deletions

View File

@ -4,7 +4,7 @@
<title>${TitleAutoOrganize}</title>
</head>
<body>
<div id="libraryFileOrganizerPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmcollapsible,jqmtable,scripts/autoorganizetv,paper-input,jqmcheckbox">
<div id="libraryFileOrganizerPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmcollapsible,jqmtable,scripts/autoorganizetv,paper-input,paper-checkbox">
<div data-role="content">
<div class="content-primary">
@ -20,8 +20,8 @@
<p>${AutoOrganizeTvHelp}</p>
<ul data-role="listview" class="ulForm" style="margin-bottom: 0!important;">
<li>
<input type="checkbox" id="chkEnableTvSorting" name="chkEnableTvSorting" />
<label for="chkEnableTvSorting">${OptionEnableEpisodeOrganization}</label>
<br />
<paper-checkbox id="chkEnableTvSorting">${OptionEnableEpisodeOrganization}</paper-checkbox>
</li>
<li>
<paper-input id="txtWatchFolder" label="${LabelWatchFolder}" style="width:85%;display:inline-block;"></paper-input>
@ -41,8 +41,8 @@
<li>
<paper-input type="text" id="txtSeasonZeroName" name="txtSeasonZeroName" label="${LabelSeasonZeroFolderName}" required></paper-input>
</li>
</ul>
<div data-role="collapsible">
</ul><br />
<div data-role="collapsible" data-mini="true">
<h3>${HeaderEpisodeFilePattern}</h3>
<div>
<br />
@ -133,7 +133,7 @@
</div>
</div>
<br />
<br /><br />
<ul data-role="listview" class="ulForm">
<li>
<label for="copyOrMoveFile" class="selectLabel">${LabelTransferMethod}</label>
@ -144,17 +144,16 @@
<div class="fieldDescription">${LabelTransferMethodHelp}</div>
</li>
<li>
<input type="checkbox" id="chkOverwriteExistingEpisodes" name="chkOverwriteExistingEpisodes" />
<label for="chkOverwriteExistingEpisodes">${OptionOverwriteExistingEpisodes}</label>
<br />
<paper-checkbox type="checkbox" id="chkOverwriteExistingEpisodes">${OptionOverwriteExistingEpisodes}</paper-checkbox>
</li>
<li>
<paper-input type="text" id="txtDeleteLeftOverFiles" name="txtDeleteLeftOverFiles" label="${LabelDeleteLeftOverFiles}"></paper-input>
<div class="fieldDescription">${LabelDeleteLeftOverFilesHelp}</div>
</li>
<li>
<input type="checkbox" id="chkDeleteEmptyFolders" name="chkDeleteEmptyFolders" data-mini="true" />
<label for="chkDeleteEmptyFolders">${LabelDeleteEmptyFolders}</label>
<div class="fieldDescription">${LabelDeleteEmptyFoldersHelp}</div>
<paper-checkbox id="chkDeleteEmptyFolders">${LabelDeleteEmptyFolders}</paper-checkbox>
<div class="fieldDescription paperCheckboxFieldDescription">${LabelDeleteEmptyFoldersHelp}</div>
</li>
</ul>

View File

@ -835,8 +835,6 @@
context.querySelector('.libraryViewNav').classList.remove('hide');
}
tabs.classList.add('bottom');
tabs.alignBottom = true;
tabs.noSlide = true;
tabs.addEventListener('iron-select', function (e) {

View File

@ -4,7 +4,7 @@
<title>Emby</title>
</head>
<body>
<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage" data-contextname="${TitleRemoteControl}" data-theme="b" data-require="scripts/nowplayingpage">
<div id="nowPlayingPage" data-role="page" class="page libraryPage nowPlayingPage noSecondaryNavPage" data-contextname="${TitleRemoteControl}" data-theme="b" data-require="scripts/nowplayingpage,paper-tabs,paper-icon-button,paper-slider">
<div class="remoteControlContent">
@ -138,7 +138,7 @@
<div class="playlist itemsContainer" style="max-width: 800px; margin: 3em auto 0; padding-bottom: 200px;">
</div>
</div>
<paper-tabs class="nowPlayingPagePaperTabs" hidescrollbuttons noink disabledrag>
<paper-tabs class="nowPlayingPagePaperTabs bottom hide" alignbottom hidescrollbuttons noink disabledrag>
<paper-tab>${TabNowPlaying}</paper-tab>
<paper-tab>${TabControls}</paper-tab>
<paper-tab>${TabPlaylist}</paper-tab>

View File

@ -60,9 +60,9 @@
var tvOptions = config.TvOptions;
$('#chkEnableTvSorting', page).checked(tvOptions.IsEnabled).checkboxradio('refresh');
$('#chkOverwriteExistingEpisodes', page).checked(tvOptions.OverwriteExistingEpisodes).checkboxradio('refresh');
$('#chkDeleteEmptyFolders', page).checked(tvOptions.DeleteEmptyFolders).checkboxradio('refresh');
$('#chkEnableTvSorting', page).checked(tvOptions.IsEnabled);
$('#chkOverwriteExistingEpisodes', page).checked(tvOptions.OverwriteExistingEpisodes);
$('#chkDeleteEmptyFolders', page).checked(tvOptions.DeleteEmptyFolders);
$('#txtMinFileSize', page).val(tvOptions.MinFileSizeMb);
$('#txtSeasonFolderPattern', page).val(tvOptions.SeasonFolderPattern).trigger('change');

View File

@ -1767,8 +1767,8 @@ var AppInfo = {};
// Put the version into the bower path since we can't easily put a query string param on html imports
// Emby server will handle this
if (!Dashboard.isRunningInCordova()) {
//bowerPath += window.dashboardVersion;
if (Dashboard.isConnectMode() && !Dashboard.isRunningInCordova()) {
bowerPath += window.dashboardVersion;
}
return bowerPath;