Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: allow grouping shows into collections #6389

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −2
Open

feat: allow grouping shows into collections #6389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions src/controllers/dashboard/librarydisplay.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,14 @@
<div class="fieldDescription checkboxFieldDescription">${LabelGroupMoviesIntoCollectionsHelp}</div>
</div>

<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input type="checkbox" is="emby-checkbox" class="chkGroupShowsIntoCollections" />
<span>${LabelGroupShowsIntoCollections}</span>
</label>
<div class="fieldDescription checkboxFieldDescription">${LabelGroupShowsIntoCollectionsHelp}</div>
</div>

<div class="checkboxContainer checkboxContainer-withDescription">
<label>
<input class="chkExternalContentInSuggestions" type="checkbox" is="emby-checkbox" />
Expand Down
6 changes: 4 additions & 2 deletions src/controllers/dashboard/librarydisplay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ export default function(view) {
function loadData() {
ApiClient.getServerConfiguration().then(function(config) {
view.querySelector('.chkFolderView').checked = config.EnableFolderView;
view.querySelector('.chkGroupMoviesIntoCollections').checked = config.EnableGroupingIntoCollections;
view.querySelector('.chkGroupMoviesIntoCollections').checked = config.EnableGroupingMoviesIntoCollections;
view.querySelector('.chkGroupShowsIntoCollections').checked = config.EnableGroupingShowsIntoCollections;
view.querySelector('.chkDisplaySpecialsWithinSeasons').checked = config.DisplaySpecialsWithinSeasons;
view.querySelector('.chkExternalContentInSuggestions').checked = config.EnableExternalContentInSuggestions;
view.querySelector('#chkSaveMetadataHidden').checked = config.SaveMetadataHidden;
Expand All @@ -22,7 +23,8 @@ export default function(view) {
const form = this;
ApiClient.getServerConfiguration().then(function(config) {
config.EnableFolderView = form.querySelector('.chkFolderView').checked;
config.EnableGroupingIntoCollections = form.querySelector('.chkGroupMoviesIntoCollections').checked;
config.EnableGroupingMoviesIntoCollections = form.querySelector('.chkGroupMoviesIntoCollections').checked;
config.EnableGroupingShowsIntoCollections = form.querySelector('.chkGroupShowsIntoCollections').checked;
config.DisplaySpecialsWithinSeasons = form.querySelector('.chkDisplaySpecialsWithinSeasons').checked;
config.EnableExternalContentInSuggestions = form.querySelector('.chkExternalContentInSuggestions').checked;
config.SaveMetadataHidden = form.querySelector('#chkSaveMetadataHidden').checked;
Expand Down
2 changes: 2 additions & 0 deletions src/strings/de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -496,6 +496,8 @@
"LabelServerNameHelp": "Dieser Name wird benutzt, um den Server zu identifizieren, standardmäßig wird der Hostname des Servers verwendet.",
"LabelGroupMoviesIntoCollections": "Gruppiere Filme in Sammlungen",
"LabelGroupMoviesIntoCollectionsHelp": "Filme in einer Sammlung werden bei der Anzeige von Filmlisten als ein gruppiertes Element angezeigt.",
"LabelGroupShowsIntoCollections": "Gruppiere Serien in Sammlungen",
"LabelGroupShowsIntoCollectionsHelp": "Serien in einer Sammlung werden bei der Anzeige von Serienlisten als ein gruppiertes Element angezeigt.",
"LabelEncoderPreset": "Kodierungsvoreinstellung",
"LabelHardwareAccelerationType": "Hardwarebeschleunigung",
"LabelHardwareAccelerationTypeHelp": "Hardwarebeschleunigung benötigt zusätzliche Konfiguration.",
Expand Down
2 changes: 2 additions & 0 deletions src/strings/en-us.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,8 @@
"LabelFriendlyName": "Friendly name",
"LabelGroupMoviesIntoCollections": "Group movies into collections",
"LabelGroupMoviesIntoCollectionsHelp": "Movies in a collection will be displayed as one grouped item when displaying movie lists.",
"LabelGroupShowsIntoCollections": "Group shows into collections",
"LabelGroupShowsIntoCollectionsHelp": "Shows in a collection will be displayed as one grouped item when displaying show lists.",
"LabelH264Crf": "H.264 encoding CRF",
"LabelH265Crf": "H.265 encoding CRF",
"LabelHardwareAccelerationType": "Hardware acceleration",
Expand Down
Loading