Skip to content

Commit 1ad27ce

Browse files
softworkzsoftworkz
committed
MovieOrganizer: migrated to emby controls
1 parent 52818d1 commit 1ad27ce

File tree

3 files changed

+93
-88
lines changed

3 files changed

+93
-88
lines changed

‎MovieOrganizer/Html/fileorganizer.js‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
define(['dialogHelper', 'paper-checkbox', 'paper-input', 'emby-button', 'paper-icon-button-light'], function (dialogHelper) {
1+
define(['dialogHelper', 'require', 'emby-checkbox', 'emby-input', 'emby-button', 'emby-select', 'formDialogStyle'], function (dialogHelper, require) {
22

33
var extractedName;
44
var extractedYear;
@@ -220,7 +220,7 @@
220220
data: JSON.stringify(options),
221221
contentType: 'application/json'
222222
});
223-
};
223+
}
224224

225225
function showNewSeriesDialog(dlg) {
226226

@@ -345,7 +345,7 @@
345345
dlg.innerHTML = html;
346346
document.body.appendChild(dlg);
347347

348-
dlg.querySelector('.dialogHeaderTitle').innerHTML = Globalize.translate('FileOrganizeManually');
348+
dlg.querySelector('.formDialogHeaderTitle').innerHTML = Globalize.translate('FileOrganizeManually');
349349

350350
dialogHelper.open(dlg);
351351

@@ -407,7 +407,7 @@
407407
selectTab(dlg, 0);
408408

409409
initForms(dlg, item);
410-
}
410+
};
411411

412412
xhr.send();
413413
});

‎MovieOrganizer/Html/fileorganizer.template.html‎

Lines changed: 87 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,91 +1,96 @@
1-
<div class="dialogHeader" style="margin:0 0 2em;">
2-
<button is="paper-icon-button-light" class="btnCancel autoSize" tabindex="-1">
3-
<i class="md-icon">&#xE5C4;</i>
4-
</button>
5-
<div class="dialogHeaderTitle">
1+
<div class="formDialogHeader">
2+
<button is="emby-button" class="btnCancel autoSize" tabindex="-1"><i class="md-icon">&#xE5C4;</i></button>
3+
<div class="formDialogHeaderTitle">
64
</div>
75
</div>
86

9-
<div id="tabcontainer" class="readOnlyContent" style="margin:auto;">
10-
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true" style="margin-top: 1em">
11-
<a id="episode" href="#" data-role="button" class="ui-btn-active">Series Episode</a>
12-
<a id="movie" href="#" data-role="button">Organize Movie</a>
13-
</div>
14-
</div>
7+
<div class="formDialogContent smoothScrollY">
8+
<div class="dialog-content-centered">
9+
<div id="tabcontainer" class="readOnlyContent" style="margin:auto;">
10+
<div data-role="controlgroup" data-type="horizontal" class="localnav" data-mini="true" style="margin-top: 1em">
11+
<a id="episode" href="#" data-role="button" class="ui-btn-active">Series Episode</a>
12+
<a id="movie" href="#" data-role="button">Organize Movie</a>
13+
</div>
14+
</div>
1515

16-
<form id="organizeSeries" class="episodeCorrectionForm" style="margin:auto;">
16+
<form id="organizeSeries" class="episodeCorrectionForm" style="margin:auto;">
1717

18-
<p><b>Filename:</b><br /><span class="inputFile"></span></p>
19-
<p class="paraInputSeriesName"><b>Extracted Series Name:</b><br /><span class="inputSeriesName"></span></p>
20-
<p class="paraInputYear"><b>Extracted Year::</b><br /><span class="inputYear"></span></p>
18+
<p><b>Filename:</b> <span class="inputFile"></span></p>
19+
<p class="paraInputSeriesName"><b>Extracted Series Name:</b> <span class="inputSeriesName"></span></p>
20+
<p class="paraInputYear"><b>Extracted Year::</b> <span class="inputYear"></span></p>
2121

22-
<div style="margin: 2em 0 1em;">
23-
<div style="width:85%;display:inline-block;">
24-
<label for="selectSeries" class="selectLabel">${LabelSeries}</label>
25-
<select id="selectSeries" data-mini="true" required="required"></select>
26-
</div>
27-
<button type="button" is="paper-icon-button-light" id="btnNewSeries" class="autoSize" title="${ButtonNew}">
28-
<i class="md-icon">add</i>
29-
</button>
30-
</div>
31-
<div class="fldSelectSeriesFolder hide" style="margin: 1em 0 1em;">
32-
<div style="width:100%;display:inline-block;">
33-
<label for="selectSeriesFolder" class="selectLabel">Series Root Folder</label>
34-
<select id="selectSeriesFolder" data-mini="true"></select>
35-
</div>
36-
</div>
37-
<div style="margin: 1em 0;">
38-
<paper-input id="txtSeason" type="number" pattern="[0-9]*" required min="0" label="${LabelSeasonNumber}"></paper-input>
39-
</div>
40-
<div style="margin: 1em 0;">
41-
<paper-input id="txtEpisode" type="number" pattern="[0-9]*" required min="0" label="${LabelEpisodeNumber}"></paper-input>
42-
</div>
43-
<div style="margin: 1em 0;">
44-
<paper-input id="txtEndingEpisode" type="number" pattern="[0-9]*" min="0" label="${LabelEndingEpisodeNumber}"></paper-input>
45-
<div class="fieldDescription">${LabelEndingEpisodeNumberHelp}</div>
46-
</div>
47-
<div class="fldRemember hide">
48-
<br />
49-
<paper-checkbox type="checkbox" id="chkRememberCorrection">${OptionRememberOrganizeCorrection} <span class="extractedName" style="font-weight: bold; font-style: italic" /></paper-checkbox>
50-
</div>
51-
<br />
52-
<button is="emby-button" type="submit" class="raised submit block">
53-
<i class="md-icon">check</i>
54-
<span>${ButtonOk}</span>
55-
</button>
56-
<input id="hfResultId" type="hidden" />
57-
</form>
58-
59-
<form class="organizeMovieForm" id="organizeMovies" class="hide" style="margin:auto;">
60-
61-
<p><b>Filename:</b><br /><span class="inputFile2"></span></p>
62-
<p class="paraInputSeriesName2"><b>Extracted Name:</b><br /><span class="inputSeriesName2"></span></p>
63-
<p class="paraInputYear2"><b>Extracted Year::</b><br /><span class="inputYear2"></span></p>
64-
65-
<div style="margin: 2em 0 1em;">
66-
<button is="emby-button" type="button" class="raised block" id="btnIdentifyMovie">
67-
<i class="md-icon">check</i>
68-
<span>Identify Movie</span>
69-
</button>
70-
</div>
22+
<div class="selectContainer" style="margin: 2em 0 1em;">
23+
<div style="display:flex; align-items:center;">
24+
<div style="flex-grow:1;">
25+
<select is="emby-select" id="selectSeries" label="${LabelSeries}" required></select>
26+
</div>
27+
<button type="button" is="emby-button" id="btnNewSeries" class="autoSize" title="${ButtonNew}"><i class="md-icon">add</i></button>
28+
</div>
29+
</div>
30+
<div class="selectContainer fldSelectSeriesFolder hide">
31+
<select is="emby-select" id="selectSeriesFolder" label="Series Root Folder" required></select>
32+
<div class="fieldDescription"></div>
33+
</div>
7134

72-
<div id="identifiedMovie" class="hide">
73-
<div style="margin: 1em 0;">
74-
<paper-input id="txtSelectedMovie" required readonly label="Identified Movie"></paper-input>
75-
</div>
76-
<br />
77-
<div class="fldSelectMovieFolder" style="margin: 1em 0 1em;">
78-
<div style="width:100%;display:inline-block;">
79-
<label for="selectMovieFolder" class="selectLabel">Movie Root Folder</label>
80-
<select id="selectMovieFolder" data-mini="true"></select>
35+
36+
<div class="inputContainer">
37+
<input is="emby-input" id="txtSeason" type="number" pattern="[0-9]*" required min="0" label="${LabelSeasonNumber}" />
8138
</div>
82-
</div>
83-
<button is="emby-button" type="submit" class="raised submit block">
84-
<i class="md-icon">check</i>
85-
<span>${ButtonOk}</span>
86-
</button>
87-
</div>
88-
<input id="hfResultIdMovie" type="hidden" />
89-
</form>
9039

91-
<div id="bottomspace" style="min-height: 1em;" />
40+
<div class="inputContainer">
41+
<input is="emby-input" id="txtEpisode" type="number" pattern="[0-9]*" required min="0" label="${LabelEpisodeNumber}" />
42+
</div>
43+
44+
<div class="inputContainer">
45+
<input is="emby-input" id="txtEndingEpisode" type="number" pattern="[0-9]*" min="0" label="${LabelEndingEpisodeNumber}" />
46+
<div class="fieldDescription">${LabelEndingEpisodeNumberHelp}</div>
47+
</div>
48+
49+
<div class="fldRemember hide">
50+
<label class="checkboxContainer">
51+
<input type="checkbox" is="emby-checkbox" id="chkRememberCorrection" />
52+
<span>${OptionRememberOrganizeCorrection} <span class="extractedName" style="font-weight: bold; font-style: italic" /></span>
53+
</label>
54+
</div>
55+
<br />
56+
<button is="emby-button" type="submit" class="raised submit block">
57+
<i class="md-icon">check</i>
58+
<span>${ButtonOk}</span>
59+
</button>
60+
<input id="hfResultId" type="hidden" />
61+
</form>
62+
63+
<form class="organizeMovieForm hide" id="organizeMovies" style="margin:auto;">
64+
65+
<p><b>Filename:</b><br /><span class="inputFile2"></span></p>
66+
<p class="paraInputSeriesName2"><b>Extracted Name:</b><br /><span class="inputSeriesName2"></span></p>
67+
<p class="paraInputYear2"><b>Extracted Year::</b><br /><span class="inputYear2"></span></p>
68+
69+
<div style="margin: 2em 0 1em;">
70+
<button is="emby-button" type="button" class="raised block" id="btnIdentifyMovie">
71+
<i class="md-icon">check</i>
72+
<span>Identify Movie</span>
73+
</button>
74+
</div>
75+
76+
<div id="identifiedMovie" class="hide">
77+
<div class="inputContainer">
78+
<input is="emby-input" id="txtSelectedMovie" type="text" required readonly label="Identified Movie" />
79+
</div>
80+
81+
<div class="selectContainer fldSelectMovieFolder">
82+
<select is="emby-select" id="selectMovieFolder" label="Movie Root Folder" required></select>
83+
<div class="fieldDescription"></div>
84+
</div>
85+
86+
<button is="emby-button" type="submit" class="raised submit block">
87+
<i class="md-icon">check</i>
88+
<span>${ButtonOk}</span>
89+
</button>
90+
</div>
91+
<input id="hfResultIdMovie" type="hidden" />
92+
</form>
93+
94+
<div id="bottomspace" style="min-height: 1em;" />
95+
</div>
96+
</div>

‎MovieOrganizer/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
// General Information about an assembly is controlled through the following
66
// set of attributes. Change these attribute values to modify the information
77
// associated with an assembly.
8-
[assembly: AssemblyTitle("MovieOrganizer Beta 4")]
9-
[assembly: AssemblyDescription("Beta 4")]
8+
[assembly: AssemblyTitle("MovieOrganizer Beta 5")]
9+
[assembly: AssemblyDescription("Beta 5")]
1010
[assembly: AssemblyConfiguration("")]
1111
[assembly: AssemblyCompany("")]
1212
[assembly: AssemblyProduct("MovieOrganizer")]

0 commit comments

Comments
 (0)