tabs and draft working

skeleton/novaconium/App/config.php

@@ -11,6 +11,7 @@ $config = [
     'secure_key' => '', //64 alphanumeric characters
     'logfile' => '/logs/novaconium.log',
     'loglevel' => 'ERROR', // 'DEBUG', 'INFO', 'WARNING', 'ERROR', 'NONE',
-    'matomo' => '1',
+    'matomo_url' => 'matomo.4lt.ca',
+    'matomo_id' => '0',
     'fonts' => 'https://fonts.googleapis.com/css2?family=VT323:wght@400&family=Fira+Code:wght@400;500&display=swap&family=Material+Icons:wght@400;500&display=swap'
 ];

src/novaconium.php

@@ -17,7 +17,8 @@ $log = new Logger(\BASEPATH . $config['logfile'], $config['loglevel']);
 // --- Twig Data Array ---
 $data = [];
 $data['fonts'] = $config['fonts'] ?? [];
-$data['matomo'] = $config['matomo'] ?? 0;
+$data['matomo_url'] = $config['matomo_url'] ?? '';
+$data['matomo_id'] = $config['matomo_id'] ?? '0';
 
 // --- Session ---
 use Novaconium\Session;

twig/cp/control-panel.html.twig

@@ -29,9 +29,11 @@
     </footer>
 
     {% if editor == 'ace' %}
-    {% include '@novaconium/javascript/ace.html.twig' %}
+      {% include '@novaconium/javascript/page-edit.html.twig' %}
+      {% include '@novaconium/javascript/ace.html.twig' %}
     {% endif %}
 
+
     {% if debug is not empty %}
       <div id="debug">
           <h2>Debugging Information</h2>

twig/foot.html.twig

@@ -1,28 +1,5 @@
 <!--
     What goes very last on the page.
     right before the /body
-    like javascript
+    such as javascript
-    or analytics
 -->
-{% include '@novaconium/javascript/page-edit.html.twig' %}
-
-{% if editor == 'ace' %}
-{% include '@novaconium/javascript/ace.html.twig' %}
-{% endif %}
-
-{% if matomo > 0 %}
-<!-- Matomo -->
-<script>
-  var _paq = window._paq = window._paq || [];
-  _paq.push(['trackPageView']);
-  _paq.push(['enableLinkTracking']);
-  (function() {
-    var u = "//matomo.4lt.ca/";
-    _paq.push(['setTrackerUrl', u + 'matomo.php']);
-    _paq.push(['setSiteId', {{ matomo }}]);
-    var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
-    g.async = true; g.src = u + 'matomo.js'; s.parentNode.insertBefore(g, s);
-  })();
-</script>
-<!-- End Matomo Code -->
-{% endif %}

twig/javascript/page-edit.html.twig

@@ -0,0 +1,192 @@
+<script>
+// Tab switching JS (unchanged)
+function switchTab(tabId, button) {
+    const contents = document.querySelectorAll('.tab-content');
+    contents.forEach(content => content.classList.remove('active'));
+  
+    const buttons = document.querySelectorAll('.tab-button');
+    buttons.forEach(b => b.classList.remove('active'));
+  
+    document.getElementById(tabId).classList.add('active');
+    button.classList.add('active');
+   
+    if (tabId === 'content6') {
+        setTimeout(initTags, 0);
+    }
+}
+
+// Tags Init (with custom dropdown autocomplete)
+let tagsListeners = [];
+function initTags() {
+    const tagsInput = document.getElementById('tags-input');
+    const tagsField = document.getElementById('tags');
+    const hiddenTags = document.getElementById('tags_json');
+    const dropdown = document.getElementById('tags-dropdown');
+  
+    if (!tagsInput || !tagsField || !hiddenTags || !dropdown) {
+        console.warn('Tags elements missing');
+        return;
+    }
+  
+    // Clean old listeners
+    tagsListeners.forEach(ls => ls());
+    tagsListeners = [];
+  
+    let tags = [];
+    let existingTags = [];
+    try {
+        tags = JSON.parse(tagsInput.dataset.tags || '[]');
+        existingTags = JSON.parse(tagsInput.dataset.existingTags || '[]');
+    } catch (e) {
+        console.warn('JSON error:', e);
+        tags = [];
+        existingTags = [];
+    }
+  
+    let selectedIndex = -1;  // For keyboard nav
+  
+    // Render chips (unchanged)
+    function renderTags() {
+        tagsInput.innerHTML = '';
+        tags.forEach((tag, index) => {
+            const chip = document.createElement('span');
+            chip.className = 'tag-chip';
+            chip.innerHTML = `${tag} <button type="button" class="tag-remove">&times;</button>`;
+            chip.querySelector('.tag-remove').onclick = () => {
+                tags.splice(index, 1);
+                renderTags();
+                hiddenTags.value = JSON.stringify(tags);
+            };
+            tagsInput.appendChild(chip);
+        });
+        tagsInput.appendChild(tagsField);
+        tagsInput.appendChild(dropdown);  // Re-add dropdown
+        hiddenTags.value = JSON.stringify(tags);
+    }
+  
+    // Filter and render dropdown
+    function updateDropdown() {
+        const value = tagsField.value.toLowerCase().trim();
+        dropdown.innerHTML = '';
+        dropdown.setAttribute('aria-expanded', value ? 'true' : 'false');
+        selectedIndex = -1;
+        
+        if (!value) return;
+        
+        const matches = existingTags.filter(tag => 
+            tag.toLowerCase().startsWith(value) && !tags.includes(tag.toLowerCase())
+        ).slice(0, 10);  // Top 10 matches, exclude existing
+        
+        matches.forEach((tag, index) => {
+            const li = document.createElement('li');
+            li.textContent = tag;
+            li.setAttribute('role', 'option');
+            li.onclick = () => selectTag(tag);
+            li.onmouseover = () => { selectedIndex = index; updateHighlight(); };
+            dropdown.appendChild(li);
+        });
+        
+        if (matches.length) dropdown.parentElement.classList.add('has-dropdown');
+        else dropdown.parentElement.classList.remove('has-dropdown');
+    }
+  
+    // Highlight selected in dropdown
+    function updateHighlight() {
+        dropdown.querySelectorAll('li').forEach((li, index) => {
+            li.classList.toggle('selected', index === selectedIndex);
+        });
+    }
+  
+    // Select tag from dropdown
+    function selectTag(tag) {
+        addTag(tag, true);  // Add as chip, refocus
+        tagsField.value = '';  // Clear input
+        dropdown.setAttribute('aria-expanded', 'false');
+    }
+  
+    // Add tag (unchanged)
+    function addTag(inputValue, refocus = false) {
+        const tag = inputValue.trim().toLowerCase().replace(/[^\w-]/g, '');
+        if (tag && tag.length > 0 && tag.length <= 50 && !tags.includes(tag)) {
+            tags.push(tag);
+            renderTags();
+            if (refocus) tagsField.focus();
+        }
+        tagsField.value = '';
+        updateDropdown();  // Hide dropdown after add
+    }
+  
+    // Events: Enter/comma/TAB adds tag (no form submit)
+const keydownListener = (e) => {
+    console.log('Keydown:', e.key, 'Value:', tagsField.value, 'Selected:', selectedIndex);
+    if (dropdown.getAttribute('aria-expanded') === 'true') {
+        if (e.key === 'ArrowDown') {
+            e.preventDefault();
+            selectedIndex = Math.min(selectedIndex + 1, dropdown.querySelectorAll('li').length - 1);
+            updateHighlight();
+            dropdown.querySelector(`li:nth-child(${selectedIndex + 1})`).scrollIntoView({ block: 'nearest' });
+        } else if (e.key === 'ArrowUp') {
+            e.preventDefault();
+            selectedIndex = Math.max(selectedIndex - 1, 0);
+            updateHighlight();
+            dropdown.querySelector(`li:nth-child(${selectedIndex + 1})`).scrollIntoView({ block: 'nearest' });
+        } else if ((e.key === 'Enter' || e.key === 'Tab') && selectedIndex >= 0) {
+            e.preventDefault();
+            const selected = dropdown.querySelector(`li:nth-child(${selectedIndex + 1})`).textContent;
+            selectTag(selected);  // Adds chip, refocuses
+        } else if (e.key === 'Escape') {
+            e.preventDefault();
+            tagsField.blur();
+        }
+    }
+    
+    // Fallback for no dropdown or non-selected Tab/Enter
+    if (!dropdown.getAttribute('aria-expanded') === 'true' || selectedIndex < 0) {
+        if (e.key === 'Enter' || e.key === ',') {
+            e.preventDefault();
+            addTag(tagsField.value, true);
+        } else if (e.key === 'Tab') {
+            e.preventDefault();
+            if (tagsField.value.trim()) addTag(tagsField.value, true);  // Add typed value, refocus
+        }
+    }
+};
+tagsField.addEventListener('keydown', keydownListener);
+tagsListeners.push(() => tagsField.removeEventListener('keydown', keydownListener));
+  
+    const inputListener = () => updateDropdown();
+    tagsField.addEventListener('input', inputListener);
+    tagsListeners.push(() => tagsField.removeEventListener('input', inputListener));
+  
+    const blurListener = () => {
+        setTimeout(() => dropdown.setAttribute('aria-expanded', 'false'), 150);  // Hide after blur
+        if (tagsField.value.trim()) addTag(tagsField.value);
+    };
+    tagsField.addEventListener('blur', blurListener);
+    tagsListeners.push(() => tagsField.removeEventListener('blur', blurListener));
+  
+    // Initial render
+    renderTags();
+    console.log('Tags ready with autocomplete, loaded:', tags.length, 'tags');
+}
+
+// Init on load + observe (unchanged)
+document.addEventListener('DOMContentLoaded', function() {
+    const tagsTab = document.getElementById('content6');
+    if (tagsTab && tagsTab.classList.contains('active')) {
+        initTags();
+    }
+    
+    const observer = new MutationObserver((mutations) => {
+        mutations.forEach((mutation) => {
+            if (mutation.type === 'attributes' && mutation.attributeName === 'class') {
+                const target = mutation.target;
+                if (target.id === 'content6' && target.classList.contains('active')) {
+                    initTags();
+                }
+            }
+        });
+    });
+    observer.observe(document.body, { subtree: true, attributes: true });
+});
+</script>

twig/master.html.twig

@@ -60,4 +60,32 @@
     {% endif %}
   
 {% include ['@override/foot.html.twig', '@novaconium/foot.html.twig'] %}
+{% if matomo_id > 0 %}
+<!-- Matomo -->
+<script>
+  var _paq = window._paq = window._paq || [];
+
+  {% if is_404 %}
+  _paq.push([
+    'setDocumentTitle',
+    '404 / Not Found - ' + document.location.pathname
+  ]);
+  {% endif %}
+
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+
+  (function() {
+    var u = "//{{ matomo_url|trim('/') }}/";
+    _paq.push(['setTrackerUrl', u + 'matomo.php']);
+    _paq.push(['setSiteId', {{ matomo_id }}]);
+    var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
+    g.async = true;
+    g.src = u + 'matomo.js';
+    s.parentNode.insertBefore(g, s);
+  })();
+</script>
+<!-- End Matomo Code -->
+{% endif %}
+
 </body></html>

views/404.html.twig

@@ -1,3 +1,4 @@
+{% set is_404 = status_code is defined and status_code == 404 %}
 {% extends '@novaconium/master.html.twig' %}
 
 {% block content %}

views/editpage/tab-main.html.twig

@@ -13,4 +13,17 @@
         <textarea id="body" name="body" rows="10" style="display: none;">{{ rows.body|default('')|e('html') }}</textarea>
         <div id="body-editor" class="ace-editor"></div>  {# Ace mounts here #}
     </div>
+</div>
+
+<div class="form-group">
+    <label for="draft">
+        <input
+            type="checkbox"
+            id="draft"
+            name="draft"
+            value="1"
+            {% if rows.draft|default(false) %}checked{% endif %}
+        >
+        Save as draft
+    </label>
 </div>