Regions UI: Show (Default) in header if no regions are available

bfederle · bfederle · commit 260669ad9eb5 · 2013-02-28T16:02:19.000-08:00
diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js
@@ -27,7 +27,7 @@
 
             args.response.success({
               data: regions ? regions : [
-                { id: -1, name: '(Default region)' }
+                { id: -1, name: '(Default)' }
               ],
               activeRegionID: cloudStack.context.users.regionid ?
                 cloudStack.context.users.regionid : 1
diff --git a/ui/scripts/ui-custom/regions.js b/ui/scripts/ui-custom/regions.js
@@ -31,18 +31,19 @@
 
             $(data).each(function() {
               var region = this;
+              var regionName = region.name;
               var $li = $('<li>').append($('<span>').html(_s(region.name)));
 
               $li.data('region-data', region);
 
               if (region.id == activeRegionID) {
                 $li.addClass('active');
-
-                $regionSwitcherButton.find('.title')
-                  .html(_s(region.name))
-                  .attr('title', _s(region.name));
               }
               
+              $regionSwitcherButton.find('.title')
+                .html(regionName)
+                .attr('title', regionName);
+              
               $regionList.append($li);
             });
           }
