From aae1cd37cbdf2382b002177a3b4c77bdb968c6db Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Mon, 31 Jul 2017 03:05:36 +0000 Subject: Add yardstick logo in GUI JIRA: YARDSTICK-767 We have yardstick logo in opnfv community. We have the demand to display it in yardstick GUI. Change-Id: Ief5807c918754e679e95ae1d1f3a769ab2d6d4b2 Signed-off-by: chenjiankun --- gui/app/images/logo.png | Bin 0 -> 4323 bytes gui/app/scripts/controllers/report.controller.js | 2 +- gui/app/views/environmentList.html | 11 ++--- gui/app/views/layout/header.html | 9 ++-- gui/app/views/layout/sideNav.html | 2 +- gui/app/views/layout/sideNav2.html | 2 +- gui/app/views/main.html | 4 +- gui/app/views/main2.html | 4 +- gui/app/views/modal/environmentDialog.html | 6 +-- gui/app/views/projectList.html | 8 ++-- gui/app/views/projectdetail.html | 10 ++--- gui/app/views/suite.html | 51 +++++++++++++---------- gui/app/views/testcaselist.html | 16 +++++-- gui/bower.json | 3 ++ install.sh | 1 + 15 files changed, 72 insertions(+), 57 deletions(-) create mode 100644 gui/app/images/logo.png diff --git a/gui/app/images/logo.png b/gui/app/images/logo.png new file mode 100644 index 000000000..c67c0d635 Binary files /dev/null and b/gui/app/images/logo.png differ diff --git a/gui/app/scripts/controllers/report.controller.js b/gui/app/scripts/controllers/report.controller.js index 9b6b5958b..6a62cf8ea 100644 --- a/gui/app/scripts/controllers/report.controller.js +++ b/gui/app/scripts/controllers/report.controller.js @@ -54,7 +54,7 @@ angular.module('yardStickGui2App') } $scope.goToExternal = function goToExternal(id) { - var url = External_URL + ':' + $scope.jumpPort + '/dashboard/db' + '/' + id; + var url = Grafana_URL +':'+$scope.jumpPort+'/dashboard/db'+ '/' + id; window.open(url, '_blank'); } diff --git a/gui/app/views/environmentList.html b/gui/app/views/environmentList.html index 29273a724..1b00b1cc6 100644 --- a/gui/app/views/environmentList.html +++ b/gui/app/views/environmentList.html @@ -22,21 +22,18 @@
-
{{env.name}}
+
{{env.name}}
diff --git a/gui/app/views/layout/header.html b/gui/app/views/layout/header.html index 033322a62..ad90de952 100644 --- a/gui/app/views/layout/header.html +++ b/gui/app/views/layout/header.html @@ -4,8 +4,9 @@ @@ -33,11 +34,11 @@ .navbar { border-radius: 0px; - background-color: #e95420; + background-color: #CAEEF1; color: #fff; } .navbar-default .navbar-brand { - color: #fff; + color: #333; } - + \ No newline at end of file diff --git a/gui/app/views/layout/sideNav.html b/gui/app/views/layout/sideNav.html index 42dcbbc6e..4fc99cd4f 100644 --- a/gui/app/views/layout/sideNav.html +++ b/gui/app/views/layout/sideNav.html @@ -90,7 +90,7 @@ + \ No newline at end of file diff --git a/gui/app/views/testcaselist.html b/gui/app/views/testcaselist.html index 3e8cfccf9..62237faa8 100644 --- a/gui/app/views/testcaselist.html +++ b/gui/app/views/testcaselist.html @@ -20,7 +20,7 @@
Name
-
Operate
+
Action
@@ -28,14 +28,22 @@
{{test.Description}}
- - + +
+ + +
diff --git a/gui/bower.json b/gui/bower.json index 6da3bee3c..d1d934f64 100644 --- a/gui/bower.json +++ b/gui/bower.json @@ -20,6 +20,9 @@ "angular-loading": "^0.1.4", "angular-bootstrap": "^2.5.0", "angular-sanitize": "^1.6.5" + }, + "resolutions": { + "angular": "~1.6.x" }, "devDependencies": { "angular-mocks": "^1.4.0" diff --git a/install.sh b/install.sh index e82ae0233..8a5050a61 100755 --- a/install.sh +++ b/install.sh @@ -89,6 +89,7 @@ pip install -e . /bin/bash "${PWD}/docker/uwsgi.sh" /bin/bash "${PWD}/docker/nginx.sh" cd "${PWD}/gui" && /bin/bash gui.sh +mkdir -p /etc/nginx/yardstick mv dist /etc/nginx/yardstick/gui service nginx restart -- cgit 1.2.3-korg