You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2013/03/25 18:52:22 UTC
[22/50] [abbrv] git commit: refs/heads/ui-multiple-pod-ranges -
Regions UI: Add 'redirecting to region' text during login loading
Regions UI: Add 'redirecting to region' text during login loading
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c9f4e513
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c9f4e513
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c9f4e513
Branch: refs/heads/ui-multiple-pod-ranges
Commit: c9f4e5130060fd7b8a2fa15febb070eba1f01519
Parents: 6ad7060
Author: Brian Federle <br...@citrix.com>
Authored: Thu Mar 21 15:57:05 2013 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu Mar 21 15:57:05 2013 -0700
----------------------------------------------------------------------
.../WEB-INF/classes/resources/messages.properties | 1 +
ui/dictionary.jsp | 1 +
ui/scripts/ui-custom/login.js | 8 +++++++-
3 files changed, 9 insertions(+), 1 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9f4e513/client/WEB-INF/classes/resources/messages.properties
----------------------------------------------------------------------
diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index f0b6b36..66b32ac 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -17,6 +17,7 @@
#new labels (begin) **********************************************************************************************
+message.redirecting.region=Redirecting to region...
label.use.vm.ip=Use VM IP:
label.menu.regions=Regions
label.region=Region
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9f4e513/ui/dictionary.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 6c06a10..dcc7898 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,7 @@ under the License.
<% long now = System.currentTimeMillis(); %>
<script language="javascript">
dictionary = {
+'message.redirecting.region': '<fmt:message key="message.redirecting.region"/>',
'label.use.vm.ip': '<fmt:message key="label.use.vm.ip"/>',
'label.add.region': '<fmt:message key="label.add.region"/>',
'label.remove.region': '<fmt:message key="label.remove.region"/>',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c9f4e513/ui/scripts/ui-custom/login.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/login.js b/ui/scripts/ui-custom/login.js
index 8769609..783a170 100644
--- a/ui/scripts/ui-custom/login.js
+++ b/ui/scripts/ui-custom/login.js
@@ -132,7 +132,13 @@
// Hide login screen, mainly for SSO
if (args.hideLoginScreen) {
$login.children().hide();
- $login.append($('<div>').addClass('loading-overlay'));
+ $login.append($('<div>').addClass('loading-overlay').append(
+ $('<span>').html(
+ // _l is not set yet, so localize directly to dictionary
+ // [should fix in future]
+ dictionary['message.redirecting.region']
+ )
+ ));
}
};
})(jQuery, cloudStack);