@geekity/cms 0.35.0 → 0.37.0

package/admin/pages/media/library.njk

@@ -5,13 +5,14 @@
    Everything works with JavaScript switched off: the upload form opens from a
    <details>, the filters are a GET form, and a tile is a link. media.js opens
    a tile's details in a dialog instead and steps through them with the arrow
-   keys. #}
+   keys, and upload-drop.js takes files dropped anywhere on the page. #}
 {% extends "layouts/shell.njk" %}
 {% from "components/alert.njk" import alert %}
 {% from "components/badge.njk" import badge %}
 {% from "components/button.njk" import button, buttonLink %}
 {% from "components/pagination.njk" import pagination %}
 {% from "components/tabs.njk" import tabs %}
+{% from "components/upload.njk" import uploadControl %}
 
 {% block title %}{{ heading }}{% endblock %}
 
@@ -34,12 +35,13 @@
         <div class="mt-2">{{ button('Upload', type='submit', color='primary') }}</div>
       </form>
     </details>
+    {{ uploadControl('library', 'main', uploadsUrl) }}
   </div>
 
   {% if sweepNotice %}
-    <section id="strip-metadata-notice" class="mb-6 max-w-4xl" aria-label="Location and camera metadata">
+    <section id="strip-metadata-notice" class="mb-6 max-w-4xl" aria-label="Location and camera metadata"{% if sweepNotice.sweep %} data-job-status="{{ sweepNotice.sweep.name }}" data-job-state="{{ sweepNotice.sweep.state }}" data-job-label="{{ sweepNotice.sweep.label }}"{% if sweepNotice.sweep.active %} data-job-refresh="{{ sweepNotice.panelUrl }}" data-job-redraw="{{ listUrl }}"{% endif %}{% endif %}>
       {% call alert(color='info', style='soft', direction='responsive', polite=true) %}
-        <span>
+        <span data-job-message>
           {% if sweepNotice.sweep and sweepNotice.sweep.active %}
             The sweep that strips location and camera metadata from older uploads is {{ sweepNotice.sweep.label | lower }}.
           {% else %}
@@ -129,5 +131,7 @@
   {% endif %}
 
   <script defer src="{{ assetPrefix }}copy.js"></script>
+  <script defer src="{{ assetPrefix }}upload-drop.js"></script>
   <script defer src="{{ assetPrefix }}media.js"></script>
+  <script defer src="{{ assetPrefix }}job-status.js"></script>
 {% endblock %}

package/admin/pages/plugins/screen.njk

@@ -1,18 +1,13 @@
 {# /admin/plugins/<package name>: a plugin's own screen (decision-33). The
-   plugin hands over cards of paragraphs and tables as data and this draws
-   them, so a plugin writes no markup and everything it says is escaped. #}
+   plugin hands over cards of blocks as data (components/blocks.njk) and this
+   draws them, so a plugin writes no markup and everything it says is
+   escaped. #}
 {% extends "layouts/shell.njk" %}
 {% import "components/fields.njk" as field %}
 {% from "components/setting-fields.njk" import settingFields %}
 {% from "components/button.njk" import button %}
 {% from "components/card.njk" import card, cardActions %}
-{% from "components/table.njk" import table %}
-
-{% macro text(parts) -%}
-  {%- for part in parts -%}
-    {%- if part.code is defined -%}<code>{{ part.code }}</code>{%- else -%}{{ part }}{%- endif -%}
-  {%- endfor -%}
-{%- endmacro %}
+{% from "components/blocks.njk" import block %}
 
 {% block title %}{{ title }}{% endblock %}
 
@@ -56,32 +51,7 @@
 
     {% for entry in cards %}
       {% call card(title=entry.title) %}
-        {% for block in entry.blocks %}
-          {% if block.table %}
-            {% call table(block.table.caption, inCard=true) %}
-              <thead>
-                <tr>
-                  {% for column in block.table.columns %}<th scope="col">{{ column }}</th>{% endfor %}
-                </tr>
-              </thead>
-              <tbody>
-                {% for row in block.table.rows %}
-                  <tr>
-                    {% for cell in row %}
-                      {% if cell.time is defined %}
-                        <td class="whitespace-nowrap">{% if cell.time %}{{ cell.time | date('readable') }}{% else %}Never{% endif %}</td>
-                      {% else %}
-                        <td>{{ text([cell]) }}</td>
-                      {% endif %}
-                    {% endfor %}
-                  </tr>
-                {% endfor %}
-              </tbody>
-            {% endcall %}
-          {% else %}
-            <p class="text-sm">{{ text(block.paragraph) }}</p>
-          {% endif %}
-        {% endfor %}
+        {% for data in entry.blocks %}{{ block(data) }}{% endfor %}
       {% endcall %}
     {% endfor %}
   </div>

package/admin/pages/settings/general.njk

@@ -4,6 +4,7 @@
 {% from "components/badge.njk" import status %}
 {% from "components/button.njk" import button %}
 {% from "components/card.njk" import card, cardActions %}
+{% from "components/upload.njk" import uploadControl %}
 
 {% block settingsProblems %}
   {{ field.problem('settings-title', problems.title) }}
@@ -49,9 +50,11 @@
   {{ field.text('settings-locale', fields.locale, 'Locale', form.locale,
        error=problems.locale, hintHtml=localeHint) }}
 
-  {% set iconHint %}A square image at least 512 pixels wide, uploaded on <a href="{{ adminUrl }}/media">Media</a>: a path such as <code>/uploads/2026/10/icon.png</code>. It is the favicon, the home screen icon, <code>/favicon.ico</code> and the web app manifest's icon. Anything not square is cropped to its middle.{% endset %}
+  {% set iconHint %}A square image at least 512 pixels wide in the media library: a path such as <code>/uploads/2026/10/icon.png</code>. It is the favicon, the home screen icon, <code>/favicon.ico</code> and the web app manifest's icon. Anything not square is cropped to its middle.{% endset %}
   {{ field.text('settings-icon', fields.icon, 'Site icon', form.icon,
        error=problems.icon, hintHtml=iconHint) }}
+  {{ uploadControl('field', 'settings-icon', uploadsUrl, images=true) }}
+  <script defer src="{{ assetPrefix }}upload-drop.js"></script>
 
   <div class="flex items-center gap-4">
     {% if iconPreview %}

package/admin/pages/tools/export.njk

@@ -29,61 +29,64 @@
       site, wait until none are, and look again here.
     </p>
 
-    {% if job %}
-      <section id="export-status" aria-labelledby="export-status-heading">
-        {% call card() %}
-          <h2 id="export-status-heading" class="card-title">Latest export</h2>
-          {% call jobStatus(job, exportUrl, verb='Exported', unit='files') %}
-            {% if result %}
-              <p>
-                {{ result.files }} {% if result.files == 1 %}file{% else %}files{% endif %},
-                {{ result.size }} before compression, {% if result.credentials %}with{% else %}without{% endif %} credentials.
-              </p>
-              {% if result.credentialsLeftOut.length %}
-                <p>Credentials left out: {{ result.credentialsLeftOut | join(', ') }}.</p>
-              {% endif %}
-              {% if result.undeclared.length %}
-                <p>Left out because no declaration says what they are:</p>
-                <ul class="list-disc pl-6">
-                  {% for file in result.undeclared %}<li><code class="break-all">{{ file }}</code></li>{% endfor %}
-                </ul>
-              {% endif %}
-              {% if result.notCarried.length %}
-                <p>Left out because an export holds only regular files:</p>
-                <ul class="list-disc pl-6">
-                  {% for entry in result.notCarried %}<li><code class="break-all">{{ entry.path }}</code>, {{ entry.why }}</li>{% endfor %}
-                </ul>
-              {% endif %}
-              {% if archive %}
+    <div class="flex flex-col gap-6" data-job-region>
+      {% if job %}
+        <section id="export-status" aria-labelledby="export-status-heading">
+          {% call card() %}
+            <h2 id="export-status-heading" class="card-title">Latest export</h2>
+            {% call jobStatus(job, exportUrl, verb='Exported', unit='files') %}
+              {% if result %}
                 <p>
-                  <code class="break-all">{{ archive.name }}</code> is deleted at
-                  <time datetime="{{ archive.expiresAt }}">{{ archive.expiresAt | date('datetime') }}</time>,
-                  or when the next export finishes.
+                  {{ result.files }} {% if result.files == 1 %}file{% else %}files{% endif %},
+                  {{ result.size }} before compression, {% if result.credentials %}with{% else %}without{% endif %} credentials.
                 </p>
-                <div>{{ buttonLink('Download ' + archive.size, downloadUrl, color='primary') }}</div>
-              {% else %}
-                <p>The archive was deleted 24 hours after it was written, or a later export replaced it. Export again to download one.</p>
+                {% if result.credentialsLeftOut.length %}
+                  <p>Credentials left out: {{ result.credentialsLeftOut | join(', ') }}.</p>
+                {% endif %}
+                {% if result.undeclared.length %}
+                  <p>Left out because no declaration says what they are:</p>
+                  <ul class="list-disc pl-6">
+                    {% for file in result.undeclared %}<li><code class="break-all">{{ file }}</code></li>{% endfor %}
+                  </ul>
+                {% endif %}
+                {% if result.notCarried.length %}
+                  <p>Left out because an export holds only regular files:</p>
+                  <ul class="list-disc pl-6">
+                    {% for entry in result.notCarried %}<li><code class="break-all">{{ entry.path }}</code>, {{ entry.why }}</li>{% endfor %}
+                  </ul>
+                {% endif %}
+                {% if archive %}
+                  <p>
+                    <code class="break-all">{{ archive.name }}</code> is deleted at
+                    <time datetime="{{ archive.expiresAt }}">{{ archive.expiresAt | date('datetime') }}</time>,
+                    or when the next export finishes.
+                  </p>
+                  <div>{{ buttonLink('Download ' + archive.size, downloadUrl, color='primary') }}</div>
+                {% else %}
+                  <p>The archive was deleted 24 hours after it was written, or a later export replaced it. Export again to download one.</p>
+                {% endif %}
               {% endif %}
-            {% endif %}
+            {% endcall %}
           {% endcall %}
-        {% endcall %}
-      </section>
-    {% endif %}
+        </section>
+      {% endif %}
 
-    {% if not job or not job.active %}
-      {% call card(title='Export the site') %}
-        <form method="post" action="{{ exportUrl }}">
-          <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
-          {{ field.checkbox('export-with-credentials', fields.withCredentials,
-               'Include credentials', checked=withCredentials,
-               hint='API keys and logins for other services, such as an email provider. Left out, they are typed in again after an import.') }}
-          {{ field.password('export-password', fields.password, 'Your password',
-               error=problem, autocomplete='current-password', required=true) }}
-          {% call cardActions() %}
-            {{ button('Export', type='submit', color='primary') }}
-          {% endcall %}
-        </form>
-      {% endcall %}
-    {% endif %}
+      {% if not job or not job.active %}
+        {% call card(title='Export the site') %}
+          <form method="post" action="{{ exportUrl }}">
+            <input type="hidden" name="csrf_token" value="{{ csrfToken }}" />
+            {{ field.checkbox('export-with-credentials', fields.withCredentials,
+                 'Include credentials', checked=withCredentials,
+                 hint='API keys and logins for other services, such as an email provider. Left out, they are typed in again after an import.') }}
+            {{ field.password('export-password', fields.password, 'Your password',
+                 error=problem, autocomplete='current-password', required=true) }}
+            {% call cardActions() %}
+              {{ button('Export', type='submit', color='primary') }}
+            {% endcall %}
+          </form>
+        {% endcall %}
+      {% endif %}
+    </div>
   </div>
+  <script defer src="{{ assetPrefix }}job-status.js"></script>
 {% endblock %}

package/admin/pages/tools/maintenance.njk

@@ -49,7 +49,7 @@
       same switch, and a running site notices either within a second.
     </p>
 
-    <section id="strip-metadata" aria-labelledby="strip-metadata-heading">
+    <section id="strip-metadata" aria-labelledby="strip-metadata-heading" data-job-region>
       {% call card() %}
         <h2 id="strip-metadata-heading" class="card-title">Location and camera metadata</h2>
         <p class="max-w-prose">
@@ -96,4 +96,5 @@
       {% endcall %}
     </section>
   </div>
+  <script defer src="{{ assetPrefix }}job-status.js"></script>
 {% endblock %}

package/admin/pages/users/edit.njk

@@ -15,6 +15,7 @@
 {% from "components/badge.njk" import badge, status %}
 {% from "components/button.njk" import button %}
 {% from "components/card.njk" import card, cardActions %}
+{% from "components/upload.njk" import uploadControl %}
 
 {% block title %}Edit {{ account.username }}{% endblock %}
 
@@ -97,6 +98,7 @@
     {% set avatarHint %}A path such as <code>/uploads/2026/09/me.jpg</code>, or a full URL.{% endset %}
     {{ field.text('profile-avatar', fields.avatar, 'Avatar', account.profile.avatar,
          hintHtml=avatarHint) }}
+    {{ uploadControl('field', 'profile-avatar', uploadsUrl, images=true) }}
 
     {{ field.text('profile-job-title', fields.jobTitle, 'Job title', account.profile.jobTitle,
          hint='What they do, printed beside the name on the archive.') }}
@@ -280,4 +282,5 @@
     {% endif %}
   {% endcall %}
   </div>
+  <script defer src="{{ assetPrefix }}upload-drop.js"></script>
 {% endblock %}

package/admin/src/admin.css

@@ -4,6 +4,7 @@
 @source '../pages';
 @source '../../editor/look.ts';
 @source '../static/media.js';
+@source '../static/upload-drop.js';
 
 @plugin 'daisyui' {
   themes: