From ef310ad140fc669c374aac41ece8673b5d70105d Mon Sep 17 00:00:00 2001
From: Abdy Franco <abdy@devmail.one>
Date: Wed, 12 Aug 2026 15:36:41 -0600
Subject: [PATCH 1/3] Replaced the short echo tags in the admin views

<?= only works where short_open_tag is enabled, so the page listing and the manage form
could render their markup as literal text on a server that has it off. Spells them out as
<?php echo instead, matching the rest of the plugin.

Also guards the language loop in the manage form against a missing $languages.
---
 views/default/admin_main.pdt        | 14 +++++++-------
 views/default/admin_main_manage.pdt | 12 ++++++------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/views/default/admin_main.pdt b/views/default/admin_main.pdt
index dd786a9..4c48597 100644
--- a/views/default/admin_main.pdt
+++ b/views/default/admin_main.pdt
@@ -25,15 +25,15 @@
                 <thead>
                     <tr>
                         <th>
-                            <a href="<?= $this->Html->safe($this->base_uri . 'plugin/cms/admin_main/index?sort=uri&order=' . ($sort == 'uri' ? $negate_order : $order));?>" class="ajax text-decoration-none">
+                            <a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/cms/admin_main/index?sort=uri&order=' . ($sort == 'uri' ? $negate_order : $order));?>" class="ajax text-decoration-none">
                                 <?php $this->_('AdminMain.index.heading.uri'); ?>
-                                <?php if ($sort == 'uri') { ?><i class="bi bi-chevron-<?= $order == 'asc' ? 'up' : 'down'; ?>"></i><?php } ?>
+                                <?php if ($sort == 'uri') { ?><i class="bi bi-chevron-<?php echo $order == 'asc' ? 'up' : 'down'; ?>"></i><?php } ?>
                             </a>
                         </th>
                         <th>
-                            <a href="<?= $this->Html->safe($this->base_uri . 'plugin/cms/admin_main/index?sort=title&order=' . ($sort == 'title' ? $negate_order : $order));?>" class="ajax text-decoration-none">
+                            <a href="<?php echo $this->Html->safe($this->base_uri . 'plugin/cms/admin_main/index?sort=title&order=' . ($sort == 'title' ? $negate_order : $order));?>" class="ajax text-decoration-none">
                                 <?php $this->_('AdminMain.index.heading.title'); ?>
-                                <?php if ($sort == 'title') { ?><i class="bi bi-chevron-<?= $order == 'asc' ? 'up' : 'down'; ?>"></i><?php } ?>
+                                <?php if ($sort == 'title') { ?><i class="bi bi-chevron-<?php echo $order == 'asc' ? 'up' : 'down'; ?>"></i><?php } ?>
                             </a>
                         </th>
                         <th style="width: 80px;"><?php $this->_('AdminMain.index.heading.options') ?></th>
@@ -43,11 +43,11 @@
                     <?php for ($i = 0; $i < $num_pages; $i++) { ?>
                         <?php $page = $pages[$i] ?>
                         <tr>
-                            <td><?= $this->Html->safe($page->uri) ?></td>
-                            <td><?= $this->Html->safe($page->title) ?></td>
+                            <td><?php echo $this->Html->safe($page->uri) ?></td>
+                            <td><?php echo $this->Html->safe($page->title) ?></td>
                             <td>
                                 <div class="d-flex gap-2">
-                                    <a class="btn btn-sm btn-outline-secondary" href="<?= $this->Html->safe($this->base_uri . 'plugin/cms/admin_main/manage/?' . http_build_query(['uri' => $page->uri])) ?>" title="<?php $this->_('AdminMain.index.edit') ?>">
+                                    <a class="btn btn-sm btn-outline-secondary" href="<?php echo $this->Html->safe($this->base_uri . 'plugin/cms/admin_main/manage/?' . http_build_query(['uri' => $page->uri])) ?>" title="<?php $this->_('AdminMain.index.edit') ?>">
                                         <i class="bi bi-pencil"></i>
                                     </a>
                                     <?php $this->Form->create($this->base_uri . 'plugin/cms/admin_main/delete', ['class' => 'd-inline']) ?>
diff --git a/views/default/admin_main_manage.pdt b/views/default/admin_main_manage.pdt
index ece58c0..b829958 100644
--- a/views/default/admin_main_manage.pdt
+++ b/views/default/admin_main_manage.pdt
@@ -28,10 +28,10 @@
         </div>
 
         <ul class="nav nav-tabs-connected" role="tablist">
-            <?php foreach ($languages as $i => $lang) { ?>
+            <?php foreach ($languages ?? [] as $i => $lang) { ?>
                 <li class="nav-item" role="presentation">
-                    <button class="nav-link<?= ($lang->code ?? null) == Configure::get('Blesta.language') ? ' active' : '' ?>" data-bs-toggle="tab" data-bs-target="#tab-<?= $this->Html->safe($lang->code) ?>" type="button" role="tab">
-                        <?= $this->Html->safe($lang->name ?? null) ?>
+                    <button class="nav-link<?php echo ($lang->code ?? null) == Configure::get('Blesta.language') ? ' active' : '' ?>" data-bs-toggle="tab" data-bs-target="#tab-<?php echo $this->Html->safe($lang->code) ?>" type="button" role="tab">
+                        <?php echo $this->Html->safe($lang->name ?? null) ?>
                     </button>
                 </li>
             <?php } ?>
@@ -39,7 +39,7 @@
         <div class="tab-content tab-content-connected mb-3">
             <?php foreach ($languages as $i => $lang) { ?>
                 <?php $page = (object)($vars[$lang->code] ?? $pages[$lang->code] ?? []); ?>
-                <div class="tab-pane fade<?= ($lang->code ?? null) == Configure::get('Blesta.language') ? ' show active' : '' ?>" id="tab-<?= $this->Html->safe($lang->code) ?>" role="tabpanel">
+                <div class="tab-pane fade<?php echo ($lang->code ?? null) == Configure::get('Blesta.language') ? ' show active' : '' ?>" id="tab-<?php echo $this->Html->safe($lang->code) ?>" role="tabpanel">
                     <div class="mb-3">
                         <?php $this->Form->label($this->_('AdminMain.manage.label.title', true), 'title-' . $lang->code, ['class' => 'form-label']); ?>
                         <?php $this->Form->fieldText('pages[' . $lang->code . '][title]', ($page->title ?? null), ['id' => 'title-' . $lang->code, 'class' => 'form-control']); ?>
@@ -48,7 +48,7 @@
                         <h6 class="alert-heading mb-2"><i class="bi bi-tags me-2"></i><?php $this->_('AdminMain.manage.label.tags'); ?></h6>
                         <div class="d-flex flex-wrap gap-2">
                             <?php foreach (($tags ?? []) as $tag) { ?>
-                                <code><?= $this->Html->safe($tag ?? null) ?></code>
+                                <code><?php echo $this->Html->safe($tag ?? null) ?></code>
                             <?php } ?>
                         </div>
                     </div>
@@ -63,7 +63,7 @@
                     </div>
                     <?php foreach ($content_types as $type => $name) {?>
                         <?php $current_type = $type == ($page->content_type ?? array_keys($content_types ?? [])[0] ?? null); ?>
-                        <div class="mb-3 content <?= 'content_' . $type ?>"<?= $current_type ? '' : ' style="display:none"' ?>>
+                        <div class="mb-3 content <?php echo 'content_' . $type ?>"<?php echo $current_type ? '' : ' style="display:none"' ?>>
                             <?php
                                 $attributes = $current_type ? ['class' => 'form-control'] : ['disabled' => '', 'class' => 'form-control'];
                                 switch($type) {

From 478aba997e6914a2943765556988ba887c557f32 Mon Sep 17 00:00:00 2001
From: Abdy Franco <abdy@devmail.one>
Date: Wed, 12 Aug 2026 15:36:59 -0600
Subject: [PATCH 2/3] Added a Meridian stylesheet for the portal page

The portal renders through the active client template already, since Main::preAction()
points the structure at client/{template}, and the page markup itself lives in cms_pages.
What did not follow was views/default/css/styles.css, which paints the portal boxes and the
install notice in fixed colors. Against Meridian's dark palette that left white cards on a
dark page, and an install notice whose inherited near-white text sat on a white background.

Adds views/meridian/, resolved per file through PluginViewResolver, holding the portal view
and a stylesheet that takes its colors from the Meridian design tokens, so light and dark
mode need no extra rules. Also carries the FontAwesome sizing classes: Meridian maps the
FontAwesome class names onto Bootstrap Icons glyphs but ships none of fa-lg through fa-5x,
so the fa-4x icons on the seeded portal page were drawing at 1em.

The stylesheet link is built in preAction, before the view directory is settled, so it was
always pointing at views/default/ no matter which directory the view came from. It now
resolves the directory the same way the renderer does.

The admin views are left on views/default/, which the admin template goes on using.
---
 config.json                    |   2 +-
 controllers/main.php           |   6 +-
 views/default/structure.pdt    |   2 +-
 views/meridian/css/styles.css  |  97 +++++++++++++++++++++++++++++++++
 views/meridian/images/logo.png | Bin 0 -> 4341 bytes
 views/meridian/main.pdt        |   3 +
 views/meridian/structure.pdt   |  13 +++++
 7 files changed, 120 insertions(+), 3 deletions(-)
 create mode 100644 views/meridian/css/styles.css
 create mode 100644 views/meridian/images/logo.png
 create mode 100644 views/meridian/main.pdt
 create mode 100644 views/meridian/structure.pdt

diff --git a/config.json b/config.json
index ca49213..7505b30 100644
--- a/config.json
+++ b/config.json
@@ -1,5 +1,5 @@
 {
-    "version": "4.0.0",
+    "version": "4.1.0",
     "name": "CmsPlugin.name",
     "description": "CmsPlugin.description",
     "icon": "bi bi-circle",
diff --git a/controllers/main.php b/controllers/main.php
index ca0d1c2..a45945f 100644
--- a/controllers/main.php
+++ b/controllers/main.php
@@ -27,10 +27,14 @@ public function preAction()
         // Use the same structure as that of the client portal for the company given
         $this->structure->setDefaultView(APPDIR);
         $this->structure->setView(null, 'client' . DS . $this->layout);
+
+        // The stylesheet has to follow the directory the view resolves to. That is settled
+        // per file when the view renders, so it cannot be read off the view here
+        $view_dir = $this->getPluginViewDir('main') ?? $this->view->view;
         $this->structure->set(
             'custom_head',
             '<link href="' . Router::makeURI(str_replace('index.php/', '', WEBDIR) . $this->view->view_path)
-            . 'views/' . $this->view->view . '/css/styles.css" rel="stylesheet" type="text/css" />'
+            . 'views/' . $view_dir . '/css/styles.css" rel="stylesheet" type="text/css" />'
         );
 
         $this->base_uri = WEBDIR;
diff --git a/views/default/structure.pdt b/views/default/structure.pdt
index 9a9ba40..8bad4f1 100644
--- a/views/default/structure.pdt
+++ b/views/default/structure.pdt
@@ -1,7 +1,7 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-us" lang="en-us" dir="ltr">
     <head>
-        <title>Title</title>
+        <title><?php echo $this->Html->safe($title ?? '');?></title>
         <link rel="stylesheet" type="text/css" href="<?php echo $this->view_dir;?>css/styles.css" />
         <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     </head>
diff --git a/views/meridian/css/styles.css b/views/meridian/css/styles.css
new file mode 100644
index 0000000..9fcad11
--- /dev/null
+++ b/views/meridian/css/styles.css
@@ -0,0 +1,97 @@
+/**
+ * CMS Plugin - Meridian client template
+ *
+ * Colors come from the Meridian design tokens so light and dark mode are
+ * handled without any extra rules.
+ */
+
+/* =============================================
+   Portal boxes
+   ============================================= */
+.portal-box .card {
+    background-color: var(--card-bg);
+    border: 1px solid var(--border-color);
+    margin-bottom: 20px;
+    transition: border-color 0.15s ease, box-shadow 0.15s ease;
+}
+
+.portal-box .card:hover {
+    border-color: var(--primary);
+    box-shadow: var(--shadow-md);
+}
+
+.portal-box .card .card-body {
+    padding: 15px;
+}
+
+.portal-box a {
+    color: var(--text-primary);
+    text-decoration: none;
+}
+
+.portal-box i {
+    display: block;
+    text-align: center;
+    color: var(--text-muted);
+    transition: color 0.15s ease;
+}
+
+.portal-box a:hover i {
+    color: var(--primary);
+}
+
+.portal-box .card .card-body h4 {
+    border-bottom: none !important;
+    padding-bottom: 0 !important;
+}
+
+.portal-box h4,
+.portal-box p {
+    text-align: center;
+}
+
+.portal-box p {
+    color: var(--text-muted);
+    margin-bottom: 0;
+}
+
+/* =============================================
+   Install notice
+   ============================================= */
+.thanks blockquote {
+    padding: 10px 20px;
+    margin: 0 0 20px;
+    font-size: 14px;
+    border-left: 5px solid var(--border-color);
+    border-right: 5px solid var(--border-color);
+    background-color: var(--card-bg);
+    color: var(--text-primary);
+}
+
+/* =============================================
+   Icon sizes
+   -
+   Meridian maps the FontAwesome classes onto Bootstrap Icons but carries none of
+   the sizing classes, so page content written against them renders at 1em.
+   ============================================= */
+.fa-lg {
+    font-size: 1.33em;
+    line-height: 0.75em;
+    vertical-align: -0.0667em;
+}
+
+.fa-2x {
+    font-size: 2em;
+}
+
+.fa-3x {
+    font-size: 3em;
+}
+
+.fa-4x {
+    font-size: 4em;
+}
+
+.fa-5x {
+    font-size: 5em;
+}
diff --git a/views/meridian/images/logo.png b/views/meridian/images/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..86f22be5979b21217ff922bfda4189c974c78ec9
GIT binary patch
literal 4341
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

literal 0
HcmV?d00001

diff --git a/views/meridian/main.pdt b/views/meridian/main.pdt
new file mode 100644
index 0000000..1b02c1e
--- /dev/null
+++ b/views/meridian/main.pdt
@@ -0,0 +1,3 @@
+<?php
+    echo $message ?? null;
+    echo $content ?? null;
diff --git a/views/meridian/structure.pdt b/views/meridian/structure.pdt
new file mode 100644
index 0000000..ef81d3d
--- /dev/null
+++ b/views/meridian/structure.pdt
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width, initial-scale=1.0">
+        <title><?php echo $this->Html->safe($title ?? '');?></title>
+        <link rel="stylesheet" type="text/css" href="<?php echo $this->view_dir;?>css/styles.css">
+    </head>
+
+    <body>
+        <?php echo $content ?? '';?>
+    </body>
+</html>

From 6fc8233e0a3b7e04cb9a895a74b81f20934781b5 Mon Sep 17 00:00:00 2001
From: Abdy Franco <abdy@devmail.one>
Date: Wed, 12 Aug 2026 21:22:11 -0600
Subject: [PATCH 3/3] Load the portal stylesheet through the Css helper on
 Bootstrap 5 templates

The two client structures include stylesheets in mutually exclusive ways. Meridian renders
the Css helper and carries no custom_head at all, while the Bootstrap template is the other
way around, so the link set here reached the head on one and was silently discarded on the
other. Meridian dropped custom_head as of core 5e7cfa300, which left the portal page with
none of the plugin stylesheet: the portal boxes and the install notice rendered unstyled,
including the dark mode rules views/meridian/css/styles.css exists to provide.

The Meridian view now loads the stylesheet itself, where $this->view_dir is already the
directory the view resolved to, and setting custom_head is left to the templates that
render it.
---
 controllers/main.php    | 20 ++++++++++++--------
 views/meridian/main.pdt |  2 ++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/controllers/main.php b/controllers/main.php
index a45945f..a349517 100644
--- a/controllers/main.php
+++ b/controllers/main.php
@@ -28,14 +28,18 @@ public function preAction()
         $this->structure->setDefaultView(APPDIR);
         $this->structure->setView(null, 'client' . DS . $this->layout);
 
-        // The stylesheet has to follow the directory the view resolves to. That is settled
-        // per file when the view renders, so it cannot be read off the view here
-        $view_dir = $this->getPluginViewDir('main') ?? $this->view->view;
-        $this->structure->set(
-            'custom_head',
-            '<link href="' . Router::makeURI(str_replace('index.php/', '', WEBDIR) . $this->view->view_path)
-            . 'views/' . $view_dir . '/css/styles.css" rel="stylesheet" type="text/css" />'
-        );
+        // A Bootstrap 5 client structure renders the Css helper and carries no custom_head, so
+        // the templates built on it load the stylesheet from views/{template}/main.pdt. Anything
+        // else is the other way around, and needs the link written into the head here, following
+        // the directory the view resolves to, which is settled per file when the view renders
+        if (self::getThemeFramework('client') !== self::FRAMEWORK_BOOTSTRAP_5) {
+            $view_dir = $this->getPluginViewDir('main') ?? $this->view->view;
+            $this->structure->set(
+                'custom_head',
+                '<link href="' . Router::makeURI(str_replace('index.php/', '', WEBDIR) . $this->view->view_path)
+                . 'views/' . $view_dir . '/css/styles.css" rel="stylesheet" type="text/css" />'
+            );
+        }
 
         $this->base_uri = WEBDIR;
         $this->view->base_uri = $this->base_uri;
diff --git a/views/meridian/main.pdt b/views/meridian/main.pdt
index 1b02c1e..a88241c 100644
--- a/views/meridian/main.pdt
+++ b/views/meridian/main.pdt
@@ -1,3 +1,5 @@
 <?php
+    $this->Css->setFile('styles.css', 'head', $this->view_dir . 'css/');
+
     echo $message ?? null;
     echo $content ?? null;