X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fresources%2FMETA-INF%2Fresources%2Fdesigner%2Fpartials%2Fportfolios%2Foperational_policy_window.html;h=db127f7d2ba4c5bace4beba1f1cff85af6adc73e;hb=refs%2Fchanges%2F77%2F88677%2F1;hp=798f18f600b5f7bc42a5295180790cc5431715a0;hpb=0169b6200be3bb4a670ebe17eca15a8870c9f3b6;p=clamp.git

diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html
index 798f18f6..db127f7d 100644
--- a/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html
+++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/operational_policy_window.html
@@ -58,6 +58,16 @@ label {
 	margin-bottom: 0px;
 }
 
+.withnote {
+	margin-bottom: 0px;
+}
+
+.note {
+	font-size:10px;
+	margin-left: 250px;
+	font-weight: normal;
+}
+
 #policyTable {
 	cursor: pointer;
 	width: 100%;
@@ -101,10 +111,9 @@ label {
 	<div class="modal-body">
 		<div attribute-test="policywindowpropertiesb" class="modal-body row">
 
-			<div class="panel panel-default col-sm-9 policyPanel">
+			<div class="panel panel-default col-sm-10 policyPanel">
 				<form id="operationalPolicyHeaderForm" class="form-horizontal">
-					<div>
-						<div class="form-group clearfix row">
+						<div class="form-group clearfix">
 							<label class="col-sm-2">Parent policy</label>
 							<div class="col-sm-3" style="padding: 0px;">
 								<select type="text" id="trigger_policy" name="trigger_policy"
@@ -124,9 +133,11 @@ label {
 							</div>
 
 							<label for="abatement" class="col-sm-2">Abatement</label>
-							<div class="col-sm-3" style="padding: 0px;">
-								<input type="checkbox" id="abatement" name="abatement"
-									checked="true" class="form-control">
+							<div class="col-sm-2" style="padding-left: 0px;">
+								<select class="form-control" id="abatement" name="abatement">
+   									<option value="false" selected>False</option>
+   									<option value="true">True</option>
+								</select>
 							</div>
 						</div>
 						<div class="form-group clearfix row">
@@ -136,7 +147,6 @@ label {
 								    readonly="readonly" id="clname" ng-model="clname"/>
 						    </div>
 						</div>
-					</div>
 				</form>
 				<div class="panel-heading" style="background-color: white;">
 					<ul id="nav_Tabs" class="nav nav-tabs">
@@ -293,17 +303,17 @@ label {
 							<select class="form-control" name="type" id="type"
 								ng-click="initTargetResourceId($event)" ng-model="type">
                 						<option value="">-- choose an option --</option>                                                    
-								<option value="VFModule">VFModule</option>
+								<option value="VFMODULE">VFMODULE</option>
 								<option value="VM">VM</option>
 								<option value="VNF">VNF</option>
 							</select>
 						</div>
 					</div>
 					<div class="form-group clearfix">
-						<label for="resourceId" class="col-sm-4 control-label">
+						<label for="resourceID" class="col-sm-4 control-label">
 							Target ResourceId</label>
 						<div class="col-sm-8">
-							<select class="form-control" name="resourceId" id="resourceId"
+							<select class="form-control" name="resourceID" id="resourceID"
 								enableFilter="true" ng-click="changeTargetResourceId($event)"
 								ng-model="resourceId">
 								<option value="">-- choose an option --</option>
@@ -365,7 +375,7 @@ label {
 						<label for="guardPolicyType" class="col-sm-4 control-label">
 							Guard Policy Type</label> <select class="form-control"
 							name="guardPolicyType" id="guardPolicyType"
-							ng-change="changeGuardPolicyType()" ng-model="guardType">
+							ng-click="changeGuardPolicyType()" ng-model="guardType">
 							<option value="GUARD_MIN_MAX">MinMax</option>
 							<option value="GUARD_YAML">FrequencyLimiter</option>
 						</select>
@@ -374,12 +384,15 @@ label {
 				<form class="guardProperties" class="form-horizontal"
 					title="Guard policy associated" style="border: 2px dotted gray;">
 
-					<div class="form-group clearfix">
+					<div class="form-group clearfix withnote">
 						<label class="col-sm-4 control-label" for="id">Guard Policy ID</label>
 						<div class="col-sm-8">
-							<input type="text" class="form-control" name="id" id="id" />
+							<input type="text" class="form-control" name="id" id="id" ng-blur="changeGuardId()" ng-model="id"/>
 						</div>
 					</div>
+					<div>
+						<label class="form-group note">Note: Prefix will be added to Guard Policy ID automatically based on Guard Policy Type</label>
+					</div>
 					<div class="form-group clearfix">
 						<label class="col-sm-4 control-label" for="recipe">Recipe</label>
 						<div class="col-sm-8">
@@ -403,34 +416,35 @@ label {
 					</div>
 					<div class="form-group clearfix">
 
-						<label for="guardTargets" class="col-sm-4 control-label">Guard
+						<label for="targets" class="col-sm-4 control-label">Guard
 							targets</label>
 						<div class="col-sm-8">
-							<input class="form-control" name="guardTargets" id="guardTargets" />
+							<input class="form-control" name="targets" id="targets" />
 						</div>
 					</div>
 
 					<div class="form-group clearfix" id="minMaxGuardPolicyDiv">
-						<label for="minGuard" class="col-sm-4 control-label"> Min
+						<label for="min" class="col-sm-4 control-label"> Min
 							Guard</label>
 						<div class="col-sm-8">
-							<input class="form-control" name="minGuard" id="minGuard" />
+							<input class="form-control" name="min" id="min" />
 						</div>
-						<label for="maxGuard" class="col-sm-4 control-label"> Max
+						<label for="max" class="col-sm-4 control-label"> Max
 							Guard</label>
 						<div class="col-sm-8">
-							<input class="form-control" name="maxGuard" id="maxGuard" />
+							<input class="form-control" name="max" id="max" />
 						</div>
 					</div>
 					<div class="form-group clearfix"
 						id="frequencyLimiterGuardPolicyDiv" style="display: none">
-						<label for="limitGuard" class="col-sm-4 control-label">Limit</label>
+						<label for="limit" class="col-sm-4 control-label">Limit</label>
 						<div class="col-sm-8">
-							<input class="form-control" name="limitGuard" id="limitGuard" />
+							<input class="form-control" name="limit" id="limit" />
 						</div>
+						<label for="timeUnits" class="col-sm-4 control-label">Time Units</label>
 						<div class="col-sm-8">
-							<select class="form-control" name="timeUnitsGuard"
-								id="timeUnitsGuard">
+							<select class="form-control" name="timeUnits"
+								id="timeUnits">
 								<option value=""></option>
 								<option value="minute">minute</option>
 								<option value="hour">hour</option>
@@ -438,13 +452,11 @@ label {
 								<option value="week">week</option>
 								<option value="month">month</option>
 								<option value="year">year</option>
-
-							</select> <label for="timeWindowGuard" class="col-sm-4 control-label">Time
-								Window</label>
+							</select> 
 						</div>
+						<label for="timeWindow" class="col-sm-4 control-label">Time	Window</label>
 						<div class="col-sm-8">
-							<input class="form-control" name="timeWindowGuard"
-								id="timeWindowGuard" />
+							<input class="form-control" name="timeWindow" id="timeWindow" />
 						</div>
 					</div>
 					<div class="form-group clearfix">
@@ -452,13 +464,13 @@ label {
 							Guard Active Start</label>
 						<div class="col-sm-8">
 							<input class="form-control" name="guardActiveStart"
-								id="guardActiveStart" />
+								id="guardActiveStart"  value="00:00:00Z"/>
 						</div>
 						<label for="guardActiveEnd" class="col-sm-4 control-label">
 							Guard Active End</label>
 						<div class="col-sm-8">
 							<input class="form-control" name="guardActiveEnd"
-								id="guardActiveEnd" />
+								id="guardActiveEnd" value="00:00:01Z"/>
 						</div>
 					</div>