From afa0889dbd5aaba09be5517570fe553d1fad47e5 Mon Sep 17 00:00:00 2001 From: maxkernbach Date: Wed, 16 Jan 2019 07:38:25 +0100 Subject: [PATCH] UI: Add Drivers & Integrations column + fix links for 3.4 (#6695) * Add Drivers & Integrations column + fix links for 3.4 * dynamic-link-versions --- .../aardvark/APP/frontend/js/arango/arango.js | 9 ++++ .../APP/frontend/js/templates/supportView.ejs | 53 ++++++++++++------- .../APP/frontend/js/views/supportView.js | 6 ++- 3 files changed, 49 insertions(+), 19 deletions(-) diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js b/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js index 420850f8a3..5021fdaaa3 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/arango/arango.js @@ -40,6 +40,15 @@ }, toString: function (v) { return v.major + '.' + v.minor + '.' + v.patch; + }, + toDocuVersion: function (v) { + var version; + if (v.toLowerCase().indexOf('devel') >= 0 || v.toLowerCase().indexOf('rc') >= 0) { + version = 'devel'; + } else { + version = v.substring(0, 3); + } + return version; } }; diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/supportView.ejs b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/supportView.ejs index d89c448a60..a915135c45 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/templates/supportView.ejs +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/templates/supportView.ejs @@ -68,42 +68,59 @@

Find manuals for ArangoDB, AQL, Foxx and many other useful resources

-
+ -
+ -
+ + + diff --git a/js/apps/system/_admin/aardvark/APP/frontend/js/views/supportView.js b/js/apps/system/_admin/aardvark/APP/frontend/js/views/supportView.js index 537ea38dc0..bf0e1b71d6 100644 --- a/js/apps/system/_admin/aardvark/APP/frontend/js/views/supportView.js +++ b/js/apps/system/_admin/aardvark/APP/frontend/js/views/supportView.js @@ -14,7 +14,11 @@ }, render: function () { - this.$el.html(this.template.render({})); + this.$el.html(this.template.render({ + parsedVersion: window.versionHelper.toDocuVersion( + window.frontendConfig.version.version + ) + })); }, resize: function (auto) {