\
-
\
- \
-
\
-
\
+
\
+ \
\
\
-
\
\
\
×\
@@ -253,10 +229,28 @@ var acl_buttons = {
var acls_tab = {
title: tr("ACLs"),
- content: acls_tab_content,
buttons: acl_buttons,
tabClass: 'subTab',
- parentTab: 'system-tab'
+ parentTab: 'system-tab',
+ search_input: '
',
+ list_header: '
'+tr("Access Control Lists"),
+ subheader: '
',
+ table: '
'
}
Sunstone.addActions(acl_actions);
@@ -439,7 +433,7 @@ function updateAclsView(request,list){
}
function setupCreateAclDialog(){
- dialogs_context.append('
');
+ dialogs_context.append('
');
$create_acl_dialog = $('#create_acl_dialog',dialogs_context);
var dialog = $create_acl_dialog;
dialog.html(create_acl_tmpl);
@@ -451,7 +445,7 @@ function setupCreateAclDialog(){
// width: 650,
// height: height
//});
- dialog.addClass("reveal-modal large max-height");
+ dialog.addClass("reveal-modal large max-height").attr("data-reveal", "");
//Default selected options
$('#res_subgroup_all',dialog).attr('checked','checked');
@@ -464,27 +458,26 @@ function setupCreateAclDialog(){
//Resource subset radio buttons
$('.res_subgroup',dialog).click(function(){
var value = $(this).val();
- var context = $(this).closest('fieldset')
switch (value) {
case "*":
- $('.res_id',context).hide();
- $('.belonging_to',context).hide();
- $('.in_cluster',context).hide();
+ $('.res_id',dialog).hide();
+ $('.belonging_to',dialog).hide();
+ $('.in_cluster',dialog).hide();
break;
case "res_id":
- $('.res_id',context).show();
+ $('.res_id',dialog).show();
$('.belonging_to').hide();
- $('.in_cluster',context).hide();
+ $('.in_cluster',dialog).hide();
break;
case "belonging_to":
- $('.res_id',context).hide();
- $('.belonging_to',context).show();
- $('.in_cluster',context).hide();
+ $('.res_id',dialog).hide();
+ $('.belonging_to',dialog).show();
+ $('.in_cluster',dialog).hide();
break;
case "in_cluster":
- $('.res_id',context).hide();
- $('.belonging_to',context).hide();
- $('.in_cluster',context).show();
+ $('.res_id',dialog).hide();
+ $('.belonging_to',dialog).hide();
+ $('.in_cluster',dialog).show();
break;
};
});
@@ -595,7 +588,7 @@ function setupCreateAclDialog(){
var acl_json = { "acl" : acl_string };
Sunstone.runAction("Acl.create",acl_json);
- $create_acl_dialog.trigger("reveal:close");
+ $create_acl_dialog.trigger('close');
return false;
});
}
@@ -633,7 +626,7 @@ function popUpCreateAclDialog(){
$('#zones_applies',dialog).trigger("change");
- dialog.reveal();
+ dialog.foundation().foundation('reveal', 'open');
}
// Prepare the autorefresh of the list
diff --git a/src/sunstone/public/js/plugins/clusters-tab.js b/src/sunstone/public/js/plugins/clusters-tab.js
index ea52229c53..d12c5ba0a5 100644
--- a/src/sunstone/public/js/plugins/clusters-tab.js
+++ b/src/sunstone/public/js/plugins/clusters-tab.js
@@ -73,97 +73,100 @@ var datastore_datatable_table_tmpl='
\
'
-var create_cluster_tmpl ='\
-
\
- \
- \
-
\
+var create_cluster_tmpl ='
\
+ \
+ \
\