diff options
| author |   seshukm <seshu.kumar.m@huawei.com> | 2017-04-25 17:53:56 +0530 |
|---|---|---|
| committer | seshukm <seshu.kumar.m@huawei.com> | 2017-04-25 17:53:56 +0530 |
| commit | 7281ba419d0a05905e1ca080731854a438141115 (patch) | |
| tree | b147cb0835b91d336cd2c125f34827d12cb36a50 | |
| parent | 986596936ef31566c58e00671f8e18cc372ed6a0 (diff) | |
Res Mgr defect fix
IssueId : CLIENT-200
Change-Id: I2f106ac9a7f253cd4fae6995986dbe6f59541fb3
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>
5 files changed, 25 insertions, 14 deletions
diff --git a/resmgr/src/main/webapp/resmgr/index.html b/resmgr/src/main/webapp/resmgr/index.html index 36a6b17b..9572b117 100644 --- a/resmgr/src/main/webapp/resmgr/index.html +++ b/resmgr/src/main/webapp/resmgr/index.html @@ -1,4 +1,4 @@ -<!--/* Copyright 2017, Huawei Technologies Co., Ltd. +<!-- Copyright 2017, Huawei Technologies Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -11,7 +11,7 @@ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. -*/--> +--> <!DOCTYPE html> diff --git a/resmgr/src/main/webapp/resmgr/js/app.js b/resmgr/src/main/webapp/resmgr/js/app.js index 2ca5177b..1c06d8ac 100644 --- a/resmgr/src/main/webapp/resmgr/js/app.js +++ b/resmgr/src/main/webapp/resmgr/js/app.js @@ -198,6 +198,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) var portOperatingState = {"ErrMsg" : {"errmsg" : "The name is required.", "modalVar":"port.operState"}};
$('#myModal #operState').append($compile(Mustache.to_html(text, portOperatingState.ErrMsg))($scope));
+ var neNativeId = {"ErrMsg" : {"errmsg" : "The nativeid required.", "modalVar":"port.nativeId"}};
+ $('#myModal #nativeId').append($compile(Mustache.to_html(text, neNativeId.ErrMsg))($scope));
+
$scope.checkboxes = { 'checked': false, items: {} };
$scope.portTableParams = new NgTableParams({count: 5, sorting: {name: 'asc'} //{page: 1,count: 10,filter: {name: 'M'},sorting: {name: 'desc'}
@@ -292,6 +295,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) $scope.numericErr = false;
}
$scope.saveData = function(id) {
+ $scope.port.edgePoint = $('#portEdropdown').val();
+ $scope.port.type = $('#portdropdown').val();
+ $scope.port.me = $('#medropdown').val();
if (!$scope.textboxErrName && !$scope.textboxErrMe) {
var ports ={};
ports.logicalTerminationPoint=$scope.port;
@@ -532,6 +538,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) $scope.textboxErrName = false;
}
$scope.saveData = function(id) {
+ $scope.site.type = $('#sitedropdown').val();
if (!$scope.textboxErrName) {
@@ -1040,6 +1047,7 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) $scope.numericErr = false;
}
$scope.saveData = function(id) {
+ $scope.link.type = $('#linkdropdown').val();
if (!$scope.textboxErr) {
var links ={}
@@ -1214,9 +1222,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) $('#myModal #controller').append($compile(Mustache.to_html(dropDown, dropSimple_data))($scope));*/
- var dropdownResponse=[{"serviceTemplateId":"meCtrl","templateName":"mecontroller1"},{"serviceTemplateId":"meCtrl2","templateName":"mecontroller"}];
+ /*var dropdownResponse=[{"serviceTemplateId":"meCtrl","templateName":"mecontroller1"},{"serviceTemplateId":"meCtrl2","templateName":"mecontroller"}];
var dropdownInfo = translateToDropdownInfo(dropdownResponse);
- document.getElementById("medropdown").innerHTML = dropdownInfo;
+ document.getElementById("medropdown").innerHTML = dropdownInfo;*/
neDataService.getNECtrlDDList()
@@ -1372,6 +1380,9 @@ var app = angular.module("ResourceMgrApp", ["ui.router", "ngTable"]) $("#myModal").modal({}).draggable();
}
$scope.saveData = function(id) {
+ $scope.ne.controller = $('#medropdown').val();
+ $scope.ne.siteId = $('#siteIdDropdown').val();
+
if (!$scope.textboxErrName && !$scope.textboxErrIP) {
var nes = {};
diff --git a/resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html b/resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html index 2bde05b5..badaa021 100644 --- a/resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html +++ b/resmgr/src/main/webapp/resmgr/nfv-resmgr/vim/vimgraph.html @@ -50,7 +50,7 @@ <br>
<label style="font-size:14px;">Cpu status</label>
</div>
- <div style="...">
+ <div style="width:30%;float: left;text-align:center;display: inline">
<canvas id="memoryChart"></canvas>
<br>
<label style="font-size:14px;">Memory status</label>
diff --git a/resmgr/src/main/webapp/resmgr/templates/templateContainer.html b/resmgr/src/main/webapp/resmgr/templates/templateContainer.html index ef6f01c6..a1640acd 100644 --- a/resmgr/src/main/webapp/resmgr/templates/templateContainer.html +++ b/resmgr/src/main/webapp/resmgr/templates/templateContainer.html @@ -61,7 +61,7 @@ <!--Table-->
<script id="table" type="text/html">
- {{#filter}}<input type="text" id="myInput" onkeyup="{{action}}" placeholder="Search for {{searchField}}">{{/filter}}
+ {{#filter}}<input type="text" autocomplete="off" id="myInput" onkeyup="{{action}}" placeholder="Search for {{searchField}}">{{/filter}}
<table id="myTable{{#filter}}_search{{/filter}}" class="table {{#striped}}table-striped{{/striped}} {{#border}}table-bordered{{/border}} {{#hover}}table-hover{{/hover}} {{#condensed}}table-condensed{{/condensed}}">
<thead>
<tr>
diff --git a/resmgr/src/main/webapp/resmgr/templates/templateWidget.html b/resmgr/src/main/webapp/resmgr/templates/templateWidget.html index bb8eef48..338cf47b 100644 --- a/resmgr/src/main/webapp/resmgr/templates/templateWidget.html +++ b/resmgr/src/main/webapp/resmgr/templates/templateWidget.html @@ -97,7 +97,7 @@ <!--text-->
<script id="textfield" type="text/html">
<div class="css-form">
- <input id ="textbox" name="textbox" class="form-control inputfield" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="text" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}> {{#required}}<span class="staricon">*</span>{{/required}}
+ <input id ="textbox" autocomplete="off" name="textbox" class="form-control inputfield" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="text" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}> {{#required}}<span class="staricon">*</span>{{/required}}
<span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>
</div>
</script>
@@ -105,7 +105,7 @@ <!--email-->
<script id="email" type="text/html">
<div class="css-form">
- <input class="form-control inputfield" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="email" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}
+ <input class="form-control inputfield" autocomplete="off" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="email" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}
<span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>
</div>
</script>
@@ -113,7 +113,7 @@ <!--url-->
<script id="url" type="text/html">
<div class="css-form">
- <input class="form-control inputfield" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="url" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}
+ <input class="form-control inputfield" autocomplete="off" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="url" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}
<span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>
</div>
</script>
@@ -123,7 +123,7 @@ <div class="css-form">
- <input class="form-control inputfield" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="password" pattern=".{3,}" maxlength="{{#maxLength}}{{maxLength}}{{/maxLength}}{{^maxLength}}9{{/maxLength}}" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}
+ <input class="form-control inputfield" autocomplete="off" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="password" pattern=".{3,}" maxlength="{{#maxLength}}{{maxLength}}{{/maxLength}}{{^maxLength}}9{{/maxLength}}" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}
<span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>
</div>
</script>
@@ -131,7 +131,7 @@ <!--numeric-->
<script id="numeric" type="text/html">
<div class="css-form">
- <input class="form-control inputfield" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="number" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}/>{{#required}}<span class="staricon">*</span>{{/required}}
+ <input class="form-control inputfield" autocomplete="off" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="number" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}/>{{#required}}<span class="staricon">*</span>{{/required}}
<span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>
</div>
</script>
@@ -139,7 +139,7 @@ <!--dot-->
<script id="dot" type="text/html">
<div class="css-form">
- <input class="form-control inputfield" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="datetime-local" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}
+ <input class="form-control inputfield" autocomplete="off" placeholder="{{placeholder}}" ng-model="{{modalVar}}" type="datetime-local" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}
<span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>
</div>
</script>
@@ -180,7 +180,7 @@ <!--ipv4-->
<script id="ipv4" type="text/html">
<div class="css-form">
- <input class="form-control inputfield" type="ipv4" placeholder="{{placeholder}}" ng-model="{{modalVar}}" pattern="((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}
+ <input class="form-control inputfield" autocomplete="off" type="ipv4" placeholder="{{placeholder}}" ng-model="{{modalVar}}" pattern="((^|\.)((25[0-5])|(2[0-4]\d)|(1\d\d)|([1-9]?\d))){4}$" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}>{{#required}}<span class="staricon">*</span>{{/required}}
<span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>
</div>
</script>
@@ -196,7 +196,7 @@ <!--textarea-->
<script id="textarea" type="text/html">
<div class="css-form">
- <textarea class="form-control inputfield" rows="4" cols="50" placeholder="{{placeholder}}" ng-model="{{modalVar}}" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}></textarea>{{#required}}<span class="staricon">*</span>{{/required}}
+ <textarea class="form-control inputfield" autocomplete="off" rows="4" cols="50" placeholder="{{placeholder}}" ng-model="{{modalVar}}" ng-blur="{{errfunc}}({{modalVar}})" {{#required}}required{{/required}}></textarea>{{#required}}<span class="staricon">*</span>{{/required}}
<span class="errMsg" ng-show="{{errtag}}">{{errmsg}}</span>
</div>
</script>
|