From e61ee56031aa0788f9a40ec245d3c391d219d6c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 31 Oct 2016 16:16:41 +0100 Subject: Added QRCode and link to configure android application --- app/Resources/static/themes/_global/js/tools.js | 2 ++ 1 file changed, 2 insertions(+) (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index ab30deb1..00f5d501 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,5 +1,7 @@ const $ = require('jquery'); +var jrQrcode = require('jr-qrcode'); + function supportsLocalStorage() { try { return 'localStorage' in window && window.localStorage !== null; -- cgit v1.2.3 From 3b81212674bb4b2cf51ce51637e0093c952cefde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 31 Oct 2016 16:48:34 +0100 Subject: Added translations and baggy part --- app/Resources/static/themes/_global/js/tools.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 00f5d501..9b23e4b5 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,6 +1,6 @@ const $ = require('jquery'); -var jrQrcode = require('jr-qrcode'); +import jrQrcode from 'jr-qrcode'; function supportsLocalStorage() { try { -- cgit v1.2.3 From 32508ef07aeb43966694ae360eeaeff8325e2a4d Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 3 Nov 2016 14:23:09 +0100 Subject: avoid eslint warning by disabling line Signed-off-by: Thomas Citharel --- app/Resources/static/themes/_global/js/tools.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 9b23e4b5..55de090c 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,6 +1,7 @@ const $ = require('jquery'); -import jrQrcode from 'jr-qrcode'; +/* Allows inline call qr-code call */ +import jrQrcode from 'jr-qrcode'; // eslint-disable-line function supportsLocalStorage() { try { -- cgit v1.2.3 From 8a9604aafe8b8c6ddde4e1be78189af5238588fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 9 Nov 2016 15:44:28 +0100 Subject: Added unmark.it sharing Fix #668 --- .../themes/_global/img/icons/unmark-icon--black.png | Bin 0 -> 926 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 app/Resources/static/themes/_global/img/icons/unmark-icon--black.png (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png b/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png new file mode 100644 index 00000000..45f679ee Binary files /dev/null and b/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png differ -- cgit v1.2.3 From 3cc78f06799b0c91957767e8d9255e67b30edd96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 24 Oct 2016 11:20:11 +0200 Subject: Added shortcuts --- app/Resources/static/themes/_global/js/tools.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 55de090c..9a98f0a6 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,4 +1,5 @@ const $ = require('jquery'); +require('mousetrap'); /* Allows inline call qr-code call */ import jrQrcode from 'jr-qrcode'; // eslint-disable-line @@ -51,3 +52,14 @@ function initExport() { } export { savePercent, retrievePercent, initFilters, initExport }; + +/** Shortcuts **/ + +/* Go to */ +Mousetrap.bind('g u', function() { window.location.href = Routing.generate('homepage') }); +Mousetrap.bind('g s', function() { window.location.href = Routing.generate('starred') }); + +/* Actions */ +Mousetrap.bind('g a', function() { + $("#nav-btn-add").trigger("click"); +}); -- cgit v1.2.3 From f9cded7dd2acab3af8ff8481941e0c199daf8270 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 24 Oct 2016 20:37:49 +0200 Subject: Added new shortcuts --- app/Resources/static/themes/_global/js/tools.js | 37 ++++++++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 9a98f0a6..d6a2d803 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -58,8 +58,43 @@ export { savePercent, retrievePercent, initFilters, initExport }; /* Go to */ Mousetrap.bind('g u', function() { window.location.href = Routing.generate('homepage') }); Mousetrap.bind('g s', function() { window.location.href = Routing.generate('starred') }); +Mousetrap.bind('g r', function() { window.location.href = Routing.generate('archive') }); +Mousetrap.bind('g a', function() { window.location.href = Routing.generate('all') }); +Mousetrap.bind('g t', function() { window.location.href = Routing.generate('tag') }); +Mousetrap.bind('g c', function() { window.location.href = Routing.generate('config') }); +Mousetrap.bind('g i', function() { window.location.href = Routing.generate('import') }); +Mousetrap.bind('g d', function() { window.location.href = Routing.generate('developer') }); +Mousetrap.bind('g h', function() { window.location.href = Routing.generate('howto') }); +Mousetrap.bind('g l', function() { window.location.href = Routing.generate('logout') }); + /* Actions */ -Mousetrap.bind('g a', function() { +Mousetrap.bind('g n', function() { $("#nav-btn-add").trigger("click"); }); + +Mousetrap.bind('esc', function() { + $(".close").trigger("click"); +}); + +// Display the first element of the current view +Mousetrap.bind('right', function() { + $("ul.data li:first-child span.dot-ellipsis a")[0].click(); +}); + +/* Article view */ +Mousetrap.bind('o', function() { + $("ul.side-nav li:nth-child(2) a i")[0].click(); +}); + +Mousetrap.bind('s', function() { + $("ul.side-nav li:nth-child(5) a i")[0].click(); +}); + +Mousetrap.bind('a', function() { + $("ul.side-nav li:nth-child(4) a i")[0].click(); +}); + +Mousetrap.bind('del', function() { + $("ul.side-nav li:nth-child(6) a i")[0].click(); +}); -- cgit v1.2.3 From af61cb80eb600618df95a01a15a08e87fc878c2a Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 27 Oct 2016 01:57:27 +0200 Subject: es6 imports Signed-off-by: Thomas Citharel --- .../static/themes/_global/js/bookmarklet.js | 1 - app/Resources/static/themes/_global/js/tools.js | 52 +++++++++++----------- 2 files changed, 26 insertions(+), 27 deletions(-) (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/js/bookmarklet.js b/app/Resources/static/themes/_global/js/bookmarklet.js index 5174ff47..a497628b 100644 --- a/app/Resources/static/themes/_global/js/bookmarklet.js +++ b/app/Resources/static/themes/_global/js/bookmarklet.js @@ -1,4 +1,3 @@ - top['bookmarklet-url@wallabag.org'] = 'bag it!' + '' + diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index d6a2d803..96d9fcf6 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,5 +1,5 @@ -const $ = require('jquery'); -require('mousetrap'); +import $ from 'jquery'; +import Mousetrap from 'mousetrap'; /* Allows inline call qr-code call */ import jrQrcode from 'jr-qrcode'; // eslint-disable-line @@ -56,45 +56,45 @@ export { savePercent, retrievePercent, initFilters, initExport }; /** Shortcuts **/ /* Go to */ -Mousetrap.bind('g u', function() { window.location.href = Routing.generate('homepage') }); -Mousetrap.bind('g s', function() { window.location.href = Routing.generate('starred') }); -Mousetrap.bind('g r', function() { window.location.href = Routing.generate('archive') }); -Mousetrap.bind('g a', function() { window.location.href = Routing.generate('all') }); -Mousetrap.bind('g t', function() { window.location.href = Routing.generate('tag') }); -Mousetrap.bind('g c', function() { window.location.href = Routing.generate('config') }); -Mousetrap.bind('g i', function() { window.location.href = Routing.generate('import') }); -Mousetrap.bind('g d', function() { window.location.href = Routing.generate('developer') }); -Mousetrap.bind('g h', function() { window.location.href = Routing.generate('howto') }); -Mousetrap.bind('g l', function() { window.location.href = Routing.generate('logout') }); +Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); }); +Mousetrap.bind('g s', () => { window.location.href = Routing.generate('starred'); }); +Mousetrap.bind('g r', () => { window.location.href = Routing.generate('archive'); }); +Mousetrap.bind('g a', () => { window.location.href = Routing.generate('all'); }); +Mousetrap.bind('g t', () => { window.location.href = Routing.generate('tag'); }); +Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); }); +Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); }); +Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); }); +Mousetrap.bind('g h', () => { window.location.href = Routing.generate('howto'); }); +Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); }); /* Actions */ -Mousetrap.bind('g n', function() { - $("#nav-btn-add").trigger("click"); +Mousetrap.bind('g n', () => { + $('#nav-btn-add').trigger('click'); }); -Mousetrap.bind('esc', function() { - $(".close").trigger("click"); +Mousetrap.bind('esc', () => { + $('.close').trigger('click'); }); // Display the first element of the current view -Mousetrap.bind('right', function() { - $("ul.data li:first-child span.dot-ellipsis a")[0].click(); +Mousetrap.bind('right', () => { + $('ul.data li:first-child span.dot-ellipsis a')[0].click(); }); /* Article view */ -Mousetrap.bind('o', function() { - $("ul.side-nav li:nth-child(2) a i")[0].click(); +Mousetrap.bind('o', () => { + $('ul.side-nav li:nth-child(2) a i')[0].click(); }); -Mousetrap.bind('s', function() { - $("ul.side-nav li:nth-child(5) a i")[0].click(); +Mousetrap.bind('s', () => { + $('ul.side-nav li:nth-child(5) a i')[0].click(); }); -Mousetrap.bind('a', function() { - $("ul.side-nav li:nth-child(4) a i")[0].click(); +Mousetrap.bind('a', () => { + $('ul.side-nav li:nth-child(4) a i')[0].click(); }); -Mousetrap.bind('del', function() { - $("ul.side-nav li:nth-child(6) a i")[0].click(); +Mousetrap.bind('del', () => { + $('ul.side-nav li:nth-child(6) a i')[0].click(); }); -- cgit v1.2.3 From 16ef7607f43ebc3e0134360b7657af191e14fe12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 2 Nov 2016 16:44:20 +0100 Subject: Reorganized JS folders for shortcuts --- .../static/themes/_global/js/shortcuts/entry.js | 0 .../static/themes/_global/js/shortcuts/main.js | 13 ++++++ app/Resources/static/themes/_global/js/tools.js | 48 +--------------------- 3 files changed, 15 insertions(+), 46 deletions(-) create mode 100644 app/Resources/static/themes/_global/js/shortcuts/entry.js create mode 100644 app/Resources/static/themes/_global/js/shortcuts/main.js (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/js/shortcuts/entry.js b/app/Resources/static/themes/_global/js/shortcuts/entry.js new file mode 100644 index 00000000..e69de29b diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js new file mode 100644 index 00000000..0bb962d0 --- /dev/null +++ b/app/Resources/static/themes/_global/js/shortcuts/main.js @@ -0,0 +1,13 @@ +/** Shortcuts **/ + +/* Go to */ +Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); }); +Mousetrap.bind('g s', () => { window.location.href = Routing.generate('starred'); }); +Mousetrap.bind('g r', () => { window.location.href = Routing.generate('archive'); }); +Mousetrap.bind('g a', () => { window.location.href = Routing.generate('all'); }); +Mousetrap.bind('g t', () => { window.location.href = Routing.generate('tag'); }); +Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); }); +Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); }); +Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); }); +Mousetrap.bind('?', () => { window.location.href = Routing.generate('howto'); }); +Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); }); diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 96d9fcf6..77879dcd 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,5 +1,7 @@ import $ from 'jquery'; import Mousetrap from 'mousetrap'; +import './shortcuts/main.js'; +import './shortcuts/entry.js'; /* Allows inline call qr-code call */ import jrQrcode from 'jr-qrcode'; // eslint-disable-line @@ -52,49 +54,3 @@ function initExport() { } export { savePercent, retrievePercent, initFilters, initExport }; - -/** Shortcuts **/ - -/* Go to */ -Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); }); -Mousetrap.bind('g s', () => { window.location.href = Routing.generate('starred'); }); -Mousetrap.bind('g r', () => { window.location.href = Routing.generate('archive'); }); -Mousetrap.bind('g a', () => { window.location.href = Routing.generate('all'); }); -Mousetrap.bind('g t', () => { window.location.href = Routing.generate('tag'); }); -Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); }); -Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); }); -Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); }); -Mousetrap.bind('g h', () => { window.location.href = Routing.generate('howto'); }); -Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); }); - - -/* Actions */ -Mousetrap.bind('g n', () => { - $('#nav-btn-add').trigger('click'); -}); - -Mousetrap.bind('esc', () => { - $('.close').trigger('click'); -}); - -// Display the first element of the current view -Mousetrap.bind('right', () => { - $('ul.data li:first-child span.dot-ellipsis a')[0].click(); -}); - -/* Article view */ -Mousetrap.bind('o', () => { - $('ul.side-nav li:nth-child(2) a i')[0].click(); -}); - -Mousetrap.bind('s', () => { - $('ul.side-nav li:nth-child(5) a i')[0].click(); -}); - -Mousetrap.bind('a', () => { - $('ul.side-nav li:nth-child(4) a i')[0].click(); -}); - -Mousetrap.bind('del', () => { - $('ul.side-nav li:nth-child(6) a i')[0].click(); -}); -- cgit v1.2.3 From 5637a26e9af98a05c76823c85611315cd1a986e0 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Thu, 3 Nov 2016 10:02:16 +0100 Subject: Bring navigation (with right, left and enter) on material entries page. Supports going to next and previous page ! Also better indentation for js files (changed editorconfig for them). Signed-off-by: Thomas Citharel --- app/Resources/static/themes/_global/js/shortcuts/main.js | 3 +++ app/Resources/static/themes/_global/js/tools.js | 5 ++--- 2 files changed, 5 insertions(+), 3 deletions(-) (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js index 0bb962d0..1f2c1c52 100644 --- a/app/Resources/static/themes/_global/js/shortcuts/main.js +++ b/app/Resources/static/themes/_global/js/shortcuts/main.js @@ -1,3 +1,6 @@ +import Mousetrap from 'mousetrap'; + + /** Shortcuts **/ /* Go to */ diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 77879dcd..568b2dce 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -1,7 +1,6 @@ import $ from 'jquery'; -import Mousetrap from 'mousetrap'; -import './shortcuts/main.js'; -import './shortcuts/entry.js'; +import './shortcuts/main'; +import './shortcuts/entry'; /* Allows inline call qr-code call */ import jrQrcode from 'jr-qrcode'; // eslint-disable-line -- cgit v1.2.3 From c930992348d81c70884791ee3edbec4a3cc1d128 Mon Sep 17 00:00:00 2001 From: Thomas Citharel Date: Sat, 5 Nov 2016 16:06:13 +0100 Subject: fix next/prev page --- app/Resources/static/themes/_global/js/shortcuts/main.js | 1 - 1 file changed, 1 deletion(-) (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js index 1f2c1c52..ef6a1b84 100644 --- a/app/Resources/static/themes/_global/js/shortcuts/main.js +++ b/app/Resources/static/themes/_global/js/shortcuts/main.js @@ -1,6 +1,5 @@ import Mousetrap from 'mousetrap'; - /** Shortcuts **/ /* Go to */ -- cgit v1.2.3 From 66e9dde0dc0ba5f554231a7a968ef5b530a0563f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 23 Nov 2016 14:40:00 +0100 Subject: Fixed logout shortcut --- app/Resources/static/themes/_global/js/shortcuts/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js index ef6a1b84..c81bf869 100644 --- a/app/Resources/static/themes/_global/js/shortcuts/main.js +++ b/app/Resources/static/themes/_global/js/shortcuts/main.js @@ -12,4 +12,4 @@ Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); }); Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); }); Mousetrap.bind('?', () => { window.location.href = Routing.generate('howto'); }); -Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); }); +Mousetrap.bind('g l', () => { window.location.href = Routing.generate('fos_user_security_logout'); }); -- cgit v1.2.3 From 9f01d0fde09fa055a7db9f26e77c5e6b3d6c2224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Mon, 28 Nov 2016 11:02:10 +0100 Subject: Added list view --- app/Resources/static/themes/_global/img/list.png | Bin 0 -> 201 bytes app/Resources/static/themes/_global/img/table.png | Bin 0 -> 229 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100755 app/Resources/static/themes/_global/img/list.png create mode 100755 app/Resources/static/themes/_global/img/table.png (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/img/list.png b/app/Resources/static/themes/_global/img/list.png new file mode 100755 index 00000000..bd5aff5a Binary files /dev/null and b/app/Resources/static/themes/_global/img/list.png differ diff --git a/app/Resources/static/themes/_global/img/table.png b/app/Resources/static/themes/_global/img/table.png new file mode 100755 index 00000000..859c4cd8 Binary files /dev/null and b/app/Resources/static/themes/_global/img/table.png differ -- cgit v1.2.3 From ccb9e79a35cdac9f93de90f577f8ec63fdcc6081 Mon Sep 17 00:00:00 2001 From: Simounet Date: Thu, 29 Dec 2016 19:17:36 +0100 Subject: Fix double overlay on expanded right sidenav --- app/Resources/static/themes/_global/js/tools.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/Resources/static/themes/_global') diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index 568b2dce..cee84fa8 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js @@ -35,7 +35,7 @@ function initFilters() { // no display if filters not available if ($('div').is('#filters')) { $('#button_filters').show(); - $('.button-collapse-right').sideNav({ edge: 'right' }); + $('.js-filters-action').sideNav({ edge: 'right' }); $('#clear_form_filters').on('click', () => { $('#filters input').val(''); $('#filters :checked').removeAttr('checked'); @@ -48,7 +48,7 @@ function initExport() { // no display if export not available if ($('div').is('#export')) { $('#button_export').show(); - $('.button-collapse-right').sideNav({ edge: 'right' }); + $('.js-export-action').sideNav({ edge: 'right' }); } } -- cgit v1.2.3