Merge "Remove redundancy file and do relative modification"

3 files changed, 15 insertions, 284 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>
diff --git a/gui/app/views/main2.html b/gui/app/views/main2.html
deleted file mode 100644
index 3f49e82e0..000000000
--- a/gui/app/views/main2.html
+++ /dev/null
@@ -1,174 +0,0 @@
-<div>
-    <div ng-include="'views/layout/header.html'"></div>
-</div>
-<div ng-include="'views/layout/sideNav2.html'"></div>
-
-
-<div style="margin-top:80px;margin-left:220px;">
-    <!--<div ncy-breadcrumb></div>-->
-    <div>
-        <ol class="progressDefine">
-            <li data-step="1" ng-click="gotoProject();" style="cursor:pointer" ng-class="{'is-complete':projectShow}">
-                Project
-            </li>
-            <li data-step="2" ng-class="{'is-complete':taskShow}">
-                Task
-            </li>
-
-            <li data-step="3" ng-class="{'is-complete':reportShow}">
-                Reporting
-            </li>
-
-        </ol>
-    </div>
-
-
-</div>
-
-
-
-
-
-
-
-
-
-<div ui-view></div>
-
-
-
-<style>
-    .stepsContent {
-        display: flex;
-        flex-direction: row;
-        justify-content: space-around;
-        margin-left: 120px;
-        margin-top: 100px;
-    }
-
-    .stepItem {
-        display: flex;
-        flex-direction: column;
-    }
-
-    .nextButton {
-        margin-left: 500px;
-    }
-
-    .progressDefine {
-        list-style: none;
-        margin: 0;
-        padding: 0;
-        display: table;
-        table-layout: fixed;
-        width: 100%;
-        color: #849397;
-    }
-
-    .progressDefine>li {
-        position: relative;
-        display: table-cell;
-        text-align: center;
-        font-size: 0.8em;
-    }
-
-    .progressDefine>li:before {
-        content: attr(data-step);
-        display: block;
-        margin: 0 auto;
-        background: #DFE3E4;
-        width: 3em;
-        height: 3em;
-        text-align: center;
-        margin-bottom: 0.25em;
-        line-height: 3em;
-        border-radius: 100%;
-        position: relative;
-        z-index: 5;
-    }
-
-    .progressDefine>li:after {
-        content: '';
-        position: absolute;
-        display: block;
-        background: #DFE3E4;
-        width: 100%;
-        height: 0.5em;
-        top: 1.25em;
-        left: 50%;
-        margin-left: 1.5em\9;
-        z-index: -1;
-    }
-
-    .progressDefine>li:last-child:after {
-        display: none;
-    }
-
-    .progressDefine>li.is-complete {
-        color: #4dc5cf;
-    }
-
-    .progressDefine>li.is-complete:before,
-    .progressDefine>li.is-complete:after {
-        color: #FFF;
-        background: #4dc5cf;
-    }
-
-    .progressDefine>li.is-active {
-        color: #3498DB;
-    }
-
-    .progressDefine>li.is-active:before {
-        color: #FFF;
-        background: #3498DB;
-    }
-    /**
- * Needed for IE8
- */
-
-    .progressDefine__last:after {
-        display: none !important;
-    }
-    /**
- * Size Extensions
- */
-
-    .progressDefine--medium {
-        font-size: 1.5em;
-    }
-
-    .progressDefine--large {
-        font-size: 2em;
-    }
-    /**
- * Some Generic Stylings
- */
-
-    *,
-    *:after,
-    *:before {
-        box-sizing: border-box;
-    }
-
-    h1 {
-        margin-bottom: 1.5em;
-    }
-
-    .progressDefine {
-        margin-bottom: 3em;
-    }
-
-    a {
-        color: #3498DB;
-        text-decoration: none;
-    }
-
-    a:hover {
-        text-decoration: underline;
-    }
-    /*
-    body {
-        text-align: center;
-        color: #444;
-    }*/
-</style>