From b055dc9f77bbdf5e638825242c58d20e9d1acdb3 Mon Sep 17 00:00:00 2001
From: Mark Veidemanis <m@zm.is>
Date: Tue, 29 Nov 2022 07:20:39 +0000
Subject: [PATCH] Update templates

---
 core/templates/wm/modal.html  | 3 ++-
 core/templates/wm/page.html   | 6 ++++++
 core/templates/wm/panel.html  | 4 +---
 core/templates/wm/widget.html | 8 ++++----
 core/templates/wm/window.html | 2 ++
 5 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 core/templates/wm/page.html

diff --git a/core/templates/wm/modal.html b/core/templates/wm/modal.html
index c5973af..b8e5614 100644
--- a/core/templates/wm/modal.html
+++ b/core/templates/wm/modal.html
@@ -12,8 +12,9 @@
   <div class="modal-content">
     <div class="box">
       {% block modal_content %}
+        {% include window_content %}
       {% endblock %}
-      <button class="modal-close is-large" aria-label="close"></button>
+      {% include 'partials/close-modal.html' %}
     </div>
   </div>
 </div>
\ No newline at end of file
diff --git a/core/templates/wm/page.html b/core/templates/wm/page.html
new file mode 100644
index 0000000..93ea8c1
--- /dev/null
+++ b/core/templates/wm/page.html
@@ -0,0 +1,6 @@
+{% extends "base.html" %}
+
+
+{% block content %}
+  {% include window_content %}
+{% endblock %}
diff --git a/core/templates/wm/panel.html b/core/templates/wm/panel.html
index e57d573..b180b38 100644
--- a/core/templates/wm/panel.html
+++ b/core/templates/wm/panel.html
@@ -3,9 +3,7 @@
   <p class="panel-heading" style="padding: .2em; line-height: .5em;">
     <i class="fa-solid fa-arrows-up-down-left-right has-text-grey-light"></i>
     {% block close_button %}
-      <i
-        class="fa-solid fa-xmark has-text-grey-light float-right"
-        data-script="on click remove the closest <nav/>"></i>
+      {% include 'partials/close-window.html' %}
     {% endblock %}
     {% block heading %}
     {% endblock %}
diff --git a/core/templates/wm/widget.html b/core/templates/wm/widget.html
index dafc773..9ef8154 100644
--- a/core/templates/wm/widget.html
+++ b/core/templates/wm/widget.html
@@ -1,24 +1,24 @@
 <div id="widget">
-  <div id="widget-{{ unique }}" class="grid-stack-item" {% block widget_options %}{% endblock %}>
+  <div id="widget-{{ unique }}" class="grid-stack-item" {% block widget_options %}gs-w="10" gs-h="1" gs-y="10" gs-x="1"{% endblock %}>
     <div class="grid-stack-item-content">
 
       <nav class="panel">
         <p class="panel-heading" style="padding: .2em; line-height: .5em;">
           <i class="fa-solid fa-arrows-up-down-left-right has-text-grey-light"></i>
           {% block close_button %}
-            <i
-              class="fa-solid fa-xmark has-text-grey-light float-right"
-              onclick='grid.removeWidget("widget-{{ unique }}");'></i>
+            {% include 'partials/close-widget.html' %}
           {% endblock %}
           <i
             class="fa-solid fa-arrows-minimize has-text-grey-light float-right"
             onclick='grid.compact();'></i>
           {% block heading %}
+            {{ title }}
           {% endblock %}
         </p>
         <article class="panel-block is-active">
           <div class="control">
             {% block panel_content %}
+              {% include window_content %}
             {% endblock %}
           </div>
         </article>
diff --git a/core/templates/wm/window.html b/core/templates/wm/window.html
index 90be2f5..3a9a776 100644
--- a/core/templates/wm/window.html
+++ b/core/templates/wm/window.html
@@ -1,8 +1,10 @@
 <magnet-block attract-distance="10" align-to="outer|center" class="floating-window">
   {% extends 'wm/panel.html' %}
   {% block heading %}
+    {{ title }}
   {% endblock %}
 
   {% block panel_content %}
+    {% include window_content %}
   {% endblock %}
 </magnet-block>
\ No newline at end of file