ranger-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From prad...@apache.org
Subject [01/19] ranger git commit: RANGER-2062: Update jQuery version
Date Fri, 13 Apr 2018 04:17:43 GMT
Repository: ranger
Updated Branches:
  refs/heads/master c394fa42c -> 8ea482af6


http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/login.jsp
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/login.jsp b/security-admin/src/main/webapp/login.jsp
index b8f4cb9..ecc22bf 100644
--- a/security-admin/src/main/webapp/login.jsp
+++ b/security-admin/src/main/webapp/login.jsp
@@ -32,7 +32,7 @@
 		<link href="styles/bootstrap.min.css" media="all" rel="stylesheet" type="text/css" id="bootstrap-css">
 		<link href="styles/xa.css" media="all" rel="stylesheet" type="text/css" >
 
-		<script src="libs/bower/jquery/js/jquery.js" ></script>
+                <script src="libs/bower/jquery/js/jquery-3.3.1.js" ></script>
 		
 		<script src="scripts/prelogin/XAPrelogin.js" ></script>
 

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/Init.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/Init.js b/security-admin/src/main/webapp/scripts/Init.js
index 3fdeaeb..4de6b6d 100644
--- a/security-admin/src/main/webapp/scripts/Init.js
+++ b/security-admin/src/main/webapp/scripts/Init.js
@@ -101,8 +101,8 @@
 
     paths: {
     	
-        jquery						: '../libs/bower/jquery/js/jquery.min',
-        'jquery-ui'					: '../libs/other/jquery-ui/js/jquery-ui-1.10.3.custom',
+        jquery						: '../libs/bower/jquery/js/jquery-3.3.1.min',
+        'jquery-ui'					: '../libs/other/jquery-ui/js/jquery-ui.min',
         backbone					: '../libs/bower/backbone-amd/js/backbone',
         underscore					: '../libs/bower/underscore-amd/js/underscore',
 
@@ -137,7 +137,7 @@
 
 		'jquery.cookie'				: '../libs/other/jquery-cookie/js/jquery.cookie',
         'jquery-toggles'			: '../libs/bower/jquery-toggles/js/toggles.min',
-        'tag-it'					: '../libs/bower/tag-it/js/tag-it',
+        'tag-it'					: '../libs/bower/tag-it/js/tag-it.min',
         'select2'					: '../libs/bower/select2/select2',
         'bootbox'					: '../libs/bower/bootbox/js/bootbox',
         'moment'					: '../libs/bower/moment/js/moment-with-langs.min',

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/models/RangerServiceDef.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/models/RangerServiceDef.js b/security-admin/src/main/webapp/scripts/models/RangerServiceDef.js
index 4b9a06a..9945044 100644
--- a/security-admin/src/main/webapp/scripts/models/RangerServiceDef.js
+++ b/security-admin/src/main/webapp/scripts/models/RangerServiceDef.js
@@ -108,7 +108,7 @@ define(function(require){
 						return {results : results};
 					},
 					transport : function (options) {
-						$.ajax(options).error(function(respones) {
+                                                $.ajax(options).fail(function(respones) {
 							XAUtils.defaultErrorHandler('error',respones);
 							this.success({
 								resultSize : 0

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/modules/XAOverrides.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/modules/XAOverrides.js b/security-admin/src/main/webapp/scripts/modules/XAOverrides.js
index c571a96..ecce373 100644
--- a/security-admin/src/main/webapp/scripts/modules/XAOverrides.js
+++ b/security-admin/src/main/webapp/scripts/modules/XAOverrides.js
@@ -1183,7 +1183,7 @@
 		* jQuery 1.3.0+, 
 		* jQuery Center plugin 1.0.0+ https://github.com/dreamerslab/jquery.center
 		*/
-		;(function(d,e){var a={},c=0,f,b=[function(){}];d.msg=function(){var g,k,j,l,m,i,h;j=[].shift.call(arguments);l={}.toString.call(j);m=d.extend({afterBlock:function(){},autoUnblock:true,center:{topPercentage:0.4},css:{},clickUnblock:true,content:"Please
wait...",fadeIn:200,fadeOut:300,bgPath:"",klass:"black-on-white",method:"appendTo",target:"body",timeOut:2400,z:1000},a);l==="[object
Object]"&&d.extend(m,j);i={unblock:function(){g=d("#jquery-msg-overlay").fadeOut(m.fadeOut,function(){b[m.msgID](g);g.remove();});clearTimeout(f);}};h={unblock:function(o,n){var
p=o===undefined?0:o;m.msgID=n===undefined?c:n;setTimeout(function(){i.unblock();},p);},replace:function(n){if({}.toString.call(n)!=="[object
String]"){throw"$.msg('replace'); error: second argument has to be a string";}d("#jquery-msg-content").empty().html(n).center(m.center);},overwriteGlobal:function(o,n){a[o]=n;}};c--;m.msgID=m.msgID===undefined?c:m.msgID;b[m.msgID]=m.beforeUnblock===undefined?function(){}:m.beforeUnblock;i
 f(l==="[object String]"){h[j].apply(h,arguments);}else{g=d('<div id="jquery-msg-overlay"
class="'+m.klass+'" style="position:absolute; z-index:'+m.z+"; top:0px; right:0px; left:0px;
height:"+d(e).height()+'px;"><img src="'+m.bgPath+'blank.gif" id="jquery-msg-bg" style="width:
100%; height: 100%; top: 0px; left: 0px;"/><div id="jquery-msg-content" class="jquery-msg-content"
style="position:absolute;">'+m.content+"</div></div>");g[m.method](m.target);k=d("#jquery-msg-content").center(m.center).css(m.css).hide();g.hide().fadeIn(m.fadeIn,function(){k.fadeIn("fast").children().andSelf().bind("click",function(n){n.stopPropagation();});m.afterBlock.call(h,g);m.clickUnblock&&g.bind("click",function(n){n.stopPropagation();i.unblock();});if(m.autoUnblock){f=setTimeout(i.unblock,m.timeOut);}});}return
this;};})(jQuery,document);
+                ;(function(d,e){var a={},c=0,f,b=[function(){}];d.msg=function(){var g,k,j,l,m,i,h;j=[].shift.call(arguments);l={}.toString.call(j);m=d.extend({afterBlock:function(){},autoUnblock:true,center:{topPercentage:0.4},css:{},clickUnblock:true,content:"Please
wait...",fadeIn:200,fadeOut:300,bgPath:"",klass:"black-on-white",method:"appendTo",target:"body",timeOut:2400,z:1000},a);l==="[object
Object]"&&d.extend(m,j);i={unblock:function(){g=d("#jquery-msg-overlay").fadeOut(m.fadeOut,function(){b[m.msgID](g);g.remove();});clearTimeout(f);}};h={unblock:function(o,n){var
p=o===undefined?0:o;m.msgID=n===undefined?c:n;setTimeout(function(){i.unblock();},p);},replace:function(n){if({}.toString.call(n)!=="[object
String]"){throw"$.msg('replace'); error: second argument has to be a string";}d("#jquery-msg-content").empty().html(n).center(m.center);},overwriteGlobal:function(o,n){a[o]=n;}};c--;m.msgID=m.msgID===undefined?c:m.msgID;b[m.msgID]=m.beforeUnblock===undefined?function(){}:m.b
 eforeUnblock;if(l==="[object String]"){h[j].apply(h,arguments);}else{g=d('<div id="jquery-msg-overlay"
class="'+m.klass+'" style="position:absolute; z-index:'+m.z+"; top:0px; right:0px; left:0px;
height:"+d(e).height()+'px;"><img src="'+m.bgPath+'blank.gif" id="jquery-msg-bg" style="width:
100%; height: 100%; top: 0px; left: 0px;"/><div id="jquery-msg-content" class="jquery-msg-content"
style="position:absolute;">'+m.content+"</div></div>");g[m.method](m.target);k=d("#jquery-msg-content").center(m.center).css(m.css).hide();g.hide().fadeIn(m.fadeIn,function(){k.fadeIn("fast").children().addBack().bind("click",function(n){n.stopPropagation();});m.afterBlock.call(h,g);m.clickUnblock&&g.bind("click",function(n){n.stopPropagation();i.unblock();});if(m.autoUnblock){f=setTimeout(i.unblock,m.timeOut);}});}return
this;};})(jQuery,document);
 		
 		/*
 		 * BASICS

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
index 25e45f2..66de789 100644
--- a/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
+++ b/security-admin/src/main/webapp/scripts/modules/globalize/message/en.js
@@ -342,11 +342,8 @@ define(function(require) {
                 collection                  :'Solr collection.',
                 database                    :'Hive database.',
                 entity                      :'Atlas all-entity.',
-                operation                   :'Atlas all-operation.',
                 path                        :'Name of policy resource.',
                 queue                       :'Yarn queue.',
-                taxonomy                    :'Atlas all-taxonomy.',
-                term                        :'Policy for all-term.',
                 topic                       :'Kafka topic.',
                 type                        :'Policy for all type.',
                 udf                         :'Hive udf.',
@@ -359,7 +356,16 @@ define(function(require) {
                 configProperties            : 'Config Properties',
                 userSync                    :'User Sync',
                 syncSourceInfo              :'Sync Source',
-                syncDetails                  :'Sync Details'
+                syncDetails                  :'Sync Details',
+                typeCategory                :'Atlas type category.',
+                entityType                  :'Atlas entity type.',
+                entityClassification        :'Atlas entity classification.',
+                atlasService                :'Atlas services.',
+                connector                   :'Connectivity By Sqoop.',
+                link                        :'Linker Name.',
+                job                         :'Sqoop Job Name.',
+                project                     :'Kylin Project Level.',
+                nifiResource                :'NiFi Resource Identifier.'
                         },
 			msg : {
 				deletePolicyValidationMsg : 'Policy does not have any settings for the specific resource.
Policy will be deleted. Press [Ok] to continue. Press [Cancel] to edit the policy.',

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/views/common/AddGroup.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/common/AddGroup.js b/security-admin/src/main/webapp/scripts/views/common/AddGroup.js
index 0952b89..8f9fe03 100644
--- a/security-admin/src/main/webapp/scripts/views/common/AddGroup.js
+++ b/security-admin/src/main/webapp/scripts/views/common/AddGroup.js
@@ -82,7 +82,6 @@ define(function(require){
 				var labelStr1 = this.$el.find('label').html().replace('*','');
 				this.$el.find('label').html(labelStr1);
 			}
-
 			this.$('.tags').editable({
 			    placement: 'right',
 			    emptytext : 'Please select',

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js b/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js
index 38c0177..6038895 100755
--- a/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/kms/KMSTableLayout.js
@@ -294,7 +294,7 @@ define(function(require){
 						return { results : results };
                                         },
                                         transport: function (options) {
-                                                $.ajax(options).error(function(respones)
{
+                                                $.ajax(options).fail(function(respones) {
                                                         XAUtil.defaultErrorHandler('error',respones);
                                                         this.success({
                                                                 resultSize : 0

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionForm.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionForm.js
b/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionForm.js
index 47c69de..8c3ec3d 100644
--- a/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionForm.js
+++ b/security-admin/src/main/webapp/scripts/views/permissions/ModulePermissionForm.js
@@ -186,7 +186,7 @@ define(function(require) {
 							return { results : results};
 						},
 						transport: function (options) {
-                                                        $.ajax(options).error(function(respones)
{
+                                                        $.ajax(options).fail(function(respones)
{
 								console.log("ajax failed");
                                                                 XAUtil.defaultErrorHandler('error',respones);
 								this.success({

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
index 194f6b6..0a6b16c 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/PermissionList.js
@@ -131,13 +131,13 @@ define(function(require) {
 				}
 				_.each(this.model.get('accesses'), function(p){
 					if(p.isAllowed){
-						this.$el.find('input[data-name="' + p.type + '"]').attr('checked', 'checked');
+                                                this.$el.find('input[data-name="' + p.type
+ '"]').prop('checked', true);
 						_.each(this.accessItems,function(obj){ if(obj.type == p.type) obj.isAllowed=true;})
 					}
 				},this);
 				
 				if(!_.isUndefined(this.model.get('delegateAdmin')) && this.model.get('delegateAdmin')){
-					this.ui.delegatedAdmin.attr('checked', 'checked');
+                                        this.ui.delegatedAdmin.prop('checked', true);
 				}
 				if(!_.isUndefined(this.model.get('rowFilterInfo')) && !_.isUndefined(this.model.get('rowFilterInfo').filterExpr)){
 					this.rowFilterExprVal = this.model.get('rowFilterInfo').filterExpr
@@ -228,7 +228,7 @@ define(function(require) {
 						return {results : results};
 					},
                     transport: function (options) {
-                    	$.ajax(options).error(function(respones) {
+			$.ajax(options).fail(function(respones) {
                     		XAUtil.defaultErrorHandler('error',respones);
                     		this.success({
                     			resultSize : 0
@@ -265,7 +265,9 @@ define(function(require) {
 			}
 			//if policy items not present. its skip that items and move forward
 			if(_.isObject(this.ui.addPerms)){
-				this.ui.addPerms.editable("destroy");
+                                if(changeType){
+                                    this.ui.addPerms.editable("destroy");
+                                }
 				//create x-editable for permissions
 				this.ui.addPerms.editable({
 					emptytext : 'Add Permissions',
@@ -304,10 +306,8 @@ define(function(require) {
                         that.ui.addPermissionsSpan.find('i').attr('class', 'icon-pencil');
                         that.ui.addPermissionsSpan.attr('title','edit');
 					},
-				}).on('click', function(e) {
-					e.stopPropagation();
-                    e.preventDefault();
-                    that.clickOnPermissions(that);
+                                }).on('shown', function(e, editable) {
+                                    that.clickOnPermissions(that);
 				});
 				that.ui.addPermissionsSpan.click(function(e) {
 				e.stopImmediatePropagation();
@@ -487,8 +487,8 @@ define(function(require) {
 					$(e.currentTarget).parent().find('.tag-fixed-popover-wrapper').remove()
 			}).on('click', function(e) {
 				e.stopPropagation();
-				e.preventDefault();
-				that.clickOnPermissions(that);
+//				e.preventDefault();
+//				that.clickOnPermissions(that);
 				 //Sticky popup
 				var pop = $(this).parent('td').find('.popover')
 				pop.wrap('<div class="tag-fixed-popover-wrapper"></div>');
@@ -511,7 +511,7 @@ define(function(require) {
 			var that = this, perms = [];
 			this.ui.addPerms.attr('data-type','radiolist')
 			this.ui.addPerms.attr('title','Components Permissions')
-			this.ui.delegatedAdmin.parent('td').hide();
+//			this.ui.delegatedAdmin.parent('td').hide();
 			
 			var maskingTypes = this.rangerServiceDefModel.get('dataMaskDef').maskTypes;
 			//get selected components masking types
@@ -528,14 +528,15 @@ define(function(require) {
 					maskTypeVal = $.inArray(maskTypeVal.substr(0,maskTypeVal.indexOf(":")), accessTypeSelectedComp)
>= 0 ? maskTypeVal : [];
 				}
 			}
-			//Reset Add Masking Options
-			this.ui.maskingType.editable("setValue",null);
-			this.ui.maskingType.editable("destroy");
-			that.ui.addMaskingTypeSpan.unbind( "click" );
+                        if(accessTypeSelectedComp || _.isEmpty(accessTypeSelectedComp)){
+                            this.ui.maskingType.editable("destroy");
+                        }
+                        that.ui.addMaskingTypeSpan.unbind( "click" );
 			this.$el.find('input[data-id="maskTypeCustom"]').unbind( "change" );
 			that.ui.addMaskingTypeSpan.find('i').attr('class', 'icon-plus');
 			that.ui.addMaskingTypeSpan.attr('title','add');
-			this.$el.find('input[data-id="maskTypeCustom"]').css("display","none");
+                        this.$el.find('input[data-id="maskTypeCustom"]').css("display","none");
+
 			//create x-editable for permissions
 			this.ui.maskingType.editable({
 			    emptytext : 'Add Mask Type',
@@ -547,7 +548,6 @@ define(function(require) {
 				display: function(value,srcData) {
 					if(_.isNull(value) || _.isUndefined(value) || _.isEmpty(value)){
 						$(this).empty();
-//						that.model.unset('accesses');
 						that.ui.addPermissionsSpan.find('i').attr('class', 'icon-plus');
 						that.ui.addPermissionsSpan.attr('title','add');
 						return;
@@ -571,12 +571,13 @@ define(function(require) {
 				},
 			}).on('hide',function(e){
 					$(e.currentTarget).parent().find('.tag-fixed-popover-wrapper').remove()
-			}).on('click', function(e) {
-				e.stopPropagation();
-				e.preventDefault();
-			});
+                        }).on('click', function(e) {
+                            e.stopPropagation();
+                            e.preventDefault();
+                        });
 			that.ui.addMaskingTypeSpan.click(function(e) {
 				e.stopPropagation();
+                                 e.preventDefault();
 				if(!that.accessPermSetForTagMasking){
 					XAUtil.alertPopup({ msg :localization.tt('msg.pleaseSelectAccessTypeForTagMasking')
});
 					return;
@@ -595,19 +596,20 @@ define(function(require) {
 		clickOnPermissions : function(that) {
 			var selectAll = true;
 			var checklist = that.$('.editable-checklist').find('input[type="checkbox"]')
-			
-			_.each(checklist,function(checkbox){ if($(checkbox).val() != -1 && !$(checkbox).is(':checked'))
selectAll = false;})
+            _.each(checklist,function(checkbox){
+                if($(checkbox).val() != -1 && !$(checkbox).is(':checked'))
+                    selectAll = false;
+            })
 			if(selectAll){
 				that.$('.editable-checklist').find('input[type="checkbox"][value="-1"]').prop('checked',true)
 			} else {
 				that.$('.editable-checklist').find('input[type="checkbox"][value="-1"]').prop('checked',false)
 			}
 			//for selectAll functionality
-			that.$('input[type="checkbox"][value="-1"]').click(function(e){
-				var checkboxlist =$(this).closest('.editable-checklist').find('input[type="checkbox"][value!=-1]')
-				$(this).is(':checked') ? checkboxlist.prop('checked',true) : checkboxlist.prop('checked',false);

-				
-			});
+                        that.$('input[type="checkbox"][value="-1"]').click(function(e){
+                var checkboxlist =$(this).closest('.editable-checklist').find('input[type="checkbox"][value!=-1]')
+                $(this).is(':checked') ? checkboxlist.prop('checked',true) : checkboxlist.prop('checked',false);
+            });
 			that.$('.editable-checklist input[type="checkbox"]').click(function(e){
 				if(this.value!="-1"){
 					var selectAll = true;
@@ -739,9 +741,7 @@ define(function(require) {
 			var $el = $(e.currentTarget);
 			XAUtil.checkDirtyFieldForToggle($el);
 			//Set Delegated Admin value 
-			if(!_.isUndefined($el.find('input').data('js'))){
-				this.model.set('delegateAdmin',$el.is(':checked'));
-			}
+                        this.model.set('delegateAdmin',$el.is(':checked'));
 			//select/deselect all functionality
 			if(this.checkAll($el.find('input[type="checkbox"][value!="-1"]'))){
 				$el.find('input[type="checkbox"][value="-1"]').prop('checked', true)

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/views/policies/PolicyTimeList.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/policies/PolicyTimeList.js b/security-admin/src/main/webapp/scripts/views/policies/PolicyTimeList.js
index 74b9b4d..919959c 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/PolicyTimeList.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/PolicyTimeList.js
@@ -75,9 +75,8 @@ define(function(require) {
                         closeOnSelect: true,
                         placeholder: 'Select Timezone',
                         maximumSelectionSize : 1,
-                        width: '220px',
                         allowClear: true,
-                width:180
+                        width:'180px'
               });
                 },
                 onInputStartTimeChange : function(e) {

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
index 1c3dc85..e431f0a 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyForm.js
@@ -586,7 +586,7 @@ define(function(require){
 								response();
 							}
 
-						}).error(function(){
+                                                }).fail(function(){
 							response();
 
 						});
@@ -701,7 +701,7 @@ define(function(require){
 							};
 						},
 						transport: function (options) {
-							$.ajax(options).error(function() { 
+                                                        $.ajax(options).fail(function() {
 								console.log("ajax failed");
 								this.success({
 									resultSize : 0

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js
index bd46034..a0b46fd 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyRO.js
@@ -51,7 +51,6 @@ define(function(require) {
                 policyType: policyType.label
 			};
 		},
-		breadCrumbs: [],
 
 		/** Layout sub regions */
 		regions: {

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js
b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js
index 1afd92e..25e1a8d 100644
--- a/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js
+++ b/security-admin/src/main/webapp/scripts/views/policies/RangerPolicyTableLayout.js
@@ -419,12 +419,14 @@ define(function(require){
                         var info = { collection : localization.tt('h.collection')    , column
  :localization.tt('lbl.columnName'),
                                          'column-family':localization.tt('msg.columnfamily')
, database :localization.tt('h.database'),
                                           entity        :localization.tt('h.entity') , keyname
 :localization.tt('lbl.keyName'),
-                                          operation:localization.tt('h.operation')   , path:localization.tt('h.path')
,
-                                          queue:localization.tt('h.queue')        , service:localization.tt('h.serviceNameMsg'),
-                                          table:localization.tt('lbl.tableName')   , tag
: localization.tt('h.tagsMsg'),
-                                          taxonomy:localization.tt('h.taxonomy')  ,term:
localization.tt('h.term') ,
+                                          path:localization.tt('h.path'), queue: localization.tt('h.queue'),
service:localization.tt('h.serviceNameMsg'),
+                                          table:localization.tt('lbl.tableName'), tag : localization.tt('h.tagsMsg'),
                                           topic:localization.tt('h.topic')    ,topology:localization.tt('lbl.topologyName'),
-                                          type:localization.tt('h.type')    ,udf:localization.tt('h.udf')
, url:localization.tt('h.url')
+                                          type:localization.tt('h.type')    ,udf:localization.tt('h.udf')
, url:localization.tt('h.url'),
+                                          'type-category': localization.tt('h.typeCategory'),
'entity-type': localization.tt('h.entityType'),
+                                          'entity-classification': localization.tt('h.entityClassification'),
'atlas-service': localization.tt('h.atlasService'),
+                                          connector: localization.tt('h.connector'), link:
localization.tt('h.link'), job: localization.tt('h.job'),
+                                          project: localization.tt('h.project'), 'nifi-resource':
localization.tt('h.nifiResource')
                                                  };
 			var serverRsrcAttrName = _.map(resourceSearchOpt,function(opt){ 
                                         return {

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/scripts/views/service/RangerServiceViewDetail.js
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/scripts/views/service/RangerServiceViewDetail.js
b/security-admin/src/main/webapp/scripts/views/service/RangerServiceViewDetail.js
index 3b2f67c..a169baa 100644
--- a/security-admin/src/main/webapp/scripts/views/service/RangerServiceViewDetail.js
+++ b/security-admin/src/main/webapp/scripts/views/service/RangerServiceViewDetail.js
@@ -46,7 +46,6 @@ define(function(require) {
                tagService  : (this.options.rangerService.get('tagService')) ? this.options.rangerService.get('tagService')
: false,
            }
                 },
-                breadCrumbs: [],
 
                 /**
                  * intialize a new RangerServiceDiffDetaile Layout

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/styles/xa.css
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/styles/xa.css b/security-admin/src/main/webapp/styles/xa.css
index 0ea0ac2..3869f8e 100644
--- a/security-admin/src/main/webapp/styles/xa.css
+++ b/security-admin/src/main/webapp/styles/xa.css
@@ -964,6 +964,13 @@ ul.tagit li.tagit-choice .tagit-close {
   background: #3ea211 !important;
 }
 
+.ui-state-active {
+  border: 0 !important;
+  color: #fff !important;
+  background: #3ea211 !important;
+  margin: 0 !important;
+}
+
 .ui-menu .ui-menu-item a {
   border-radius: 0 !important;
 }
@@ -2053,10 +2060,13 @@ td.subgrid-custom-cell{
 .margin-right-5{
 	margin-right: 5px !important;	
 }
-.VS-search .search_facet {
-	margin-top: 5px;
+.VS-search .VS-search-box {
+        min-height: 32px;
+}
+.VS-search .VS-icon-search {
+        margin-top: 3px;
 }
-.VS-search .VS-cancel-search-box {
+/*.VS-search .VS-cancel-search-box {
 	margin-top: 3px;
 }
 .VS-search .VS-icon-search {
@@ -2064,6 +2074,9 @@ td.subgrid-custom-cell{
 }
 .VS-search .search_facet_input_container{
 	margin-top: 1px;
+} */
+.VS-search .VS-placeholder{
+        top: 7px;
 }
 .padding-right-10{
         padding-right: 10px;

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/templates/common/AddGroup_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/common/AddGroup_tmpl.html b/security-admin/src/main/webapp/templates/common/AddGroup_tmpl.html
index af966e7..3a5d531 100644
--- a/security-admin/src/main/webapp/templates/common/AddGroup_tmpl.html
+++ b/security-admin/src/main/webapp/templates/common/AddGroup_tmpl.html
@@ -20,7 +20,7 @@
         <div class="tags" id="tags-editable-1" data-toggle="manual" data-type="select2"

             data-value="{{groupId}}" data-original-title="Enter Group Name">
         </div>
-       	<a href="#" id="tags-edit-1" data-editable="tags-editable-1" class="link-tag"
>
+	<a href="javascript:;" id="tags-edit-1" data-editable="tags-editable-1" class="link-tag"
>
        		{{#if isModelNew}}
        			<i class="icon-plus" title="Add"></i>
        		{{else}}

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html b/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html
index 1683b89..1c3cfe0 100644
--- a/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html
+++ b/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html
@@ -17,7 +17,7 @@
 <div class="nav-collapse collapse" >
 	<ul class="nav pull-right">
 		<li class="dropdown">
-			<a href="#" class="dropdown-toggle usermenu _allowNav" data-toggle="dropdown" >
<img alt="Avatar" src="images/avatar.png"> 
+                        <a href="javascript:;" class="dropdown-toggle usermenu _allowNav"
data-toggle="dropdown" > <img alt="Avatar" src="images/avatar.png">
 				<span>{{userProfile.attributes.loginId}}</span> </a>
 				
 			<ul class="dropdown-menu">

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/templates/common/downloadservicepolicy_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/common/downloadservicepolicy_tmpl.html
b/security-admin/src/main/webapp/templates/common/downloadservicepolicy_tmpl.html
index 38437fe..e608a0f 100644
--- a/security-admin/src/main/webapp/templates/common/downloadservicepolicy_tmpl.html
+++ b/security-admin/src/main/webapp/templates/common/downloadservicepolicy_tmpl.html
@@ -31,4 +31,4 @@
 	</div>
 
 </div>
-<a href="javascript:void(0)" data-id="downloadReport"></a>
\ No newline at end of file
+<a href="javascript:;" data-id="downloadReport"></a>
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/templates/policies/PermissionItem.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/policies/PermissionItem.html b/security-admin/src/main/webapp/templates/policies/PermissionItem.html
index f6ff167..d2b401d 100644
--- a/security-admin/src/main/webapp/templates/policies/PermissionItem.html
+++ b/security-admin/src/main/webapp/templates/policies/PermissionItem.html
@@ -22,19 +22,19 @@
 </td>
 {{#if policyConditions}}
 <td>	
-	<a href="#" id="policyConditions" data-type="policyConditions" data-original-title="Policy
Conditions" title="add/edit conditions"></a>
+        <a href="javascript:;" id="policyConditions" data-type="policyConditions" data-original-title="Policy
Conditions" title="add/edit conditions"></a>
 	<button type="button" class="btn btn-mini add-conditions" title="Add" style="display:
inline-block;"><i class="icon-plus"></i>
 	</button>
 </td>
 {{/if}}
 <td>	
-	<a href="#" data-js="permissions" data-type="checklist" data-title="Select permissions"
title="add/edit permissions" ></a>
+        <a href="javascript:;" data-js="permissions" data-type="checklist" data-title="Select
permissions" title="add/edit permissions" ></a>
 	<button type="button" class="btn btn-mini add-permissions" title="Add" style="display:
inline-block;"><i class="icon-plus"></i>
 	</button>
 </td>
 {{#if isMaskingPolicy}}
 <td>	
-	<a href="#" data-js="maskingType" data-type="radiolist" data-title="Select Masking Option"
title="Select Masking Option" >Add Mask Type</a>
+        <a href="javascript:;" data-js="maskingType" data-type="radiolist" data-title="Select
Masking Option" title="Select Masking Option" >Add Mask Type</a>
 	<button type="button" class="btn btn-mini add-masking-type" title="Add" style="display:
inline-block;"><i class="icon-plus"></i>
 	</button>
 	<input type="text" data-id="maskTypeCustom" value="{{dataMaskInfo.valueExpr}}" placeholder="enter
masked value or expression" style="display:none;" width="40%"/>
@@ -42,7 +42,7 @@
 {{/if}}
 {{#if isRowFilterPolicy}}
 <td>	
-	<a href="#" data-js="rowLeveFilter" data-type="text" data-title="Enter row filter expression"
title="Enter filter expression" ></a>
+        <a href="javascript:;" data-js="rowLeveFilter" data-type="text" data-title="Enter
row filter expression" title="Enter filter expression" ></a>
 	<button type="button" class="btn btn-mini add-row-filter" title="Add" style="display:
inline-block;"><i class="icon-plus"></i>
 	</button>
 </td>	

http://git-wip-us.apache.org/repos/asf/ranger/blob/8ea482af/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html
----------------------------------------------------------------------
diff --git a/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html
index 69d7c3e..d99b3b4 100644
--- a/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html
+++ b/security-admin/src/main/webapp/templates/users/UserTableLayout_tmpl.html
@@ -35,7 +35,7 @@
 			{{/isSystemAdmin}}
       {{#isSystemAdmin .}}
       <div class="btn-group btn-right">
-        <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="#">
+        <a class="btn btn-primary dropdown-toggle" data-toggle="dropdown" href="javascript:void(0);">
           {{tt 'btn.setVisibility'}}
           <span class="caret"></span>
         </a>


Mime
View raw message