Compare commits
7 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| bc266ff969 | |||
| 8a97c5cb94 | |||
| d1178bc463 | |||
| c747d33491 | |||
| 850127e712 | |||
| 70f42352b0 | |||
| d57544ebfd |
@@ -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) {
|
||||
|
||||
@@ -18,6 +18,8 @@ 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),
|
||||
'organon_tweaks_show_all_filter' => (int) $this->configModel->get('organon_tweaks_show_all_filter', 1),
|
||||
),
|
||||
'errors' => array(),
|
||||
)));
|
||||
@@ -30,17 +32,33 @@ 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;
|
||||
$showAllFilter = isset($values['organon_tweaks_show_all_filter']) ? 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,
|
||||
'organon_tweaks_show_all_filter' => $showAllFilter,
|
||||
))) {
|
||||
$this->flash->success(t('Settings saved successfully.'));
|
||||
} else {
|
||||
$this->flash->failure(t('Unable to save your settings.'));
|
||||
}
|
||||
|
||||
// Apply the "Show all tasks" toggle across all boards immediately: on -> (re)create the
|
||||
// filter everywhere, off -> remove every one (it is a plugin-managed, reserved-name filter).
|
||||
$projectHelper = new \Kanboard\Plugin\OrganonTweaks\Helper\OrganonProjectHelper($this->container);
|
||||
|
||||
if ($showAllFilter === 1) {
|
||||
$projectHelper->addShowAllFilterToAllProjects();
|
||||
} else {
|
||||
$projectHelper->removeAllShowAllFilters();
|
||||
}
|
||||
|
||||
$this->response->redirect($this->helper->url->to('ConfigController', 'show', array('plugin' => 'OrganonTweaks')));
|
||||
}
|
||||
}
|
||||
|
||||
129
Helper/OrganonProjectHelper.php
Normal file
129
Helper/OrganonProjectHelper.php
Normal file
@@ -0,0 +1,129 @@
|
||||
<?php
|
||||
|
||||
namespace Kanboard\Plugin\OrganonTweaks\Helper;
|
||||
|
||||
use Kanboard\Core\Base;
|
||||
use Kanboard\Model\CustomFilterModel;
|
||||
|
||||
/**
|
||||
* 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.
|
||||
*
|
||||
* Also maintains a shared "Show all tasks" custom filter (an empty query) on every board, so there
|
||||
* is always a one-click way to clear the board filter and reveal open + closed tasks.
|
||||
*/
|
||||
class OrganonProjectHelper extends Base
|
||||
{
|
||||
const EMPHASIZE_KEY = 'organon_tweaks_emphasize_duedate';
|
||||
const EMPHASIZE_DEFAULT_KEY = 'organon_tweaks_emphasize_duedate_default';
|
||||
|
||||
const SHOW_ALL_FILTER_KEY = 'organon_tweaks_show_all_filter';
|
||||
|
||||
// The plugin RESERVES this custom-filter name: a fixed (non-translated) string so the dedup is
|
||||
// stable across locales. A user's own filter with this name is absorbed into the canonical form.
|
||||
const SHOW_ALL_FILTER_NAME = 'Show all tasks';
|
||||
|
||||
/**
|
||||
* 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;
|
||||
}
|
||||
|
||||
/**
|
||||
* Ensure the board has exactly one canonical "Show all tasks" filter (empty query, shared).
|
||||
* Idempotent: create it when absent, force a same-named one back to the canonical form (reserved
|
||||
* name), and drop any duplicates. Called lazily on every project-header render, so it covers old
|
||||
* and new boards alike. No-op without a real project and a real owner (custom_filters.user_id has
|
||||
* a FK to users, so a system id like 0 would fail the insert).
|
||||
*
|
||||
* @param int $project_id
|
||||
*/
|
||||
public function ensureShowAllFilter($project_id)
|
||||
{
|
||||
$project_id = (int) $project_id;
|
||||
$user_id = (int) $this->userSession->getId();
|
||||
|
||||
if ($project_id <= 0 || $user_id <= 0) {
|
||||
return;
|
||||
}
|
||||
|
||||
$existing = $this->db->table(CustomFilterModel::TABLE)
|
||||
->eq('project_id', $project_id)
|
||||
->eq('name', self::SHOW_ALL_FILTER_NAME)
|
||||
->findAll();
|
||||
|
||||
if (empty($existing)) {
|
||||
$this->db->table(CustomFilterModel::TABLE)->insert(array(
|
||||
'filter' => '',
|
||||
'project_id' => $project_id,
|
||||
'user_id' => $user_id,
|
||||
'name' => self::SHOW_ALL_FILTER_NAME,
|
||||
'is_shared' => 1,
|
||||
'append' => 0,
|
||||
));
|
||||
return;
|
||||
}
|
||||
|
||||
// Reserved name: keep one, force it to the canonical empty + shared form, drop the rest.
|
||||
$keep = array_shift($existing);
|
||||
|
||||
if ($keep['filter'] !== '' || (int) $keep['is_shared'] !== 1) {
|
||||
$this->db->table(CustomFilterModel::TABLE)
|
||||
->eq('id', $keep['id'])
|
||||
->update(array('filter' => '', 'is_shared' => 1));
|
||||
}
|
||||
|
||||
foreach ($existing as $duplicate) {
|
||||
$this->db->table(CustomFilterModel::TABLE)->eq('id', $duplicate['id'])->remove();
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggle turned ON: eagerly (re)create the "Show all tasks" filter on every existing board.
|
||||
* ensureShowAllFilter() keeps covering boards created afterwards.
|
||||
*/
|
||||
public function addShowAllFilterToAllProjects()
|
||||
{
|
||||
foreach ($this->projectModel->getAll() as $project) {
|
||||
$this->ensureShowAllFilter((int) $project['id']);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Toggle turned OFF: remove every "Show all tasks" filter across all boards (reserved name).
|
||||
*/
|
||||
public function removeAllShowAllFilters()
|
||||
{
|
||||
$this->db->table(CustomFilterModel::TABLE)
|
||||
->eq('name', self::SHOW_ALL_FILTER_NAME)
|
||||
->remove();
|
||||
}
|
||||
}
|
||||
18
Plugin.php
18
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.
|
||||
@@ -50,12 +57,19 @@ class Plugin extends Base
|
||||
'template' => 'plugins/OrganonTweaks/Asset/js/enhance-recurrence.js',
|
||||
));
|
||||
}
|
||||
|
||||
// Tweak: keep a shared "Show all tasks" custom filter (empty query -> open + closed) on every
|
||||
// board as a one-click "clear the filter". Ensured lazily when a project header renders, so
|
||||
// it covers old and new boards. The config toggle bulk-adds/removes them (ConfigController).
|
||||
if ((int) $this->configModel->get('organon_tweaks_show_all_filter', 1) === 1) {
|
||||
$this->template->hook->attach('template:project:header:before', 'organonTweaks:project_header/show_all_filter');
|
||||
}
|
||||
}
|
||||
|
||||
public function getHelpers()
|
||||
{
|
||||
return array(
|
||||
'Plugin\OrganonTweaks\Helper' => array('OrganonColumnHelper'),
|
||||
'Plugin\OrganonTweaks\Helper' => array('OrganonColumnHelper', 'OrganonProjectHelper'),
|
||||
);
|
||||
}
|
||||
|
||||
@@ -76,7 +90,7 @@ class Plugin extends Base
|
||||
|
||||
public function getPluginVersion()
|
||||
{
|
||||
return '1.3.2';
|
||||
return '1.5.0';
|
||||
}
|
||||
|
||||
public function getPluginHomepage()
|
||||
|
||||
@@ -27,12 +27,26 @@
|
||||
</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>
|
||||
|
||||
<fieldset>
|
||||
<?= $this->form->checkbox('organon_tweaks_show_all_filter', t('Add a "Show all tasks" filter to every board'), 1, isset($values['organon_tweaks_show_all_filter']) && $values['organon_tweaks_show_all_filter'] == 1) ?>
|
||||
<p class="form-help">
|
||||
<?= t('Keep a shared "Show all tasks" custom filter (an empty query, so open and closed tasks are shown) on every board, old and new. It appears in the board filter bookmark menu as a one-click way to clear the filter. Turning this off removes it from all boards; turning it on recreates it everywhere.') ?>
|
||||
</p>
|
||||
</fieldset>
|
||||
|
||||
<div class="form-actions">
|
||||
<button type="submit" class="btn btn-blue"><?= t('Save') ?></button>
|
||||
</div>
|
||||
|
||||
3
Template/layout/emphasize_duedate.php
Normal file
3
Template/layout/emphasize_duedate.php
Normal file
@@ -0,0 +1,3 @@
|
||||
<?php if ($this->OrganonProjectHelper->isEmphasizeDueDate()): ?>
|
||||
<style>.task-date { font-size: 1.375em; font-weight: bold; }</style>
|
||||
<?php endif ?>
|
||||
24
Template/project/integration.php
Normal file
24
Template/project/integration.php
Normal file
@@ -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>
|
||||
1
Template/project_header/show_all_filter.php
Normal file
1
Template/project_header/show_all_filter.php
Normal file
@@ -0,0 +1 @@
|
||||
<?php $this->OrganonProjectHelper->ensureShowAllFilter($project['id']) ?>
|
||||
Reference in New Issue
Block a user