You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2015/10/11 15:57:20 UTC
[1/3] git commit: updated refs/heads/master to f0cd632
Repository: cloudstack
Updated Branches:
refs/heads/master fddf59f88 -> f0cd632d5
CLOUDSTACK-8930: Showing blank screen when click 'Next' link in final step of Add Zone wizard.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2651956c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2651956c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2651956c
Branch: refs/heads/master
Commit: 2651956cf427614f5c50e89c3405e88319961cdd
Parents: 99059e2
Author: Nitin Kumar Maharana <ni...@citrix.com>
Authored: Thu Oct 1 16:04:20 2015 +0530
Committer: Milamber <mi...@apache.org>
Committed: Wed Oct 7 07:47:00 2015 +0100
----------------------------------------------------------------------
ui/dictionary2.jsp | 1 +
ui/scripts/ui-custom/zoneWizard.js | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2651956c/ui/dictionary2.jsp
----------------------------------------------------------------------
diff --git a/ui/dictionary2.jsp b/ui/dictionary2.jsp
index 26cebf1..d2bb683 100644
--- a/ui/dictionary2.jsp
+++ b/ui/dictionary2.jsp
@@ -1098,6 +1098,7 @@ under the License.
'label.remove.this.physical.network': '<fmt:message key="label.remove.this.physical.network" />',
'label.physical.network.name': '<fmt:message key="label.physical.network.name" />',
'label.save.changes': '<fmt:message key="label.save.changes" />',
+'label.launch.zone': '<fmt:message key="label.launch.zone" />',
'label.autoscale.configuration.wizard': '<fmt:message key="label.autoscale.configuration.wizard" />',
'label.health.check.wizard': '<fmt:message key="label.health.check.wizard" />',
'label.health.check.message.desc': '<fmt:message key="label.health.check.message.desc" />',
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2651956c/ui/scripts/ui-custom/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui-custom/zoneWizard.js b/ui/scripts/ui-custom/zoneWizard.js
index 0e2dbe2..f8e8e20 100644
--- a/ui/scripts/ui-custom/zoneWizard.js
+++ b/ui/scripts/ui-custom/zoneWizard.js
@@ -1211,7 +1211,7 @@
// Show launch button if last step
if ($targetStep.index() == $steps.size() - 1 || options.nextStep) {
- $nextButton.find('span').html(options.nextStep ? _('label.save.changes') : _('label.launch.zone'));
+ $nextButton.find('span').html(options.nextStep ? _l('label.save.changes') : _l('label.launch.zone'));
$nextButton.addClass('final');
if (options.nextStep) {
[2/3] git commit: updated refs/heads/master to f0cd632
Posted by ra...@apache.org.
PR 906 (CLOUDSTACK-8930) and PR 912 combined. Bugs on localization buttons in zone wizard final step and Advanced search popup
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e64025a2
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e64025a2
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e64025a2
Branch: refs/heads/master
Commit: e64025a2b8d78b5c6fe8f2eff9d203ea6ef953de
Parents: 2651956
Author: Milamber <mi...@apache.org>
Authored: Wed Oct 7 07:50:04 2015 +0100
Committer: Milamber <mi...@apache.org>
Committed: Wed Oct 7 07:50:04 2015 +0100
----------------------------------------------------------------------
ui/scripts/ui/widgets/listView.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e64025a2/ui/scripts/ui/widgets/listView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/listView.js b/ui/scripts/ui/widgets/listView.js
index cb31eef..c3c6930 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -1974,7 +1974,7 @@
$form.find('input[type=submit]')
.show()
.appendTo($form)
- .val(_('label.search'));
+ .val(_l('label.search'));
// Cancel button
$form.append(
[3/3] git commit: updated refs/heads/master to f0cd632
Posted by ra...@apache.org.
Merge pull request #915 from milamberspace/PR-906-912-BugZoneWizardAndAdvSearchPopup
Pr 906 912 bug zone wizard and adv search popup
* pr/915:
PR 906 (CLOUDSTACK-8930) and PR 912 combined. Bugs on localization buttons in zone wizard final step and Advanced search popup
CLOUDSTACK-8930: Showing blank screen when click 'Next' link in final step of Add Zone wizard.
Signed-off-by: Rajani Karuturi <ra...@gmail.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/f0cd632d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/f0cd632d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/f0cd632d
Branch: refs/heads/master
Commit: f0cd632d54905b4451771a53d3e4bfbd78626365
Parents: fddf59f e64025a
Author: Rajani Karuturi <ra...@gmail.com>
Authored: Sun Oct 11 19:25:03 2015 +0530
Committer: Rajani Karuturi <ra...@gmail.com>
Committed: Sun Oct 11 19:25:03 2015 +0530
----------------------------------------------------------------------
ui/dictionary2.jsp | 1 +
ui/scripts/ui-custom/zoneWizard.js | 2 +-
ui/scripts/ui/widgets/listView.js | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------