This is an automated email from the ASF dual-hosted git repository.
ni3galave pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git
The following commit(s) were added to refs/heads/master by this push:
new eded676 RANGER-2475-Replacing bootstrap accordion with jquery
SlideToggle.
eded676 is described below
commit eded676d2d727e2aec7c63399890a8eb3e8981d5
Author: Nitin Galave <[email protected]>
AuthorDate: Tue Jun 18 14:58:39 2019 +0530
RANGER-2475-Replacing bootstrap accordion with jquery SlideToggle.
---
.../scripts/views/security_zone/SecurityZone.js | 10 +-
.../views/security_zone/ZoneAdministration.js | 9 +-
security-admin/src/main/webapp/styles/xa.css | 47 ++++---
.../templates/security_zone/SecurityZone_tmpl.html | 30 +----
.../security_zone/ZoneAdministration_tmpl.html | 138 ++++++++++-----------
5 files changed, 104 insertions(+), 130 deletions(-)
diff --git
a/security-admin/src/main/webapp/scripts/views/security_zone/SecurityZone.js
b/security-admin/src/main/webapp/scripts/views/security_zone/SecurityZone.js
index 9bce74b..982387d 100644
--- a/security-admin/src/main/webapp/scripts/views/security_zone/SecurityZone.js
+++ b/security-admin/src/main/webapp/scripts/views/security_zone/SecurityZone.js
@@ -79,7 +79,8 @@ define(function(require) {
'deleteZone': '[data-id="deleteZone"]',
'editZone': '[data-id="editZone"]',
'zoneSearch' : '[data-id="zoneSearch"]',
- 'zoneUlList' : '[data-id="zoneUlList"]'
+ 'zoneUlList' : '[data-id="zoneUlList"]',
+ 'toggleForZoneServiceTbl' : '[data-id="zoneServiceTbl"]'
},
events: function() {
@@ -91,7 +92,7 @@ define(function(require) {
events['click ' + this.ui.zoneTable] = 'renderTable';
events['click ' + this.ui.deleteZone] = 'onDelete';
events['keyup ' + this.ui.zoneSearch] = 'zoneSearch';
-
+ events['click ' + this.ui.toggleForZoneServiceTbl] =
'toggleForZoneServiceTbl';
return events;
},
@@ -316,6 +317,11 @@ define(function(require) {
});
},
+ toggleForZoneServiceTbl : function(e) {
+ $(e.currentTarget).children().toggleClass('icon-chevron-down');
+ $(e.currentTarget).next().slideToggle();
+ },
+
onClick: function() {
}
diff --git
a/security-admin/src/main/webapp/scripts/views/security_zone/ZoneAdministration.js
b/security-admin/src/main/webapp/scripts/views/security_zone/ZoneAdministration.js
index 1dfa36c..f25ff8c 100644
---
a/security-admin/src/main/webapp/scripts/views/security_zone/ZoneAdministration.js
+++
b/security-admin/src/main/webapp/scripts/views/security_zone/ZoneAdministration.js
@@ -51,13 +51,15 @@ define(function(require) {
/** ui selector cache */
ui: {
'btnServiceName': '[data-id="servicesName"]',
-
+ 'panelClick' : '[data-id="panel"]'
+
},
/** ui events hash */
events: function() {
var events = {};
events['click ' + this.ui.btnSave] = 'onSave';
+ events['click ' + this.ui.panelClick] = 'onPanelToggle';
return events;
},
@@ -77,7 +79,10 @@ define(function(require) {
},
-
+ onPanelToggle : function(e){
+ $(e.currentTarget).children().toggleClass('icon-chevron-down');
+ $(e.currentTarget).next().slideToggle();
+ }
});
return ZoneAdministration;
diff --git a/security-admin/src/main/webapp/styles/xa.css
b/security-admin/src/main/webapp/styles/xa.css
index e8238ca..3f39024 100644
--- a/security-admin/src/main/webapp/styles/xa.css
+++ b/security-admin/src/main/webapp/styles/xa.css
@@ -2573,30 +2573,6 @@ textarea:read-only{
color: #64a224;
margin-top: 0;
}
-.zone-accordion .accordion-group {
- border-color: #ccc;
-}
-.zone-accordion .accordion-heading .accordion-toggle {
- background-color: #eeeeee;
- color: #444;
- text-decoration: none;
- font-weight: bold;
- border-bottom: 1px solid #ccc;
-}
-.zone-accordion .accordion-inner {
- border-top: none;
-}
-.zone-accordion .accordion-heading .accordion-toggle:after {
- font-family: 'FontAwesome';
- content: "\f078";
- float: right;
-}
-.zone-accordion .form-horizontal .control-group {
- margin-bottom: 10px;
-}
-.zone-accordion form {
- margin-bottom: 0px;
-}
.table-operations-new > thead > tr > th {
background-color: #eee;
}
@@ -2808,3 +2784,26 @@ div#zoneServiceAccordion table thead {
margin-right: 2px;
opacity: 0.7;
}
+
+.panel{
+ border:1px solid #ccc;
+}
+
+.panel-header{
+ text-decoration: none;
+ font-weight: bold;
+ border-bottom: 1px solid #ccc;
+ display: block;
+ padding: 8px 15px;
+ cursor: pointer;
+}
+
+.panel-default .panel-header {
+ background-color: #eeeeee;
+ color: #444;
+}
+
+.panel .panel-content{
+ padding: 9px 15px;
+ background-color: white;
+}
diff --git
a/security-admin/src/main/webapp/templates/security_zone/SecurityZone_tmpl.html
b/security-admin/src/main/webapp/templates/security_zone/SecurityZone_tmpl.html
index b14519c..6a94d32 100644
---
a/security-admin/src/main/webapp/templates/security_zone/SecurityZone_tmpl.html
+++
b/security-admin/src/main/webapp/templates/security_zone/SecurityZone_tmpl.html
@@ -35,21 +35,6 @@
</li>
{{/ifCond}}
</ul>
- <!--
- {{#if zoneList.length}}
- <ul class="zone-listing">
- {{#each zoneList}}
- {{#compare this "eq" ../this.zoneModel.attributes.name}}
- <li class="selected" data-action="zoneListing"
data-id="{{this}}">{{this}}</li>
- {{else}}
- <li data-action="zoneListing"
data-id="{{this}}">{{this}}</li>
- {{/compare}}
- {{/each}}
- </ul>
- {{else}}
- <h4>No zones found!</h4>
- {{/if}}
- -->
</div>
</div><!-- listData -->
</div>
@@ -62,7 +47,6 @@
{{#if isZoneAdministration}}
<div class="span4">
<div class="btn-group-zone pull-right">
- <!--<button class="btn btn-default"
data-id="zoneAdministrationDetail"><i class="icon-info"></i> Details</button>-->
<a type="button"
href='#!/zones/edit/{{this.zoneModel.attributes.id}}' class="btn btn-default"
data-id="editZone"><i class="icon-edit"></i>Edit</a>
<button class="btn btn-danger"
data-id="deleteZone"><i class="icon-trash"></i>Delete</button>
</div>
@@ -70,17 +54,9 @@
{{/if}}
</div>
<div class="row-fluid" data-id="zoneAdministrationView"></div>
- <div class="accordion zone-accordion" id="zoneServiceAccordion">
- <div class="accordion-group">
- <div class="accordion-heading accordion-opened">
- <a class="accordion-toggle" data-toggle="collapse"
data-parent="#zoneServiceAccordion" href="#collapseZoneService">Services</a>
- </div>
- <div id="collapseZoneService" class="accordion-body in
collapse" style="height: auto;">
- <div class="accordion-inner">
- <div class="span12"
data-id="zoneTableLayout"></div>
- </div>
- </div>
- </div>
+ <div class="panel panel-default">
+ <div class="panel-header" data-id="zoneServiceTbl">Services<i
class="icon-chevron-up pull-right"></i></div>
+ <div class="panel-content" data-id="zoneTableLayout"></div>
</div>
</div>
{{else}}
diff --git
a/security-admin/src/main/webapp/templates/security_zone/ZoneAdministration_tmpl.html
b/security-admin/src/main/webapp/templates/security_zone/ZoneAdministration_tmpl.html
index 125bf86..d883d5f 100644
---
a/security-admin/src/main/webapp/templates/security_zone/ZoneAdministration_tmpl.html
+++
b/security-admin/src/main/webapp/templates/security_zone/ZoneAdministration_tmpl.html
@@ -19,84 +19,72 @@ language governing permissions and limitations under the
License. --}}
{{/if}}
<div class="row-fluid">
<div class="span12">
- <div class="accordion zone-accordion" id="zone-admin-accordion">
- <div class="accordion-group">
- <div class="accordion-heading accordion-opened">
- <a class="accordion-toggle" data-toggle="collapse"
data-parent="#zone-admin-accordion" href="#collapseOne">Zone Administration</a>
- </div>
- <div id="collapseOne" class="accordion-body in collapse"
style="height: auto;">
- <div class="accordion-inner">
- <form class="form-horizontal form-administration">
- <div class="control-group">
- <label class="control-label"
for="inputEmail">Admin Users</label>
- <div class="controls">
- {{#compare
this.zoneModel.attributes.adminUsers "eq" ''}}
- <span> -- </span>
- {{else}}
- {{#each
this.zoneModel.attributes.adminUsers}}
- <span class="label
label-info">{{this}}</span>
- {{/each}}
- {{/compare}}
- </div>
- </div>
- <div class="control-group">
- <label class="control-label"
for="inputEmail">Admin Usergroups</label>
- <div class="controls">
- {{#compare
this.zoneModel.attributes.adminUserGroups "eq" ''}}
- <span> -- </span>
- {{else}}
- {{#each
this.zoneModel.attributes.adminUserGroups}}
- <span class="label
label-default">{{this}}</span>
- {{/each}}
- {{/compare}}
- </div>
- </div>
- <div class="control-group">
- <label class="control-label"
for="inputEmail">Auditor Users</label>
- <div class="controls">
- {{#compare
this.zoneModel.attributes.auditUsers "eq" ''}}
- <span> -- </span>
- {{else}}
- {{#each
this.zoneModel.attributes.auditUsers}}
- <span class="label
label-info">{{this}}</span>
- {{/each}}
- {{/compare}}
- </div>
- </div>
- <div class="control-group">
- <label class="control-label"
for="inputEmail">Auditor Usergroups</label>
- <div class="controls">
- {{#compare
this.zoneModel.attributes.auditUserGroups "eq" ''}}
- <span> -- </span>
- {{else}}
- {{#each
this.zoneModel.attributes.auditUserGroups}}
- <span class="label
label-default">{{this}}</span>
- {{/each}}
- {{/compare}}
- </div>
- </div>
- </form>
+ <div class="panel panel-default m-b-md">
+ <div class="panel-header" data-id="panel">Zone Administration<i
class="icon-chevron-up pull-right"></i></div>
+ <div class="panel-content">
+ <form class="form-horizontal form-administration">
+ <div class="control-group">
+ <label class="control-label" for="inputEmail">Admin
Users</label>
+ <div class="controls">
+ {{#compare this.zoneModel.attributes.adminUsers
"eq" ''}}
+ <span> -- </span>
+ {{else}}
+ {{#each this.zoneModel.attributes.adminUsers}}
+ <span class="label
label-info">{{this}}</span>
+ {{/each}}
+ {{/compare}}
+ </div>
</div>
- </div>
+ <div class="control-group">
+ <label class="control-label" for="inputEmail">Admin
Usergroups</label>
+ <div class="controls">
+ {{#compare
this.zoneModel.attributes.adminUserGroups "eq" ''}}
+ <span> -- </span>
+ {{else}}
+ {{#each
this.zoneModel.attributes.adminUserGroups}}
+ <span class="label
label-default">{{this}}</span>
+ {{/each}}
+ {{/compare}}
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="inputEmail">Auditor
Users</label>
+ <div class="controls">
+ {{#compare this.zoneModel.attributes.auditUsers
"eq" ''}}
+ <span> -- </span>
+ {{else}}
+ {{#each this.zoneModel.attributes.auditUsers}}
+ <span class="label
label-info">{{this}}</span>
+ {{/each}}
+ {{/compare}}
+ </div>
+ </div>
+ <div class="control-group">
+ <label class="control-label" for="inputEmail">Auditor
Usergroups</label>
+ <div class="controls">
+ {{#compare
this.zoneModel.attributes.auditUserGroups "eq" ''}}
+ <span> -- </span>
+ {{else}}
+ {{#each
this.zoneModel.attributes.auditUserGroups}}
+ <span class="label
label-default">{{this}}</span>
+ {{/each}}
+ {{/compare}}
+ </div>
+ </div>
+ </form>
</div>
</div>
</div>
</div>
-<div class="accordion zone-accordion" id="zone-tag-accordion">
- <div class="accordion-group">
- <div class="accordion-heading accordion-opened">
- <a class="accordion-toggle" data-toggle="collapse"
data-parent="#zone-tag-accordion" href="#collapseTag">Zone Tag Services</a>
- </div>
- <div id="collapseTag" class="accordion-body in collapse"
style="height: auto;">
- <div class="accordion-inner">
- {{#if tagServices}}
- {{#each tagServices}}
- <span class="label label-info">{{this}}</span>
- {{/each}}
- {{else}}
- <span> No tag based services are associated with this zone
</span>
- {{/if}}
- </div>
- </div>
+<div class="panel panel-default m-b-md">
+ <div class="panel-header" data-id="panel">Zone Tag Services <i
class="icon-chevron-up pull-right"></i></div>
+ <div class="panel-content">
+ {{#if tagServices}}
+ {{#each tagServices}}
+ <span class="label label-info">{{this}}</span>
+ {{/each}}
+ {{else}}
+ <span> No tag based services are associated with this zone </span>
+ {{/if}}
</div>
-</div>
+</div>
\ No newline at end of file
