From de56846780735a472273aba14bb6219693cabaff Mon Sep 17 00:00:00 2001 From: Alexandra Pereira Date: Thu, 1 Apr 2021 00:16:42 -0300 Subject: [PATCH 1/3] dashboard/templates: update symbols legend remove symbols legends used for boots and compare. Signed-off-by: Alexandra Pereira --- app/dashboard/templates/info.html | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/dashboard/templates/info.html b/app/dashboard/templates/info.html index 23df5955..2e9edaa0 100644 --- a/app/dashboard/templates/info.html +++ b/app/dashboard/templates/info.html @@ -13,12 +13,8 @@

Symbols Legend

Indicates job and/or tree resources
Indicates build resources
-
-
Indicates boot report resources
Indicates SoC resources
-
-
Indicates the compare resource
From 5cd65e658b853bb8b537afd77134b4fdc4626ed4 Mon Sep 17 00:00:00 2001 From: Alexandra Pereira Date: Thu, 1 Apr 2021 14:53:13 -0300 Subject: [PATCH 2/3] dashboard/templates: update keyboard shortcuts Delete shotcuts to boot and compare views and add a shortcut to tests view. Signed-off-by: Alexandra Pereira --- app/dashboard/templates/hotkeys.html | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/app/dashboard/templates/hotkeys.html b/app/dashboard/templates/hotkeys.html index bfbc6989..3ecc90bf 100644 --- a/app/dashboard/templates/hotkeys.html +++ b/app/dashboard/templates/hotkeys.html @@ -28,18 +28,13 @@

Navigation

g then t  :  - Go to the boots page + Go to the tests page g then s  :  Go to the SoCs page - - g then c -  :  - Go to the compare page - g then i  :  From ec1134887f3654071662824950d65bab29c99b64 Mon Sep 17 00:00:00 2001 From: Alexandra Pereira Date: Fri, 2 Apr 2021 02:26:51 -0300 Subject: [PATCH 3/3] dashboard: update keyboard shortcuts scripts add a new script to info view in order to keep shortcuts working and switch boot option to test view. Signed-off-by: Alexandra Pereira --- app/dashboard/static/js/app/utils/init.js | 10 ++++---- ...o-faq.2017.3.3.js => view-info.2021.03.js} | 0 app/dashboard/static/js/build.js | 3 +++ app/dashboard/static/js/common.js | 1 + app/dashboard/static/js/kci-info.js | 24 +++++++++++++++++++ app/dashboard/templates/info.html | 3 +++ 6 files changed, 36 insertions(+), 5 deletions(-) rename app/dashboard/static/js/app/{view-info-faq.2017.3.3.js => view-info.2021.03.js} (100%) create mode 100644 app/dashboard/static/js/kci-info.js diff --git a/app/dashboard/static/js/app/utils/init.js b/app/dashboard/static/js/app/utils/init.js index 977bb887..2676264a 100644 --- a/app/dashboard/static/js/app/utils/init.js +++ b/app/dashboard/static/js/app/utils/init.js @@ -51,13 +51,13 @@ define([ } function setHotKeys() { - var goToBoot, - goToBuild, + var goToBuild, goToCompare, goToHome, goToInfo, goToJob, goToSoc, + goToTest, selectSearch, selectTableLength, showHelp; @@ -78,8 +78,8 @@ define([ window.location = document.getElementById('build-l').href; }; - goToBoot = function() { - window.location = document.getElementById('boot-l').href; + goToTest = function() { + window.location = document.getElementById('tests-l').href; }; goToSoc = function() { @@ -114,7 +114,7 @@ define([ $.mapHotKeys.createSequence('g', 'o', $(document), goToHome), $.mapHotKeys.createSequence('g', 'j', $(document), goToJob), $.mapHotKeys.createSequence('g', 'b', $(document), goToBuild), - $.mapHotKeys.createSequence('g', 't', $(document), goToBoot), + $.mapHotKeys.createSequence('g', 't', $(document), goToTest), $.mapHotKeys.createSequence('g', 's', $(document), goToSoc), $.mapHotKeys.createSequence('g', 'c', $(document), goToCompare), $.mapHotKeys.createSequence('g', 'i', $(document), goToInfo) diff --git a/app/dashboard/static/js/app/view-info-faq.2017.3.3.js b/app/dashboard/static/js/app/view-info.2021.03.js similarity index 100% rename from app/dashboard/static/js/app/view-info-faq.2017.3.3.js rename to app/dashboard/static/js/app/view-info.2021.03.js diff --git a/app/dashboard/static/js/build.js b/app/dashboard/static/js/build.js index ad6cdc82..d10309f0 100644 --- a/app/dashboard/static/js/build.js +++ b/app/dashboard/static/js/build.js @@ -67,6 +67,7 @@ 'app/view-builds-job-kernel-defconfig': 'app/view-builds-job-kernel-defconfig.2017.3.3', 'app/view-builds-job-kernel-defconfig-logs': 'app/view-builds-job-kernel-defconfig-logs.2020.6', 'app/view-index': 'app/view-index.2017.3.3', + 'app/view-info': 'app/view-info.2021.03', 'app/view-jobs-all': 'app/view-jobs-all.2020.10', 'app/view-jobs-job': 'app/view-jobs-job.2020.10', 'app/view-jobs-job-branch': 'app/view-jobs-job-branch.2020.10', @@ -102,6 +103,7 @@ {name: 'app/view-builds-job-kernel-defconfig-logs.2020.6'}, {name: 'app/view-builds-job-kernel-defconfig.2017.3.3'}, {name: 'app/view-index.2017.3.3'}, + {name: 'app/view-info.2021.03'}, {name: 'app/view-jobs-all.2020.10'}, {name: 'app/view-jobs-job-branch.2020.10'}, {name: 'app/view-jobs-job.2020.10'}, @@ -121,6 +123,7 @@ {name: 'kci-builds-job-kernel-defconfig'}, {name: 'kci-builds-job-kernel-defconfig-logs'}, {name: 'kci-index'}, + {name: 'kci-info'}, {name: 'kci-jobs-all'}, {name: 'kci-jobs-job'}, {name: 'kci-jobs-job-branch'}, diff --git a/app/dashboard/static/js/common.js b/app/dashboard/static/js/common.js index ae4ec5b1..efbb25c5 100644 --- a/app/dashboard/static/js/common.js +++ b/app/dashboard/static/js/common.js @@ -64,6 +64,7 @@ require.config({ 'app/view-builds-job-kernel-defconfig': 'app/view-builds-job-kernel-defconfig.2017.3.3', 'app/view-builds-job-kernel-defconfig-logs': 'app/view-builds-job-kernel-defconfig-logs.2020.6', 'app/view-index': 'app/view-index.2017.3.3', + 'app/view-info': 'app/view-info.2021.03', 'app/view-jobs-all': 'app/view-jobs-all.2020.10', 'app/view-jobs-job': 'app/view-jobs-job.2020.10', 'app/view-jobs-job-branch': 'app/view-jobs-job-branch.2020.10', diff --git a/app/dashboard/static/js/kci-info.js b/app/dashboard/static/js/kci-info.js new file mode 100644 index 00000000..55364e5e --- /dev/null +++ b/app/dashboard/static/js/kci-info.js @@ -0,0 +1,24 @@ +/*! +* kernelci dashboard. +* +* Copyright (C) 2014, 2015, 2016, 2017 Linaro Ltd. +* +* This program is free software; you can redistribute it and/or modify it under +* the terms of the GNU Lesser General Public License as published by the Free +* Software Foundation; either version 2.1 of the License, or (at your option) +* any later version. +* +* This program is distributed in the hope that it will be useful, but WITHOUT +* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS +* FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more +* details. +* +* You should have received a copy of the GNU Lesser General Public License +* along with this library; if not, write to the Free Software Foundation, Inc., +* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +*/ + +require(['common'], function() { + 'use strict'; + require(['app/view-info']); +}); diff --git a/app/dashboard/templates/info.html b/app/dashboard/templates/info.html index 2e9edaa0..a605bc11 100644 --- a/app/dashboard/templates/info.html +++ b/app/dashboard/templates/info.html @@ -36,3 +36,6 @@

Keyboard shortcuts

{% endblock %} +{%- block scripts %} + +{%- endblock %}