Policy 1707 Second commit

Change-Id: I18f5b142238733d17280cf17c3d1dd28204d34e9
Signed-off-by: ITSERVICES\rb7147 <rb7147@att.com>

3 files changed, 40 insertions, 48 deletions

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-context-menu.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-context-menu.html
index 5ef11b219..3c41fbc1d 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-context-menu.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-context-menu.html
@@ -47,7 +47,7 @@
             </a>
         </li>
         <li ng-show="config.allowedActions.edit && !temp.isFolder()">
-            <a href="" tabindex="-1" data-toggle="modal" data-target="#createNewPolicy" ng-show="editPolicyId" ng-click="temp.getContent();">
+            <a href="" tabindex="-1" data-toggle="modal" data-target="#createNewPolicy" ng-show="editPolicyId" ng-click="temp.getContent(policyNavigator);">
                 <i class="glyphicon glyphicon-pencil"></i> Edit Policy
             </a>
         </li>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/modals.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/modals.html
index f2b2b8d9d..6bd9587ef 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/modals.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/modals.html
@@ -4,17 +4,16 @@
     <form ng-submit="remove(temp)">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal">
-            <span aria-hidden="true">&times;</span>
             <span class="sr-only">Close</span>
         </button>
         <h4 class="modal-title">Confirm</h4>
       </div>
-      <div>
+      <div class="modal-body">
         Are you Sure to delete   <b>{{temp.model.name}}</b> ?
         <div ng-include data-src="'error-bar'" class="clearfix"></div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal" ng-disabled="temp.inprocess">Cancel</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal" ng-click="refresh();" ng-disabled="temp.inprocess">Cancel</button>
         <button type="submit" class="btn btn-primary" ng-disabled="temp.inprocess" autofocus="autofocus">Delete</button>
       </div>
       </form>
@@ -28,12 +27,11 @@
     <form ng-submit="removePolicy(temp)">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal">
-            <span aria-hidden="true">&times;</span>
             <span class="sr-only">Close</span>
         </button>
         <h4 class="modal-title">Confirm</h4>
       </div>
-      <div>Are you Sure to delete  <b>{{temp.model.name}}</b> ?
+      <div class="modal-body">Are you Sure to delete  <b>{{temp.model.name}}</b> ?
       	<div>
       	 <p>          
           	<input type = "radio" ng-model ="temp.model.versions"  name = "radSize" id = "sizeSmall" value = "CURRENT" checked = "checked" /><label for = "sizeSmall">Are you sure you want to delete Current Version of Policy</label>
@@ -44,7 +42,7 @@
         <div ng-include data-src="'error-bar'" class="clearfix"></div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal" ng-disabled="temp.inprocess">Cancel</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal" ng-click="refresh();" ng-disabled="temp.inprocess">Cancel</button>
         <button type="submit" class="btn btn-primary" ng-disabled="temp.inprocess" autofocus="autofocus">Delete</button>
       </div>
       </form>
@@ -58,16 +56,14 @@
         <form ng-submit="rename(temp)">
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal">
-                  <span aria-hidden="true">&times;</span>
                   <span class="sr-only">Close</span>
               </button>
               <h4 class="modal-title">Rename</h4>
             </div>
-            <div>
+            <div class="modal-body">
               <label class="radio">Enter New Name : <b>{{temp.model.name}}</b></label>
               <input class="form-control" ng-model="temp.tempModel.name" autofocus="autofocus">
 
-                <div ng-include data-src="'path-selector'" class="clearfix"></div>
               <div ng-include data-src="'error-bar'" class="clearfix"></div>
             </div>
             <div class="modal-footer">
@@ -85,7 +81,6 @@
         <form>
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal">
-                  <span aria-hidden="true">&times;</span>
                   <span class="sr-only">Close</span>
               </button>
               <h4 class="modal-title">List of Policies</h4>
@@ -107,12 +102,11 @@
         <form ng-submit="move(temp)">
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal">
-                  <span aria-hidden="true">&times;</span>
                   <span class="sr-only">Close</span>
               </button>
               <h4 class="modal-title">Move Policy</h4>
             </div>
-            <div>
+            <div class="modal-body">
               <div ng-include data-src="'path-selector'" class="clearfix"></div>
               <div ng-include data-src="'error-bar'" class="clearfix"></div>
             </div>
@@ -131,16 +125,15 @@
         <form ng-submit="switchVersion(temp)">
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal">
-                  <span aria-hidden="true">&times;</span>
                   <span class="sr-only">Close</span>
               </button>
               <h4 class="modal-title">Switch Version</h4>
             </div>
-            <div>
+            <div class="modal-body">
               <label class="radio">Highest Version <b></b></label>
               <input class="form-control" ng-disabled="true" ng-model="temp.tempModel.content.highestVersion" autofocus="autofocus">
             </div>
-             <div>
+             <div class="modal-body">
               <label class="radio">Active Version <b></b></label>
               <select class="form-control" ng-model="temp.tempModel.content.activeVersion" ng-options="option for option in temp.tempModel.content.availableVersions" autofocus="autofocus"></select>
               <div ng-include data-src="'error-bar'" class="clearfix"></div>
@@ -160,12 +153,11 @@
         <form ng-submit="copy(temp)">
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal">
-                  <span aria-hidden="true">&times;</span>
                   <span class="sr-only">Close</span>
               </button>
               <h4 class="modal-title">Clone Policy</h4>
             </div>
-            <div>
+            <div class="modal-body">
               <label class="radio">Enter new Policy Name to Clone <b>{{temp.model.name}}</b></label>
               <input class="form-control" ng-model="temp.tempModel.name" autofocus="autofocus">
 
@@ -187,12 +179,11 @@
         <form ng-submit="createFolder(temp)">
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal">
-                  <span aria-hidden="true">&times;</span>
                   <span class="sr-only">Close</span>
               </button>
               <h4 class="modal-title">Add Scope</h4>
             </div>
-            <div>
+            <div class="modal-body">
               <label class="radio">Scope Name</label>
               <input class="form-control" ng-model="temp.tempModel.name" autofocus="autofocus">
               <div ng-include data-src="'error-bar'" class="clearfix"></div>
@@ -212,12 +203,11 @@
         <form ng-submit="subScopeFolder(temp)">
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal">
-                  <span aria-hidden="true">&times;</span>
                   <span class="sr-only">Close</span>
               </button>
               <h4 class="modal-title">Add Sub Scope</h4>
             </div>
-            <div>
+            <div class="modal-body">
               <label class="radio">Scope Name</label>
               <input class="form-control" ng-model="temp.tempModel.subScopename" autofocus="autofocus">
               <div ng-include data-src="'error-bar'" class="clearfix"></div>
@@ -237,12 +227,11 @@
         <form ng-submit="uploadFiles()">
             <div class="modal-header">
               <button type="button" class="close" data-dismiss="modal">
-                  <span aria-hidden="true">&times;</span>
                   <span class="sr-only">Close</span>
               </button>
               <h4 class="modal-title">Import</h4>
             </div>
-            <div>
+            <div class="modal-body">
               <label class="radio">Upload to</label>
               <input type="file" class="form-control" ng-file="$parent.uploadFileList" autofocus="autofocus" multiple="multiple"/>
               <div ng-include data-src="'error-bar'" class="clearfix"></div>
@@ -266,7 +255,6 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal">
-            <span aria-hidden="true">&times;</span>
             <span class="sr-only">Close</span>
         </button>
         <h4 class="modal-title">Select the Destination Scope</h4>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/searchNavbar.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/searchNavbar.html
index 43eb5148b..72985a190 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/searchNavbar.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/searchNavbar.html
@@ -102,7 +102,7 @@ body {
 														</div>
 													</div>
 													<div class="form-group row">
-														<div class="form-group col-sm-6">
+														<div class="form-group col-sm-6" ng-if="search.closedLooppolicyType == 'Config_PM'">
 															<label>D2 Service:</label><BR> <select
 																class="form-control" ng-model="search.d2Service">
 																<option>Hosted Voice(Trinity)</option>
@@ -112,18 +112,15 @@ body {
 																<option>vDNS</option>
 															</select>
 														</div>
-														<div class="form-group col-sm-6">
-															<label>Bind Text Search to:</label><BR> <select
-																class="form-control" ng-model="search.bindTextSearch">
-																<option>Email Address</option>
-																<option>Trigger Signature</option>
-																<option>Connect All Traps</option>
-																<option>Verification Signature</option>
-																<option>Connect All Faults</option>
-																<option>Onset Message</option>
-																<option>Policy Name</option>
-																<option>Abatement Message</option>
-																<option>Geo Link</option>
+														<div class="form-group col-sm-6"
+															ng-if="search.closedLooppolicyType == 'Config_PM'">
+															<label>Service Type:</label><BR> <select
+																class="form-control" ng-model="search.serviceType">
+																<option>Registration Failure(Trinity)</option>
+																<option>International Fraud(Trinity)</option>
+																<option>No Dial Tone(Trinity)</option>
+																<option>Call Storm(Trinity)</option>
+																<option>Registration Storm(Trinity)</option>
 															</select>
 														</div>
 													</div>
@@ -150,15 +147,18 @@ body {
 																class="form-control" ng-model="search.vproAction"
 																ng-options="option for option in vsclActionDictionaryDatas track by option"></select>
 														</div>
-														<div class="form-group col-sm-6"
-															ng-if="search.closedLooppolicyType == 'Config_PM'">
-															<label>Service Type:</label><BR> <select
-																class="form-control" ng-model="search.serviceType">
-																<option>Registration Failure(Trinity)</option>
-																<option>International Fraud(Trinity)</option>
-																<option>No Dial Tone(Trinity)</option>
-																<option>Call Storm(Trinity)</option>
-																<option>Registration Storm(Trinity)</option>
+														<div class="form-group col-sm-6" ng-if="search.closedLooppolicyType == 'Config_Fault'">
+															<label>Bind Text Search to:</label><BR> <select
+																class="form-control" ng-model="search.bindTextSearch">
+																<option>Email Address</option>
+																<option>Trigger Signature</option>
+																<option>Connect All Traps</option>
+																<option>Verification Signature</option>
+																<option>Connect All Faults</option>
+																<option>Onset Message</option>
+																<option>Policy Name</option>
+																<option>Abatement Message</option>
+																<option>Geo Link</option>
 															</select>
 														</div>
 													</div>
@@ -166,8 +166,12 @@ body {
 											</form>
 										</div>
 									</div>
+									<button type="button" class="btn btn-default"
+										ng-click="refresh(search = null);">
+										<span aria-hidden="true">Clear</span>
+									</button>
 									<button type="button" class="btn btn-primary"
-										ng-click="search(search);">
+										ng-click="searchPolicy(search);">
 										<span class="glyphicon glyphicon-search" aria-hidden="true"></span>
 									</button>
 								</div>