fix Always-off (on/off/default safe values) + bump emphasis to 1.375em (v1.4.2)

Asset/js/click-guard.js

@@ -13,7 +13,7 @@
 (function () {
     "use strict";
 
-    var THRESHOLD = 100; // ms; a press on a card held longer than this is a drag, not a click
+    var THRESHOLD = 110; // ms; a press on a card held longer than this is a drag, not a click
     var pressStart = 0;
 
     function onDown(e) {

Asset/js/enhance-recurrence.js

@@ -0,0 +1,105 @@
+/*
+ * OrganonTweaks -- enhance Kanboard's native "Edit recurrence" dialog.
+ *
+ * That template (task_recurrence/edit.php) has no hook, so we transform the form in JS when
+ * the modal opens:
+ *   1. Replace the "Generate recurrent task" Yes/No dropdown with two radio buttons (one
+ *      click instead of open + select). The original <select> is kept, hidden, and stays in
+ *      sync, so the form still submits recurrence_status normally.
+ *   2. Add a small [+7] button next to the "Factor" input that adds 7 (a week of days).
+ *
+ * Detection: the modal is injected into #modal-box dynamically, so we watch the document for
+ * an un-enhanced recurrence form appearing. Loaded only when the setting is enabled.
+ */
+(function () {
+    "use strict";
+
+    function enhanceStatus(select) {
+        var group = document.createElement("span");
+        group.className = "ot-recurrence-status";
+
+        var radios = [];
+
+        for (var i = 0; i < select.options.length; i++) {
+            var opt = select.options[i];
+
+            var label = document.createElement("label");
+            // Kanboard styles form labels as display:block; force inline so Yes/No sit
+            // side by side instead of stacked.
+            label.style.display = "inline-block";
+            label.style.marginRight = "14px";
+            label.style.cursor = "pointer";
+
+            var radio = document.createElement("input");
+            radio.type = "radio";
+            // No name attribute on purpose: a named radio would be SUBMITTED with the form,
+            // and Kanboard rejects the extra key ("invalid identifier"). These are display
+            // only -- the hidden <select> carries the value -- so we enforce the mutual
+            // exclusivity ourselves.
+            radio.value = opt.value;
+            radio.checked = opt.value === select.value;
+            radio.style.marginRight = "4px";
+            radios.push(radio);
+
+            radio.addEventListener("change", function () {
+                for (var k = 0; k < radios.length; k++) {
+                    radios[k].checked = (radios[k] === this);
+                }
+                select.value = this.value;
+                select.dispatchEvent(new Event("change", { bubbles: true }));
+            });
+
+            label.appendChild(radio);
+            label.appendChild(document.createTextNode(opt.text));
+            group.appendChild(label);
+        }
+
+        select.style.display = "none";
+        select.parentNode.insertBefore(group, select.nextSibling);
+    }
+
+    function enhanceFactor(input) {
+        var btn = document.createElement("button");
+        btn.type = "button";
+        btn.className = "btn";
+        btn.textContent = "+7";
+        btn.title = "Add 7 (one week of days)";
+        btn.style.marginLeft = "6px";
+        btn.addEventListener("click", function () {
+            input.value = (parseInt(input.value, 10) || 0) + 7;
+            input.dispatchEvent(new Event("change", { bubbles: true }));
+        });
+
+        input.parentNode.insertBefore(btn, input.nextSibling);
+    }
+
+    function enhance() {
+        var select = document.querySelector('select[name="recurrence_status"]:not([data-ot-recurrence])');
+        if (!select) {
+            return;
+        }
+
+        select.setAttribute("data-ot-recurrence", "1");
+        enhanceStatus(select);
+
+        var factor = document.querySelector('input[name="recurrence_factor"]:not([data-ot-recurrence])');
+        if (factor) {
+            factor.setAttribute("data-ot-recurrence", "1");
+            enhanceFactor(factor);
+        }
+    }
+
+    function init() {
+        enhance();
+
+        if (window.MutationObserver) {
+            new MutationObserver(enhance).observe(document.body, { childList: true, subtree: true });
+        }
+    }
+
+    if (document.readyState === "loading") {
+        document.addEventListener("DOMContentLoaded", init);
+    } else {
+        init();
+    }
+})();

Controller/ConfigController.php

@@ -17,6 +17,8 @@ class ConfigController extends BaseController
                 'organon_tweaks_always_comment_icon' => (int) $this->configModel->get('organon_tweaks_always_comment_icon', 1),
                 'organon_tweaks_keep_scroll' => (int) $this->configModel->get('organon_tweaks_keep_scroll', 1),
                 'organon_tweaks_quick_click_only' => (int) $this->configModel->get('organon_tweaks_quick_click_only', 1),
+                'organon_tweaks_enhance_recurrence' => (int) $this->configModel->get('organon_tweaks_enhance_recurrence', 1),
+                'organon_tweaks_emphasize_duedate_default' => (int) $this->configModel->get('organon_tweaks_emphasize_duedate_default', 0),
             ),
             'errors' => array(),
         )));
@@ -29,11 +31,15 @@ class ConfigController extends BaseController
         $alwaysCommentIcon = isset($values['organon_tweaks_always_comment_icon']) ? 1 : 0;
         $keepScroll = isset($values['organon_tweaks_keep_scroll']) ? 1 : 0;
         $quickClickOnly = isset($values['organon_tweaks_quick_click_only']) ? 1 : 0;
+        $enhanceRecurrence = isset($values['organon_tweaks_enhance_recurrence']) ? 1 : 0;
+        $emphasizeDueDateDefault = isset($values['organon_tweaks_emphasize_duedate_default']) ? 1 : 0;
 
         if ($this->configModel->save(array(
             'organon_tweaks_always_comment_icon' => $alwaysCommentIcon,
             'organon_tweaks_keep_scroll' => $keepScroll,
             'organon_tweaks_quick_click_only' => $quickClickOnly,
+            'organon_tweaks_enhance_recurrence' => $enhanceRecurrence,
+            'organon_tweaks_emphasize_duedate_default' => $emphasizeDueDateDefault,
         ))) {
             $this->flash->success(t('Settings saved successfully.'));
         } else {

Helper/OrganonProjectHelper.php

@@ -0,0 +1,49 @@
+<?php
+
+namespace Kanboard\Plugin\OrganonTweaks\Helper;
+
+use Kanboard\Core\Base;
+
+/**
+ * Per-board helper for OrganonTweaks.
+ *
+ * Resolves the 3-state "emphasize due date" setting for the CURRENT board (read from the route
+ * project_id, which the router populates for pretty URLs before the layout renders):
+ *   per-board 'on' -> on, 'off' -> off, 'default'/absent -> follow the LIVE global default.
+ *
+ * The stored values are the non-falsy strings 'on'/'off' (not '1'/'0'): Kanboard's
+ * MetadataModel::get() uses `?:`, and PHP treats the string "0" as falsy, so a stored "0" would
+ * come back as the 'default' fallback and "Always off" would never be honored.
+ */
+class OrganonProjectHelper extends Base
+{
+    const EMPHASIZE_KEY = 'organon_tweaks_emphasize_duedate';
+    const EMPHASIZE_DEFAULT_KEY = 'organon_tweaks_emphasize_duedate_default';
+
+    /**
+     * Should the current board emphasize the due date? Board pages only (project_id in the route).
+     *
+     * @return bool
+     */
+    public function isEmphasizeDueDate()
+    {
+        $project_id = $this->request->getIntegerParam('project_id');
+
+        if ($project_id <= 0) {
+            return false;
+        }
+
+        $value = $this->projectMetadataModel->get($project_id, self::EMPHASIZE_KEY, 'default');
+
+        if ($value === 'on') {
+            return true;
+        }
+
+        if ($value === 'off') {
+            return false;
+        }
+
+        // 'default' (or absent) -> follow the live global default.
+        return (int) $this->configModel->get(self::EMPHASIZE_DEFAULT_KEY, 0) === 1;
+    }
+}

Plugin.php

@@ -20,6 +20,13 @@ class Plugin extends Base
         // Settings page for the plugin's tweaks.
         $this->template->hook->attach('template:config:sidebar', 'organonTweaks:config/sidebar');
 
+        // Per-board tweak: emphasize the due date on the board. Configured with 3-state radios on the
+        // board's Settings -> Integrations (Use default / Always on / Always off); the global default
+        // (for "Use default" boards) lives in the plugin settings above. The emphasis <style> is
+        // emitted into the head only on enabled board pages (gated by OrganonProjectHelper).
+        $this->template->hook->attach('template:project:integrations', 'organonTweaks:project/integration');
+        $this->template->hook->attach('template:layout:head', 'organonTweaks:layout/emphasize_duedate');
+
         // Tweak: always show a comment icon on board cards. When a card has no comments
         // yet, add a bubble "+" that opens the same comment modal (add the first comment
         // straight from the board). Cards with comments already show the native count.
@@ -42,12 +49,20 @@ class Plugin extends Base
                 'template' => 'plugins/OrganonTweaks/Asset/js/click-guard.js',
             ));
         }
+
+        // Tweak: enhance the native "Edit recurrence" dialog (Yes/No radios + a [+7] button
+        // on the factor). No template hook there, so it is done in JS.
+        if ((int) $this->configModel->get('organon_tweaks_enhance_recurrence', 1) === 1) {
+            $this->hook->on('template:layout:js', array(
+                'template' => 'plugins/OrganonTweaks/Asset/js/enhance-recurrence.js',
+            ));
+        }
     }
 
     public function getHelpers()
     {
         return array(
-            'Plugin\OrganonTweaks\Helper' => array('OrganonColumnHelper'),
+            'Plugin\OrganonTweaks\Helper' => array('OrganonColumnHelper', 'OrganonProjectHelper'),
         );
     }
 
@@ -68,7 +83,7 @@ class Plugin extends Base
 
     public function getPluginVersion()
     {
-        return '1.2.1';
+        return '1.4.2';
     }
 
     public function getPluginHomepage()

README.md

@@ -58,6 +58,19 @@ clicks (well under 100 ms) still open cards as usual. The 100 ms threshold is fi
 
 - **On by default.** Toggle it under "Settings -> Organon Tweaks".
 
+### Enhance the recurrence dialog
+
+Kanboard's native "Edit recurrence" dialog is a plain form. This makes two small usability
+edits when it opens (there is no template hook, so it is done in JS,
+`Asset/js/enhance-recurrence.js`):
+
+- the "Generate recurrent task" **Yes/No dropdown** becomes two **radio buttons** (one click
+  to set, instead of open + select). The original select is kept hidden and stays in sync, so
+  the form submits exactly as before.
+- a small **[+7]** button next to the "Factor" input adds 7 to it (one week of days).
+
+- **On by default.** Toggle it under "Settings -> Organon Tweaks".
+
 ## Settings
 
 Global (per Kanboard instance) and admin-only, under "Settings -> Organon Tweaks":
@@ -65,6 +78,7 @@ Global (per Kanboard instance) and admin-only, under "Settings -> Organon Tweaks
 - **Always show the comment icon on board cards** -- default on.
 - **Keep the board scroll position across refreshes** -- default on.
 - **Open a card only on a quick click** -- default on.
+- **Enhance the recurrence dialog** -- default on.
 
 ## Requirements
 

Template/config/show.php

@@ -26,6 +26,20 @@
         </p>
     </fieldset>
 
+    <fieldset>
+        <?= $this->form->checkbox('organon_tweaks_enhance_recurrence', t('Enhance the native recurrence dialog'), 1, isset($values['organon_tweaks_enhance_recurrence']) && $values['organon_tweaks_enhance_recurrence'] == 1) ?>
+        <p class="form-help">
+            <?= t('In the native "Edit recurrence" dialog, replace the Generate recurrent task dropdown with Yes/No radio buttons (one click), and add a [+7] button next to the factor that adds 7 (one week of days).') ?>
+        </p>
+    </fieldset>
+
+    <fieldset>
+        <?= $this->form->checkbox('organon_tweaks_emphasize_duedate_default', t('Emphasize due date by default'), 1, isset($values['organon_tweaks_emphasize_duedate_default']) && $values['organon_tweaks_emphasize_duedate_default'] == 1) ?>
+        <p class="form-help">
+            <?= t('Default for boards set to "Use default": enlarge and bold the due date on the board. Each board can override this under its own Settings -> Integrations.') ?>
+        </p>
+    </fieldset>
+
     <div class="form-actions">
         <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
     </div>

Template/layout/emphasize_duedate.php

@@ -0,0 +1,3 @@
+<?php if ($this->OrganonProjectHelper->isEmphasizeDueDate()): ?>
+<style>.task-date { font-size: 1.375em; font-weight: bold; }</style>
+<?php endif ?>

Template/project/integration.php

@@ -0,0 +1,24 @@
+<?php $choice = isset($values['organon_tweaks_emphasize_duedate']) && in_array($values['organon_tweaks_emphasize_duedate'], array('on', 'off'), true) ? $values['organon_tweaks_emphasize_duedate'] : 'default' ?>
+
+<h3><i class="fa fa-umbrella fa-fw" aria-hidden="true"></i> <?= t('OrganonTweaks') ?></h3>
+<div class="listing">
+    <p><strong><?= t('Emphasize due date on the board') ?></strong></p>
+
+    <label style="display:inline-block; margin-right:16px;">
+        <input type="radio" name="organon_tweaks_emphasize_duedate" value="default" <?= $choice === 'default' ? 'checked="checked"' : '' ?>> <?= t('Use default') ?>
+    </label>
+    <label style="display:inline-block; margin-right:16px;">
+        <input type="radio" name="organon_tweaks_emphasize_duedate" value="on" <?= $choice === 'on' ? 'checked="checked"' : '' ?>> <?= t('Always on') ?>
+    </label>
+    <label style="display:inline-block; margin-right:16px;">
+        <input type="radio" name="organon_tweaks_emphasize_duedate" value="off" <?= $choice === 'off' ? 'checked="checked"' : '' ?>> <?= t('Always off') ?>
+    </label>
+
+    <p class="form-help">
+        <?= t('Enlarge and bold the due date on this board. "Use default" follows the global OrganonTweaks setting.') ?>
+    </p>
+</div>
+
+<div class="form-actions">
+    <button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
+</div>

VERSION

@@ -1 +1 @@
-OrganonTweaks v1.2.1
+OrganonTweaks v1.4.2