From aae1cd37cbdf2382b002177a3b4c77bdb968c6db Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Mon, 31 Jul 2017 03:05:36 +0000 Subject: [PATCH] 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 0000000000000000000000000000000000000000..c67c0d635ecda32b5ff6d75b67c862156fd2bc1f GIT binary patch literal 4323 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
- +
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 @@
- + Yardstick +
@@ -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 -- 2.16.6