[proxy] remove options page in web UI and move options to proxy's home page

3 files changed, 89 insertions, 113 deletions

diff --git a/src/hydrilla/proxy/web_ui/templates/base.html.jinja b/src/hydrilla/proxy/web_ui/templates/base.html.jinja
index 37930e2..c0eecce 100644
--- a/src/hydrilla/proxy/web_ui/templates/base.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/base.html.jinja
@@ -239,7 +239,6 @@ code in a proprietary work, I am not going to enforce this in court.
     {%
       set navigation_bar = [
           ('home',                 _('web_ui.base.nav.home'),      false),
-          ('options.options',      _('web_ui.base.nav.options'),   false),
           ('rules.rules',          _('web_ui.base.nav.rules'),     false),
           ('items.packages',       _('web_ui.base.nav.packages'),  false),
           ('items.libraries',      _('web_ui.base.nav.libraries'), true),
diff --git a/src/hydrilla/proxy/web_ui/templates/index.html.jinja b/src/hydrilla/proxy/web_ui/templates/index.html.jinja
index b0c0b36..d95937a 100644
--- a/src/hydrilla/proxy/web_ui/templates/index.html.jinja
+++ b/src/hydrilla/proxy/web_ui/templates/index.html.jinja
@@ -40,4 +40,93 @@ code in a proprietary work, I am not going to enforce this in court.
   <p>
     {{ _('web_ui.home.haketilo_is_blah_blah') }}
   </p>
+
+  <div class="horizontal-separator"></div>
+
+  <h4>
+    {{ _('web_ui.home.heading.options') }}
+  </h4>
+
+  {% set use_enabled_but_classes  = ['green-button'] %}
+  {% set use_auto_but_classes     = ['green-button'] %}
+  {% set use_question_but_classes = ['green-button'] %}
+
+  <p>
+    {% if settings.mapping_use_mode == MappingUseMode.WHEN_ENABLED %}
+      {% do use_enabled_but_classes.append('disabled-button') %}
+      {{ _('web_ui.home.packages_are_used_when_enabled') }}
+    {% elif settings.mapping_use_mode == MappingUseMode.QUESTION %}
+      {% do use_question_but_classes.append('disabled-button') %}
+      {{ _('web_ui.home.user_gets_asked_whether_to_enable_package') }}
+    {% else %}
+      {# settings.mapping_use_mode == MappingUseMode.AUTO #}
+      {% do use_auto_but_classes.append('disabled-button') %}
+      {{ _('web_ui.home.packages_are_used_automatically') }}
+    {% endif %}
+  </p>
+
+  {{
+    button_row([
+        (use_enabled_but_classes,
+         _('web_ui.home.use_enabled_button'),
+         {'action': 'use_enabled'}),
+        (use_question_but_classes,
+         _('web_ui.home.use_question_button'),
+         {'action': 'use_question'}),
+        (use_auto_but_classes,
+         _('web_ui.home.use_auto_button'),
+         {'action': 'use_auto'})
+    ])
+  }}
+
+  <div class="horizontal-separator"></div>
+
+  {% set allow_but_classes = ['red-button'] %}
+  {% set block_but_classes = ['blue-button'] %}
+
+  <p>
+    {% if settings.default_allow_scripts %}
+      {% do allow_but_classes.append('disabled-button') %}
+      {{ _('web_ui.home.scripts_are_allowed_by_default') }}
+    {% else %}
+      {% do block_but_classes.append('disabled-button') %}
+      {{ _('web_ui.home.scripts_are_blocked_by_default') }}
+    {% endif %}
+  </p>
+
+  {% set allow_but_text = _('web_ui.home.allow_scripts_button') %}
+  {% set block_but_text = _('web_ui.home.block_scripts_button') %}
+
+  {{
+    button_row([
+        (allow_but_classes, allow_but_text, {'action': 'allow_scripts'}),
+        (block_but_classes, block_but_text, {'action': 'block_scripts'})
+    ])
+  }}
+
+  <div class="horizontal-separator"></div>
+
+  {% set advanced_user_but_classes = ['red-button'] %}
+  {% set simple_user_but_classes   = ['blue-button'] %}
+
+  <p>
+    {% if settings.advanced_user %}
+      {% do advanced_user_but_classes.append('disabled-button') %}
+      {{ _('web_ui.home.user_is_advanced_user') }}
+    {% else %}
+      {% do simple_user_but_classes.append('disabled-button') %}
+      {{ _('web_ui.home.user_is_simple_user') }}
+    {% endif %}
+  </p>
+
+  {{
+    button_row([
+        (advanced_user_but_classes,
+         _('web_ui.home.user_make_advanced_button'),
+         {'action': 'user_make_advanced'}),
+        (simple_user_but_classes,
+         _('web_ui.home.user_make_simple_button'),
+         {'action': 'user_make_simple'})
+    ])
+  }}
 {% endblock %}
diff --git a/src/hydrilla/proxy/web_ui/templates/options.html.jinja b/src/hydrilla/proxy/web_ui/templates/options.html.jinja
deleted file mode 100644
index 26519c4..0000000
--- a/src/hydrilla/proxy/web_ui/templates/options.html.jinja
+++ /dev/null
@@ -1,112 +0,0 @@
-{#
-SPDX-License-Identifier: GPL-3.0-or-later OR CC-BY-SA-4.0
-
-Proxy web UI settings page.
-
-This file is part of Hydrilla&Haketilo.
-
-Copyright (C) 2022 Wojtek Kosior
-
-Dual licensed under
-* GNU General Public License v3.0 or later and
-* Creative Commons Attribution Share Alike 4.0 International.
-
-You can choose to use either of these licenses or both.
-
-
-I, Wojtek Kosior, thereby promise not to sue for violation of this
-file's licenses. Although I request that you do not make use of this
-code in a proprietary work, I am not going to enforce this in court.
-#}
-{% extends "base.html.jinja" %}
-
-{% block title %} {{ _('web_ui.options.title') }} {% endblock %}
-
-{% block main %}
-  <h3>
-    {{ _('web_ui.options.heading') }}
-  </h3>
-
-  {% set use_enabled_but_classes  = ['green-button'] %}
-  {% set use_auto_but_classes     = ['green-button'] %}
-  {% set use_question_but_classes = ['green-button'] %}
-
-  <p>
-    {% if settings.mapping_use_mode == MappingUseMode.WHEN_ENABLED %}
-      {% do use_enabled_but_classes.append('disabled-button') %}
-      {{ _('web_ui.options.packages_are_used_when_enabled') }}
-    {% elif settings.mapping_use_mode == MappingUseMode.QUESTION %}
-      {% do use_question_but_classes.append('disabled-button') %}
-      {{ _('web_ui.options.user_gets_asked_whether_to_enable_package') }}
-    {% else %}
-      {# settings.mapping_use_mode == MappingUseMode.AUTO #}
-      {% do use_auto_but_classes.append('disabled-button') %}
-      {{ _('web_ui.options.packages_are_used_automatically') }}
-    {% endif %}
-  </p>
-
-  {{
-    button_row([
-        (use_enabled_but_classes,
-         _('web_ui.options.use_enabled_button'),
-         {'action': 'use_enabled'}),
-        (use_question_but_classes,
-         _('web_ui.options.use_question_button'),
-         {'action': 'use_question'}),
-        (use_auto_but_classes,
-         _('web_ui.options.use_auto_button'),
-         {'action': 'use_auto'})
-    ])
-  }}
-
-  <div class="horizontal-separator"></div>
-
-  {% set allow_but_classes = ['red-button'] %}
-  {% set block_but_classes = ['green-button'] %}
-
-  <p>
-    {% if settings.default_allow_scripts %}
-      {% do allow_but_classes.append('disabled-button') %}
-      {{ _('web_ui.options.scripts_are_allowed_by_default') }}
-    {% else %}
-      {% do block_but_classes.append('disabled-button') %}
-      {{ _('web_ui.options.scripts_are_blocked_by_default') }}
-    {% endif %}
-  </p>
-
-  {% set allow_but_text = _('web_ui.options.allow_scripts_button') %}
-  {% set block_but_text = _('web_ui.options.block_scripts_button') %}
-
-  {{
-    button_row([
-        (allow_but_classes, allow_but_text, {'action': 'allow_scripts'}),
-        (block_but_classes, block_but_text, {'action': 'block_scripts'})
-    ])
-  }}
-
-  <div class="horizontal-separator"></div>
-
-  {% set advanced_user_but_classes = ['red-button'] %}
-  {% set simple_user_but_classes   = ['green-button'] %}
-
-  <p>
-    {% if settings.advanced_user %}
-      {% do advanced_user_but_classes.append('disabled-button') %}
-      {{ _('web_ui.options.user_is_advanced_user') }}
-    {% else %}
-      {% do simple_user_but_classes.append('disabled-button') %}
-      {{ _('web_ui.options.user_is_simple_user') }}
-    {% endif %}
-  </p>
-
-  {{
-    button_row([
-        (advanced_user_but_classes,
-         _('web_ui.options.user_make_advanced_button'),
-         {'action': 'user_make_advanced'}),
-        (simple_user_but_classes,
-         _('web_ui.options.user_make_simple_button'),
-         {'action': 'user_make_simple'})
-    ])
-  }}
-{% endblock %}