http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js b/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js index 79d6187..6f7d5b9 100644 --- a/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js +++ b/security-admin/src/main/webapp/scripts/views/service/ServiceCreate.js @@ -27,11 +27,11 @@ define(function(require){ var Backbone = require('backbone'); var App = require('App'); - var XAUtil = require('utils/XAUtils'); var XAEnums = require('utils/XAEnums'); var XALinks = require('modules/XALinks'); var localization = require('utils/XALangSupport'); + var ServiceForm = require('views/service/ServiceForm'); var RangerServiceDef = require('models/RangerServiceDef'); var ServiceCreateTmpl = require('hbs!tmpl/service/ServiceCreate_tmpl'); @@ -49,10 +49,11 @@ define(function(require){ breadCrumbs :function(){ var name = this.rangerServiceDefModel.get('name') != XAEnums.ServiceType.SERVICE_TAG.label ? 'ServiceManager' : 'TagBasedServiceManager'; - if(this.model.isNew()) + if(this.model.isNew()){ return [XALinks.get(name), XALinks.get('ServiceCreate', {model:this.model})]; - else + } else { return [XALinks.get(name), XALinks.get('ServiceEdit',{model:this.model})]; + } }, /** Layout sub regions */ @@ -86,16 +87,12 @@ define(function(require){ console.log("initialized a ServiceCreate Layout"); _.extend(this, _.pick(options, 'serviceTypeId')); this.initializeServiceDef(); - /*if(! this.model.isNew()){ - this.setupModel(); - }*/ this.form = new ServiceForm({ model : this.model, rangerServiceDefModel : this.rangerServiceDefModel, template : require('hbs!tmpl/service/ServiceForm_tmpl') }); this.editService = this.model.has('id') ? true : false; - this.bindEvents(); }, initializeServiceDef : function(){ @@ -104,7 +101,6 @@ define(function(require){ cache : false, async : false }); - }, setupModel : function(){ }, @@ -120,9 +116,6 @@ define(function(require){ if(!this.editService){ this.ui.btnDelete.hide(); this.ui.btnSave.html('Add'); - } else { - - // XAUtil.preventNavigation(localization.tt('dialogMsg.preventNavRepositoryForm')); } this.rForm.show(this.form); this.rForm.$el.dirtyFields(); @@ -141,7 +134,6 @@ define(function(require){ } this.form.formValidation(); this.saveService(); - }, saveService : function(){ var that = this; @@ -170,7 +162,6 @@ define(function(require){ onDelete :function(){ var that = this; XAUtil.confirmPopup({ - //msg :localize.tt('msg.confirmDelete'), msg :'Are you sure want to delete ?', callback : function(){ XAUtil.blockUI(); @@ -186,7 +177,7 @@ define(function(require){ XAUtil.blockUI('unblock'); if ( response && response.responseJSON && response.responseJSON.msgDesc){ XAUtil.notifyError('Error', response.responseJSON.msgDesc); - }else{ + } else { XAUtil.notifyError('Error', 'Error occured while deleting service!'); } } @@ -218,7 +209,7 @@ define(function(require){ var div = '<div class="showMore connection-error-font"><br>'+msResponse.messageList[0].message.split('\n').join('<br>')+'</div>' $(e.delegateTarget).find('.modal-body').append(div) $(e.currentTarget).html('Show Less..') - }else{ + } else { $(e.delegateTarget).find('.showMore').remove(); $(e.currentTarget).html('Show More..') } @@ -228,22 +219,22 @@ define(function(require){ label: "OK", callback:function(){} }]; - }else{ + } else { popupBtnOpts = [{label: "OK", callback:function(){} }]; } var msgHtml = '<b>Connection Failed.</b></br>'+msResponse.msgDesc; bootbox.dialog(msgHtml, popupBtnOpts); - }else{ + } else { bootbox.alert("Connection Failed."); } - }else{ + } else { bootbox.alert("Connection Failed."); } - } - else + } else { bootbox.alert("Connected Successfully."); + } }, error: function (msResponse, options) { bootbox.alert("Connection Failed.");
http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js b/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js index 058a407..dcec203 100644 --- a/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js +++ b/security-admin/src/main/webapp/scripts/views/service/ServiceForm.js @@ -46,11 +46,13 @@ define(function(require){ templateData: function(){ var serviceDetail="", serviceConfig=""; _.each(this.schema, function(obj, name){ - if(!_.isUndefined(obj['class']) && obj['class'] == 'serviceConfig') - serviceConfig += name+","; - else - serviceDetail += name+","; + if(!_.isUndefined(obj['class']) && obj['class'] == 'serviceConfig'){ + serviceConfig += name+","; + } else { + serviceDetail += name+","; + } }); + return { serviceDetail : serviceDetail.slice(0,-1), serviceConfig : serviceConfig.slice(0,-1) @@ -103,7 +105,7 @@ define(function(require){ var configObj = _.findWhere(this.rangerServiceDefModel.get('configs'),{'name' : name }); if(!_.isUndefined(configObj) && configObj.type == 'bool'){ this.model.set(name, this.getStringFromBoolean(configObj, value)) - }else{ + } else { this.model.set(name, value) if(_.isUndefined(configObj)){ this.extraConfigColl.add(new Backbone.Model({'name' : name, 'value' : value})) @@ -115,11 +117,11 @@ define(function(require){ setupForm : function() { if(this.model.isNew()){ this.fields.isEnabled.editor.setValue(XAEnums.ActiveStatus.STATUS_ENABLED.value); - }else{ - //Set isEnabled Status + } else { + //Set isEnabled Status if(XAEnums.ActiveStatus.STATUS_ENABLED.value == this.model.get('isEnabled')){ this.fields.isEnabled.editor.setValue(XAEnums.ActiveStatus.STATUS_ENABLED.value); - }else{ + } else { this.fields.isEnabled.editor.setValue(XAEnums.ActiveStatus.STATUS_DISABLED.value); } } @@ -154,7 +156,7 @@ define(function(require){ if(!_.isNull(obj)){ if(obj.type == 'bool'){ config[obj.name] = that.getBooleanForConfig(obj, that.model); - }else{ + } else { config[obj.name] = _.isNull(that.model.get(obj.name)) ? "" : that.model.get(obj.name).toString(); } if(!_.isNull(obj.name)) { @@ -171,7 +173,7 @@ define(function(require){ //Set isEnabled if(parseInt(this.model.get('isEnabled')) == XAEnums.ActiveStatus.STATUS_ENABLED.value){ this.model.set('isEnabled',true); - }else{ + } else { this.model.set('isEnabled',false); } @@ -191,7 +193,7 @@ define(function(require){ var subType = cofigObj.subType.split(':'); if(subType[0].indexOf(model.get(cofigObj.name)) >= 0 ){ return true; - }else{ + } else { return false; } }, @@ -199,7 +201,7 @@ define(function(require){ var subType = configObj.subType.split(':'); if(subType[0].toLowerCase().indexOf(value) >= 0 ){ return subType[0].substr(0, subType[0].length - 4); - }else{ + } else { return subType[1].substr(0, subType[0].length - 5); } }, http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/scripts/views/service/ServiceTableLayout.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/service/ServiceTableLayout.js b/security-admin/src/main/webapp/scripts/views/service/ServiceTableLayout.js deleted file mode 100644 index 284135b..0000000 --- a/security-admin/src/main/webapp/scripts/views/service/ServiceTableLayout.js +++ /dev/null @@ -1,164 +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. - */ - - -define(function(require){ - 'use strict'; - - var Backbone = require('backbone'); - var Communicator = require('communicator'); - var App = require('App'); - var XALinks = require('modules/XALinks'); - var XAEnums = require('utils/XAEnums'); - var XAGlobals = require('utils/XAGlobals'); - var localization = require('utils/XALangSupport'); - - var XABackgrid = require('views/common/XABackgrid'); - var XATableLayout = require('views/common/XATableLayout'); - - var AssettablelayoutTmpl = require('hbs!tmpl/asset/AssetTableLayout_tmpl'); - - require('backgrid-filter'); - require('backgrid-paginator'); - require('bootbox'); - - var AssetTableLayout = Backbone.Marionette.Layout.extend( - /** @lends AssetTableLayout */ - { - _viewName : 'AssetTableLayout', - - template: AssettablelayoutTmpl, - - /* - breadCrumbs :function(){ - if(this.model.isNew()) - return [XALinks.get(''), XALinks.get('')]; - else - return [XALinks.get(''), XALinks.get('')]; - }, - */ - - /** Layout sub regions */ - regions: { - 'rTableList' : 'div[data-id="r_assettable"]' - }, - - /** ui selector cache */ - ui: {}, - - /** ui events hash */ - events: function() { - var events = {}; - //events['change ' + this.ui.input] = 'onInputChange'; - return events; - }, - - /** - * intialize a new AssetTableLayout Layout - * @constructs - */ - initialize: function(options) { - console.log("initialized a AssetTableLayout Layout"); - - _.extend(this, _.pick(options, '')); - - this.collection.extraSearchParams = { - //resourceType : XAEnums.AssetType.ASSET_HDFS.value - }; - - this.bindEvents(); - }, - - /** all events binding here */ - bindEvents : function(){ - /*this.listenTo(this.model, "change:foo", this.modelChanged, this);*/ - /*this.listenTo(communicator.vent,'someView:someEvent', this.someEventHandler, this)'*/ - }, - - /** on render callback */ - onRender: function() { - this.initializePlugins(); - this.renderTable(); - }, - - /** all post render plugin initialization */ - initializePlugins: function(){ - }, - - renderTable : function(){ - var that = this; - var TableRow = Backgrid.Row.extend({ - events: { - 'click' : 'onClick' - }, - onClick: function (e) { - if($(e.toElement).is('.icon-edit')) - return; - this.$el.parent('tbody').find('tr').removeClass('tr-active'); - this.$el.toggleClass('tr-active'); - that.rFolderInfo.show(new vFolderInfo({ - model : this.model - })); - - } - }); - - this.rTableList.show(new XATableLayout({ - columns: this.getColumns(), - collection: this.collection, - includeFilter : false, - gridOpts : { - row: TableRow, - header : XABackgrid, - emptyText : localization.tt('plcHldr.noAssets') - }, - filterOpts : { - name: ['name'], - placeholder: localization.tt('plcHldr.searchByResourcePath'), - wait: 150 - } - })); - }, - - getColumns : function(){ - var that = this; - var cols = { - name : { - label : localization.tt("lbl.resourcePath"), - placeholder : 'Resource Path', - editable:false - //cell :"uri," - /*href: function(model){ - return '#!/policy/' + model.id; - }*/ - } - - }; - return this.collection.constructor.getTableCols(cols, this.collection); - }, - - - /** on close */ - onClose: function(){ - } - - }); - - return AssetTableLayout; -}); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/scripts/views/user/UserProfile.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/user/UserProfile.js b/security-admin/src/main/webapp/scripts/views/user/UserProfile.js index 79ee687..ca0c893 100644 --- a/security-admin/src/main/webapp/scripts/views/user/UserProfile.js +++ b/security-admin/src/main/webapp/scripts/views/user/UserProfile.js @@ -28,8 +28,8 @@ define(function(require){ var XAEnums = require('utils/XAEnums'); var XALinks = require('modules/XALinks'); var localization = require('utils/XALangSupport'); + var VPasswordChange = require("models/VXPasswordChange"); - var UserProfileForm = require('views/user/UserProfileForm'); var UserprofileTmpl = require('hbs!tmpl/user/UserProfile_tmpl'); @@ -55,7 +55,6 @@ define(function(require){ /** ui events hash */ events: function() { var events = {}; - //events['change ' + this.ui.input] = 'onInputChange'; events['click '+this.ui.tab+' li a'] = 'onTabChange'; events['click ' + this.ui.saveBtn] = 'onSave'; events['click ' + this.ui.cancelBtn] = 'onCancel'; @@ -81,10 +80,6 @@ define(function(require){ /** on render callback */ onRender: function() { - /* if(!this.model.isNew()){ - this.$('[data-tab="edit-password"]').hide(); - this.$('[data-tab="edit-basic"]').hide(); - }*/ if(!_.isUndefined(this.model.get('userSource')) && this.model.get('userSource') == XAEnums.UserSource.XA_USER.value){ this.$('[data-tab="edit-password"]').hide(); this.$('[data-tab="edit-basic"]').hide(); @@ -117,7 +112,7 @@ define(function(require){ this.form.afterCommit(); if(this.showBasicFields){ this.saveUserDetail(); - }else{ + } else { this.savePasswordDetail(); } }, @@ -128,8 +123,6 @@ define(function(require){ XAUtil.notifySuccess('Success', "User profile updated successfully !!"); App.appRouter.navigate("#!/policymanager",{trigger: true}); Communicator.vent.trigger('ProfileBar:rerender'); - - //console.log("success"); }, error: function (model, response, options) { if(model.responseJSON != undefined && _.isArray(model.responseJSON.messageList)){ @@ -137,20 +130,18 @@ define(function(require){ if (model.responseJSON.msgDesc == "Validation failure"){ XAUtil.notifyError('Error', "Please try different name."); return; - } - else{ + } else { XAUtil.notifyError('Error', model.responseJSON.msgDesc); return; } } - } if ( response && response.responseJSON && response.responseJSON.msgDesc){ that.form.fields.name.setError(response.responseJSON.msgDesc); XAUtil.notifyError('Error', response.responseJSON.msgDesc); - }else + }else { XAUtil.notifyError('Error', 'Error occurred while updating user profile!!'); - //console.log("error"); + } } }); }, @@ -169,8 +160,6 @@ define(function(require){ XAUtil.notifySuccess('Success', "User profile updated successfully !!"); App.appRouter.navigate("#!/policymanager",{trigger: true}); that.clearPasswordFields(); - console.log("success"); - }, error: function (msResponse, options) { console.log("error occured during updated user profile: ",msResponse.response); @@ -180,16 +169,9 @@ define(function(require){ that.form.fields.reEnterPassword.setError(localization.tt('validationMessages.newPasswordError')); }else if(localization.tt(msResponse.responseJSON.msgDesc) == " You can not use old password. "){ that.form.fields.oldPassword.setError(localization.tt('validationMessages.oldPasswordRepeatError')); - } - else{ + } else { that.form.fields.oldPassword.setError(localization.tt('validationMessages.oldPasswordError')); - } - //that.form.fields.name.setError(response.responseJSON.msgDesc); -// XAUtil.notifyError('Error', response.responseJSON.msgDesc); - //that.form.fields.newPassword.setError(msResponse.responseJSON.msgDesc) -// that.clearPasswordFields(); - console.log("error"); } }); }, @@ -199,7 +181,6 @@ define(function(require){ this.form.fields.reEnterPassword.setValue(''); }, onCancel : function(){ -// App.appRouter.navigate("",{trigger: false}); window.history.back(); }, /** on close */ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js b/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js index b363a10..38ee737 100644 --- a/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js +++ b/security-admin/src/main/webapp/scripts/views/user/UserProfileForm.js @@ -22,7 +22,6 @@ define(function(require){ 'use strict'; var Backbone = require('backbone'); - var localization = require('utils/XALangSupport'); var XAUtil = require('utils/XAUtils'); var XAEnums = require('utils/XAEnums'); @@ -62,8 +61,6 @@ define(function(require){ /** fields for the form */ schema :function(){ - var that = this; - //var plugginAttr = this.getPlugginAttr(true); }, /** on render callback */ @@ -76,12 +73,13 @@ define(function(require){ if(this.model.has('userRoleList')){ var roleList = this.model.get('userRoleList'); if(!_.isUndefined(roleList) && roleList.length > 0){ - if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_USER.value) + if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_USER.value){ this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_USER.value); - else if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_KEY_ADMIN.value) + } else if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_KEY_ADMIN.value){ this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_KEY_ADMIN.value); - else + } else { this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_SYS_ADMIN.value); + } } } if(!_.isUndefined(this.model.get('userSource')) && this.model.get('userSource') == XAEnums.UserSource.XA_USER.value){ @@ -99,9 +97,7 @@ define(function(require){ this.fields.emailAddress.$el.hide(); this.fields.userRoleList.$el.hide(); this.fields.firstName.editor.validators.pop(); -// this.fields.lastName.editor.validators.pop(); this.fields.lastName.editor.validators = []; - // this.fields.emailAddress.editor.validators.pop(); this.fields.oldPassword.$el.show(); this.fields.newPassword.$el.show(); @@ -115,14 +111,12 @@ define(function(require){ }, formValidation : function(){ }, - afterCommit : function(){ -// this.model.unset('userRoleList'); if(this.model.get('userRoleList') == XAEnums.UserRoles.ROLE_SYS_ADMIN.value){ this.model.set('userRoleList',["ROLE_SYS_ADMIN"]); - }else if(this.model.get('userRoleList') == XAEnums.UserRoles.ROLE_USER.value){ + } else if(this.model.get('userRoleList') == XAEnums.UserRoles.ROLE_USER.value){ this.model.set('userRoleList',["ROLE_USER"]); - }else if(this.model.get('userRoleList') == XAEnums.UserRoles.ROLE_KEY_ADMIN.value){ + } else if(this.model.get('userRoleList') == XAEnums.UserRoles.ROLE_KEY_ADMIN.value){ this.model.set('userRoleList',["ROLE_KEY_ADMIN"]); } }, @@ -136,16 +130,13 @@ define(function(require){ loginId : this.model.get('id'), emailAddress :this.model.get('emailAddress'), oldPassword : that.fields.oldPassword.getValue() - //updPassword : this.model.get('newPassword'), }); this.model.changePassword(this.model.get('id'),vPasswordChange,{ wait: true, success: function () { XAUtil.notifySuccess('Success', "User profile updated successfully !!"); - console.log("success"); }, error: function (msResponse, options) { - console.log("error occured during updated user profile: "+localization.tt(msResponse.responseJSON.msgDesc)); if(!localization.tt(msResponse.responseJSON.msgDesc) == "Invalid new password"){ that.fields.oldPassword.setError(localization.tt('validationMessages.oldPasswordError')); XAUtil.notifyInfo('',localization.tt('msg.myProfileError')); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/scripts/views/users/GroupCreate.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/users/GroupCreate.js b/security-admin/src/main/webapp/scripts/views/users/GroupCreate.js index dca6b13..41678ab 100644 --- a/security-admin/src/main/webapp/scripts/views/users/GroupCreate.js +++ b/security-admin/src/main/webapp/scripts/views/users/GroupCreate.js @@ -40,10 +40,8 @@ define(function(require){ template: GroupcreateTmpl, breadCrumbs :function(){ - if(this.model.isNew()) - return [XALinks.get('Groups'),XALinks.get('GroupCreate')]; - else - return [XALinks.get('Groups'),XALinks.get('GroupEdit')]; + return this.model.isNew() ? [XALinks.get('Groups'),XALinks.get('GroupCreate')] + : [XALinks.get('Groups'),XALinks.get('GroupEdit')]; }, /** Layout sub regions */ @@ -103,7 +101,7 @@ define(function(require){ initializePlugins: function(){ }, onSave: function(){ - var that =this ; + var that = this ; var errors = this.form.commit({validate : false}); if(! _.isEmpty(errors)){ return; @@ -134,7 +132,7 @@ define(function(require){ groupList.fetch({ cache:false }).done(function(){ - var newColl;// = groupList; + var newColl; groupList.getLastPage({ cache : false, success : function(collection, response, options){ @@ -155,12 +153,14 @@ define(function(require){ error : function (model, response, options) { XAUtil.blockUI('unblock'); if ( response && response.responseJSON && response.responseJSON.msgDesc){ - if(response.responseJSON.msgDesc == "XGroup already exists") + if(response.responseJSON.msgDesc == "XGroup already exists"){ XAUtil.notifyError('Error', "Group name already exists"); - else + } else { XAUtil.notifyError('Error', response.responseJSON.msgDesc); - }else + } + }else { XAUtil.notifyError('Error', 'Error occurred while creating/updating group!'); + } } }); }, @@ -176,4 +176,4 @@ define(function(require){ }); return GroupCreate; -}); +}); \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/scripts/views/users/UserCreate.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/users/UserCreate.js b/security-admin/src/main/webapp/scripts/views/users/UserCreate.js index 817831d..b0fc105 100644 --- a/security-admin/src/main/webapp/scripts/views/users/UserCreate.js +++ b/security-admin/src/main/webapp/scripts/views/users/UserCreate.js @@ -40,10 +40,8 @@ define(function(require){ template: UserCreateTmpl, breadCrumbs :function(){ - if(this.model.isNew()) - return [XALinks.get('Users'),XALinks.get('UserCreate')]; - else - return [XALinks.get('Users'),XALinks.get('UserEdit')]; + return this.model.isNew() ? [XALinks.get('Users'),XALinks.get('UserCreate')] + : [XALinks.get('Users'),XALinks.get('UserEdit')]; }, /** Layout sub regions */ @@ -98,7 +96,6 @@ define(function(require){ if(!_.isUndefined(this.model.get('userSource')) && this.model.get('userSource') == XAEnums.UserSource.XA_USER.value){ this.$('[data-tab="edit-password"]').hide(); this.$('[data-tab="edit-basic"]').hide(); -// this.ui.btnSave.hide(); } this.renderForm(); this.rForm.$el.dirtyFields(); @@ -140,11 +137,7 @@ define(function(require){ this.form.beforeSaveUserDetail(); return; } - if(this.showBasicFields){ - this.saveUserDetail(); - }else{ - this.savePasswordDetail(); - } + this.showBasicFields ? this.saveUserDetail() : this.savePasswordDetail(); }, saveUserDetail : function(){ @@ -157,7 +150,7 @@ define(function(require){ success: function () { XAUtil.blockUI('unblock'); XAUtil.allowNavigation(); - var msg = that.editUser ? 'User updated successfully' :'User created successfully'; + var msg = that.editUser ? localization.tt('msg.userUpdatedSucc') : localization.tt('msg.userCreatedSucc'); XAUtil.notifySuccess('Success', msg); if(that.editUser){ App.appRouter.navigate("#!/users/usertab",{trigger: true}); @@ -167,9 +160,9 @@ define(function(require){ var userList = new VXUserList(); - userList.fetch({ + userList.fetch({ cache:false - }).done(function(){ + }).done(function(){ var newColl = userList; userList.getLastPage({ cache : false, @@ -195,13 +188,14 @@ define(function(require){ error : function(model,resp){ XAUtil.blockUI('unblock'); if(!_.isUndefined(resp.responseJSON) && !_.isUndefined(resp.responseJSON.msgDesc)){ - if(resp.responseJSON.msgDesc == "XUser already exists") + if(resp.responseJSON.msgDesc == "XUser already exists"){ XAUtil.notifyError('Error',"User already exists."); - else + } else { XAUtil.notifyError('Error',resp.responseJSON.msgDesc); - }else + } + }else { XAUtil.notifyError('Error', "Error occurred while creating/updating user."); - + } } }); }, @@ -219,12 +213,14 @@ define(function(require){ error : function(model,resp){ XAUtil.blockUI('unblock'); if(!_.isUndefined(resp.responseJSON) && !_.isUndefined(resp.responseJSON.msgDesc)){ - if(resp.responseJSON.msgDesc == "serverMsg.userMgrNewPassword") + if(resp.responseJSON.msgDesc == "serverMsg.userMgrNewPassword"){ XAUtil.notifyError('Error','Invalid new password'); - else + } else { XAUtil.notifyError('Error',resp.responseJSON.msgDesc); - }else + } + } else { XAUtil.notifyError('Error', "Error occurred while creating/updating user."); + } } }); }, @@ -236,8 +232,6 @@ define(function(require){ /** on close */ onClose: function(){ } - }); - return UserCreate; }); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/scripts/views/users/UserForm.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/users/UserForm.js b/security-admin/src/main/webapp/scripts/views/users/UserForm.js index 52a278d..edd87c3 100644 --- a/security-admin/src/main/webapp/scripts/views/users/UserForm.js +++ b/security-admin/src/main/webapp/scripts/views/users/UserForm.js @@ -100,10 +100,11 @@ define(function(require){ options : function(callback, editor){ var userTypes = _.filter(XAEnums.UserRoles,function(m){ - if(!SessionMgr.isKeyAdmin()) + if(!SessionMgr.isKeyAdmin()){ return m.label != 'Unknown' && m.label != 'KeyAdmin'; - else + } else { return m.label != 'Unknown' && m.label != 'Admin'; + } }); var nvPairs = XAUtils.enumToSelectPairs(userTypes); callback(nvPairs); @@ -124,12 +125,13 @@ define(function(require){ if(this.model.has('userRoleList')){ var roleList = this.model.get('userRoleList'); if(!_.isUndefined(roleList) && roleList.length > 0){ - if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_USER.value) + if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_USER.value){ this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_USER.value); - else if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_KEY_ADMIN.value) + } else if(XAEnums.UserRoles[roleList[0]].value == XAEnums.UserRoles.ROLE_KEY_ADMIN.value){ this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_KEY_ADMIN.value); - else + } else { this.fields.userRoleList.setValue(XAEnums.UserRoles.ROLE_SYS_ADMIN.value); + } } } if(!_.isUndefined(this.model.get('userSource')) && this.model.get('userSource') == XAEnums.UserSource.XA_USER.value){ @@ -147,15 +149,15 @@ define(function(require){ if(_.contains(SessionMgr.getUserProfile().get('userRoleList'),'ROLE_SYS_ADMIN') || _.contains(SessionMgr.getUserProfile().get('userRoleList'),'ROLE_KEY_ADMIN')){ this.fields.userRoleList.editor.$el.attr('disabled',false); - }else{ + } else { if(!SessionMgr.isKeyAdmin()){ this.fields.userRoleList.editor.$el.attr('disabled',true); } } - }else{ + } else { this.fields.userRoleList.editor.$el.attr('disabled',true); } - }else{ + } else { this.fields.userRoleList.editor.$el.attr('disabled',false); } //User does not allowed to change his role (it's own role) @@ -169,8 +171,9 @@ define(function(require){ that.$('[data-customfields="groupIdList"]').html(new AddGroup({ model : that.model }).render().el); - if(!that.showBasicFields) + if(!that.showBasicFields) { that.$('[data-customfields="groupIdList"]').hide(); + } }, showCustomFields : function(){ if(!this.showBasicFields){ @@ -239,8 +242,6 @@ define(function(require){ }else{ this.model.set('userRoleList',["ROLE_SYS_ADMIN"]); } -// this.model.unset('userRoleList'); - }, /** all post render plugin initialization */ initializePlugins: function(){ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js b/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js index aeb8608..d9d6e8a 100644 --- a/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js +++ b/security-admin/src/main/webapp/scripts/views/users/UserTableLayout.js @@ -87,9 +87,7 @@ define(function(require){ _.extend(this, _.pick(options, 'groupList','tab')); this.showUsers = this.tab == 'usertab' ? true : false; - this.chgFlags = []; - if(_.isUndefined(this.groupList)){ this.groupList = new VXGroupList(); } @@ -107,10 +105,11 @@ define(function(require){ /** on render callback */ onRender: function() { this.initializePlugins(); - if(this.tab == 'grouptab') + if(this.tab == 'grouptab'){ this.renderGroupTab(); - else + } else { this.renderUserTab(); + } this.addVisualSearch(); }, onTabChange : function(e){ @@ -120,8 +119,7 @@ define(function(require){ if(this.showUsers){ this.renderUserTab(); this.addVisualSearch(); - } - else{ + } else { this.renderGroupTab(); this.addVisualSearch(); } @@ -411,7 +409,6 @@ define(function(require){ select : { label : localization.tt("lbl.isVisible"), - //cell : Backgrid.SelectCell.extend({className: 'cellWidth-1'}), cell: "select-row", headerCell: "select-all", click : false, @@ -437,10 +434,12 @@ define(function(require){ if(!_.isUndefined(rawValue)){ if(rawValue == XAEnums.GroupSource.XA_PORTAL_GROUP.value) return '<span class="label label-success">'+XAEnums.GroupTypes.GROUP_INTERNAL.label+'</span>'; - else + else { return '<span class="label label-green">'+XAEnums.GroupTypes.GROUP_EXTERNAL.label+'</span>'; - }else + } + }else { return '--'; + } } }), click : false, @@ -454,12 +453,14 @@ define(function(require){ formatter: _.extend({}, Backgrid.CellFormatter.prototype, { fromRaw: function (rawValue, model) { if(!_.isUndefined(rawValue)){ - if(rawValue) + if(rawValue){ return '<span class="label label-success">'+XAEnums.VisibilityStatus.STATUS_VISIBLE.label+'</span>'; - else + } else { return '<span class="label label-green">'+XAEnums.VisibilityStatus.STATUS_HIDDEN.label+'</span>'; - }else + } + }else { return '--'; + } } }), editable:false, @@ -469,6 +470,7 @@ define(function(require){ return this.groupList.constructor.getTableCols(cols, this.groupList); }, addVisualSearch : function(){ + var that = this; var coll,placeholder; var searchOpt = [], serverAttrName = []; if(this.showUsers){ @@ -483,7 +485,7 @@ define(function(require){ {text : "User Source", label :"userSource", 'multiple' : true, 'optionsArr' : XAUtil.enumToSelectLabelValuePairs(XAEnums.UserTypes)}, {text : "User Status", label :"status", 'multiple' : true, 'optionsArr' : XAUtil.enumToSelectLabelValuePairs(XAEnums.ActiveStatus)}, ]; - }else{ + } else { placeholder = localization.tt('h.searchForYourGroup'); coll = this.groupList; searchOpt = ['Group Name','Group Source', 'Visibility'];//,'Start Date','End Date','Today']; @@ -515,7 +517,8 @@ define(function(require){ callback(XAUtil.hackForVSLabelValuePairs(XAEnums.VisibilityStatus)); break; case 'User Status': - callback(XAUtil.hackForVSLabelValuePairs(XAEnums.ActiveStatus)); +// callback(XAUtil.hackForVSLabelValuePairs(XAEnums.ActiveStatus)); + callback(that.getActiveStatusNVList()); break; /*case 'Start Date' : setTimeout(function () { XAUtil.displayDatepicker(that.ui.visualSearch, callback); }, 0); @@ -534,6 +537,13 @@ define(function(require){ }; XAUtil.addVisualSearch(searchOpt,serverAttrName, coll,pluginAttr); }, + getActiveStatusNVList : function() { + var activeStatusList = _.filter(XAEnums.ActiveStatus, function(obj){ + if(obj.label != XAEnums.ActiveStatus.STATUS_DELETED.label) + return obj; + }); + return _.map(activeStatusList, function(status) { return { 'label': status.label, 'value': status.label}; }) + }, onShowMore : function(e){ var id = $(e.currentTarget).attr('policy-group-id'); this.rTableList.$el.find('[policy-group-id="'+id+'"]').show(); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/accounts/AccountCreate_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/accounts/AccountCreate_tmpl.html b/security-admin/src/main/webapp/templates/accounts/AccountCreate_tmpl.html deleted file mode 100644 index 1fe0fce..0000000 --- a/security-admin/src/main/webapp/templates/accounts/AccountCreate_tmpl.html +++ /dev/null @@ -1,28 +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="wrap non-collapsible"> - <h4> Account Details </h4> - <div data-id="r_form"></div> - <div class="form-actions"> - <button type="submit" data-id="save" class="btn btn-primary"> - Save - </button> - <button type="button" data-id="cancel" class="btn btn-inverse"> - Cancel - </button> - </div> -</div> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/accounts/AccountDetailLayout_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/accounts/AccountDetailLayout_tmpl.html b/security-admin/src/main/webapp/templates/accounts/AccountDetailLayout_tmpl.html deleted file mode 100644 index f0e5c0f..0000000 --- a/security-admin/src/main/webapp/templates/accounts/AccountDetailLayout_tmpl.html +++ /dev/null @@ -1,88 +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="wrap non-collapsible"> - <div class="span12"> - - <legend>Account Info</legend> - <div><a id="editDetail" class="pull-right" href="#!/accounts/{{this.id}}/edit">Edit</a></div> - - - <table id="dvDispDetail" class="table table-bordered table-striped"> - <tbody> - <tr> - <td width="40%">{{tt 'lbl.customerName'}}</td> - <td>{{this.customerName}}</td> - </tr> - <tr> - <td>{{tt 'lbl.accountCode'}}</td> - <td>{{this.accountCode}}</td> - </tr> - <tr> - <td>{{tt 'lbl.accountStatus'}}</td> - {{#if_eq this.status compare='Enabled'}} - <td>{{tt 'lbl.ActiveStatus_STATUS_ENABLED'}}</td> - {{else}} - <td>{{tt 'lbl.ActiveStatus_STATUS_DISABLED'}}</td> - {{/if_eq}} - </tr> - </tbody> - </table> - - </div> -</div> - -<!-- - <fieldset> - - <form style="display:none" id="frmAddAcc" class="form-horizontal"> - <label class="infoMsg">Fields marked as * are mandatory</label> - <div class="control-group"> - <label class="control-label">Account Name *</label> - <div class="controls"> - <input class="validate[required]" id="inpCustName" type="text"> - </div> - </div> - <div class="control-group"> - <label class="control-label">Account Status *</label> - <div class="controls"> - select class="validate[required]" id="selActStatus" name="" id=""> - <option value="">Select</option> - - <option value="1">Enabled</option> - - <option value="0">Disabled</option> - - </select - <span>Enable </span> - <input id="enabled" type="radio" class="validate[required]" name="status" title="Enabled" checked="checked"> - <span>Disable </span> - <input id="disabled" type="radio" class="validate[required]" name="status" title="Disabled"> - </div> - </div> - <div class="control-group"> - <label class="control-label">Support Corporate Authentication</label> - <div class="controls"> - <input id="chkMail" type="checkbox"> - </div> - </div> - <div class="form-actions"> - <button id="btnSaveAcc" type="button" class="btn ">Save Account</button> - <button id="btnCancel" type="button" class="btn">Cancel</button> - </div> - </form> - </fieldset> - --> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/accounts/AccountForm_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/accounts/AccountForm_tmpl.html b/security-admin/src/main/webapp/templates/accounts/AccountForm_tmpl.html deleted file mode 100644 index 0a0e560..0000000 --- a/security-admin/src/main/webapp/templates/accounts/AccountForm_tmpl.html +++ /dev/null @@ -1,23 +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" > - <div class="" data-fields="customerName"></div> - <div class="" data-fields="accountStatus"></div> - <div class="" data-fields="accountCode"></div> -</form> - - http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/accounts/AccountTableLayout_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/accounts/AccountTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/accounts/AccountTableLayout_tmpl.html deleted file mode 100644 index 4d4d14e..0000000 --- a/security-admin/src/main/webapp/templates/accounts/AccountTableLayout_tmpl.html +++ /dev/null @@ -1,31 +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"> Manage Accounts </h3> -<div class="wrap non-collapsible"> - <div class="span12"> - <div class="clearfix"> - <a href="#!/accounts/create" class="btn btn-primary pull-right btn-right" type="button"> Add New Account </a> - </div> - - <div data-id="r_tableList"> - No Records! - </div> - <div data-id="r_pagination" class="text-center"></div> - - </div> -</div> - http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/asset/AssetCreate_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/asset/AssetCreate_tmpl.html b/security-admin/src/main/webapp/templates/asset/AssetCreate_tmpl.html deleted file mode 100644 index 43b7f24..0000000 --- a/security-admin/src/main/webapp/templates/asset/AssetCreate_tmpl.html +++ /dev/null @@ -1,36 +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 editAsset}} - <h4 class="wrap-header bold"> Edit Repository </h4> -{{else}} - <h4 class="wrap-header bold"> Create Repository </h4> -{{/if}} -<div class="wrap non-collapsible "> - <div data-id="r_form"></div> - <div class="form-actions form-asset" class="row-fluid"> - <button type="submit" data-id="save" class="btn btn-primary"> - Save - </button> - <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/018644b9/security-admin/src/main/webapp/templates/asset/AssetForm_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/asset/AssetForm_tmpl.html b/security-admin/src/main/webapp/templates/asset/AssetForm_tmpl.html deleted file mode 100644 index 3e24abc..0000000 --- a/security-admin/src/main/webapp/templates/asset/AssetForm_tmpl.html +++ /dev/null @@ -1,69 +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 class="configProp"> - <p class="formHeader"> - {{tt 'lbl.repositoryDetails'}} : - </p> - <div class="" data-fields="name"></div> - <div class="" data-fields="description"></div> - <div class="" data-fields="activeStatus"></div> - <div class="" data-fields="assetType"></div> - </fieldset> - <fieldset class="configProp"> - <p class="formHeader"> - Config Properties : - </p> - <!-- div class="" data-fields="_vPassword"></div--> - <div class="" data-fields="userName"></div> - <div class="" data-fields="passwordKeytabfile"></div> - <div class="" data-fields="fsDefaultName"></div> - <div class="" data-fields="authorization"></div> - <div class="" data-fields="authentication"></div> - <div class="" data-fields="auth_to_local"></div> - <div class="" data-fields="datanode"></div> - <div class="" data-fields="namenode"></div> - <div class="" data-fields="secNamenode"></div> - <div class="" data-fields="hadoopRpcProtection"></div> - <div class="" data-fields="driverClassName"></div> - <div class="" data-fields="url"></div> - <div class="" data-fields="masterKerberos"></div> - <div class="" data-fields="rpcEngine"></div> - <div class="" data-fields="rpcProtection"></div> - <div class="" data-fields="securityAuthentication"></div> - <div class="" data-fields="zookeeperProperty"></div> - <div class="" data-fields="zookeeperQuorum"></div> - <div class="" data-fields="zookeeperZnodeParent"></div> - <div class="" data-fields="knoxUrl"></div> - <div class="" data-fields="nimbusUrl"></div> - <div class="" data-fields="commonnameforcertificate"></div> - <!-- div class="" data-fields="pair"></div--> - </fieldset> - <div> - <div class="control-group field-username hdfs hive knox storm" style="display: block;"> - <label class="control-label" for="c12_username"></label> - <div class="controls"> - <span data-editor=""> - <input data-id="testConn" type="button" value="Test Connection" class="btn" /> - </span> - - </div> - </div> - </div> - -</form> - http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/asset/AssetTableLayout_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/asset/AssetTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/asset/AssetTableLayout_tmpl.html deleted file mode 100644 index 4769039..0000000 --- a/security-admin/src/main/webapp/templates/asset/AssetTableLayout_tmpl.html +++ /dev/null @@ -1,29 +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'}} : {{tt 'h.hdfs'}} </h3> -<div class="wrap non-collapsible m-height"> - <div class="span12"> - <div class="clearfix"> - <a href="#!/policy/create" class="btn btn-primary btn-right" type="button"> {{tt 'lbl.addNewAsset'}} </a> - <div data-id="r_filter" class="pull-left wrap-filter"></div> - </div> - - <div data-id="r_assettable" class="hdfs-table"></div> - </div> - -</div> - http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/common/Footer_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/common/Footer_tmpl.html b/security-admin/src/main/webapp/templates/common/Footer_tmpl.html index 253202c..e3accb6 100644 --- a/security-admin/src/main/webapp/templates/common/Footer_tmpl.html +++ b/security-admin/src/main/webapp/templates/common/Footer_tmpl.html @@ -23,20 +23,6 @@ </div> <div class="pull-right"> <ul class="nav nav-footer"> - <!-- <li class="active"> - <a href="http://xasecure.com";>About</a> - </li> - - <li> - <a href="http://xasecure.com";>Contact</a> - </li> - - <li> - <a href="http://xasecure.com"; >Privacy</a> - </li> - <li> - <a href="http://xasecure.com";>Blog</a> - </li> --> </ul> </div> </div> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/common/PolicyManagerLayout_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/common/PolicyManagerLayout_tmpl.html b/security-admin/src/main/webapp/templates/common/PolicyManagerLayout_tmpl.html deleted file mode 100644 index b4f242b..0000000 --- a/security-admin/src/main/webapp/templates/common/PolicyManagerLayout_tmpl.html +++ /dev/null @@ -1,274 +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 'h.repositoryManager'}}</h3> - -<div class="wrap non-collapsible policy-manager"> - <div class="row-fluid"> - <div class="span4"> - <div class="position-relative"> - <table class="table table-bordered table-striped"> - <!-- table-policy --> - <thead> - <tr> - <th> - <span class="policy-title"> - <img alt="HDFS" src="images/folder-grey.png"> - HDFS - {{#if isSysAdmin}} - <a href="{{assetCreateHref}}/{{hdfsVal}}"class="pull-right" title="Add"> <i class="icon-plus"></i></a> - {{/if}} - </span> - </th> - </tr> - </thead> - <tbody> - {{#unless hdfsList}} - <tr> - <td>No Repositories! - </td> - </tr> - {{/unless}} - {{#each hdfsList}} - - <tr> - <td> - <div> - <a data-id="{{./this.id}}" href="#!/hdfs/{{./this.id}}/policies">{{./this.attributes.name}}</a> - {{#if ../isSysAdmin}} - <div class="pull-right"> - <a data-id="{{./this.id}}" class="btn btn-mini" - href="#!/asset/{{./this.id}}" title="Edit"><i - class="icon-edit"></i></a> <a data-id="{{./this.id}}" - class="deleteRep btn btn-mini btn-danger" - href="javascript:void(0);" title="Delete"><i - class="icon-trash"></i></a> - </div> - {{/if}} - </div> - </td> - </tr> - {{/each}} - </tbody> - </table> - - <div data-id="r_tableSpinner" class="loading"> - </div> - </div> - </div> - <div class="span4"> - <div class="position-relative"> - <table class="table table-bordered table-striped"> - <!-- table-policy --> - <thead> - <tr> - <th> - <span class="policy-title"> - <img alt="Hive" src="images/data-grey.png" > - Hive - {{#if isSysAdmin}} - <a href="{{assetCreateHref}}/{{hiveVal}}" class="pull-right" title="Add"><i class="icon-plus"></i></a> - {{/if}} - </span> - </th> - </tr> - </thead> - <tbody> - {{#unless hiveList}} - <tr> - <td>No Repositories! - </td> - </tr> - {{/unless}} - {{#each hiveList}} - <tr> - <td> - <div> - <a data-id="{{./this.id}}" href="#!/hive/{{./this.id}}/policies">{{./this.attributes.name}}</a> - {{#if ../isSysAdmin}} - <div class="pull-right"> - <a data-id="{{./this.id}}" class="btn btn-mini" - href="#!/asset/{{./this.id}}" title="Edit"><i - class="icon-edit"></i></a> <a data-id="{{./this.id}}" - class="deleteRep btn btn-mini btn-danger" - href="javascript:void(0);" title="Delete"><i - class="icon-trash"></i></a> - </div> - {{/if}} - </div> - </td> - </tr> - {{/each}} - - </tbody> - </table> - <div data-id="r_tableSpinner" class="loading"> - </div> - </div> - </div> - <div class="span4"> - <div class="position-relative"> - <table class="table table-bordered table-striped"> - <!-- table-policy --> - <thead> - <tr> - <th> - <span class="policy-title"> - <img alt="HBase" src="images/data-grey.png" > - Hbase - {{#if isSysAdmin}} - <a href="{{assetCreateHref}}/{{hbaseVal}}" class="pull-right" title="Add"><i class="icon-plus"></i></a> - {{/if}} - </span> - </th> - </tr> - </thead> - <tbody> - {{#unless hbaseList}} - <tr> - <td>No Repositories! - </td> - </tr> - {{/unless}} - {{#each hbaseList}} - <tr> - <td> - <div> - - <a data-id="{{./this.id}}" href="#!/hbase/{{./this.id}}/policies">{{./this.attributes.name}}</a> - {{#if ../isSysAdmin}} - <div class="pull-right"> - <a data-id="{{./this.id}}" class="btn btn-mini" - href="#!/asset/{{./this.id}}" title="Edit"><i - class="icon-edit"></i></a> <a data-id="{{./this.id}}" - class="deleteRep btn btn-mini btn-danger" - href="javascript:void(0);" title="Delete"><i - class="icon-trash"></i></a> - </div> - {{/if}} - </div> - </td> - </tr> - {{/each}} - </tbody> - </table> - <div data-id="r_tableSpinner" class="loading"> - </div> - </div> - </div> - </div> - <div class="row-fluid"> - <div class="span4"> - <div class="position-relative"> - <table class="table table-bordered table-striped"> - <!-- table-policy --> - <thead> - <tr> - <th> - <span class="policy-title"> - <img alt="KNOX" src="images/router-grey.png" > - Knox - {{#if isSysAdmin}} - <a href="{{assetCreateHref}}/{{knoxVal}}" class="pull-right" title="Add"> <i class="icon-plus"></i></a> - {{/if}} - </span> - </th> - </tr> - </thead> - <tbody> - {{#unless knoxList}} - <tr> - <td>No Repositories! - </td> - </tr> - {{/unless}} - {{#each knoxList}} - - <tr> - <td> - <div> - <a data-id="{{./this.id}}" href="#!/knox/{{./this.id}}/policies">{{./this.attributes.name}}</a> - {{#if ../isSysAdmin}} - <div class="pull-right"> - <a data-id="{{./this.id}}" class="btn btn-mini" - href="#!/asset/{{./this.id}}" title="Edit"><i - class="icon-edit"></i></a> <a data-id="{{./this.id}}" - class="deleteRep btn btn-mini btn-danger" - href="javascript:void(0);" title="Delete"><i - class="icon-trash"></i></a> - </div> - {{/if}} - </div> - </td> - </tr> - {{/each}} - </tbody> - </table> - <div data-id="r_tableSpinner" class="loading"> - </div> - </div> - </div> - <div class="span4"> - <div class="position-relative"> - <table class="table table-bordered table-striped"> - <!-- table-policy --> - <thead> - <tr> - <th> - <span class="policy-title"> - <img alt="STORM" src="images/task-grey.png" > - Storm - {{#if isSysAdmin}} - <a href="{{assetCreateHref}}/{{stormVal}}" class="pull-right" title="Add"> <i class="icon-plus"></i></a> - {{/if}} - </th> - </tr> - </thead> - <tbody> - {{#unless stormList}} - <tr> - <td>No Repositories! - </td> - </tr> - {{/unless}} - {{#each stormList}} - - <tr> - <td> - <div> - <a data-id="{{./this.id}}" href="#!/storm/{{./this.id}}/policies">{{./this.attributes.name}}</a> - {{#if ../isSysAdmin}} - <div class="pull-right"> - <a data-id="{{./this.id}}" class="btn btn-mini" - href="#!/asset/{{./this.id}}" title="Edit"><i - class="icon-edit"></i></a> <a data-id="{{./this.id}}" - class="deleteRep btn btn-mini btn-danger" - href="javascript:void(0);" title="Delete"><i - class="icon-trash"></i></a> - </div> - {{/if}} - </div> - </td> - </tr> - {{/each}} - </tbody> - </table> - <div data-id="r_tableSpinner" class="loading"> - </div> - </div> - </div> - </div> - </div> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/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 f124a12..1683b89 100644 --- a/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html +++ b/security-admin/src/main/webapp/templates/common/ProfileBar_tmpl.html @@ -18,53 +18,16 @@ <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"> - <!-- <span>{{userProfile.attributes.firstName}} {{userProfile.attributes.lastName}}</span> </a> --> <span>{{userProfile.attributes.loginId}}</span> </a> <ul class="dropdown-menu"> <li> <a href="#!/userprofile" > <i class="icon-male"></i>Profile </a> </li> - <!-- <li> - <a href="#"> <i class="icon-cogs"></i>Settings </a> - </li> --> - <!-- <li class="divider"></li> --> - <!-- <li> - <a href="#">Sign In</a> - </li> --> <li> <a href="javascript:;" class="_allowNav" data-id="logout"> <i class="icon-off"></i>Log Out </a> </li> </ul> </li> </ul> -<!-- <ul class="nav pull-right ul-db" title="Select Repository"> - - <li class="dropdown"> - <a href="#" class="dropdown-toggle" data-toggle="dropdown">Repository <i class=" icon-caret-down"></i></a> - <ul class="dropdown-menu"> - <li class="nav-header"> - HBase - </li> - <li> - <a href="#">Demo Table 1</a> - </li> - <li> - <a href="#">Demo Table 2</a> - </li> - - <li class="divider"></li> - <li class="nav-header"> - HDFS - </li> - <li> - <a href="#">Test Folder 1</a> - </li> - <li> - <a href="#">Test Folder 2</a> - </li> - </ul> - </li> - <li class="divider-vertical"></li> - </ul> --> </div> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html b/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html index a5bc392..d2ff968 100644 --- a/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html +++ b/security-admin/src/main/webapp/templates/common/TopNav_tmpl.html @@ -42,7 +42,6 @@ {{#hasAccessToTab 'Key Manager'}} <li><a href="#!/kms/keys/new/manage/service"><i class="icon-key"></i>Key Manager </a></li> {{/hasAccessToTab}} - <!-- <li><a href="#">Encryption Policies</a></li> --> </ul> </li> <li class="dropdown"> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/common/UserPermissionList.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/common/UserPermissionList.html b/security-admin/src/main/webapp/templates/common/UserPermissionList.html index 797ae21..e7fee52 100644 --- a/security-admin/src/main/webapp/templates/common/UserPermissionList.html +++ b/security-admin/src/main/webapp/templates/common/UserPermissionList.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="addUser" title="Add"> - <!-- {{tt 'btn.add'}} --> <i class="icon-plus"></i> </button> </div> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/common/breadcrumbs.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/common/breadcrumbs.html b/security-admin/src/main/webapp/templates/common/breadcrumbs.html index 26d5116..8de0ad3 100644 --- a/security-admin/src/main/webapp/templates/common/breadcrumbs.html +++ b/security-admin/src/main/webapp/templates/common/breadcrumbs.html @@ -20,22 +20,6 @@ } }} -<!-- <ul class="breadcrumb-flat"> - {{#each breadcrumb}} - {{#if this.isLast}} - <li> - a href="javascript:;" style="cursor:default; text-decoration: none;color: none;">{{tt this.text}}</a<i class="{{this.iconClass}}"></i>{{tt this.text}} - </li> - li><i class="{{this.iconClass}}"></i><a href="{{this.href}}">{{tt this.text}}</a></li - {{else}} - <li> - <a href="{{this.href}}"> {{tt this.text}} </a> - </li> - {{/if}} - {{/each}} -</ul> - --> - <ul class="breadcrumb-flat"> {{#each breadcrumb}} <li> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/common/formInputItem.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/common/formInputItem.html b/security-admin/src/main/webapp/templates/common/formInputItem.html deleted file mode 100644 index b9e4b82..0000000 --- a/security-admin/src/main/webapp/templates/common/formInputItem.html +++ /dev/null @@ -1,54 +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. ---}} -<td> - <input type="text" data-js="selectGroups" /> -</td> - -{{#if policyKnox}} -<td> - <input type="text" data-js="ipAddress" placeholder="Enter IP address"/> -</td> -{{/if}} - -{{#if policyStorm}} -<td> - <span class="tags" id="tags-editable-1" data-toggle="manual" data-type="checklist" - data-value="{{stormPerms}}" data-original-title="Select Actions"> - </span> - <a href="#" id="tags-edit-1" data-editable="tags-editable-1" class="" style="margin-left:10px;"> - {{#if isModelNew}} - <i class="icon-plus" title="Add"></i> - {{else}} - <i class="icon-pencil" title="Edit"></i> - {{/if}} - </a> -</td> -{{/if}} -{{#each permissions}} - <td style="cursor:pointer;"> - <input data-id="{{./this.value}}" type="checkbox"> - </td> -{{/each}} - - - -<td> - <button type="button" class="btn btn-small btn-danger " data-action="delete"> - <i class="icon-remove"></i> - </button> -</td> - http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/common/formInputItemList.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/common/formInputItemList.html b/security-admin/src/main/webapp/templates/common/formInputItemList.html deleted file mode 100644 index ff40e5b..0000000 --- a/security-admin/src/main/webapp/templates/common/formInputItemList.html +++ /dev/null @@ -1,42 +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="control-group"> - <label class="control-label">{{tt 'lbl.groupPermissions'}}</label> - <div class="controls"> - <table class="table-permission table-condensed"> - <thead> - <tr> - {{#each permHeaders}} - <th>{{./this}}</th> - {{/each}} - - </tr> - </thead> - <tbody class="js-formInput"> - - </tbody> - </table> - </div> -</div> -<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> -</div> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/folders/FolderInfo_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/folders/FolderInfo_tmpl.html b/security-admin/src/main/webapp/templates/folders/FolderInfo_tmpl.html deleted file mode 100644 index 741623f..0000000 --- a/security-admin/src/main/webapp/templates/folders/FolderInfo_tmpl.html +++ /dev/null @@ -1,134 +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;"> --> - {{#if hdfsModel}} - <label class="labelInverse">{{tt 'lbl.resourceInformation'}} :</label> - <table class="table table-bordered"> - <tbody> - {{#if name}} - <tr> - <td>{{tt 'lbl.resourcePath'}}(s)</td> - <td> {{{customPermString name }}} </td> - </tr> - {{/if}} - </tbody> - </table> - {{/if}} - {{#if hiveOrHbaseModel}} - <label class="labelInverse">{{tt 'lbl.resourceInformation'}} :</label> - <table class="table table-bordered"> - <tbody> - {{#if databases}} - <tr> - <td>{{tt 'lbl.database'}}(s)</td> - <td>{{{customPermString databases 'label label-info'}}}</td> - </tr> - {{/if}} - {{#if tables}} - <tr> - <td>{{tt 'lbl.table'}}(s)</td> - <td> {{{customPermString tables 'label label-success'}}} </td> - </tr> - {{/if}} - {{#if columnFamilies}} - <tr> - <td>{{tt 'lbl.columnFamilies'}}(s)</td> - <td> {{{customPermString columnFamilies 'label label-info'}}} </td> - </tr> - {{/if}} - {{#if columns}} - <tr> - <td>{{tt 'lbl.column'}}(s)</td> - <td> {{{customPermString columns 'label label-yellow'}}} </td> - </tr> - {{/if}} - {{#if udfs}} - <tr> - <td>{{tt 'lbl.udf'}}(s)</td> - <td> {{{customPermString udfs 'label label-success'}}} </td> - </tr> - {{/if}} - </tbody> - </table> - {{/if}} - <!-- <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.permissions'}}</th> - </tr> - </thead> - <tbody> - {{#each groupPermListArr}} - <tr> - <td>{{./this.name}}</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.permissions'}}</th> - </tr> - </thead> - <tbody> - {{#each userPermListArr}} - <tr> - <td>{{./this.name}}</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/018644b9/security-admin/src/main/webapp/templates/hbase/HbasePolicyCreate_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/hbase/HbasePolicyCreate_tmpl.html b/security-admin/src/main/webapp/templates/hbase/HbasePolicyCreate_tmpl.html deleted file mode 100644 index 954f3f5..0000000 --- a/security-admin/src/main/webapp/templates/hbase/HbasePolicyCreate_tmpl.html +++ /dev/null @@ -1,48 +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">×</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/018644b9/security-admin/src/main/webapp/templates/hbase/HbasePolicyForm_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/hbase/HbasePolicyForm_tmpl.html b/security-admin/src/main/webapp/templates/hbase/HbasePolicyForm_tmpl.html deleted file mode 100644 index fdd5f47..0000000 --- a/security-admin/src/main/webapp/templates/hbase/HbasePolicyForm_tmpl.html +++ /dev/null @@ -1,56 +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"> - Policy Details : - </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="tables"></div> - <div class="" data-fields="columnFamilies"></div> - <div class="" data-fields="columns"></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/018644b9/security-admin/src/main/webapp/templates/hbase/HbaseTableLayout_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/hbase/HbaseTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/hbase/HbaseTableLayout_tmpl.html deleted file mode 100644 index 109b9d2..0000000 --- a/security-admin/src/main/webapp/templates/hbase/HbaseTableLayout_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="#!/hbase/{{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/018644b9/security-admin/src/main/webapp/templates/hdfs/HDFSTableLayout_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/hdfs/HDFSTableLayout_tmpl.html b/security-admin/src/main/webapp/templates/hdfs/HDFSTableLayout_tmpl.html deleted file mode 100644 index a0b2780..0000000 --- a/security-admin/src/main/webapp/templates/hdfs/HDFSTableLayout_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="#!/policy/{{assetId}}/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="pull-left wrap-filter"></div> - </div> - - <div data-id="r_hdfstable" class="hdfs-table clickable"></div> - </div> - - <!-- <div class="span3" style="margin-top:39px"> - <div id="folderDetail" style="display:none;"></div> - <div id="folderDetail"></div> - </div> --> -</div> - http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/018644b9/security-admin/src/main/webapp/templates/hdfs/PolicyCreate_tmpl.html ---------------------------------------------------------------------- diff --git a/security-admin/src/main/webapp/templates/hdfs/PolicyCreate_tmpl.html b/security-admin/src/main/webapp/templates/hdfs/PolicyCreate_tmpl.html deleted file mode 100644 index eab1c22..0000000 --- a/security-admin/src/main/webapp/templates/hdfs/PolicyCreate_tmpl.html +++ /dev/null @@ -1,48 +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">×</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-spinner btn-primary"> - <span>Save</span> - <i class="icon-spinner icon-spin"></i> - </button> - {{else}} - <button type="submit" data-id="save" class="btn btn-spinner btn-primary"> - <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> -
