1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00

update auto-organize popup

This commit is contained in:
Luke Pulverenti 2016-02-09 13:44:07 -05:00
parent 06c88752b1
commit 95dadd9829
9 changed files with 51 additions and 67 deletions

View file

@ -4,7 +4,7 @@
<title>${TitleAutoOrganize}</title> <title>${TitleAutoOrganize}</title>
</head> </head>
<body> <body>
<div id="libraryFileOrganizerLogPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmtable,jqmpopup,scripts/autoorganizelog,scripts/taskbutton,detailtablecss"> <div id="libraryFileOrganizerLogPage" data-role="page" class="page type-interior organizePage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Auto-Organize" data-require="jqmtable,jqmpopup,scripts/autoorganizelog,scripts/taskbutton,detailtablecss,paper-input,paper-checkbox">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -55,45 +55,40 @@
<div data-role="popup" class="popup episodeCorrectionPopup"> <div data-role="popup" class="popup episodeCorrectionPopup">
<div class="ui-bar-a" style="text-align: center; padding: 0 20px;"> <div class="ui-bar-a" style="text-align: center; padding: 0 1em;">
<h3>${HeaderEpisodeOrganization}</h3> <h3>${HeaderEpisodeOrganization}</h3>
</div> </div>
<div data-role="content"> <div data-role="content">
<form class="episodeCorrectionForm"> <form class="episodeCorrectionForm" style="padding:0 .5em;">
<p><span class="inputFile"></span></p> <p><span class="inputFile"></span></p>
<div style="margin: 1em 0 1em; min-width: 250px;"> <div style="margin: 1em 0 1em; min-width: 250px;">
<label for="selectSeries">${LabelSeries}</label> <label for="selectSeries" class="selectLabel">${LabelSeries}</label>
<select id="selectSeries" data-mini="true" required="required"></select> <select id="selectSeries" data-mini="true" required="required"></select>
</div> </div>
<div style="margin: 1em 0;"> <div style="margin: 1em 0;">
<label for="txtSeason">${LabelSeasonNumber}</label> <paper-input id="txtSeason" type="number" pattern="[0-9]*" required min="0" label="${LabelSeasonNumber}"></paper-input>
<input id="txtSeason" type="number" pattern="[0-9]*" required="required" min="0" />
</div> </div>
<div style="margin: 1em 0;"> <div style="margin: 1em 0;">
<label for="txtEpisode">${LabelEpisodeNumber}</label> <paper-input id="txtEpisode" type="number" pattern="[0-9]*" required min="0" label="${LabelEpisodeNumber}"></paper-input>
<input id="txtEpisode" type="number" pattern="[0-9]*" required="required" min="0" />
</div> </div>
<div style="margin: 1em 0;"> <div style="margin: 1em 0;">
<label for="txtEndingEpisode">${LabelEndingEpisodeNumber}</label> <paper-input id="txtEndingEpisode" type="number" pattern="[0-9]*" min="0" label="${LabelEndingEpisodeNumber}"></paper-input>
<input id="txtEndingEpisode" type="number" pattern="[0-9]*" min="0" />
<div class="fieldDescription">${LabelEndingEpisodeNumberHelp}</div> <div class="fieldDescription">${LabelEndingEpisodeNumberHelp}</div>
</div> </div>
<div style="margin: 1em 0;"> <br/>
<input type="checkbox" id="chkRememberCorrection" name="chkRememberCorrection" data-mini="true" /> <div>
<label for="chkRememberCorrection">${LabelOrganizeSmartMatchOption} '<span class="extractedName" />' </label> <paper-checkbox type="checkbox" id="chkRememberCorrection">${OptionRememberOrganizeCorrection}</paper-checkbox>
</div> </div>
<br />
<p>
<button type="submit" data-theme="b" data-icon="check" data-mini="true"> <button type="submit" data-theme="b" data-icon="check" data-mini="true">
${ButtonOk} ${ButtonOk}
</button> </button>
<button type="button" data-icon="delete" onclick="$(this).parents('.popup').popup('close');" data-mini="true"> <button type="button" data-icon="delete" onclick="$(this).parents('.popup').popup('close');" data-mini="true">
${ButtonCancel} ${ButtonCancel}
</button> </button>
</p>
<input id="hfResultId" type="hidden" /> <input id="hfResultId" type="hidden" />
</form> </form>
</div> </div>

View file

@ -71,8 +71,6 @@
<button type="submit" data-role="none" class="clearButton"> <button type="submit" data-role="none" class="clearButton">
<paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button> <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
</button> </button>
<paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
</li> </li>
</ul> </ul>
</form> </form>

View file

@ -4,7 +4,7 @@
<title>${TitlePlayback}</title> <title>${TitlePlayback}</title>
</head> </head>
<body> <body>
<div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage" data-require="jqmcollapsible,scripts/playbackconfiguration"> <div id="playbackConfigurationPage" data-role="page" class="page type-interior playbackConfigurationPage" data-require="scripts/playbackconfiguration,paper-input">
<div data-role="content"> <div data-role="content">
<div class="content-primary"> <div class="content-primary">
@ -17,43 +17,35 @@
</div> </div>
<form class="playbackConfigurationForm"> <form class="playbackConfigurationForm">
<div data-role="collapsible" data-collapsed="false">
<h2>${HeaderResumeSettings}</h2> <h2>${HeaderResumeSettings}</h2>
<div> <div>
<br />
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<label for="txtMinResumePct">${LabelMinResumePercentage}</label> <paper-input type="number" id="txtMinResumePct" name="txtMinResumePct" pattern="[0-9]*" required min="0" max="100" label="${LabelMinResumePercentage}"></paper-input>
<input type="number" id="txtMinResumePct" name="txtMinResumePct" pattern="[0-9]*" required="required" min="0" max="100" />
<div class="fieldDescription"> <div class="fieldDescription">
${LabelMinResumePercentageHelp} ${LabelMinResumePercentageHelp}
</div> </div>
</li> </li>
<li> <li>
<label for="txtMaxResumePct">${LabelMaxResumePercentage}</label> <paper-input type="number" id="txtMaxResumePct" name="txtMaxResumePct" pattern="[0-9]*" required min="1" max="100" label="${LabelMaxResumePercentage}"></paper-input>
<input type="number" id="txtMaxResumePct" name="txtMaxResumePct" pattern="[0-9]*" required="required" min="1" max="100" />
<div class="fieldDescription"> <div class="fieldDescription">
${LabelMaxResumePercentageHelp} ${LabelMaxResumePercentageHelp}
</div> </div>
</li> </li>
<li> <li>
<label for="txtMinResumeDuration">${LabelMinResumeDuration}</label> <paper-input type="number" id="txtMinResumeDuration" name="txtMinResumeDuration" pattern="[0-9]*" required min="0" label="${LabelMinResumeDuration}"></paper-input>
<input type="number" id="txtMinResumeDuration" name="txtMinResumeDuration" pattern="[0-9]*" required="required" min="0" />
<div class="fieldDescription"> <div class="fieldDescription">
${LabelMinResumeDurationHelp} ${LabelMinResumeDurationHelp}
</div> </div>
</li> </li>
</ul> </ul>
</div> </div>
</div>
<br /> <br />
<ul data-role="listview" class="ulForm"> <ul data-role="listview" class="ulForm">
<li> <li>
<button type="submit" data-role="none" class="clearButton"> <button type="submit" data-role="none" class="clearButton">
<paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button> <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
</button> </button>
<paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
</li> </li>
</ul> </ul>

View file

@ -77,7 +77,6 @@
$('#txtEndingEpisode', popup).val(item.ExtractedEndingEpisodeNumber); $('#txtEndingEpisode', popup).val(item.ExtractedEndingEpisodeNumber);
$('#chkRememberCorrection', popup).val(false); $('#chkRememberCorrection', popup).val(false);
$('.extractedName', popup).html(item.ExtractedName);
$('#hfResultId', popup).val(item.Id); $('#hfResultId', popup).val(item.Id);

View file

@ -1940,6 +1940,7 @@ var AppInfo = {};
define("paper-slider", ["html!" + bowerPath + "/paper-slider/paper-slider.html"]); define("paper-slider", ["html!" + bowerPath + "/paper-slider/paper-slider.html"]);
define("paper-tabs", ["html!" + bowerPath + "/paper-tabs/paper-tabs.html"]); define("paper-tabs", ["html!" + bowerPath + "/paper-tabs/paper-tabs.html"]);
define("paper-menu", ["html!" + bowerPath + "/paper-menu/paper-menu.html"]); define("paper-menu", ["html!" + bowerPath + "/paper-menu/paper-menu.html"]);
define("paper-material", ["html!" + bowerPath + "/paper-material/paper-material.html"]);
define("paper-dialog", ["html!" + bowerPath + "/paper-dialog/paper-dialog.html"]); define("paper-dialog", ["html!" + bowerPath + "/paper-dialog/paper-dialog.html"]);
define("paper-dialog-scrollable", ["html!" + bowerPath + "/paper-dialog-scrollable/paper-dialog-scrollable.html"]); define("paper-dialog-scrollable", ["html!" + bowerPath + "/paper-dialog-scrollable/paper-dialog-scrollable.html"]);
define("paper-button", ["html!" + bowerPath + "/paper-button/paper-button.html"]); define("paper-button", ["html!" + bowerPath + "/paper-button/paper-button.html"]);

View file

@ -25,15 +25,9 @@
</li> </li>
</ul> </ul>
<ul data-role="listview" class="ulForm">
<li>
<button type="submit" data-role="none" class="clearButton"> <button type="submit" data-role="none" class="clearButton">
<paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button> <paper-button raised class="submit block"><iron-icon icon="check"></iron-icon><span>${ButtonSave}</span></paper-button>
</button> </button>
<paper-button raised class="cancel block btnCancel" onclick="history.back();"><iron-icon icon="close"></iron-icon><span>${ButtonCancel}</span></paper-button>
</li>
</ul>
</form> </form>
</div> </div>
</div> </div>

View file

@ -1,7 +1,7 @@
{ {
"HeaderTaskTriggers": "Task Triggers", "HeaderTaskTriggers": "Task Triggers",
"TabSmartMatches": "Smart Matches", "TabSmartMatches": "Smart Matches",
"LabelOrganizeSmartMatchOption": "In the future, organize all files into the selected series if the name contains", "OptionRememberOrganizeCorrection": "Save and apply this correction to future files with similiar names.",
"TabSmartMatchInfo": "Manage your smart matches that were added using the Auto-Organize correction dialog", "TabSmartMatchInfo": "Manage your smart matches that were added using the Auto-Organize correction dialog",
"LabelExit": "Exit", "LabelExit": "Exit",
"LabelVisitCommunity": "Visit Community", "LabelVisitCommunity": "Visit Community",

View file

@ -595,7 +595,7 @@
"LabelEpisodeNumber": "Episode number:", "LabelEpisodeNumber": "Episode number:",
"LabelEndingEpisodeNumber": "Ending episode number:", "LabelEndingEpisodeNumber": "Ending episode number:",
"LabelEndingEpisodeNumberHelp": "Only required for multi-episode files", "LabelEndingEpisodeNumberHelp": "Only required for multi-episode files",
"LabelOrganizeSmartMatchOption": "In the future, organize all files into the selected series if the name contains", "OptionRememberOrganizeCorrection": "Save and apply this correction to future files with similiar names.",
"HeaderSupportTheTeam": "Support the Emby Team", "HeaderSupportTheTeam": "Support the Emby Team",
"LabelSupportAmount": "Amount (USD)", "LabelSupportAmount": "Amount (USD)",
"HeaderSupportTheTeamHelp": "Help ensure the continued development of this project by purchasing Emby Premiere. A portion of all income will be contributed to other free tools we depend on.", "HeaderSupportTheTeamHelp": "Help ensure the continued development of this project by purchasing Emby Premiere. A portion of all income will be contributed to other free tools we depend on.",

View file

@ -550,6 +550,11 @@ div.dialogHeader {
color: #fff; color: #fff;
} }
.background-theme-a .pageContentPaperMaterial {
background-color: #fff;
padding: 1.5em;
}
.background-theme-b div.dialogHeader { .background-theme-b div.dialogHeader {
background-color: #101010; background-color: #101010;
} }