From 95f0788dbc2b774e943d505cd3b419fc9258d98c Mon Sep 17 00:00:00 2001 From: Hector Sanjuan Date: Fri, 13 Jan 2012 13:03:48 +0100 Subject: [PATCH] Small fixes in UIs Left Menu
  • items are clickable instead of . Corrected some typos. Updated language template. (cherry picked from commit 8b7945d0fb6ec3818fc3ae4893f66528ed486bc6) --- src/cloud/occi/lib/ui/public/js/layout.js | 8 ++++---- src/sunstone/public/js/layout.js | 8 ++++---- src/sunstone/public/js/plugins/templates-tab.js | 2 +- src/sunstone/public/js/plugins/users-tab.js | 2 +- src/sunstone/public/locale/en_US/en_US.js | 3 --- 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/src/cloud/occi/lib/ui/public/js/layout.js b/src/cloud/occi/lib/ui/public/js/layout.js index 79e8df8320..7b315b443c 100644 --- a/src/cloud/occi/lib/ui/public/js/layout.js +++ b/src/cloud/occi/lib/ui/public/js/layout.js @@ -57,14 +57,14 @@ function showTab(tabname){ $(document).ready(function () { $(".tab").hide(); - $(".outer-west ul li.subTab a").live("click",function(){ - var tab = $(this).attr('href'); + $(".outer-west ul li.subTab").live("click",function(){ + var tab = $('a',this).attr('href'); showTab(tab); return false; }); - $(".outer-west ul li.topTab a").live("click",function(){ - var tab = $(this).attr('href'); + $(".outer-west ul li.topTab").live("click",function(){ + var tab = $('a',this).attr('href'); //toggle subtabs trick $('li.'+tab.substr(1)).toggle(); showTab(tab); diff --git a/src/sunstone/public/js/layout.js b/src/sunstone/public/js/layout.js index fc3057e32a..b783835236 100644 --- a/src/sunstone/public/js/layout.js +++ b/src/sunstone/public/js/layout.js @@ -57,14 +57,14 @@ function showTab(tabname){ $(document).ready(function () { $(".tab").hide(); - $(".outer-west ul li.subTab a").live("click",function(){ - var tab = $(this).attr('href'); + $(".outer-west ul li.subTab").live("click",function(){ + var tab = $('a',this).attr('href'); showTab(tab); return false; }); - $(".outer-west ul li.topTab a").live("click",function(){ - var tab = $(this).attr('href'); + $(".outer-west ul li.topTab").live("click",function(){ + var tab = $('a',this).attr('href'); //toggle subtabs trick $('li.'+tab.substr(1)).toggle(); showTab(tab); diff --git a/src/sunstone/public/js/plugins/templates-tab.js b/src/sunstone/public/js/plugins/templates-tab.js index f838bd1495..5375aaf892 100644 --- a/src/sunstone/public/js/plugins/templates-tab.js +++ b/src/sunstone/public/js/plugins/templates-tab.js @@ -587,7 +587,7 @@ var update_template_tmpl = '
    \

    '+tr("Please, choose and modify the template you want to update")+':

    \
    \ - \ + \ \
    \
    \ diff --git a/src/sunstone/public/js/plugins/users-tab.js b/src/sunstone/public/js/plugins/users-tab.js index fbd1e2a8fa..bb5e20eda2 100644 --- a/src/sunstone/public/js/plugins/users-tab.js +++ b/src/sunstone/public/js/plugins/users-tab.js @@ -241,7 +241,7 @@ var user_buttons = { }, "User.update_dialog" : { type: "action", - text: tr("Update a template"), + text: tr("Update properties"), alwaysActive: true }, "User.update_password" : { diff --git a/src/sunstone/public/locale/en_US/en_US.js b/src/sunstone/public/locale/en_US/en_US.js index 11bce91eb5..abd23e3ef1 100644 --- a/src/sunstone/public/locale/en_US/en_US.js +++ b/src/sunstone/public/locale/en_US/en_US.js @@ -139,7 +139,6 @@ locale={ "Group":"", "Group ":"", "Group name":"", - "Group permissions":"", "Groups":"", "Hardware that will emulate this network interface. With Xen this is the type attribute of the vif.":"", "hd":"", @@ -249,10 +248,8 @@ locale={ "OS":"", "OS and Boot options":"", "Other":"", - "Other permissions":"", "Owned by group":"", "Owner":"", - "Owner permissions":"", "PAE":"", "Password":"", "Password for the VNC server":"",