aboutsummaryrefslogtreecommitdiffstats
path: root/gui/app/views/layout
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-08-16 03:37:59 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-08-16 03:37:59 +0000
commit4a5bc16d841221e8ac7853b3044e50af0c8143d2 (patch)
treed84f869319b9ef5d209f4b845e98b5164de54816 /gui/app/views/layout
parentbf15098782f77d750313a60cb2d4ae61529b369d (diff)
parent9915eca37c459c121c7bee0e0a249eaa498b6d4d (diff)
Merge "Remove redundancy file and do relative modification"
Diffstat (limited to 'gui/app/views/layout')
-rw-r--r--gui/app/views/layout/sideNav.html17
-rw-r--r--gui/app/views/layout/sideNav2.html108
2 files changed, 15 insertions, 110 deletions
diff --git a/gui/app/views/layout/sideNav.html b/gui/app/views/layout/sideNav.html
index 4fc99cd4f..6c4426307 100644
--- a/gui/app/views/layout/sideNav.html
+++ b/gui/app/views/layout/sideNav.html
@@ -18,7 +18,7 @@
</div>
</div>
- <div class="panel-group" role="tablist" aria-multiselectable="true" bs-collapse style="margin-bottom:0px;" ng-model="activeStatus">
+ <div class="panel-group" role="tablist" aria-multiselectable="true" bs-collapse style="margin-bottom:0px;" ng-model="activeStatus" ng-if="ifshowEnvChild">
<div class="panel panel-default">
<div class="panel-heading" role="tab">
<h4 class="panel-title">
@@ -48,6 +48,19 @@
</div>
</div>
</div>
+ <div class="panel-group" role="tablist" aria-multiselectable="false" bs-collapse style="margin-bottom:0px;" ng-if="!ifshowEnvChild">
+ <div class="panel panel-default">
+ <div class="panel-heading" role="tab">
+ <h4 class="panel-title">
+ <a bs-collapse-toggle style=" text-decoration: none;">
+ <div style="display:inline;" ng-click="gotoEnviron()">Environment </div>
+ <!--<i class="fa fa-sort-asc" aria-hidden="true" style="margin-left: 71px;display:inline"></i>-->
+ </a>
+ </h4>
+ </div>
+
+ </div>
+ </div>
<div class="panel-group " role="tablist " aria-multiselectable="true " bs-collapse style="margin-bottom:0px; ">
<div class="panel panel-default ">
@@ -138,4 +151,4 @@
.active.panel-body {
background-color: #dfe3e4;
}
-</style>
+</style> \ No newline at end of file
diff --git a/gui/app/views/layout/sideNav2.html b/gui/app/views/layout/sideNav2.html
deleted file mode 100644
index 93e0de4be..000000000
--- a/gui/app/views/layout/sideNav2.html
+++ /dev/null
@@ -1,108 +0,0 @@
-<div class="naviSide">
-
-
- <ul class="nav bs-sidenav">
-
- <div class="panel-group " role="tablist " aria-multiselectable="true " bs-collapse style="margin-bottom:0px; ">
- <div class="panel panel-default ">
- <div class="panel-heading " role="tab ">
- <h4 class="panel-title ">
- <a bs-collapse-toggle style=" text-decoration: none;" ng-click="gotoProject();">
- Project
- </a>
- </h4>
-
- </div>
-
- </div>
- </div>
- <div class="panel-group" role="tablist" aria-multiselectable="false" bs-collapse style="margin-bottom:0px;">
- <div class="panel panel-default">
- <div class="panel-heading" role="tab">
- <h4 class="panel-title">
- <a bs-collapse-toggle style=" text-decoration: none;">
- <div style="display:inline;" ng-click="gotoEnviron()">Environment </div>
- <!--<i class="fa fa-sort-asc" aria-hidden="true" style="margin-left: 71px;display:inline"></i>-->
- </a>
- </h4>
- </div>
-
- </div>
- </div>
-
- <div class="panel-group " role="tablist " aria-multiselectable="true " bs-collapse style="margin-bottom:0px; ">
- <div class="panel panel-default ">
- <div class="panel-heading " role="tab ">
- <h4 class="panel-title ">
- <a bs-collapse-toggle style=" text-decoration: none;" ng-click="gotoTestcase()">
- Test Case
- </a>
- </h4>
-
- </div>
-
- </div>
- </div>
-
- <div class="panel-group " role="tablist " aria-multiselectable="true " bs-collapse style="margin-bottom:0px; ">
- <div class="panel panel-default ">
- <div class="panel-heading " role="tab ">
- <h4 class="panel-title ">
- <a bs-collapse-toggle style=" text-decoration: none;" ng-click="gotoSuite()">
- Test Suite
- </a>
- </h4>
-
- </div>
-
- </div>
- </div>
-
-
-
- </ul>
-
-</div>
-
-<style>
- .bs-sidenav {
- margin-top: 21px;
- margin-bottom: 20px;
- width: 124px;
- }
-
- .nav {
- margin-bottom: 0;
- padding-left: 0;
- list-style: none;
- }
-
- .nav>li {
- position: relative;
- display: block;
- }
-
- li {
- display: list-item;
- text-align: -webkit-match-parent;
- }
-
- a {
- cursor: pointer;
- }
-
- a.active {
- background-color: #EEEEEE;
- border-radius: 5px;
- width: 165px;
- }
- /*a:hover {
- width: 165px;
- }*/
-
- .nav>li>a:hover,
- .nav>li>a:focus {
- text-decoration: underline;
- background-color: transparent;
- }
-</style>