@raketa-cloud/admin 0.0.22 → 0.0.24

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@raketa-cloud/admin",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "main": "src/index.js",
   "scripts": {
     "dev": "npx tailwindcss -i ./src/styles/application.css -o ../../apps/admin/static/application.css --watch",

package/src/Adapter.js

@@ -1,6 +1,6 @@
-import currentPath from "./currentPath.cjs";
-import { existsSync } from "node:fs";
+import { existsSync, readFileSync } from "node:fs";
 import ejs from "ejs";
+import currentPath from "./currentPath.cjs";
 import FormBuilder from "./helpers/FormBuilder";
 import HTMLBuilder from "./helpers/HTMLBuilder";
 import form_for from "./helpers/form_for";
@@ -88,6 +88,13 @@ function putIn(result, key, value) {
   });
 }
 
+function getPartialPath(partialPath) {
+  const packagePath = `${currentPath}/views/${partialPath}`;
+  const appPath = `${process.cwd()}/src/views/${partialPath}`;
+
+  return existsSync(appPath) ? appPath : packagePath;
+}
+
 export default class Adapter {
   constructor(router) {
     this.router = router;
@@ -116,11 +123,17 @@ export default class Adapter {
     return existsSync(appPath) ? appPath : packagePath;
   }
 
-  getHelpers() {
+  getHelpers(viewHelpersConfig) {
     const t = new HTMLBuilder();
     const f = new FormBuilder();
 
-    return { t, f, form_for, sort_button, pagination };
+    return {
+      t,
+      f,
+      form_for: form_for(viewHelpersConfig),
+      sort_button,
+      pagination,
+    };
   }
 
   async renderLayout(assigns, body) {
@@ -132,13 +145,51 @@ export default class Adapter {
     });
   }
 
-  async renderAction({ views, action, assigns }) {
+  renderPartial(assigns) {
+    return function render(relativePath, localAssigns) {
+      const partialPath = getPartialPath(relativePath);
+      try {
+        // Synchronously read the partial file as ejs does not support async/await
+        const partialTemplate = readFileSync(partialPath, "utf8");
+        const rendered = ejs.render(
+          partialTemplate,
+          {
+            ...assigns,
+            ...localAssigns,
+          },
+          { filename: partialPath }
+        );
+
+        return rendered;
+      } catch (e) {
+        const error = `Error rendering:\n ${partialPath}`;
+        Logger.error(`${error}\n\n${e.stack}`);
+
+        return renderError(error, e.stack);
+      }
+    };
+  }
+
+  async renderAction({ views, action, assigns }, viewHelpersConfig = {}) {
     const fullTemplatePath = this.getActionPath(views, action);
-    const renderAssigns = { ...this.getHelpers(), ...assigns };
+    const renderAssigns = { ...this.getHelpers(viewHelpersConfig), ...assigns };
+    const renderPartialHelper = this.renderPartial(renderAssigns);
 
     try {
-      const rendered = await ejs.renderFile(fullTemplatePath, renderAssigns);
-      const fullPage = await this.renderLayout(renderAssigns, rendered);
+      // Synchronously read the full template file
+      const template = readFileSync(fullTemplatePath, "utf8");
+
+      // Render the full template with synchronous partial rendering
+      const rendered = ejs.render(
+        template,
+        {
+          ...renderAssigns,
+          render_partial: renderPartialHelper,
+        },
+        { filename: fullTemplatePath }
+      );
+
+      const fullPage = this.renderLayout(renderAssigns, rendered);
 
       return fullPage;
     } catch (e) {

package/src/HonoAdapter.js

@@ -185,11 +185,14 @@ export default class HonoAdapter extends Adapter {
           return routerCtx.json(json);
         }
 
-        const rendered = this.renderAction({
-          views,
-          action,
-          assigns: fullAssigns,
-        });
+        const rendered = this.renderAction(
+          {
+            views,
+            action,
+            assigns: fullAssigns,
+          },
+          this.globalConfig?.helpers || {}
+        );
 
         return routerCtx.html(rendered);
       });

package/src/helpers/FormBuilder.js

@@ -1,5 +1,61 @@
 import HTMLBuilder from "./HTMLBuilder";
 
+const BUTTON_FIELDS_MAP = {
+  label: { label: "Label" },
+  link: { label: "Link" },
+  id: { label: "ID" },
+  type: {
+    label: "Type",
+    as: "select",
+    options: [
+      ["primary", "Primary"],
+      ["secondary", "Secondary"],
+      ["text", "Text"],
+    ],
+  },
+  target: {
+    label: "Target",
+    as: "select",
+    options: [
+      ["_self", "Self"],
+      ["_blank", "New Tab"],
+    ],
+  },
+  rel: {
+    label: "Follow Link",
+    as: "select",
+    options: [
+      ["follow", "Follow"],
+      ["nofollow", "No Follow"],
+    ],
+  },
+};
+
+const LINK_FIELDS_MAP = {
+  label: { label: "Label" },
+  link: { label: "Link" },
+  id: { label: "ID" },
+  className: {
+    label: "CSS Class",
+  },
+  target: {
+    label: "Target",
+    as: "select",
+    options: [
+      ["_self", "Self"],
+      ["_blank", "New Tab"],
+    ],
+  },
+  rel: {
+    label: "Follow Link",
+    as: "select",
+    options: [
+      ["follow", "Follow"],
+      ["nofollow", "No Follow"],
+    ],
+  },
+};
+
 function dig(obj, path) {
   return path.split(".").reduce((acc, key) => {
     if (acc && Object.hasOwn(acc, key)) {
@@ -33,10 +89,11 @@ function toFormName(dotNotation) {
 }
 
 export default class FormBuilder extends HTMLBuilder {
-  constructor(obj = {}, errors = {}) {
+  constructor(obj = {}, errors = {}, config = {}) {
     super();
     this.obj = obj;
     this.errors = errors;
+    this.config = config;
   }
 
   __getValue(name) {
@@ -85,6 +142,7 @@ export default class FormBuilder extends HTMLBuilder {
     const selected = value || this.__getValue(name);
 
     const renderedOpts = [];
+
     if (prompt) {
       renderedOpts.push(this.tag("option", prompt, { value: "" }));
     }
@@ -191,8 +249,73 @@ export default class FormBuilder extends HTMLBuilder {
     return this.tag("button", label, { type: "submit", ...opts });
   }
 
+  button(name, opts) {
+    const { label, ...rest } = opts;
+    const defaultLabel = opts?.label || this.__getDefaultLabel(name);
+    const fields = Object.keys(BUTTON_FIELDS_MAP).map((key) => {
+      const innerOpts = BUTTON_FIELDS_MAP[key];
+
+      if (innerOpts.as) {
+        return this.field(`${name}.${key}`, {
+          as: innerOpts.as,
+          options: this.config.buttons?.[`${key}Options`] || innerOpts.options,
+          label: innerOpts.label,
+          class: "no-margin",
+        });
+      } else {
+        return this.field(`${name}.${key}`, {
+          label: innerOpts.label,
+          class: "no-margin",
+        });
+      }
+    });
+
+    return this.tag(
+      "fieldset",
+      [this.tag("legend", defaultLabel, {}), ...fields].join(""),
+      {
+        class: "button-group",
+      }
+    );
+  }
+
+  link(name, opts) {
+    const { label, ...rest } = opts;
+    const defaultLabel = opts?.label || this.__getDefaultLabel(name);
+    const fields = Object.keys(LINK_FIELDS_MAP).map((key) => {
+      const innerOpts = LINK_FIELDS_MAP[key];
+
+      if (innerOpts.as) {
+        return this.field(`${name}.${key}`, {
+          as: innerOpts.as,
+          options: innerOpts.options,
+          label: innerOpts.label,
+          class: "no-margin",
+        });
+      } else {
+        return this.field(`${name}.${key}`, {
+          label: innerOpts.label,
+          class: "no-margin",
+        });
+      }
+    });
+
+    return this.tag(
+      "fieldset",
+      [this.tag("legend", defaultLabel, {}), ...fields].join(""),
+      {
+        class: "link-group",
+      }
+    );
+  }
+
   field(name, opts = {}) {
     const { as = "input", label, ...rest } = opts;
+
+    if (as === "button" || as === "link") {
+      return this[as](name, { ...rest, label });
+    }
+
     const defaultLabel = opts?.label || this.__getDefaultLabel(name);
     const htmlID = this.__getID(name);
     const error = this.__getError(name);

package/src/helpers/form_for.js

@@ -1,6 +1,8 @@
 import FormBuilder from "./FormBuilder";
 
-export default function form_for(obj = {}, errors = {}, callback = (_) => {}) {
-  const form = new FormBuilder(obj, errors);
-  return callback(form);
+export default function form_for(viewHelpersConfig = {}) {
+  return function form_for(obj = {}, errors = {}, callback = (_) => {}) {
+    const form = new FormBuilder(obj, errors, viewHelpersConfig);
+    return callback(form);
+  };
 }

package/src/styles/application.css

@@ -170,6 +170,30 @@ body {
     .hint {
       @apply text-sm opacity-50;
     }
+
+    .button-group,
+    .link-group {
+      @apply grid grid-cols-6 gap-4 mb-4;
+    }
+
+    .button-group label,
+    .link-group label {
+      @apply font-normal;
+    }
+
+    .button-group legend,
+    .link-group legend {
+      @apply col-span-6 text-nowrap text-sm font-semibold w-fit pb-2;
+    }
+
+    .button-group div,
+    .link-group div {
+      @apply col-span-2 mb-0;
+    }
+
+    .no-margin {
+      @apply m-0;
+    }
   }
 
   .inline-form {

package/src/views/article_revisions/codes/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / Code customizations</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: code_settings, active: 'codes' }) %>
+  <%- render_partial('article_revisions/_nav.ejs', { settings: code_settings, active: 'codes' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -24,7 +24,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/article_revisions/general/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / General</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: general_settings, active: 'general' }) %>
+  <%- render_partial('article_revisions/_nav.ejs', { settings: general_settings, active: 'general' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -29,7 +29,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/article_revisions/meta/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / Open graph & meta tags</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: meta_settings, active: 'meta' }) %>
+  <%- render_partial('article_revisions/_nav.ejs', { settings: meta_settings, active: 'meta' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -26,7 +26,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/article_revisions/publishes/create_form.ejs

@@ -4,7 +4,6 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('article_revisions/publishes/_form.ejs') %>
   </div>
 </div>
-

package/src/views/article_revisions/tags/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / Content tags</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: tag_settings, active: 'tags' }) %>
+  <%- render_partial('article_revisions/_nav.ejs', { settings: tag_settings, active: 'tags' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -23,7 +23,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/article_revisions/visuals/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / Visuals</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: visual_settings, active: 'visuals' }) %>
+  <%- render_partial('article_revisions/_nav.ejs', { settings: visual_settings, active: 'visuals' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -27,7 +27,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/articles/create_form.ejs

@@ -4,6 +4,6 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('articles/_form.ejs') %>
   </div>
 </div>

package/src/views/articles/edit_form.ejs

@@ -1,3 +1,3 @@
 <h1>Hello from edit form <%= id %></h1>
 
-<%- include('_form.ejs') %>
+<%- render_partial('articles/_form.ejs') %>

package/src/views/articles/translations/create_form.ejs

@@ -4,6 +4,6 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('articles/translations/_form.ejs') %>
   </div>
 </div>

package/src/views/event_revisions/codes/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / Code customizations</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: code_settings, active: 'codes' }) %>
+  <%- render_partial('event_revisions/_nav.ejs', { settings: code_settings, active: 'codes' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -24,7 +24,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/event_revisions/general/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / General</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: general_settings, active: 'general' }) %>
+  <%- render_partial('event_revisions/_nav.ejs', { settings: general_settings, active: 'general' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -31,7 +31,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/event_revisions/meta/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / Open graph & meta tags</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: meta_settings, active: 'meta' }) %>
+  <%- render_partial('event_revisions/_nav.ejs', { settings: meta_settings, active: 'meta' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -26,7 +26,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/event_revisions/publishes/create_form.ejs

@@ -4,7 +4,6 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('event_revisions/publishes/_form.ejs') %>
   </div>
 </div>
-

package/src/views/event_revisions/tags/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / Content tags</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: tag_settings, active: 'tags' }) %>
+  <%- render_partial('event_revisions/_nav.ejs', { settings: tag_settings, active: 'tags' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -23,7 +23,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/event_revisions/visuals/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / Visuals</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: visual_settings, active: 'visuals' }) %>
+  <%- render_partial('event_revisions/_nav.ejs', { settings: visual_settings, active: 'visuals' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -27,7 +27,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/events/create_form.ejs

@@ -4,6 +4,6 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('events/_form.ejs') %>
   </div>
 </div>

package/src/views/events/edit_form.ejs

@@ -1,3 +1,3 @@
 <h1>Hello from edit form <%= id %></h1>
 
-<%- include('_form.ejs') %>
+<%- render_partial('events/_form.ejs') %>

package/src/views/events/translations/create_form.ejs

@@ -4,7 +4,7 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('events/translations/_form.ejs') %>
   </div>
 </div>
 

package/src/views/page_revisions/codes/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / Code customizations</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: code_settings, active: 'codes' }) %>
+  <%- render_partial('page_revisions/_nav.ejs', { settings: code_settings, active: 'codes' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -24,7 +24,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/page_revisions/general/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / General</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: general_settings, active: 'general' }) %>
+  <%- render_partial('page_revisions/_nav.ejs', { settings: general_settings, active: 'general' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -28,7 +28,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/page_revisions/meta/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / Open graph & meta tags</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: meta_settings, active: 'meta' }) %>
+  <%- render_partial('page_revisions/_nav.ejs', { settings: meta_settings, active: 'meta' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -26,7 +26,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/page_revisions/publishes/create_form.ejs

@@ -4,7 +4,7 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('page_revisions/publishes/_form.ejs') %>
   </div>
 </div>
 

package/src/views/page_revisions/tags/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / Content tags</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: tag_settings, active: 'tags' }) %>
+  <%- render_partial('page_revisions/_nav.ejs', { settings: tag_settings, active: 'tags' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -23,7 +23,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/page_revisions/visuals/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Edit revision / Visuals</h1>
   </div>
 
-  <%- include('../_nav.ejs', { settings: visual_settings, active: 'visuals' }) %>
+  <%- render_partial('page_revisions/_nav.ejs', { settings: visual_settings, active: 'visuals' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div>
@@ -27,7 +27,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/pages/create_form.ejs

@@ -4,6 +4,6 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('pages/_form.ejs') %>
   </div>
 </div>

package/src/views/pages/edit_form.ejs

@@ -1,3 +1,3 @@
 <h1>Hello from edit form <%= id %></h1>
 
-<%- include('_form.ejs') %>
+<%- render_partial('pages/_form.ejs') %>

package/src/views/pages/translations/create_form.ejs

@@ -4,6 +4,6 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('pages/translations/_form.ejs') %>
   </div>
 </div>

package/src/views/redirects/create_form.ejs

@@ -4,6 +4,6 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('redirects/_form.ejs') %>
   </div>
 </div>

package/src/views/redirects/edit_form.ejs

@@ -4,6 +4,6 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('redirects/_form.ejs') %>
   </div>
-</div>
+</div>

package/src/views/settings/general/edit_form.ejs

@@ -3,14 +3,14 @@
     <h1 class="heading-1">General</h1>
   </div>
 
-  <%- include('../_nav.ejs', { active: 'general' }) %>
+  <%- render_partial('settings/_nav.ejs', { active: 'general' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <div></div>
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/settings/layout/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Layout and Navigation Settings</h1>
   </div>
 
-  <%- include('../_nav.ejs', { active: 'layout' }) %>
+  <%- render_partial('settings/_nav.ejs', { active: 'layout' }) %>
 
   <div>
     <% form_for({ layout_settings }, errors, (f) => { %>

package/src/views/settings/meta/edit_form.ejs

@@ -3,7 +3,7 @@
     <h1 class="heading-1">Meta and OpenGraph</h1>
   </div>
 
-  <%- include('../_nav.ejs', { active: 'meta' }) %>
+  <%- render_partial('settings/_nav.ejs', { active: 'meta' }) %>
 
   <div class="grid gap-4 md:grid-cols-3">
     <% form_for({ meta_settings }, errors, (f) => { %>
@@ -23,7 +23,7 @@
 
     <div>
       <div class="help">
-        <div class="mb-2 flex items-center gap-1">
+        <div class="flex items-center gap-1 mb-2">
           <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="size-4">
             <path stroke-linecap="round" stroke-linejoin="round" d="m11.25 11.25.041-.02a.75.75 0 0 1 1.063.852l-.708 2.836a.75.75 0 0 0 1.063.853l.041-.021M21 12a9 9 0 1 1-18 0 9 9 0 0 1 18 0Zm-9-3.75h.008v.008H12V8.25Z" />
           </svg>

package/src/views/tags/create_form.ejs

@@ -4,6 +4,6 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('tags/_form.ejs') %>
   </div>
-</div>
+</div>

package/src/views/tags/edit_form.ejs

@@ -4,6 +4,6 @@
   </div>
 
   <div class="grid gap-4 md:grid-cols-3">
-    <%- include('_form.ejs') %>
+    <%- render_partial('tags/_form.ejs') %>
   </div>
-</div>
+</div>