fix stuck enhance-recurrence toggle + clarify label (v1.4.1)

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

@@ -18,6 +18,8 @@
         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];
 
@@ -30,15 +32,21 @@
 
             var radio = document.createElement("input");
             radio.type = "radio";
-            radio.name = "ot-recurrence-status";
+            // 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 () {
-                if (this.checked) {
+                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);

Controller/ConfigController.php

@@ -18,6 +18,7 @@ class ConfigController extends BaseController
                 '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(),
         )));
@@ -30,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,45 @@
+<?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 '1' -> on, '0' -> off, 'default'/absent -> follow the LIVE global default.
+ */
+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 === '1') {
+            return true;
+        }
+
+        if ($value === '0') {
+            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.
@@ -55,7 +62,7 @@ class Plugin extends Base
     public function getHelpers()
     {
         return array(
-            'Plugin\OrganonTweaks\Helper' => array('OrganonColumnHelper'),
+            'Plugin\OrganonTweaks\Helper' => array('OrganonColumnHelper', 'OrganonProjectHelper'),
         );
     }
 
@@ -76,7 +83,7 @@ class Plugin extends Base
 
     public function getPluginVersion()
     {
-        return '1.3.1';
+        return '1.4.1';
     }
 
     public function getPluginHomepage()

Template/config/show.php

@@ -27,12 +27,19 @@
     </fieldset>
 
     <fieldset>
-        <?= $this->form->checkbox('organon_tweaks_enhance_recurrence', t('Enhance the recurrence dialog'), 1, isset($values['organon_tweaks_enhance_recurrence']) && $values['organon_tweaks_enhance_recurrence'] == 1) ?>
+        <?= $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.25em; 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('1', '0'), 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="1" <?= $choice === '1' ? 'checked="checked"' : '' ?>> <?= t('Always on') ?>
+    </label>
+    <label style="display:inline-block; margin-right:16px;">
+        <input type="radio" name="organon_tweaks_emphasize_duedate" value="0" <?= $choice === '0' ? '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.3.1
+OrganonTweaks v1.4.1