cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [1/9] git commit: updated refs/heads/4.5 to b79f13c
Date Fri, 13 Mar 2015 09:32:51 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 4b45d2515 -> b79f13ccb


Fix encoding for user account label in header

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bfcdbeca
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bfcdbeca
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bfcdbeca

Branch: refs/heads/4.5
Commit: bfcdbeca29dcf234d5aecbb4f2d9ca1ec315e0da
Parents: 4b45d25
Author: Brian Federle <brian.federle@citrix.com>
Authored: Thu Oct 9 10:47:31 2014 -0700
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Fri Mar 13 12:47:32 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/bfcdbeca/ui/scripts/ui/core.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/core.js b/ui/scripts/ui/core.js
index add7d06..6912d1b 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('&nbsp;'))
-                .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'))
             )
 
@@ -309,7 +309,7 @@
                 .attr({
                     href: '#'
                 })
-                .html(_l(this.toString()))
+                .text(_l(this.toString()))
                 .appendTo($options);
 
             if (this == 'label.help') {
@@ -323,8 +323,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,


Mime
View raw message