From 764da42d48d7a322e9489e36fcf15001073bf10b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Benqu=C3=A9?= Date: Mon, 22 Jun 2020 13:22:48 +0100 Subject: [PATCH 1/2] add icon to support ticket category dropdown + added an option to add "fa-angle-down" to any dropdown --- www/common/common-ui-elements.js | 5 +++++ www/support/ui.js | 1 + 2 files changed, 6 insertions(+) diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 7d829bdb0..386353339 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -2155,6 +2155,11 @@ define([ 'class': 'fa fa-caret-down', }).prependTo($button); } + if (config.angleDown) { + $('', { + 'class': 'fa fa-angle-down', + }).prependTo($button); + } // Menu var $innerblock = $('
', {'class': 'cp-dropdown-content'}); diff --git a/www/support/ui.js b/www/support/ui.js index 2be5cff1e..7783cca2e 100644 --- a/www/support/ui.js +++ b/www/support/ui.js @@ -119,6 +119,7 @@ Messages.support_category = "Category"; // XXX }); var dropdownCfg = { text: Messages.support_category, + angleDown: 1, options: categories, container: $(container), isSelect: true From d9b005970db12b432c61d54b08f020ed4cc4b4ad Mon Sep 17 00:00:00 2001 From: ansuz Date: Mon, 22 Jun 2020 09:43:29 -0400 Subject: [PATCH 2/2] update version strings for 3.19.1 (Thylacine's revenge) --- customize.dist/pages.js | 2 +- package-lock.json | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 0e42b9a3a..c37e4b2f5 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -62,7 +62,7 @@ define([ var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ? '/imprint.html' : AppConfig.imprint); - Pages.versionString = "CryptPad v3.19.0 (Thylacine)"; + Pages.versionString = "CryptPad v3.19.1 (Thylacine's revenge)"; // used for the about menu Pages.imprintLink = AppConfig.imprint ? footLink(imprintUrl, 'imprint') : undefined; diff --git a/package-lock.json b/package-lock.json index ed2097eff..dcced0ee4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "cryptpad", - "version": "3.19.0", + "version": "3.19.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index be6f77978..8b9bc912c 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "cryptpad", "description": "realtime collaborative visual editor with zero knowlege server", - "version": "3.19.0", + "version": "3.19.1", "license": "AGPL-3.0+", "repository": { "type": "git",