You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/13 10:33:45 UTC
[2/9] git commit: updated refs/heads/master to 6c71d3b
Fix encoding for user account label in header
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
(cherry picked from commit bfcdbeca29dcf234d5aecbb4f2d9ca1ec315e0da)
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5608982c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5608982c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5608982c
Branch: refs/heads/master
Commit: 5608982c43af7c400394689fe8cab4b8af24fff0
Parents: 3d411dc
Author: Brian Federle <br...@citrix.com>
Authored: Thu Oct 9 10:47:31 2014 -0700
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Fri Mar 13 15:02:26 2015 +0530
----------------------------------------------------------------------
ui/scripts/ui/core.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5608982c/ui/scripts/ui/core.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/core.js b/ui/scripts/ui/core.js
index c5816a0..da2a16c 100644
--- a/ui/scripts/ui/core.js
+++ b/ui/scripts/ui/core.js
@@ -50,7 +50,7 @@
.addClass('navigation-item')
.addClass(sectionID)
.append($('<span>').addClass('icon').html(' '))
- .append($('<span>').html(_l(args.title)))
+ .append($('<span>').text(_l(args.title)))
.data('cloudStack-section-id', sectionID);
if (args.customIcon) {
@@ -223,7 +223,7 @@
id: 'user'
}).addClass('button')
.append(
- $('<div>').addClass('name').html(
+ $('<div>').addClass('name').text(
args.context && args.context.users ?
cloudStack.concat(userLabel, 14) : 'Invalid User'
)
@@ -258,7 +258,7 @@
$('<div>').attr({
id: 'breadcrumbs'
})
- .append($('<div>').addClass('home').html(_l('label.home')))
+ .append($('<div>').addClass('home').text(_l('label.home')))
.append($('<div>').addClass('end'))
)
@@ -312,7 +312,7 @@
.attr({
href: '#'
})
- .html(_l(this.toString()))
+ .text(_l(this.toString()))
.appendTo($options);
if (this == 'label.help') {
@@ -326,8 +326,8 @@
}
if (this == 'label.about') {
$link.addClass('about').click(function() {
- var $logo = $('<div>').addClass('logo').html(_l('label.app.name')),
- $version = $('<div>').addClass('version').html(g_cloudstackversion),
+ var $logo = $('<div>').addClass('logo').text(_l('label.app.name')),
+ $version = $('<div>').addClass('version').text(g_cloudstackversion),
$about = $('<div>').addClass('about').append($logo).append($version);
$about.dialog({
modal: true,