Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 89E66200C1F for ; Fri, 3 Feb 2017 15:53:11 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 8884A160B6A; Fri, 3 Feb 2017 14:53:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id F2BCA160B6C for ; Fri, 3 Feb 2017 15:53:08 +0100 (CET) Received: (qmail 92271 invoked by uid 500); 3 Feb 2017 14:53:07 -0000 Mailing-List: contact commits-help@ambari.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: ambari-dev@ambari.apache.org Delivered-To: mailing list commits@ambari.apache.org Received: (qmail 90822 invoked by uid 99); 3 Feb 2017 14:53:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 03 Feb 2017 14:53:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 1E3D8F1740; Fri, 3 Feb 2017 14:53:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ncole@apache.org To: commits@ambari.apache.org Date: Fri, 03 Feb 2017 14:53:29 -0000 Message-Id: <11129e749c92443082523305d8339998@git.apache.org> In-Reply-To: <68fd00dbfa98457d890ae128ff26e2c7@git.apache.org> References: <68fd00dbfa98457d890ae128ff26e2c7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [25/50] [abbrv] ambari git commit: AMBARI-19819. Styling changes and spelling fixes (Madhan Mohan Reddy via pallavkul) archived-at: Fri, 03 Feb 2017 14:53:11 -0000 AMBARI-19819. Styling changes and spelling fixes (Madhan Mohan Reddy via pallavkul) Project: http://git-wip-us.apache.org/repos/asf/ambari/repo Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/a9ddb2fd Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/a9ddb2fd Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/a9ddb2fd Branch: refs/heads/branch-dev-patch-upgrade Commit: a9ddb2fd2014954cb35821f8ad1f33faa3ae1d95 Parents: b01438c Author: pallavkul Authored: Thu Feb 2 11:54:17 2017 +0530 Committer: pallavkul Committed: Thu Feb 2 11:54:17 2017 +0530 ---------------------------------------------------------------------- .../resources/ui/app/components/asset-config.js | 6 +- .../ui/app/components/bundle-config.js | 2 +- .../ui/app/components/flow-designer.js | 2 - .../resources/ui/app/components/job-config.js | 1 - .../resources/ui/app/components/job-details.js | 28 ++-- .../main/resources/ui/app/components/save-wf.js | 1 - .../src/main/resources/ui/app/styles/app.less | 168 +++++++++++++------ .../app/templates/components/archive-config.hbs | 4 +- .../ui/app/templates/components/arg-config.hbs | 2 +- .../app/templates/components/asset-config.hbs | 2 +- .../ui/app/templates/components/asset-list.hbs | 2 +- .../app/templates/components/asset-manager.hbs | 2 +- .../components/bundle-coord-config.hbs | 2 +- .../templates/components/bundle-job-details.hbs | 6 +- .../app/templates/components/coord-config.hbs | 6 +- .../templates/components/coord-job-details.hbs | 10 +- .../app/templates/components/date-with-expr.hbs | 4 +- .../templates/components/designer-errors.hbs | 2 +- .../templates/components/designer-workspace.hbs | 2 +- .../ui/app/templates/components/file-config.hbs | 6 +- .../app/templates/components/global-config.hbs | 4 +- .../ui/app/templates/components/help-icon.hbs | 3 + .../ui/app/templates/components/hive-action.hbs | 2 +- .../app/templates/components/hive2-action.hbs | 2 +- .../components/instance-list-config.hbs | 2 +- .../ui/app/templates/components/job-config.hbs | 8 +- .../ui/app/templates/components/job-details.hbs | 13 +- .../ui/app/templates/components/job-row.hbs | 2 +- .../templates/components/name-value-config.hbs | 2 +- .../ui/app/templates/components/pig-action.hbs | 2 +- .../templates/components/prepare-config-fs.hbs | 12 +- .../app/templates/components/prepare-config.hbs | 6 +- .../ui/app/templates/components/save-wf.hbs | 2 +- .../app/templates/components/shell-action.hbs | 2 +- .../app/templates/components/spark-action.hbs | 2 +- .../app/templates/components/sub-workflow.hbs | 2 +- .../components/workflow-action-editor.hbs | 2 +- .../templates/components/workflow-config.hbs | 2 +- .../components/workflow-job-details.hbs | 14 +- .../ui/app/validators/operand-length.js | 2 +- 40 files changed, 207 insertions(+), 137 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/components/asset-config.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/asset-config.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/asset-config.js index 62d3be3..cedb318 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/asset-config.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/asset-config.js @@ -52,9 +52,9 @@ export default Ember.Component.extend(Validations, { this.sendAction('saveAssetConfig'); } }.bind(this)).catch(function(data){ - model.set("inProgress", false); - return "There is some problem while checking asset name availability. Please try again."; - }); + this.set("inProgress", false); + this.set("assetErrorMsg", "There is some problem while checking asset name availability. Please try again."); + }.bind(this)); } } }); http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js index fe6dfd1..7b24d34 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/bundle-config.js @@ -31,7 +31,7 @@ const Validations = buildValidations({ validator('operand-length', { min : 1, dependentKeys: ['bundle','bundle.coordinators.[]'], - message : 'Alteast one coordinator is required', + message : 'At least one coordinator is required', disabled(model, attribute) { return !model.get('bundle'); } http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js index f897d48..ad5f3f8 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/flow-designer.js @@ -719,11 +719,9 @@ export default Ember.Component.extend(FindNodeMixin, Validations, { showingErrorMsgInDesigner(data){ var self = this, stackTraceMsg = self.getStackTrace(data.responseText); if(stackTraceMsg.length){ - self.set("isStackTraceVisible", true); self.set("stackTrace", stackTraceMsg); self.set("isStackTraceAvailable", true); } else { - self.set("isStackTraceVisible", false); self.set("isStackTraceAvailable", false); } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/components/job-config.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-config.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-config.js index beb15f6..dde012d 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-config.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-config.js @@ -224,7 +224,6 @@ export default Ember.Component.extend(Validations, { error: function(response) { console.log(response); this.set("savingInProgress",false); - this.set("isStackTraceVisible",true); this.showNotification({ "type": "error", "message": "Error occurred while saving "+ this.get('displayName').toLowerCase(), http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js index 91e1ce3..d0c5d11 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/job-details.js @@ -330,18 +330,22 @@ export default Ember.Component.extend({ }, doRefresh : function(){ var tab = this.$(this.get('currentTab')).prop('href'); - var currentTabHref = tab.substr(tab.indexOf('#')+1); - if(currentTabHref === 'jobLog'){ - this.send('getJobLog', this.get('logParams')); - }else if(currentTabHref === 'jobErrorLog'){ - this.send('getErrorLog'); - }else if(currentTabHref === 'jobAuditLog'){ - this.send('getAuditLog'); - }else if(currentTabHref === 'jobDag'){ - this.send('getJobDag'); - }else if(currentTabHref === 'coordActionReruns'){ - this.send('getCoordActionReruns'); - }else{ + if (tab) { + var currentTabHref = tab.substr(tab.indexOf('#')+1); + if(currentTabHref === 'jobLog'){ + this.send('getJobLog', this.get('logParams')); + }else if(currentTabHref === 'jobErrorLog'){ + this.send('getErrorLog'); + }else if(currentTabHref === 'jobAuditLog'){ + this.send('getAuditLog'); + }else if(currentTabHref === 'jobDag'){ + this.send('getJobDag'); + }else if(currentTabHref === 'coordActionReruns'){ + this.send('getCoordActionReruns'); + }else{ + this.sendAction('doRefresh'); + } + } else { this.sendAction('doRefresh'); } }, http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/components/save-wf.js ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/components/save-wf.js b/contrib/views/wfmanager/src/main/resources/ui/app/components/save-wf.js index 54d13ff..a2210a6 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/components/save-wf.js +++ b/contrib/views/wfmanager/src/main/resources/ui/app/components/save-wf.js @@ -103,7 +103,6 @@ export default Ember.Component.extend(Validations, { }.bind(this)).catch(function(response){ console.log(response); self.set("savingInProgress",false); - self.set("isStackTraceVisible",true); self.showNotification({ "type": "error", "message": "Error occurred while saving "+ self.get('displayName').toLowerCase(), http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less index 5080560..3707280 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less +++ b/contrib/views/wfmanager/src/main/resources/ui/app/styles/app.less @@ -17,13 +17,18 @@ @bgColor: #eee; @bgGreenActive: #5bb75b; -@moduleHeaderBgColor: #fafafa; +@navBarColor: #fafafa; +@tabPanelHeadingColor: #fff; +@moduleHeaderBgColor: #fff; @nodeDefaultHeight: 40px; @nodeDefaultWidth: 40px; @defaultRed: red; @defaultBorderRadius: 5px; @nodeActionBgColor: #E5E5E5; @defaultPropertiesEditorHeight: 350px; +@actionLinkColor: #49aebf; +@navTabAnchorColor: #777; +@navTabAnchorHighlightedColor: #555; body { background: @bgColor; @@ -33,6 +38,11 @@ body { a { color: #000; } + +.navbar-default { + background-color: @navBarColor; +} + .padding0 { padding: 0px; } @@ -86,7 +96,7 @@ a { } .container-custom { - background-color: @moduleHeaderBgColor; + background-color: @moduleHeaderBgColor !important; } .disabled { @@ -94,7 +104,7 @@ a { } #header { white-space: nowrap; - background: @bgGreenActive; + background: #101010; background-position: 10px; color: yellow; height: 50px; @@ -554,6 +564,7 @@ input:invalid { top:50px; left: 75%; z-index: 1; + margin: 3px 0; } #action_properties_dialog .modal-body { @@ -589,7 +600,8 @@ input:invalid { #killnode-manager-dialog .modal-dialog, #asset_manager_dialog .modal-dialog, #asset_config_dialog .modal-dialog, -#asset_list_dialog .modal-dialog { +#asset_list_dialog .modal-dialog, +#actionDetailsModal .modal-dialog { width: 800px; } #configureJob .modal-dialog{ @@ -607,21 +619,20 @@ input:invalid { #workflow_sla_dialog .panel-default > .panel-heading, #workflow_credentials_dialog .panel-default > .panel-heading, #configureWorkfowModal .panel-default > .panel-heading, +#configureJob .panel-default > .panel-heading, #workflow_parameters_dialog .panel-default > .panel-heading, #killnode-manager-dialog .panel-default > .panel-heading, #asset_manager_dialog .panel-default > .panel-heading, #asset_config_dialog .panel-default > .panel-heading, -#asset_list_dialog .panel-default > .panel-heading, - .whiteLabel, .whiteLabel:hover, .whiteLabel:focus, .whiteLabel:visited, .whiteLabel:active { - background-color: @bgGreenActive; - color: #fff; +#asset_list_dialog .panel-default > .panel-heading { + background-color: #f8f8f8; + color: @actionLinkColor; } -.btn-primary{ - background-color: @bgGreenActive !important; - border-color: #289028 !important; + +.whiteLabel, .whiteLabel:hover, .whiteLabel:focus, .whiteLabel:visited, .whiteLabel:active { color: #fff; } -.btn-primary:visited,.btn-primary:focus,.btn-primary:active,.btn-primary.active{ +.btn-primary, .btn-primary:visited, .btn-primary:focus, .btn-primary:active, .btn-primary.active { background-color: @bgGreenActive !important; border-color: #289028 !important; color: #fff; @@ -631,6 +642,16 @@ input:invalid { border-color: #289028 !important; color: #fff; } +.btn-secondary, .btn-secondary:visited, .btn-secondary:focus, .btn-secondary:active, .btn-secondary.active { + color: #333; + background-color: #ddd; + border-color: #ccc; +} +.btn-secondary:hover { + color: #333; + background-color: #ccc; + border-color: #ccc; +} ._actions_popup { padding: 4px; } @@ -712,7 +733,7 @@ input:invalid { display: none !important; } #search-bar .bootstrap-tagsinput { - width: 300px; + width: 350px; border-radius: 0px; line-height: 20px; vertical-align: top; @@ -781,13 +802,15 @@ input:invalid { border-radius: 0px; } -.listing thead { - background: #f5f5f5; -} +// .listing thead { +// background: #f5f5f5; +// } .listing th { - border-left : 1px solid #ddd; - border-bottom: 1px solid #ddd !important; + border: 0 !important; + padding: 8px 5px !important; + font-weight: normal; + color: #777; } .listing tr th:first-child { @@ -882,6 +905,10 @@ input:invalid { border-bottom: 1px solid #ddd; } +#dashboard { + border-top: 0; +} + #loading { position: absolute; top: 20%; @@ -1456,6 +1483,7 @@ input:invalid { .tab-panel-heading { margin-top: 2px; + background-color: @tabPanelHeadingColor; } .borderTopNone { @@ -1528,15 +1556,15 @@ input:invalid { .breadcrumb { padding: 0px; margin: 0px; + background-color: @moduleHeaderBgColor; } .breadcrumb-item { color: #777; - font-size: 11px; } .breadcrumb-item a { - color: #777; + color: @actionLinkColor; } .action-file-picker { @@ -1572,16 +1600,20 @@ input:invalid { width: 98%; } .asset-list-panel-header { - background-color: #f5f5f5; + background-color: #fff; border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; + border-top-right-radius: 0px; + border-top-right-radius: 0px; + border-left: 0; + border-right: 0; } .asset-list-panel-body { max-height: 200px; overflow-y: scroll; border-top-left-radius: 0px; border-top-right-radius: 0px; - border-top: 0px; + border: 0px; } #search-table td:first-child { width:5%; @@ -1623,17 +1655,11 @@ input:invalid { width: 100%; min-height: 100px; } -.displayBlock { - display : block; -} .no-asset-records { text-align: center; padding: 3px; overflow-y: auto; } -#projectsList .modal-dialog { - width:850px; -} .custom-action-xml{ width: 100%; min-height: 175px; @@ -1642,36 +1668,70 @@ input:invalid { width: 650px; top: 60px; } -.tab-pane #draftsTable, #projectsList #dashboard, .tab-pane .searchWorkflows { - display : none; +.action-link, .action-link:hover, .action-link:focus { + color: @actionLinkColor !important; +} +.table-striped > tbody > tr:nth-of-type(odd) { + background-color: #fff; } -#projectDeleteModal .modal-dialog { - width:500px; +.listing thead { + background: #fff; } -.projects-list { - white-space: nowrap; - width: 100%; - overflow: hidden; - text-overflow: ellipsis; +.panel-footer { + background-color: #fff; } -.proj-menu { - width:200px; +.table-bordered { + border: 0; } -.pl10 { - padding-left:10px; +.search-bar { + border-bottom: 1px solid #ddd; } -.fixed-col { - width:15%; +.edit-workflow-btn { + margin-top: 4px; + margin-right: 4px; } -.width100 { - white-space: nowrap; - width: 100px; - overflow: hidden; - text-overflow: ellipsis; +.nav-tabs > li > a { + color: @navTabAnchorColor; } -.l-input { - height: 30px; - width: 60%; - margin-bottom: 10px; - margin-right: 3px; -} \ No newline at end of file +.nav-tabs > li.active > a, .nav-tabs > li.active > a:hover, .nav-tabs > li.active > a:focus { + color: @navTabAnchorHighlightedColor; +} +.displayBlock { + display : block; +} +#projectsList .modal-dialog { + width:850px; +} +.tab-pane #draftsTable, #projectsList #dashboard, .tab-pane .searchWorkflows { + display : none; + } + #projectDeleteModal .modal-dialog { + width:500px; + } + .projects-list { + white-space: nowrap; + width: 100%; + overflow: hidden; + text-overflow: ellipsis; + } + .proj-menu { + width:200px; + } + .pl10 { + padding-left:10px; + } + .fixed-col { + width:15%; + } + .width100 { + white-space: nowrap; + width: 100px; + overflow: hidden; + text-overflow: ellipsis; + } + .l-input { + height: 30px; + width: 60%; + margin-bottom: 10px; + margin-right: 3px; + } http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/archive-config.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/archive-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/archive-config.hbs index 166a202..21524c0 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/archive-config.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/archive-config.hbs @@ -33,12 +33,12 @@
{{input type="text" class="form-control" value=archive placeholder="Archive"}} - +
- +
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/arg-config.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/arg-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/arg-config.hbs index e11d896..539d9fa 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/arg-config.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/arg-config.hbs @@ -38,7 +38,7 @@ {{input type="text" class="form-control" value=arg placeholder=title}}
- +
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-config.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-config.hbs index 7bc48d7..816b360 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-config.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-config.hbs @@ -51,7 +51,7 @@
- +
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-list.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-list.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-list.hbs index 7fd1236..453642d 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-list.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-list.hbs @@ -63,7 +63,7 @@
- +
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-manager.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-manager.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-manager.hbs index 6ca85c6..8a34333 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-manager.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/asset-manager.hbs @@ -68,7 +68,7 @@
- +
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-coord-config.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-coord-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-coord-config.hbs index 140ff0a..56cacd6 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-coord-config.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-coord-config.hbs @@ -22,7 +22,7 @@
{{input type="text" class="form-control" name="appPath" focus-out="showCoordinatorName" value=coordinator.appPath placeholder="Path of the coordinator file"}} - +
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-job-details.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-job-details.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-job-details.hbs index 97eb859..c780943 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-job-details.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/bundle-job-details.hbs @@ -70,8 +70,8 @@ {{#each model.bundleCoordJobs as |coordJob|}} - - {{coordJob.coordJobName}} + + {{coordJob.coordJobName}} {{coordJob.status}} {{coordJob.user}} {{coordJob.group}} @@ -97,7 +97,7 @@
- +
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs index 1c80312..7b607ca 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-config.hbs @@ -105,7 +105,7 @@
{{input type="text" class="form-control" name="appPath" focus-out="showWorkflowName" value=coordinator.workflow.appPath placeholder="Path of the workflow file"}} - +
@@ -199,10 +199,10 @@
- -
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-job-details.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-job-details.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-job-details.hbs index 1418121..b3f1097 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-job-details.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/coord-job-details.hbs @@ -96,8 +96,12 @@
{{#each model.actions as |actionInfo|}} - - + + {{#if actionInfo.externalId}} + + {{else}} + + {{/if}} @@ -121,7 +125,7 @@
-
Name
{{actionInfo.id}}
{{actionInfo.id}}{{actionInfo.id}}{{actionInfo.status}} {{actionInfo.externalId}} {{actionInfo.errorCode}}
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/date-with-expr.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/date-with-expr.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/date-with-expr.hbs index 4c86f3d..beba820 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/date-with-expr.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/date-with-expr.hbs @@ -24,10 +24,10 @@
- -
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-errors.hbs ---------------------------------------------------------------------- diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-errors.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-errors.hbs index 8b2911b..8438255 100644 --- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-errors.hbs +++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-errors.hbs @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. }} -
+
{{#if (or (gt errors.length 0) (gt validationErrors.length 0))}}
Name