diff options
Diffstat (limited to 'gui/app/views')
| -rw-r--r-- | gui/app/views/layout/sideNav.html | 17 | ||||
| -rw-r--r-- | gui/app/views/layout/sideNav2.html | 108 | ||||
| -rw-r--r-- | gui/app/views/main2.html | 174 | ||||
| -rw-r--r-- | gui/app/views/modal/environmentDialog.html | 15 | ||||
| -rw-r--r-- | gui/app/views/modal/imageDialog.html | 19 | ||||
| -rw-r--r-- | gui/app/views/podupload.html | 2 | ||||
| -rw-r--r-- | gui/app/views/uploadImage.html | 82 |
7 files changed, 99 insertions, 318 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> diff --git a/gui/app/views/modal/environmentDialog.html b/gui/app/views/modal/environmentDialog.html index 389de8340..4c539fc33 100644 --- a/gui/app/views/modal/environmentDialog.html +++ b/gui/app/views/modal/environmentDialog.html @@ -133,16 +133,17 @@ <table class="table table-striped"> <tr> + <th>choose</th> <th>name</th> - <th>size</th> + <th>description</th> <th>status</th> - <th>time</th> </tr> - <tr ng-repeat="image in imageListData"> - <td>{{image.name}}</td> - <td>{{image.size/1024}} mb</td> - <td>{{image.status}}</td> - <td>{{image.time}}</td> + <tr ng-repeat="(name, value) in yardstickImage"> + <td ng-if="selectImageList.indexOf(name) > -1"><img src="images/checkyes.png" style="height:12px;cursor:pointer" ng-click="unselectImage(name)" /></td> + <td ng-if="selectImageList.indexOf(name) == -1"><img src="images/checkno.png" style="height:12px;cursor:pointer" ng-click="selectImage(name)" /></td> + <td>{{name}}</td> + <td>{{value.description}}</td> + <td>{{value.status}}</td> </tr> diff --git a/gui/app/views/modal/imageDialog.html b/gui/app/views/modal/imageDialog.html new file mode 100644 index 000000000..c568f2aba --- /dev/null +++ b/gui/app/views/modal/imageDialog.html @@ -0,0 +1,19 @@ +<div> + + <h4>Enter Remote Image Url</h4> + <input type="text" ng-model="url" /> + + <div style="text-align:center;margin-top:20px;"> + <button class="btn btn-default" ng-disabled=" url==null || url==''" ng-click="uploadCustomImageByUrl(url)">Upload</button> + </div> + +</div> + + +<style> + input { + border-radius: 10px; + border: 1px solid #eeeeee; + width: 100%; + } +</style> diff --git a/gui/app/views/podupload.html b/gui/app/views/podupload.html index 99e83aca2..d6d7c0c6e 100644 --- a/gui/app/views/podupload.html +++ b/gui/app/views/podupload.html @@ -13,7 +13,7 @@ <hr/> - <button class="btn btn-default" ngf-select="uploadFiles($file, $invalidFiles)" ngf-max-size="5MB"> + <button class="btn btn-default" ngf-select="uploadFiles($file, $invalidFiles)" ngf-max-size="1024MB"> <div ng-show="!loadingOPENrc">Upload</div> <img src="images/loading2.gif" width="25" height="25" ng-if="loadingOPENrc" /> </button> diff --git a/gui/app/views/uploadImage.html b/gui/app/views/uploadImage.html index 17ccfdb8b..0c337feeb 100644 --- a/gui/app/views/uploadImage.html +++ b/gui/app/views/uploadImage.html @@ -4,56 +4,86 @@ <div style="display:flex;flex-direction:row;"> <div style="width:750px;"> - <h3>{{baseElementInfo.name}} -- Image + <h3>{{environmentInfo.name}} -- Image <button class="btn btn-default" style="float:right" ng-click="goNext()">Next</button> </h3> <!--<p>In this process, you can input your define openrc config or upload a openrc file</p>--> - <hr/> - <button class="btn btn-default" ng-click="uploadImage()"> - <div ng-if="!showloading">Load Image</div> - <img src="images/loading2.gif" width="25" height="25" ng-if="showloading" /> - </button> - <i class="fa fa-check" aria-hidden="true" style="margin-top:34px;margin-left:5px;color: #2ecc71;" ng-show="imageStatus==1&&ifshowStatus==1">done</i> - <i class="fa fa-spinner" aria-hidden="true" style="margin-top:34px;margin-left:5px;color: #2ecc71;" ng-show="imageStatus==0&&ifshowStatus==1">loading</i> - <i class="fa fa-exclamation-triangle" aria-hidden="true" style="margin-top:34px;margin-left:5px;color: red;" ng-show="imageStatus==2&&ifshowStatus==1">error</i> - <hr> - <h4>Current Images</h4> - + <h4>Alternative Images</h4> <div> <table class="table table-striped"> <tr> <th>name</th> + <th>description</th> <th>size</th> <th>status</th> <th>time</th> + <th>action</th> </tr> - <tr ng-repeat="image in imageListData"> + <tr ng-repeat="image in yardstickImage"> <td>{{image.name}}</td> - <td>{{image.size/1024}} MB</td> + <td>{{image.description}}</td> + <td>{{image.size | number:2}} MB</td> <td>{{image.status}}</td> <td>{{image.time}}</td> - + <td> + <div class="btn-group" uib-dropdown> + <button id="single-button" type="button" class="btn btn-default btn-sm" uib-dropdown-toggle> + action<span class="caret"></span> + </button> + <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button"> + <li role="menuitem" ng-show="image.status == 'N/A'"><a ng-click="loadYardstickImage(image.name)">load</a></li> + <li role="menuitem" ng-show="image.status != 'N/A'"><a ng-click="deleteYardstickImage(image.name)">delete</a></li> + </ul> + </div> + </td> </tr> - - - </table> </div> + <hr> + <h4 style="display:inline">Custom Images</h4> + <div class="btn-group button-margin" style="float:right;margin-top:-10px;margin-bottom:5px"> + <button class="btn btn-default" style="width:60px" ngf-select="uploadCustomImage($file, $invalidFiles)" ngf-max-size="2048MB"> + <div ng-show="!showloading">Local</div> + <img src="images/loading2.gif" width="25" height="25" ng-if="showloading" /> + </button> + <button class="btn btn-default" style="width:60px" ng-click="openImageDialog()">Url</button> + </div> + <div> + <table class="table table-striped"> - - - - - - + <tr> + <th>name</th> + <th>description</th> + <th>size</th> + <th>status</th> + <th>time</th> + <th>action</th> + </tr> + <tr ng-repeat="image in customImage"> + <td>{{image.name}}</td> + <td>{{image.description}}</td> + <td>{{image.size | number:2}} MB</td> + <td>{{image.status}}</td> + <td>{{image.time}}</td> + <td> + <div class="btn-group" uib-dropdown> + <button id="single-button" type="button" class="btn btn-default btn-sm" uib-dropdown-toggle> + action<span class="caret"></span> + </button> + <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="single-button"> + <li role="menuitem" ><a ng-click="deleteCustomImage(image.id)">delete</a></li> + </ul> + </div> + </td> + </tr> + </table> + </div> </div> - - </div> </div> |