diff options
author | Determe, Sebastien (sd378r) <sd378r@intl.att.com> | 2017-09-22 15:52:45 +0200 |
---|---|---|
committer | Determe, Sebastien (sd378r) <sd378r@intl.att.com> | 2017-09-22 16:04:11 +0200 |
commit | 8c5ffd0eb1269ceeb9b19a2c274577fae6240840 (patch) | |
tree | b2c21078726a8cf13a0070a579b45248710b3934 /src/main/resources/META-INF | |
parent | 10efd56cf30699a2d241d2b8aef6d504faf3090d (diff) |
Add the target resource ID
Add target resource ID in operational policy code as requested.
It changes the UI, the Policy code, the model and the tests.
Change-Id: Ie72badde55e7f8b5c2e5234099a09b95958205cf
Issue-ID: CLAMP-55
Signed-off-by: Determe, Sebastien (sd378r) <sd378r@intl.att.com>
Diffstat (limited to 'src/main/resources/META-INF')
-rw-r--r-- | src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html | 245 |
1 files changed, 127 insertions, 118 deletions
diff --git a/src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html b/src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html index 4f7a77d4e..00e167516 100644 --- a/src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html +++ b/src/main/resources/META-INF/resources/designer/partials/portfolios/PolicyWindow_properties.html @@ -23,14 +23,15 @@ <style> -#deletePolicy{ - height:34px; - background-color:#dddd; +#deletePolicy { + height: 34px; + background-color: #dddd; } -.disabled{ +.disabled { background-color: #dddd; } + .fileUpload { position: relative; overflow: hidden; @@ -60,61 +61,62 @@ margin-top: 17px; } -.modelSearchBox{ - position:absolute; +.modelSearchBox { + position: absolute; padding: 25px 12px; } -label{ - text-align:right; - vertical-align:middle; +label { + text-align: right; + vertical-align: middle; } -.leftPolicyPanel{ +.leftPolicyPanel { padding: 0 10px 0 0; } -#createNewPolicy{ - height:34px; - width:120px; /*84*/ - background-color:#f2bfab; +#createNewPolicy { + height: 34px; + width: 120px; /*84*/ + background-color: #f2bfab; } -.idError{ - color:red; - padding:50px 0px; - text-align:center; - display:none; +.idError { + color: red; + padding: 50px 0px; + text-align: center; + display: none; } -.policyPanel{ +.policyPanel { background-color: #f5f5f5; padding: 15px 5px 0 5px; } -.form-group.clearfix{ - display:-webkit-flex; - display: flex; +.form-group.clearfix { + display: -webkit-flex; + display: flex; align-items: center; } -label{ - margin-bottom:0px; +label { + margin-bottom: 0px; } -#policySearch{ +#policySearch { height: 33px; font-size: 12px; padding: 2px 2px 2px 30px; margin-bottom: 5px; - width:100%; + width: 100%; } -#policyTable{ + +#policyTable { cursor: pointer; - width:100%; + width: 100%; } -#policyTable tr{ +#policyTable tr { border-bottom: 1px solid #ddd; border-collapse: collapse; text-align: left; @@ -122,22 +124,21 @@ label{ font-weight: normal; } -#policyTable td{ +#policyTable td { padding: 8px 10px; } -#policyTable tr.highlight{ +#policyTable tr.highlight { background-color: #f5f5f5; font-weight: bold; font-size: 13px; } -#policyTableHolder{ - height:200px; - width: 100%; - overflow:auto; +#policyTableHolder { + height: 200px; + width: 100%; + overflow: auto; } - </style> <script type="text/javascript"> @@ -163,128 +164,136 @@ label{ </script> - <div attribute-test="policywindowproperties" id="configure-widgets" - class="disabled-block-container"> +<div attribute-test="policywindowproperties" id="configure-widgets" + class="disabled-block-container"> <div attribute-test="policywindowpropertiesh" class="modal-header"> <button type="button" class="close" ng-click="close(false)" aria-hidden="true" style="margin-top: -3px">×</button> <h4>Operational Policy</h4> - </div> - - + </div> + + <div class="modal-body"> - <div attribute-test="policywindowpropertiesb" class="modal-body row"> - - <div class="leftPolicyPanel"> - <div class="panel panel-default"> + <div attribute-test="policywindowpropertiesb" class="modal-body row"> + + <div class="leftPolicyPanel"> + <div class="panel panel-default"> <i class="glyphicon glyphicon-search modelSearchBox"></i> <input type="text" id="policySearch" onkeyup="searchPolicyList()" - placeholder="Search ..."> - <div id="policyTableHolder"> - <table id="policyTable"></table> + placeholder="Search ..."> + <div id="policyTableHolder"> + <table id="policyTable"></table> + </div> </div> - </div> - <div style="float:left"> + <div style="float: left"> <button type="button" id="createNewPolicy" class="btn btn-sm">New Policy</button></span> - </div> - <div style="float:right"> + </div> + <div style="float: right"> <button type="button" id="deletePolicy" class="btn btn-sm glyphicon glyphicon-trash" disabled></button></span> - </div> + </div> <div id="repeatIdError" class="idError">Error: This Policy name is already taken.</div> <div id="newIdError" class="idError">Error: Please rename your new Policy.</div> <div id="spaceError" class="idError">Error: Spaces are not allowed in the ID.</div> - </div> - + </div> + <div class="panel panel-default col-sm-9 policyPanel" style="display:none;"> - <form id="Timeoutform" class="form-horizontal"> - <div> - <div class="form-group clearfix row"> - <label class="col-sm-2">Name</label> - <div class="col-sm-3" style="padding:0px;"> + <form id="Timeoutform" class="form-horizontal"> + <div> + <div class="form-group clearfix row"> + <label class="col-sm-2">Name</label> + <div class="col-sm-3" style="padding: 0px;"> <input type="text" id="pname" name="pname" maxlength="48" placeholder="Enter Unique Name" class="form-control"> - </div> - - <label class="col-sm-1">ID</label> - <div class="col-sm-1" style="padding:0px;"> + </div> + + <label class="col-sm-1">ID</label> + <div class="col-sm-1" style="padding: 0px;"> <input onkeydown="return false;" type="text" id="pid" name="pid" class="form-control" readonly> - </div> - + </div> + <label for="userID" class="col-sm-3" style="padding-left:5px;padding-right:10px;">Overall Time Limit</label> - <div class="col-sm-2" style="padding-left:0px;"> + <div class="col-sm-2" style="padding-left: 0px;"> <input type="text" maxlength="10" onkeypress="return isNumberKey(event)" class="form-control" id="timeout" name="timeout"> - </div> + </div> + </div> </div> + </form> + <div class="panel-heading" style="background-color: white;"> + <ul id="nav_Tabs" class="nav nav-tabs"> + <li class><a id="add_one_more" href="#desc_tab"><span + class="glyphicon glyphicon-plus" aria-hidden="true"></span></a></li> + </ul> </div> - </form> - <div class="panel-heading" style="background-color: white;"> - <ul id="nav_Tabs" class="nav nav-tabs"> - <li class><a id="add_one_more" href="#desc_tab"><span - class="glyphicon glyphicon-plus" aria-hidden="true"></span></a></li> - </ul> - </div> - <div class="panel-body"> - <div class="tab-content"> - <div id="properties_tab" class="tab-pane fade in active"></div> + <div class="panel-body"> + <div class="tab-content"> + <div id="properties_tab" class="tab-pane fade in active"></div> + </div> </div> </div> - </div> - - <span id="formSpan" style="display: none"> - <form class="saveProps" class="form-horizontal"> - <div> - <div class="form-group clearfix" > - <label class="col-sm-4 control-label" for="recipe">Recipe</label> - <div class="col-sm-8"> + + <span id="formSpan" style="display: none"> + <form class="saveProps" class="form-horizontal"> + <div> + <div class="form-group clearfix"> + <label class="col-sm-4 control-label" for="recipe">Recipe</label> + <div class="col-sm-8"> <select class="form-control" name="recipe" id="recipe" enableFilter="true"></select> + </div> </div> - </div> - <div class="form-group clearfix"> - <label for="maxRetries" class="col-sm-4 control-label"> - Max Retries</label> - <div class="col-sm-8"> + <div class="form-group clearfix"> + <label for="maxRetries" class="col-sm-4 control-label"> + Max Retries</label> + <div class="col-sm-8"> <input type="text" maxlength="5" class="form-control" id="maxRetries" onkeypress="return isNumberKey(event)" - name="maxRetries"> </input> + name="maxRetries"> </input> + </div> </div> - </div> - <div class="form-group clearfix" > - <label for="retryTimeLimit" class="col-sm-4 control-label" > - Retry Time Limit</label> - <div class="col-sm-8"> + <div class="form-group clearfix"> + <label for="retryTimeLimit" class="col-sm-4 control-label"> + Retry Time Limit</label> + <div class="col-sm-8"> <input type="text" maxlength="5" class="form-control" id="retryTimeLimit" onkeypress="return isNumberKey(event)" - name="retryTimeLimit"></input> + name="retryTimeLimit"></input> + </div> </div> - </div> - <div style="display:none;" class="form-group clearfix"> + <div style="display: none;" class="form-group clearfix"> <label for="_id" class="col-sm-4 control-label"> PolicyID</label> - <div class="col-sm-8"> + <div class="col-sm-8"> <input type="text" onkeydown="return false;" class="form-control" id="_id" name="_id" value=""></input> + </div> </div> - </div> - <div class="form-group clearfix"> - <label for="parentPolicy" class="col-sm-4 control-label"> - Parent Policy</label> - <div class="col-sm-8"> - <select class="form-control" id="parentPolicy" + <div class="form-group clearfix"> + <label for="parentPolicy" class="col-sm-4 control-label"> + Parent Policy</label> + <div class="col-sm-8"> + <select class="form-control" id="parentPolicy" name="parentPolicy" enableFilter="true"><option value=""></option></select> + </div> </div> - </div> - <div class="form-group clearfix"> + <div class="form-group clearfix"> <label for="parentPolicyConditions" class="col-sm-4 control-label"> Parent Policy Conditions</label> - <div class="col-sm-8"> - <select class="form-control" id="parentPolicyConditions" - name="parentPolicyConditions" multiple></select> + <div class="col-sm-8"> + <select class="form-control" id="parentPolicyConditions" + name="parentPolicyConditions" multiple></select> + </div> + </div> + <div class="form-group clearfix"> + <label for="targetResourceId" class="col-sm-4 control-label"> + Target ResourceId</label> + <div class="col-sm-8"> + <input type="text" class="form-control" id="targetResourceId" + name="targetResourceId"> </input> + </div> </div> </div> - </div> - </form> - </span> - </div> + </form> + </span> + </div> </div> <div attribute-test="policywindowpropertiesf" class="modal-footer"> @@ -293,7 +302,7 @@ label{ <button ng-click="close(true)" id="close_button" class="btn btn-primary">Cancel</button> </div> - + <script> //Basically this method will add a new form. All forms share the same class. When you want one form to show(active form) the other forms get the // css attribute display:none |