ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gau...@apache.org
Subject [2/5] incubator-ranger git commit: RANGER-799 : Ranger UI fixes - partial search not working on Policy listing page
Date Mon, 22 Feb 2016 05:35:27 GMT
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/helpers/XAHelpers.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/helpers/XAHelpers.js b/security-admin/src/main/webapp/templates/helpers/XAHelpers.js
index b140608..66d37ce 100644
--- a/security-admin/src/main/webapp/templates/helpers/XAHelpers.js
+++ b/security-admin/src/main/webapp/templates/helpers/XAHelpers.js
@@ -165,8 +165,7 @@
         if(typeof pageSize === 'undefined'){
             pageSize = 25;
         }
-        var html = '',
-        fromPage = 0, i = 1;
+        var html = '', fromPage = 0, i = 1;
         var index = parseInt(totalCount/pageSize);
         if(index == 0){
             return html;
@@ -174,7 +173,7 @@
         for (; i <= index; i++) {
             if(i == 1){
                 html += '<li class="active" data-page='+fromPage+'><a href="javascript:;">'+i+'</a></li>';
-            }else{
+            } else {
                 html += '<li data-page='+fromPage+'><a href="javascript:;">'+i+'</a></li>';
             }
             fromPage = pageSize * i; 
@@ -189,7 +188,6 @@
 		if(permsString == "--")
 			return permsString;
 		permArr = permsString.split(',');
-		//return permArr.join(', ');
 		var cl = _.isObject(kclass) ? 'label label-info' : kclass;
 		var tempArr = [];
 		_.each(permArr, function(val){
@@ -299,8 +297,6 @@
 				path = "styles/images/s-avatar.png";
 			}
 		return path;
-			//return path;
-            //return XAUtil.getImgPath(id,size);
 	});
 
 	Handlebars.registerHelper('ifCond', function (v1, operator, v2, options) {
@@ -328,7 +324,6 @@
 				return options.inverse(this);     
 			break;
 		}
-		//return options.inverse(this);
 	});
 	
 	//For Example
@@ -372,13 +367,15 @@
 		if(hightlightValue == 'new'){
 			if(_.isNull(oldValue) || oldValue == '--' || oldValue == "" || _.isUndefined(oldValue)){
 				html = '<span class="add-text">'+newValue+'</span>';
-			}else
+			} else {
 				html = '<span class="">'+newValue+'</span>';
-		}else{
+			}
+		} else {
 			if(_.isNull(newValue) || newValue == '--' || newValue == ""){
 				html = '<span class="delete-text">'+oldValue+'</span>';
-			}else
+			} else {
 				html = '<span class="">'+oldValue+'</span>';
+			}
 		}
 	    return html;
 	});
@@ -387,13 +384,15 @@
 		if(hightlightValue == 'new'){
 			if(_.isNull(oldValue[prop]) || oldValue[prop] == ""){
 				html = '<span class="add-text">'+newValue+'</span>';
-			}else
+			} else {
 				html = '<span class="">'+newValue+'</span>';
-		}else{
+			}
+		} else {
 			if(_.isNull(oldValue[prop]) || oldValue[prop] == ""){
 				html = '<span class="delete-text">'+newValue+'</span>';
-			}else
+			}else{
 				html = '<span class="">'+newValue+'</span>';
+			}
 		}
 	    return html;
 	});
@@ -408,20 +407,19 @@
 			_.each(newValue, function(val) {
 				if($.inArray(val, oldValue) < 0){
 					html += '<span class="add-text">'+_.escape(val)+'</span>';
-				}else{
+				} else {
 					html += '<span>'+_.escape(val)+'</span>';
 				}
 				html+='<span>,</span>';
 			});
-		}else{
+		} else {
 			_.each(oldValue, function(val) {
 				if($.inArray(val, newValue) < 0){
 					html += '<span class="delete-text">'+_.escape(val)+'</span>';
-				}else{
+				} else {
 					html += '<span>'+_.escape(val)+'</span>';
 				}
 				html+='<span>,</span>';
-				
 			});
 		}
 	    return html;
@@ -431,7 +429,7 @@
 		if(hightlightValue == 'new'){
 			if($.inArray(val, arr) < 0)
 				html = '<span class="add-text">'+val+'</span>';
-		}else{
+		} else {
 			if($.inArray(val, arr) < 0)
 				return html = '<span class="delete-text">'+val+'</span>';
 		}
@@ -452,11 +450,11 @@
 					});
 					if(isRemoved)
 						return html = '<span class="delete-text">'+perm[type]+'</span>';
-				}else{
+				} else {
 					return html = '<span class="delete-text">'+perm[type]+'</span>';
 				}
 			}
-		}else{
+		} else {
 			if(_.isNull(perm[type]) || perm[type] != ""){
 				if(!_.isUndefined(pemList[perm.userName])){
 					var isNewAdd = true;
@@ -466,7 +464,7 @@
 					});
 					if(isNewAdd)
 						return html = '<span class="add-text">'+perm[type]+'</span>';
-				}else{
+				} else {
 					return html = '<span class="delete-text">'+perm[type]+'</span>';
 				}
 			}
@@ -475,8 +473,9 @@
 	});
 	Handlebars.registerHelper('highlightPermissionsForGroup', function(perm, newValue, pemList, hightlightValue) {
 		var type = 'permType';
-		if(_.isUndefined(perm.permType))
+		if(_.isUndefined(perm.permType)){
 			type = 'ipAddress';
+		}
 		var html = perm[type];
 		if(hightlightValue == 'old'){
 			if(_.isNull(perm[type]) || perm[type] != ""){
@@ -488,11 +487,11 @@
 					});
 					if(isRemoved)
 						return html = '<span class="delete-text">'+perm[type]+'</span>';
-				}else{
+				} else {
 					return html = '<span class="delete-text">'+perm[type]+'</span>';
 				}
 			}
-		}else{
+		} else {
 			if(_.isNull(perm[type]) || perm[type] != ""){
 				if(!_.isUndefined(pemList[perm.groupName])){
 					var isNewAdd = true;
@@ -502,8 +501,7 @@
 					});
 					if(isNewAdd)
 						return html = '<span class="add-text">'+perm[type]+'</span>';
-				}
-				else{
+				} else {
 					return html = '<span class="add-text">'+perm[type]+'</span>';
 				}
 			}
@@ -511,7 +509,7 @@
 	    return new Handlebars.SafeString(html);
 	});
 	Handlebars.registerHelper('getServices', function(services, serviceDef) {
-		var XAEnums			= require('utils/XAEnums');
+		var XAEnums		= require('utils/XAEnums');
 		var tr = '', serviceOperationDiv = '';
 		var serviceType = serviceDef.get('name');
 		if(!_.isUndefined(services[serviceType])){
@@ -540,10 +538,8 @@
 		var groupModules = _.pluck(vxPortalUser.get('groupPermissions'), 'moduleName');
 		var moduleNames =  _.union(userModules,groupModules);
 		var returnFlag = _.contains(moduleNames, tabName);
-		if (returnFlag)
-			return options.fn(this);
-		else
-			return options.inverse(this);
+		
+		return (returnFlag) ? options.fn(this) : options.inverse(this);
 	});
 
 	return HHelpers;

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/hive/HivePolicyCreate_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/hive/HivePolicyCreate_tmpl.html b/security-admin/src/main/webapp/templates/hive/HivePolicyCreate_tmpl.html
deleted file mode 100644
index 69e97d3..0000000
--- a/security-admin/src/main/webapp/templates/hive/HivePolicyCreate_tmpl.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{{!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
---}}
-{{#if editPolicy}}
-	<h4> {{tt 'h.editPolicy'}}</h4>
-{{else}}
-	<h4> {{tt 'h.createPolicy'}} </h4>
-{{/if}}	
-<div class="wrap non-collapsible ">
-<div class="alert alert-danger" data-id="policyDisabledAlert" style="display:none;">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <strong>Warning !</strong> {{tt 'msg.policyDisabledMsg'}}
-</div>
-	<div data-id="r_form"></div>
-	<div class="form-actions form-policy" class="row-fluid">
-		{{#if editPolicy}}
-			<button type="submit" data-id="save" class="btn btn-primary btn-spinner">
-				<span>Save</span>
-				<i class="icon-spinner icon-spin"></i>
-			</button>
-		{{else}}
-			<button type="submit" data-id="save" class="btn btn-primary btn-spinner">
-				<span>Add</span> 
-				<i class="icon-spinner icon-spin"></i> 
-			</button>
-			
-		{{/if}}	
-			<button type="button" data-id="cancel" class="btn btn-inverse">
-				Cancel
-			</button>
-		{{#if editPolicy}}
-			<button type="button" data-id="delete" class="btn btn-danger" ><!-- style="margin-left: 27%;" -->Delete</button>
-		{{/if}}	
-	</div>
-</div>
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/hive/HivePolicyForm_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/hive/HivePolicyForm_tmpl.html b/security-admin/src/main/webapp/templates/hive/HivePolicyForm_tmpl.html
deleted file mode 100644
index 94fa928..0000000
--- a/security-admin/src/main/webapp/templates/hive/HivePolicyForm_tmpl.html
+++ /dev/null
@@ -1,67 +0,0 @@
-{{!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
---}}
-<form class="form-horizontal">
-	<fieldset>
-		<p class="formHeader">
-			<span>Policy Details :</span> 
-		</p>
-		<div class="" data-fields="policyName" style="float:left"></div>
-		<div class="" data-editors="resourceStatus" style="float:left"></div>
-		<div class="clearfix"></div>
-		<div class="" data-fields="databases"></div>
-		<div>
-			<div class="control-group inline-block">
-				<div data-editors="resourceType" class="control-label"></div>
-				<div class="controls" data-editors="tables"></div>
-				<div class="controls" data-editors="udfs" style="display:none;"></div>
-			</div>
-			<div data-editors="isTableInclude" class="is-table-include"></div>	
-		</div>
-		
-		<!-- <div class="" data-fields="views" style="display:none"></div> -->
-		<!-- <div class="" data-editors="udfs" style="display:none;margin-left: 180px;margin-top: -29px;margin-bottom: 15px;"></div> -->
-		<div>
-			<div class="select-columns inline-block" data-fields="columns"></div>
-			<div class="is-column-include" data-editors="isColumnInclude"></div>
-		</div>	
-		<div class="" data-fields="_vAuditListToggle"></div>
-		<div class="" data-fields="isEncrypt"></div>
-	</fieldset>
-	<fieldset>
-		<p class="formHeader">
-			User and Group Permissions :
-		</p>
-		<div class="" data-customfields="groupPerms">
-			<div class="control-group">
-				<label class="control-label">{{tt 'lbl.groupPermissions'}}</label>
-				<div class="controls">
-					<img src="images/loading.gif" style=" margin-left: 4%; margin-top: 1%;" />
-				</div>
-			</div>		
-		</div>
-		<div class="" data-customfields="userPerms">
-			<div class="control-group">
-				<label class="control-label">{{tt 'lbl.userPermissions'}}</label>
-				<div class="controls">
-					<img src="images/loading.gif" style=" margin-left: 4%; margin-top: 1%;" />
-				</div>
-			</div>
-		</div>
-		<div class="" data-fields="description"></div>
-	</fieldset>
-</form>
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/hive/HiveTableLayout_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/hive/HiveTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/hive/HiveTableLayout_tmpl.html
deleted file mode 100644
index 9500c1a..0000000
--- a/security-admin/src/main/webapp/templates/hive/HiveTableLayout_tmpl.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{{!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
---}}
-<h3 class="wrap-header bold"> {{tt 'lbl.listOfPolicies'}} : {{assetModel.attributes.name}} </h3>
-<div class="wrap non-collapsible m-height ">
-	<div>
-		<div class="span9">
-			<div class="visual_search"></div>
-		</div>
-		<div class="clearfix">
-			<a href="#!/hive/{{assetId}}/policy/create" class="btn btn-primary btn-right" type="button"> {{tt 'lbl.addNewPolicy'}} </a>
-		{{#if isSysAdmin}}	
-			{{#if version}}
-				<a href="javascript:void(0);" data-js="export" class="btn btn-black btn-right">{{tt 'lbl.exports'}}</a>
-			{{/if}} 
-		{{/if}}	
-			<div data-id="r_filter" class="wrap-filter pull-left"></div>
-		</div>
-		
-		<div data-id="r_tableList" class="clickable">
-		</div>
-	</div>
-
-	<!-- <div class="span3" style="margin-top:39px">
-		<div id="policyDetail"></div>
-	</div> -->
-</div>
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/kms/KmsKeyCreate_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/kms/KmsKeyCreate_tmpl.html b/security-admin/src/main/webapp/templates/kms/KmsKeyCreate_tmpl.html
index 1249aed..2aaac43 100644
--- a/security-admin/src/main/webapp/templates/kms/KmsKeyCreate_tmpl.html
+++ b/security-admin/src/main/webapp/templates/kms/KmsKeyCreate_tmpl.html
@@ -24,7 +24,6 @@
 		<button type="button" data-id="cancel" class="btn btn-inverse">
 			Cancel
 		</button>
-		<!-- <button type="button" data-id="delete" class="btn btn-danger" >style="margin-left: 27%;"Delete</button> -->
 	</div>
 </div>
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/kms/KmsTableLayout_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/kms/KmsTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/kms/KmsTableLayout_tmpl.html
index 8437c04..8107148 100644
--- a/security-admin/src/main/webapp/templates/kms/KmsTableLayout_tmpl.html
+++ b/security-admin/src/main/webapp/templates/kms/KmsTableLayout_tmpl.html
@@ -14,14 +14,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --}}
- <!--  <ul class="nav nav-tabs tabs clearfix">
-    <li data="groups" data-js="groups"> 
-      <a data-toggle="tab" href="#groups">Zones</a> 
-    </li>
-    <li class="active" data-js="users">
-      <a data-toggle="tab" href="#users">Keys</a> 
-    </li>
-  </ul> -->
 
 <h3 class="wrap-header bold"> {{tt 'lbl.keyManagement'}} </h3>
 <div class="wrap non-collapsible m-height ">
@@ -35,7 +27,6 @@
 			<div class="visual_search"></div>
 		</div>
 		<div class="clearfix">
-			<!-- <input type="text" name="serviceName" data-js="serviceName" style="margin-top: 1px;margin-left: -17px;"> -->
 			<a href="javascript:;" class="btn btn-primary btn-right" type="button" data-id="addNewKey"> {{tt 'lbl.addNewKey'}} </a>
 			<a href="#!/group/create" class="btn btn-primary btn-right" type="button" data-id="addNewGroup" style="display:none;"> {{tt 'lbl.addNewZone'}} </a>
 		</div>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/knox/KnoxInfo_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/knox/KnoxInfo_tmpl.html b/security-admin/src/main/webapp/templates/knox/KnoxInfo_tmpl.html
deleted file mode 100644
index 09a6348..0000000
--- a/security-admin/src/main/webapp/templates/knox/KnoxInfo_tmpl.html
+++ /dev/null
@@ -1,106 +0,0 @@
-{{!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
---}}
-<div class="well well-small ">
-	<!-- <label style="color: white;padding: 5px;font-weight: 700;background: -webkit-linear-gradient(#4C89D6, #b8892d);background: -o-linear-gradient(#f7ec13, #b8892d);background: linear-gradient(#94BBEB, #2D75B8);">Policy Information</label> -->
-	<div class="fancy title" style="margin-bottom: 16px;">
-	   <span>Policy Information</span>
-	</div>
-	<div class="datagrid-stretch-wrapper newScroll" style="overflow-y: auto; height:400px"><!-- height:400px;"> -->
-		<label class="labelInverse">{{tt 'lbl.resourceInformation'}} :</label>
-		<table class="table table-bordered">
-			<tbody>
-				{{#if topologies}}
-				<tr>
-					<td>{{tt 'lbl.topologyName'}}(s)</td>
-					<td>{{{customPermString topologies 'label label-info'}}}</td>
-				</tr>
-				{{/if}}
-				{{#if services}}
-				<tr>
-					<td>{{tt 'lbl.serivceName'}}(s)</td>
-					<td> {{{customPermString services 'label label-success'}}} </td>
-				</tr>
-				{{/if}}
-			</tbody>
-		</table>
-		
-		<!-- <label class="labelInverse" >{{tt 'lbl.policyInfo'}} :</label> -->
-		<table class="table table-bordered">
-			<tbody>
-				<tr>
-					<td>{{tt 'lbl.createdBy'}}</td>
-					<td> {{owner}} </td>
-				</tr>
-				<tr>
-					<td>{{tt 'lbl.createdOn'}}</td>
-					<td>{{dateFormat createDate format="MM/DD/YYYY HH:mm:ss A"}}</td>
-				</tr>
-				<tr>
-					<td>{{tt 'lbl.updatedBy'}}</td>
-					<td> {{updatedBy}} </td>
-				</tr>
-				<tr>
-					<td>{{tt 'lbl.updatedOn'}}</td>
-					<td>{{dateFormat updateDate format="MM/DD/YYYY HH:mm:ss A"}} </td>
-				</tr>
-			</tbody>
-		</table>
-	{{#if  groupPermListArr}}	
-		<label class="labelInverse"> {{tt 'lbl.permissionGranted'}} :</label>
-		<table class="table table-bordered">
-			<thead>
-				<tr>
-					<th >{{tt 'lbl.groupName'}}</th>
-					<th >{{tt 'lbl.ipAddress'}}</th>
-					<th >{{tt 'lbl.permissions'}}</th>
-				</tr>
-			</thead>
-			<tbody>
-				{{#each groupPermListArr}}
-				<tr>
-					<td>{{./this.name}}</td>
-					<td >{{{customPermString ./this.ipAddress}}}</td>
-					<td >{{{customPermString ./this.permType}}}</td>
-				</tr>
-				{{/each}}
-			</tbody>
-		</table>
-	{{/if}}	
-	{{#if  userPermListArr}}
-	<label class="labelInverse">{{tt 'lbl.userPermissions'}} :</label>
-		<table class="table table-bordered">
-			<thead>
-				<tr>
-					<th >{{tt 'lbl.userName'}}</th>
-					<th >{{tt 'lbl.ipAddress'}}</th>
-					<th >{{tt 'lbl.permissions'}}</th>
-				</tr>
-			</thead>
-			<tbody>
-				{{#each userPermListArr}}
-				<tr>
-					<td>{{./this.name}}</td>
-					<td >{{{customPermString ./this.ipAddress}}}</td>
-					<td style="word-break: break-word;">{{{customPermString ./this.permType}}}</td>
-				</tr>
-				{{/each}}
-			</tbody>
-		</table>
-	{{/if}}	
-		<!-- <a href="javascript:void(0);" class="btn btn-primary" disabled="disabled" onclick="alert('Coming Soon..')"> Manage Folder </a> -->
-	</div>
-</div>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/knox/KnoxPolicyCreate_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/knox/KnoxPolicyCreate_tmpl.html b/security-admin/src/main/webapp/templates/knox/KnoxPolicyCreate_tmpl.html
deleted file mode 100644
index 69e97d3..0000000
--- a/security-admin/src/main/webapp/templates/knox/KnoxPolicyCreate_tmpl.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{{!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
---}}
-{{#if editPolicy}}
-	<h4> {{tt 'h.editPolicy'}}</h4>
-{{else}}
-	<h4> {{tt 'h.createPolicy'}} </h4>
-{{/if}}	
-<div class="wrap non-collapsible ">
-<div class="alert alert-danger" data-id="policyDisabledAlert" style="display:none;">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <strong>Warning !</strong> {{tt 'msg.policyDisabledMsg'}}
-</div>
-	<div data-id="r_form"></div>
-	<div class="form-actions form-policy" class="row-fluid">
-		{{#if editPolicy}}
-			<button type="submit" data-id="save" class="btn btn-primary btn-spinner">
-				<span>Save</span>
-				<i class="icon-spinner icon-spin"></i>
-			</button>
-		{{else}}
-			<button type="submit" data-id="save" class="btn btn-primary btn-spinner">
-				<span>Add</span> 
-				<i class="icon-spinner icon-spin"></i> 
-			</button>
-			
-		{{/if}}	
-			<button type="button" data-id="cancel" class="btn btn-inverse">
-				Cancel
-			</button>
-		{{#if editPolicy}}
-			<button type="button" data-id="delete" class="btn btn-danger" ><!-- style="margin-left: 27%;" -->Delete</button>
-		{{/if}}	
-	</div>
-</div>
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/knox/KnoxPolicyForm_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/knox/KnoxPolicyForm_tmpl.html b/security-admin/src/main/webapp/templates/knox/KnoxPolicyForm_tmpl.html
deleted file mode 100644
index 2e31599..0000000
--- a/security-admin/src/main/webapp/templates/knox/KnoxPolicyForm_tmpl.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{{!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
---}}
-<form class="form-horizontal">
-	<fieldset>
-		<p class="formHeader">
-			<span>Policy Details :</span> 
-		</p>
-		<div class="" data-fields="policyName" style="float:left"></div>
-		<div class="" data-editors="resourceStatus" style="float:left"></div>
-		<div class="clearfix"></div>
-		<div class="" data-fields="topologies"></div>
-		<div class="" data-fields="services"></div>
-		
-		<!-- <div class="" data-fields="views" style="display:none"></div> -->
-		<!-- <div class="" data-editors="udfs" style="display:none;margin-left: 180px;margin-top: -29px;margin-bottom: 15px;"></div> -->
-		<div class="" data-fields="_vAuditListToggle"></div>
-	</fieldset>
- 	<fieldset>
-		<p class="formHeader">
-			User and Group Permissions :
-		</p>
-		<div class="" data-customfields="groupPerms">
-			<div class="control-group">
-				<label class="control-label">{{tt 'lbl.groupPermissions'}}</label>
-				<div class="controls">
-					<img src="images/loading.gif" style=" margin-left: 4%; margin-top: 1%;" />
-				</div>
-			</div>		
-		</div>
-		<div class="" data-customfields="userPerms">
-			<div class="control-group">
-				<label class="control-label">{{tt 'lbl.userPermissions'}}</label>
-				<div class="controls">
-					<img src="images/loading.gif" style=" margin-left: 4%; margin-top: 1%;" />
-				</div>
-			</div>
-		</div>
-		<div class="" data-fields="description"></div>
-	</fieldset> 
-</form>
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/knox/KnoxTableLayout_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/knox/KnoxTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/knox/KnoxTableLayout_tmpl.html
deleted file mode 100644
index 3369522..0000000
--- a/security-admin/src/main/webapp/templates/knox/KnoxTableLayout_tmpl.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{{!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
---}}
-<h3 class="wrap-header bold"> {{tt 'lbl.listOfPolicies'}} : {{assetModel.attributes.name}} </h3>
-<div class="wrap non-collapsible m-height ">
-	<div>
-		<div class="span9">
-			<div class="visual_search"></div>
-		</div>
-		<div class="clearfix">
-			<a href="#!/knox/{{assetId}}/policy/create" class="btn btn-primary btn-right" type="button"> {{tt 'lbl.addNewPolicy'}} </a>
-		{{#if isSysAdmin}}	
-			{{#if version}}
-				<a href="javascript:void(0);" data-js="export" class="btn btn-black btn-right">{{tt 'lbl.exports'}}</a>
-			{{/if}} 
-		{{/if}}	
-			<div data-id="r_filter" class="wrap-filter pull-left"></div>
-		</div>
-		
-		<div data-id="r_tableList" class="clickable">
-		</div>
-	</div>
-
-	<!-- <div class="span3" style="margin-top:39px">
-		<div id="policyDetail"></div>
-	</div> -->
-</div>
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/license/LicenseCreate_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/license/LicenseCreate_tmpl.html b/security-admin/src/main/webapp/templates/license/LicenseCreate_tmpl.html
deleted file mode 100644
index 029b024..0000000
--- a/security-admin/src/main/webapp/templates/license/LicenseCreate_tmpl.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{{!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
---}}
-<h4 class="wrap-header bold">License Detail</h4>
-<div class="wrap non-collapsible ">
-	<!-- <div data-id="r_form"></div> -->
-		<form class="form-horizontal">
-			<div class="" data-fields="licenseKey">
-				<div class="control-group field-licenseKey">
-					<label class="control-label" for="licenseKey">Enter License
-						Key *</label>
-					<div class="controls">
-						<span data-editor="">
-							<textarea data-id="licenseKey" name="licenseKey" type="text" style=" width: 607px; height: 128px; "></textarea>
-							</span>
-						<div class="help-inline" data-error=""></div>
-						<div class="help-block"></div>
-				</div>
-			</div>
-		</form>
-					</div>
-	<div style="margin-left: 179px;">
-		<button type="button" data-id="save" class="btn btn-primary">
-			Save</button>
-		<button type="button" data-id="cancel" class="btn btn-inverse">
-			Cancel</button>
-	</div>
-	<br /> <br />
-	<p>
-		{{tt 'msg.invalidLicenseMsg'}}  
-		<a href="mailto:sales@xasecure.com">sales@xasecure.com</a>
-	</p>
-</div>
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/license/LicenseInfo_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/license/LicenseInfo_tmpl.html b/security-admin/src/main/webapp/templates/license/LicenseInfo_tmpl.html
deleted file mode 100644
index dd7e5ec..0000000
--- a/security-admin/src/main/webapp/templates/license/LicenseInfo_tmpl.html
+++ /dev/null
@@ -1,59 +0,0 @@
-{{!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
---}}
-<h3 class="wrap-header bold">License Information:</h3>
-<div class="well well-small ">
-	<!-- <label style="color: white;padding: 5px;font-weight: 700;background: -webkit-linear-gradient(#4C89D6, #b8892d);background: -o-linear-gradient(#f7ec13, #b8892d);background: linear-gradient(#94BBEB, #2D75B8);">Policy Information</label> -->
-	<div class="datagrid-stretch-wrapper " style="margin-left: 44px;margin-top: 35px;">
-		<table class="table table-bordered table-license">
-			<tbody>
-				<tr >
-					<td>License Text</td>
-					<td>
-					 
-						<a href="javascript:void(0);" data-id="editLicenseKey" title="Update" class="pull-right link-tag"><i class="icon-pencil"></i></a>
-						<p data-id="licenseKeyText">{{licenseKey}}</p>
-						<div data-id="licenseUpdate" style="display:none;">
-							<textarea data-id="licenseKeyTextarea"  type="text" style="height: 75px;width: 670px;" >
-						{{licenseKey}}	
-							</textarea>
-							<button type="submit" data-id="update" class="btn " style="margin-left: -686px;margin-top: 128px;">Update</button>
-							<button type="submit" data-id="cancel" class="btn btn-inverse" style="margin-top: 128px;">Cancel</button>
-						</div>
-					</td>
-				</tr>
-				<tr>
-					<td >License Holder Email</td>
-					<td data-id="email"> </td>
-				</tr>
-				<tr>
-					<td>License Type: </td>
-					<td data-id="type">  </td>
-				</tr>
-				<tr>
-					<td>License Start Date: </td>
-					<td data-id="startDate"> </td>
-				</tr>
-				<tr>
-					<td>License End Date: </td>
-					<td data-id="endDate"></td>
-				</tr>
-				
-			</tbody>
-		</table>
-	</div>
-</div>
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/permissions/ModulePermissionForm_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/permissions/ModulePermissionForm_tmpl.html b/security-admin/src/main/webapp/templates/permissions/ModulePermissionForm_tmpl.html
index badb615..1bf096b 100644
--- a/security-admin/src/main/webapp/templates/permissions/ModulePermissionForm_tmpl.html
+++ b/security-admin/src/main/webapp/templates/permissions/ModulePermissionForm_tmpl.html
@@ -21,9 +21,7 @@
 	<b class="policy-form">
 		<fieldset>
 			<div class="control-group field-database">
-				<!-- <div class="controls"> -->
 					<div class="" data-fields="module"></div>
-				<!-- </div> -->
 			</div>
 		</fieldset>
 	</b>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/policies/PermissionList.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/policies/PermissionList.html b/security-admin/src/main/webapp/templates/policies/PermissionList.html
index 070b908..3373230 100644
--- a/security-admin/src/main/webapp/templates/policies/PermissionList.html
+++ b/security-admin/src/main/webapp/templates/policies/PermissionList.html
@@ -35,7 +35,6 @@
 <div class="control-group">
 	<div class="controls" style="margin-top:-14px">
 		<button type="button" class="btn btn-small" data-action="addGroup" title="Add">
-			<!-- {{tt 'btn.add'}} -->
 			<i class="icon-plus"></i>
 		</button>
 	</div>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/AssetOperationDiff_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/AssetOperationDiff_tmpl.html b/security-admin/src/main/webapp/templates/reports/AssetOperationDiff_tmpl.html
index 7f0cef6..e6bd359 100644
--- a/security-admin/src/main/webapp/templates/reports/AssetOperationDiff_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/AssetOperationDiff_tmpl.html
@@ -47,7 +47,7 @@
 		</div>
 	</div>
 
-	
+	{{#if isNewConnConfig}}
 	<h5>Connection Configurations :</h5>
 	<div class="diff">
 		<div class="diff-left">
@@ -71,7 +71,7 @@
 			</ol>
 		</div>
 	</div>
-
+	{{/if}}
 {{else}}
 	<label class="no-margin label-size13-weightbold" > Deleted By  &nbsp;&nbsp;:  {{userName}}</label>
 	<h4>Service Details</h4>
@@ -104,7 +104,7 @@
 	
 	</div>
 
-	
+	{{#if isPreviousConnConfig}}
 	<h4>Connection Configurations :</h4>
 	<div class="diff">
 		<div class="diff-left">
@@ -128,6 +128,7 @@
 			</ol>
 		</div>
 	</div>
+	{{/if}}
 
 {{/compare}}
 </div>	

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/AuditLayout_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/AuditLayout_tmpl.html b/security-admin/src/main/webapp/templates/reports/AuditLayout_tmpl.html
index 9de3007..48467aa 100644
--- a/security-admin/src/main/webapp/templates/reports/AuditLayout_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/AuditLayout_tmpl.html
@@ -14,7 +14,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --}}
-<!-- <h3 class="wrap-header bold"><i class="icon-shield"></i> {{tt 'lbl.auditReport'}} </h3> -->
 <ul class="nav nav-tabs tabs clearfix">
 	<li data-js="agent" >
      <a data-toggle="tab" href="#agent">{{tt 'h.agents'}}</a> 
@@ -44,7 +43,6 @@
 			</button>
 			<span class="pull-right" data-id="lastUpdateTime"> Last Updated Time : <label data-id="lastUpdateTimeLabel" class="label label-info">{{currentDate}}</label> </span>
 		</div>
-		<!-- <div  data-id="r_auditTable" class="hdfs-table"></div> -->
 		<div  data-id="r_tableLists" class=""></div>
 	</div>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/KnoxPolicyDeleteOperationDiff_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/KnoxPolicyDeleteOperationDiff_tmpl.html b/security-admin/src/main/webapp/templates/reports/KnoxPolicyDeleteOperationDiff_tmpl.html
index 55b0a9e..31cd974 100644
--- a/security-admin/src/main/webapp/templates/reports/KnoxPolicyDeleteOperationDiff_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/KnoxPolicyDeleteOperationDiff_tmpl.html
@@ -14,7 +14,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --}}
-<!-- <label class="no-margin label-size13-weightbold">Name : {{objectName}}</label> -->
 <label class="no-margin label-size13-weightbold">Policy Name : {{policyName}}</label>
 <label class="no-margin label-size13-weightbold">Repository Type : {{repositoryType}}</label>
 <label class="no-margin label-size13-weightbold"> Date  &nbsp;&nbsp;:  {{objectCreatedDate}}</label>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/KnoxPolicyOperationDiff_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/KnoxPolicyOperationDiff_tmpl.html b/security-admin/src/main/webapp/templates/reports/KnoxPolicyOperationDiff_tmpl.html
index 30b6c60..3afe134 100644
--- a/security-admin/src/main/webapp/templates/reports/KnoxPolicyOperationDiff_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/KnoxPolicyOperationDiff_tmpl.html
@@ -15,7 +15,6 @@
   limitations under the License.
 --}}
 <div class="diff-content">
-	<!-- <label class="no-margin label-size13-weightbold">Name : {{objectName}}</label> -->
 	<label class="no-margin label-size13-weightbold">Policy Name : {{policyName}}</label>
 	<label class="no-margin label-size13-weightbold">Repository Type : {{repositoryType}}</label>
 	<label class="no-margin label-size13-weightbold"> Date  &nbsp;&nbsp;:  {{objectCreatedDate}}</label>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/KnoxPolicyUpdateOperationDiff_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/KnoxPolicyUpdateOperationDiff_tmpl.html b/security-admin/src/main/webapp/templates/reports/KnoxPolicyUpdateOperationDiff_tmpl.html
index 7e66fca..07758dd 100644
--- a/security-admin/src/main/webapp/templates/reports/KnoxPolicyUpdateOperationDiff_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/KnoxPolicyUpdateOperationDiff_tmpl.html
@@ -17,8 +17,6 @@
 <div class="diff-content">
 	<div class="row-fluid">
 		<div class="span6">
-			<!-- <label class="no-margin label-size13-weightbold">ID : {{objectId}}</label> -->
-			<!-- <label class="no-margin label-size13-weightbold">Name : {{objectName}}</label> -->
 			<label class="no-margin label-size13-weightbold">Policy Name : {{policyName}}</label>
 			<label class="no-margin label-size13-weightbold">Repository Type : {{repositoryType}}</label>
 			<label class="no-margin label-size13-weightbold"> Date  &nbsp;&nbsp;:  {{objectCreatedDate}}</label>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/LoginSessionDetail_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/LoginSessionDetail_tmpl.html b/security-admin/src/main/webapp/templates/reports/LoginSessionDetail_tmpl.html
index 376967c..ddd6e3d 100644
--- a/security-admin/src/main/webapp/templates/reports/LoginSessionDetail_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/LoginSessionDetail_tmpl.html
@@ -16,7 +16,6 @@
 --}}
 <h3 class="wrap-header bold">Session Detail:</h3>
 <div class="wrap non-collapsible">
-	<!-- <label style="color: white;padding: 5px;font-weight: 700;background: -webkit-linear-gradient(#4C89D6, #b8892d);background: -o-linear-gradient(#f7ec13, #b8892d);background: linear-gradient(#94BBEB, #2D75B8);">Policy Information</label> -->
 	<div class="datagrid-stretch-wrapper "style="margin-left: 44px; margin-top: 35px;">
 		<table class="table table-bordered table-condensed">
 	<tbody>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/PlugableServicePolicyDeleteDiff_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/PlugableServicePolicyDeleteDiff_tmpl.html b/security-admin/src/main/webapp/templates/reports/PlugableServicePolicyDeleteDiff_tmpl.html
index 0d632a4..68ab403 100644
--- a/security-admin/src/main/webapp/templates/reports/PlugableServicePolicyDeleteDiff_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/PlugableServicePolicyDeleteDiff_tmpl.html
@@ -17,7 +17,6 @@
 <div class="diff-content">
 	<b>Policy ID :&nbsp;&nbsp;</b><label class="label label-ranger"> {{objectId}}</label>
 	<label class="no-margin label-size13-weightbold">Policy Name : {{policyName}}</label>
-	<!-- <label class="no-margin label-size13-weightbold">Repository Type : {{repositoryType}}</label> -->
 	<label class="no-margin label-size13-weightbold"> Deleted Date  &nbsp;&nbsp;:  {{objectCreatedDate}}</label>
 	<label class="no-margin label-size13-weightbold" > Deleted By  &nbsp;&nbsp;:  {{objectCreatedBy}}</label>
 

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/PlugableServicePolicyUpdateDiff_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/PlugableServicePolicyUpdateDiff_tmpl.html b/security-admin/src/main/webapp/templates/reports/PlugableServicePolicyUpdateDiff_tmpl.html
index f61e91f..727c998 100644
--- a/security-admin/src/main/webapp/templates/reports/PlugableServicePolicyUpdateDiff_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/PlugableServicePolicyUpdateDiff_tmpl.html
@@ -56,7 +56,6 @@
 			<h3>New Value</h3>
 			<ol class="unstyled data">
 			{{#each collection}}
-					 <!-- <li class="change-row">{{./this.attributes.newValue}}</li> --> 
 					{{#compare ./this.attributes.newValue "eq" ''}}
 				 			<li>--</li>		
 					{{else}}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/PolicyDeleteOperationDiff_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/PolicyDeleteOperationDiff_tmpl.html b/security-admin/src/main/webapp/templates/reports/PolicyDeleteOperationDiff_tmpl.html
index 7bed784..1449b04 100644
--- a/security-admin/src/main/webapp/templates/reports/PolicyDeleteOperationDiff_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/PolicyDeleteOperationDiff_tmpl.html
@@ -14,7 +14,6 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --}}
-<!-- <label class="no-margin label-size13-weightbold">Name : {{objectName}}</label> -->
 <label class="no-margin label-size13-weightbold">Policy Name : {{policyName}}</label>
 <label class="no-margin label-size13-weightbold">Repository Type : {{repositoryType}}</label>
 <label class="no-margin label-size13-weightbold"> Date  &nbsp;&nbsp;:  {{objectCreatedDate}}</label>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/PolicyOperationDiff_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/PolicyOperationDiff_tmpl.html b/security-admin/src/main/webapp/templates/reports/PolicyOperationDiff_tmpl.html
index 05d9c77..54248f0 100644
--- a/security-admin/src/main/webapp/templates/reports/PolicyOperationDiff_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/PolicyOperationDiff_tmpl.html
@@ -15,7 +15,6 @@
   limitations under the License.
 --}}
 <div class="diff-content">
-	<!-- <label class="no-margin label-size13-weightbold">Name : {{objectName}}</label> -->
 	<label class="no-margin label-size13-weightbold">Policy Name : {{policyName}}</label>
 	<label class="no-margin label-size13-weightbold">Repository Type : {{repositoryType}}</label>
 	<label class="no-margin label-size13-weightbold"> Date  &nbsp;&nbsp;:  {{objectCreatedDate}}</label>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/PolicyUpdateOperationDiff_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/PolicyUpdateOperationDiff_tmpl.html b/security-admin/src/main/webapp/templates/reports/PolicyUpdateOperationDiff_tmpl.html
index 45c3c59..38de921 100644
--- a/security-admin/src/main/webapp/templates/reports/PolicyUpdateOperationDiff_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/PolicyUpdateOperationDiff_tmpl.html
@@ -17,7 +17,6 @@
 <div class="diff-content">
 	<div class="row-fluid">
 		<div class="span6">
-			<!-- <label class="no-margin label-size13-weightbold">Name : {{objectName}}</label> -->
 			<label class="no-margin label-size13-weightbold">Policy Name : {{policyName}}</label>
 			<label class="no-margin label-size13-weightbold">Repository Type : {{repositoryType}}</label>
 			<label class="no-margin label-size13-weightbold"> Date  &nbsp;&nbsp;:  {{objectCreatedDate}}</label>
@@ -107,7 +106,6 @@
 				{{#eachProperty newGroupPermList}}
 					<li class="change-row">
 						{{#each value}}
-							<!-- {{permType}}, -->
 							{{{highlightPermissionsForGroup ./this ../property ../../previousGroupPermList 'new'}}}
 							<span>,</span> 
 						{{/each}}
@@ -151,7 +149,6 @@
 				{{#eachProperty newUserPermList}}
 					<li class="change-row">
 						{{#each value}}
-								<!-- {{permType}}, -->
 								{{{highlightPermissionsForUser ./this ../property ../../previousUserPermList 'new'}}}
 								<span>,</span>
 						{{/each}}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html b/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html
index e12ce7f..1352882 100644
--- a/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/UserAccessLayout_tmpl.html
@@ -28,7 +28,7 @@
 						<div class="control-group">
 							<label class="control-label">Policy Name</label>
 							<div class="controls">
-								<input type="text" name="policyName" data-js="policyName" class="input-xxlarge">
+								<input type="text" name="policyName" data-js="policyName" class="input-xxlarge" autofocus="true">
 							</div>
 						</div>
 						<div class="control-group">
@@ -82,27 +82,6 @@
 		</div>
 	</div>
 
-<!-- 	<div class="clearfix">
-		<span class="pull-right">GOTO :&nbsp;&nbsp; 
-			<a href="javascript:;" class="link-tag gotoLink" data-js="gotoHive" style="margin-right: 5px;">
-				<i class=" icon-chevron-down" ></i>
-				Hive Table
-			</a>
-			<a href="javascript:;" class="link-tag gotoLink" data-js="gotoHbase">
-				<i class=" icon-chevron-down" ></i>
-				Hbase Table
-			</a>
-			<a href="javascript:;" class="link-tag gotoLink" data-js="gotoKnox">
-				<i class=" icon-chevron-down" ></i>
-				Knox Table
-			</a>
-			<a href="javascript:;" class="link-tag gotoLink" data-js="gotoStorm">
-				<i class=" icon-chevron-down" ></i>
-				Storm Table
-			</a>
-		</span>
-	</div> -->
-
 	<div class="row-fluid">
 		{{#each policyHeaderList}}
 			<h3 class="wrap-header bold reportSearchHeader" data-js="hdfsHeader"> {{capitaliseLetter this.serviceDefName}}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/reports/UserUpdateOperationDiff_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/reports/UserUpdateOperationDiff_tmpl.html b/security-admin/src/main/webapp/templates/reports/UserUpdateOperationDiff_tmpl.html
index 2bce108..0123f0c 100644
--- a/security-admin/src/main/webapp/templates/reports/UserUpdateOperationDiff_tmpl.html
+++ b/security-admin/src/main/webapp/templates/reports/UserUpdateOperationDiff_tmpl.html
@@ -90,7 +90,6 @@
 			<ol class="unstyled data">
 				<li class="change-row">
 					{{#each previousGroupList}}
-						<!-- {{this}} -->
 						{{{highlightUsersForArr ./this ../newGroupList 'old'}}}
 						<span>,</span>
 					{{/each}}
@@ -102,7 +101,6 @@
 			<ol class="unstyled data">
 				<li class="change-row">
 					{{#each newGroupList}}
-						<!-- {{this}} --> 
 						{{{highlightUsersForArr ./this ../previousGroupList 'new'}}}
 						<span>,</span>
 					{{/each}}

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/service/ConfigurationList_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/service/ConfigurationList_tmpl.html b/security-admin/src/main/webapp/templates/service/ConfigurationList_tmpl.html
index dbc0d65..3e59836 100644
--- a/security-admin/src/main/webapp/templates/service/ConfigurationList_tmpl.html
+++ b/security-admin/src/main/webapp/templates/service/ConfigurationList_tmpl.html
@@ -34,8 +34,5 @@
 		<button type="button" class="btn btn-small" data-action="addGroup" title="Add">
 			<i class="icon-plus"></i>
 		</button>
-		<!-- <button type="button" class="btn btn-small" data-action="addGroup" title="Add">
-			Add New Configuration
-		</button> -->
 	</div>
 </div>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/service/ServiceCreate_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/service/ServiceCreate_tmpl.html b/security-admin/src/main/webapp/templates/service/ServiceCreate_tmpl.html
index 587a7c6..d79028e 100644
--- a/security-admin/src/main/webapp/templates/service/ServiceCreate_tmpl.html
+++ b/security-admin/src/main/webapp/templates/service/ServiceCreate_tmpl.html
@@ -14,7 +14,7 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 --}}
-{{#if editAsset}}
+{{#if editService}}
 	<h4 class="wrap-header bold"> Edit Service  </h4>
 {{else}}
 	<h4 class="wrap-header bold"> Create Service  </h4>

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/storm/StormPolicyCreate_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/storm/StormPolicyCreate_tmpl.html b/security-admin/src/main/webapp/templates/storm/StormPolicyCreate_tmpl.html
deleted file mode 100644
index 69e97d3..0000000
--- a/security-admin/src/main/webapp/templates/storm/StormPolicyCreate_tmpl.html
+++ /dev/null
@@ -1,49 +0,0 @@
-{{!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
---}}
-{{#if editPolicy}}
-	<h4> {{tt 'h.editPolicy'}}</h4>
-{{else}}
-	<h4> {{tt 'h.createPolicy'}} </h4>
-{{/if}}	
-<div class="wrap non-collapsible ">
-<div class="alert alert-danger" data-id="policyDisabledAlert" style="display:none;">
-  <button type="button" class="close" data-dismiss="alert">&times;</button>
-  <strong>Warning !</strong> {{tt 'msg.policyDisabledMsg'}}
-</div>
-	<div data-id="r_form"></div>
-	<div class="form-actions form-policy" class="row-fluid">
-		{{#if editPolicy}}
-			<button type="submit" data-id="save" class="btn btn-primary btn-spinner">
-				<span>Save</span>
-				<i class="icon-spinner icon-spin"></i>
-			</button>
-		{{else}}
-			<button type="submit" data-id="save" class="btn btn-primary btn-spinner">
-				<span>Add</span> 
-				<i class="icon-spinner icon-spin"></i> 
-			</button>
-			
-		{{/if}}	
-			<button type="button" data-id="cancel" class="btn btn-inverse">
-				Cancel
-			</button>
-		{{#if editPolicy}}
-			<button type="button" data-id="delete" class="btn btn-danger" ><!-- style="margin-left: 27%;" -->Delete</button>
-		{{/if}}	
-	</div>
-</div>
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/storm/StormPolicyForm_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/storm/StormPolicyForm_tmpl.html b/security-admin/src/main/webapp/templates/storm/StormPolicyForm_tmpl.html
deleted file mode 100644
index 4b70327..0000000
--- a/security-admin/src/main/webapp/templates/storm/StormPolicyForm_tmpl.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{{!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
---}}
-<form class="form-horizontal">
-	<fieldset>
-		<p class="formHeader">
-			<span>Policy Details :</span> 
-		</p>
-		<div class="" data-fields="policyName" style="float:left"></div>
-		<div class="" data-editors="resourceStatus" style="float:left"></div>
-		<div class="clearfix"></div>		
-		<div class="" data-fields="topologies"></div>
-		<!-- <div class="" data-fields="services"></div> -->
-		
-		<!-- <div class="" data-fields="views" style="display:none"></div> -->
-		<!-- <div class="" data-editors="udfs" style="display:none;margin-left: 180px;margin-top: -29px;margin-bottom: 15px;"></div> -->
-		<div class="" data-fields="_vAuditListToggle"></div>
-	</fieldset>
- 	<fieldset>
-		<p class="formHeader">
-			User and Group Permissions :
-		</p>
-		<div class="" data-customfields="groupPerms">
-			<div class="control-group">
-				<label class="control-label">{{tt 'lbl.groupPermissions'}}</label>
-				<div class="controls">
-					<img src="images/loading.gif" style=" margin-left: 4%; margin-top: 1%;" />
-				</div>
-			</div>		
-		</div>
-		<div class="" data-customfields="userPerms">
-			<div class="control-group">
-				<label class="control-label">{{tt 'lbl.userPermissions'}}</label>
-				<div class="controls">
-					<img src="images/loading.gif" style=" margin-left: 4%; margin-top: 1%;" />
-				</div>
-			</div>
-		</div>
-		<div class="" data-fields="description"></div>
-	</fieldset> 
-</form>
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/storm/StormTableLayout_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/storm/StormTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/storm/StormTableLayout_tmpl.html
deleted file mode 100644
index 9e6495d..0000000
--- a/security-admin/src/main/webapp/templates/storm/StormTableLayout_tmpl.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{{!-- 
-  Licensed to the Apache Software Foundation (ASF) under one or more
-  contributor license agreements.  See the NOTICE file distributed with
-  this work for additional information regarding copyright ownership.
-  The ASF licenses this file to You under the Apache License, Version 2.0
-  (the "License"); you may not use this file except in compliance with
-  the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  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.
---}}
-<h3 class="wrap-header bold"> {{tt 'lbl.listOfPolicies'}} : {{assetModel.attributes.name}} </h3>
-<div class="wrap non-collapsible m-height ">
-	<div>
-		<div class="span9">
-			<div class="visual_search"></div>
-		</div>
-		<div class="clearfix">
-			<a href="#!/storm/{{assetId}}/policy/create" class="btn btn-primary btn-right" type="button"> {{tt 'lbl.addNewPolicy'}} </a>
-		{{#if isSysAdmin}}	
-			{{#if version}}
-				<a href="javascript:void(0);" data-js="export" class="btn btn-black btn-right">{{tt 'lbl.exports'}}</a>
-			{{/if}} 
-		{{/if}}	
-			<div data-id="r_filter" class="wrap-filter pull-left"></div>
-		</div>
-		
-		<div data-id="r_tableList" class="clickable">
-		</div>
-	</div>
-
-	<!-- <div class="span3" style="margin-top:39px">
-		<div id="policyDetail"></div>
-	</div> -->
-</div>
-

http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/082d0f28/security-admin/src/main/webapp/templates/user/UserProfileForm_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/user/UserProfileForm_tmpl.html b/security-admin/src/main/webapp/templates/user/UserProfileForm_tmpl.html
index 8ed5ac6..6dfa39b 100644
--- a/security-admin/src/main/webapp/templates/user/UserProfileForm_tmpl.html
+++ b/security-admin/src/main/webapp/templates/user/UserProfileForm_tmpl.html
@@ -15,10 +15,6 @@
   limitations under the License.
 --}}
 <form class="form-horizontal">
-	<!-- <fieldset> -->
-		<!-- <legend>
-			User Profile
-		</legend> -->
 		<div class="" data-fields="firstName"></div>
 		<div class="" data-fields="lastName"></div>
 		<div class="" data-fields="emailAddress"></div>
@@ -26,14 +22,6 @@
 		<div class="" data-fields="oldPassword"></div>
 		<div class="" data-fields="newPassword"></div>
 		<div class="" data-fields="reEnterPassword"></div>
-	<!-- </fieldset> -->
-	<!-- <fieldset>
-		<legend>
-			User and Group Permissions
-		</legend>
-		<div class="" data-customfields="groupPerms"></div>
-		<div class="" data-customfields="userPerms"></div>
-	</fieldset> -->
 </form>
 
 


Mime
View raw message