chore(version): pre-release bump to 02.21.05-dev [skip ci]

Default icon color now falls back through: --social-icon-color →
--accent-color-secondary → --accent-color-primary → currentColor

.gitignore

@@ -113,7 +113,7 @@ releases/
 build/
 dist/
 out/
-site/
+/site/
 *.map
 *.css.map
 *.js.map

.mokogitea/CLAUDE.md

@@ -0,0 +1,63 @@
+# MokoOnyx
+
+Joomla site template — successor to MokoCassiopeia. Base template for all WaaS client deployments.
+
+## Quick Reference
+
+| Field | Value |
+|---|---|
+| **Element** | `tpl_mokoonyx` |
+| **Type** | Joomla site template |
+| **Language** | PHP 8.1+ / CSS / JS |
+| **Branch** | develop on `dev`, merge to `main` (protected) |
+| **Wiki** | [MokoOnyx Wiki](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/wiki) |
+
+## Commands
+
+```bash
+make build        # Build template ZIP
+make lint         # Run linters
+make validate     # Validate structure
+make release      # Full release pipeline
+make minify       # Minify CSS/JS assets
+make clean        # Clean build artifacts
+composer install  # Install PHP dependencies
+```
+
+## Architecture
+
+Joomla **site template** — the base layer that client theme packages override:
+
+- `src/templateDetails.xml` — template manifest
+- `src/index.php` — main template entry point
+- `src/error.php` — error page
+- `src/offline.php` — maintenance page
+- `src/component.php` — print/component-only layout
+- `src/html/` — template overrides for core components
+- `src/media/css/` — base stylesheets
+- `src/media/js/` — base scripts
+- `src/media/images/` — template images
+- `src/language/` — translations
+
+### Client Theme Packages
+
+Client repos (`client-clarksvillefurs`, `client-optainfunding`, etc.) install `type="file"` packages that overlay client-specific CSS, images, and JS into the MokoOnyx media directory. MokoOnyx provides the structure; client themes customize the appearance.
+
+### Minification
+
+`MokoMinifyHelper` handles runtime CSS/JS minification in Joomla. Build-time minification via `make minify`. Never commit `*.min.css`/`*.min.js` — they're generated.
+
+## Rules
+
+- **Never commit** `.claude/`, `.mcp.json`, `TODO.md`, `*.min.css`/`*.min.js`
+- **Attribution**: `Authored-by: Moko Consulting`
+- **Workflow directory**: `.mokogitea/` (not `.gitea/` or `.github/`)
+- **Minification**: handled at build time (CI) and runtime (MokoMinifyHelper)
+- **Wiki**: documentation lives in the Gitea wiki, not `docs/` files
+- **Standards**: [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)
+
+## Coding Standards
+
+- PHP 8.1+ minimum
+- SPDX license headers on all PHP files
+- `defined('_JEXEC') or die;` on all PHP files

.mokogitea/cascade-dev.yml

@@ -1,4 +1,4 @@
-# DISABLED - auto-release handles dev recreation from main
+# DISABLED - auto-release handles dev recreation
 name: Cascade (DISABLED)
 on: workflow_dispatch
 jobs:

.mokogitea/manifest.xml

@@ -9,7 +9,7 @@
     <display-name>Template - MokoOnyx</display-name>
     <org>MokoConsulting</org>
     <description>MokoOnyx - Joomla site template (successor to MokoCassiopeia)</description>
-    <version>02.15.02</version>
+    <version>02.21.05</version>
     <license spdx="GPL-3.0-or-later">GNU General Public License v3</license>
   </identity>
   <governance>

.mokogitea/workflows/auto-bump.yml

@@ -1,66 +1,66 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
+#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later
-#
+#
-# FILE INFORMATION
+# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Release
+# INGROUP: moko-platform.Release
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
-# PATH: /.mokogitea/workflows/auto-bump.yml
+# PATH: /.mokogitea/workflows/auto-bump.yml
-# VERSION: 09.02.00
+# VERSION: 09.02.00
-# BRIEF: Auto patch-bump version on every push to dev (skips merge commits)
+# BRIEF: Auto patch-bump version on every push to dev (skips merge commits)
-
+
-name: "Universal: Auto Version Bump"
+name: "Universal: Auto Version Bump"
-
+
-on:
+on:
-  push:
+  push:
-    branches:
+    branches:
-      - dev
+      - dev
-      - rc
+      - rc
-      - 'feature/**'
+      - 'feature/**'
-      - 'patch/**'
+      - 'patch/**'
-
+
-env:
+env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
-
+
-permissions:
+permissions:
-  contents: write
+  contents: write
-
+
-jobs:
+jobs:
-  bump:
+  bump:
-    name: Version Bump
+    name: Version Bump
-    runs-on: release
+    runs-on: release
-    if: >-
+    if: >-
-      !contains(github.event.head_commit.message, '[skip ci]') &&
+      !contains(github.event.head_commit.message, '[skip ci]') &&
-      !contains(github.event.head_commit.message, '[skip bump]') &&
+      !contains(github.event.head_commit.message, '[skip bump]') &&
-      !startsWith(github.event.head_commit.message, 'Merge pull request')
+      !startsWith(github.event.head_commit.message, 'Merge pull request')
-
+
-    steps:
+    steps:
-      - name: Checkout
+      - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
-        with:
+        with:
-          token: ${{ secrets.MOKOGITEA_TOKEN }}
+          token: ${{ secrets.MOKOGITEA_TOKEN }}
-          fetch-depth: 1
+          fetch-depth: 1
-
+
-      - name: Setup moko-platform tools
+      - name: Setup moko-platform tools
-        run: |
+        run: |
-          if ! command -v composer &> /dev/null; then
+          if ! command -v composer &> /dev/null; then
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
-          fi
+          fi
-          if [ -d "/opt/moko-platform/cli" ]; then
+          if [ -d "/opt/moko-platform/cli" ]; then
-            echo "MOKO_CLI=/opt/moko-platform/cli" >> "$GITHUB_ENV"
+            echo "MOKO_CLI=/opt/moko-platform/cli" >> "$GITHUB_ENV"
-          else
+          else
-            git clone --depth 1 --branch main --quiet \
+            git clone --depth 1 --branch main --quiet \
-              "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/moko-platform.git" \
+              "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/MokoConsulting/moko-platform.git" \
-              /tmp/moko-platform-api
+              /tmp/moko-platform-api
-            cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
+            cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
-            echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV"
+            echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV"
-          fi
+          fi
-
+
-      - name: Bump version
+      - name: Bump version
-        run: |
+        run: |
-          php ${MOKO_CLI}/version_auto_bump.php \
+          php ${MOKO_CLI}/version_auto_bump.php \
-            --path . --branch "${GITHUB_REF_NAME}" \
+            --path . --branch "${GITHUB_REF_NAME}" \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
+            --token "${{ secrets.MOKOGITEA_TOKEN }}" \
-            --repo-url "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
+            --repo-url "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"

.mokogitea/workflows/auto-release.yml

@@ -17,7 +17,7 @@
 # |  Reads manifest.xml (joomla|dolibarr|generic) to branch logic.       |
 # |                                                                        |
 # |  Platform-specific:                                                    |
-# |    joomla:   XML manifest, updates.xml, type-prefixed packages         |
+# |    joomla:   XML manifest, type-prefixed packages                      |
 # |    dolibarr: mod*.class.php, update.txt, dev version reset             |
 # |    generic:  README-only, no update stream                             |
 # |                                                                        |
@@ -71,20 +71,25 @@ jobs:
           MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
           MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
         run: |
-          if ! command -v composer &> /dev/null; then
+          if [ -f /opt/moko-platform/cli/version_bump.php ] && [ -f /opt/moko-platform/vendor/autoload.php ]; then
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+            echo Using pre-installed /opt/moko-platform
+            echo MOKO_CLI=/opt/moko-platform/cli >> $GITHUB_ENV
+          else
+            echo Falling back to fresh clone
+            if ! command -v composer > /dev/null 2>&1; then
+              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer > /dev/null 2>&1
+            fi
+            rm -rf /tmp/moko-platform-api
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git
+            git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/moko-platform-api
+            cd /tmp/moko-platform-api
+            composer install --no-dev --no-interaction --quiet
+            echo MOKO_CLI=/tmp/moko-platform-api/cli >> $GITHUB_ENV
           fi
-          # Always fetch latest CLI tools — never use stale cache from previous runs
-          rm -rf /tmp/moko-platform-api
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-            /tmp/moko-platform-api
-          cd /tmp/moko-platform-api
-          composer install --no-dev --no-interaction --quiet
 
       - name: Rename branch to rc
         run: |
-          php /tmp/moko-platform-api/cli/branch_rename.php \
+          php ${MOKO_CLI}/branch_rename.php \
             --from "${{ github.event.pull_request.head.ref || 'dev' }}" --to rc \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" \
             --api-base "${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}" \
@@ -100,7 +105,7 @@ jobs:
 
       - name: Publish RC release
         run: |
-          php /tmp/moko-platform-api/cli/release_publish.php \
+          php ${MOKO_CLI}/release_publish.php \
             --path . --stability rc --bump minor --branch rc \
             --token "${{ secrets.MOKOGITEA_TOKEN }}"
 
@@ -108,7 +113,7 @@ jobs:
         if: always()
         run: |
           echo "## Promoted to Release Candidate" >> $GITHUB_STEP_SUMMARY
-          echo "Branch renamed to rc, minor bump, RC + lesser stream releases built, updates.xml synced" >> $GITHUB_STEP_SUMMARY
+          echo "Branch renamed to rc, minor bump, RC release built" >> $GITHUB_STEP_SUMMARY
 
   # ── Merged PR → Build & Release (or promote RC to stable) ────────────────────
   release:
@@ -131,31 +136,80 @@ jobs:
           git config --local user.name "gitea-actions[bot]"
           git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
 
+      - name: Check for merge conflict markers
+        run: |
+          CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true)
+          if [ -n "$CONFLICTS" ]; then
+            echo "::error::Merge conflict markers found — aborting release"
+            echo "## Release Blocked: Conflict Markers" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            echo "$CONFLICTS" >> $GITHUB_STEP_SUMMARY
+            echo '```' >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+          echo "No conflict markers found"
+
       - name: Setup moko-platform tools
         env:
           MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
           MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
           COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_MIRROR_TOKEN }}"}}'
         run: |
-          # Ensure PHP + Composer are available
+          if [ -f /opt/moko-platform/cli/version_bump.php ] && [ -f /opt/moko-platform/vendor/autoload.php ]; then
-          if ! command -v composer &> /dev/null; then
+            echo Using pre-installed /opt/moko-platform
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+            echo MOKO_CLI=/opt/moko-platform/cli >> $GITHUB_ENV
+          else
+            echo Falling back to fresh clone
+            if ! command -v composer > /dev/null 2>&1; then
+              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer > /dev/null 2>&1
+            fi
+            rm -rf /tmp/moko-platform-api
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git
+            git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/moko-platform-api
+            cd /tmp/moko-platform-api
+            composer install --no-dev --no-interaction --quiet
+            echo MOKO_CLI=/tmp/moko-platform-api/cli >> $GITHUB_ENV
           fi
-          # Always fetch latest CLI tools — never use stale cache from previous runs
-          rm -rf /tmp/moko-platform-api
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-            /tmp/moko-platform-api
-          cd /tmp/moko-platform-api
-          composer install --no-dev --no-interaction --quiet
-
 
       - name: "Publish stable release"
         run: |
-          php /tmp/moko-platform-api/cli/release_publish.php \
+          php ${MOKO_CLI}/release_publish.php \
             --path . --stability stable --bump minor --branch main \
             --token "${{ secrets.MOKOGITEA_TOKEN }}"
 
+      - name: Update release notes from CHANGELOG.md
+        run: |
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+
+          # Extract [Unreleased] section from changelog
+          if [ -f "CHANGELOG.md" ]; then
+            NOTES=$(awk '/^## \[Unreleased\]/{found=1; next} /^## \[/{if(found) exit} found{print}' CHANGELOG.md)
+            [ -z "$NOTES" ] && NOTES="Stable release"
+          else
+            NOTES="Stable release"
+          fi
+
+          # Update release body via API
+          RELEASE_ID=$(curl -sf -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
+            "${API_BASE}/releases/tags/stable" | python3 -c "import json,sys; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
+
+          if [ -n "$RELEASE_ID" ]; then
+            python3 -c "
+          import json, urllib.request
+          body = open('/dev/stdin').read()
+          payload = json.dumps({'body': body}).encode()
+          req = urllib.request.Request(
+              '${API_BASE}/releases/${RELEASE_ID}',
+              data=payload, method='PATCH',
+              headers={
+                  'Authorization': 'token ${{ secrets.MOKOGITEA_TOKEN }}',
+                  'Content-Type': 'application/json'
+              })
+          urllib.request.urlopen(req)
+          " <<< "$NOTES"
+            echo "Release notes updated from CHANGELOG.md"
+          fi
+
       # -- STEP 9: Mirror to GitHub (stable only) --------------------------------
       - name: "Step 9: Mirror release to GitHub"
         if: >-
@@ -167,7 +221,7 @@ jobs:
           RELEASE_TAG="${{ steps.version.outputs.release_tag }}"
           GH_REPO="${{ vars.GH_MIRROR_REPO || github.repository }}"
           API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          php /tmp/moko-platform-api/cli/release_mirror.php \
+          php ${MOKO_CLI}/release_mirror.php \
             --version "$VERSION" --tag "$RELEASE_TAG" \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
             --gh-token "${{ secrets.GH_MIRROR_TOKEN }}" --gh-repo "$GH_REPO" \
@@ -241,7 +295,7 @@ jobs:
         continue-on-error: true
         run: |
           API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          php /tmp/moko-platform-api/cli/version_reset_dev.php \
+          php ${MOKO_CLI}/version_reset_dev.php \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "${API_BASE}" \
             --branch dev --path . 2>&1 || true
 

.mokogitea/workflows/cascade-dev.yml

@@ -1,8 +1,10 @@
-# DISABLED - auto-release handles dev recreation from main
+# DISABLED — auto-release Step 11 recreates dev from main after every release.
-name: Cascade (DISABLED)
+# Cascade-dev is redundant and causes version conflicts when both main and dev
+# have different version numbers in templateDetails.xml / manifest.xml.
+name: "Cascade Main → Dev (DISABLED)"
 on: workflow_dispatch
 jobs:
   noop:
     runs-on: ubuntu-latest
     steps:
-      - run: echo disabled
+      - run: echo "Cascade disabled — auto-release handles dev recreation"

.mokogitea/workflows/ci-generic.yml

@@ -0,0 +1,204 @@
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: MokoStandards.CI
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/Template-Generic
+# PATH: /.gitea/workflows/ci-generic.yml
+# VERSION: 01.00.00
+# BRIEF: CI pipeline — lint, validate, and test for generic projects (PHP + Node.js)
+
+name: "Generic: Project CI"
+
+on:
+  push:
+    branches:
+      - main
+      - dev
+      - dev/**
+      - rc/**
+      - version/**
+  pull_request:
+    branches:
+      - main
+      - dev
+      - dev/**
+      - rc/**
+  workflow_dispatch:
+
+permissions:
+  contents: read
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+jobs:
+  # ── Lint & Validate ───────────────────────────────────────────────────
+  lint:
+    name: Lint & Validate
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Detect toolchain
+        id: detect
+        run: |
+          HAS_PHP=false
+          HAS_NODE=false
+          [ -f "composer.json" ] && HAS_PHP=true
+          [ -f "package.json" ] && HAS_NODE=true
+          echo "has_php=$HAS_PHP" >> "$GITHUB_OUTPUT"
+          echo "has_node=$HAS_NODE" >> "$GITHUB_OUTPUT"
+          echo "Toolchain: PHP=$HAS_PHP Node=$HAS_NODE"
+
+      - name: Setup PHP
+        if: steps.detect.outputs.has_php == 'true'
+        run: |
+          if ! command -v php &> /dev/null; then
+            sudo apt-get update -qq
+            sudo apt-get install -y -qq php-cli php-mbstring php-xml >/dev/null 2>&1
+          fi
+          php -v
+
+      - name: Setup Node.js
+        if: steps.detect.outputs.has_node == 'true'
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install PHP dependencies
+        if: steps.detect.outputs.has_php == 'true'
+        run: |
+          if [ -f "composer.json" ]; then
+            composer install --no-interaction --prefer-dist --quiet 2>/dev/null || true
+          fi
+
+      - name: Install Node.js dependencies
+        if: steps.detect.outputs.has_node == 'true'
+        run: |
+          if [ -f "package.json" ]; then
+            npm ci --quiet 2>/dev/null || npm install --quiet 2>/dev/null || true
+          fi
+
+      - name: PHP syntax check
+        if: steps.detect.outputs.has_php == 'true'
+        run: |
+          ERRORS=0
+          while IFS= read -r -d '' file; do
+            if ! php -l "$file" 2>&1 | grep -q "No syntax errors"; then
+              echo "::error file=${file}::PHP syntax error"
+              ERRORS=$((ERRORS + 1))
+            fi
+          done < <(find . -name "*.php" -not -path "./.git/*" -not -path "./vendor/*" -not -path "./node_modules/*" -print0)
+
+          echo "## PHP Lint" >> $GITHUB_STEP_SUMMARY
+          if [ "$ERRORS" -eq 0 ]; then
+            echo "All PHP files passed syntax check." >> $GITHUB_STEP_SUMMARY
+          else
+            echo "${ERRORS} file(s) with syntax errors." >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+
+      - name: TypeScript/JavaScript lint
+        if: steps.detect.outputs.has_node == 'true'
+        run: |
+          if [ -f "node_modules/.bin/eslint" ]; then
+            npx eslint src/ --quiet 2>&1 || { echo "::error::ESLint errors found"; exit 1; }
+            echo "## ESLint" >> $GITHUB_STEP_SUMMARY
+            echo "All files passed ESLint." >> $GITHUB_STEP_SUMMARY
+          elif [ -f ".eslintrc.json" ] || [ -f ".eslintrc.js" ] || [ -f "eslint.config.js" ]; then
+            echo "::warning::ESLint config found but eslint not installed"
+          else
+            echo "No ESLint configured — skipping"
+          fi
+
+      - name: TypeScript compile check
+        if: steps.detect.outputs.has_node == 'true'
+        run: |
+          if [ -f "tsconfig.json" ] && [ -f "node_modules/.bin/tsc" ]; then
+            npx tsc --noEmit 2>&1 || { echo "::error::TypeScript compilation errors"; exit 1; }
+            echo "## TypeScript" >> $GITHUB_STEP_SUMMARY
+            echo "TypeScript compilation passed." >> $GITHUB_STEP_SUMMARY
+          fi
+
+      - name: PHPStan static analysis
+        if: steps.detect.outputs.has_php == 'true'
+        run: |
+          if [ -f "phpstan.neon" ] && [ -f "vendor/bin/phpstan" ]; then
+            vendor/bin/phpstan analyse --no-progress 2>&1 || { echo "::warning::PHPStan found issues"; }
+          fi
+
+  # ── Tests ─────────────────────────────────────────────────────────────
+  test:
+    name: Tests
+    runs-on: ubuntu-latest
+    needs: lint
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Detect toolchain
+        id: detect
+        run: |
+          HAS_PHP=false
+          HAS_NODE=false
+          [ -f "composer.json" ] && HAS_PHP=true
+          [ -f "package.json" ] && HAS_NODE=true
+          echo "has_php=$HAS_PHP" >> "$GITHUB_OUTPUT"
+          echo "has_node=$HAS_NODE" >> "$GITHUB_OUTPUT"
+
+      - name: Setup PHP
+        if: steps.detect.outputs.has_php == 'true'
+        run: |
+          if ! command -v php &> /dev/null; then
+            sudo apt-get update -qq
+            sudo apt-get install -y -qq php-cli php-mbstring php-xml >/dev/null 2>&1
+          fi
+
+      - name: Setup Node.js
+        if: steps.detect.outputs.has_node == 'true'
+        uses: actions/setup-node@v4
+        with:
+          node-version: '20'
+
+      - name: Install dependencies
+        run: |
+          [ -f "composer.json" ] && composer install --no-interaction --prefer-dist --quiet 2>/dev/null || true
+          [ -f "package.json" ] && { npm ci --quiet 2>/dev/null || npm install --quiet 2>/dev/null || true; }
+
+      - name: Run PHP tests
+        if: steps.detect.outputs.has_php == 'true'
+        run: |
+          if [ -f "vendor/bin/phpunit" ]; then
+            vendor/bin/phpunit --testdox 2>&1
+            echo "## PHPUnit" >> $GITHUB_STEP_SUMMARY
+            echo "Tests passed." >> $GITHUB_STEP_SUMMARY
+          elif [ -f "phpunit.xml" ] || [ -f "phpunit.xml.dist" ]; then
+            echo "::warning::PHPUnit config found but phpunit not installed"
+          else
+            echo "No PHPUnit configured — skipping"
+          fi
+
+      - name: Run Node.js tests
+        if: steps.detect.outputs.has_node == 'true'
+        run: |
+          if jq -e '.scripts.test' package.json > /dev/null 2>&1; then
+            npm test 2>&1
+            echo "## Node.js Tests" >> $GITHUB_STEP_SUMMARY
+            echo "Tests passed." >> $GITHUB_STEP_SUMMARY
+          else
+            echo "No test script in package.json — skipping"
+          fi
+
+      - name: Build check
+        run: |
+          if [ -f "Makefile" ]; then
+            make build 2>&1 || echo "::warning::Build failed or not configured"
+          elif [ -f "package.json" ] && jq -e '.scripts.build' package.json > /dev/null 2>&1; then
+            npm run build 2>&1 || echo "::warning::Build failed"
+          fi

.mokogitea/workflows/ci-joomla.yml

@@ -10,7 +10,7 @@
 # REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/MokoStandards-API
 # PATH: /templates/workflows/joomla/ci-joomla.yml.template
 # VERSION: 04.06.00
-# BRIEF: CI workflow for Joomla extensions -- lint, validate, test
+# BRIEF: CI workflow for Joomla extensions — lint, validate, test
 
 name: "Joomla: Extension CI"
 
@@ -35,25 +35,32 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@v4
 
       - name: Setup PHP
         run: |
+          if ! command -v php &> /dev/null; then
+            sudo apt-get update -qq
+            sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+          fi
           php -v && composer --version
 
-      - name: Clone MokoStandards
+      - name: Setup moko-platform tools
         env:
-          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN || secrets.MOKOGITEA_TOKEN || github.token }}
+          MOKO_CLONE_TOKEN: ${{ secrets.GA_TOKEN || github.token }}
-          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN || secrets.MOKOGITEA_TOKEN || github.token }}
+          MOKO_CLONE_HOST: ${{ secrets.GA_TOKEN && 'git.mokoconsulting.tech/MokoConsulting' || 'github.com/mokoconsulting-tech' }}
-          MOKO_CLONE_HOST: ${{ secrets.MOKOGITEA_TOKEN && 'git.mokoconsulting.tech/MokoConsulting' || 'github.com/mokoconsulting-tech' }}
         run: |
-          git clone --depth 1 --branch main --quiet \
+          if [ -d "/tmp/moko-platform" ] || [ -d "/opt/moko-platform" ]; then
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoStandards-API.git" \
+            echo "moko-platform already available on runner — skipping clone"
-            /tmp/mokostandards-api
+          else
+            git clone --depth 1 --branch main --quiet \
+              "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
+              /tmp/moko-platform 2>/dev/null || echo "moko-platform clone skipped — continuing without it"
+          fi
 
       - name: Install dependencies
         env:
-          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.MOKOGITEA_TOKEN || github.token }}"}}'
+          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_TOKEN || secrets.GA_TOKEN || github.token }}"}}'
         run: |
           if [ -f "composer.json" ]; then
             composer install \
@@ -61,7 +68,7 @@ jobs:
               --prefer-dist \
               --optimize-autoloader
           else
-            echo "No composer.json found -- skipping dependency install"
+            echo "No composer.json found — skipping dependency install"
           fi
 
       - name: PHP syntax check
@@ -124,8 +131,8 @@ jobs:
               echo "Manifest is well-formed XML." >> $GITHUB_STEP_SUMMARY
             fi
 
-            # Check required tags: name, version, author, namespace (Joomla 5+)
+            # Check required tags: name, version, author
-            for TAG in name version author namespace; do
+            for TAG in name version author; do
               if ! grep -q "<${TAG}>" "$MANIFEST" 2>/dev/null; then
                 echo "Missing required tag: \`<${TAG}>\`" >> $GITHUB_STEP_SUMMARY
                 ERRORS=$((ERRORS + 1))
@@ -133,6 +140,19 @@ jobs:
                 echo "Found required tag: \`<${TAG}>\`" >> $GITHUB_STEP_SUMMARY
               fi
             done
+
+            # Namespace is required for components/plugins but not packages
+            EXT_TYPE=$(grep -oP '<extension[^>]*\btype="\K[^"]+' "$MANIFEST" | head -1)
+            if [ "$EXT_TYPE" != "package" ]; then
+              if ! grep -q "<namespace" "$MANIFEST" 2>/dev/null; then
+                echo "Missing required tag: \`<namespace>\` (required for Joomla 5+ ${EXT_TYPE} extensions)" >> $GITHUB_STEP_SUMMARY
+                ERRORS=$((ERRORS + 1))
+              else
+                echo "Found required tag: \`<namespace>\`" >> $GITHUB_STEP_SUMMARY
+              fi
+            else
+              echo "Package extension — \`<namespace>\` not required." >> $GITHUB_STEP_SUMMARY
+            fi
           fi
 
           if [ "${ERRORS}" -gt 0 ]; then
@@ -161,7 +181,7 @@ jobs:
             # Extract language file references from manifest
             LANG_FILES=$(grep -oP 'language\s+tag="[^"]*"[^>]*>\K[^<]+' "$MANIFEST" 2>/dev/null || true)
             if [ -z "$LANG_FILES" ]; then
-              echo "No language file references found in manifest -- skipping." >> $GITHUB_STEP_SUMMARY
+              echo "No language file references found in manifest — skipping." >> $GITHUB_STEP_SUMMARY
             else
               while IFS= read -r LANG_FILE; do
                 LANG_FILE=$(echo "$LANG_FILE" | xargs)
@@ -185,7 +205,7 @@ jobs:
               done <<< "$LANG_FILES"
             fi
           else
-            echo "No manifest found -- skipping language check." >> $GITHUB_STEP_SUMMARY
+            echo "No manifest found — skipping language check." >> $GITHUB_STEP_SUMMARY
           fi
 
           if [ "${ERRORS}" -gt 0 ]; then
@@ -216,7 +236,7 @@ jobs:
           done
 
           if [ "${CHECKED}" -eq 0 ]; then
-            echo "No src/ or htdocs/ directories found -- skipping." >> $GITHUB_STEP_SUMMARY
+            echo "No src/ or htdocs/ directories found — skipping." >> $GITHUB_STEP_SUMMARY
           elif [ "${MISSING}" -gt 0 ]; then
             echo "" >> $GITHUB_STEP_SUMMARY
             echo "**${MISSING} director(ies) missing index.html out of ${CHECKED} checked.**" >> $GITHUB_STEP_SUMMARY
@@ -232,7 +252,7 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@v4
 
       - name: Validate release readiness
         run: |
@@ -338,15 +358,19 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@v4
 
       - name: Setup PHP ${{ matrix.php }}
         run: |
+          if ! command -v php &> /dev/null; then
+            sudo apt-get update -qq
+            sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+          fi
           php -v && composer --version
 
       - name: Install dependencies
         env:
-          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.MOKOGITEA_TOKEN || github.token }}"}}'
+          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_TOKEN || secrets.GA_TOKEN || github.token }}"}}'
         run: |
           if [ -f "composer.json" ]; then
             composer install \
@@ -354,7 +378,7 @@ jobs:
               --prefer-dist \
               --optimize-autoloader
           else
-            echo "No composer.json found -- skipping dependency install"
+            echo "No composer.json found — skipping dependency install"
           fi
 
       - name: Run tests
@@ -366,14 +390,14 @@ jobs:
             if [ $EXIT -eq 0 ]; then
               echo "All tests passed." >> $GITHUB_STEP_SUMMARY
             else
-              echo "Test failures detected -- see log." >> $GITHUB_STEP_SUMMARY
+              echo "Test failures detected — see log." >> $GITHUB_STEP_SUMMARY
               echo '```' >> $GITHUB_STEP_SUMMARY
               cat /tmp/test-output.log >> $GITHUB_STEP_SUMMARY
               echo '```' >> $GITHUB_STEP_SUMMARY
             fi
             exit $EXIT
           else
-            echo "No phpunit.xml found -- skipping tests." >> $GITHUB_STEP_SUMMARY
+            echo "No phpunit.xml found — skipping tests." >> $GITHUB_STEP_SUMMARY
           fi
 
   static-analysis:
@@ -384,14 +408,19 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@v4
 
       - name: Setup PHP
-        run: php -v && composer --version
+        run: |
+          if ! command -v php &> /dev/null; then
+            sudo apt-get update -qq
+            sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+          fi
+          php -v && composer --version
 
       - name: Install dependencies
         env:
-          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.MOKOGITEA_TOKEN || github.token }}"}}'
+          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GH_TOKEN || secrets.GA_TOKEN || github.token }}"}}'
         run: |
           if [ -f "composer.json" ]; then
             composer install --no-interaction --prefer-dist --optimize-autoloader
@@ -422,7 +451,7 @@ jobs:
           done
 
           if [ -z "$SRC_DIR" ]; then
-            echo "No source directory found (src/, htdocs/, lib/) -- skipping." >> $GITHUB_STEP_SUMMARY
+            echo "No source directory found (src/, htdocs/, lib/) — skipping." >> $GITHUB_STEP_SUMMARY
             exit 0
           fi
 
@@ -432,7 +461,7 @@ jobs:
             echo "Using project PHPStan config." >> $GITHUB_STEP_SUMMARY
           else
             ARGS="$ARGS --level=3"
-            echo "No phpstan.neon found -- using level 3 (type inference)." >> $GITHUB_STEP_SUMMARY
+            echo "No phpstan.neon found — using level 3 (type inference)." >> $GITHUB_STEP_SUMMARY
           fi
 
           $PHPSTAN $ARGS 2>&1 | tee /tmp/phpstan-output.txt
@@ -458,10 +487,14 @@ jobs:
     steps:
       - name: Trigger pre-release build
         env:
-          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          GA_TOKEN: ${{ secrets.GA_TOKEN }}
           REPO: ${{ github.repository }}
           BRANCH: ${{ github.head_ref }}
         run: |
-          curl -s -X POST             "${GITEA_URL:-https://git.mokoconsulting.tech}/api/v1/repos/${REPO}/actions/workflows/pre-release.yml/dispatches"             -H "Authorization: token ${GITEA_TOKEN}"             -H "Content-Type: application/json"             -d "{\"ref\":\"${BRANCH}\",\"inputs\":{\"stability\":\"release-candidate\"}}"
+          curl -s -X POST \
+            "${GITEA_URL:-https://git.mokoconsulting.tech}/api/v1/repos/${REPO}/actions/workflows/pre-release.yml/dispatches" \
+            -H "Authorization: token ${GA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "{\"ref\":\"${BRANCH}\",\"inputs\":{\"stability\":\"release-candidate\"}}"
           echo "### Pre-Release" >> $GITHUB_STEP_SUMMARY
           echo "Triggered RC build on branch \`${BRANCH}\`" >> $GITHUB_STEP_SUMMARY

.mokogitea/workflows/cleanup.yml

@@ -4,8 +4,8 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Maintenance
+# INGROUP: MokoStandards.Maintenance
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
 # PATH: /.gitea/workflows/cleanup.yml
 # VERSION: 01.00.00
 # BRIEF: Scheduled cleanup — delete merged branches and old workflow runs
@@ -33,17 +33,17 @@ jobs:
         uses: actions/checkout@v4
         with:
           fetch-depth: 0
-          token: ${{ secrets.MOKOGITEA_TOKEN }}
+          token: ${{ secrets.GA_TOKEN }}
 
       - name: Delete merged branches
         env:
-          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          GA_TOKEN: ${{ secrets.GA_TOKEN }}
         run: |
           echo "=== Merged Branch Cleanup ==="
           API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"
 
           # List branches via API
-          BRANCHES=$(curl -sS -H "Authorization: token ${GITEA_TOKEN}" \
+          BRANCHES=$(curl -sS -H "Authorization: token ${GA_TOKEN}" \
             "${API}/branches?limit=50" | jq -r '.[].name')
 
           DELETED=0
@@ -56,7 +56,7 @@ jobs:
             # Check if branch is merged into main
             if git merge-base --is-ancestor "origin/${BRANCH}" origin/main 2>/dev/null; then
               echo "  Deleting merged branch: ${BRANCH}"
-              curl -sS -X DELETE -H "Authorization: token ${GITEA_TOKEN}" \
+              curl -sS -X DELETE -H "Authorization: token ${GA_TOKEN}" \
                 "${API}/branches/${BRANCH}" 2>/dev/null || true
               DELETED=$((DELETED + 1))
             fi
@@ -66,20 +66,20 @@ jobs:
 
       - name: Clean old workflow runs
         env:
-          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          GA_TOKEN: ${{ secrets.GA_TOKEN }}
         run: |
           echo "=== Workflow Run Cleanup ==="
           API="${GITEA_URL}/api/v1/repos/${{ github.repository }}"
           CUTOFF=$(date -d "30 days ago" +%Y-%m-%dT%H:%M:%SZ 2>/dev/null || date -v-30d +%Y-%m-%dT%H:%M:%SZ)
 
           # Get old completed runs
-          RUNS=$(curl -sS -H "Authorization: token ${GITEA_TOKEN}" \
+          RUNS=$(curl -sS -H "Authorization: token ${GA_TOKEN}" \
             "${API}/actions/runs?status=completed&limit=50" | \
             jq -r ".workflow_runs[] | select(.created_at < \"${CUTOFF}\") | .id" 2>/dev/null)
 
           DELETED=0
           for RUN_ID in $RUNS; do
-            curl -sS -X DELETE -H "Authorization: token ${GITEA_TOKEN}" \
+            curl -sS -X DELETE -H "Authorization: token ${GA_TOKEN}" \
               "${API}/actions/runs/${RUN_ID}" 2>/dev/null || true
             DELETED=$((DELETED + 1))
           done

.mokogitea/workflows/deploy-manual.yml

@@ -0,0 +1,126 @@
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Gitea.Workflow
+# INGROUP: MokoStandards.Deploy
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API
+# PATH: /templates/workflows/joomla/deploy-manual.yml.template
+# VERSION: 04.07.00
+# BRIEF: Manual SFTP deploy to dev server for Joomla repos
+
+name: "Universal: Deploy to Dev (Manual)"
+
+on:
+  workflow_dispatch:
+    inputs:
+      clear_remote:
+        description: 'Delete all remote files before uploading'
+        required: false
+        default: 'false'
+        type: boolean
+
+env:
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+
+permissions:
+  contents: read
+
+jobs:
+  deploy:
+    name: SFTP Deploy to Dev
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+
+      - name: Setup PHP
+        run: |
+          php -v && composer --version
+
+      - name: Setup MokoStandards tools
+        env:
+          GA_TOKEN: ${{ secrets.GA_TOKEN || secrets.GA_TOKEN || github.token }}
+          MOKO_CLONE_TOKEN: ${{ secrets.GA_TOKEN || secrets.GA_TOKEN || github.token }}
+          MOKO_CLONE_HOST: ${{ secrets.GA_TOKEN && 'git.mokoconsulting.tech/MokoConsulting' || 'github.com/mokoconsulting-tech' }}
+          COMPOSER_AUTH: '{"github-oauth":{"github.com":"${{ secrets.GA_TOKEN || github.token }}"}}'
+        run: |
+          git clone --depth 1 --branch main --quiet \
+            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/MokoStandards-API.git" \
+            /tmp/mokostandards-api 2>/dev/null || true
+          if [ -d "/tmp/mokostandards-api" ] && [ -f "/tmp/mokostandards-api/composer.json" ]; then
+            cd /tmp/mokostandards-api && composer install --no-dev --no-interaction --quiet 2>/dev/null || true
+          fi
+
+      - name: Check FTP configuration
+        id: check
+        env:
+          HOST: ${{ vars.DEV_FTP_HOST }}
+          PATH_VAR: ${{ vars.DEV_FTP_PATH }}
+          PORT: ${{ vars.DEV_FTP_PORT }}
+        run: |
+          if [ -z "$HOST" ] || [ -z "$PATH_VAR" ]; then
+            echo "DEV_FTP_HOST or DEV_FTP_PATH not configured -- cannot deploy"
+            echo "skip=true" >> "$GITHUB_OUTPUT"
+            exit 0
+          fi
+          echo "skip=false" >> "$GITHUB_OUTPUT"
+          echo "host=$HOST" >> "$GITHUB_OUTPUT"
+
+          REMOTE="${PATH_VAR%/}"
+          echo "remote=$REMOTE" >> "$GITHUB_OUTPUT"
+
+          [ -z "$PORT" ] && PORT="22"
+          echo "port=$PORT" >> "$GITHUB_OUTPUT"
+
+      - name: Deploy via SFTP
+        if: steps.check.outputs.skip != 'true'
+        env:
+          SFTP_KEY: ${{ secrets.DEV_FTP_KEY }}
+          SFTP_PASS: ${{ secrets.DEV_FTP_PASSWORD }}
+          SFTP_USER: ${{ vars.DEV_FTP_USERNAME }}
+        run: |
+          SOURCE_DIR="src"
+          [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
+          [ ! -d "$SOURCE_DIR" ] && { echo "No src/ or htdocs/ -- nothing to deploy"; exit 0; }
+
+          printf '{"host":"%s","port":%s,"username":"%s","remotePath":"%s"' \
+            "${{ steps.check.outputs.host }}" "${{ steps.check.outputs.port }}" "$SFTP_USER" "${{ steps.check.outputs.remote }}" \
+            > /tmp/sftp-config.json
+
+          if [ -n "$SFTP_KEY" ]; then
+            echo "$SFTP_KEY" > /tmp/deploy_key
+            chmod 600 /tmp/deploy_key
+            printf ',"privateKeyPath":"/tmp/deploy_key"}' >> /tmp/sftp-config.json
+          else
+            printf ',"password":"%s"}' "$SFTP_PASS" >> /tmp/sftp-config.json
+          fi
+
+          DEPLOY_ARGS=(--path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json)
+          [ "${{ inputs.clear_remote }}" = "true" ] && DEPLOY_ARGS+=(--clear-remote)
+
+          PLATFORM=$(php /tmp/mokostandards-api/cli/platform_detect.php --path . 2>/dev/null || true)
+          if [ "$PLATFORM" = "waas-component" ] && [ -f "/tmp/mokostandards-api/deploy/deploy-joomla.php" ]; then
+            php /tmp/mokostandards-api/deploy/deploy-joomla.php "${DEPLOY_ARGS[@]}"
+          else
+            php /tmp/mokostandards-api/deploy/deploy-sftp.php "${DEPLOY_ARGS[@]}"
+          fi
+
+          rm -f /tmp/deploy_key /tmp/sftp-config.json
+
+      - name: Summary
+        if: always()
+        run: |
+          if [ "${{ steps.check.outputs.skip }}" = "true" ]; then
+            echo "### Deploy Skipped -- FTP not configured" >> $GITHUB_STEP_SUMMARY
+          else
+            echo "### Manual Dev Deploy Complete" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
+            echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
+            echo "| Host | \`${{ steps.check.outputs.host }}\` |" >> $GITHUB_STEP_SUMMARY
+            echo "| Remote | \`${{ steps.check.outputs.remote }}\` |" >> $GITHUB_STEP_SUMMARY
+            echo "| Clear | ${{ inputs.clear_remote }} |" >> $GITHUB_STEP_SUMMARY
+          fi

.mokogitea/workflows/gitleaks.yml

@@ -4,8 +4,8 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Security
+# INGROUP: MokoStandards.Security
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/MokoStandards-API
 # PATH: /templates/workflows/gitleaks.yml.template
 # VERSION: 01.00.00
 # BRIEF: Secret scanning — detect leaked credentials, API keys, and tokens

.mokogitea/workflows/issue-branch.yml

@@ -5,17 +5,7 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: moko-platform.Automation
-<<<<<<< HEAD
+# VERSION: 02.21.05
-<<<<<<< HEAD
-# VERSION: 02.15.02
-=======
-# VERSION: 02.15.02
-=======
-# VERSION: 02.15.02
-=======
-# VERSION: 02.15.02
->>>>>>> origin/main
->>>>>>> origin/main
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"

.mokogitea/workflows/notify.yml

@@ -4,8 +4,8 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Notifications
+# INGROUP: MokoStandards.Notifications
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
 # PATH: /.gitea/workflows/notify.yml
 # VERSION: 01.00.00
 # BRIEF: Push notifications via ntfy on release success or workflow failure

.mokogitea/workflows/pr-check.yml

@@ -1,236 +1,508 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
+#
-# SPDX-License-Identifier: GPL-3.0-or-later
+# SPDX-License-Identifier: GPL-3.0-or-later
-#
+#
-# FILE INFORMATION
+# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
+# DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.CI
+# INGROUP: moko-platform.CI
-# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
+# REPO: https://git.mokoconsulting.tech/mokoconsulting-tech/moko-platform
-# PATH: /templates/workflows/universal/pr-check.yml.template
+# PATH: /templates/workflows/universal/pr-check.yml.template
-# VERSION: 05.00.00
+# VERSION: 09.23.00
-# BRIEF: PR gate — branch policy + code validation before merge
+# BRIEF: PR gate — branch policy + code validation before merge
-
+
-name: "Universal: PR Check"
+name: "Universal: PR Check"
-
+
-on:
+on:
-  pull_request:
+  pull_request:
-    types: [opened, synchronize, reopened, edited]
+    types: [opened, synchronize, reopened, edited]
-
+
-permissions:
+permissions:
-  contents: read
+  contents: read
-  pull-requests: write
+  pull-requests: write
-
+
-env:
+env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
+  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-
+
-jobs:
+jobs:
-  # ── Branch Policy ──────────────────────────────────────────────────────
+  # ── Branch Policy ──────────────────────────────────────────────────────
-  branch-policy:
+  branch-policy:
-    name: Branch Policy
+    name: Branch Policy
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-    steps:
+    steps:
-      - name: Check branch merge target
+      - name: Check branch merge target
-        run: |
+        run: |
-          HEAD="${{ github.head_ref }}"
+          HEAD="${{ github.head_ref }}"
-          BASE="${{ github.base_ref }}"
+          BASE="${{ github.base_ref }}"
-
+
-          echo "PR: ${HEAD} → ${BASE}"
+          echo "PR: ${HEAD} → ${BASE}"
-
+
-          ALLOWED=true
+          ALLOWED=true
-          REASON=""
+          REASON=""
-
+
-          case "$HEAD" in
+          case "$HEAD" in
-            feature/*|feat/*)
+            feature/*|feat/*)
-              if [ "$BASE" != "dev" ]; then
+              if [ "$BASE" != "dev" ]; then
-                ALLOWED=false
+                ALLOWED=false
-                REASON="Feature branches must target 'dev', not '${BASE}'"
+                REASON="Feature branches must target 'dev', not '${BASE}'"
-              fi
+              fi
-              ;;
+              ;;
-            fix/*|bugfix/*)
+            fix/*|bugfix/*)
-              if [ "$BASE" != "dev" ]; then
+              if [ "$BASE" != "dev" ]; then
-                ALLOWED=false
+                ALLOWED=false
-                REASON="Fix branches must target 'dev', not '${BASE}'"
+                REASON="Fix branches must target 'dev', not '${BASE}'"
-              fi
+              fi
-              ;;
+              ;;
-            patch/*)
+            patch/*)
-              if [ "$BASE" != "dev" ] && [ "$BASE" != "rc" ]; then
+              if [ "$BASE" != "dev" ] && [ "$BASE" != "rc" ]; then
-                ALLOWED=false
+                ALLOWED=false
-                REASON="Patch branches must target 'dev' or 'rc', not '${BASE}'"
+                REASON="Patch branches must target 'dev' or 'rc', not '${BASE}'"
-              fi
+              fi
-              ;;
+              ;;
-            hotfix/*)
+            hotfix/*)
-              if [ "$BASE" != "dev" ] && [ "$BASE" != "main" ]; then
+              if [ "$BASE" != "dev" ] && [ "$BASE" != "main" ]; then
-                ALLOWED=false
+                ALLOWED=false
-                REASON="Hotfix branches can only target 'dev' or 'main', not '${BASE}'"
+                REASON="Hotfix branches can only target 'dev' or 'main', not '${BASE}'"
-              fi
+              fi
-              ;;
+              ;;
-            rc)
+            rc)
-              if [ "$BASE" != "main" ]; then
+              if [ "$BASE" != "main" ]; then
-                ALLOWED=false
+                ALLOWED=false
-                REASON="RC branch can only merge into 'main', not '${BASE}'"
+                REASON="RC branch can only merge into 'main', not '${BASE}'"
-              fi
+              fi
-              ;;
+              ;;
-            dev)
+            dev)
-              if [ "$BASE" != "main" ]; then
+              if [ "$BASE" != "main" ]; then
-                ALLOWED=false
+                ALLOWED=false
-                REASON="Dev branch can only merge into 'main', not '${BASE}'"
+                REASON="Dev branch can only merge into 'main', not '${BASE}'"
-              fi
+              fi
-              ;;
+              ;;
-          esac
+          esac
-
+
-          if [ "$ALLOWED" = false ]; then
+          if [ "$ALLOWED" = false ]; then
-            echo "::error::${REASON}"
+            echo "::error::${REASON}"
-            echo "## Branch Policy Violation" >> $GITHUB_STEP_SUMMARY
+            echo "## Branch Policy Violation" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "${REASON}" >> $GITHUB_STEP_SUMMARY
+            echo "${REASON}" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
-            echo "### Allowed merge paths:" >> $GITHUB_STEP_SUMMARY
+            echo "### Allowed merge paths:" >> $GITHUB_STEP_SUMMARY
-            echo "- \`feature/*\` → \`dev\`" >> $GITHUB_STEP_SUMMARY
+            echo "- \`feature/*\` → \`dev\`" >> $GITHUB_STEP_SUMMARY
-            echo "- \`fix/*\` → \`dev\`" >> $GITHUB_STEP_SUMMARY
+            echo "- \`fix/*\` → \`dev\`" >> $GITHUB_STEP_SUMMARY
-            echo "- \`hotfix/*\` → \`dev\` or \`main\`" >> $GITHUB_STEP_SUMMARY
+            echo "- \`hotfix/*\` → \`dev\` or \`main\`" >> $GITHUB_STEP_SUMMARY
-            echo "- \`dev\` → \`main\`" >> $GITHUB_STEP_SUMMARY
+            echo "- \`dev\` → \`main\`" >> $GITHUB_STEP_SUMMARY
-            echo "- \`rc/*\` → \`main\`" >> $GITHUB_STEP_SUMMARY
+            echo "- \`rc/*\` → \`main\`" >> $GITHUB_STEP_SUMMARY
-            exit 1
+            exit 1
-          fi
+          fi
-
+
-          echo "Branch policy: OK (${HEAD} → ${BASE})"
+          echo "Branch policy: OK (${HEAD} → ${BASE})"
-          echo "## Branch Policy: Passed" >> $GITHUB_STEP_SUMMARY
+          echo "## Branch Policy: Passed" >> $GITHUB_STEP_SUMMARY
-
+
-  # ── Code Validation ────────────────────────────────────────────────────
+  # ── Code Validation ────────────────────────────────────────────────────
-  validate:
+  validate:
-    name: Validate PR
+    name: Validate PR
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-latest
-
+
-    steps:
+    steps:
-      - name: Checkout
+      - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v4
-
+
-      - name: Detect platform
+      - name: Check for merge conflict markers
-        id: platform
+        run: |
-        run: |
+          CONFLICTS=$(grep -rn '<<<<<<< \|>>>>>>> \|^=======$' --include='*.php' --include='*.xml' --include='*.css' --include='*.js' --include='*.json' --include='*.md' --include='*.yml' --include='*.yaml' --include='*.ini' --include='*.txt' . 2>/dev/null | grep -v '.git/' || true)
-          # Read platform from XML manifest (<platform> tag) or plain text fallback
+          if [ -n "$CONFLICTS" ]; then
-          PLATFORM=$(sed -n 's/.*<platform>\([^<]*\)<\/platform>.*/\1/p' .mokogitea/manifest.xml 2>/dev/null | head -1)
+            echo "::error::Merge conflict markers found in source files"
-          [ -z "$PLATFORM" ] && PLATFORM=$(cat .mokogitea/manifest.xml 2>/dev/null | tr -d '[:space:]')
+            echo "## Conflict Markers Found" >> $GITHUB_STEP_SUMMARY
-          [ -z "$PLATFORM" ] && PLATFORM="generic"
+            echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "platform=$PLATFORM" >> "$GITHUB_OUTPUT"
+            echo "$CONFLICTS" >> $GITHUB_STEP_SUMMARY
-
+            echo '```' >> $GITHUB_STEP_SUMMARY
-      - name: Setup PHP
+            exit 1
-        if: steps.platform.outputs.platform == 'joomla' || steps.platform.outputs.platform == 'dolibarr'
+          fi
-        run: |
+          echo "No conflict markers found"
-          if ! command -v php &> /dev/null; then
+
-            sudo apt-get update -qq
+      - name: Detect platform
-            sudo apt-get install -y -qq php-cli php-mbstring php-xml >/dev/null 2>&1
+        id: platform
-          fi
+        run: |
-
+          # Read platform from XML manifest (<platform> tag) or plain text fallback
-      - name: PHP syntax check
+          PLATFORM=$(sed -n 's/.*<platform>\([^<]*\)<\/platform>.*/\1/p' .mokogitea/manifest.xml 2>/dev/null | head -1)
-        if: steps.platform.outputs.platform == 'joomla' || steps.platform.outputs.platform == 'dolibarr'
+          [ -z "$PLATFORM" ] && PLATFORM=$(cat .mokogitea/manifest.xml 2>/dev/null | tr -d '[:space:]')
-        run: |
+          [ -z "$PLATFORM" ] && PLATFORM="generic"
-          ERRORS=0
+          echo "platform=$PLATFORM" >> "$GITHUB_OUTPUT"
-          while IFS= read -r -d '' file; do
+
-            if ! php -l "$file" 2>&1 | grep -q "No syntax errors"; then
+      - name: Setup PHP
-              ERRORS=$((ERRORS + 1))
+        if: steps.platform.outputs.platform == 'joomla' || steps.platform.outputs.platform == 'dolibarr'
-            fi
+        run: |
-          done < <(find . -name "*.php" -not -path "./.git/*" -not -path "./vendor/*" -print0)
+          if ! command -v php &> /dev/null; then
-          echo "PHP lint: ${ERRORS} error(s)"
+            sudo apt-get update -qq
-          [ "$ERRORS" -eq 0 ] || { echo "::error::PHP syntax errors found"; exit 1; }
+            sudo apt-get install -y -qq php-cli php-mbstring php-xml >/dev/null 2>&1
-
+          fi
-      - name: Validate platform manifest
+
-        run: |
+      - name: PHP syntax check
-          PLATFORM="${{ steps.platform.outputs.platform }}"
+        if: steps.platform.outputs.platform == 'joomla' || steps.platform.outputs.platform == 'dolibarr'
-          case "$PLATFORM" in
+        run: |
-            joomla)
+          ERRORS=0
-              MANIFEST=$(find . -maxdepth 3 -name "*.xml" ! -path "./.git/*" -exec grep -l '<extension' {} \; 2>/dev/null | head -1)
+          while IFS= read -r -d '' file; do
-              if [ -z "$MANIFEST" ]; then
+            if ! php -l "$file" 2>&1 | grep -q "No syntax errors"; then
-                echo "::warning::No Joomla manifest found (WaaS site)"
+              ERRORS=$((ERRORS + 1))
-                exit 0
+            fi
-              fi
+          done < <(find . -name "*.php" -not -path "./.git/*" -not -path "./vendor/*" -print0)
-              echo "Manifest: ${MANIFEST}"
+          echo "PHP lint: ${ERRORS} error(s)"
-              if command -v php &> /dev/null; then
+          [ "$ERRORS" -eq 0 ] || { echo "::error::PHP syntax errors found"; exit 1; }
-                php -r "libxml_use_internal_errors(true); \$x = simplexml_load_file('$MANIFEST'); if(!\$x){foreach(libxml_get_errors() as \$e) echo \$e->message; exit(1);}" || { echo "::error::Manifest XML is malformed"; exit 1; }
+
-              fi
+      - name: Joomla JEXEC guard check
-              for ELEMENT in name version description; do
+        if: steps.platform.outputs.platform == 'joomla'
-                grep -q "<${ELEMENT}>" "$MANIFEST" || { echo "::error::Missing <${ELEMENT}> in manifest"; exit 1; }
+        run: |
-              done
+          ERRORS=0
-              echo "Joomla manifest valid"
+          while IFS= read -r -d '' file; do
-              ;;
+            # Skip vendor, node_modules, and index.html stub files
-            dolibarr)
+            case "$file" in ./vendor/*|./node_modules/*) continue ;; esac
-              MOD_FILE=$(find . -maxdepth 4 -name "mod*.class.php" ! -path "./.git/*" -exec grep -l 'extends DolibarrModules' {} \; 2>/dev/null | head -1)
+            # Check first 10 lines for JEXEC or JPATH guard
-              if [ -z "$MOD_FILE" ]; then
+            if ! head -20 "$file" | grep -qE "defined\s*\(\s*['\"](_JEXEC|JPATH_BASE|\\\\JPATH_PLATFORM)['\"]"; then
-                echo "::error::No mod*.class.php found"
+              echo "::error file=${file}::Missing JEXEC guard: ${file}"
-                exit 1
+              ERRORS=$((ERRORS + 1))
-              fi
+            fi
-              echo "Dolibarr module: ${MOD_FILE}"
+          done < <(find . -name "*.php" -path "*/src/*" -not -path "./.git/*" -not -path "./vendor/*" -print0)
-              ;;
+          if [ "$ERRORS" -gt 0 ]; then
-            *)
+            echo "::error::${ERRORS} PHP file(s) missing defined('_JEXEC') or die guard"
-              echo "Generic platform — no manifest validation"
+            echo "## JEXEC Guard Check: Failed" >> $GITHUB_STEP_SUMMARY
-              ;;
+            echo "${ERRORS} file(s) in src/ are missing the Joomla execution guard." >> $GITHUB_STEP_SUMMARY
-          esac
+            exit 1
-
+          fi
-      - name: Check update stream format
+          echo "JEXEC guard: OK"
-        run: |
+
-          PLATFORM="${{ steps.platform.outputs.platform }}"
+      - name: Joomla directory listing protection
-          case "$PLATFORM" in
+        if: steps.platform.outputs.platform == 'joomla'
-            joomla)
+        run: |
-              if [ -f "updates.xml" ]; then
+          MISSING=0
-                if command -v php &> /dev/null; then
+          SOURCE_DIR="src"
-                  php -r "libxml_use_internal_errors(true); \$x = simplexml_load_file('updates.xml'); if(!\$x){foreach(libxml_get_errors() as \$e) echo \$e->message; exit(1);}" || { echo "::error::updates.xml is malformed"; exit 1; }
+          [ ! -d "$SOURCE_DIR" ] && exit 0
-                fi
+          while IFS= read -r dir; do
-                echo "updates.xml valid"
+            if [ ! -f "${dir}/index.html" ]; then
-              fi
+              echo "::warning::Missing index.html in ${dir} (directory listing protection)"
-              ;;
+              MISSING=$((MISSING + 1))
-            dolibarr)
+            fi
-              [ -f "update.txt" ] && echo "update.txt present" || echo "::warning::No update.txt"
+          done < <(find "$SOURCE_DIR" -type d -not -path "./.git/*" -not -path "*/vendor/*" -not -path "*/node_modules/*")
-              ;;
+          if [ "$MISSING" -gt 0 ]; then
-          esac
+            echo "## Directory Protection" >> $GITHUB_STEP_SUMMARY
-
+            echo "${MISSING} director(ies) missing index.html" >> $GITHUB_STEP_SUMMARY
-      - name: Check changelog has unreleased entry
+          fi
-        run: |
+          echo "Directory protection: ${MISSING} missing (advisory)"
-          if [ ! -f "CHANGELOG.md" ]; then
+
-            echo "::warning::No CHANGELOG.md found"
+      - name: Joomla script file and asset checks
-            exit 0
+        if: steps.platform.outputs.platform == 'joomla'
-          fi
+        run: |
-          # Check for content under [Unreleased] section
+          ERRORS=0
-          if ! grep -q "## \[Unreleased\]" CHANGELOG.md; then
+          MANIFEST=$(find . -maxdepth 3 -name "*.xml" ! -path "./.git/*" -exec grep -l '<extension' {} \; 2>/dev/null | head -1)
-            echo "::error::CHANGELOG.md missing [Unreleased] section"
+          [ -z "$MANIFEST" ] && exit 0
-            exit 1
+          MANIFEST_DIR=$(dirname "$MANIFEST")
-          fi
+
-          # Check there's at least one entry (Added/Changed/Fixed/Removed) under Unreleased
+          # Check scriptfile exists if declared
-          UNRELEASED_CONTENT=$(sed -n '/## \[Unreleased\]/,/## \[/p' CHANGELOG.md | grep -cE '^\s*-\s' || true)
+          SCRIPTFILE=$(sed -n 's/.*<scriptfile>\([^<]*\)<\/scriptfile>.*/\1/p' "$MANIFEST" 2>/dev/null)
-          if [ "$UNRELEASED_CONTENT" -eq 0 ]; then
+          if [ -n "$SCRIPTFILE" ]; then
-            echo "::error::CHANGELOG.md [Unreleased] section has no entries. Add a changelog entry describing your changes."
+            if [ ! -f "${MANIFEST_DIR}/${SCRIPTFILE}" ]; then
-            echo "## Changelog Check: Failed" >> $GITHUB_STEP_SUMMARY
+              echo "::error::Manifest declares <scriptfile>${SCRIPTFILE}</scriptfile> but file not found at ${MANIFEST_DIR}/${SCRIPTFILE}"
-            echo "The \`[Unreleased]\` section in CHANGELOG.md has no entries." >> $GITHUB_STEP_SUMMARY
+              ERRORS=$((ERRORS + 1))
-            echo "Add a line like \`- Description of your change\` under a heading (\`### Added\`, \`### Changed\`, \`### Fixed\`, etc.)" >> $GITHUB_STEP_SUMMARY
+            else
-            exit 1
+              echo "Script file: ${MANIFEST_DIR}/${SCRIPTFILE} (OK)"
-          fi
+            fi
-          echo "Changelog: ${UNRELEASED_CONTENT} entry/entries in [Unreleased]"
+          fi
-
+
-      - name: Verify package source
+          # Require joomla.asset.json and validate it
-        run: |
+          ASSET_JSON=$(find "$MANIFEST_DIR" -name "joomla.asset.json" -not -path "./.git/*" 2>/dev/null | head -1)
-          SOURCE_DIR="src"
+          if [ -z "$ASSET_JSON" ]; then
-          [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
+            echo "::error::joomla.asset.json not found — Joomla asset system is required"
-          if [ ! -d "$SOURCE_DIR" ]; then
+            ERRORS=$((ERRORS + 1))
-            echo "::warning::No src/ or htdocs/ directory"
+          else
-            exit 0
+            if command -v php &> /dev/null; then
-          fi
+              php -r "json_decode(file_get_contents('$ASSET_JSON')); if(json_last_error()!==JSON_ERROR_NONE){echo json_last_error_msg();exit(1);}" 2>&1 || {
-          FILE_COUNT=$(find "$SOURCE_DIR" -type f | wc -l)
+                echo "::error::joomla.asset.json is not valid JSON"
-          echo "Source: ${FILE_COUNT} files"
+                ERRORS=$((ERRORS + 1))
-          [ "$FILE_COUNT" -gt 0 ] || { echo "::error::Source directory is empty"; exit 1; }
+              }
-
+            fi
-  # ── Pre-Release RC Build ─────────────────────────────────────────────────
+            echo "joomla.asset.json: valid"
-  pre-release:
+          fi
-    name: Build RC Package
+
-    runs-on: ubuntu-latest
+          # Validate all XML files in src/ are well-formed
-    needs: [branch-policy, validate]
+          XML_ERRORS=0
-
+          if command -v php &> /dev/null; then
-    steps:
+            while IFS= read -r -d '' xmlfile; do
-      - name: Trigger RC pre-release
+              if ! php -r "libxml_use_internal_errors(true); \$x = simplexml_load_file('$xmlfile'); if(!\$x){foreach(libxml_get_errors() as \$e) echo trim(\$e->message) . ' in $xmlfile'; exit(1);}" 2>&1; then
-        env:
+                XML_ERRORS=$((XML_ERRORS + 1))
-          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+              fi
-          REPO: ${{ github.repository }}
+            done < <(find "$MANIFEST_DIR" -name "*.xml" -not -path "./.git/*" -print0)
-          BRANCH: ${{ github.head_ref }}
+          fi
-          GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+          if [ "$XML_ERRORS" -gt 0 ]; then
-        run: |
+            echo "::error::${XML_ERRORS} XML file(s) are malformed"
-          curl -s -X POST             "${GITEA_URL}/api/v1/repos/${REPO}/actions/workflows/pre-release.yml/dispatches"             -H "Authorization: token ${GITEA_TOKEN}"             -H "Content-Type: application/json"             -d "{\"ref\":\"${BRANCH}\",\"inputs\":{\"stability\":\"release-candidate\"}}"
+            ERRORS=$((ERRORS + 1))
-          echo "### Pre-Release" >> $GITHUB_STEP_SUMMARY
+          else
-          echo "Triggered RC build on branch \`${BRANCH}\`" >> $GITHUB_STEP_SUMMARY
+            echo "XML well-formedness: OK"
+          fi
+
+          [ "$ERRORS" -gt 0 ] && exit 1
+          echo "Joomla asset checks: OK"
+
+      - name: Validate platform manifest
+        run: |
+          PLATFORM="${{ steps.platform.outputs.platform }}"
+          case "$PLATFORM" in
+            joomla)
+              MANIFEST=$(find . -maxdepth 3 -name "*.xml" ! -path "./.git/*" -exec grep -l '<extension' {} \; 2>/dev/null | head -1)
+              if [ -z "$MANIFEST" ]; then
+                echo "::warning::No Joomla manifest found (WaaS site)"
+                exit 0
+              fi
+              echo "Manifest: ${MANIFEST}"
+              if command -v php &> /dev/null; then
+                php -r "libxml_use_internal_errors(true); \$x = simplexml_load_file('$MANIFEST'); if(!\$x){foreach(libxml_get_errors() as \$e) echo \$e->message; exit(1);}" || { echo "::error::Manifest XML is malformed"; exit 1; }
+              fi
+              for ELEMENT in name version description; do
+                grep -q "<${ELEMENT}>" "$MANIFEST" || { echo "::error::Missing <${ELEMENT}> in manifest"; exit 1; }
+              done
+              # Block legacy raw/branch update server URLs on MokoGitea
+              RAW_URLS=$(grep -n 'raw/branch' "$MANIFEST" | grep -i 'mokoconsulting\|mokogitea\|git\.mokoconsulting\.tech' || true)
+              if [ -n "$RAW_URLS" ]; then
+                echo "::error::Manifest contains legacy raw/branch update server URL on MokoGitea. Use the Gitea Pages URL instead (e.g. /{REPO}/updates.xml not /{REPO}/raw/branch/main/updates.xml)"
+                echo "$RAW_URLS"
+                exit 1
+              fi
+              echo "Joomla manifest valid"
+              ;;
+            dolibarr)
+              MOD_FILE=$(find . -maxdepth 4 -name "mod*.class.php" ! -path "./.git/*" -exec grep -l 'extends DolibarrModules' {} \; 2>/dev/null | head -1)
+              if [ -z "$MOD_FILE" ]; then
+                echo "::error::No mod*.class.php found"
+                exit 1
+              fi
+              echo "Dolibarr module: ${MOD_FILE}"
+              ;;
+            *)
+              echo "Generic platform — no manifest validation"
+              ;;
+          esac
+
+      - name: Check update stream format
+        run: |
+          PLATFORM="${{ steps.platform.outputs.platform }}"
+          case "$PLATFORM" in
+            joomla)
+              if [ -f "updates.xml" ]; then
+                if command -v php &> /dev/null; then
+                  php -r "libxml_use_internal_errors(true); \$x = simplexml_load_file('updates.xml'); if(!\$x){foreach(libxml_get_errors() as \$e) echo \$e->message; exit(1);}" || { echo "::error::updates.xml is malformed"; exit 1; }
+                fi
+                echo "updates.xml valid"
+              fi
+              ;;
+            dolibarr)
+              [ -f "update.txt" ] && echo "update.txt present" || echo "::warning::No update.txt"
+              ;;
+          esac
+
+      - name: Validate Joomla language files
+        if: steps.platform.outputs.platform == 'joomla'
+        run: |
+          ERRORS=0
+          WARNINGS=0
+
+          # Require both en-GB and en-US language directories
+          LANG_ROOT=$(find . -path "*/language" -type d -not -path "./.git/*" 2>/dev/null | head -1)
+          if [ -z "$LANG_ROOT" ]; then
+            echo "No language/ directory found — skipping"
+            exit 0
+          fi
+
+          if [ ! -d "$LANG_ROOT/en-GB" ]; then
+            echo "::error::Missing en-GB language directory (${LANG_ROOT}/en-GB)"
+            ERRORS=$((ERRORS + 1))
+          fi
+          if [ ! -d "$LANG_ROOT/en-US" ]; then
+            echo "::error::Missing en-US language directory (${LANG_ROOT}/en-US)"
+            ERRORS=$((ERRORS + 1))
+          fi
+
+          # Check that en-GB and en-US have matching .ini files
+          if [ -d "$LANG_ROOT/en-GB" ] && [ -d "$LANG_ROOT/en-US" ]; then
+            for GB_INI in "$LANG_ROOT/en-GB"/*.ini; do
+              [ ! -f "$GB_INI" ] && continue
+              US_INI="$LANG_ROOT/en-US/$(basename "$GB_INI")"
+              if [ ! -f "$US_INI" ]; then
+                echo "::error::$(basename "$GB_INI") exists in en-GB but missing from en-US"
+                ERRORS=$((ERRORS + 1))
+              fi
+            done
+            for US_INI in "$LANG_ROOT/en-US"/*.ini; do
+              [ ! -f "$US_INI" ] && continue
+              GB_INI="$LANG_ROOT/en-GB/$(basename "$US_INI")"
+              if [ ! -f "$GB_INI" ]; then
+                echo "::error::$(basename "$US_INI") exists in en-US but missing from en-GB"
+                ERRORS=$((ERRORS + 1))
+              fi
+            done
+          fi
+
+          # Find all .ini language files
+          INI_FILES=$(find . -path "*/language/*/*.ini" -not -path "./.git/*" 2>/dev/null)
+          if [ -z "$INI_FILES" ]; then
+            echo "No .ini language files found"
+            [ "$ERRORS" -gt 0 ] && exit 1
+            exit 0
+          fi
+
+          echo "Found $(echo "$INI_FILES" | wc -l) language file(s)"
+
+          for FILE in $INI_FILES; do
+            FNAME=$(basename "$FILE")
+            LINENUM=0
+            SEEN_KEYS=""
+
+            while IFS= read -r line || [ -n "$line" ]; do
+              LINENUM=$((LINENUM + 1))
+
+              # Skip empty lines and comments
+              [ -z "$line" ] && continue
+              echo "$line" | grep -qE '^\s*;' && continue
+              echo "$line" | grep -qE '^\s*$' && continue
+
+              # Must match KEY="VALUE" format
+              if ! echo "$line" | grep -qE '^[A-Z_][A-Z0-9_]*=".*"$'; then
+                echo "::error file=${FILE},line=${LINENUM}::Malformed line: ${line}"
+                ERRORS=$((ERRORS + 1))
+                continue
+              fi
+
+              # Extract key and check for duplicates
+              KEY=$(echo "$line" | sed 's/=.*//')
+              if echo "$SEEN_KEYS" | grep -qx "$KEY"; then
+                echo "::error file=${FILE},line=${LINENUM}::Duplicate key: ${KEY}"
+                ERRORS=$((ERRORS + 1))
+              fi
+              SEEN_KEYS="${SEEN_KEYS}
+          ${KEY}"
+            done < "$FILE"
+
+            echo "  ${FILE}: checked ${LINENUM} lines"
+          done
+
+          # Cross-check en-GB vs en-US key consistency
+          GB_DIR=$(find . -path "*/language/en-GB" -type d -not -path "./.git/*" 2>/dev/null | head -1)
+          US_DIR=$(find . -path "*/language/en-US" -type d -not -path "./.git/*" 2>/dev/null | head -1)
+
+          if [ -n "$GB_DIR" ] && [ -n "$US_DIR" ]; then
+            for GB_FILE in "$GB_DIR"/*.ini; do
+              [ ! -f "$GB_FILE" ] && continue
+              FNAME=$(basename "$GB_FILE")
+              US_FILE="$US_DIR/$FNAME"
+              [ ! -f "$US_FILE" ] && continue
+
+              GB_KEYS=$(grep -oP '^[A-Z_][A-Z0-9_]*(?==)' "$GB_FILE" 2>/dev/null | sort)
+              US_KEYS=$(grep -oP '^[A-Z_][A-Z0-9_]*(?==)' "$US_FILE" 2>/dev/null | sort)
+
+              # Keys in en-GB but not en-US
+              MISSING_US=$(comm -23 <(echo "$GB_KEYS") <(echo "$US_KEYS"))
+              if [ -n "$MISSING_US" ]; then
+                echo "::warning::Keys in en-GB/$FNAME but missing from en-US/$FNAME:"
+                echo "$MISSING_US" | while read -r k; do echo "  - $k"; done
+                WARNINGS=$((WARNINGS + 1))
+              fi
+
+              # Keys in en-US but not en-GB
+              MISSING_GB=$(comm -13 <(echo "$GB_KEYS") <(echo "$US_KEYS"))
+              if [ -n "$MISSING_GB" ]; then
+                echo "::warning::Keys in en-US/$FNAME but missing from en-GB/$FNAME:"
+                echo "$MISSING_GB" | while read -r k; do echo "  - $k"; done
+                WARNINGS=$((WARNINGS + 1))
+              fi
+            done
+          fi
+
+          {
+            echo "### Language File Validation"
+            echo "| Metric | Count |"
+            echo "|---|---|"
+            echo "| Files checked | $(echo "$INI_FILES" | wc -l) |"
+            echo "| Errors | ${ERRORS} |"
+            echo "| Warnings | ${WARNINGS} |"
+          } >> $GITHUB_STEP_SUMMARY
+
+          if [ "$ERRORS" -gt 0 ]; then
+            echo "::error::Language validation failed with ${ERRORS} error(s)"
+            exit 1
+          fi
+          echo "Language files: OK (${WARNINGS} warning(s))"
+
+      - name: Check changelog has unreleased entry
+        run: |
+          if [ ! -f "CHANGELOG.md" ]; then
+            echo "::warning::No CHANGELOG.md found"
+            exit 0
+          fi
+          # Check for content under [Unreleased] section
+          if ! grep -q "## \[Unreleased\]" CHANGELOG.md; then
+            echo "::error::CHANGELOG.md missing [Unreleased] section"
+            exit 1
+          fi
+          # Check there's at least one entry (Added/Changed/Fixed/Removed) under Unreleased
+          UNRELEASED_CONTENT=$(sed -n '/## \[Unreleased\]/,/## \[/p' CHANGELOG.md | grep -cE '^\s*-\s' || true)
+          if [ "$UNRELEASED_CONTENT" -eq 0 ]; then
+            echo "::error::CHANGELOG.md [Unreleased] section has no entries. Add a changelog entry describing your changes."
+            echo "## Changelog Check: Failed" >> $GITHUB_STEP_SUMMARY
+            echo "The \`[Unreleased]\` section in CHANGELOG.md has no entries." >> $GITHUB_STEP_SUMMARY
+            echo "Add a line like \`- Description of your change\` under a heading (\`### Added\`, \`### Changed\`, \`### Fixed\`, etc.)" >> $GITHUB_STEP_SUMMARY
+            exit 1
+          fi
+          echo "Changelog: ${UNRELEASED_CONTENT} entry/entries in [Unreleased]"
+
+      - name: Verify package source
+        run: |
+          SOURCE_DIR="src"
+          [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
+          if [ ! -d "$SOURCE_DIR" ]; then
+            echo "::warning::No src/ or htdocs/ directory"
+            exit 0
+          fi
+          FILE_COUNT=$(find "$SOURCE_DIR" -type f | wc -l)
+          echo "Source: ${FILE_COUNT} files"
+          [ "$FILE_COUNT" -gt 0 ] || { echo "::error::Source directory is empty"; exit 1; }
+
+  # ── Pre-Release RC Build ─────────────────────────────────────────────────
+  pre-release:
+    name: Build RC Package
+    runs-on: ubuntu-latest
+    needs: [branch-policy, validate]
+
+    steps:
+      - name: Trigger RC pre-release
+        env:
+          GA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          REPO: ${{ github.repository }}
+          BRANCH: ${{ github.head_ref }}
+          GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+        run: |
+          curl -s -X POST             "${GITEA_URL}/api/v1/repos/${REPO}/actions/workflows/pre-release.yml/dispatches"             -H "Authorization: token ${GITEA_TOKEN}"             -H "Content-Type: application/json"             -d "{\"ref\":\"${BRANCH}\",\"inputs\":{\"stability\":\"release-candidate\"}}"
+          echo "### Pre-Release" >> $GITHUB_STEP_SUMMARY
+          echo "Triggered RC build on branch \`${BRANCH}\`" >> $GITHUB_STEP_SUMMARY
+
+  # ── Issue Reporter ──────────────────────────────────────────────────────
+  report-issues:
+    name: Report Issues
+    runs-on: ubuntu-latest
+    needs: [branch-policy, validate]
+    if: >-
+      always() &&
+      needs.validate.result == 'failure'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: automation/ci-issue-reporter.sh
+          sparse-checkout-cone-mode: false
+
+      - name: "File issue for PR validation failure"
+        env:
+          GITEA_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
+          GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
+        run: |
+          chmod +x automation/ci-issue-reporter.sh
+          ./automation/ci-issue-reporter.sh \
+            --gate "PR Validation" \
+            --workflow "PR Check" \
+            --severity error \
+            --details "PR validation failed (syntax, manifest, changelog, or source checks). See the CI run for the specific check that failed."

.mokogitea/workflows/pre-release.yml

@@ -8,15 +8,22 @@
 # REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
 # PATH: /templates/workflows/universal/pre-release.yml.template
 # VERSION: 05.01.00
-# BRIEF: Manual pre-release -- builds dev/alpha/beta/rc packages from any branch
+# BRIEF: Auto pre-release on push to dev/alpha/beta/rc branches
 
 name: "Universal: Pre-Release"
 
 on:
-  pull_request:
+  push:
-    types: [closed]
     branches:
       - dev
+      - 'fix/**'
+      - 'patch/**'
+      - 'hotfix/**'
+      - 'bugfix/**'
+      - 'chore/**'
+      - alpha
+      - beta
+      - rc
   workflow_dispatch:
     inputs:
       stability:
@@ -39,11 +46,11 @@ env:
 
 jobs:
   build:
-    name: "Build Pre-Release (${{ inputs.stability || 'development' }})"
+    name: "Build Pre-Release (${{ inputs.stability || github.ref_name }})"
     runs-on: release
     if: >-
       github.event_name == 'workflow_dispatch' ||
-      (github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'dev')
+      github.event_name == 'push'
 
     steps:
       - name: Checkout
@@ -51,32 +58,50 @@ jobs:
         with:
           fetch-depth: 0
           token: ${{ secrets.MOKOGITEA_TOKEN }}
+          ref: ${{ github.ref_name }}
 
       - name: Setup moko-platform tools
         env:
           MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
           MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
         run: |
-          if ! command -v composer &> /dev/null; then
+          # Use pre-installed /opt/moko-platform if available (updated by cron every 6h)
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
+          if [ -f /opt/moko-platform/cli/version_bump.php ] && [ -f /opt/moko-platform/cli/manifest_element.php ] && [ -f /opt/moko-platform/vendor/autoload.php ]; then
+            echo Using pre-installed /opt/moko-platform
+            echo MOKO_CLI=/opt/moko-platform/cli >> $GITHUB_ENV
+          else
+            echo Falling back to fresh clone
+            if ! command -v composer > /dev/null 2>&1; then
+              sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer > /dev/null 2>&1
+            fi
+            rm -rf /tmp/moko-platform-api
+            CLONE_URL=https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git
+            git clone --depth 1 --branch main --quiet $CLONE_URL /tmp/moko-platform-api
+            cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
+            echo MOKO_CLI=/tmp/moko-platform-api/cli >> $GITHUB_ENV
           fi
-          # Always fetch latest CLI tools — never use stale cache from previous runs
-          rm -rf /tmp/moko-platform-api
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-            /tmp/moko-platform-api
-          cd /tmp/moko-platform-api && composer install --no-dev --no-interaction --quiet
-          echo "MOKO_CLI=/tmp/moko-platform-api/cli" >> "$GITHUB_ENV"
 
       - name: Detect platform
         id: platform
         run: |
+          # Auto-detect and update platform if not set in manifest
+          php ${MOKO_CLI}/platform_detect.php --path . --github-output 2>/dev/null || true
           php ${MOKO_CLI}/manifest_read.php --path . --github-output
 
       - name: Resolve metadata and bump version
         id: meta
         run: |
-          STABILITY="${{ inputs.stability || 'development' }}"
+          # Auto-detect stability from branch name on push, or use input on dispatch
+          if [ "${{ github.event_name }}" = "push" ]; then
+            case "${{ github.ref_name }}" in
+              rc)    STABILITY="release-candidate" ;;
+              alpha) STABILITY="alpha" ;;
+              beta)  STABILITY="beta" ;;
+              *)     STABILITY="development" ;;
+            esac
+          else
+            STABILITY="${{ inputs.stability || 'development' }}"
+          fi
 
           case "$STABILITY" in
             development)        SUFFIX="-dev";   TAG="development" ;;
@@ -85,20 +110,26 @@ jobs:
             release-candidate)  SUFFIX="-rc";    TAG="release-candidate" ;;
           esac
 
-          # Read current version (bump already handled by push workflow)
+          # Bump version via CLI: patch for dev/alpha/beta, minor for RC
-          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null)
+          case "$STABILITY" in
-          [ -z "$VERSION" ] && VERSION="00.00.01"
+            release-candidate) BUMP="minor" ;;
+            *)                 BUMP="patch" ;;
+          esac
 
-          # Strip any existing suffix from version before applying stability
+          php ${MOKO_CLI}/version_bump.php --path . $([ "$BUMP" = "minor" ] && echo "--minor") 2>/dev/null || true
+
+          # Set stability suffix and verify consistency
+          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null || echo "00.00.01")
           VERSION=$(echo "$VERSION" | sed 's/-\(dev\|alpha\|beta\|rc\)$//')
 
           php ${MOKO_CLI}/version_set_platform.php \
             --path . --version "$VERSION" --branch "${{ github.ref_name }}" --stability "$STABILITY" 2>/dev/null || true
-
-          # Verify version consistency across all files
           php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
 
-          # Update VERSION variable with suffix
+          # Ensure licensing tags (updateservers, dlid) if enabled in manifest.xml
+          php ${MOKO_CLI}/manifest_licensing.php --path . --fix 2>/dev/null || true
+
+          # Append suffix for output
           if [ -n "$SUFFIX" ]; then
             VERSION="${VERSION}${SUFFIX}"
           fi
@@ -142,7 +173,42 @@ jobs:
           php ${MOKO_CLI}/release_create.php \
             --path . --version "$VERSION" --tag "$TAG" \
             --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
-            --repo "${GITEA_REPO}" --branch dev --prerelease
+            --repo "${GITEA_REPO}" --branch "${{ github.ref_name }}" --prerelease
+
+      - name: Update release notes from CHANGELOG.md
+        run: |
+          TAG="${{ steps.meta.outputs.tag }}"
+          VERSION="${{ steps.meta.outputs.version }}"
+          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
+
+          # Extract [Unreleased] section from changelog (everything between [Unreleased] and next ## heading)
+          if [ -f "CHANGELOG.md" ]; then
+            NOTES=$(awk '/^## \[Unreleased\]/{found=1; next} /^## \[/{if(found) exit} found{print}' CHANGELOG.md)
+            [ -z "$NOTES" ] && NOTES="Release ${VERSION}"
+          else
+            NOTES="Release ${VERSION}"
+          fi
+
+          # Update release body via API
+          RELEASE_ID=$(curl -sf -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
+            "${API_BASE}/releases/tags/${TAG}" | python3 -c "import json,sys; print(json.load(sys.stdin).get('id',''))" 2>/dev/null || true)
+
+          if [ -n "$RELEASE_ID" ]; then
+            python3 -c "
+          import json, urllib.request
+          body = open('/dev/stdin').read()
+          payload = json.dumps({'body': body}).encode()
+          req = urllib.request.Request(
+              '${API_BASE}/releases/${RELEASE_ID}',
+              data=payload, method='PATCH',
+              headers={
+                  'Authorization': 'token ${{ secrets.MOKOGITEA_TOKEN }}',
+                  'Content-Type': 'application/json'
+              })
+          urllib.request.urlopen(req)
+          " <<< "$NOTES"
+            echo "Release notes updated from CHANGELOG.md"
+          fi
 
       - name: Build package and upload
         id: package
@@ -155,55 +221,8 @@ jobs:
             --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
             --repo "${GITEA_REPO}" --output /tmp || true
 
-      - name: Update updates.xml
+      # updates.xml is generated dynamically by MokoGitea license server
-        if: steps.platform.outputs.platform == 'joomla'
+      # No need to build, commit, or sync updates.xml from workflows
-        run: |
-          VERSION="${{ steps.meta.outputs.version }}"
-          STABILITY="${{ steps.meta.outputs.stability }}"
-          SHA256="${{ steps.package.outputs.sha256_zip }}"
-
-          if [ ! -f "updates.xml" ]; then
-            echo "No updates.xml -- skipping"
-            exit 0
-          fi
-
-          SHA_FLAG=""
-          [ -n "$SHA256" ] && SHA_FLAG="--sha ${SHA256}"
-
-          php ${MOKO_CLI}/updates_xml_build.php \
-            --path . --version "${VERSION}" --stability "${STABILITY}" \
-            --gitea-url "${GITEA_URL}" --org "${GITEA_ORG}" --repo "${GITEA_REPO}" \
-            ${SHA_FLAG}
-
-          # Commit and push
-          if ! git diff --quiet updates.xml 2>/dev/null; then
-            git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-            git config --local user.name "gitea-actions[bot]"
-            git add updates.xml
-            git commit -m "chore: update ${STABILITY} channel ${VERSION} [skip ci]"
-            git push origin HEAD 2>&1 || echo "WARNING: push failed"
-          fi
-
-      - name: "Sync updates.xml to all branches"
-        if: steps.platform.outputs.platform == 'joomla'
-        run: |
-          CURRENT_BRANCH="${{ github.ref_name }}"
-          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "gitea-actions[bot]"
-
-          for BRANCH in main dev; do
-            [ "$BRANCH" = "$CURRENT_BRANCH" ] && continue
-            echo "Syncing updates.xml -> ${BRANCH}"
-            git fetch origin "${BRANCH}" 2>/dev/null || continue
-            git checkout "origin/${BRANCH}" -- updates.xml 2>/dev/null || continue
-            git checkout "${CURRENT_BRANCH}" -- updates.xml
-            if ! git diff --quiet updates.xml 2>/dev/null; then
-              git add updates.xml
-              git commit -m "chore: sync updates.xml from ${CURRENT_BRANCH} [skip ci]"
-              git push origin HEAD:refs/heads/${BRANCH} 2>&1 || echo "WARNING: push to ${BRANCH} failed"
-            fi
-            git checkout "${CURRENT_BRANCH}" 2>/dev/null
-          done
 
       - name: "Delete lesser pre-release channels (cascade)"
         continue-on-error: true

.mokogitea/workflows/security-audit.yml

@@ -4,8 +4,8 @@
 #
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Security
+# INGROUP: MokoStandards.Security
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoStandards
 # PATH: /.gitea/workflows/security-audit.yml
 # VERSION: 01.00.00
 # BRIEF: Dependency vulnerability scanning for composer and npm packages
@@ -80,19 +80,3 @@ jobs:
             -H "Priority: high" \
             -d "Security audit found vulnerabilities. Review dependency updates." \
             "${NTFY_URL}/${NTFY_TOPIC}" || true
-
-
-      - name: Joomla version audit
-        if: always()
-        run: |
-          if [ -f "monitoring/joomla-version-audit.php" ] && [ -n "$JOOMLA_SITES" ]; then
-            echo "$JOOMLA_SITES" > /tmp/sites.json
-            php monitoring/joomla-version-audit.php --sites /tmp/sites.json || true
-            echo "### Joomla Version Audit" >> $GITHUB_STEP_SUMMARY
-            rm -f /tmp/sites.json
-          else
-            echo "Joomla audit skipped (no script or JOOMLA_SITES_JSON not configured)"
-          fi
-        env:
-          JOOMLA_SITES: ${{ vars.JOOMLA_SITES_JSON }}
-

.mokogitea/workflows/update-server.yml

@@ -1,312 +0,0 @@
-# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
-#
-# SPDX-License-Identifier: GPL-3.0-or-later
-#
-# FILE INFORMATION
-# DEFGROUP: Gitea.Workflow
-# INGROUP: moko-platform.Universal
-# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
-# PATH: /templates/workflows/update-server.yml
-# VERSION: 05.00.00
-# BRIEF: Pre-release build + update server XML for dev/alpha/beta/rc branches
-#
-# Thin wrapper around moko-platform CLI tools.
-# Builds packages, updates updates.xml, and optionally deploys via SFTP.
-#
-# Joomla filters update entries by the user's "Minimum Stability" setting.
-
-name: "Update Server"
-
-on:
-  push:
-    branches:
-      - 'dev'
-      - 'dev/**'
-      - 'alpha/**'
-      - 'beta/**'
-      - 'rc/**'
-    paths:
-      - 'src/**'
-      - 'htdocs/**'
-  pull_request:
-    types: [closed]
-    branches:
-      - 'dev'
-      - 'dev/**'
-      - 'alpha/**'
-      - 'beta/**'
-      - 'rc/**'
-    paths:
-      - 'src/**'
-      - 'htdocs/**'
-  workflow_dispatch:
-    inputs:
-      stability:
-        description: 'Stability tag'
-        required: true
-        default: 'development'
-        type: choice
-        options:
-          - development
-          - alpha
-          - beta
-          - rc
-          - stable
-
-env:
-  FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
-  GITEA_URL: ${{ vars.GITEA_URL || 'https://git.mokoconsulting.tech' }}
-  GITEA_ORG: ${{ vars.GITEA_ORG || github.repository_owner }}
-  GITEA_REPO: ${{ vars.GITEA_REPO || github.event.repository.name }}
-
-permissions:
-  contents: write
-
-jobs:
-  update-xml:
-    name: Update Server
-    runs-on: release
-    if: >-
-      github.event.pull_request.merged == true || github.event_name == 'workflow_dispatch' || github.event_name == 'push'
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-        with:
-          token: ${{ secrets.MOKOGITEA_TOKEN }}
-          fetch-depth: 0
-
-      - name: Setup moko-platform tools
-        env:
-          MOKO_CLONE_TOKEN: ${{ secrets.MOKOGITEA_TOKEN }}
-          MOKO_CLONE_HOST: git.mokoconsulting.tech/MokoConsulting
-          COMPOSER_AUTH: '{"http-basic":{"git.mokoconsulting.tech":{"username":"token","password":"${{ secrets.MOKOGITEA_TOKEN }}"}}}'
-        run: |
-          if ! command -v composer &> /dev/null; then
-            sudo apt-get update -qq && sudo apt-get install -y -qq php-cli php-mbstring php-xml php-zip php-curl composer >/dev/null 2>&1
-          fi
-          # Always fetch latest CLI tools — never use stale cache from previous runs
-          rm -rf /tmp/moko-platform
-          git clone --depth 1 --branch main --quiet \
-            "https://x-access-token:${MOKO_CLONE_TOKEN}@${MOKO_CLONE_HOST}/moko-platform.git" \
-            /tmp/moko-platform 2>/dev/null || true
-          if [ -d "/tmp/moko-platform" ] && [ -f "/tmp/moko-platform/composer.json" ]; then
-            cd /tmp/moko-platform && composer install --no-dev --no-interaction --quiet 2>/dev/null || true
-          fi
-          echo "MOKO_CLI=/tmp/moko-platform/cli" >> "$GITHUB_ENV"
-
-      - name: Detect platform
-        id: platform
-        run: php ${MOKO_CLI}/manifest_read.php --path . --github-output
-
-      - name: Resolve stability and bump version
-        id: meta
-        run: |
-          BRANCH="${{ github.ref_name }}"
-
-          # Configure git for bot pushes
-          git config --local user.email "gitea-actions[bot]@mokoconsulting.tech"
-          git config --local user.name "gitea-actions[bot]"
-          git remote set-url origin "https://x-access-token:${{ secrets.MOKOGITEA_TOKEN }}@git.mokoconsulting.tech/${{ github.repository }}.git"
-
-          # Auto-bump patch version
-          php ${MOKO_CLI}/version_bump.php --path . 2>/dev/null || true
-
-          VERSION=$(php ${MOKO_CLI}/version_read.php --path . 2>/dev/null || echo "0.0.0")
-
-          # Strip any existing suffix before applying stability
-          VERSION=$(echo "$VERSION" | sed 's/-\(dev\|alpha\|beta\|rc\)$//')
-
-          # Determine stability from branch or manual input
-          if [ "${{ github.event_name }}" = "workflow_dispatch" ]; then
-            STABILITY="${{ inputs.stability }}"
-          elif [[ "$BRANCH" == rc/* ]]; then
-            STABILITY="rc"
-          elif [[ "$BRANCH" == beta/* ]]; then
-            STABILITY="beta"
-          elif [[ "$BRANCH" == alpha/* ]]; then
-            STABILITY="alpha"
-          else
-            STABILITY="development"
-          fi
-
-          # Version suffix per stability stream
-          case "$STABILITY" in
-            development) SUFFIX="-dev";  TAG="development" ;;
-            alpha)       SUFFIX="-alpha"; TAG="alpha" ;;
-            beta)        SUFFIX="-beta";  TAG="beta" ;;
-            rc)          SUFFIX="-rc";    TAG="release-candidate" ;;
-            *)           SUFFIX="";       TAG="stable" ;;
-          esac
-
-          # Propagate version with stability suffix to all manifest files
-          php ${MOKO_CLI}/version_set_platform.php \
-            --path . --version "$VERSION" --branch "$BRANCH" --stability "$STABILITY" 2>/dev/null || true
-          php ${MOKO_CLI}/version_check.php --path . --fix 2>/dev/null || true
-
-          # Re-read version (now includes suffix from version_set_platform)
-          if [ -n "$SUFFIX" ]; then
-            VERSION="${VERSION}${SUFFIX}"
-          fi
-
-          echo "version=${VERSION}" >> "$GITHUB_OUTPUT"
-          echo "stability=${STABILITY}" >> "$GITHUB_OUTPUT"
-          echo "suffix=${SUFFIX}" >> "$GITHUB_OUTPUT"
-          echo "tag=${TAG}" >> "$GITHUB_OUTPUT"
-          echo "display_version=${VERSION}" >> "$GITHUB_OUTPUT"
-
-          # Commit version bump if changed
-          git add -A
-          git diff --cached --quiet || {
-            git commit -m "chore(version): auto-bump ${VERSION} [skip ci]" \
-              --author="gitea-actions[bot] <gitea-actions[bot]@mokoconsulting.tech>"
-            git push
-          }
-
-      - name: Create release and upload package
-        id: package
-        run: |
-          VERSION="${{ steps.meta.outputs.version }}"
-          TAG="${{ steps.meta.outputs.tag }}"
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-
-          # Create or update Gitea release
-          php ${MOKO_CLI}/release_create.php \
-            --path . --version "$VERSION" --tag "$TAG" \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
-            --repo "${GITEA_REPO}" --branch "${{ github.ref_name }}" --prerelease
-
-          # Build package and upload
-          php ${MOKO_CLI}/release_package.php \
-            --path . --version "$VERSION" --tag "$TAG" \
-            --token "${{ secrets.MOKOGITEA_TOKEN }}" --api-base "$API_BASE" \
-            --repo "${GITEA_REPO}" --output /tmp || true
-
-      - name: Update updates.xml
-        if: steps.platform.outputs.platform == 'joomla'
-        run: |
-          VERSION="${{ steps.meta.outputs.version }}"
-          STABILITY="${{ steps.meta.outputs.stability }}"
-          SHA256="${{ steps.package.outputs.sha256_zip }}"
-
-          if [ ! -f "updates.xml" ]; then
-            echo "No updates.xml — skipping"
-            exit 0
-          fi
-
-          SHA_FLAG=""
-          [ -n "$SHA256" ] && SHA_FLAG="--sha ${SHA256}"
-
-          php ${MOKO_CLI}/updates_xml_build.php \
-            --path . --version "${VERSION}" --stability "${STABILITY}" \
-            --gitea-url "${GITEA_URL}" --org "${GITEA_ORG}" --repo "${GITEA_REPO}" \
-            ${SHA_FLAG}
-
-          # Commit and push updates.xml
-          git add updates.xml
-          git diff --cached --quiet || {
-            git commit -m "chore: update ${STABILITY} channel ${VERSION} [skip ci]"
-            git push
-          }
-
-      - name: Sync updates.xml to main
-        if: github.ref_name != 'main' && steps.platform.outputs.platform == 'joomla'
-        run: |
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-          GITEA_TOKEN="${{ secrets.MOKOGITEA_TOKEN }}"
-
-          FILE_SHA=$(curl -sf -H "Authorization: token ${GITEA_TOKEN}" \
-            "${API_BASE}/contents/updates.xml?ref=main" | python3 -c "import sys,json; print(json.load(sys.stdin).get('sha',''))" 2>/dev/null || true)
-
-          if [ -n "$FILE_SHA" ] && [ -f "updates.xml" ]; then
-            python3 -c "
-          import base64, json, urllib.request, sys
-          with open('updates.xml', 'rb') as f:
-              content = base64.b64encode(f.read()).decode()
-          payload = json.dumps({
-              'content': content,
-              'sha': '${FILE_SHA}',
-              'message': 'chore: sync updates.xml from ${{ steps.meta.outputs.stability }} [skip ci]',
-              'branch': 'main'
-          }).encode()
-          req = urllib.request.Request(
-              '${API_BASE}/contents/updates.xml',
-              data=payload, method='PUT',
-              headers={
-                  'Authorization': 'token ${GITEA_TOKEN}',
-                  'Content-Type': 'application/json'
-              })
-          try:
-              urllib.request.urlopen(req)
-              print('updates.xml synced to main')
-          except Exception as e:
-              print(f'WARNING: sync to main failed: {e}', file=sys.stderr)
-          "
-          fi
-
-      - name: SFTP deploy to dev server
-        if: contains(github.ref, 'dev/') || github.ref == 'refs/heads/dev'
-        env:
-          DEV_HOST: ${{ vars.DEV_FTP_HOST }}
-          DEV_PATH: ${{ vars.DEV_FTP_PATH }}
-          DEV_SUFFIX: ${{ vars.DEV_FTP_SUFFIX }}
-          DEV_USER: ${{ vars.DEV_FTP_USERNAME }}
-          DEV_PORT: ${{ vars.DEV_FTP_PORT }}
-          DEV_KEY: ${{ secrets.DEV_FTP_KEY }}
-          DEV_PASS: ${{ secrets.DEV_FTP_PASSWORD }}
-        run: |
-          # Permission check: admin or maintain role required
-          ACTOR="${{ github.actor }}"
-          API_BASE="${GITEA_URL}/api/v1/repos/${GITEA_ORG}/${GITEA_REPO}"
-
-          PERMISSION=$(curl -sf -H "Authorization: token ${{ secrets.MOKOGITEA_TOKEN }}" \
-            "${API_BASE}/collaborators/${ACTOR}/permission" 2>/dev/null | \
-            python3 -c "import sys,json; print(json.load(sys.stdin).get('permission','read'))" 2>/dev/null || echo "read")
-          case "$PERMISSION" in
-            admin|maintain|write) ;;
-            *)
-              echo "Deploy denied: ${ACTOR} has '${PERMISSION}' — requires admin, maintain, or write"
-              exit 0
-              ;;
-          esac
-
-          [ -z "$DEV_HOST" ] || [ -z "$DEV_PATH" ] && { echo "DEV FTP not configured — skipping SFTP"; exit 0; }
-
-          SOURCE_DIR="src"
-          [ ! -d "$SOURCE_DIR" ] && SOURCE_DIR="htdocs"
-          [ ! -d "$SOURCE_DIR" ] && exit 0
-
-          PORT="${DEV_PORT:-22}"
-          REMOTE="${DEV_PATH%/}"
-          [ -n "$DEV_SUFFIX" ] && REMOTE="${REMOTE}/${DEV_SUFFIX#/}"
-
-          printf '{"host":"%s","port":%s,"username":"%s","remotePath":"%s"' \
-            "$DEV_HOST" "$PORT" "$DEV_USER" "$REMOTE" > /tmp/sftp-config.json
-          if [ -n "$DEV_KEY" ]; then
-            echo "$DEV_KEY" > /tmp/deploy_key && chmod 600 /tmp/deploy_key
-            printf ',"privateKeyPath":"/tmp/deploy_key"}' >> /tmp/sftp-config.json
-          else
-            printf ',"password":"%s"}' "$DEV_PASS" >> /tmp/sftp-config.json
-          fi
-
-          PLATFORM=$(php ${MOKO_CLI}/platform_detect.php --path . 2>/dev/null || true)
-          if [ "$PLATFORM" = "waas-component" ] && [ -f "${MOKO_CLI}/../deploy/deploy-joomla.php" ]; then
-            php ${MOKO_CLI}/../deploy/deploy-joomla.php --path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json
-          elif [ -f "${MOKO_CLI}/../deploy/deploy-sftp.php" ]; then
-            php ${MOKO_CLI}/../deploy/deploy-sftp.php --path . --src-dir "$SOURCE_DIR" --config /tmp/sftp-config.json
-          fi
-          rm -f /tmp/deploy_key /tmp/sftp-config.json
-          echo "SFTP deploy to dev complete" >> $GITHUB_STEP_SUMMARY
-
-      - name: Summary
-        if: always()
-        run: |
-          VERSION="${{ steps.meta.outputs.version }}"
-          STABILITY="${{ steps.meta.outputs.stability }}"
-          DISPLAY="${{ steps.meta.outputs.display_version }}"
-          echo "## Update Server" >> $GITHUB_STEP_SUMMARY
-          echo "" >> $GITHUB_STEP_SUMMARY
-          echo "| Field | Value |" >> $GITHUB_STEP_SUMMARY
-          echo "|-------|-------|" >> $GITHUB_STEP_SUMMARY
-          echo "| Stability | \`${STABILITY}\` |" >> $GITHUB_STEP_SUMMARY
-          echo "| Version | \`${DISPLAY}\` |" >> $GITHUB_STEP_SUMMARY

CHANGELOG.md

@@ -8,65 +8,26 @@
  DEFGROUP: Joomla.Template.Site
  INGROUP: MokoOnyx.Documentation
  PATH: ./CHANGELOG.md
-<<<<<<< HEAD
+ VERSION: 02.21.05
-<<<<<<< HEAD
- VERSION: 02.15.02
  BRIEF: Changelog file documenting version history of MokoOnyx
  -->
 
-# Changelog — MokoOnyx (VERSION: 02.15.02)
+# Changelog — MokoOnyx (VERSION: 02.21.05)
-=======
- VERSION: 02.15.02
- BRIEF: Changelog file documenting version history of MokoOnyx
- -->
-
-# Changelog — MokoOnyx (VERSION: 02.15.02)
->>>>>>> origin/main
-=======
- VERSION: 02.15.02
- BRIEF: Changelog file documenting version history of MokoOnyx
- -->
-
-# Changelog — MokoOnyx (VERSION: 02.15.02)
->>>>>>> origin/main
 ## [Unreleased]
 
-## [02.15.00] --- 2026-05-30
+### Fixed
-
+- Strip Joomla-injected `p-2` padding class from Font Awesome icons in all menu overrides (default, mainmenu, horizontal)
-=======
- VERSION: 02.15.02
- BRIEF: Changelog file documenting version history of MokoOnyx
- -->
-
-# Changelog — MokoOnyx (VERSION: 02.15.02)
->>>>>>> origin/main
-## [02.14.00] --- 2026-05-30
-
-## [02.13.00] --- 2026-05-30
-
-### Added
-- Hero image (`hero.jpg`) to template images
-- `.fa-solid`, `.fa-regular`, `.fa-brands`, `.fa-light` icon margin spacing
-- `.blog-item .item-image` fixed 250px height with object-fit cover
-- Hide header on home page option (`hideHeaderHome` template param)
-- Hide main menu on home page option (`hideMenuHome` template param)
-- Three distinct menu overrides: mainmenu (collapsible), horizontal (always visible), default (vertical)
-- `<php_minimum>8.1.0</php_minimum>` to templateDetails.xml
-- `<changelogurl>` support in updates.xml
-- CONTRIBUTING.md with universal workflow and version policy
 
 ### Changed
-- Release pipeline rework: independent update streams, CLI-driven workflows
+- Migrated update server URL from raw file endpoint to Gitea Pages
-- Version bumps only trigger on `src/` changes (not docs/config)
+- Release workflow no longer manages updates.xml (decoupled to Gitea Pages)
-- Branch protection: CI bot only for push, force push disabled
+- Added conflict-marker guard to PR check and release workflows
-- Auto-bump supports dev, rc, feature/*, patch/* branches
+- Added Joomla language file validation (syntax, duplicates, en-GB/en-US consistency)
+- Added JEXEC guard, joomla.asset.json, XML well-formedness, and script file CI checks
+- Removed RS_FTP_PATH_SUFFIX from repo health requirements
 
-### Fixed
+## [02.20.00] --- 2026-06-04
-- Joomla update loop caused by version mismatch between ZIP and updates.xml
-- Duplicate hamburger menu on mobile
-- Stacked version suffixes (-dev-dev-dev)
-- Template name doubling (Template - Template - MokoOnyx)
 
-## [02.08.00] --- 2026-05-29
+## [02.18.00] --- 2026-06-02
 
-## [02.08.00] --- 2026-05-29
+## [02.15.00] --- 2026-05-30

CLAUDE.md

@@ -1,42 +0,0 @@
-# CLAUDE.md
-
-This file provides guidance to Claude Code when working with this repository.
-
-## Project Overview
-
-**MokoOnyx** -- MokoOnyx - Joomla site template (successor to MokoCassiopeia)
-
-| Field | Value |
-|---|---|
-| **Platform** | joomla |
-| **Language** | PHP |
-| **Default branch** | main |
-| **License** | GPL-3.0-or-later |
-| **Wiki** | [MokoOnyx Wiki](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/wiki) |
-| **Standards** | [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home) |
-
-## Common Commands
-
-```bash
-composer install  # Install PHP dependencies
-```
-
-## Architecture
-
-This is a Joomla extension. Key directories:
-- `src/` -- extension source (deployed to Joomla)
-- `src/*.xml` -- manifest file (version, files, params)
-- `src/src/` or `src/services/` -- PHP classes
-- `src/language/` -- translation strings
-- `src/media/` -- CSS/JS/images
-
-## Rules
-
-- **Workflow directory**: `.mokogitea/` (not `.gitea/` or `.github/`)
-
-- **Never commit** `.claude/`, `.mcp.json`, `TODO.md`, or `*.min.css`/`*.min.js`
-- **Attribution**: use `Authored-by: Moko Consulting` in commits
-- **Branch strategy**: develop on `dev`, merge to `main` for release
-- **Minification**: handled at build time (CI) and runtime (MokoMinifyHelper for Joomla templates)
-- **Wiki**: documentation lives in the Gitea wiki, not in `docs/` files
-- **Standards**: this repo follows [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)

CONTRIBUTING.md

@@ -1,161 +1,161 @@
-# Contributing to Moko Consulting Projects
+# Contributing to Moko Consulting Projects
-
+
-Thank you for your interest in contributing. All Moko Consulting repositories follow this universal workflow and version policy.
+Thank you for your interest in contributing. All Moko Consulting repositories follow this universal workflow and version policy.
-
+
-## Branching Workflow
+## Branching Workflow
-
+
-```
+```
-feature/* ──PR──> dev ──draft PR──> (renamed to rc) ──merge──> main
+feature/* ──PR──> dev ──draft PR──> (renamed to rc) ──merge──> main
-```
+```
-
+
-### Step by step
+### Step by step
-
+
-1. **Create a feature branch** from `dev`:
+1. **Create a feature branch** from `dev`:
-   ```bash
+   ```bash
-   git checkout dev && git pull
+   git checkout dev && git pull
-   git checkout -b feature/my-change
+   git checkout -b feature/my-change
-   ```
+   ```
-
+
-2. **Work and commit** on your feature branch. Push to origin.
+2. **Work and commit** on your feature branch. Push to origin.
-
+
-3. **Open a PR**: `feature/my-change` → `dev`. After review and checks, merge it.
+3. **Open a PR**: `feature/my-change` → `dev`. After review and checks, merge it.
-
+
-4. **When ready for release**, open a **draft PR**: `dev` → `main`.
+4. **When ready for release**, open a **draft PR**: `dev` → `main`.
-   - This automatically renames the source branch to `rc` (release candidate)
+   - This automatically renames the source branch to `rc` (release candidate)
-   - An RC pre-release is built and uploaded
+   - An RC pre-release is built and uploaded
-
+
-5. **Alpha and beta branches** are created by manually renaming the branch before the RC stage:
+5. **Alpha and beta branches** are created by manually renaming the branch before the RC stage:
-   - Rename `dev` to `alpha` for early testing → alpha pre-release is built
+   - Rename `dev` to `alpha` for early testing → alpha pre-release is built
-   - Rename `alpha` to `beta` for feature-complete testing → beta pre-release is built
+   - Rename `alpha` to `beta` for feature-complete testing → beta pre-release is built
-   - When the draft PR is created, the branch is renamed to `rc`
+   - When the draft PR is created, the branch is renamed to `rc`
-
+
-6. **Once PR checks pass** on the `rc` branch, mark the PR as ready and merge to `main`.
+6. **Once PR checks pass** on the `rc` branch, mark the PR as ready and merge to `main`.
-
+
-7. **Merging to main** triggers the stable release pipeline:
+7. **Merging to main** triggers the stable release pipeline:
-   - Minor version bump (e.g., `02.09.xx` → `02.10.00`)
+   - Minor version bump (e.g., `02.09.xx` → `02.10.00`)
-   - Stability suffix stripped (clean version)
+   - Stability suffix stripped (clean version)
-   - Gitea release created with ZIP/tar.gz packages
+   - Gitea release created with ZIP/tar.gz packages
-   - `updates.xml` updated (Joomla extensions)
+   - `updates.xml` updated (Joomla extensions)
-   - `dev` branch recreated from `main`
+   - `dev` branch recreated from `main`
-
+
-### Branch summary
+### Branch summary
-
+
-| Branch | Purpose | Created by |
+| Branch | Purpose | Created by |
-|--------|---------|-----------|
+|--------|---------|-----------|
-| `feature/*` | New features and fixes | Developer |
+| `feature/*` | New features and fixes | Developer |
-| `dev` | Integration branch | Auto-recreated after release |
+| `dev` | Integration branch | Auto-recreated after release |
-| `alpha` | Alpha pre-release testing | Manual rename from `dev` |
+| `alpha` | Alpha pre-release testing | Manual rename from `dev` |
-| `beta` | Beta pre-release testing | Manual rename from `alpha` |
+| `beta` | Beta pre-release testing | Manual rename from `alpha` |
-| `rc` | Release candidate | Auto-renamed on draft PR to main |
+| `rc` | Release candidate | Auto-renamed on draft PR to main |
-| `main` | Stable releases | Protected, merge only |
+| `main` | Stable releases | Protected, merge only |
-| `version/XX.YY.ZZ` | Archived release snapshots | Auto-created by CI |
+| `version/XX.YY.ZZ` | Archived release snapshots | Auto-created by CI |
-
+
-### Protected branches
+### Protected branches
-
+
-| Branch | Direct push | Merge via |
+| Branch | Direct push | Merge via |
-|--------|------------|-----------|
+|--------|------------|-----------|
-| `main` | Blocked (CI bot whitelisted) | PR merge only |
+| `main` | Blocked (CI bot whitelisted) | PR merge only |
-| `dev` | Blocked (CI bot whitelisted) | PR merge from feature/* |
+| `dev` | Blocked (CI bot whitelisted) | PR merge from feature/* |
-| `rc` | Blocked (CI bot whitelisted) | Auto-created on draft PR |
+| `rc` | Blocked (CI bot whitelisted) | Auto-created on draft PR |
-| `alpha` | Blocked (CI bot whitelisted) | Manual rename |
+| `alpha` | Blocked (CI bot whitelisted) | Manual rename |
-| `beta` | Blocked (CI bot whitelisted) | Manual rename |
+| `beta` | Blocked (CI bot whitelisted) | Manual rename |
-| `feature/*` | Open | N/A (source branch) |
+| `feature/*` | Open | N/A (source branch) |
-
+
-## Version Policy
+## Version Policy
-
+
-### Format
+### Format
-
+
-All versions use `XX.YY.ZZ` — three two-digit segments, zero-padded:
+All versions use `XX.YY.ZZ` — three two-digit segments, zero-padded:
-
+
-- **XX** — Major version (breaking changes)
+- **XX** — Major version (breaking changes)
-- **YY** — Minor version (new features, bumped on release to main)
+- **YY** — Minor version (new features, bumped on release to main)
-- **ZZ** — Patch version (auto-incremented on every push to dev/feature branches)
+- **ZZ** — Patch version (auto-incremented on every push to dev/feature branches)
-
+
-Rollover: patch `99` → `00` increments minor; minor `99` → `00` increments major.
+Rollover: patch `99` → `00` increments minor; minor `99` → `00` increments major.
-
+
-### Stability suffixes
+### Stability suffixes
-
+
-Each branch appends a suffix to indicate stability:
+Each branch appends a suffix to indicate stability:
-
+
-| Branch | Suffix | Example |
+| Branch | Suffix | Example |
-|--------|--------|---------|
+|--------|--------|---------|
-| `main` | (none) | `02.09.00` |
+| `main` | (none) | `02.09.00` |
-| `dev` | `-dev` | `02.09.01-dev` |
+| `dev` | `-dev` | `02.09.01-dev` |
-| `feature/*` | `-dev` | `02.09.01-dev` |
+| `feature/*` | `-dev` | `02.09.01-dev` |
-| `alpha` | `-alpha` | `02.09.01-alpha` |
+| `alpha` | `-alpha` | `02.09.01-alpha` |
-| `beta` | `-beta` | `02.09.01-beta` |
+| `beta` | `-beta` | `02.09.01-beta` |
-| `rc` | `-rc` | `02.09.01-rc` |
+| `rc` | `-rc` | `02.09.01-rc` |
-
+
-### Auto version bump
+### Auto version bump
-
+
-On every push to `dev`, `feature/*`, or `patch/*`:
+On every push to `dev`, `feature/*`, or `patch/*`:
-
+
-1. Patch version incremented
+1. Patch version incremented
-2. Stability suffix `-dev` applied
+2. Stability suffix `-dev` applied
-3. All version-bearing files updated (manifests, CHANGELOG, PHP headers, etc.)
+3. All version-bearing files updated (manifests, CHANGELOG, PHP headers, etc.)
-4. Commit created with `[skip ci]` to avoid loops
+4. Commit created with `[skip ci]` to avoid loops
-
+
-### Release version flow
+### Release version flow
-
+
-Version bumps happen at specific release events:
+Version bumps happen at specific release events:
-
+
-| Event | Bump | Example |
+| Event | Bump | Example |
-|-------|------|---------|
+|-------|------|---------|
-| Feature merged to dev | Patch bump after dev release | `02.09.01-dev` → release → `02.09.02-dev` |
+| Feature merged to dev | Patch bump after dev release | `02.09.01-dev` → release → `02.09.02-dev` |
-| Dev promoted to RC | Minor bump | `02.09.02-dev` → `02.10.00-rc` |
+| Dev promoted to RC | Minor bump | `02.09.02-dev` → `02.10.00-rc` |
-| RC merged to main | Minor bump | `02.10.00-rc` → `02.11.00` (stable) |
+| RC merged to main | Minor bump | `02.10.00-rc` → `02.11.00` (stable) |
-| Dev recreated from main | Patch bump | `02.11.00` → `02.11.01-dev` |
+| Dev recreated from main | Patch bump | `02.11.00` → `02.11.01-dev` |
-
+
-### Release stream copies
+### Release stream copies
-
+
-When a higher-stability release is published, copies are created for all lesser streams with the same base version:
+When a higher-stability release is published, copies are created for all lesser streams with the same base version:
-
+
-- **RC `02.10.00-rc`** also creates: `02.10.00-dev`, `02.10.00-alpha`, `02.10.00-beta`
+- **RC `02.10.00-rc`** also creates: `02.10.00-dev`, `02.10.00-alpha`, `02.10.00-beta`
-- **Stable `02.11.00`** also creates: `02.11.00-dev`, `02.11.00-alpha`, `02.11.00-beta`, `02.11.00-rc`
+- **Stable `02.11.00`** also creates: `02.11.00-dev`, `02.11.00-alpha`, `02.11.00-beta`, `02.11.00-rc`
-
+
-This ensures Joomla sites on ANY stability channel see the update (Joomla only shows versions higher than what's installed).
+This ensures Joomla sites on ANY stability channel see the update (Joomla only shows versions higher than what's installed).
-
+
-### Version files
+### Version files
-
+
-The version tools update all files containing version stamps:
+The version tools update all files containing version stamps:
-
+
-- `.mokogitea/manifest.xml` (canonical source)
+- `.mokogitea/manifest.xml` (canonical source)
-- Joomla XML manifests (`<version>` tag)
+- Joomla XML manifests (`<version>` tag)
-- `README.md`, `CHANGELOG.md` (`VERSION:` pattern)
+- `README.md`, `CHANGELOG.md` (`VERSION:` pattern)
-- `package.json`, `pyproject.toml`
+- `package.json`, `pyproject.toml`
-- Any text file with a `VERSION: XX.YY.ZZ` label
+- Any text file with a `VERSION: XX.YY.ZZ` label
-
+
-Files synced from other repos (with a `# REPO:` header) are not touched.
+Files synced from other repos (with a `# REPO:` header) are not touched.
-
+
-## Code Standards
+## Code Standards
-
+
-- **PHP**: PSR-12, tabs for indentation
+- **PHP**: PSR-12, tabs for indentation
-- **Copyright**: all files must include the Moko Consulting copyright header
+- **Copyright**: all files must include the Moko Consulting copyright header
-- **License**: SPDX identifier `GPL-3.0-or-later` (or as specified per repo)
+- **License**: SPDX identifier `GPL-3.0-or-later` (or as specified per repo)
-- **Attribution**: use `Authored-by: Moko Consulting` in commits, not individual names
+- **Attribution**: use `Authored-by: Moko Consulting` in commits, not individual names
-
+
-## Commit Messages
+## Commit Messages
-
+
-Use conventional commit format:
+Use conventional commit format:
-
+
-```
+```
-type(scope): short description
+type(scope): short description
-
+
-Optional body with context.
+Optional body with context.
-
+
-Authored-by: Moko Consulting
+Authored-by: Moko Consulting
-```
+```
-
+
-Types: `feat`, `fix`, `chore`, `docs`, `style`, `refactor`, `test`, `ci`
+Types: `feat`, `fix`, `chore`, `docs`, `style`, `refactor`, `test`, `ci`
-
+
-Special flags in commit messages:
+Special flags in commit messages:
-- `[skip ci]` — skip all CI workflows
+- `[skip ci]` — skip all CI workflows
-- `[skip bump]` — skip auto version bump only
+- `[skip bump]` — skip auto version bump only
-
+
-## Reporting Issues
+## Reporting Issues
-
+
-Use the repository's issue tracker with the appropriate template.
+Use the repository's issue tracker with the appropriate template.
-
+
----
+---
-
+
-*Moko Consulting <hello@mokoconsulting.tech>*
+*Moko Consulting <hello@mokoconsulting.tech>*

SECURITY.md

@@ -10,17 +10,7 @@
  INGROUP: MokoOnyx.Governance
  REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
  FILE: SECURITY.md
-<<<<<<< HEAD
+ VERSION: 02.21.05
-<<<<<<< HEAD
- VERSION: 02.15.02
-=======
- VERSION: 02.15.02
-=======
- VERSION: 02.15.02
-=======
- VERSION: 02.15.02
->>>>>>> origin/main
->>>>>>> origin/main
  BRIEF: Security policy and vulnerability reporting process for MokoOnyx.
  PATH: /SECURITY.md
  NOTE: This policy is process oriented and does not replace secure engineering practices.

automation/ci-issue-reporter.sh

@@ -0,0 +1,237 @@
+#!/usr/bin/env bash
+# ============================================================================
+# Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+#
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# FILE INFORMATION
+# DEFGROUP: Automation.CI
+# INGROUP: moko-platform.Automation
+# REPO: https://git.mokoconsulting.tech/MokoConsulting/moko-platform
+# PATH: /automation/ci-issue-reporter.sh
+# VERSION: 09.23.00
+# BRIEF: Creates or updates a Gitea issue when a CI gate fails.
+#        Deduplicates by searching open issues with the "ci-auto" label
+#        whose title matches the gate. If a matching issue exists, a comment
+#        is appended instead of opening a duplicate.
+# ============================================================================
+
+set -euo pipefail
+
+# ── Defaults ────────────────────────────────────────────────────────────────
+GITEA_URL="${GITEA_URL:-https://git.mokoconsulting.tech}"
+GITEA_TOKEN="${GITEA_TOKEN:-}"
+REPO="${GITHUB_REPOSITORY:-}"
+RUN_URL="${GITHUB_SERVER_URL:-${GITEA_URL}}/${REPO}/actions/runs/${GITHUB_RUN_ID:-0}"
+LABEL_NAME="ci-auto"
+LABEL_COLOR="#e11d48"
+
+GATE=""
+DETAILS=""
+SEVERITY="error"
+WORKFLOW=""
+
+# ── Parse arguments ─────────────────────────────────────────────────────────
+usage() {
+  cat <<EOF
+Usage: ci-issue-reporter.sh --gate NAME --details TEXT [OPTIONS]
+
+Required:
+  --gate      CI gate name (e.g. "Code Quality", "Self-Health")
+  --details   Human-readable failure description
+
+Optional:
+  --severity  "error" (default) or "warning"
+  --workflow  Workflow name for the issue title
+  --repo      owner/repo (default: \$GITHUB_REPOSITORY)
+  --run-url   URL to the CI run (auto-detected from env)
+  --token     Gitea API token (default: \$GITEA_TOKEN)
+  --url       Gitea base URL (default: \$GITEA_URL)
+EOF
+  exit 1
+}
+
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    --gate)     GATE="$2";       shift 2 ;;
+    --details)  DETAILS="$2";    shift 2 ;;
+    --severity) SEVERITY="$2";   shift 2 ;;
+    --workflow) WORKFLOW="$2";   shift 2 ;;
+    --repo)     REPO="$2";      shift 2 ;;
+    --run-url)  RUN_URL="$2";   shift 2 ;;
+    --token)    GITEA_TOKEN="$2"; shift 2 ;;
+    --url)      GITEA_URL="$2"; shift 2 ;;
+    -h|--help)  usage ;;
+    *)          echo "Unknown option: $1"; usage ;;
+  esac
+done
+
+[[ -z "$GATE" ]]         && { echo "ERROR: --gate is required"; usage; }
+[[ -z "$DETAILS" ]]      && { echo "ERROR: --details is required"; usage; }
+[[ -z "$GITEA_TOKEN" ]]  && { echo "ERROR: GITEA_TOKEN not set"; exit 1; }
+[[ -z "$REPO" ]]         && { echo "ERROR: GITHUB_REPOSITORY not set"; exit 1; }
+
+API="${GITEA_URL}/api/v1/repos/${REPO}"
+
+# ── Build title ─────────────────────────────────────────────────────────────
+if [[ -n "$WORKFLOW" ]]; then
+  TITLE="[CI] ${WORKFLOW}: ${GATE} failed"
+else
+  TITLE="[CI] ${GATE} failed"
+fi
+
+# ── Ensure label exists ─────────────────────────────────────────────────────
+ensure_label() {
+  local exists
+  exists=$(curl -sf -o /dev/null -w '%{http_code}' \
+    -H "Authorization: token ${GITEA_TOKEN}" \
+    "${API}/labels" 2>/dev/null || echo "000")
+
+  if [[ "$exists" == "200" ]]; then
+    # Check if label already exists
+    local found
+    found=$(curl -sf \
+      -H "Authorization: token ${GITEA_TOKEN}" \
+      "${API}/labels" 2>/dev/null \
+      | grep -o "\"name\":\"${LABEL_NAME}\"" || true)
+
+    if [[ -z "$found" ]]; then
+      curl -sf -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/json" \
+        "${API}/labels" \
+        -d "{\"name\":\"${LABEL_NAME}\",\"color\":\"${LABEL_COLOR}\",\"description\":\"Auto-created by CI issue reporter\"}" \
+        > /dev/null 2>&1 || true
+    fi
+  fi
+}
+
+# ── Search for existing open issue ──────────────────────────────────────────
+find_existing_issue() {
+  # URL-encode the gate name for the query
+  local query
+  query=$(printf '%s' "[CI] ${GATE}" | sed 's/ /%20/g; s/\[/%5B/g; s/\]/%5D/g')
+
+  local response
+  response=$(curl -sf \
+    -H "Authorization: token ${GITEA_TOKEN}" \
+    "${API}/issues?type=issues&state=open&labels=${LABEL_NAME}&q=${query}&limit=5" \
+    2>/dev/null || echo "[]")
+
+  # Extract the first matching issue number
+  echo "$response" \
+    | grep -oP '"number":\s*\K[0-9]+' \
+    | head -1
+}
+
+# ── Build issue body ────────────────────────────────────────────────────────
+build_body() {
+  local severity_badge
+  if [[ "$SEVERITY" == "error" ]]; then
+    severity_badge="**Severity:** Error"
+  else
+    severity_badge="**Severity:** Warning"
+  fi
+
+  cat <<BODY
+## CI Gate Failure: ${GATE}
+
+${severity_badge}
+**Workflow:** ${WORKFLOW:-unknown}
+**Branch:** ${GITHUB_REF_NAME:-unknown}
+**Commit:** \`${GITHUB_SHA:0:8}\`
+**Run:** [View CI run](${RUN_URL})
+
+### Details
+
+${DETAILS}
+
+### Resolution
+
+Fix the issue described above and push a new commit. This issue will be closed automatically when the gate passes, or can be closed manually.
+
+---
+*Auto-created by [ci-issue-reporter](${GITEA_URL}/${REPO}/src/branch/main/automation/ci-issue-reporter.sh)*
+BODY
+}
+
+# ── Build comment body (for existing issues) ────────────────────────────────
+build_comment() {
+  cat <<COMMENT
+### CI failure recurrence
+
+**Branch:** ${GITHUB_REF_NAME:-unknown}
+**Commit:** \`${GITHUB_SHA:0:8}\`
+**Run:** [View CI run](${RUN_URL})
+
+${DETAILS}
+COMMENT
+}
+
+# ── Main ────────────────────────────────────────────────────────────────────
+ensure_label
+
+EXISTING=$(find_existing_issue)
+
+if [[ -n "$EXISTING" ]]; then
+  # Append comment to existing issue
+  COMMENT_BODY=$(build_comment)
+  COMMENT_JSON=$(printf '%s' "$COMMENT_BODY" | python3 -c "
+import sys, json
+print(json.dumps({'body': sys.stdin.read()}))" 2>/dev/null)
+
+  HTTP=$(curl -sf -o /dev/null -w '%{http_code}' -X POST \
+    -H "Authorization: token ${GITEA_TOKEN}" \
+    -H "Content-Type: application/json" \
+    "${API}/issues/${EXISTING}/comments" \
+    -d "${COMMENT_JSON}" 2>/dev/null || echo "000")
+
+  if [[ "$HTTP" == "201" ]]; then
+    echo "Commented on existing issue #${EXISTING}"
+  else
+    echo "WARNING: Failed to comment on issue #${EXISTING} (HTTP ${HTTP})"
+  fi
+else
+  # Create new issue
+  ISSUE_BODY=$(build_body)
+  ISSUE_JSON=$(python3 -c "
+import sys, json
+body = sys.stdin.read()
+print(json.dumps({
+    'title': sys.argv[1],
+    'body': body,
+    'labels': []
+}))" "$TITLE" <<< "$ISSUE_BODY" 2>/dev/null)
+
+  # Create the issue
+  RESPONSE=$(curl -sf -X POST \
+    -H "Authorization: token ${GITEA_TOKEN}" \
+    -H "Content-Type: application/json" \
+    "${API}/issues" \
+    -d "${ISSUE_JSON}" 2>/dev/null || echo "{}")
+
+  ISSUE_NUM=$(echo "$RESPONSE" | grep -oP '"number":\s*\K[0-9]+' | head -1)
+
+  if [[ -n "$ISSUE_NUM" ]]; then
+    # Apply label (separate call — more reliable across Gitea versions)
+    LABEL_ID=$(curl -sf \
+      -H "Authorization: token ${GITEA_TOKEN}" \
+      "${API}/labels" 2>/dev/null \
+      | grep -oP "\"id\":\s*\K[0-9]+(?=[^}]*\"name\":\s*\"${LABEL_NAME}\")" \
+      | head -1 || true)
+
+    if [[ -n "$LABEL_ID" ]]; then
+      curl -sf -X POST \
+        -H "Authorization: token ${GITEA_TOKEN}" \
+        -H "Content-Type: application/json" \
+        "${API}/issues/${ISSUE_NUM}/labels" \
+        -d "{\"labels\":[${LABEL_ID}]}" \
+        > /dev/null 2>&1 || true
+    fi
+
+    echo "Created issue #${ISSUE_NUM}: ${TITLE}"
+  else
+    echo "WARNING: Failed to create issue"
+    echo "Response: ${RESPONSE}"
+  fi
+fi

src/helper/migrate.php

@@ -236,11 +236,11 @@ use Joomla\CMS\Log\Log;
 
     // Update the update server
     try {
-        $onyxUpdatesUrl = 'https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/main/updates.xml';
+        $onyxUpdatesUrl = 'https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/updates.xml';
         $query = $db->getQuery(true)
             ->update('#__update_sites')
             ->set($db->quoteName('location') . ' = ' . $db->quote($onyxUpdatesUrl))
-            ->set($db->quoteName('name') . ' = ' . $db->quote($newDisplay))
+            ->set($db->quoteName('name') . ' = ' . $db->quote('Template - MokoOnyx'))
             ->where($db->quoteName('location') . ' LIKE ' . $db->quote('%MokoCassiopeia%'));
         $db->setQuery($query)->execute();
         $n = $db->getAffectedRows();

src/helper/minify.php

@@ -161,7 +161,7 @@ class MokoMinifyHelper
         $js = preg_replace('/\s*([{}();,=+\-*\/<>!&|?:])\s*/', '$1', $js);
 
         // Restore necessary spaces (after keywords)
-        $js = preg_replace('/(var|let|const|return|typeof|instanceof|new|delete|throw|case|in|of)([^\s;})><=!&|?:,])/', '$1 $2', $js);
+        $js = preg_replace('/\b(var|let|const|return|typeof|instanceof|new|delete|throw|case|in|of)\b([^\s;})><=!&|?:,])/', '$1 $2', $js);
 
         return trim($js);
     }

src/html/com_joomgallery/category/default.php

@@ -1,61 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
- *
- * This file is part of a Moko Consulting project.
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * FILE INFORMATION
- * DEFGROUP: MokoOnyx.Override
- * INGROUP: MokoOnyx
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
- * PATH: /html/com_joomgallery/category/default.php
-<<<<<<< HEAD
-<<<<<<< HEAD
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
->>>>>>> origin/main
->>>>>>> origin/main
- * BRIEF: Category view override — password gate then loads default_cat sub-layout
- */
-
-// No direct access
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\HTML\HTMLHelper;
-
-// Import CSS & JS
-$wa = $this->document->getWebAssetManager();
-$wa->useStyle('com_joomgallery.site');
-$wa->useStyle('com_joomgallery.jg-icon-font');
-?>
-
-<?php if ($this->item->pw_protected) : ?>
-	<div class="com-joomgallery-category--locked">
-		<form action="<?php echo Route::_('index.php?task=category.unlock&catid=' . $this->item->id); ?>" method="post" class="row g-3 align-items-end" autocomplete="off">
-			<div class="col-12">
-				<h3><i class="jg-icon-lock me-2" aria-hidden="true"></i><?php echo Text::_('COM_JOOMGALLERY_CATEGORY_PASSWORD_PROTECTED'); ?></h3>
-			</div>
-			<div class="col-auto">
-				<label for="jg_password" class="form-label"><?php echo Text::_('JGLOBAL_PASSWORD'); ?></label>
-				<input type="password" name="password" id="jg_password" class="form-control" required />
-			</div>
-			<div class="col-auto">
-				<button type="submit" class="btn btn-primary" id="jg_unlock_button">
-					<i class="jg-icon-unlock me-1" aria-hidden="true"></i><?php echo Text::_('COM_JOOMGALLERY_CATEGORY_BUTTON_UNLOCK'); ?>
-				</button>
-			</div>
-			<?php echo HTMLHelper::_('form.token'); ?>
-		</form>
-	</div>
-<?php else : ?>
-	<?php echo $this->loadTemplate('cat'); ?>
-<?php endif; ?>

src/html/com_joomgallery/category/default_cat.php

@@ -1,229 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
- *
- * This file is part of a Moko Consulting project.
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * FILE INFORMATION
- * DEFGROUP: MokoOnyx.Override
- * INGROUP: MokoOnyx
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
- * PATH: /html/com_joomgallery/category/default_cat.php
-<<<<<<< HEAD
-<<<<<<< HEAD
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
->>>>>>> origin/main
->>>>>>> origin/main
- * BRIEF: Category sub-layout — subcategories grid + images grid with pagination
- */
-
-// No direct access
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Layout\LayoutHelper;
-use Joomgallery\Component\Joomgallery\Administrator\Helper\JoomHelper;
-
-// Image params
-$image_type             = $this->params['configs']->get('jg_category_view_type_image', 'thumbnail', 'STRING');
-$gallery_class          = $this->params['configs']->get('jg_category_view_class', 'masonry', 'STRING');
-$num_columns            = $this->params['configs']->get('jg_category_view_num_columns', 3, 'INT');
-$image_class            = $this->params['configs']->get('jg_category_view_image_class', 0, 'INT');
-$justified_height       = $this->params['configs']->get('jg_category_view_justified_height', 200, 'INT');
-$justified_gap          = $this->params['configs']->get('jg_category_view_justified_gap', 5, 'INT');
-$image_link             = $this->params['configs']->get('jg_category_view_image_link', 'defaultview', 'STRING');
-$lightbox_image         = $this->params['configs']->get('jg_category_view_lightbox_image', 'detail', 'STRING');
-$pagination_type        = $this->params['configs']->get('jg_category_view_pagination', 0, 'INT');
-$show_subcategories     = $this->params['configs']->get('jg_category_view_subcategories', 1, 'INT');
-$subcategory_type_image = $this->params['configs']->get('jg_category_view_type_subcategory_image', 'thumbnail', 'STRING');
-$num_columns_subcats    = $this->params['configs']->get('jg_category_view_subcategories_num_columns', 3, 'INT');
-
-// Import CSS & JS
-$wa = $this->document->getWebAssetManager();
-
-if ($gallery_class == 'masonry') {
-	$wa->useScript('com_joomgallery.masonry');
-}
-
-if ($gallery_class == 'justified') {
-	$wa->useScript('com_joomgallery.justified');
-	$wa->addInlineStyle('.jg-images[class*=" justified-"] .jg-image-caption-hover { right: ' . $justified_gap . 'px; }');
-}
-
-$lightbox = false;
-if ($image_link == 'lightgallery') {
-	$lightbox = true;
-	$wa->useScript('com_joomgallery.lightgallery');
-	$wa->useScript('com_joomgallery.lg-thumbnail');
-	$wa->useStyle('com_joomgallery.lightgallery-bundle');
-}
-
-// Initialise the grid script
-$iniJS  = 'window.joomGrid = {';
-$iniJS .= '  itemid: ' . $this->item->id . ',';
-$iniJS .= '  pagination: ' . $pagination_type . ',';
-$iniJS .= '  layout: "' . $gallery_class . '",';
-$iniJS .= '  num_columns: ' . $num_columns . ',';
-$iniJS .= '  lightbox: ' . ($lightbox ? 'true' : 'false') . ',';
-$iniJS .= '  justified: {height: ' . $justified_height . ', gap: ' . $justified_gap . '}';
-$iniJS .= '};';
-
-$wa->addInlineScript($iniJS, ['position' => 'before'], [], ['com_joomgallery.joomgrid']);
-$wa->useScript('com_joomgallery.joomgrid');
-
-// Access check
-$canEdit    = $this->getAcl()->checkACL('edit', 'com_joomgallery.category', $this->item->id, $this->item->parent_id, true);
-$canAdd     = $this->getAcl()->checkACL('add', 'com_joomgallery.image', 0, $this->item->id, true);
-$canDelete  = $this->getAcl()->checkACL('delete', 'com_joomgallery.category', $this->item->id, $this->item->parent_id, true);
-$canCheckin = $this->getAcl()->checkACL('editstate', 'com_joomgallery.category', $this->item->id, $this->item->parent_id, true) || $this->item->checked_out == Factory::getUser()->id;
-$returnURL  = base64_encode(JoomHelper::getViewRoute('category', $this->item->id, $this->item->parent_id, $this->item->language, $this->getLayout()));
-
-$hasSubcats = $show_subcategories && !empty($this->item->children->items) && count($this->item->children->items) > 0;
-$hasImages  = !empty($this->item->images->items) && count($this->item->images->items) > 0;
-?>
-
-<div class="com-joomgallery-category" itemscope itemtype="https://schema.org/ImageGallery">
-	<?php // Page heading ?>
-	<?php if ($this->params['menu']->get('show_page_heading')) : ?>
-		<div class="page-header">
-			<h1><?php echo $this->escape($this->params['menu']->get('page_heading')); ?></h1>
-		</div>
-	<?php endif; ?>
-
-	<?php // Category title ?>
-	<h2 itemprop="name"><?php echo $this->escape($this->item->title); ?></h2>
-
-	<?php // Category description ?>
-	<?php if (!empty($this->item->description)) : ?>
-		<div class="com-joomgallery-category__description mb-3" itemprop="description">
-			<?php echo $this->item->description; ?>
-		</div>
-	<?php endif; ?>
-
-	<?php // Admin buttons ?>
-	<?php if ($canEdit || $canCheckin || $canAdd || $canDelete) : ?>
-		<div class="com-joomgallery-category__actions btn-toolbar mb-3" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
-			<?php if ($canCheckin && $this->item->checked_out > 0) : ?>
-				<a class="btn btn-outline-secondary btn-sm me-2" href="<?php echo Route::_('index.php?option=com_joomgallery&task=category.checkin&id=' . $this->item->id . '&return=' . $returnURL . '&' . Session::getFormToken() . '=1'); ?>">
-					<i class="jg-icon-checkin me-1" aria-hidden="true"></i><?php echo Text::_('JLIB_HTML_CHECKIN'); ?>
-				</a>
-			<?php endif; ?>
-
-			<?php if ($canEdit) : ?>
-				<a class="btn btn-outline-primary btn-sm me-2<?php echo ($this->item->checked_out > 0) ? ' disabled' : ''; ?>" href="<?php echo Route::_('index.php?option=com_joomgallery&task=category.edit&id=' . $this->item->id . '&return=' . $returnURL); ?>">
-					<i class="jg-icon-edit me-1" aria-hidden="true"></i><?php echo Text::_('JGLOBAL_EDIT'); ?>
-				</a>
-			<?php endif; ?>
-
-			<?php if ($canAdd) : ?>
-				<a class="btn btn-outline-success btn-sm me-2<?php echo ($this->item->checked_out > 0) ? ' disabled' : ''; ?>" href="<?php echo Route::_('index.php?option=com_joomgallery&task=image.add&catid=' . $this->item->id . '&return=' . $returnURL); ?>">
-					<i class="jg-icon-upload me-1" aria-hidden="true"></i><?php echo Text::_('COM_JOOMGALLERY_IMG_UPLOAD_IMAGE'); ?>
-				</a>
-			<?php endif; ?>
-
-			<?php if ($canDelete) : ?>
-				<a class="btn btn-outline-danger btn-sm<?php echo ($this->item->checked_out > 0) ? ' disabled' : ''; ?>" href="#deleteCatModal" role="button" data-bs-toggle="modal">
-					<i class="jg-icon-delete me-1" aria-hidden="true"></i><?php echo Text::_('JACTION_DELETE'); ?>
-				</a>
-				<?php echo HTMLHelper::_(
-					'bootstrap.renderModal',
-					'deleteCatModal',
-					[
-						'title'      => Text::_('JACTION_DELETE'),
-						'modalWidth' => '50',
-						'bodyHeight' => '100',
-						'footer'     => '<button class="btn btn-secondary" data-bs-dismiss="modal">' . Text::_('JCANCEL') . '</button>'
-							. '<a href="' . Route::_('index.php?option=com_joomgallery&task=category.remove&id=' . $this->item->id . '&return=' . $returnURL . '&' . Session::getFormToken() . '=1', false, 2) . '" class="btn btn-danger">' . Text::_('JACTION_DELETE') . '</a>',
-					],
-					Text::_('COM_JOOMGALLERY_COMMON_ALERT_SURE_DELETE_SELECTED_ITEM')
-				); ?>
-			<?php endif; ?>
-		</div>
-	<?php endif; ?>
-
-	<?php // Subcategories ?>
-	<?php if ($hasSubcats) : ?>
-		<section class="com-joomgallery-category__subcategories mb-4" aria-label="<?php echo Text::_('COM_JOOMGALLERY_SUBCATEGORIES'); ?>">
-			<h3><?php echo Text::_('COM_JOOMGALLERY_SUBCATEGORIES'); ?></h3>
-			<?php
-			$catsData = [
-				'id'          => (int) $this->item->id,
-				'items'       => $this->item->children->items,
-				'num_columns' => (int) $num_columns_subcats,
-				'image_type'  => $subcategory_type_image,
-			];
-			echo LayoutHelper::render('joomgallery.grids.categories', $catsData);
-			?>
-		</section>
-	<?php endif; ?>
-
-	<?php // Images ?>
-	<?php if ($hasImages) : ?>
-		<section class="com-joomgallery-category__images" aria-label="<?php echo Text::_('COM_JOOMGALLERY_IMAGES'); ?>">
-			<?php if ($hasSubcats) : ?>
-				<h3><?php echo Text::_('COM_JOOMGALLERY_IMAGES'); ?></h3>
-			<?php endif; ?>
-
-			<?php
-			$imgsData = [
-				'id'            => (int) $this->item->id,
-				'layout'        => $gallery_class,
-				'items'         => $this->item->images->items,
-				'num_columns'   => (int) $num_columns,
-				'caption_align' => 'center',
-				'image_class'   => $image_class,
-				'image_type'    => $image_type,
-				'lightbox_type' => $lightbox_image,
-				'image_link'    => $image_link,
-				'image_title'   => false,
-				'title_link'    => 'defaultview',
-				'image_desc'    => false,
-				'image_date'    => false,
-				'image_author'  => false,
-				'image_tags'    => false,
-			];
-			echo LayoutHelper::render('joomgallery.grids.images', $imgsData);
-			?>
-
-			<?php // Pagination ?>
-			<nav class="mt-4" aria-label="<?php echo Text::_('JLIB_HTML_PAGINATION'); ?>">
-				<?php echo $this->item->images->pagination->getListFooter(); ?>
-			</nav>
-		</section>
-	<?php elseif (!$hasSubcats) : ?>
-		<div class="alert alert-info" role="alert">
-			<p class="mb-0"><?php echo Text::_('COM_JOOMGALLERY_GALLERY_NO_IMAGES'); ?></p>
-		</div>
-	<?php endif; ?>
-
-	<?php // Back to parent category ?>
-	<?php if ($this->item->parent_id > 0 && $this->item->parent_id != 1) : ?>
-		<div class="mt-4">
-			<a class="btn btn-outline-secondary" href="<?php echo Route::_('index.php?option=com_joomgallery&view=category&id=' . (int) $this->item->parent_id); ?>">
-				<i class="jg-icon-arrow-left-alt me-1" aria-hidden="true"></i><?php echo Text::_('COM_JOOMGALLERY_BACK'); ?>
-			</a>
-		</div>
-	<?php endif; ?>
-
-	<script>
-	if (window.joomGrid.layout != 'justified') {
-		document.querySelectorAll('.' + window.joomGrid.imgclass).forEach(function(image) {
-			image.addEventListener('load', function() {
-				this.closest('.' + window.joomGrid.imgboxclass).classList.add('loaded');
-			});
-		});
-	}
-	</script>
-</div>

src/html/com_joomgallery/category/index.html

@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>

src/html/com_joomgallery/gallery/default.php

@@ -1,148 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
- *
- * This file is part of a Moko Consulting project.
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * FILE INFORMATION
- * DEFGROUP: MokoOnyx.Override
- * INGROUP: MokoOnyx
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
- * PATH: /html/com_joomgallery/gallery/default.php
-<<<<<<< HEAD
-<<<<<<< HEAD
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
->>>>>>> origin/main
->>>>>>> origin/main
- * BRIEF: Gallery view override — main image grid with masonry/justified layout
- */
-
-// No direct access
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Layout\LayoutHelper;
-
-// Image params
-$image_type              = $this->params['configs']->get('jg_gallery_view_type_image', 'thumbnail', 'STRING');
-$gallery_class           = $this->params['configs']->get('jg_gallery_view_class', 'masonry', 'STRING');
-$num_columns             = $this->params['configs']->get('jg_gallery_view_num_columns', 3, 'INT');
-$image_class             = $this->params['configs']->get('jg_gallery_view_image_class', 0, 'INT');
-$justified_height        = $this->params['configs']->get('jg_gallery_view_justified_height', 200, 'INT');
-$justified_gap           = $this->params['configs']->get('jg_gallery_view_justified_gap', 5, 'INT');
-$image_link              = $this->params['configs']->get('jg_gallery_view_image_link', 'defaultview', 'STRING');
-$lightbox_image          = $this->params['configs']->get('jg_category_view_lightbox_image', 'detail', 'STRING');
-$browse_categories_link  = $this->params['configs']->get('jg_gallery_view_browse_categories_link', 1, 'INT');
-
-// Import CSS & JS
-$wa = $this->document->getWebAssetManager();
-$wa->useStyle('com_joomgallery.site');
-$wa->useStyle('com_joomgallery.jg-icon-font');
-
-if ($gallery_class == 'masonry') {
-	$wa->useScript('com_joomgallery.masonry');
-}
-
-if ($gallery_class == 'justified') {
-	$wa->useScript('com_joomgallery.justified');
-	$wa->addInlineStyle('.jg-images[class*=" justified-"] .jg-image-caption-hover { right: ' . $justified_gap . 'px; }');
-}
-
-$lightbox = false;
-if ($image_link == 'lightgallery') {
-	$lightbox = true;
-	$wa->useScript('com_joomgallery.lightgallery');
-	$wa->useScript('com_joomgallery.lg-thumbnail');
-	$wa->useStyle('com_joomgallery.lightgallery-bundle');
-}
-
-// Initialise the grid script
-$iniJS  = 'window.joomGrid = {';
-$iniJS .= '  itemid: ' . $this->item->id . ',';
-$iniJS .= '  pagination: 0,';
-$iniJS .= '  layout: "' . $gallery_class . '",';
-$iniJS .= '  num_columns: ' . $num_columns . ',';
-$iniJS .= '  lightbox: ' . ($lightbox ? 'true' : 'false') . ',';
-$iniJS .= '  justified: {height: ' . $justified_height . ', gap: ' . $justified_gap . '}';
-$iniJS .= '};';
-
-$wa->addInlineScript($iniJS, ['position' => 'before'], [], ['com_joomgallery.joomgrid']);
-$wa->useScript('com_joomgallery.joomgrid');
-?>
-
-<div class="com-joomgallery-gallery" itemscope itemtype="https://schema.org/ImageGallery">
-	<?php if ($this->params['menu']->get('show_page_heading')) : ?>
-		<div class="page-header">
-			<h1><?php echo $this->escape($this->params['menu']->get('page_heading')); ?></h1>
-		</div>
-	<?php endif; ?>
-
-	<?php // Browse categories link (top) ?>
-	<?php if ($browse_categories_link == '1') : ?>
-		<div class="text-center mb-4">
-			<a class="btn btn-outline-primary" href="<?php echo Route::_('index.php?option=com_joomgallery&view=category&id=1'); ?>">
-				<i class="jg-icon-folder me-1" aria-hidden="true"></i><?php echo Text::_('COM_JOOMGALLERY_GALLERY_VIEW_BROWSE_CATEGORIES'); ?>
-			</a>
-		</div>
-	<?php endif; ?>
-
-	<?php if (count($this->item->images->items) == 0) : ?>
-		<div class="alert alert-info" role="alert">
-			<p class="mb-0"><?php echo Text::_('COM_JOOMGALLERY_GALLERY_NO_IMAGES'); ?></p>
-		</div>
-	<?php else : ?>
-		<?php
-		$imgsData = [
-			'id'            => (int) $this->item->id,
-			'layout'        => $gallery_class,
-			'items'         => $this->item->images->items,
-			'num_columns'   => (int) $num_columns,
-			'caption_align' => 'center',
-			'image_class'   => $image_class,
-			'image_type'    => $image_type,
-			'lightbox_type' => $lightbox_image,
-			'image_link'    => $image_link,
-			'image_title'   => false,
-			'title_link'    => 'defaultview',
-			'image_desc'    => false,
-			'image_date'    => false,
-			'image_author'  => false,
-			'image_tags'    => false,
-		];
-		?>
-		<?php echo LayoutHelper::render('joomgallery.grids.images', $imgsData); ?>
-
-		<?php // Pagination ?>
-		<nav class="mt-4" aria-label="<?php echo Text::_('JLIB_HTML_PAGINATION'); ?>">
-			<?php echo $this->item->images->pagination->getListFooter(); ?>
-		</nav>
-	<?php endif; ?>
-
-	<?php // Browse categories link (bottom) ?>
-	<?php if ($browse_categories_link == '2') : ?>
-		<div class="text-center mt-4">
-			<a class="btn btn-outline-primary" href="<?php echo Route::_('index.php?option=com_joomgallery&view=category&id=1'); ?>">
-				<i class="jg-icon-folder me-1" aria-hidden="true"></i><?php echo Text::_('COM_JOOMGALLERY_GALLERY_VIEW_BROWSE_CATEGORIES'); ?>
-			</a>
-		</div>
-	<?php endif; ?>
-
-	<script>
-	if (window.joomGrid.layout != 'justified') {
-		document.querySelectorAll('.' + window.joomGrid.imgclass).forEach(function(image) {
-			image.addEventListener('load', function() {
-				this.closest('.' + window.joomGrid.imgboxclass).classList.add('loaded');
-			});
-		});
-	}
-	</script>
-</div>

src/html/com_joomgallery/gallery/index.html

@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>

src/html/com_joomgallery/image/default.php

@@ -1,259 +0,0 @@
-<?php
-/**
- * Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
- *
- * This file is part of a Moko Consulting project.
- *
- * SPDX-License-Identifier: GPL-3.0-or-later
- *
- * FILE INFORMATION
- * DEFGROUP: MokoOnyx.Override
- * INGROUP: MokoOnyx
- * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
- * PATH: /html/com_joomgallery/image/default.php
-<<<<<<< HEAD
-<<<<<<< HEAD
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
->>>>>>> origin/main
->>>>>>> origin/main
- * BRIEF: Image detail view override — single image with metadata, tags, custom fields
- */
-
-// No direct access
-defined('_JEXEC') or die;
-
-use Joomla\CMS\Factory;
-use Joomla\CMS\Router\Route;
-use Joomla\CMS\Language\Text;
-use Joomla\CMS\Session\Session;
-use Joomla\CMS\HTML\HTMLHelper;
-use Joomla\CMS\Layout\FileLayout;
-use Joomla\CMS\User\UserFactoryInterface;
-use Joomla\Component\Fields\Administrator\Helper\FieldsHelper;
-use Joomgallery\Component\Joomgallery\Administrator\Helper\JoomHelper;
-
-// Image params
-$image_type        = $this->params['configs']->get('jg_detail_view_type_image', 'detail', 'STRING');
-$show_title        = $this->params['configs']->get('jg_detail_view_show_title', 0, 'INT');
-$show_category     = $this->params['configs']->get('jg_detail_view_show_category', 0, 'INT');
-$show_description  = $this->params['configs']->get('jg_detail_view_show_description', 0, 'INT');
-$show_imgdate      = $this->params['configs']->get('jg_detail_view_show_imgdate', 0, 'INT');
-$show_imgauthor    = $this->params['configs']->get('jg_detail_view_show_imgauthor', 0, 'INT');
-$show_created_by   = $this->params['configs']->get('jg_detail_view_show_created_by', 0, 'INT');
-$show_votes        = $this->params['configs']->get('jg_detail_view_show_votes', 0, 'INT');
-$show_rating       = $this->params['configs']->get('jg_detail_view_show_rating', 0, 'INT');
-$show_hits         = $this->params['configs']->get('jg_detail_view_show_hits', 0, 'INT');
-$show_downloads    = $this->params['configs']->get('jg_detail_view_show_downloads', 0, 'INT');
-$show_tags         = $this->params['configs']->get('jg_detail_view_show_tags', 0, 'INT');
-$show_metadata     = $this->params['configs']->get('jg_detail_view_show_metadata', 0, 'INT');
-
-// Import CSS & JS
-$wa = $this->document->getWebAssetManager();
-$wa->useStyle('com_joomgallery.site');
-$wa->useStyle('com_joomgallery.jg-icon-font');
-
-// Access check
-$canEdit    = $this->getAcl()->checkACL('edit', 'com_joomgallery.image', $this->item->id, $this->item->catid, true);
-$canDelete  = $this->getAcl()->checkACL('delete', 'com_joomgallery.image', $this->item->id, $this->item->catid, true);
-$canCheckin = $this->getAcl()->checkACL('editstate', 'com_joomgallery.image', $this->item->id, $this->item->catid, true) || $this->item->checked_out == Factory::getUser()->id;
-$returnURL  = base64_encode(JoomHelper::getViewRoute('image', $this->item->id, $this->item->catid, $this->item->language, $this->getLayout()));
-
-// Tags
-$tagLayout = new FileLayout('joomgallery.content.tags');
-$tags = $tagLayout->render($this->item->tags);
-
-// Metadata
-$metadataLayout = new FileLayout('joomgallery.content.metadata');
-$metadata = $metadataLayout->render($this->item->imgmetadata);
-
-// Custom Fields
-$fields = FieldsHelper::getFields('com_joomgallery.image', $this->item);
-
-// Check if we have any info rows to show
-$hasInfo = $show_category || $show_imgdate || $show_imgauthor || $show_created_by
-	|| $show_votes || $show_rating || $show_hits || $show_downloads
-	|| $show_tags || $show_metadata || count($fields) > 0;
-?>
-
-<div class="com-joomgallery-image" itemscope itemtype="https://schema.org/ImageObject">
-	<?php if ($show_title) : ?>
-		<h2 itemprop="name"><?php echo $this->escape($this->item->title); ?></h2>
-	<?php endif; ?>
-
-	<?php // Back to category ?>
-	<a class="btn btn-outline-primary btn-sm mb-3" href="<?php echo Route::_('index.php?option=com_joomgallery&view=category&id=' . (int) $this->item->catid); ?>">
-		<i class="jg-icon-arrow-left-alt me-1" aria-hidden="true"></i><?php echo Text::_('COM_JOOMGALLERY_IMAGE_BACK_TO_CATEGORY') . ' ' . $this->escape($this->item->cattitle); ?>
-	</a>
-
-	<?php // Admin buttons ?>
-	<?php if ($canEdit || $canCheckin || $canDelete) : ?>
-		<div class="com-joomgallery-image__actions btn-toolbar mb-3" role="toolbar" aria-label="<?php echo Text::_('JTOOLBAR'); ?>">
-			<?php if ($canCheckin && $this->item->checked_out > 0) : ?>
-				<a class="btn btn-outline-secondary btn-sm me-2" href="<?php echo Route::_('index.php?option=com_joomgallery&task=image.checkin&id=' . $this->item->id . '&return=' . $returnURL . '&' . Session::getFormToken() . '=1'); ?>">
-					<i class="jg-icon-checkin me-1" aria-hidden="true"></i><?php echo Text::_('JLIB_HTML_CHECKIN'); ?>
-				</a>
-			<?php endif; ?>
-
-			<?php if ($canEdit) : ?>
-				<a class="btn btn-outline-primary btn-sm me-2<?php echo ($this->item->checked_out > 0) ? ' disabled' : ''; ?>" href="<?php echo Route::_('index.php?option=com_joomgallery&task=image.edit&id=' . $this->item->id . '&return=' . $returnURL); ?>">
-					<i class="jg-icon-edit me-1" aria-hidden="true"></i><?php echo Text::_('JGLOBAL_EDIT'); ?>
-				</a>
-			<?php endif; ?>
-
-			<?php if ($canDelete) : ?>
-				<a class="btn btn-outline-danger btn-sm<?php echo ($this->item->checked_out > 0) ? ' disabled' : ''; ?>" href="#deleteImgModal" role="button" data-bs-toggle="modal">
-					<i class="jg-icon-delete me-1" aria-hidden="true"></i><?php echo Text::_('JACTION_DELETE'); ?>
-				</a>
-				<?php echo HTMLHelper::_(
-					'bootstrap.renderModal',
-					'deleteImgModal',
-					[
-						'title'      => Text::_('JACTION_DELETE'),
-						'modalWidth' => '50',
-						'bodyHeight' => '100',
-						'footer'     => '<button class="btn btn-secondary" data-bs-dismiss="modal">' . Text::_('JCANCEL') . '</button>'
-							. '<a href="' . Route::_('index.php?option=com_joomgallery&task=image.remove&id=' . $this->item->id . '&return=' . $returnURL . '&' . Session::getFormToken() . '=1', false, 2) . '" class="btn btn-danger">' . Text::_('COM_JOOMGALLERY_COMMON_DELETE_IMAGE_TIPCAPTION') . '</a>',
-					],
-					Text::_('COM_JOOMGALLERY_COMMON_ALERT_SURE_DELETE_SELECTED_ITEM')
-				); ?>
-			<?php endif; ?>
-		</div>
-	<?php endif; ?>
-
-	<?php // Image ?>
-	<figure class="figure com-joomgallery-image__figure text-center w-100 mb-4">
-		<div id="jg-loader"></div>
-		<img
-			src="<?php echo JoomHelper::getImg($this->item, $image_type); ?>"
-			class="figure-img img-fluid rounded"
-			alt="<?php echo $this->escape($this->item->title); ?>"
-			style="width:auto;"
-			itemprop="contentUrl"
-			loading="lazy"
-		/>
-		<?php if ($show_description && !empty($this->item->description)) : ?>
-			<figcaption class="figure-caption" itemprop="description"><?php echo $this->item->description; ?></figcaption>
-		<?php endif; ?>
-	</figure>
-
-	<?php // Image info table ?>
-	<?php if ($hasInfo) : ?>
-		<div class="com-joomgallery-image__info">
-			<h3><?php echo Text::_('COM_JOOMGALLERY_IMAGE_INFO'); ?></h3>
-			<table class="table table-striped">
-				<tbody>
-					<?php if ($show_category) : ?>
-						<tr>
-							<th scope="row"><?php echo Text::_('JCATEGORY'); ?></th>
-							<td>
-								<a href="<?php echo Route::_('index.php?option=com_joomgallery&view=category&id=' . (int) $this->item->catid); ?>">
-									<?php echo $this->escape($this->item->cattitle); ?>
-								</a>
-							</td>
-						</tr>
-					<?php endif; ?>
-
-					<?php if ($show_imgdate) : ?>
-						<tr>
-							<th scope="row"><?php echo Text::_('COM_JOOMGALLERY_DATE'); ?></th>
-							<td>
-								<time datetime="<?php echo HTMLHelper::_('date', $this->item->date, 'c'); ?>" itemprop="dateCreated">
-									<?php echo HTMLHelper::_('date', $this->item->date, Text::_('DATE_FORMAT_LC4')); ?>
-								</time>
-							</td>
-						</tr>
-					<?php endif; ?>
-
-					<?php if ($show_imgauthor) : ?>
-						<tr>
-							<th scope="row"><?php echo Text::_('JAUTHOR'); ?></th>
-							<td itemprop="author"><?php echo $this->escape($this->item->author); ?></td>
-						</tr>
-					<?php endif; ?>
-
-					<?php if ($show_created_by) : ?>
-						<?php $user = Factory::getContainer()->get(UserFactoryInterface::class)->loadUserById($this->item->created_by); ?>
-						<tr>
-							<th scope="row"><?php echo Text::_('COM_JOOMGALLERY_OWNER'); ?></th>
-							<td><?php echo $this->escape($user->name); ?></td>
-						</tr>
-					<?php endif; ?>
-
-					<?php if ($show_votes) : ?>
-						<tr>
-							<th scope="row"><?php echo Text::_('COM_JOOMGALLERY_VOTES'); ?></th>
-							<td><?php echo $this->escape($this->item->votes); ?></td>
-						</tr>
-					<?php endif; ?>
-
-					<?php if ($show_rating) : ?>
-						<tr>
-							<th scope="row"><?php echo Text::_('COM_JOOMGALLERY_IMAGE_RATING'); ?></th>
-							<td><?php echo $this->escape($this->item->rating); ?></td>
-						</tr>
-					<?php endif; ?>
-
-					<?php if ($show_hits) : ?>
-						<tr>
-							<th scope="row"><?php echo Text::_('JGLOBAL_HITS'); ?></th>
-							<td><?php echo (int) $this->item->hits; ?></td>
-						</tr>
-					<?php endif; ?>
-
-					<?php if ($show_downloads) : ?>
-						<tr>
-							<th scope="row"><?php echo Text::_('COM_JOOMGALLERY_DOWNLOADS'); ?></th>
-							<td><?php echo (int) $this->item->downloads; ?></td>
-						</tr>
-					<?php endif; ?>
-
-					<?php if ($show_tags) : ?>
-						<tr>
-							<th scope="row"><?php echo Text::_('COM_JOOMGALLERY_TAGS'); ?></th>
-							<td><?php echo $tags; ?></td>
-						</tr>
-					<?php endif; ?>
-
-					<?php if ($show_metadata) : ?>
-						<tr>
-							<th scope="row"><?php echo Text::_('COM_JOOMGALLERY_IMGMETADATA'); ?></th>
-							<td><?php echo $metadata; ?></td>
-						</tr>
-					<?php endif; ?>
-
-					<?php // Custom fields ?>
-					<?php if (count($fields) > 0) : ?>
-						<tr>
-							<th scope="row" colspan="2"><strong><?php echo Text::_('JGLOBAL_FIELDS'); ?></strong></th>
-						</tr>
-						<?php foreach ($fields as $field) : ?>
-							<?php if ($this->component->getAccess()->checkViewLevel($field->access) && $field->params->get('display') > 0) : ?>
-								<tr class="<?php echo $this->escape($field->params->get('render_class')); ?>">
-									<?php if ($field->params->get('showlabel', true)) : ?>
-										<th scope="row" class="<?php echo $this->escape($field->params->get('label_render_class')); ?>"><?php echo $this->escape($field->title); ?></th>
-									<?php else : ?>
-										<th scope="row"></th>
-									<?php endif; ?>
-									<td class="<?php echo $this->escape($field->params->get('value_render_class')); ?>"><?php echo $field->value; ?></td>
-								</tr>
-							<?php endif; ?>
-						<?php endforeach; ?>
-					<?php endif; ?>
-				</tbody>
-			</table>
-		</div>
-	<?php endif; ?>
-
-	<script>
-	window.onload = function() {
-		var el = document.querySelector('#jg-loader');
-		if (el) el.classList.add('hidden');
-	};
-	</script>
-</div>

src/html/com_joomgallery/image/index.html

@@ -1 +0,0 @@
-<!DOCTYPE html><title></title>

src/html/layouts/joomla/module/card.php

@@ -10,17 +10,7 @@
  * INGROUP: MokoOnyx
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
  * PATH: /html/layouts/joomla/module/card.php
-<<<<<<< HEAD
+ * VERSION: 02.21.05
-<<<<<<< HEAD
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
->>>>>>> origin/main
->>>>>>> origin/main
  * BRIEF: Custom card module chrome — renders module titles for all modules
  */
 

src/html/layouts/mokoonyx/article-metadata.php

@@ -11,17 +11,7 @@
  * INGROUP: MokoOnyx.Layouts
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
  * PATH: /src/html/layouts/mokoonyx/article-metadata.php
-<<<<<<< HEAD
+ * VERSION: 02.21.05
-<<<<<<< HEAD
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
->>>>>>> origin/main
->>>>>>> origin/main
  * BRIEF: Article metadata footer layout -- renders jcfields grouped by field group
  */
 

src/html/layouts/mokoonyx/social-icons.php

@@ -0,0 +1,100 @@
+<?php
+/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
+
+ This file is part of a Moko Consulting project.
+
+ SPDX-License-Identifier: GPL-3.0-or-later
+ */
+
+defined('_JEXEC') or die;
+
+use Joomla\CMS\Language\Text;
+
+/**
+ * Social icons layout — rendered by index.php in topbar and/or footer.
+ *
+ * Expected $displayData keys:
+ *   'params'   => Joomla\Registry\Registry  (template params)
+ *   'position' => string                    ('topbar' | 'footer' | 'floating')
+ */
+
+$params   = $displayData['params'];
+$position = $displayData['position'] ?? 'footer';
+
+// Platform definitions: key => [FA icon class, language key for aria-label]
+$platforms = [
+    'facebook'   => ['fa-brands fa-facebook-f',   'TPL_MOKOONYX_SOCIAL_FACEBOOK'],
+    'twitter'    => ['fa-brands fa-x-twitter',     'TPL_MOKOONYX_SOCIAL_TWITTER'],
+    'instagram'  => ['fa-brands fa-instagram',     'TPL_MOKOONYX_SOCIAL_INSTAGRAM'],
+    'linkedin'   => ['fa-brands fa-linkedin-in',   'TPL_MOKOONYX_SOCIAL_LINKEDIN'],
+    'youtube'    => ['fa-brands fa-youtube',        'TPL_MOKOONYX_SOCIAL_YOUTUBE'],
+    'github'     => ['fa-brands fa-github',         'TPL_MOKOONYX_SOCIAL_GITHUB'],
+    'bluesky'    => ['fa-brands fa-bluesky',        'TPL_MOKOONYX_SOCIAL_BLUESKY'],
+    'threads'    => ['fa-brands fa-threads',        'TPL_MOKOONYX_SOCIAL_THREADS'],
+    'discord'    => ['fa-brands fa-discord',        'TPL_MOKOONYX_SOCIAL_DISCORD'],
+    'tiktok'     => ['fa-brands fa-tiktok',         'TPL_MOKOONYX_SOCIAL_TIKTOK'],
+    'reddit'     => ['fa-brands fa-reddit-alien',   'TPL_MOKOONYX_SOCIAL_REDDIT'],
+    'pinterest'  => ['fa-brands fa-pinterest-p',    'TPL_MOKOONYX_SOCIAL_PINTEREST'],
+    'snapchat'   => ['fa-brands fa-snapchat',       'TPL_MOKOONYX_SOCIAL_SNAPCHAT'],
+    'telegram'   => ['fa-brands fa-telegram',       'TPL_MOKOONYX_SOCIAL_TELEGRAM'],
+    'whatsapp'   => ['fa-brands fa-whatsapp',       'TPL_MOKOONYX_SOCIAL_WHATSAPP'],
+    'tumblr'     => ['fa-brands fa-tumblr',         'TPL_MOKOONYX_SOCIAL_TUMBLR'],
+    'twitch'     => ['fa-brands fa-twitch',         'TPL_MOKOONYX_SOCIAL_TWITCH'],
+    'spotify'    => ['fa-brands fa-spotify',        'TPL_MOKOONYX_SOCIAL_SPOTIFY'],
+    'soundcloud' => ['fa-brands fa-soundcloud',     'TPL_MOKOONYX_SOCIAL_SOUNDCLOUD'],
+    'flickr'     => ['fa-brands fa-flickr',         'TPL_MOKOONYX_SOCIAL_FLICKR'],
+    'vimeo'      => ['fa-brands fa-vimeo-v',        'TPL_MOKOONYX_SOCIAL_VIMEO'],
+    'linktree'   => ['fa-solid fa-link',            'TPL_MOKOONYX_SOCIAL_LINKTREE'],
+    'mail'       => ['fa-solid fa-envelope',        'TPL_MOKOONYX_SOCIAL_MAIL'],
+];
+
+// Collect enabled platforms (those with a non-empty URL)
+$active = [];
+foreach ($platforms as $key => [$iconClass, $langKey]) {
+    $url = trim((string) $params->get('social_' . $key . '_url', ''));
+    if ($url !== '' && preg_match('#^(https?://|mailto:|/)#i', $url)) {
+        $active[] = [
+            'url'       => $url,
+            'iconClass' => $iconClass,
+            'label'     => Text::_($langKey),
+        ];
+    }
+}
+
+if (empty($active)) {
+    return;
+}
+
+$style = in_array($params->get('social_icon_style'), ['plain', 'square', 'circle', 'rounded'], true)
+    ? $params->get('social_icon_style') : 'plain';
+$size  = in_array($params->get('social_icon_size'), ['sm', 'md', 'lg'], true)
+    ? $params->get('social_icon_size') : 'md';
+
+$floatingPos = in_array($params->get('social_floating_pos'), ['left', 'right'], true)
+    ? $params->get('social_floating_pos') : 'left';
+$colorMode = in_array($params->get('social_icon_color'), ['theme', 'brand', 'black', 'white'], true)
+    ? $params->get('social_icon_color') : 'theme';
+
+$listClass  = 'moko-social-icons';
+$listClass .= ' moko-social-icons--' . htmlspecialchars($style, ENT_QUOTES, 'UTF-8');
+$listClass .= ' moko-social-icons--' . htmlspecialchars($size, ENT_QUOTES, 'UTF-8');
+$listClass .= ' moko-social-icons--' . htmlspecialchars($position, ENT_QUOTES, 'UTF-8');
+$listClass .= ' moko-social-icons--color-' . $colorMode;
+if ($position === 'floating') {
+    $listClass .= ' moko-social-icons--floating-' . $floatingPos;
+}
+?>
+<nav class="<?php echo $listClass; ?>" aria-label="<?php echo Text::_('TPL_MOKOONYX_SOCIAL_NAV_LABEL'); ?>">
+    <ul>
+        <?php foreach ($active as $item) : ?>
+        <li>
+            <a href="<?php echo htmlspecialchars($item['url'], ENT_QUOTES, 'UTF-8'); ?>"
+               target="_blank"
+               rel="noopener noreferrer"
+               aria-label="<?php echo htmlspecialchars($item['label'], ENT_QUOTES, 'UTF-8'); ?>">
+                <span class="<?php echo htmlspecialchars($item['iconClass'], ENT_QUOTES, 'UTF-8'); ?>" aria-hidden="true"></span>
+            </a>
+        </li>
+        <?php endforeach; ?>
+    </ul>
+</nav>

src/html/mod_menu/default_component.php

@@ -33,6 +33,8 @@ if ($item->anchor_rel) {
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/default_heading.php

@@ -19,6 +19,8 @@ $anchor_css = $item->anchor_css ?: '';
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/default_separator.php

@@ -19,6 +19,8 @@ $anchor_css = $item->anchor_css ?: '';
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/default_url.php

@@ -33,6 +33,8 @@ if ($item->anchor_rel) {
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/horizontal_component.php

@@ -33,6 +33,8 @@ if ($item->anchor_rel) {
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/horizontal_heading.php

@@ -19,6 +19,8 @@ $anchor_css = $item->anchor_css ?: '';
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/horizontal_separator.php

@@ -19,6 +19,8 @@ $anchor_css = $item->anchor_css ?: '';
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/horizontal_url.php

@@ -33,6 +33,8 @@ if ($item->anchor_rel) {
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     if ($itemParams->get('menu_text', 1)) {
         $linktype = '<span class="' . $item->menu_icon . '" aria-hidden="true"></span>' . $item->title;
     } else {

src/html/mod_menu/mainmenu_component.php

@@ -33,6 +33,8 @@ if ($item->anchor_rel) {
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     // The link is an icon
     if ($itemParams->get('menu_text', 1)) {
         // If the link text is to be displayed, the icon is added with aria-hidden

src/html/mod_menu/mainmenu_heading.php

@@ -19,6 +19,8 @@ $anchor_css = $item->anchor_css ?: '';
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     // The link is an icon
     if ($itemParams->get('menu_text', 1)) {
         // If the link text is to be displayed, the icon is added with aria-hidden

src/html/mod_menu/mainmenu_separator.php

@@ -19,6 +19,8 @@ $anchor_css = $item->anchor_css ?: '';
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     // The link is an icon
     if ($itemParams->get('menu_text', 1)) {
         // If the link text is to be displayed, the icon is added with aria-hidden

src/html/mod_menu/mainmenu_url.php

@@ -33,6 +33,8 @@ if ($item->anchor_rel) {
 $linktype = $item->title;
 
 if ($item->menu_icon) {
+    // Strip Joomla-injected padding classes that conflict with FA icon sizing
+    $item->menu_icon = trim(preg_replace('/\bp-[0-5]\b/', '', $item->menu_icon));
     // The link is an icon
     if ($itemParams->get('menu_text', 1)) {
         // If the link text is to be displayed, the icon is added with aria-hidden

src/index.php

@@ -436,9 +436,12 @@ $wa->useScript('user.js');         // js/user.js
 <?php if (!$hideHeaderHome) : ?>
 <header id="top" class="header container-header full-width<?php echo $stickyHeader ? ' ' . $stickyHeader : ''; ?>" role="banner">
 
-	<?php if ($this->countModules('topbar')) : ?>
+	<?php if ($this->countModules('topbar') || $this->params->get('social_topbar')) : ?>
 		<div class="container-topbar">
 			<jdoc:include type="modules" name="topbar" style="none" />
+			<?php if ($this->params->get('social_topbar')) :
+				echo \Joomla\CMS\Layout\LayoutHelper::render('mokoonyx.social-icons', ['params' => $this->params, 'position' => 'topbar']);
+			endif; ?>
 		</div>
 	<?php endif; ?>
 
@@ -590,6 +593,11 @@ $wa->useScript('user.js');         // js/user.js
 </div>
 
 <footer class="container-footer footer full-width">
+	<?php if ($this->params->get('social_footer')) : ?>
+		<div class="grid-child footer-social">
+			<?php echo \Joomla\CMS\Layout\LayoutHelper::render('mokoonyx.social-icons', ['params' => $this->params, 'position' => 'footer']); ?>
+		</div>
+	<?php endif; ?>
 	<?php if ($this->countModules('footer-menu', true)) : ?>
 		<div class="grid-child footer-menu">
 			<jdoc:include type="modules" name="footer-menu" />
@@ -602,6 +610,10 @@ $wa->useScript('user.js');         // js/user.js
 	<?php endif; ?>
 </footer>
 
+<?php if ($this->params->get('social_floating')) :
+	echo \Joomla\CMS\Layout\LayoutHelper::render('mokoonyx.social-icons', ['params' => $this->params, 'position' => 'floating']);
+endif; ?>
+
 <?php if ($this->params->get('backTop') == 1) : ?>
 	<a href="#top" id="back-top" class="back-to-top-link" aria-label="<?php echo Text::_('TPL_MOKOONYX_BACKTOTOP'); ?>">
 		<span class="fa-solid fa-arrow-up" aria-hidden="true"></span>

src/language/en-GB/tpl_mokoonyx.ini

@@ -262,6 +262,67 @@ TPL_MOKOONYX_CSS_VARS_GABLE_DESC="Colour tokens used by the Gable extension.<br>
 TPL_MOKOONYX_CSS_VARS_FOOTER_LABEL="Footer"
 TPL_MOKOONYX_CSS_VARS_FOOTER_DESC="<strong>Spacing</strong><br><code>--footer-padding-top</code> — Top padding (default: <code>1rem</code>)<br><code>--footer-padding-bottom</code> — Bottom padding (default: <code>80px</code>)<br><code>--footer-grid-padding-y</code> — Grid vertical padding (default: <code>2.5rem</code>)<br><code>--footer-grid-padding-x</code> — Grid horizontal padding (default: <code>0.5em</code>)"
 
+; ===== Social Icons =====
+TPL_MOKOONYX_SOCIAL_FIELDSET_LABEL="Social Icons"
+TPL_MOKOONYX_SOCIAL_NOTE="<p>Add your social media profile URLs below. Only platforms with a URL will be displayed. Icons use Font Awesome 7 and inherit your template's theme colours.</p>"
+TPL_MOKOONYX_SOCIAL_TOPBAR_LABEL="Show in Topbar"
+TPL_MOKOONYX_SOCIAL_TOPBAR_DESC="Display social icons in the topbar area (right-aligned on desktop, centred on mobile)."
+TPL_MOKOONYX_SOCIAL_FOOTER_LABEL="Show in Footer"
+TPL_MOKOONYX_SOCIAL_FOOTER_DESC="Display social icons centred above the footer content."
+TPL_MOKOONYX_SOCIAL_STYLE_LABEL="Icon Style"
+TPL_MOKOONYX_SOCIAL_STYLE_DESC="Choose the visual style for social icons."
+TPL_MOKOONYX_SOCIAL_STYLE_PLAIN="Plain (no background)"
+TPL_MOKOONYX_SOCIAL_STYLE_SQUARE="Square background"
+TPL_MOKOONYX_SOCIAL_STYLE_CIRCLE="Circle background"
+TPL_MOKOONYX_SOCIAL_STYLE_ROUNDED="Rounded background"
+TPL_MOKOONYX_SOCIAL_SIZE_LABEL="Icon Size"
+TPL_MOKOONYX_SOCIAL_SIZE_DESC="Choose the size of social icons."
+TPL_MOKOONYX_SOCIAL_SIZE_SM="Small"
+TPL_MOKOONYX_SOCIAL_SIZE_MD="Medium"
+TPL_MOKOONYX_SOCIAL_SIZE_LG="Large"
+TPL_MOKOONYX_SOCIAL_FLOATING_LABEL="Show Floating Sidebar"
+TPL_MOKOONYX_SOCIAL_FLOATING_DESC="Display social icons as a fixed vertical bar on the side of the viewport. Hidden on mobile devices."
+TPL_MOKOONYX_SOCIAL_FLOATING_POS_LABEL="Floating Position"
+TPL_MOKOONYX_SOCIAL_FLOATING_POS_DESC="Which side of the screen the floating social bar appears on."
+TPL_MOKOONYX_SOCIAL_FLOATING_POS_LEFT="Left"
+TPL_MOKOONYX_SOCIAL_FLOATING_POS_RIGHT="Right"
+TPL_MOKOONYX_SOCIAL_COLOR_LABEL="Icon Colour"
+TPL_MOKOONYX_SOCIAL_COLOR_DESC="Choose the colour scheme for social icons."
+TPL_MOKOONYX_SOCIAL_COLOR_THEME="Theme (CSS variables)"
+TPL_MOKOONYX_SOCIAL_COLOR_BRAND="Brand colours"
+TPL_MOKOONYX_SOCIAL_COLOR_BLACK="Black"
+TPL_MOKOONYX_SOCIAL_COLOR_WHITE="White"
+TPL_MOKOONYX_SOCIAL_URLS_NOTE="<p>Enter the full URL for each platform. Leave blank to hide that icon.</p>"
+TPL_MOKOONYX_SOCIAL_MAIL_DESC="Use a mailto: link (e.g. mailto:hello@example.com) or a contact page URL."
+TPL_MOKOONYX_SOCIAL_NAV_LABEL="Social media links"
+TPL_MOKOONYX_SOCIAL_FACEBOOK="Follow us on Facebook"
+TPL_MOKOONYX_SOCIAL_TWITTER="Follow us on X"
+TPL_MOKOONYX_SOCIAL_INSTAGRAM="Follow us on Instagram"
+TPL_MOKOONYX_SOCIAL_LINKEDIN="Follow us on LinkedIn"
+TPL_MOKOONYX_SOCIAL_YOUTUBE="Subscribe on YouTube"
+TPL_MOKOONYX_SOCIAL_GITHUB="Follow us on GitHub"
+TPL_MOKOONYX_SOCIAL_BLUESKY="Follow us on Bluesky"
+TPL_MOKOONYX_SOCIAL_THREADS="Follow us on Threads"
+TPL_MOKOONYX_SOCIAL_DISCORD="Join us on Discord"
+TPL_MOKOONYX_SOCIAL_TIKTOK="Follow us on TikTok"
+TPL_MOKOONYX_SOCIAL_REDDIT="Join us on Reddit"
+TPL_MOKOONYX_SOCIAL_PINTEREST="Follow us on Pinterest"
+TPL_MOKOONYX_SOCIAL_SNAPCHAT="Follow us on Snapchat"
+TPL_MOKOONYX_SOCIAL_TELEGRAM="Join us on Telegram"
+TPL_MOKOONYX_SOCIAL_WHATSAPP="Chat on WhatsApp"
+TPL_MOKOONYX_SOCIAL_TUMBLR="Follow us on Tumblr"
+TPL_MOKOONYX_SOCIAL_TWITCH="Follow us on Twitch"
+TPL_MOKOONYX_SOCIAL_SPOTIFY="Listen on Spotify"
+TPL_MOKOONYX_SOCIAL_SOUNDCLOUD="Listen on SoundCloud"
+TPL_MOKOONYX_SOCIAL_FLICKR="Follow us on Flickr"
+TPL_MOKOONYX_SOCIAL_VIMEO="Follow us on Vimeo"
+TPL_MOKOONYX_SOCIAL_LINKTREE="Visit our Linktree"
+TPL_MOKOONYX_SOCIAL_MAIL="Email us"
+
+; ===== CSS Variables tab (social) =====
+TPL_MOKOONYX_CSS_VARS_SOCIAL_LABEL="Social Icons"
+TPL_MOKOONYX_CSS_VARS_SOCIAL_DESC="<code>--social-icon-size</code> — Icon font size (overrides size preset)<br><code>--social-icon-gap</code> — Gap between icons (default: <code>0.5rem</code>)<br><code>--social-icon-color</code> — Icon colour (default: <code>currentColor</code>)<br><code>--social-icon-hover-color</code> — Hover colour (default: <code>var(--accent-color-primary)</code>)<br><code>--social-icon-bg</code> — Background for circle/rounded styles<br><code>--social-icon-hover-bg</code> — Hover background<br><code>--social-icon-radius</code> — Border radius for rounded style (default: <code>0.375rem</code>)"
+
 ; ===== Misc =====
 MOD_BREADCRUMBS_HERE="YOU ARE HERE:"
 

src/language/en-US/tpl_mokoonyx.ini

@@ -262,6 +262,67 @@ TPL_MOKOONYX_CSS_VARS_GABLE_DESC="Color tokens used by the Gable extension.<br><
 TPL_MOKOONYX_CSS_VARS_FOOTER_LABEL="Footer"
 TPL_MOKOONYX_CSS_VARS_FOOTER_DESC="<strong>Spacing</strong><br><code>--footer-padding-top</code> — Top padding (default: <code>1rem</code>)<br><code>--footer-padding-bottom</code> — Bottom padding (default: <code>80px</code>)<br><code>--footer-grid-padding-y</code> — Grid vertical padding (default: <code>2.5rem</code>)<br><code>--footer-grid-padding-x</code> — Grid horizontal padding (default: <code>0.5em</code>)"
 
+; ===== Social Icons =====
+TPL_MOKOONYX_SOCIAL_FIELDSET_LABEL="Social Icons"
+TPL_MOKOONYX_SOCIAL_NOTE="<p>Add your social media profile URLs below. Only platforms with a URL will be displayed. Icons use Font Awesome 7 and inherit your template's theme colors.</p>"
+TPL_MOKOONYX_SOCIAL_TOPBAR_LABEL="Show in Topbar"
+TPL_MOKOONYX_SOCIAL_TOPBAR_DESC="Display social icons in the topbar area (right-aligned on desktop, centered on mobile)."
+TPL_MOKOONYX_SOCIAL_FOOTER_LABEL="Show in Footer"
+TPL_MOKOONYX_SOCIAL_FOOTER_DESC="Display social icons centered above the footer content."
+TPL_MOKOONYX_SOCIAL_STYLE_LABEL="Icon Style"
+TPL_MOKOONYX_SOCIAL_STYLE_DESC="Choose the visual style for social icons."
+TPL_MOKOONYX_SOCIAL_STYLE_PLAIN="Plain (no background)"
+TPL_MOKOONYX_SOCIAL_STYLE_SQUARE="Square background"
+TPL_MOKOONYX_SOCIAL_STYLE_CIRCLE="Circle background"
+TPL_MOKOONYX_SOCIAL_STYLE_ROUNDED="Rounded background"
+TPL_MOKOONYX_SOCIAL_SIZE_LABEL="Icon Size"
+TPL_MOKOONYX_SOCIAL_SIZE_DESC="Choose the size of social icons."
+TPL_MOKOONYX_SOCIAL_SIZE_SM="Small"
+TPL_MOKOONYX_SOCIAL_SIZE_MD="Medium"
+TPL_MOKOONYX_SOCIAL_SIZE_LG="Large"
+TPL_MOKOONYX_SOCIAL_FLOATING_LABEL="Show Floating Sidebar"
+TPL_MOKOONYX_SOCIAL_FLOATING_DESC="Display social icons as a fixed vertical bar on the side of the viewport. Hidden on mobile devices."
+TPL_MOKOONYX_SOCIAL_FLOATING_POS_LABEL="Floating Position"
+TPL_MOKOONYX_SOCIAL_FLOATING_POS_DESC="Which side of the screen the floating social bar appears on."
+TPL_MOKOONYX_SOCIAL_FLOATING_POS_LEFT="Left"
+TPL_MOKOONYX_SOCIAL_FLOATING_POS_RIGHT="Right"
+TPL_MOKOONYX_SOCIAL_COLOR_LABEL="Icon Color"
+TPL_MOKOONYX_SOCIAL_COLOR_DESC="Choose the color scheme for social icons."
+TPL_MOKOONYX_SOCIAL_COLOR_THEME="Theme (CSS variables)"
+TPL_MOKOONYX_SOCIAL_COLOR_BRAND="Brand colors"
+TPL_MOKOONYX_SOCIAL_COLOR_BLACK="Black"
+TPL_MOKOONYX_SOCIAL_COLOR_WHITE="White"
+TPL_MOKOONYX_SOCIAL_URLS_NOTE="<p>Enter the full URL for each platform. Leave blank to hide that icon.</p>"
+TPL_MOKOONYX_SOCIAL_MAIL_DESC="Use a mailto: link (e.g. mailto:hello@example.com) or a contact page URL."
+TPL_MOKOONYX_SOCIAL_NAV_LABEL="Social media links"
+TPL_MOKOONYX_SOCIAL_FACEBOOK="Follow us on Facebook"
+TPL_MOKOONYX_SOCIAL_TWITTER="Follow us on X"
+TPL_MOKOONYX_SOCIAL_INSTAGRAM="Follow us on Instagram"
+TPL_MOKOONYX_SOCIAL_LINKEDIN="Follow us on LinkedIn"
+TPL_MOKOONYX_SOCIAL_YOUTUBE="Subscribe on YouTube"
+TPL_MOKOONYX_SOCIAL_GITHUB="Follow us on GitHub"
+TPL_MOKOONYX_SOCIAL_BLUESKY="Follow us on Bluesky"
+TPL_MOKOONYX_SOCIAL_THREADS="Follow us on Threads"
+TPL_MOKOONYX_SOCIAL_DISCORD="Join us on Discord"
+TPL_MOKOONYX_SOCIAL_TIKTOK="Follow us on TikTok"
+TPL_MOKOONYX_SOCIAL_REDDIT="Join us on Reddit"
+TPL_MOKOONYX_SOCIAL_PINTEREST="Follow us on Pinterest"
+TPL_MOKOONYX_SOCIAL_SNAPCHAT="Follow us on Snapchat"
+TPL_MOKOONYX_SOCIAL_TELEGRAM="Join us on Telegram"
+TPL_MOKOONYX_SOCIAL_WHATSAPP="Chat on WhatsApp"
+TPL_MOKOONYX_SOCIAL_TUMBLR="Follow us on Tumblr"
+TPL_MOKOONYX_SOCIAL_TWITCH="Follow us on Twitch"
+TPL_MOKOONYX_SOCIAL_SPOTIFY="Listen on Spotify"
+TPL_MOKOONYX_SOCIAL_SOUNDCLOUD="Listen on SoundCloud"
+TPL_MOKOONYX_SOCIAL_FLICKR="Follow us on Flickr"
+TPL_MOKOONYX_SOCIAL_VIMEO="Follow us on Vimeo"
+TPL_MOKOONYX_SOCIAL_LINKTREE="Visit our Linktree"
+TPL_MOKOONYX_SOCIAL_MAIL="Email us"
+
+; ===== CSS Variables tab (social) =====
+TPL_MOKOONYX_CSS_VARS_SOCIAL_LABEL="Social Icons"
+TPL_MOKOONYX_CSS_VARS_SOCIAL_DESC="<code>--social-icon-size</code> — Icon font size (overrides size preset)<br><code>--social-icon-gap</code> — Gap between icons (default: <code>0.5rem</code>)<br><code>--social-icon-color</code> — Icon color (default: <code>currentColor</code>)<br><code>--social-icon-hover-color</code> — Hover color (default: <code>var(--accent-color-primary)</code>)<br><code>--social-icon-bg</code> — Background for circle/rounded styles<br><code>--social-icon-hover-bg</code> — Hover background<br><code>--social-icon-radius</code> — Border radius for rounded style (default: <code>0.375rem</code>)"
+
 ; ===== Misc =====
 MOD_BREADCRUMBS_HERE="YOU ARE HERE:"
 

src/media/css/a11y-high-contrast.css

@@ -10,17 +10,7 @@
  * INGROUP: MokoOnyx.Accessibility
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
  * PATH: ./media/css/a11y-high-contrast.css
-<<<<<<< HEAD
+ * VERSION: 02.21.05
-<<<<<<< HEAD
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
-=======
- * VERSION: 02.15.02
->>>>>>> origin/main
->>>>>>> origin/main
  * BRIEF: High-contrast stylesheet for accessibility toolbar
  */
 

src/media/css/template.css

@@ -38,7 +38,7 @@
 	nav,
 	.container-topbar,
 	.container-nav,
-	#rssocial-133,
+	.moko-social-icons,
 	.container-sidebar-right,
 	.container-sidebar-left,
 	.container-bottom-a,
@@ -23528,4 +23528,193 @@ font-size: 0.8125rem;
 .fa-brands {
 	margin-right: 0.25rem;
 }
-/* patch release test */
+
+/* ===== Social Icons ===== */
+.moko-social-icons ul {
+	display: flex;
+	flex-wrap: wrap;
+	list-style: none;
+	margin: 0;
+	padding: 0;
+	gap: var(--social-icon-gap, 0.5rem);
+}
+
+.moko-social-icons a {
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	color: var(--social-icon-color, var(--accent-color-secondary, var(--accent-color-primary, currentColor)));
+	text-decoration: none;
+	transition: color 0.2s ease, background-color 0.2s ease, transform 0.2s ease;
+}
+
+.moko-social-icons a:hover,
+.moko-social-icons a:focus-visible {
+	color: var(--social-icon-hover-color, var(--accent-color-primary, #3f8ff0));
+	transform: scale(1.15);
+}
+
+.moko-social-icons a .fa-brands,
+.moko-social-icons a .fa-solid {
+	margin-right: 0;
+}
+
+/* Size variants */
+.moko-social-icons--sm a { font-size: var(--social-icon-size, 1rem); }
+.moko-social-icons--md a { font-size: var(--social-icon-size, 1.25rem); }
+.moko-social-icons--lg a { font-size: var(--social-icon-size, 1.75rem); }
+
+/* Color mode: theme (default) — inherits from CSS variables */
+.moko-social-icons--color-theme a {
+	color: var(--social-icon-color, var(--accent-color-secondary, var(--accent-color-primary, currentColor)));
+}
+
+/* Color mode: black */
+.moko-social-icons--color-black a {
+	color: #000;
+}
+
+/* Color mode: white */
+.moko-social-icons--color-white a {
+	color: #fff;
+}
+
+/* Color mode: brand — official platform colours */
+.moko-social-icons--color-brand .fa-facebook-f  { color: #1877f2; }
+.moko-social-icons--color-brand .fa-x-twitter   { color: #000; }
+.moko-social-icons--color-brand .fa-instagram    { color: #e4405f; }
+.moko-social-icons--color-brand .fa-linkedin-in  { color: #0a66c2; }
+.moko-social-icons--color-brand .fa-youtube      { color: #ff0000; }
+.moko-social-icons--color-brand .fa-github       { color: #333; }
+.moko-social-icons--color-brand .fa-bluesky      { color: #0085ff; }
+.moko-social-icons--color-brand .fa-threads      { color: #000; }
+.moko-social-icons--color-brand .fa-discord      { color: #5865f2; }
+.moko-social-icons--color-brand .fa-tiktok       { color: #000; }
+.moko-social-icons--color-brand .fa-reddit-alien { color: #ff4500; }
+.moko-social-icons--color-brand .fa-pinterest-p  { color: #bd081c; }
+.moko-social-icons--color-brand .fa-snapchat     { color: #fffc00; }
+.moko-social-icons--color-brand .fa-telegram     { color: #26a5e4; }
+.moko-social-icons--color-brand .fa-whatsapp     { color: #25d366; }
+.moko-social-icons--color-brand .fa-tumblr       { color: #35465c; }
+.moko-social-icons--color-brand .fa-twitch       { color: #9146ff; }
+.moko-social-icons--color-brand .fa-spotify      { color: #1db954; }
+.moko-social-icons--color-brand .fa-soundcloud   { color: #ff5500; }
+.moko-social-icons--color-brand .fa-flickr       { color: #0063dc; }
+.moko-social-icons--color-brand .fa-vimeo-v      { color: #1ab7ea; }
+
+:root[data-bs-theme="dark"] .moko-social-icons--color-brand .fa-x-twitter,
+:root[data-bs-theme="dark"] .moko-social-icons--color-brand .fa-threads,
+:root[data-bs-theme="dark"] .moko-social-icons--color-brand .fa-tiktok,
+:root[data-bs-theme="dark"] .moko-social-icons--color-brand .fa-github {
+	color: #fff;
+}
+
+/* Style: plain (default) — no background */
+.moko-social-icons--plain a {
+	width: auto;
+	height: auto;
+	padding: 0.25em;
+}
+
+/* Style: square — square background */
+.moko-social-icons--square a {
+	width: 2.2em;
+	height: 2.2em;
+	border-radius: 0;
+	background-color: var(--social-icon-bg, rgba(255, 255, 255, 0.15));
+}
+
+.moko-social-icons--square a:hover,
+.moko-social-icons--square a:focus-visible {
+	background-color: var(--social-icon-hover-bg, rgba(255, 255, 255, 0.3));
+}
+
+/* Style: circle — round background */
+.moko-social-icons--circle a {
+	width: 2.2em;
+	height: 2.2em;
+	border-radius: 50%;
+	background-color: var(--social-icon-bg, rgba(255, 255, 255, 0.15));
+}
+
+.moko-social-icons--circle a:hover,
+.moko-social-icons--circle a:focus-visible {
+	background-color: var(--social-icon-hover-bg, rgba(255, 255, 255, 0.3));
+}
+
+/* Style: rounded — rounded-rect background */
+.moko-social-icons--rounded a {
+	width: 2.2em;
+	height: 2.2em;
+	border-radius: var(--social-icon-radius, 0.375rem);
+	background-color: var(--social-icon-bg, rgba(255, 255, 255, 0.15));
+}
+
+.moko-social-icons--rounded a:hover,
+.moko-social-icons--rounded a:focus-visible {
+	background-color: var(--social-icon-hover-bg, rgba(255, 255, 255, 0.3));
+}
+
+/* Position: topbar — align right */
+.moko-social-icons--topbar {
+	display: flex;
+	justify-content: flex-end;
+}
+
+/* Position: footer — centered */
+.moko-social-icons--footer {
+	display: flex;
+	justify-content: center;
+	padding: 1rem 0;
+}
+
+.footer-social {
+	align-items: center;
+}
+
+@media (max-width: 767.98px) {
+	.moko-social-icons--topbar {
+		justify-content: center;
+	}
+}
+
+/* Position: floating — fixed sidebar, hidden on mobile */
+.moko-social-icons--floating {
+	position: fixed;
+	top: 50%;
+	transform: translateY(-50%);
+	z-index: 1030;
+	display: flex;
+}
+
+.moko-social-icons--floating ul {
+	flex-direction: column;
+}
+
+.moko-social-icons--floating-left {
+	left: 0;
+}
+
+.moko-social-icons--floating-right {
+	right: 0;
+}
+
+.moko-social-icons--floating-left a {
+	border-radius: 0 var(--social-icon-radius, 0.375rem) var(--social-icon-radius, 0.375rem) 0;
+}
+
+.moko-social-icons--floating-right a {
+	border-radius: var(--social-icon-radius, 0.375rem) 0 0 var(--social-icon-radius, 0.375rem);
+}
+
+.moko-social-icons--floating.moko-social-icons--circle a,
+.moko-social-icons--floating.moko-social-icons--plain a {
+	border-radius: inherit;
+}
+
+@media (max-width: 991.98px) {
+	.moko-social-icons--floating {
+		display: none;
+	}
+}
+/* ===== End Social Icons ===== */

src/offline.php

@@ -393,6 +393,11 @@ if (class_exists('\Joomla\Component\Users\Site\Helper\RouteHelper')) {
 				</div>
 			</div>
 
+			<!-- Social icons -->
+			<?php if ($params->get('social_footer') || $params->get('social_floating')) :
+				echo \Joomla\CMS\Layout\LayoutHelper::render('mokoonyx.social-icons', ['params' => $params, 'position' => 'footer']);
+			endif; ?>
+
 			<!-- Copyright -->
 			<div class="moko-offline-copyright">
 				<div>&copy; <?php echo date('Y'); ?> <?php echo htmlspecialchars($sitename, ENT_COMPAT, 'UTF-8'); ?></div>

src/script.php

@@ -36,6 +36,10 @@ class Tpl_MokoonyxInstallerScript implements InstallerScriptInterface
 
     public function preflight(string $type, InstallerAdapter $parent): bool
     {
+        if ($type === 'update') {
+            $this->saveDownloadKey();
+        }
+
         if (version_compare(PHP_VERSION, self::MIN_PHP, '<')) {
             Factory::getApplication()->enqueueMessage(
                 sprintf('MokoOnyx requires PHP %s or later. You are running PHP %s.', self::MIN_PHP, PHP_VERSION),
@@ -88,11 +92,16 @@ class Tpl_MokoonyxInstallerScript implements InstallerScriptInterface
 
     public function postflight(string $type, InstallerAdapter $parent): bool
     {
+        $this->restoreDownloadKey();
+        $this->warnMissingLicenseKey();
+
         if ($type === 'install' || $type === 'update') {
             $this->migrateFromCassiopeia();
             $this->replaceCassiopeiaReferences();
             $this->clearFaviconStamp();
             $this->cleanMediaFolder();
+            $this->removeDeletedFiles();
+            $this->removeDuplicateExtensions();
             $this->lockExtension();
         }
 
@@ -483,6 +492,189 @@ class Tpl_MokoonyxInstallerScript implements InstallerScriptInterface
         }
     }
 
+    /**
+     * Remove duplicate MokoOnyx extension entries from #__extensions.
+     *
+     * Re-installs or migrations can leave ghost rows.  We keep the one
+     * that is locked (the active template) and delete any extras.
+     * Also removes stale MokoCassiopeia entries if present.
+     */
+    private function removeDuplicateExtensions(): void
+    {
+        $db = Factory::getDbo();
+
+        // Find all MokoOnyx template entries
+        $rows = $db->setQuery(
+            $db->getQuery(true)
+                ->select(['extension_id', 'locked'])
+                ->from('#__extensions')
+                ->where($db->quoteName('element') . ' = ' . $db->quote(self::NEW_NAME))
+                ->where($db->quoteName('type') . ' = ' . $db->quote('template'))
+                ->order('locked DESC, extension_id ASC')
+        )->loadObjectList();
+
+        if (count($rows) > 1) {
+            $keep = (int) $rows[0]->extension_id;
+            $removed = 0;
+
+            for ($i = 1; $i < count($rows); $i++) {
+                $staleId = (int) $rows[$i]->extension_id;
+
+                $db->setQuery(
+                    $db->getQuery(true)
+                        ->delete('#__update_sites_extensions')
+                        ->where('extension_id = ' . $staleId)
+                )->execute();
+
+                $db->setQuery(
+                    $db->getQuery(true)
+                        ->delete('#__extensions')
+                        ->where('extension_id = ' . $staleId)
+                )->execute();
+
+                $removed++;
+            }
+
+            if ($removed > 0) {
+                $this->logMessage("Removed {$removed} duplicate MokoOnyx extension(s). Kept ID {$keep}.");
+            }
+        }
+
+        // Remove faulty "template-mokoonyx" duplicate (wrong element name from bad install)
+        $faultyId = (int) $db->setQuery(
+            $db->getQuery(true)
+                ->select('extension_id')
+                ->from('#__extensions')
+                ->where($db->quoteName('element') . ' = ' . $db->quote('template-mokoonyx'))
+                ->where($db->quoteName('type') . ' = ' . $db->quote('template'))
+        )->loadResult();
+
+        if ($faultyId) {
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->delete('#__update_sites_extensions')
+                    ->where('extension_id = ' . $faultyId)
+            )->execute();
+
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->delete('#__extensions')
+                    ->where('extension_id = ' . $faultyId)
+            )->execute();
+
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->delete('#__template_styles')
+                    ->where($db->quoteName('template') . ' = ' . $db->quote('template-mokoonyx'))
+            )->execute();
+
+            $this->logMessage('Removed faulty template-mokoonyx duplicate extension.');
+        }
+
+        // Remove stale MokoCassiopeia if not set as default
+        $oldExt = (int) $db->setQuery(
+            $db->getQuery(true)
+                ->select('extension_id')
+                ->from('#__extensions')
+                ->where($db->quoteName('element') . ' = ' . $db->quote(self::OLD_NAME))
+                ->where($db->quoteName('type') . ' = ' . $db->quote('template'))
+        )->loadResult();
+
+        if ($oldExt) {
+            $isDefault = (int) $db->setQuery(
+                $db->getQuery(true)
+                    ->select('COUNT(*)')
+                    ->from('#__template_styles')
+                    ->where($db->quoteName('template') . ' = ' . $db->quote(self::OLD_NAME))
+                    ->where($db->quoteName('home') . ' = 1')
+            )->loadResult();
+
+            if ($isDefault === 0) {
+                $db->setQuery(
+                    $db->getQuery(true)
+                        ->delete('#__update_sites_extensions')
+                        ->where('extension_id = ' . $oldExt)
+                )->execute();
+
+                $db->setQuery(
+                    $db->getQuery(true)
+                        ->delete('#__extensions')
+                        ->where('extension_id = ' . $oldExt)
+                )->execute();
+
+                $db->setQuery(
+                    $db->getQuery(true)
+                        ->delete('#__template_styles')
+                        ->where($db->quoteName('template') . ' = ' . $db->quote(self::OLD_NAME))
+                )->execute();
+
+                $this->logMessage('Removed stale MokoCassiopeia extension and styles.');
+            }
+        }
+    }
+
+    /**
+     * Remove files and directories that were shipped in previous versions
+     * but have since been deleted from the package.
+     *
+     * Joomla's installer never deletes files on upgrade — it only
+     * adds/overwrites.  This method fills that gap so stale overrides
+     * and deprecated assets don't linger on disk.
+     *
+     * Maintain this list: when you delete a file from the repo, add its
+     * path here (relative to the template root) so existing installs
+     * get cleaned up on the next update.
+     */
+    private function removeDeletedFiles(): void
+    {
+        $templateRoot = JPATH_ROOT . '/templates/' . self::NEW_NAME;
+
+        // Paths relative to templates/mokoonyx/
+        $deletedFiles = [
+            // JoomGallery template overrides — removed in 02.19.00
+            'html/com_joomgallery/category/default.php',
+            'html/com_joomgallery/category/default_cat.php',
+            'html/com_joomgallery/category/index.html',
+            'html/com_joomgallery/gallery/default.php',
+            'html/com_joomgallery/gallery/index.html',
+            'html/com_joomgallery/image/default.php',
+            'html/com_joomgallery/image/index.html',
+        ];
+
+        // Directories to remove (only if empty after file deletion)
+        $deletedDirs = [
+            'html/com_joomgallery/image',
+            'html/com_joomgallery/gallery',
+            'html/com_joomgallery/category',
+            'html/com_joomgallery',
+        ];
+
+        $removed = 0;
+
+        foreach ($deletedFiles as $relPath) {
+            $file = $templateRoot . '/' . $relPath;
+            if (is_file($file)) {
+                @unlink($file);
+                $removed++;
+            }
+        }
+
+        foreach ($deletedDirs as $relPath) {
+            $dir = $templateRoot . '/' . $relPath;
+            if (is_dir($dir)) {
+                // Only remove if empty
+                $entries = @scandir($dir);
+                if ($entries && count($entries) <= 2) { // . and .. only
+                    @rmdir($dir);
+                }
+            }
+        }
+
+        if ($removed > 0) {
+            $this->logMessage("Removed {$removed} deprecated file(s) from previous versions.");
+        }
+    }
+
     private function logMessage(string $message, string $priority = 'info'): void
     {
         $priorities = [
@@ -499,4 +691,94 @@ class Tpl_MokoonyxInstallerScript implements InstallerScriptInterface
 
         Log::add($message, $priorities[$priority] ?? Log::INFO, 'mokoonyx');
     }
+
+
+    private ?string $savedDownloadKey = null;
+
+    private function saveDownloadKey(): void
+    {
+        try {
+            $db = Factory::getDbo();
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->select($db->quoteName('us.extra_query'))
+                    ->from($db->quoteName('#__update_sites', 'us'))
+                    ->join('INNER', $db->quoteName('#__update_sites_extensions', 'use') . ' ON use.update_site_id = us.update_site_id')
+                    ->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
+                    ->where($db->quoteName('e.element') . ' = ' . $db->quote('mokoonyx'))
+                    ->setLimit(1)
+            );
+            $key = $db->loadResult();
+            if (!empty($key)) {
+                $this->savedDownloadKey = $key;
+            }
+        } catch (\Throwable $e) {
+        }
+    }
+
+    private function restoreDownloadKey(): void
+    {
+        if ($this->savedDownloadKey === null) {
+            return;
+        }
+
+        try {
+            $db = Factory::getDbo();
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->select($db->quoteName('us.update_site_id'))
+                    ->from($db->quoteName('#__update_sites', 'us'))
+                    ->join('INNER', $db->quoteName('#__update_sites_extensions', 'use') . ' ON use.update_site_id = us.update_site_id')
+                    ->join('INNER', $db->quoteName('#__extensions', 'e') . ' ON e.extension_id = use.extension_id')
+                    ->where($db->quoteName('e.element') . ' = ' . $db->quote('mokoonyx'))
+                    ->setLimit(1)
+            );
+            $siteId = (int) $db->loadResult();
+            if ($siteId > 0) {
+                $db->setQuery(
+                    $db->getQuery(true)
+                        ->update($db->quoteName('#__update_sites'))
+                        ->set($db->quoteName('extra_query') . ' = ' . $db->quote($this->savedDownloadKey))
+                        ->where($db->quoteName('update_site_id') . ' = ' . $siteId)
+                )->execute();
+            }
+        } catch (\Throwable $e) {
+        }
+    }
+
+    private function warnMissingLicenseKey(): void
+    {
+        try {
+            $db = Factory::getDbo();
+            $db->setQuery(
+                $db->getQuery(true)
+                    ->select([$db->quoteName('update_site_id'), $db->quoteName('extra_query')])
+                    ->from($db->quoteName('#__update_sites'))
+                    ->where('(' . $db->quoteName('name') . ' LIKE ' . $db->quote('%MokoOnyx%') . ' OR ' . $db->quoteName('location') . ' LIKE ' . $db->quote('%MokoOnyx%') . ')')
+                    ->setLimit(1)
+            );
+            $site = $db->loadObject();
+
+            if ($site) {
+                $eq = (string) ($site->extra_query ?? '');
+                if (!empty($eq) && strpos($eq, 'dlid=') !== false) {
+                    parse_str($eq, $p);
+                    if (!empty($p['dlid'])) {
+                        return;
+                    }
+                }
+                $editUrl = 'index.php?option=com_installer&task=updatesite.edit&update_site_id=' . (int) $site->update_site_id;
+            } else {
+                $editUrl = 'index.php?option=com_installer&view=updatesites';
+            }
+
+            Factory::getApplication()->enqueueMessage(
+                '<strong>Moko Consulting License Key Required</strong> — '
+                . 'No download key is configured. Updates will not be available until a valid license key is entered. '
+                . '<a href="' . htmlspecialchars($editUrl, ENT_QUOTES, 'UTF-8') . '" class="btn btn-sm btn-warning ms-2">Enter License Key</a>',
+                'warning'
+            );
+        } catch (\Throwable $e) {
+        }
+    }
 }

src/templateDetails.xml

@@ -31,16 +31,11 @@
 -->
 <extension type="template" client="site" method="upgrade">
 	<updateservers>
-		<server type="extension" priority="1" name="MokoOnyx Update Server (MokoGitea)">
+		<server type="extension" name="Template - MokoOnyx">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/updates.xml</server>
-			https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/main/updates.xml
-		</server>
 	</updateservers>
+	<dlid prefix="dlid=" suffix=""/>
 	<name>mokoonyx</name>
-<<<<<<< HEAD
+	<version>02.21.05-dev</version>
-	<version>02.15.02-dev</version>
-=======
-	<version>02.15.02-dev</version>
->>>>>>> origin/main
 	<scriptfile>script.php</scriptfile>
 	<creationDate>2026-05-16</creationDate>
 	<author>Jonathan Miller || Moko Consulting</author>
@@ -329,6 +324,88 @@
 				</field>
 			</fieldset>
 
+			<!-- Social icons tab -->
+			<fieldset name="social" label="TPL_MOKOONYX_SOCIAL_FIELDSET_LABEL">
+				<field name="social_note" type="note" description="TPL_MOKOONYX_SOCIAL_NOTE" />
+
+				<!-- Display toggles -->
+				<field name="social_sep_display" type="spacer" label="Display" hr="false" class="text fw-bold" />
+				<field name="social_topbar" type="radio" default="0"
+							 label="TPL_MOKOONYX_SOCIAL_TOPBAR_LABEL" description="TPL_MOKOONYX_SOCIAL_TOPBAR_DESC"
+							 layout="joomla.form.field.radio.switcher" filter="boolean">
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+				<field name="social_footer" type="radio" default="0"
+							 label="TPL_MOKOONYX_SOCIAL_FOOTER_LABEL" description="TPL_MOKOONYX_SOCIAL_FOOTER_DESC"
+							 layout="joomla.form.field.radio.switcher" filter="boolean">
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+				<field name="social_floating" type="radio" default="0"
+							 label="TPL_MOKOONYX_SOCIAL_FLOATING_LABEL" description="TPL_MOKOONYX_SOCIAL_FLOATING_DESC"
+							 layout="joomla.form.field.radio.switcher" filter="boolean">
+					<option value="0">JNO</option>
+					<option value="1">JYES</option>
+				</field>
+				<field name="social_floating_pos" type="list" default="left"
+							 label="TPL_MOKOONYX_SOCIAL_FLOATING_POS_LABEL" description="TPL_MOKOONYX_SOCIAL_FLOATING_POS_DESC"
+							 showon="social_floating:1">
+					<option value="left">TPL_MOKOONYX_SOCIAL_FLOATING_POS_LEFT</option>
+					<option value="right">TPL_MOKOONYX_SOCIAL_FLOATING_POS_RIGHT</option>
+				</field>
+
+				<!-- Style options -->
+				<field name="social_sep_style" type="spacer" label="Style" hr="false" class="text fw-bold" />
+				<field name="social_icon_style" type="list" default="plain"
+							 label="TPL_MOKOONYX_SOCIAL_STYLE_LABEL" description="TPL_MOKOONYX_SOCIAL_STYLE_DESC">
+					<option value="plain">TPL_MOKOONYX_SOCIAL_STYLE_PLAIN</option>
+					<option value="square">TPL_MOKOONYX_SOCIAL_STYLE_SQUARE</option>
+					<option value="circle">TPL_MOKOONYX_SOCIAL_STYLE_CIRCLE</option>
+					<option value="rounded">TPL_MOKOONYX_SOCIAL_STYLE_ROUNDED</option>
+				</field>
+				<field name="social_icon_size" type="list" default="md"
+							 label="TPL_MOKOONYX_SOCIAL_SIZE_LABEL" description="TPL_MOKOONYX_SOCIAL_SIZE_DESC">
+					<option value="sm">TPL_MOKOONYX_SOCIAL_SIZE_SM</option>
+					<option value="md">TPL_MOKOONYX_SOCIAL_SIZE_MD</option>
+					<option value="lg">TPL_MOKOONYX_SOCIAL_SIZE_LG</option>
+				</field>
+				<field name="social_icon_color" type="list" default="theme"
+							 label="TPL_MOKOONYX_SOCIAL_COLOR_LABEL" description="TPL_MOKOONYX_SOCIAL_COLOR_DESC">
+					<option value="theme">TPL_MOKOONYX_SOCIAL_COLOR_THEME</option>
+					<option value="brand">TPL_MOKOONYX_SOCIAL_COLOR_BRAND</option>
+					<option value="black">TPL_MOKOONYX_SOCIAL_COLOR_BLACK</option>
+					<option value="white">TPL_MOKOONYX_SOCIAL_COLOR_WHITE</option>
+				</field>
+
+				<!-- Platform URLs -->
+				<field name="social_sep_urls" type="spacer" label="Platform URLs" hr="false" class="text fw-bold" />
+				<field name="social_urls_note" type="note" description="TPL_MOKOONYX_SOCIAL_URLS_NOTE" />
+				<field name="social_facebook_url" type="url" default="" label="Facebook" filter="url" />
+				<field name="social_twitter_url" type="url" default="" label="X / Twitter" filter="url" />
+				<field name="social_instagram_url" type="url" default="" label="Instagram" filter="url" />
+				<field name="social_linkedin_url" type="url" default="" label="LinkedIn" filter="url" />
+				<field name="social_youtube_url" type="url" default="" label="YouTube" filter="url" />
+				<field name="social_github_url" type="url" default="" label="GitHub" filter="url" />
+				<field name="social_bluesky_url" type="url" default="" label="Bluesky" filter="url" />
+				<field name="social_threads_url" type="url" default="" label="Threads" filter="url" />
+				<field name="social_discord_url" type="url" default="" label="Discord" filter="url" />
+				<field name="social_tiktok_url" type="url" default="" label="TikTok" filter="url" />
+				<field name="social_reddit_url" type="url" default="" label="Reddit" filter="url" />
+				<field name="social_pinterest_url" type="url" default="" label="Pinterest" filter="url" />
+				<field name="social_snapchat_url" type="url" default="" label="Snapchat" filter="url" />
+				<field name="social_telegram_url" type="url" default="" label="Telegram" filter="url" />
+				<field name="social_whatsapp_url" type="url" default="" label="WhatsApp" filter="url" />
+				<field name="social_tumblr_url" type="url" default="" label="Tumblr" filter="url" />
+				<field name="social_twitch_url" type="url" default="" label="Twitch" filter="url" />
+				<field name="social_spotify_url" type="url" default="" label="Spotify" filter="url" />
+				<field name="social_soundcloud_url" type="url" default="" label="SoundCloud" filter="url" />
+				<field name="social_flickr_url" type="url" default="" label="Flickr" filter="url" />
+				<field name="social_vimeo_url" type="url" default="" label="Vimeo" filter="url" />
+				<field name="social_linktree_url" type="url" default="" label="Linktree" filter="url" />
+				<field name="social_mail_url" type="url" default="" label="Email" description="TPL_MOKOONYX_SOCIAL_MAIL_DESC" filter="string" />
+			</fieldset>
+
 			<!-- CSS Variables reference tab -->
 			<fieldset name="css_variables" label="TPL_MOKOONYX_CSS_VARS_FIELDSET_LABEL">
 				<field name="css_vars_intro" type="note" description="TPL_MOKOONYX_CSS_VARS_INTRO" />
@@ -374,6 +451,7 @@
 				<field name="css_vars_virtuemart" type="note" label="TPL_MOKOONYX_CSS_VARS_VM_LABEL" description="TPL_MOKOONYX_CSS_VARS_VM_DESC" class="alert alert-light" />
 				<field name="css_vars_gable" type="note" label="TPL_MOKOONYX_CSS_VARS_GABLE_LABEL" description="TPL_MOKOONYX_CSS_VARS_GABLE_DESC" class="alert alert-light" />
 				<field name="css_vars_footer" type="note" label="TPL_MOKOONYX_CSS_VARS_FOOTER_LABEL" description="TPL_MOKOONYX_CSS_VARS_FOOTER_DESC" class="alert alert-light" />
+				<field name="css_vars_social" type="note" label="TPL_MOKOONYX_CSS_VARS_SOCIAL_LABEL" description="TPL_MOKOONYX_CSS_VARS_SOCIAL_DESC" class="alert alert-info" />
 			</fieldset>
 		</fields>
 	</config>

updates.xml

@@ -1,108 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
- SPDX-License-Identifier: GPL-3.0-or-later
- VERSION: 02.16.00
- -->
-
-<updates>
-  <update>
-    <name>Template - MokoOnyx</name>
-    <description>Template - MokoOnyx dev build.</description>
-    <element>mokoonyx</element>
-    <type>template</type>
-    <client>site</client>
-    <version>02.16.00-dev</version>
-    <creationDate>2026-05-30</creationDate>
-    <infourl title="Template - MokoOnyx">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/tag/development</infourl>
-    <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/download/development/tpl_mokoonyx-02.16.00-dev.zip</downloadurl>
-    </downloads>
-    <sha256>f8eb73b0a0b61a9f37ee5b720182374cb0b2495fda5e1198711d1298ef5bbd67</sha256>
-    <tags><tag>dev</tag></tags>
-    <changelogurl>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/main/CHANGELOG.md</changelogurl>
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-    <targetplatform name="joomla" version="(5|6)\..*"/>
-    <php_minimum>8.1.0</php_minimum>
-  </update>
-  <update>
-    <name>Template - MokoOnyx</name>
-    <description>Template - MokoOnyx alpha build.</description>
-    <element>mokoonyx</element>
-    <type>template</type>
-    <client>site</client>
-    <version>02.16.00-alpha</version>
-    <creationDate>2026-05-30</creationDate>
-    <infourl title="Template - MokoOnyx">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/tag/alpha</infourl>
-    <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/download/alpha/tpl_mokoonyx-02.16.00-alpha.zip</downloadurl>
-    </downloads>
-    <sha256>f8eb73b0a0b61a9f37ee5b720182374cb0b2495fda5e1198711d1298ef5bbd67</sha256>
-    <tags><tag>alpha</tag></tags>
-    <changelogurl>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/main/CHANGELOG.md</changelogurl>
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-    <targetplatform name="joomla" version="(5|6)\..*"/>
-    <php_minimum>8.1.0</php_minimum>
-  </update>
-  <update>
-    <name>Template - MokoOnyx</name>
-    <description>Template - MokoOnyx beta build.</description>
-    <element>mokoonyx</element>
-    <type>template</type>
-    <client>site</client>
-    <version>02.16.00-beta</version>
-    <creationDate>2026-05-30</creationDate>
-    <infourl title="Template - MokoOnyx">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/tag/beta</infourl>
-    <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/download/beta/tpl_mokoonyx-02.16.00-beta.zip</downloadurl>
-    </downloads>
-    <sha256>f8eb73b0a0b61a9f37ee5b720182374cb0b2495fda5e1198711d1298ef5bbd67</sha256>
-    <tags><tag>beta</tag></tags>
-    <changelogurl>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/main/CHANGELOG.md</changelogurl>
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-    <targetplatform name="joomla" version="(5|6)\..*"/>
-    <php_minimum>8.1.0</php_minimum>
-  </update>
-  <update>
-    <name>Template - MokoOnyx</name>
-    <description>Template - MokoOnyx rc build.</description>
-    <element>mokoonyx</element>
-    <type>template</type>
-    <client>site</client>
-    <version>02.16.00-rc</version>
-    <creationDate>2026-05-30</creationDate>
-    <infourl title="Template - MokoOnyx">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/tag/release-candidate</infourl>
-    <downloads>
-      <downloadurl type="full" format="zip">https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/download/release-candidate/tpl_mokoonyx-02.16.00-rc.zip</downloadurl>
-    </downloads>
-    <sha256>f8eb73b0a0b61a9f37ee5b720182374cb0b2495fda5e1198711d1298ef5bbd67</sha256>
-    <tags><tag>rc</tag></tags>
-    <changelogurl>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/main/CHANGELOG.md</changelogurl>
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-    <targetplatform name="joomla" version="(5|6)\..*"/>
-    <php_minimum>8.1.0</php_minimum>
-  </update>
-  <update>
-    <name>Template - MokoOnyx</name>
-    <description>Template - MokoOnyx stable build.</description>
-    <element>mokoonyx</element>
-    <type>template</type>
-    <client>site</client>
-    <version>02.16.00</version>
-    <creationDate>2026-05-30</creationDate>
-    <infourl title='Template - MokoOnyx'>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/tag/stable</infourl>
-    <downloads>
-      <downloadurl type='full' format='zip'>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/releases/download/stable/tpl_mokoonyx-02.16.00.zip</downloadurl>
-    </downloads>
-    <sha256>f8eb73b0a0b61a9f37ee5b720182374cb0b2495fda5e1198711d1298ef5bbd67</sha256>
-    <tags><tag>stable</tag></tags>
-    <changelogurl>https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx/raw/branch/main/CHANGELOG.md</changelogurl>
-    <maintainer>Moko Consulting</maintainer>
-    <maintainerurl>https://mokoconsulting.tech</maintainerurl>
-    <targetplatform name="joomla" version="(5|6)\..*" />
-    <php_minimum>8.1.0</php_minimum>
-  </update>
-</updates>

wiki/configuration.md

@@ -136,11 +136,11 @@ A read-only reference tab displaying all available CSS custom properties organiz
 
 ---
 
-*Built with [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API) -- Moko Consulting*
+*Built with [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform) -- Moko Consulting*
 
 ---
 
-*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
+*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
 
 | Revision | Date | Author | Description |
 |---|---|---|---|

wiki/css-variables.md

@@ -223,11 +223,11 @@ Additional variables are defined for: VirtueMart (`--vm-*`), Gable (`--gab-*`),
 
 ---
 
-*Built with [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API) -- Moko Consulting*
+*Built with [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform) -- Moko Consulting*
 
 ---
 
-*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
+*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
 
 | Revision | Date | Author | Description |
 |---|---|---|---|

wiki/custom-themes.md

@@ -114,11 +114,11 @@ For additional overrides beyond theme variables, use these files (also update-sa
 
 ---
 
-*Built with [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API) -- Moko Consulting*
+*Built with [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform) -- Moko Consulting*
 
 ---
 
-*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
+*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
 
 | Revision | Date | Author | Description |
 |---|---|---|---|

wiki/development.md

@@ -46,7 +46,7 @@ MokoOnyx/
 │       ├── dark.custom.css       # Custom dark palette template
 │       └── brand-showcase.html   # Brand showcase HTML template
 ├── Makefile                      # Build and validation automation
-├── composer.json                 # PHP dependencies (MokoStandards)
+├── composer.json                 # PHP dependencies (moko-platform)
 ├── package.json                  # Node.js dependencies (minification)
 ├── phpcs.xml                     # PHP CodeSniffer configuration
 ├── phpstan.neon                  # PHPStan static analysis configuration
@@ -63,7 +63,7 @@ MokoOnyx/
 ## Prerequisites
 
 - **PHP** 8.1+
-- **Composer** (for MokoStandards CLI and dependencies)
+- **Composer** (for moko-platform CLI and dependencies)
 - **Node.js** (optional, for build-time minification with terser/clean-css)
 - **Make** (GNU Make or compatible)
 - **zip** (or PowerShell for Windows)
@@ -110,7 +110,7 @@ Creates `dist/mokoonyx-{version}-beta.zip` (skips minification).
 
 ## Validation
 
-MokoOnyx uses the **MokoStandards Enterprise API** for code quality checks.
+MokoOnyx uses the **moko-platform CLI** for code quality checks.
 
 ```bash
 # Run all validation checks
@@ -277,11 +277,11 @@ vendor/bin/codecept run
 
 ---
 
-*Built with [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API) -- Moko Consulting*
+*Built with [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform) -- Moko Consulting*
 
 ---
 
-*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
+*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
 
 | Revision | Date | Author | Description |
 |---|---|---|---|

wiki/home.md

@@ -88,11 +88,11 @@ Key parameters include:
 
 ---
 
-> **[MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki)** -- central standards hub for all Moko Consulting projects.
+> **[moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki)** -- central standards hub for all Moko Consulting projects.
 
 ---
 
-*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
+*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
 
 | Revision | Date | Author | Description |
 |---|---|---|---|

wiki/installation.md

@@ -55,11 +55,11 @@ MokoOnyx includes an automatic update server. Joomla will notify you when new ve
 
 ---
 
-*Built with [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API) -- Moko Consulting*
+*Built with [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform) -- Moko Consulting*
 
 ---
 
-*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
+*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
 
 | Revision | Date | Author | Description |
 |---|---|---|---|

wiki/migration.md

@@ -108,11 +108,11 @@ Once you have confirmed everything is working:
 
 ---
 
-*Built with [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API) -- Moko Consulting*
+*Built with [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform) -- Moko Consulting*
 
 ---
 
-*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
+*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
 
 | Revision | Date | Author | Description |
 |---|---|---|---|

wiki/minification.md

@@ -102,11 +102,11 @@ This immediately deletes all `.min` files. The template will load the unminified
 
 ---
 
-*Built with [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API) -- Moko Consulting*
+*Built with [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform) -- Moko Consulting*
 
 ---
 
-*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
+*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
 
 | Revision | Date | Author | Description |
 |---|---|---|---|

wiki/template-overrides.md

@@ -99,11 +99,11 @@ Each layout has sub-templates for different menu item types: `_component`, `_hea
 
 ---
 
-*Built with [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/MokoStandards-API) -- Moko Consulting*
+*Built with [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform) -- Moko Consulting*
 
 ---
 
-*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
+*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
 
 | Revision | Date | Author | Description |
 |---|---|---|---|
@@ -111,7 +111,7 @@ Each layout has sub-templates for different menu item types: `_component`, `_hea
 
 ---
 
-*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [MokoStandards](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
+*Repo: [MokoOnyx](https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx) · [moko-platform](https://git.mokoconsulting.tech/MokoConsulting/moko-platform/wiki/Home)*
 
 | Field | Value |
 |---|---|