From a420bb3c437352c281230fbed0a0ba97b41e33c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Louis=20V=C3=A9zina?=
 <5130500+morpheus65535@users.noreply.github.com>
Date: Thu, 30 May 2019 00:11:07 -0400
Subject: [PATCH] Fix after merging dev branch.

---
 views/settings_subtitles.tpl | 41 ++++++++++++++++++++++++++++++++++++
 views/wizard_subtitles.tpl   | 38 +++++++++++++++++++++++++++++++++
 2 files changed, 79 insertions(+)

diff --git a/views/settings_subtitles.tpl b/views/settings_subtitles.tpl
index e6fc91885..19f788ca2 100644
--- a/views/settings_subtitles.tpl
+++ b/views/settings_subtitles.tpl
@@ -430,6 +430,21 @@
                                 </div>
                             </div>
                         </div>
+
+                        <div class="middle aligned row">
+                            <div class="right aligned four wide column">
+                                <label>Forced</label>
+                            </div>
+                            <div class="eleven wide column">
+                                <div class='field'>
+                                    <select name="settings_serie_default_forced" id="settings_serie_default_forced" class="ui fluid selection dropdown">
+                                        <option value="False">False</option>
+                                        <option value="True">True</option>
+                                        <option value="Both">Both</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
 
@@ -487,6 +502,21 @@
                                 </div>
                             </div>
                         </div>
+
+                        <div class="middle aligned row">
+                            <div id="movie_default_forced_label" class="right aligned four wide column">
+                                <label>Forced</label>
+                            </div>
+                            <div class="eleven wide column">
+                                <div class='field'>
+                                    <select name="settings_movie_default_forced" id="settings_movie_default_forced" class="ui fluid selection dropdown">
+                                        <option value="False">False</option>
+                                        <option value="True">True</option>
+                                        <option value="Both">Both</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
 
@@ -617,19 +647,23 @@
                     if ($('#settings_serie_default_enabled_div').data("enabled") === "True") {
                         $("#settings_serie_default_languages").removeClass('disabled');
                         $("#settings_serie_default_hi_div").removeClass('disabled');
+                        $("#settings_serie_default_forced_div").removeClass('disabled');
                     } else {
                         $("#settings_serie_default_languages").addClass('disabled');
                         $("#settings_serie_default_hi_div").addClass('disabled');
+                        $("#settings_serie_default_forced_div").addClass('disabled');
                     }
 
                     $('#settings_serie_default_enabled_div').checkbox({
                         onChecked: function() {
                             $("#settings_serie_default_languages").parent().removeClass('disabled');
                             $("#settings_serie_default_hi_div").removeClass('disabled');
+                            $("#settings_serie_default_forced").parent().removeClass('disabled');
                         },
                         onUnchecked: function() {
                             $("#settings_serie_default_languages").parent().addClass('disabled');
                             $("#settings_serie_default_hi_div").addClass('disabled');
+                            $("#settings_serie_default_forced").parent().addClass('disabled');
                         }
                     });
 
@@ -648,19 +682,23 @@
                     if ($('#settings_movie_default_enabled_div').data("enabled") === "True") {
                         $("#settings_movie_default_languages").removeClass('disabled');
                         $("#settings_movie_default_hi_div").removeClass('disabled');
+                        $("#settings_movie_default_forced_div").removeClass('disabled');
                     } else {
                         $("#settings_movie_default_languages").addClass('disabled');
                         $("#settings_movie_default_hi_div").addClass('disabled');
+                        $("#settings_movie_default_forced_div").addClass('disabled');
                     }
 
                     $('#settings_movie_default_enabled_div').checkbox({
                         onChecked: function() {
                             $("#settings_movie_default_languages").parent().removeClass('disabled');
                             $("#settings_movie_default_hi_div").removeClass('disabled');
+                            $("#settings_movie_default_forced").parent().removeClass('disabled');
                         },
                         onUnchecked: function() {
                             $("#settings_movie_default_languages").parent().addClass('disabled');
                             $("#settings_movie_default_hi_div").addClass('disabled');
+                            $("#settings_movie_default_forced").parent().addClass('disabled');
                         }
                     });
 
@@ -718,6 +756,9 @@
                     $('#settings_movie_default_languages').dropdown('set selected',{{!settings.general.movie_default_language}});
                     %end
 
+                    $('#settings_serie_default_forced').dropdown('set selected','{{!settings.general.serie_default_forced}}');
+                    $('#settings_movie_default_forced').dropdown('set selected','{{!settings.general.movie_default_forced}}');
+
                     $('#settings_languages').dropdown('setting', 'onChange', function(){
                         $('.form').form('validate field', 'settings_subliminal_languages');
                     });
diff --git a/views/wizard_subtitles.tpl b/views/wizard_subtitles.tpl
index fecacec11..ca649ccbe 100644
--- a/views/wizard_subtitles.tpl
+++ b/views/wizard_subtitles.tpl
@@ -171,6 +171,21 @@
                                 </div>
                             </div>
                         </div>
+
+                        <div class="middle aligned row">
+                            <div class="right aligned four wide column">
+                                <label>Forced</label>
+                            </div>
+                            <div class="eleven wide column">
+                                <div class='field'>
+                                    <select name="settings_serie_default_forced" id="settings_serie_default_forced" class="ui fluid selection dropdown">
+                                        <option value="False">False</option>
+                                        <option value="True">True</option>
+                                        <option value="Both">Both</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
 
@@ -228,6 +243,21 @@
                                 </div>
                             </div>
                         </div>
+
+                        <div class="middle aligned row">
+                            <div id="movie_default_forced_label" class="right aligned four wide column">
+                                <label>Forced</label>
+                            </div>
+                            <div class="eleven wide column">
+                                <div class='field'>
+                                    <select name="settings_movie_default_forced" id="settings_movie_default_forced" class="ui fluid selection dropdown">
+                                        <option value="False">False</option>
+                                        <option value="True">True</option>
+                                        <option value="Both">Both</option>
+                                    </select>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
 
@@ -270,19 +300,23 @@
                     if ($('#settings_serie_default_enabled_div').data("enabled") === "True") {
                         $("#settings_serie_default_languages").removeClass('disabled');
                         $("#settings_serie_default_hi_div").removeClass('disabled');
+                        $("#settings_serie_default_forced_div").removeClass('disabled');
                     } else {
                         $("#settings_serie_default_languages").addClass('disabled');
                         $("#settings_serie_default_hi_div").addClass('disabled');
+                        $("#settings_serie_default_forced_div").addClass('disabled');
                     }
 
                     $('#settings_serie_default_enabled_div').checkbox({
                         onChecked: function() {
                             $("#settings_serie_default_languages").parent().removeClass('disabled');
                             $("#settings_serie_default_hi_div").removeClass('disabled');
+                            $("#settings_serie_default_forced").parent().removeClass('disabled');
                         },
                         onUnchecked: function() {
                             $("#settings_serie_default_languages").parent().addClass('disabled');
                             $("#settings_serie_default_hi_div").addClass('disabled');
+                            $("#settings_serie_default_forced").parent().addClass('disabled');
                         }
                     });
 
@@ -301,19 +335,23 @@
                     if ($('#settings_movie_default_enabled_div').data("enabled") === "True") {
                         $("#settings_movie_default_languages").removeClass('disabled');
                         $("#settings_movie_default_hi_div").removeClass('disabled');
+                        $("#settings_movie_default_forced_div").removeClass('disabled');
                     } else {
                         $("#settings_movie_default_languages").addClass('disabled');
                         $("#settings_movie_default_hi_div").addClass('disabled');
+                        $("#settings_movie_default_forced_div").addClass('disabled');
                     }
 
                     $('#settings_movie_default_enabled_div').checkbox({
                         onChecked: function() {
                             $("#settings_movie_default_languages").parent().removeClass('disabled');
                             $("#settings_movie_default_hi_div").removeClass('disabled');
+                            $("#settings_movie_default_forced").parent().removeClass('disabled');
                         },
                         onUnchecked: function() {
                             $("#settings_movie_default_languages").parent().addClass('disabled');
                             $("#settings_movie_default_hi_div").addClass('disabled');
+                            $("#settings_movie_default_forced").parent().addClass('disabled');
                         }
                     });