Merge "Add yardstick logo in GUI"

14 files changed, 71 insertions, 57 deletions

diff --git a/gui/app/images/logo.png b/gui/app/images/logo.png
new file mode 100644
index 000000000..c67c0d635
--- /dev/null
+++ b/gui/app/images/logo.png
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 @@
 
             <div dir-paginate="env in environmentList | orderBy:'-id' | itemsPerPage: 10 ">
                 <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;">
-                    <div> <a style="color:#e95420" ng-click="gotoDetail('false',env.uuid)">{{env.name}}</a></div>
+                    <div> <a style="color:#4dc5cf" ng-click="gotoDetail('false',env.uuid)">{{env.name}}</a></div>
                     <div>
 
                         <!-- <button class="btn btn-default btn-sm" ng-click="openDeleteEnv(env.uuid,'environment')">Delete</button> -->
 
                         <div class="btn-group" uib-dropdown is-open="status.isopen" style="margin-right:60px;">
                             <button id="single-button" type="button" class="btn btn-default btn-sm" uib-dropdown-toggle>
-                            Modify <span class="caret"></span>
+                            delete <span class="caret"></span>
                         </button>
                             <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button">
-                                <li role="menuitem"><a ng-click="openDeleteEnv(env.uuid,'environment')">Delete</a></li>
-                                <!-- <li role="menuitem"><a href="#">Another action</a></li>
-        <li role="menuitem"><a href="#">Something else here</a></li>
-        <li class="divider"></li>
-        <li role="menuitem"><a href="#">Separated link</a></li> -->
+                                <li role="menuitem"><a ng-click="openDeleteEnv(env.uuid,'environment')">delete</a></li>
+
                             </ul>
                         </div>
                     </div>
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 @@
             <div class="navbar-header">
 
 
-
+                <img src="images/logo.png" style="width:50px;height:50px;float:left;margin-left:20px;" />
                 <a class="navbar-brand" href="#/">Yardstick</a>
+
             </div>
 
 
@@ -33,11 +34,11 @@
 
     .navbar {
         border-radius: 0px;
-        background-color: #e95420;
+        background-color: #CAEEF1;
         color: #fff;
     }
 
     .navbar-default .navbar-brand {
-        color: #fff;
+        color: #333;
     }
-</style>
+</style>
\ 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 @@
 
 <style>
     .bs-sidenav {
-        margin-top: 40px;
+        margin-top: 21px;
         margin-bottom: 20px;
         width: 124px;
     }
diff --git a/gui/app/views/layout/sideNav2.html b/gui/app/views/layout/sideNav2.html
index 104a9c6cf..93e0de4be 100644
--- a/gui/app/views/layout/sideNav2.html
+++ b/gui/app/views/layout/sideNav2.html
@@ -66,7 +66,7 @@
 
 <style>
     .bs-sidenav {
-        margin-top: 40px;
+        margin-top: 21px;
         margin-bottom: 20px;
         width: 124px;
     }
diff --git a/gui/app/views/main.html b/gui/app/views/main.html
index d5f7a3af3..36bcbbd3c 100644
--- a/gui/app/views/main.html
+++ b/gui/app/views/main.html
@@ -105,13 +105,13 @@
     }
 
     .progressDefine>li.is-complete {
-        color: #e95420;
+        color: #4dc5cf;
     }
 
     .progressDefine>li.is-complete:before,
     .progressDefine>li.is-complete:after {
         color: #FFF;
-        background: #e95420;
+        background: #4dc5cf;
     }
 
     .progressDefine>li.is-active {
diff --git a/gui/app/views/main2.html b/gui/app/views/main2.html
index 661d604c6..3f49e82e0 100644
--- a/gui/app/views/main2.html
+++ b/gui/app/views/main2.html
@@ -105,13 +105,13 @@
     }
 
     .progressDefine>li.is-complete {
-        color: #e95420;
+        color: #4dc5cf;
     }
 
     .progressDefine>li.is-complete:before,
     .progressDefine>li.is-complete:after {
         color: #FFF;
-        background: #e95420;
+        background: #4dc5cf;
     }
 
     .progressDefine>li.is-active {
diff --git a/gui/app/views/modal/environmentDialog.html b/gui/app/views/modal/environmentDialog.html
index a5b88d240..389de8340 100644
--- a/gui/app/views/modal/environmentDialog.html
+++ b/gui/app/views/modal/environmentDialog.html
@@ -104,7 +104,7 @@
                  Next
             </button>
                     <button class="btn btn-default" ng-click="goToPodPrev()" style="margin-right:5px;float:right">
-                 Previous
+                 Back
             </button>
 
                 </h3>
@@ -165,7 +165,7 @@
 
                 <h3>{{name}} -- Pod File
                     <div style="float:right">
-                        <button class="btn btn-default" ng-click="skipPodPrev()">Previous</button>
+                        <button class="btn btn-default" ng-click="skipPodPrev()">Back</button>
                         <button class="btn btn-default" ng-click="skipPod()" ng-show="podData==null">Skip</button>
                         <button class="btn btn-default" ng-click="skipPod()" ng-show="podData!=null">Next</button>
 
@@ -234,7 +234,7 @@
 
                 <h3>{{name}} -- Container
                     <div style="float:right">
-                        <button class="btn btn-default" ng-click="skipContainerPrev()">Previous</button>
+                        <button class="btn btn-default" ng-click="skipContainerPrev()">Back</button>
                         <button class="btn btn-default" ng-click="skipContainer()" ng-show="ifskipOrClose!=1">
                             Skip
             </button>
diff --git a/gui/app/views/projectList.html b/gui/app/views/projectList.html
index ea6e63d6b..6edc32fc1 100644
--- a/gui/app/views/projectList.html
+++ b/gui/app/views/projectList.html
@@ -11,21 +11,21 @@
     <div dw-loading="key" dw-loading-options="{text:'loading'}">
         <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;background-color:#f9f9f9;">
             <div style="font-weight:600">Name</div>
-            <div style="font-weight:600;margin-right:4px;">Action</div>
+            <div style="font-weight:600;margin-right:20px;">Action</div>
 
         </div>
 
         <div dir-paginate="project in projectListData | orderBy:'-id' | itemsPerPage: 10 ">
             <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;">
                 <div>
-                    <a ng-click="gotoDetail(project.uuid)" style="color:#e95420"> {{project.name}}</a>
+                    <a ng-click="gotoDetail(project.uuid)" style="color:#4dc5cf"> {{project.name}}</a>
                 </div>
                 <div>
                     <!-- <button class="btn btn-default btn-sm" ng-click="gotoDetail(project.uuid)">Detail</button> -->
                     <!--<button class="btn btn-default btn-sm" ng-click="openDeleteEnv(project.uuid,'project')">Delete</button>-->
-                    <div class="btn-group" uib-dropdown is-open="status.isopen" style="margin-right:20px;">
+                    <div class="btn-group" uib-dropdown is-open="status.isopen" >
                         <button id="single-button" type="button" class="btn btn-default btn-sm" uib-dropdown-toggle>
-                            Modify <span class="caret"></span>
+                            delete <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button">
                             <li role="menuitem" ng-show="task.status!=0"><a ng-click="openDeleteEnv(project.uuid,'project')">delete</a></li>
diff --git a/gui/app/views/projectdetail.html b/gui/app/views/projectdetail.html
index ff61c5fed..357a26add 100644
--- a/gui/app/views/projectdetail.html
+++ b/gui/app/views/projectdetail.html
@@ -24,8 +24,8 @@
             </tr>
             <tr dir-paginate="task in finalTaskListDisplay | orderBy:'-id' | itemsPerPage: 6 " pagination-id="table">
 
-                <td width="10%"> <a ng-click="gotoDetail(task.uuid)" style="color:#e95420"> {{task.name}} </a></td>
-                <td width="40%">
+                <td width="20%"> <a ng-click="gotoDetail(task.uuid)" style="color:#4dc5cf"> {{task.name}} </a></td>
+                <td width="70%">
                     <div class="progree-parent" ng-show="task.status!=2">
                         <div class="progree-child" ng-style="{'width':task.stausWidth}">
                         </div>
@@ -37,11 +37,11 @@
                 </td>
 
 
-                <td width="50%">
+                <td width="10%">
 
-                    <div class="btn-group" uib-dropdown is-open="status.isopen" style="margin-right:20px;">
+                    <div class="btn-group" uib-dropdown is-open="status.isopen">
                         <button id="single-button" type="button" class="btn btn-default btn-sm" uib-dropdown-toggle>
-                            Modify <span class="caret"></span>
+                            modify <span class="caret"></span>
                         </button>
                         <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button">
                             <li role="menuitem" ng-show="task.status!=0"><a ng-click="runAtaskForTable(task.uuid)">run</a></li>
diff --git a/gui/app/views/suite.html b/gui/app/views/suite.html
index 8e1348333..652cf1e0e 100644
--- a/gui/app/views/suite.html
+++ b/gui/app/views/suite.html
@@ -9,39 +9,44 @@
 
                                     </button>
 
-        <!--<div ng-show="displayOpenrcFile!=null || displayOpenrcFile!=undefined">
-            {{displayOpenrcFile.name}} last modified: {{filelastModified}}
-        </div>-->
+
         <hr/>
 
-        <!--<div ng-repeat="env in environmentList">
-            {{env.name}}
-        </div>-->
+
         <div dw-loading="key" dw-loading-options="{text:'loading'}">
-        <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;background-color: #f9f9f9;" >
-            <div style="font-weight:600">Name</div>
-            <div style="font-weight:600;margin-right:4px;">Operate</div>
+            <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;background-color: #f9f9f9;">
+                <div style="font-weight:600">Name</div>
+                <div style="font-weight:600;margin-right:20px;">Action</div>
 
-        </div>
+            </div>
 
 
-        <div dir-paginate="suite in testsuitlist | itemsPerPage: 10">
-            <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;">
-                <div>
-                    <a style="color:#e95420"  ng-click="gotoDetail(suite)"> {{suite}}
+            <div dir-paginate="suite in testsuitlist | itemsPerPage: 10">
+                <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;">
+                    <div>
+                        <a style="color:#4dc5cf" ng-click="gotoDetail(suite)"> {{suite}}
                     </a>
                     </div>
-                <div>
-                    <!-- <button class="btn btn-default btn-sm" ng-click="gotoDetail(suite)">Detail</button> -->
-                    <button class="btn btn-default btn-sm" ng-click="openDeleteEnv(suite,'test suite')">Delete</button>
+                    <div>
+                        <!-- <button class="btn btn-default btn-sm" ng-click="openDeleteEnv(suite,'test suite')">Delete</button> -->
+                        <div class="btn-group" uib-dropdown is-open="status.isopen">
+                            <button id="single-button" type="button" class="btn btn-default btn-sm" uib-dropdown-toggle>
+                            delete <span class="caret"></span>
+                        </button>
+                            <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button">
+                                <li role="menuitem"><a ng-click="openDeleteEnv(suite,'test suite')">delete</a></li>
+
+                            </ul>
+                        </div>
+
+                    </div>
+
                 </div>
 
             </div>
-
-        </div>
-        <center>
-            <dir-pagination-controls></dir-pagination-controls>
-        </center>
+            <center>
+                <dir-pagination-controls></dir-pagination-controls>
+            </center>
         </div>
 
 
@@ -146,4 +151,4 @@
         background-color: #EEEEEE;
         border-radius: 5px;
     }
-</style>
+</style>
\ 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 @@
         <div dw-loading="key" dw-loading-options="{text:'loading'}">
         <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;background-color: #f9f9f9">
             <div style="font-weight:600">Name</div>
-            <div style="font-weight:600;margin-right:4px;">Operate</div>
+            <div style="font-weight:600;margin-right:20px;">Action</div>
 
         </div>
 
@@ -28,14 +28,22 @@
             <div style="display:flex;flex-direction:row;justify-content:space-between;padding:8px;border-top: 1px solid #e9ecec;">
                 <div>
 
-                   <a style="color:#e95420" ng-click="gotoDetail(test.Name)">
+                   <a style="color:#4dc5cf" ng-click="gotoDetail(test.Name)">
                        {{test.Name}}
                    </a>
                     </div>
                 <div style="font-size:10px;">{{test.Description}}</div>
                 <div>
-                    <!-- <button class="btn btn-default btn-sm" ng-click="gotoDetail(test.Name)">Detail</button> -->
-                    <button class="btn btn-default btn-sm" ng-click="openDeleteEnv(test.Name,'test case')">Delete</button>
+                    <!-- <button class="btn btn-default btn-sm" ng-click="openDeleteEnv(test.Name,'test case')">Delete</button> -->
+                    <div class="btn-group" uib-dropdown is-open="status.isopen" >
+                            <button id="single-button" type="button" class="btn btn-default btn-sm" uib-dropdown-toggle>
+                            delete <span class="caret"></span>
+                        </button>
+                            <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button">
+                                <li role="menuitem"><a ng-click="openDeleteEnv(test.Name,'test case')">delete</a></li>
+
+                            </ul>
+                        </div>
                 </div>
 
             </div>
diff --git a/gui/bower.json b/gui/bower.json
index 6da3bee3c..d1d934f64 100644
--- a/gui/bower.json
+++ b/gui/bower.json
@@ -21,6 +21,9 @@
     "angular-bootstrap": "^2.5.0",
     "angular-sanitize": "^1.6.5"
   },
+   "resolutions": {
+    "angular": "~1.6.x"
+  },
   "devDependencies": {
     "angular-mocks": "^1.4.0"
   },