diff --git a/src/sunstone/public/js/plugins/acls-tab.js b/src/sunstone/public/js/plugins/acls-tab.js index 539b8d1256..06785b134d 100644 --- a/src/sunstone/public/js/plugins/acls-tab.js +++ b/src/sunstone/public/js/plugins/acls-tab.js @@ -66,10 +66,10 @@ var create_acl_tmpl = \
\ \ - '+tr("Create")+'
\ '+tr("Use")+'
\ '+tr("Manage")+'
\ '+tr("Administrate")+'
\ + '+tr("Create")+'
\
\ \ \ diff --git a/src/sunstone/public/js/plugins/images-tab.js b/src/sunstone/public/js/plugins/images-tab.js index cf1e96d6f2..b2a0aee838 100644 --- a/src/sunstone/public/js/plugins/images-tab.js +++ b/src/sunstone/public/js/plugins/images-tab.js @@ -197,15 +197,15 @@ var update_image_tmpl = \ \ '+tr("Group")+'\ - \ - \ - \ + \ + \ + \ \ \ '+tr("Other")+'\ - \ - \ - \ + \ + \ + \ \ \ \ @@ -629,19 +629,19 @@ function updateImageInfo(request,img){ '+tr("Running #VMS")+'\ '+img_info.RUNNING_VMS+'\ \ - \ - \ - '+tr("Owner permissions")+'\ - '+ownerPermStr(img_info)+'\ - \ - \ - '+tr("Group permissions")+'\ - '+groupPermStr(img_info)+'\ - \ - \ - '+tr("Other permissions")+'\ - '+otherPermStr(img_info)+'\ - \ + Permissions\ + \ +      '+tr("Owner")+'\ + '+ownerPermStr(img_info)+'\ + \ + \ +      '+tr("Group")+'\ + '+groupPermStr(img_info)+'\ + \ + \ +      '+tr("Other")+'\ + '+otherPermStr(img_info)+'\ + \ ' } diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index 40b47230cd..8252f55f2e 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -605,15 +605,15 @@ var update_template_tmpl = \ \ '+tr("Group")+'\ - \ - \ - \ + \ + \ + \ \ \ '+tr("Other")+'\ - \ - \ - \ + \ + \ + \ \ \ \ @@ -953,19 +953,19 @@ function updateTemplateInfo(request,template){ '+tr("Register time")+'\ '+pretty_time(template_info.REGTIME)+'\ \ - \ - \ - '+tr("Owner permissions")+'\ - '+ownerPermStr(template_info)+'\ - \ - \ - '+tr("Group permissions")+'\ - '+groupPermStr(template_info)+'\ - \ - \ - '+tr("Other permissions")+'\ - '+otherPermStr(template_info)+'\ - \ + Permissions\ + \ +      '+tr("Owner")+'\ + '+ownerPermStr(template_info)+'\ + \ + \ +      '+tr("Group")+'\ + '+groupPermStr(template_info)+'\ + \ + \ +      '+tr("Other")+'\ + '+otherPermStr(template_info)+'\ + \ ' }; var template_tab = { diff --git a/src/sunstone/public/js/plugins/vms-tab.js b/src/sunstone/public/js/plugins/vms-tab.js index 609f7ac91b..5a0886b5c0 100644 --- a/src/sunstone/public/js/plugins/vms-tab.js +++ b/src/sunstone/public/js/plugins/vms-tab.js @@ -114,15 +114,15 @@ var update_vm_tmpl = \ \ '+tr("Group")+'\ - \ - \ - \ + \ + \ + \ \ \ '+tr("Other")+'\ - \ - \ - \ + \ + \ + \ \ \ \ @@ -749,18 +749,18 @@ function updateVMInfo(request,vm){ '+tr("Deploy ID")+'\ '+(typeof(vm_info.DEPLOY_ID) == "object" ? "-" : vm_info.DEPLOY_ID)+'\ \ - \ + Permissions\ \ - '+tr("Owner permissions")+'\ - '+ownerPermStr(vm_info)+'\ +      '+tr("Owner")+'\ + '+ownerPermStr(vm_info)+'\ \ \ - '+tr("Group permissions")+'\ - '+groupPermStr(vm_info)+'\ +      '+tr("Group")+'\ + '+groupPermStr(vm_info)+'\ \ \ - '+tr("Other permissions")+'\ - '+otherPermStr(vm_info)+'\ +      '+tr("Other")+'\ + '+otherPermStr(vm_info)+'\ \ \ \ diff --git a/src/sunstone/public/js/plugins/vnets-tab.js b/src/sunstone/public/js/plugins/vnets-tab.js index c206a0aae1..7a4787c4d1 100644 --- a/src/sunstone/public/js/plugins/vnets-tab.js +++ b/src/sunstone/public/js/plugins/vnets-tab.js @@ -163,14 +163,14 @@ var update_vnet_tmpl = \ '+tr("Group")+'\ \ - \ - \ + \ + \ \ \ '+tr("Other")+'\ - \ - \ - \ + \ + \ + \ \ \ \ @@ -535,18 +535,18 @@ function updateVNetworkInfo(request,vn){ '+tr("VNET ID")+'\ '+ (typeof(vn_info.VLAN_ID) == "object" ? "--": vn_info.VLAN_ID) +'\ \ - \ + Permissions\ \ - '+tr("Owner permissions")+'\ - '+ownerPermStr(vn_info)+'\ +      '+tr("Owner")+'\ + '+ownerPermStr(vn_info)+'\ \ \ - '+tr("Group permissions")+'\ - '+groupPermStr(vn_info)+'\ +      '+tr("Group")+'\ + '+groupPermStr(vn_info)+'\ \ \ - '+tr("Other permissions")+'\ - '+otherPermStr(vn_info)+'\ +      '+tr("Other")+'\ + '+otherPermStr(vn_info)+'\ \ '; diff --git a/src/sunstone/public/js/sunstone-util.js b/src/sunstone/public/js/sunstone-util.js index d1f2669bad..1f1abed1f6 100644 --- a/src/sunstone/public/js/sunstone-util.js +++ b/src/sunstone/public/js/sunstone-util.js @@ -777,43 +777,25 @@ function otherAdmin(resource){ function ownerPermStr(resource){ var result = ""; - if (ownerUse(resource)) - result += tr("Use")+", "; - if (ownerManage(resource)) - result += tr("Manage")+", "; - if (ownerAdmin(resource)) - result += tr("Administrate")+", "; - - //Remove ", " from end - result = result.substring(0,result.length-2); + result += ownerUse(resource) ? "u" : "-"; + result += ownerManage(resource) ? "m" : "-"; + result += ownerAdmin(resource) ? "a" : "-"; return result; }; function groupPermStr(resource){ var result = ""; - if (groupUse(resource)) - result += tr("Use")+", "; - if (groupManage(resource)) - result += tr("Manage")+", "; - if (groupAdmin(resource)) - result += tr("Administrate")+", "; - - //Remove ", " from end - result = result.substring(0,result.length-2); + result += groupUse(resource) ? "u" : "-"; + result += groupManage(resource) ? "m" : "-"; + result += groupAdmin(resource) ? "a" : "-"; return result; }; function otherPermStr(resource){ var result = ""; - if (otherUse(resource)) - result += tr("Use")+", "; - if (otherManage(resource)) - result += tr("Manage")+", "; - if (otherAdmin(resource)) - result += tr("Administrate")+", "; - - //Remove ", " from end - result = result.substring(0,result.length-2); + result += otherUse(resource) ? "u" : "-"; + result += otherManage(resource) ? "m" : "-"; + result += otherAdmin(resource) ? "a" : "-"; return result; };