From c52348e234755c0c4bcb51e6c71fddfc55912b28 Mon Sep 17 00:00:00 2001 From: George Moschovitis Date: Wed, 14 Nov 2018 14:07:14 +0200 Subject: Added new branding material #4598 (#4656) * Moved name2id to utils.js * Added new favicon and other branding material #4598 * Added improved favicon, cleanup #4598 * Removed some older icons * Removed seo-performance-128 icon refs, and refs to soylent icon * Regenerated dashboard.js * Use base64 encoded favicon #4598 Avoids refetching when hash gets updated --- REDISTRIBUTED.md | 5 --- health/notifications/alarm-notify.sh.in | 12 ++++---- web/gui/Makefile.am | 38 +++++++++++++++-------- web/gui/browserconfig.xml | 2 ++ web/gui/dashboard.js | 29 +++++++++-------- web/gui/favicon.ico | Bin 56875 -> 34494 bytes web/gui/images/android-icon-144x144.png | Bin 0 -> 5534 bytes web/gui/images/android-icon-192x192.png | Bin 0 -> 6680 bytes web/gui/images/android-icon-36x36.png | Bin 0 -> 1668 bytes web/gui/images/android-icon-48x48.png | Bin 0 -> 1932 bytes web/gui/images/android-icon-72x72.png | Bin 0 -> 2716 bytes web/gui/images/android-icon-96x96.png | Bin 0 -> 3500 bytes web/gui/images/apple-icon-114x114.png | Bin 0 -> 4248 bytes web/gui/images/apple-icon-120x120.png | Bin 0 -> 4471 bytes web/gui/images/apple-icon-144x144.png | Bin 0 -> 5534 bytes web/gui/images/apple-icon-152x152.png | Bin 0 -> 5883 bytes web/gui/images/apple-icon-180x180.png | Bin 0 -> 7297 bytes web/gui/images/apple-icon-57x57.png | Bin 0 -> 2212 bytes web/gui/images/apple-icon-60x60.png | Bin 0 -> 2246 bytes web/gui/images/apple-icon-72x72.png | Bin 0 -> 2716 bytes web/gui/images/apple-icon-76x76.png | Bin 0 -> 2751 bytes web/gui/images/apple-icon-precomposed.png | Bin 0 -> 7254 bytes web/gui/images/apple-icon.png | Bin 0 -> 7254 bytes web/gui/images/banner-icon-144x144.png | Bin 0 -> 5534 bytes web/gui/images/favicon-16x16.png | Bin 0 -> 1096 bytes web/gui/images/favicon-32x32.png | Bin 0 -> 1575 bytes web/gui/images/favicon-96x96.png | Bin 0 -> 3500 bytes web/gui/images/favicon.ico | Bin 0 -> 1150 bytes web/gui/images/ms-icon-144x144.png | Bin 0 -> 5534 bytes web/gui/images/ms-icon-150x150.png | Bin 0 -> 5772 bytes web/gui/images/ms-icon-310x310.png | Bin 0 -> 16102 bytes web/gui/images/ms-icon-70x70.png | Bin 0 -> 2523 bytes web/gui/images/seo-performance-114.png | Bin 3578 -> 0 bytes web/gui/images/seo-performance-16.png | Bin 287 -> 0 bytes web/gui/images/seo-performance-24.png | Bin 528 -> 0 bytes web/gui/images/seo-performance-256.png | Bin 3216 -> 0 bytes web/gui/images/seo-performance-32.png | Bin 509 -> 0 bytes web/gui/images/seo-performance-48.png | Bin 1116 -> 0 bytes web/gui/images/seo-performance-512.png | Bin 6995 -> 0 bytes web/gui/images/seo-performance-64.png | Bin 961 -> 0 bytes web/gui/images/seo-performance-72.png | Bin 1609 -> 0 bytes web/gui/images/seo-performance-multi-size.icns | Bin 80967 -> 0 bytes web/gui/images/seo-performance-multi-size.ico | Bin 56875 -> 0 bytes web/gui/index.html | 39 ++++++++++++----------- web/gui/manifest.json | 41 +++++++++++++++++++++++++ web/gui/src/dashboard.js/alarms.js | 2 +- web/gui/src/dashboard.js/compatibility.js | 15 ++------- web/gui/src/dashboard.js/utils.js | 12 ++++++++ 48 files changed, 126 insertions(+), 69 deletions(-) create mode 100644 web/gui/browserconfig.xml create mode 100644 web/gui/images/android-icon-144x144.png create mode 100644 web/gui/images/android-icon-192x192.png create mode 100644 web/gui/images/android-icon-36x36.png create mode 100644 web/gui/images/android-icon-48x48.png create mode 100644 web/gui/images/android-icon-72x72.png create mode 100644 web/gui/images/android-icon-96x96.png create mode 100644 web/gui/images/apple-icon-114x114.png create mode 100644 web/gui/images/apple-icon-120x120.png create mode 100644 web/gui/images/apple-icon-144x144.png create mode 100644 web/gui/images/apple-icon-152x152.png create mode 100644 web/gui/images/apple-icon-180x180.png create mode 100644 web/gui/images/apple-icon-57x57.png create mode 100644 web/gui/images/apple-icon-60x60.png create mode 100644 web/gui/images/apple-icon-72x72.png create mode 100644 web/gui/images/apple-icon-76x76.png create mode 100644 web/gui/images/apple-icon-precomposed.png create mode 100644 web/gui/images/apple-icon.png create mode 100644 web/gui/images/banner-icon-144x144.png create mode 100644 web/gui/images/favicon-16x16.png create mode 100644 web/gui/images/favicon-32x32.png create mode 100644 web/gui/images/favicon-96x96.png create mode 100644 web/gui/images/favicon.ico create mode 100644 web/gui/images/ms-icon-144x144.png create mode 100644 web/gui/images/ms-icon-150x150.png create mode 100644 web/gui/images/ms-icon-310x310.png create mode 100644 web/gui/images/ms-icon-70x70.png delete mode 100644 web/gui/images/seo-performance-114.png delete mode 100644 web/gui/images/seo-performance-16.png delete mode 100644 web/gui/images/seo-performance-24.png delete mode 100644 web/gui/images/seo-performance-256.png delete mode 100644 web/gui/images/seo-performance-32.png delete mode 100644 web/gui/images/seo-performance-48.png delete mode 100644 web/gui/images/seo-performance-512.png delete mode 100644 web/gui/images/seo-performance-64.png delete mode 100644 web/gui/images/seo-performance-72.png delete mode 100644 web/gui/images/seo-performance-multi-size.icns delete mode 100644 web/gui/images/seo-performance-multi-size.ico create mode 100644 web/gui/manifest.json diff --git a/REDISTRIBUTED.md b/REDISTRIBUTED.md index ed30624fb0..f102297b86 100644 --- a/REDISTRIBUTED.md +++ b/REDISTRIBUTED.md @@ -126,11 +126,6 @@ connectivity is not available. Code license: [MIT License](http://opensource.org/licenses/mit-license.html) -- [IconsDB.com Icons](http://www.iconsdb.com/soylent-red-icons/seo-performance-icon.html) - - Icons provided as CC0 1.0 Universal (CC0 1.0) Public Domain Dedication - - - [node-extend](https://github.com/justmoon/node-extend) Copyright 2014, Stefan Thomas diff --git a/health/notifications/alarm-notify.sh.in b/health/notifications/alarm-notify.sh.in index 43391f319c..ea82230971 100755 --- a/health/notifications/alarm-notify.sh.in +++ b/health/notifications/alarm-notify.sh.in @@ -1480,7 +1480,7 @@ send_slack() { { "channel": "#${channel}", "username": "netdata on ${host}", - "icon_url": "${images_base_url}/images/seo-performance-128.png", + "icon_url": "${images_base_url}/images/banner-icon-144x144.png", "text": "${host} ${status_message}, \`${chart}\` (_${family}_), *${alarm}*", "attachments": [ { @@ -1545,7 +1545,7 @@ send_rocketchat() { { "channel": "#${channel}", "alias": "netdata on ${host}", - "avatar": "${images_base_url}/images/seo-performance-128.png", + "avatar": "${images_base_url}/images/banner-icon-144x144.png", "text": "${host} ${status_message}, \`${chart}\` (_${family}_), *${alarm}*", "attachments": [ { @@ -1684,7 +1684,7 @@ send_flock() { httpcode=$(docurl -X POST "${webhook}" -H "Content-Type: application/json" -d "{ \"sendAs\": { \"name\" : \"netdata on ${host}\", - \"profileImage\" : \"${images_base_url}/images/seo-performance-128.png\" + \"profileImage\" : \"${images_base_url}/images/banner-icon-144x144.png\" }, \"text\": \"${host} *${status_message}*\", \"timestamp\": \"${when}\", @@ -1744,7 +1744,7 @@ send_discord() { "channel": "#${channel}", "username": "${username}", "text": "${host} ${status_message}, \`${chart}\` (_${family}_), *${alarm}*", - "icon_url": "${images_base_url}/images/seo-performance-128.png", + "icon_url": "${images_base_url}/images/banner-icon-144x144.png", "attachments": [ { "color": "${color}", @@ -1758,7 +1758,7 @@ send_discord() { } ], "thumb_url": "${image}", - "footer_icon": "${images_base_url}/images/seo-performance-128.png", + "footer_icon": "${images_base_url}/images/banner-icon-144x144.png", "footer": "${this_host}", "ts": ${when} } @@ -1981,7 +1981,7 @@ color="grey" alarm="${name//_/ } = ${value_string}" # the image of the alarm -image="${images_base_url}/images/seo-performance-128.png" +image="${images_base_url}/images/banner-icon-144x144.png" # prepare the title based on status case "${status}" in diff --git a/web/gui/Makefile.am b/web/gui/Makefile.am index b18fa5d6d7..05d6f6542d 100644 --- a/web/gui/Makefile.am +++ b/web/gui/Makefile.am @@ -127,18 +127,32 @@ dist_webimages_DATA = \ images/check-mark-2-multi-size-green.ico \ images/netdata.svg \ images/post.png \ - images/seo-performance-16.png \ - images/seo-performance-24.png \ - images/seo-performance-32.png \ - images/seo-performance-48.png \ - images/seo-performance-64.png \ - images/seo-performance-72.png \ - images/seo-performance-114.png \ - images/seo-performance-128.png \ - images/seo-performance-256.png \ - images/seo-performance-512.png \ - images/seo-performance-multi-size.ico \ - images/seo-performance-multi-size.icns \ + images/android-icon-36x36.png \ + images/android-icon-48x48.png \ + images/android-icon-72x72.png \ + images/android-icon-96x96.png \ + images/android-icon-144x144.png \ + images/android-icon-192x192.png \ + images/apple-icon-57x57.png \ + images/apple-icon-60x60.png \ + images/apple-icon-72x72.png \ + images/apple-icon-76x76.png \ + images/apple-icon-114x114.png \ + images/apple-icon-120x120.png \ + images/apple-icon-144x144.png \ + images/apple-icon-152x152.png \ + images/apple-icon-180x180.png \ + images/apple-icon-precomposed.png \ + images/apple-icon.png \ + images/favicon-16x16.png \ + images/favicon-32x32.png \ + images/favicon-96x96.png \ + images/favicon.ico \ + images/ms-icon-70x70.png \ + images/ms-icon-144x144.png \ + images/ms-icon-150x150.png \ + images/ms-icon-310x310.png \ + images/banner-icon-144x144.png \ $(NULL) dashboard.js: $(DASHBOARD_JS_FILES) diff --git a/web/gui/browserconfig.xml b/web/gui/browserconfig.xml new file mode 100644 index 0000000000..32f47595e8 --- /dev/null +++ b/web/gui/browserconfig.xml @@ -0,0 +1,2 @@ + +#ffffff diff --git a/web/gui/dashboard.js b/web/gui/dashboard.js index 1b377d71c3..8a8061a555 100644 --- a/web/gui/dashboard.js +++ b/web/gui/dashboard.js @@ -81,6 +81,18 @@ const NETDATA = window.NETDATA || {}; (function(window, document, $, undefined) { +// *** src/dashboard.js/utils.js + +NETDATA.name2id = function (s) { + return s + .replace(/ /g, '_') + .replace(/:/g, '_') + .replace(/\(/g, '_') + .replace(/\)/g, '_') + .replace(/\./g, '_') + .replace(/\//g, '_'); +}; + NETDATA.encodeURIComponent = function (s) { if (typeof(s) === 'string') { return encodeURIComponent(s); @@ -603,8 +615,9 @@ NETDATA.errorReset = function () { NETDATA.errorLast.message = "You are doing fine!"; NETDATA.errorLast.datetime = 0; }; -// ------------------------------------------------------------------------ -// compatibility fixes +// *** src/dashboard.js/compatibility.js + +// Compatibility fixes. // fix IE issue with console if (!window.console) { @@ -633,16 +646,6 @@ if (typeof String.prototype.startsWith !== 'function') { return this.slice(s.length) === s; }; } - -NETDATA.name2id = function (s) { - return s - .replace(/ /g, '_') - .replace(/:/g, '_') - .replace(/\(/g, '_') - .replace(/\)/g, '_') - .replace(/\./g, '_') - .replace(/\//g, '_'); -}; // ---------------------------------------------------------------------------------------------------------------- // XSS checks @@ -9300,7 +9303,7 @@ NETDATA.alarms = { let status = entry.status.toLowerCase(); let title = name + ' = ' + value_string.toString(); let tag = entry.alarm_id; - let icon = 'images/seo-performance-128.png'; + let icon = 'images/banner-icon-144x144.png'; let interaction = false; let data = entry; let show = true; diff --git a/web/gui/favicon.ico b/web/gui/favicon.ico index 821f7c4026..857c582d1b 100644 Binary files a/web/gui/favicon.ico and b/web/gui/favicon.ico differ diff --git a/web/gui/images/android-icon-144x144.png b/web/gui/images/android-icon-144x144.png new file mode 100644 index 0000000000..c3013cc964 Binary files /dev/null and b/web/gui/images/android-icon-144x144.png differ diff --git a/web/gui/images/android-icon-192x192.png b/web/gui/images/android-icon-192x192.png new file mode 100644 index 0000000000..77d18d9cce Binary files /dev/null and b/web/gui/images/android-icon-192x192.png differ diff --git a/web/gui/images/android-icon-36x36.png b/web/gui/images/android-icon-36x36.png new file mode 100644 index 0000000000..74576f6bab Binary files /dev/null and b/web/gui/images/android-icon-36x36.png differ diff --git a/web/gui/images/android-icon-48x48.png b/web/gui/images/android-icon-48x48.png new file mode 100644 index 0000000000..5666fa102a Binary files /dev/null and b/web/gui/images/android-icon-48x48.png differ diff --git a/web/gui/images/android-icon-72x72.png b/web/gui/images/android-icon-72x72.png new file mode 100644 index 0000000000..7f7043f149 Binary files /dev/null and b/web/gui/images/android-icon-72x72.png differ diff --git a/web/gui/images/android-icon-96x96.png b/web/gui/images/android-icon-96x96.png new file mode 100644 index 0000000000..1bbf594def Binary files /dev/null and b/web/gui/images/android-icon-96x96.png differ diff --git a/web/gui/images/apple-icon-114x114.png b/web/gui/images/apple-icon-114x114.png new file mode 100644 index 0000000000..7d093e856b Binary files /dev/null and b/web/gui/images/apple-icon-114x114.png differ diff --git a/web/gui/images/apple-icon-120x120.png b/web/gui/images/apple-icon-120x120.png new file mode 100644 index 0000000000..d4c38e7b1c Binary files /dev/null and b/web/gui/images/apple-icon-120x120.png differ diff --git a/web/gui/images/apple-icon-144x144.png b/web/gui/images/apple-icon-144x144.png new file mode 100644 index 0000000000..c3013cc964 Binary files /dev/null and b/web/gui/images/apple-icon-144x144.png differ diff --git a/web/gui/images/apple-icon-152x152.png b/web/gui/images/apple-icon-152x152.png new file mode 100644 index 0000000000..c92f381724 Binary files /dev/null and b/web/gui/images/apple-icon-152x152.png differ diff --git a/web/gui/images/apple-icon-180x180.png b/web/gui/images/apple-icon-180x180.png new file mode 100644 index 0000000000..1a58fdbb22 Binary files /dev/null and b/web/gui/images/apple-icon-180x180.png differ diff --git a/web/gui/images/apple-icon-57x57.png b/web/gui/images/apple-icon-57x57.png new file mode 100644 index 0000000000..36c273cede Binary files /dev/null and b/web/gui/images/apple-icon-57x57.png differ diff --git a/web/gui/images/apple-icon-60x60.png b/web/gui/images/apple-icon-60x60.png new file mode 100644 index 0000000000..c3c48c8bdf Binary files /dev/null and b/web/gui/images/apple-icon-60x60.png differ diff --git a/web/gui/images/apple-icon-72x72.png b/web/gui/images/apple-icon-72x72.png new file mode 100644 index 0000000000..7f7043f149 Binary files /dev/null and b/web/gui/images/apple-icon-72x72.png differ diff --git a/web/gui/images/apple-icon-76x76.png b/web/gui/images/apple-icon-76x76.png new file mode 100644 index 0000000000..b5e73cd4ee Binary files /dev/null and b/web/gui/images/apple-icon-76x76.png differ diff --git a/web/gui/images/apple-icon-precomposed.png b/web/gui/images/apple-icon-precomposed.png new file mode 100644 index 0000000000..f69945bf99 Binary files /dev/null and b/web/gui/images/apple-icon-precomposed.png differ diff --git a/web/gui/images/apple-icon.png b/web/gui/images/apple-icon.png new file mode 100644 index 0000000000..f69945bf99 Binary files /dev/null and b/web/gui/images/apple-icon.png differ diff --git a/web/gui/images/banner-icon-144x144.png b/web/gui/images/banner-icon-144x144.png new file mode 100644 index 0000000000..c3013cc964 Binary files /dev/null and b/web/gui/images/banner-icon-144x144.png differ diff --git a/web/gui/images/favicon-16x16.png b/web/gui/images/favicon-16x16.png new file mode 100644 index 0000000000..43eb188fee Binary files /dev/null and b/web/gui/images/favicon-16x16.png differ diff --git a/web/gui/images/favicon-32x32.png b/web/gui/images/favicon-32x32.png new file mode 100644 index 0000000000..e657e92121 Binary files /dev/null and b/web/gui/images/favicon-32x32.png differ diff --git a/web/gui/images/favicon-96x96.png b/web/gui/images/favicon-96x96.png new file mode 100644 index 0000000000..1bbf594def Binary files /dev/null and b/web/gui/images/favicon-96x96.png differ diff --git a/web/gui/images/favicon.ico b/web/gui/images/favicon.ico new file mode 100644 index 0000000000..7ed9572529 Binary files /dev/null and b/web/gui/images/favicon.ico differ diff --git a/web/gui/images/ms-icon-144x144.png b/web/gui/images/ms-icon-144x144.png new file mode 100644 index 0000000000..c3013cc964 Binary files /dev/null and b/web/gui/images/ms-icon-144x144.png differ diff --git a/web/gui/images/ms-icon-150x150.png b/web/gui/images/ms-icon-150x150.png new file mode 100644 index 0000000000..f0cf412878 Binary files /dev/null and b/web/gui/images/ms-icon-150x150.png differ diff --git a/web/gui/images/ms-icon-310x310.png b/web/gui/images/ms-icon-310x310.png new file mode 100644 index 0000000000..4f5f7e6211 Binary files /dev/null and b/web/gui/images/ms-icon-310x310.png differ diff --git a/web/gui/images/ms-icon-70x70.png b/web/gui/images/ms-icon-70x70.png new file mode 100644 index 0000000000..70012c61fe Binary files /dev/null and b/web/gui/images/ms-icon-70x70.png differ diff --git a/web/gui/images/seo-performance-114.png b/web/gui/images/seo-performance-114.png deleted file mode 100644 index 3f3862b3b8..0000000000 Binary files a/web/gui/images/seo-performance-114.png and /dev/null differ diff --git a/web/gui/images/seo-performance-16.png b/web/gui/images/seo-performance-16.png deleted file mode 100644 index 6d7f075ec0..0000000000 Binary files a/web/gui/images/seo-performance-16.png and /dev/null differ diff --git a/web/gui/images/seo-performance-24.png b/web/gui/images/seo-performance-24.png deleted file mode 100644 index 32d077ef1a..0000000000 Binary files a/web/gui/images/seo-performance-24.png and /dev/null differ diff --git a/web/gui/images/seo-performance-256.png b/web/gui/images/seo-performance-256.png deleted file mode 100644 index 07abfa01cc..0000000000 Binary files a/web/gui/images/seo-performance-256.png and /dev/null differ diff --git a/web/gui/images/seo-performance-32.png b/web/gui/images/seo-performance-32.png deleted file mode 100644 index a39543cfbb..0000000000 Binary files a/web/gui/images/seo-performance-32.png and /dev/null differ diff --git a/web/gui/images/seo-performance-48.png b/web/gui/images/seo-performance-48.png deleted file mode 100644 index 6dab89e92b..0000000000 Binary files a/web/gui/images/seo-performance-48.png and /dev/null differ diff --git a/web/gui/images/seo-performance-512.png b/web/gui/images/seo-performance-512.png deleted file mode 100644 index 1f8c164107..0000000000 Binary files a/web/gui/images/seo-performance-512.png and /dev/null differ diff --git a/web/gui/images/seo-performance-64.png b/web/gui/images/seo-performance-64.png deleted file mode 100644 index e79f3b35b7..0000000000 Binary files a/web/gui/images/seo-performance-64.png and /dev/null differ diff --git a/web/gui/images/seo-performance-72.png b/web/gui/images/seo-performance-72.png deleted file mode 100644 index a4c9efb307..0000000000 Binary files a/web/gui/images/seo-performance-72.png and /dev/null differ diff --git a/web/gui/images/seo-performance-multi-size.icns b/web/gui/images/seo-performance-multi-size.icns deleted file mode 100644 index 2e1a884fb0..0000000000 Binary files a/web/gui/images/seo-performance-multi-size.icns and /dev/null differ diff --git a/web/gui/images/seo-performance-multi-size.ico b/web/gui/images/seo-performance-multi-size.ico deleted file mode 100644 index 821f7c4026..0000000000 Binary files a/web/gui/images/seo-performance-multi-size.ico and /dev/null differ diff --git a/web/gui/index.html b/web/gui/index.html index 094c815284..86c95c9889 100644 --- a/web/gui/index.html +++ b/web/gui/index.html @@ -14,25 +14,26 @@ + + - - - - - - - - - - - - - - - - - - + @@ -199,8 +200,6 @@ FontAwesome, Created by Dave Gandy, Font: SIL OFL 1.1 License, CSS: MIT License - IconsDB.com Icons, Icons provided as CC0 1.0 Universal (CC0 1.0) Public Domain Dedication. - bootstrap-table, Copyright 2012-2016 Zhixin Wen, MIT License diff --git a/web/gui/manifest.json b/web/gui/manifest.json new file mode 100644 index 0000000000..52cb4831c7 --- /dev/null +++ b/web/gui/manifest.json @@ -0,0 +1,41 @@ +{ + "name": "App", + "icons": [ + { + "src": "images\/android-icon-36x36.png", + "sizes": "36x36", + "type": "image\/png", + "density": "0.75" + }, + { + "src": "images\/android-icon-48x48.png", + "sizes": "48x48", + "type": "image\/png", + "density": "1.0" + }, + { + "src": "images\/android-icon-72x72.png", + "sizes": "72x72", + "type": "image\/png", + "density": "1.5" + }, + { + "src": "images\/android-icon-96x96.png", + "sizes": "96x96", + "type": "image\/png", + "density": "2.0" + }, + { + "src": "images\/android-icon-144x144.png", + "sizes": "144x144", + "type": "image\/png", + "density": "3.0" + }, + { + "src": "images\/android-icon-192x192.png", + "sizes": "192x192", + "type": "image\/png", + "density": "4.0" + } + ] +} diff --git a/web/gui/src/dashboard.js/alarms.js b/web/gui/src/dashboard.js/alarms.js index fe922dadc5..82477671ad 100644 --- a/web/gui/src/dashboard.js/alarms.js +++ b/web/gui/src/dashboard.js/alarms.js @@ -91,7 +91,7 @@ NETDATA.alarms = { let status = entry.status.toLowerCase(); let title = name + ' = ' + value_string.toString(); let tag = entry.alarm_id; - let icon = 'images/seo-performance-128.png'; + let icon = 'images/banner-icon-144x144.png'; let interaction = false; let data = entry; let show = true; diff --git a/web/gui/src/dashboard.js/compatibility.js b/web/gui/src/dashboard.js/compatibility.js index fa5215b266..e1ecfbdb2c 100644 --- a/web/gui/src/dashboard.js/compatibility.js +++ b/web/gui/src/dashboard.js/compatibility.js @@ -1,5 +1,6 @@ -// ------------------------------------------------------------------------ -// compatibility fixes +// *** src/dashboard.js/compatibility.js + +// Compatibility fixes. // fix IE issue with console if (!window.console) { @@ -28,13 +29,3 @@ if (typeof String.prototype.startsWith !== 'function') { return this.slice(s.length) === s; }; } - -NETDATA.name2id = function (s) { - return s - .replace(/ /g, '_') - .replace(/:/g, '_') - .replace(/\(/g, '_') - .replace(/\)/g, '_') - .replace(/\./g, '_') - .replace(/\//g, '_'); -}; diff --git a/web/gui/src/dashboard.js/utils.js b/web/gui/src/dashboard.js/utils.js index 01642acc36..2d658dcc23 100644 --- a/web/gui/src/dashboard.js/utils.js +++ b/web/gui/src/dashboard.js/utils.js @@ -1,3 +1,15 @@ +// *** src/dashboard.js/utils.js + +NETDATA.name2id = function (s) { + return s + .replace(/ /g, '_') + .replace(/:/g, '_') + .replace(/\(/g, '_') + .replace(/\)/g, '_') + .replace(/\./g, '_') + .replace(/\//g, '_'); +}; + NETDATA.encodeURIComponent = function (s) { if (typeof(s) === 'string') { return encodeURIComponent(s); -- cgit v1.2.3