From 29a837f347f53f751b723d466a2cd05fd92fd34e Mon Sep 17 00:00:00 2001 From: ArthurHoaro Date: Sun, 12 Mar 2017 19:03:50 +0100 Subject: Bulk deletion * Add a checkboxes in linklist which display a sub-header containing action buttons * Strongly rely on JS * Requires a modern browser (ES6 syntax support) * Checkboxes are hidden if the browser is old or JS disabled --- index.php | 19 +++++++----- tpl/default/css/shaarli.css | 13 ++++++++ tpl/default/js/shaarli.js | 73 ++++++++++++++++++++++++++++++++++++++++++-- tpl/default/linklist.html | 5 ++- tpl/default/page.header.html | 7 +++++ 5 files changed, 106 insertions(+), 11 deletions(-) diff --git a/index.php b/index.php index ab1e30da..5e61cbb0 100644 --- a/index.php +++ b/index.php @@ -1329,18 +1329,21 @@ function renderPage($conf, $pluginManager, $LINKSDB, $history) // -------- User clicked the "Delete" button when editing a link: Delete link from database. if ($targetPage == Router::$PAGE_DELETELINK) { - // We do not need to ask for confirmation: - // - confirmation is handled by JavaScript - // - we are protected from XSRF by the token. - if (! tokenOk($_GET['token'])) { die('Wrong token.'); } - $id = intval(escape($_GET['lf_linkdate'])); - $link = $LINKSDB[$id]; - $pluginManager->executeHooks('delete_link', $link); - unset($LINKSDB[$id]); + if (strpos($_GET['lf_linkdate'], ' ') !== false) { + $ids = array_values(array_filter(preg_split('/\s+/', escape($_GET['lf_linkdate'])))); + } else { + $ids = [$_GET['lf_linkdate']]; + } + foreach ($ids as $id) { + $id = (int) escape($id); + $link = $LINKSDB[$id]; + $pluginManager->executeHooks('delete_link', $link); + unset($LINKSDB[$id]); + } $LINKSDB->save($conf->get('resource.page_cache')); // save to disk $history->deleteLink($link); diff --git a/tpl/default/css/shaarli.css b/tpl/default/css/shaarli.css index 73fade5f..efdf06d4 100644 --- a/tpl/default/css/shaarli.css +++ b/tpl/default/css/shaarli.css @@ -275,6 +275,19 @@ body, .pure-g [class*="pure-u"] { } } +.subheader-form a.button { + color: #f5f5f5; + font-weight: bold; + text-decoration: none; + border: 2px solid #f5f5f5; + border-radius: 5px; + padding: 3px 10px; +} + +.linklist-item-editbuttons .delete-checkbox { + display: none; +} + #header-login-form input[type="text"], #header-login-form input[type="password"] { width: 200px; } diff --git a/tpl/default/js/shaarli.js b/tpl/default/js/shaarli.js index 4d47fcd0..7abd20b2 100644 --- a/tpl/default/js/shaarli.js +++ b/tpl/default/js/shaarli.js @@ -357,11 +357,64 @@ window.onload = function () { var continent = document.getElementById('continent'); var city = document.getElementById('city'); if (continent != null && city != null) { - continent.addEventListener('change', function(event) { + continent.addEventListener('change', function (event) { hideTimezoneCities(city, continent.options[continent.selectedIndex].value, true); }); hideTimezoneCities(city, continent.options[continent.selectedIndex].value, false); } + + /** + * Bulk actions + * + * Note: Requires a modern browser. + */ + if (testEs6Compatibility()) { + let linkCheckboxes = document.querySelectorAll('.delete-checkbox'); + for(let checkbox of linkCheckboxes) { + checkbox.style.display = 'block'; + checkbox.addEventListener('click', function(event) { + let count = 0; + for(let checkbox of linkCheckboxes) { + count = checkbox.checked ? count + 1 : count; + } + let bar = document.getElementById('actions'); + if (count == 0 && bar.classList.contains('open')) { + bar.classList.toggle('open'); + } else if (count > 0 && ! bar.classList.contains('open')) { + bar.classList.toggle('open'); + } + }); + } + + let deleteButton = document.getElementById('actions-delete'); + let token = document.querySelector('input[type="hidden"][name="token"]'); + if (deleteButton != null && token != null) { + deleteButton.addEventListener('click', function(event) { + event.preventDefault(); + + let links = []; + for(let checkbox of linkCheckboxes) { + if (checkbox.checked) { + links.push({ + 'id': checkbox.value, + 'title': document.querySelector('.linklist-item[data-id="'+ checkbox.value +'"] .linklist-link').innerHTML + }); + } + } + + let message = 'Are you sure you want to delete '+ links.length +' links?\n'; + message += 'This action is IRREVERSIBLE!\n\nTitles:\n'; + let ids = ''; + for (let item of links) { + message += ' - '+ item['title'] +'\n'; + ids += item['id'] +'+'; + } + if (window.confirm(message)) { + window.location = '?delete_link&lf_linkdate='+ ids +'&token='+ token.value; + } + }); + } + } }; function activateFirefoxSocial(node) { @@ -397,7 +450,7 @@ function activateFirefoxSocial(node) { */ function hideTimezoneCities(cities, currentContinent, reset = false) { var first = true; - [].forEach.call(cities, function(option) { + [].forEach.call(cities, function (option) { if (option.getAttribute('data-continent') != currentContinent) { option.className = 'hidden'; } else { @@ -409,3 +462,19 @@ function hideTimezoneCities(cities, currentContinent, reset = false) { } }); } + +/** + * Check if the browser is compatible with ECMAScript 6 syntax + * + * Source: http://stackoverflow.com/a/29046739/1484919 + * + * @returns {boolean} + */ +function testEs6Compatibility() +{ + "use strict"; + + try { eval("var foo = (x)=>x+1"); } + catch (e) { return false; } + return true; +} diff --git a/tpl/default/linklist.html b/tpl/default/linklist.html index 57ef4567..6a4e14a6 100644 --- a/tpl/default/linklist.html +++ b/tpl/default/linklist.html @@ -15,6 +15,8 @@ {/if} + +