This is an automated email from the ASF dual-hosted git repository.
ishanbha pushed a commit to branch branch-feature-AMBARI-14714
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 6436488ab6ba242301051b99acab5e999f3f46ee
Merge: 8383d16 430285d
Author: Ishan Bhatt <ishanbhatt.1...@gmail.com>
AuthorDate: Mon Feb 12 12:06:13 2018 -0800
Merge branch 'branch-feature-AMBARI-14714-ui' into
branch-feature-AMBARI-14714
.gitignore | 1 +
.../ZEPPELIN/0.6.0.3.0/metainfo.xml | 103 ++
ambari-web/app/app.js | 3 +-
ambari-web/app/assets/index.html | 8 +-
ambari-web/app/assets/test/tests.js | 9 +
ambari-web/app/controllers.js | 7 +
ambari-web/app/controllers/installer.js | 461 +++++--
.../app/controllers/main/host/add_controller.js | 2 +-
.../app/controllers/main/service/add_controller.js | 4 +-
ambari-web/app/controllers/wizard.js | 78 +-
.../wizard/configureDownload_controller.js | 82 ++
.../wizard/customMpackRepos_controller.js | 50 +
.../wizard/customProductRepos_controller.js | 285 +++++
.../wizard/downloadMpacks_controller.js | 157 +++
.../controllers/wizard/selectMpacks_controller.js | 615 ++++++++++
.../app/controllers/wizard/step0_controller.js | 5 +-
.../app/controllers/wizard/step10_controller.js | 7 +-
.../app/controllers/wizard/step1_controller.js | 5 +-
.../app/controllers/wizard/step2_controller.js | 212 ++--
.../app/controllers/wizard/step3_controller.js | 24 +-
.../app/controllers/wizard/step4_controller.js | 9 +-
.../app/controllers/wizard/step5_controller.js | 13 +-
.../app/controllers/wizard/step6_controller.js | 19 +-
.../app/controllers/wizard/step7_controller.js | 26 +-
.../app/controllers/wizard/step8_controller.js | 162 +--
.../app/controllers/wizard/step9_controller.js | 11 +-
.../wizard/verifyProducts_controller.js | 162 +++
...tep5_controller.js => wizardStep_controller.js} | 37 +-
ambari-web/app/mappers.js | 3 +-
ambari-web/app/mappers/mpack_service_mapper.js | 114 ++
ambari-web/app/mappers/stack_mapper.js | 14 +-
ambari-web/app/messages.js | 595 ++++++----
.../app/mixins/wizard/assign_master_components.js | 32 +-
ambari-web/app/mixins/wizard/wizard_menu_view.js | 64 +-
ambari-web/app/models/repository.js | 8 +-
ambari-web/app/models/stack.js | 2 -
ambari-web/app/router.js | 14 +-
ambari-web/app/routes/installer.js | 581 +++++++--
ambari-web/app/styles/application.less | 177 ++-
ambari-web/app/styles/bootstrap_overrides.less | 148 ++-
ambari-web/app/styles/common.less | 8 +-
ambari-web/app/styles/stack_versions.less | 2 +-
ambari-web/app/styles/theme/bootstrap-ambari.css | 28 +-
ambari-web/app/styles/widgets.less | 2 -
ambari-web/app/styles/wizard.less | 457 +++++--
.../templates/common/assign_master_components.hbs | 10 +-
ambari-web/app/templates/common/pagination.hbs | 2 +-
ambari-web/app/templates/installer.hbs | 34 +-
.../app/templates/wizard/configureDownload.hbs | 92 ++
.../app/templates/wizard/customMpackRepos.hbs | 73 ++
.../app/templates/wizard/customProductRepos.hbs | 121 ++
ambari-web/app/templates/wizard/downloadMpacks.hbs | 93 ++
ambari-web/app/templates/wizard/selectMpacks.hbs | 138 +++
.../app/templates/wizard/selectMpacks/mpack.hbs | 46 +
.../wizard/selectMpacks/selectedMpackVersion.hbs | 40 +
.../app/templates/wizard/selectMpacks/service.hbs | 36 +
.../app/templates/wizard/selectMpacks/usecase.hbs | 28 +
ambari-web/app/templates/wizard/step0.hbs | 18 +-
ambari-web/app/templates/wizard/step1.hbs | 4 +-
ambari-web/app/templates/wizard/step10.hbs | 6 +-
ambari-web/app/templates/wizard/step2.hbs | 150 ++-
ambari-web/app/templates/wizard/step3.hbs | 203 ++--
ambari-web/app/templates/wizard/step4.hbs | 4 +-
ambari-web/app/templates/wizard/step6.hbs | 4 +-
ambari-web/app/templates/wizard/step7.hbs | 2 +-
ambari-web/app/templates/wizard/step8.hbs | 14 +-
ambari-web/app/templates/wizard/step9.hbs | 2 +-
ambari-web/app/templates/wizard/verifyProducts.hbs | 108 ++
ambari-web/app/utils.js | 1 +
ambari-web/app/utils/ajax/ajax.js | 103 ++
.../step5_controller.js => utils/constants.js} | 27 +-
ambari-web/app/views.js | 6 +
ambari-web/app/views/common/breadcrumbs_view.js | 3 +
ambari-web/app/views/common/modal_popup.js | 2 +-
.../app/views/wizard/configureDownload_view.js | 103 ++
.../app/views/wizard/customMpackRepos_view.js | 35 +
.../app/views/wizard/customProductRepos_view.js | 73 ++
ambari-web/app/views/wizard/downloadMpacks_view.js | 44 +
ambari-web/app/views/wizard/selectMpacks_view.js | 194 +++
ambari-web/app/views/wizard/step2_view.js | 13 +-
ambari-web/app/views/wizard/step3_view.js | 15 +-
ambari-web/app/views/wizard/step6_view.js | 1 +
ambari-web/app/views/wizard/verifyProducts_view.js | 42 +
ambari-web/test/controllers/installer_test.js | 266 +++--
.../controllers/main/host/add_controller_test.js | 2 +-
.../main/service/add_controller_test.js | 2 +-
.../controllers/wizard/configureDownload_test.js | 85 ++
.../controllers/wizard/customProductRepos_test.js | 80 ++
.../test/controllers/wizard/downloadMpacks_test.js | 128 ++
.../test/controllers/wizard/selectMpacks_test.js | 1253 ++++++++++++++++++++
ambari-web/test/controllers/wizard/step2_test.js | 117 +-
ambari-web/test/controllers/wizard/step3_test.js | 23 -
ambari-web/test/controllers/wizard/step5_test.js | 1 +
ambari-web/test/controllers/wizard/step6_test.js | 13 +-
ambari-web/test/controllers/wizard/step8_test.js | 223 ++--
.../test/controllers/wizard/verifyProducts_test.js | 54 +
.../test/controllers/wizard/wizardStep_test.js | 51 +
ambari-web/test/controllers/wizard_test.js | 108 ++
.../test/mixins/routers/redirections_test.js | 8 +-
ambari-web/test/views/installer_test.js | 16 +-
.../views/wizard/configureDownload_view_test.js | 139 +++
.../customMpackRepos_view_test.js} | 48 +-
.../views/wizard/customProductRepos_view_test.js | 185 +++
ambari-web/test/views/wizard/step2_view_test.js | 35 +-
ambari-web/test/views/wizard/step3_view_test.js | 46 +
ambari-web/test/views/wizard/step6_view_test.js | 5 +-
106 files changed, 8219 insertions(+), 1365 deletions(-)
diff --cc ambari-web/app/messages.js
index b940874,1c818e6..890f449
--- a/ambari-web/app/messages.js
+++ b/ambari-web/app/messages.js
@@@ -82,288 -81,291 +81,309 @@@ Em.I18n.translations =
'ops': 'ops',
'or': 'or',
'then': 'then',
- 'it': 'it',
-
+ 'to':'To',
+ 'yes':'Yes',
+ 'common.abort': 'Abort',
+ 'common.aborted': 'Aborted',
+ 'common.aboutAmbari': 'About',
'common.access':'Access',
- 'common.learnMore':'Learn more',
- 'common.showDetails':'Show Details',
- 'common.back':'Back',
- 'common.prev':'Prev',
- 'common.next':'Next',
- 'common.host':'Host',
- 'common.hosts':'Hosts',
- 'common.services':'Services',
- 'common.group':'Group',
- 'common.groups':'Groups',
- 'common.progress':'Progress',
- 'common.status':'Status',
'common.action':'Action',
- 'common.refresh':'Refresh',
- 'common.remove':'Remove',
- 'common.retry':'Retry',
- 'common.skip':'Skip',
- 'common.filter': 'Filter',
- 'common.rollBack':'Rollback',
- 'common.show':'Show',
- 'common.hide':'Hide',
- 'common.cancel':'Cancel',
+ 'common.actions': 'Actions',
+ 'common.add': 'Add',
+ 'common.additional': 'Additional',
+ 'common.advanced': 'Advanced',
+ 'common.alertDefinition': "Alert Definition",
+ 'common.all.clients':'All Clients',
+ 'common.all':'All',
+ 'common.allServices':'All Services',
'common.apply':'Apply',
- 'common.done':'Done',
- 'common.failed':'Failed',
- 'common.service': 'Service',
- 'common.version':'Version',
- 'common.downgrade':'Downgrade',
- 'common.description':'Description',
- 'common.default':'Default',
+ 'common.author': 'Author',
+ 'common.back':'Back',
+ 'common.backgroundOperations': 'Background Operations',
+ 'common.cancel':'Cancel',
+ 'common.change': 'Change',
'common.client':'Client',
+ 'common.master':'Master',
+ 'common.slave':'Slave',
+ 'common.zookeeper':'ZooKeeper',
+ 'common.hbase':'HBase',
+ 'common.regionServer':'RegionServer',
+ 'common.taskTracker':'TaskTracker',
+ 'common.dataNode':'DataNode',
+ 'common.more': 'More...',
+ 'common.print':'Print',
+ 'common.deploy':'Deploy',
+ 'common.generate.blueprint':'Generate Blueprint',
+ 'common.message':'Message',
+ 'common.tasks':'Tasks',
+ 'common.taskLog':'Task Log',
+ 'common.open':'Open',
+ 'common.copy':'Copy',
+ 'common.clients':'Clients',
+ 'common.clone': 'Clone',
+ 'common.close': 'Close',
+ 'common.cluster':'Cluster',
+ 'common.compare': 'Compare',
'common.complete':'Complete',
'common.completed':'Completed',
- 'common.metrics':'Metrics',
- 'common.timeRange':'Time Range',
- 'common.name':'Name',
- 'common.key':'Key',
- 'common.value':'Value',
- 'common.ipAddress':'IP Address',
- 'common.rack':'Rack',
- 'common.cpu':'CPU',
- 'common.cores': 'Cores',
+ 'common.component':'Component',
+ 'common.components':'Components',
+ 'common.conf.group': 'Configuration Group',
+ 'common.configGroup': 'Config Group',
+ 'common.configs': "Configs",
+ 'common.configuration': "Configuration",
+ 'common.confirm': 'Confirm',
+ 'common.continueAnyway': 'Continue Anyway',
+ 'common.copy':'Copy',
'common.cores.cpu': 'Cores (CPU)',
- 'common.ram':'RAM',
- 'common.disabled':'Disabled',
- 'common.enabled':'Enabled',
- 'common.enableAll':'Enable All',
+ 'common.cores': 'Cores',
+ 'common.cpu':'CPU',
+ 'common.critical': 'Critical',
+ 'common.csv': 'Save as CSV',
+ 'common.current': 'Current',
+ 'common.custom': 'Custom',
+ 'common.dataNode':'DataNode',
+ 'common.dataSet': 'Data Set',
+ 'common.days': "Days",
+ 'common.decommission':'Decommission',
+ 'common.default':'Default',
+ 'common.delete': 'Delete',
+ 'common.deploy':'Deploy',
+ 'common.description':'Description',
+ 'common.details':'Details',
+ 'common.direction': 'Direction',
+ 'common.disable': 'Disable',
'common.disableAll':'Disable All',
+ 'common.disabled':'Disabled',
+ 'common.discard': 'Discard',
'common.disk':'Disk',
'common.diskUsage':'Disk Usage',
- 'common.last':'Last',
- 'common.loadAvg':'Load Avg',
- 'common.components':'Components',
- 'common.component':'Component',
- 'common.quickLinks':'Quick Links',
- 'common.save':'Save',
- 'common.saveAnyway':'Save Anyway',
- 'common.servers':'Servers',
- 'common.clients':'Clients',
- 'common.all.clients':'All Clients',
- 'common.user': 'User',
- 'common.users': 'Users',
- 'common.issues': 'Issues',
- 'common.os':'OS',
- 'common.oss':'OSs',
- 'common.memory':'Memory',
- 'common.maximum':'Maximum',
- 'common.started':'Started',
- 'common.start':'Start',
- 'common.stop':'Stop',
- 'common.pause':'Pause',
+ 'common.dismiss': "Dismiss",
+ 'common.done':'Done',
+ 'common.downgrade':'Downgrade',
+ 'common.download': 'Download',
+ 'common.duplicate': 'Duplicate',
+ 'common.duration': 'Duration',
+ 'common.edit': 'Edit',
+ 'common.empty': 'Empty',
+ 'common.enable': 'Enable',
+ 'common.enableAll':'Enable All',
+ 'common.enabled':'Enabled',
+ 'common.end.time': 'End Time',
'common.end':'End',
- 'common.decommission':'Decommission',
- 'common.recommission':'Recommission',
+ 'common.enter': 'Enter',
+ 'common.error': 'Error',
+ 'common.errorPopup.header': 'An error has been encountered',
+ 'common.exclude.short': 'Excl',
+ 'common.exclude': 'Exclude',
+ 'common.exitAnyway': 'Exit Anyway',
+ 'common.export': 'Export',
+ 'common.express.downgrade': 'Express Downgrade',
+ 'common.express': 'Express',
+ 'common.expression': 'Expression',
+ 'common.extension': 'Extension',
+ 'common.fail':'Fail',
+ 'common.failed':'Failed',
'common.failure': 'Failure',
- 'common.type': 'Type',
- 'common.direction': 'Direction',
- 'common.close': 'Close',
- 'common.warning': 'Warning',
- 'common.critical': 'Critical',
+ 'common.file': 'File',
+ 'common.fileName': 'File Name',
+ 'common.filter': 'Filter',
+ 'common.filters': 'Filters',
+ 'common.finalize': "Finalize",
+ 'common.free': 'free',
+ 'common.from.version': 'From Version',
+ 'common.fullLogPopup.clickToCopy': 'Click to Copy',
+ 'common.generate.blueprint':'Generate Blueprint',
+ 'common.group':'Group',
+ 'common.groups':'Groups',
+ 'common.hbase':'HBase',
+ 'common.hide':'Hide',
+ 'common.host':'Host',
+ 'common.hostLog.popup.errorLog.value': 'errors-{0}.txt',
+ 'common.hostLog.popup.logDir.path':'/var/lib/ambari-agent/data/', //
TODO, this hardcoded path needs to be removed.
+ 'common.hostLog.popup.outputLog.value': 'output-{0}.txt',
+ 'common.hostOrdered': 'Host Ordered',
+ 'common.hosts':'Hosts',
+ 'common.hours': "Hours",
+ 'common.ignore': 'Ignore',
+ 'common.important.strong': '<strong>Important:</strong>',
+ 'common.important': 'Important',
+ 'common.include.short': 'Incl',
+ 'common.include': 'Include',
'common.information': 'Information',
- 'common.all':'All',
- 'common.success': 'Success',
- 'common.fail':'Fail',
- 'common.error': 'Error',
- 'common.loading': 'Loading',
- 'common.search': 'Search',
- 'common.confirm': 'Confirm',
- 'common.upgrade': 'Upgrade',
- 'common.reUpgrade': 'Retry Upgrade',
- 'common.reDowngrade': 'Retry Downgrade',
- 'common.security':'Security',
+ 'common.install': "Install",
+ 'common.installed': 'Installed',
+ 'common.installRepo.task': ' Install Packages',
+ 'common.ipAddress':'IP Address',
+ 'common.issues': 'Issues',
+ 'common.json': 'Save as JSON',
'common.kerberos':'Kerberos',
- 'common.cluster':'Cluster',
- 'common.repositories':'Repositories',
- 'common.stack.versions':'Stack Versions',
- 'common.versions':'Versions',
- 'common.upgrade.history':'Upgrade History',
- 'common.serviceAccounts': 'Service Accounts',
- 'common.add': 'Add',
- 'common.edit': 'Edit',
- 'common.delete': 'Delete',
- 'common.duplicate': 'Duplicate',
- 'common.disable': 'Disable',
- 'common.enable': 'Enable',
- 'common.empty': 'Empty',
- 'common.override':'Override',
- 'common.undo':'Undo',
- 'common.details':'Details',
- 'common.stats':'Stats',
- 'common.abort': 'Abort',
- 'common.aborted': 'Aborted',
+ 'common.key':'Key',
+ 'common.keywords': 'Keywods',
+ 'common.label': 'Label',
+ 'common.last':'Last',
+ 'common.latest': 'Latest',
+ 'common.learnMore':'Learn more',
+ 'common.levels': 'Levels',
+ 'common.link': 'Link',
+ 'common.live': 'Live',
+ 'common.loadAvg':'Load Avg',
+ 'common.loading.eclipses': 'Loading...',
+ 'common.loading': 'Loading',
+ 'common.logs': 'Logs',
+ 'common.maint': 'Maint',
+ 'common.maintenance.task': ' Toggle Maintenance Mode',
+ 'common.maintenance': 'Maintenance',
+ 'common.maximum':'Maximum',
+ 'common.memory':'Memory',
+ 'common.message':'Message',
+ 'common.metrics':'Metrics',
+ 'common.milliseconds': "Milliseconds",
+ 'common.minutes': "Minutes",
'common.misc': 'Misc',
- 'common.userSettings': 'User Settings',
- 'common.aboutAmbari': 'About',
- 'common.notAvailable': 'Not Available',
+ 'common.more': 'More...',
+ 'common.move':'Move',
+ 'common.mpack': 'Management Pack',
+ 'common.freeStorage': 'Free Storage',
+ 'common.noHostsFound': 'No Hosts found.',
'common.na': 'n/a',
+ 'common.name':'Name',
+ 'common.next':'Next',
+ 'common.noData': 'No Data',
+ 'common.noLink': 'No Links',
+ 'common.notAvailable': 'Not Available',
+ 'common.notes': 'Notes',
+ 'common.nothingToDelete': 'Nothing to delete',
+ 'common.open':'Open',
+ 'common.openNewWindow': 'Open in New Window',
+ 'common.operatingSystem': 'Operating System',
'common.operations': 'Operations',
- 'common.backgroundOperations': 'Background Operations',
- 'common.startTime': 'Start Time',
- 'common.duration': 'Duration',
- 'common.reinstall': 'Re-Install',
- 'common.revert': 'Revert',
- 'common.errorPopup.header': 'An error has been encountered',
- 'common.use': 'Use',
- 'common.stacks': 'Stacks',
- 'common.stack': 'Stack',
- 'common.reset': 'Reset',
- 'common.reset.default': 'Reset to default',
- 'common.resume': 'Resume',
- 'common.path': 'Path',
- 'common.patch': 'Patch',
- 'common.maint': 'Maint',
+ 'common.optional': 'Optional',
+ 'common.options': 'Options',
+ 'common.os': 'OS',
+ 'common.oss':'OSs',
+ 'common.override':'Override',
+ 'common.overrides': 'Overrides',
'common.package': 'Package',
+ 'common.passive_state': 'Maintenance Mode',
+ 'common.password': 'Password',
+ 'common.patch': 'Patch',
+ 'common.path': 'Path',
+ 'common.pause':'Pause',
+ 'common.persist.error' : 'Error in persisting web client state at ambari
server. Server respond with following error message:',
+ 'common.prerequisites': 'Prerequisites',
+ 'common.prev':'Prev',
+ 'common.preview': 'Preview',
+ 'common.print':'Print',
'common.proceed': 'Proceed',
'common.proceedAnyway': 'Proceed Anyway',
- 'common.exitAnyway': 'Exit Anyway',
'common.process': 'Process',
- 'common.property': 'Property',
- 'common.installed': 'Installed',
- 'common.persist.error' : 'Error in persisting web client state at ambari
server. Server respond with following error message:',
- 'common.update.error' : 'Error in retrieving web client state from ambari
server',
- 'common.tags': 'Tags',
- 'common.important': 'Important',
- 'common.important.strong': '<strong>Important:</strong>',
- 'common.allServices':'All Services',
- 'common.move':'Move',
- 'common.change': 'Change',
- 'common.overrides': 'Overrides',
+ 'common.progress':'Progress',
'common.properties': 'properties',
- 'common.conf.group': 'Configuration Group',
- 'common.ignore': 'Ignore',
+ 'common.property.undefined': "Undefined",
+ 'common.property': 'Property',
+ 'common.propertyType': 'Property Type',
+ 'common.public': 'Public',
+ 'common.quickLinks':'Quick Links',
+ 'common.rack':'Rack',
+ 'common.ram':'RAM',
+ 'common.recommission':'Recommission',
+ 'common.reDowngrade': 'Retry Downgrade',
+ 'common.refresh':'Refresh',
+ 'common.regionServer':'RegionServer',
+ 'common.reinstall': 'Re-Install',
+ 'common.remove':'Remove',
+ 'common.removed': 'Removed',
+ 'common.repositories':'Repositories',
+ 'common.repository': 'Repository',
+ 'common.repositoryType': 'Repository Type',
+ 'common.reset.default': 'Reset to default',
+ 'common.reset': 'Reset',
'common.restart': 'Restart',
- 'common.discard': 'Discard',
- 'common.actions': 'Actions',
- 'common.maintenance': 'Maintenance',
- 'common.passive_state': 'Maintenance Mode',
+ 'common.resume': 'Resume',
+ 'common.retry':'Retry',
+ 'common.reUpgrade': 'Retry Upgrade',
+ 'common.revert': 'Revert',
+ 'common.rollBack':'Rollback',
+ 'common.rolling.downgrade': 'Rolling Downgrade',
+ 'common.rolling': 'Rolling',
+ 'common.running': 'Running',
+ 'common.save':'Save',
+ 'common.saveAnyway':'Save Anyway',
+ 'common.scope': 'Scope',
+ 'common.search': 'Search',
+ 'common.seconds': "Seconds",
+ 'common.security':'Security',
'common.select': 'Select',
'common.selected': 'Selected',
- 'common.password': 'Password',
- 'common.url': 'URL',
- 'common.advanced': 'Advanced',
- 'common.download': 'Download',
- 'common.current': 'Current',
- 'common.additional': 'Additional',
- 'common.time.start': 'Start Time',
- 'common.time.end': 'End Time',
- 'common.hostLog.popup.logDir.path':'/var/lib/ambari-agent/data/', //
TODO, this hardcoded path needs to be removed.
- 'common.hostLog.popup.outputLog.value': 'output-{0}.txt',
- 'common.hostLog.popup.errorLog.value': 'errors-{0}.txt',
- 'common.maintenance.task': ' Toggle Maintenance Mode',
- 'common.installRepo.task': ' Install Packages',
- 'common.used': 'used',
- 'common.free': 'free',
- 'common.type.string': 'string',
- 'common.type.number': 'number',
- 'common.author': 'Author',
- 'common.notes': 'Notes',
- 'common.view': 'View',
- 'common.compare': 'Compare',
- 'common.latest': 'Latest',
- 'common.custom': 'Custom',
- 'common.continueAnyway': 'Continue Anyway',
- 'common.property.undefined': "Undefined",
- 'common.summary': "Summary",
- 'common.configs': "Configs",
- 'common.configuration': "Configuration",
- 'common.unknown': "Unknown",
- 'common.install': "Install",
- 'common.alertDefinition': "Alert Definition",
- 'common.prerequisites': 'Prerequisites',
- 'common.finalize': "Finalize",
+ 'common.servers':'Servers',
+ 'common.service': 'Service',
+ 'common.serviceAccounts': 'Service Accounts',
+ 'common.services':'Services',
'common.severity': "Severity",
- 'common.dismiss': "Dismiss",
- 'common.stdout': "stdout",
+ 'common.show':'Show',
+ 'common.showDetails':'Show Details',
+ 'common.skip':'Skip',
+ 'common.stack.versions':'Stack Versions',
+ 'common.stack': 'Stack',
+ 'common.stacks': 'Stacks',
+ 'common.start.time': 'Start Time',
+ 'common.start':'Start',
+ 'common.started':'Started',
+ 'common.startTime': 'Start Time',
+ 'common.stats':'Stats',
+ 'common.status':'Status',
'common.stderr': "stderr",
+ 'common.stdout': "stdout",
+ 'common.stop':'Stop',
+ 'common.stopped': 'Stopped',
'common.structuredOut': "structured_out",
- 'common.fileName': 'File Name',
- 'common.file': 'File',
- 'common.days': "Days",
- 'common.hours': "Hours",
- 'common.minutes': "Minutes",
- 'common.seconds': "Seconds",
- 'common.milliseconds': "Milliseconds",
- 'common.configGroup': 'Config Group',
- 'common.expression': 'Expression',
- 'common.dataSet': 'Data Set',
- 'common.label': 'Label',
- 'common.preview': 'Preview',
- 'common.options': 'Options',
- 'common.scope': 'Scope',
- 'common.clone': 'Clone',
- 'common.removed': 'Removed',
+ 'common.success': 'Success',
+ 'common.summary': "Summary",
+ 'common.tags': 'Tags',
+ 'common.taskLog':'Task Log',
+ 'common.tasks':'Tasks',
+ 'common.taskTracker':'TaskTracker',
'common.testing': 'Testing',
- 'common.noData': 'No Data',
- 'common.export': 'Export',
- 'common.csv': 'Save as CSV',
- 'common.json': 'Save as JSON',
- 'common.timestamp': 'Timestamp',
- 'common.timezone': 'Timezone',
- 'common.loading.eclipses': 'Loading...',
- 'common.optional': 'Optional',
- 'common.propertyType': 'Property Type',
- 'common.running': 'Running',
- 'common.stopped': 'Stopped',
- 'common.enter': 'Enter',
- 'common.timeout.warning.popup.header': 'Automatic Logout',
- 'common.timeout.warning.popup.body.before': 'You will be automatically
logged out in ',
+ 'common.time.end': 'End Time',
+ 'common.time.start': 'Start Time',
'common.timeout.warning.popup.body.after': ' seconds due to inactivity',
+ 'common.timeout.warning.popup.body.before': 'You will be automatically
logged out in ',
+ 'common.timeout.warning.popup.header': 'Automatic Logout',
'common.timeout.warning.popup.primary': 'Remain Logged In',
'common.timeout.warning.popup.secondary': 'Log Out Now',
- 'common.openNewWindow': 'Open in New Window',
- 'common.fullLogPopup.clickToCopy': 'Click to Copy',
- 'common.nothingToDelete': 'Nothing to delete',
- 'common.exclude': 'Exclude',
- 'common.include': 'Include',
- 'common.exclude.short': 'Excl',
- 'common.include.short': 'Incl',
- 'common.filters': 'Filters',
- 'common.keywords': 'Keywods',
- 'common.levels': 'Levels',
- 'common.extension': 'Extension',
- 'common.logs': 'Logs',
- 'common.warn.message': '<div class="alert alert-warning">{0}</div>',
- 'common.link': 'Link',
- 'common.noLink': 'No Links',
- 'common.live': 'Live',
- 'common.from.version': 'From Version',
+ 'common.timeRange':'Time Range',
+ 'common.timestamp': 'Timestamp',
+ 'common.timezone': 'Timezone',
'common.to.version': 'To Version',
- 'common.start.time': 'Start Time',
- 'common.end.time': 'End Time',
- 'common.rolling': 'Rolling',
- 'common.express': 'Express',
- 'common.hostOrdered': 'Host Ordered',
- 'common.repository': 'Repository',
- 'common.repositoryType': 'Repository Type',
- 'common.rolling.downgrade': 'Rolling Downgrade',
- 'common.express.downgrade': 'Express Downgrade',
+ 'common.type.number': 'number',
+ 'common.type.string': 'string',
+ 'common.type': 'Type',
+ 'common.undo':'Undo',
+ 'common.unknown': "Unknown",
+ 'common.update.error' : 'Error in retrieving web client state from ambari
server',
+ 'common.upgrade.history':'Upgrade History',
+ 'common.upgrade': 'Upgrade',
+ 'common.url': 'URL',
+ 'common.use': 'Use',
+ 'common.used': 'used',
+ 'common.user': 'User',
+ 'common.users': 'Users',
+ 'common.userSettings': 'User Settings',
+ 'common.value': 'Value',
+ 'common.verification': 'Verification',
+ 'common.version':'Version',
+ 'common.versions':'Versions',
+ 'common.view': 'View',
+ 'common.viewLog': 'View Log',
'common.views': 'Views',
+ 'common.warn.message': '<div class="alert alert-warning">{0}</div>',
+ 'common.warning': 'Warning',
+ 'common.zookeeper':'ZooKeeper',
'common.critical.error': 'Critical',
+ 'common.with': 'with',
+ 'common.propertyName': 'Property Name',
'models.alert_instance.tiggered.verbose': "Occurred on {0} <br> Checked on
{1}",
'models.alert_definition.triggered.verbose': "Occurred on {0}",
diff --cc ambari-web/app/styles/bootstrap_overrides.less
index 1d40755,905fc84..1e45263
--- a/ambari-web/app/styles/bootstrap_overrides.less
+++ b/ambari-web/app/styles/bootstrap_overrides.less
@@@ -442,16 -439,141 +451,149 @@@ select.form-control
}
}
+ .table.table-hover .action {
+ padding-right: 10px;
+ }
- .wizard .wizard-body {
- padding: 0 !important;
+ .nav.nav-tabs {
+ margin-bottom: 15px;
+ }
+ .panel-heading .nav-tabs {
+ margin-bottom: 0;
+ }
+ .panel-heading .nav.nav-tabs li a {
+ padding-top: 0;
+ }
+ .nav.nav-tabs li.active a {
+ padding-bottom: 10px;
}
+.table.table-hover .action {
+ padding-right: 10px;
+}
+
+.btn-group.open .dropdown-menu input[type="checkbox"] + label,
+.dropdown.open .dropdown-menu input[type="checkbox"] + label {
+ line-height: 1.3em;
++}
+ .wizard {
+ border: none;
+ }
+ .wizard .wizard-body {
+ overflow: initial;
+ position: relative;
+ width: 100%;
+ padding: 0;
+ padding-bottom: 64px; // height of wizard-footer
+ background-color: #eee;
+ }
+ .wizard .wizard-body .wizard-content {
+ padding: 30px;
+ margin-bottom: 0;
+ background: #eee;
+ }
+ .wizard .wizard-body .wizard-content .step-header {
+ font-family: inherit;
+ font-weight: inherit;
+ color: inherit;
+ font-size: inherit;
+ font-style: inherit;
+ line-height: inherit;
+ margin-bottom: 0;
+ }
+ .wizard .wizard-body .wizard-content .step-title {
+ font-size: 20px;
+ margin: 0;
+ margin-bottom: 20px;
+ }
+ .wizard .wizard-body .wizard-content .step-description {
+ font-size: 14px;
+ color: #666;
+ line-height: inherit;
+ }
+ .wizard .wizard-body .wizard-content .panel.panel-default {
+ margin-top: 0;
+ padding: 30px;
+ }
+ .wizard .wizard-body .wizard-content .panel.panel-default .panel-body {
+ padding: 0;
+ }
+ .wizard .wizard-body .wizard-content .panel {
+ margin-bottom: 0;
+ }
+ .panel-default > .panel-heading {
+ border: none;
+ background-color: inherit;
+ }
+ .wizard .wizard-body .wizard-nav {
+ min-width: 250px;
+ padding: 30px;
+ background-color: #333;
+ margin-bottom: 0;
+ padding-bottom: 0;
+ }
+ .wizard .wizard-body .wizard-nav .nav li {
+ padding: 0;
+ margin-bottom: 30px;
+ }
+ .wizard .wizard-body .wizard-nav .nav li:last-child {
+ margin-bottom: 30px;
+ }
+ .wizard .wizard-body .wizard-nav .nav li a {
+ height: auto;
+ display: block;
+ vertical-align: initial;
+ min-height: 30px;
+ padding: 0;
+ }
+ .wizard .wizard-body .wizard-nav .nav li .step-marker {
+ top: auto;
+ width: 30px;
+ height: 30px;
+ color: #3fae2a;
+ border: 2px solid #3fae2a;
+ font-size: 16px;
+ background-color: #333;
+ }
+ .wizard .wizard-body .wizard-nav .nav li .step-name {
+ line-height: 1.3;
+ font-size: 16px;
+ margin-left: 40px;
+ position: absolute;
+ top: 50%;
+ transform: translateY(-50%);
+ }
+ .wizard .wizard-body .wizard-nav .nav li .step-index {
+ line-height: inherit;
+ position: absolute;
+ top: calc(50% + 1px);
+ transform: translateY(-50%);
+ left: 0;
+ right: 0;
+ }
+ .wizard .wizard-body .wizard-nav .nav li.completed .step-marker:after {
+ position: absolute;
+ top: calc(50% + 1px);
+ transform: translateY(-50%);
+ left: 1px;
+ right: 0;
+ font-family: "FontAwesome";
+ font-size: 16px;
+ content: "\f00c";
+ }
+ .wizard .wizard-body .wizard-nav .nav li.completed:after {
+ background-color: #3fae2a;
+ top: 30px;
+ left: 14px;
+ }
+ .wizard .wizard-body .wizard-nav .nav li.disabled.completed .step-marker {
+ background-color: #3fae2a;
+ border: 2px solid #3fae2a;
+ }
+ .wizard .wizard-body .wizard-footer {
+ padding: 15px 20px;
+ margin: 0;
+ position: absolute;
+ bottom: 0;
+ left: 0;
}
diff --cc ambari-web/app/styles/wizard.less
index 67fc5f8,b18e95d..b095a40
--- a/ambari-web/app/styles/wizard.less
+++ b/ambari-web/app/styles/wizard.less
@@@ -176,22 -244,11 +250,26 @@@
.progress {
margin-bottom: 0;
}
+ .pre-scrollable {
+ float: left;
+ max-height: 440px;
+ }
#confirm-hosts-table {
+ th:first-of-type {
+ width: 25px;
+ }
+ th:nth-of-type(2) {
+ width: 42%;
+ }
+ th:nth-of-type(3) {
+ width: 17%;
+ }
+ th:nth-of-type(4) {
+ width: 17%;
+ }
+ th:nth-of-type(5) {
+ width: 17%;
+ }
td.host {
max-width: 290px;
}
@@@ -206,10 -263,18 +284,23 @@@
#display-action {
visibility:visible;
}
+ .step3-table-checkbox {
+ label {
+ top: 1px;
+ }
++ }
+ .step3-table-progress {
+ .progress {
+ height: 8px;
+ margin: 5px 5px 5px 0;
+ border-radius: 2px;
+ width: 80%;
+ }
+ }
+ .step3-table-action {
+ .icon {
+ color: #999;
+ }
}
}
#warningsSection {
diff --cc ambari-web/app/templates/wizard/step0.hbs
index e38e7f2,738bb2b..aa6a1a3
--- a/ambari-web/app/templates/wizard/step0.hbs
+++ b/ambari-web/app/templates/wizard/step0.hbs
@@@ -17,22 -17,18 +17,18 @@@
}}
<div id="get-started" class="wizard-content col-md-9">
<h4 class="step-title">{{t installer.step0.body.header}}</h4>
- <p class="step-description">{{t installer.step0.body}}</p>
-
- <div class="panel panel-default">
+ <div class="panel panel-default">
<div class="panel-body">
+ <label class="control-label" for="cluster-name" {{QAAttr
"cluster-name-inscription"}}>
+ <p class="step-description">
+ {{t installer.step0.body}}
+ <span class="more-info" rel="popover" {{QAAttr
"cluster-name-tooltip"}} {{translateAttr
title="installer.step0.clusterName.tooltip.title"
data-content="installer.step0.clusterName.tooltip.content" }}></span>
+ </p>
+ </label>
<div {{bindAttr class="view.onError:has-error :form-group"}}>
- <label class="control-label" for="cluster-name" {{QAAttr
"cluster-name-inscription"}}>{{t installer.step0.clusterName}}
- <a href="javascript:void(null)"
- rel="popover"
- {{QAAttr "cluster-name-tooltip"}}
- {{translateAttr title="installer.step0.clusterName.tooltip.title"
- data-content="installer.step0.clusterName.tooltip.content"}}>{{t
common.learnMore}}</a>
- </label>
-
<div>
<div class="col-sm-3 cluster-name-input">
- {{view App.WizardStep0ViewClusterNameInput id="cluster-name"
valueBinding="content.cluster.name" placeholder="cluster name"
target="controller" classNames="form-control" data-qa="cluster-name-input"}}
+ {{view App.WizardStep0ViewClusterNameInput id="cluster-name"
valueBinding="content.cluster.name" placeholder="CLUSTER NAME"
target="controller" classNames="form-control" data-qa="cluster-name-input"}}
</div>
{{#if clusterNameError}}
<p class="help-block validation-block col-sm-9" {{QAAttr
"cluster-name-validation"}}>{{clusterNameError}}</p>
diff --cc ambari-web/app/templates/wizard/step4.hbs
index 68db717,4dfaeff..3f785db
--- a/ambari-web/app/templates/wizard/step4.hbs
+++ b/ambari-web/app/templates/wizard/step4.hbs
@@@ -17,8 -17,9 +17,8 @@@
}}
<div id="step4" class="wizard-content col-md-9">
- <h4 class="step-title">{{t installer.step4.headerFS}}</h4>
- <p class="step-description">{{t installer.step4.bodyFS}}</p>
+ <h4 class="step-header">{{t installer.step4.header}}</h4>
+ <p class="step-description">{{t installer.step4.body}}</p>
-
<div class="panel panel-default">
<div class="panel-body">
<table class="table table-hover">
--
To stop receiving notification emails like this one, please contact
ishan...@apache.org.
