etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <rajanikaruturi@gmail.com>
This commit is contained in:
Rajani Karuturi 2015-10-11 19:25:03 +05:30
parent fddf59f885 e64025a2b8
commit f0cd632d54
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ui/dictionary2.jsp
View File

@ -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" />',

2
ui/scripts/ui-custom/zoneWizard.js
View File

@ -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
ui/scripts/ui/widgets/listView.js
View File

@ -1974,7 +1974,7 @@
$form.find('input[type=submit]')
.show()
.appendTo($form)
.val(_('label.search'));
.val(_l('label.search'));
// Cancel button
$form.append(