From 21a83c2197b3ee88951e454ae937481ea9c38a3c Mon Sep 17 00:00:00 2001
From: AnthonyAxenov <anthonyaxenov@gmail.com>
Date: Sun, 15 Sep 2024 17:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=BE=D0=B4=D0=B3=D1=80=D1=83=D0=B7?=
 =?UTF-8?q?=D0=BA=D0=B0=20custom=20+=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BF?=
 =?UTF-8?q?=D1=83=D1=82=D0=B0=D0=BD=D0=BD=D0=B0=D1=8F=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=D0=BA=D0=B0=20faq?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/custom.twig.example                     |  2 ++
 src/views/custom/custom.twig.example              |  6 ------
 src/views/details.twig                            |  2 +-
 src/views/faq.twig                                | 12 ++++++------
 src/views/list.twig                               |  2 +-
 src/views/notfound.twig                           |  2 +-
 src/views/{layouts/default.twig => template.twig} |  4 +---
 7 files changed, 12 insertions(+), 18 deletions(-)
 create mode 100644 src/views/custom.twig.example
 delete mode 100644 src/views/custom/custom.twig.example
 rename src/views/{layouts/default.twig => template.twig} (97%)

diff --git a/src/views/custom.twig.example b/src/views/custom.twig.example
new file mode 100644
index 0000000..617c191
--- /dev/null
+++ b/src/views/custom.twig.example
@@ -0,0 +1,2 @@
+{# Файл для включения кастомных блоков #}
+{# Переименуйте файл в custom.twig и впишите сюда свой html/js #}
diff --git a/src/views/custom/custom.twig.example b/src/views/custom/custom.twig.example
deleted file mode 100644
index e5dc82d..0000000
--- a/src/views/custom/custom.twig.example
+++ /dev/null
@@ -1,6 +0,0 @@
-{# Файл для включения кастомных блоков #}
-
-{% block head %}{# ваш код здесь #}{% endblock %}
-{% block header %}{# ваш код здесь #}{% endblock %}
-{% block content %}{# ваш код здесь #}{% endblock %}
-{% block footer %}{# ваш код здесь #}{% endblock %}
diff --git a/src/views/details.twig b/src/views/details.twig
index 317976f..ea5d26f 100644
--- a/src/views/details.twig
+++ b/src/views/details.twig
@@ -1,4 +1,4 @@
-{% extends "layouts/default.twig" %}
+{% extends "template.twig" %}
 
 {% block title %}{{ title }}{% endblock %}
 
diff --git a/src/views/faq.twig b/src/views/faq.twig
index a1ff6b5..7be1154 100644
--- a/src/views/faq.twig
+++ b/src/views/faq.twig
@@ -1,4 +1,4 @@
-{% extends "layouts/default.twig" %}
+{% extends "template.twig" %}
 
 {% block header %}
     <h2>FAQ</h2>
@@ -49,7 +49,10 @@
                         </button>
                     </h2>
                     <div id="howtoconnect" class="accordion-collapse collapse" aria-labelledby="h-howtoconnect" data-bs-parent="#faq-accordion">
-                        <p class="accordion-body">Возможно. По крайней мере, так утверждают источники. Но гарантий никаких никто не даёт.</p>
+                        <p class="accordion-body">
+                            <a href="https://www.google.com/search?q=%D0%BA%D0%B0%D0%BA%20%D0%BF%D0%BE%D0%B4%D0%BA%D0%BB%D1%8E%D1%87%D0%B8%D1%82%D1%8C%20iptv%20%D0%BF%D0%BB%D0%B5%D0%B9%D0%BB%D0%B8%D1%81%D1%82%20%D0%BF%D0%BE%20%D1%81%D1%81%D1%8B%D0%BB%D0%BA%D0%B5">
+                                Добавь в свой медиаплеер</a> "Ссылку для ТВ".
+                        </p>
                     </div>
                 </div>
                 <div class="accordion-item bg-dark">
@@ -59,10 +62,7 @@
                         </button>
                     </h2>
                     <div id="isitfree" class="accordion-collapse collapse" aria-labelledby="h-isitfree" data-bs-parent="#faq-accordion">
-                        <p class="accordion-body">
-                            <a href="https://www.google.com/search?q=%D0%BA%D0%B0%D0%BA%20%D0%BF%D0%BE%D0%B4%D0%BA%D0%BB%D1%8E%D1%87%D0%B8%D1%82%D1%8C%20iptv%20%D0%BF%D0%BB%D0%B5%D0%B9%D0%BB%D0%B8%D1%81%D1%82%20%D0%BF%D0%BE%20%D1%81%D1%81%D1%8B%D0%BB%D0%BA%D0%B5">
-                                Добавь в свой медиаплеер</a> "Ссылку для ТВ".
-                        </p>
+                        <p class="accordion-body">Возможно. По крайней мере, так утверждают источники. Но гарантий никаких никто не даёт.</p>
                     </div>
                 </div>
                 <div class="accordion-item bg-dark">
diff --git a/src/views/list.twig b/src/views/list.twig
index 970b2b8..3f2a2a4 100644
--- a/src/views/list.twig
+++ b/src/views/list.twig
@@ -1,4 +1,4 @@
-{% extends "layouts/default.twig" %}
+{% extends "template.twig" %}
 
 {% block header %}
     <p class="text-muted small">
diff --git a/src/views/notfound.twig b/src/views/notfound.twig
index 2a354fb..d31a704 100644
--- a/src/views/notfound.twig
+++ b/src/views/notfound.twig
@@ -1,4 +1,4 @@
-{% extends "layouts/default.twig" %}
+{% extends "template.twig" %}
 
 {% block header %}
     <h2>Плейлист не найден</h2>
diff --git a/src/views/layouts/default.twig b/src/views/template.twig
similarity index 97%
rename from src/views/layouts/default.twig
rename to src/views/template.twig
index f9099d9..499381a 100644
--- a/src/views/layouts/default.twig
+++ b/src/views/template.twig
@@ -16,6 +16,7 @@
     <meta name="msapplication-TileColor" content="#00aba9">
     <meta name="msapplication-TileImage" content="{{ base_url('/favicon/mstile-144x144.png') }}">
     <meta name="theme-color" content="#212529">
+    {% include("custom.twig") ignore missing %}
     {% block head %}{% endblock %}
 </head>
 <body class="bg-dark text-light">
@@ -70,8 +71,5 @@
             </span>
         </footer>
     </div>
-    {% if is_file("custom/custom.twig") %}
-        {% include "custom/custom.twig" %}
-    {% endif %}
 </body>
 </html>