You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by pa...@apache.org on 2017/02/02 06:25:39 UTC
ambari git commit: AMBARI-19819. Styling changes and spelling fixes
(Madhan Mohan Reddy via pallavkul)
Repository: ambari
Updated Branches:
refs/heads/trunk b01438c7d -> a9ddb2fd2
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/trunk
Commit: a9ddb2fd2014954cb35821f8ad1f33faa3ae1d95
Parents: b01438c
Author: pallavkul <pa...@gmail.com>
Authored: Thu Feb 2 11:54:17 2017 +0530
Committer: pallavkul <pa...@gmail.com>
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 @@
<div class="input-group">
{{input type="text" class="form-control" value=archive placeholder="Archive"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser" "archive"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser" "archive"}}>Browse</button>
</span>
</div>
</div>
<div class="col-xs-1">
- <input class="form-control btn btn-success" type="button" {{action "addArchive"}} value="+">
+ <input class="form-control btn btn-secondary" type="button" {{action "addArchive"}} value="+">
</div>
</div>
</div>
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}}
</div>
<div class="col-xs-1">
- <input class="form-control btn btn-success" type="button" value="+" {{action "addArg"}}>
+ <input class="form-control btn btn-secondary" type="button" value="+" {{action "addArg"}}>
</div>
</div>
</div>
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 @@
</form>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-secondary" data-dismiss="modal" {{action 'close'}}>Cancel</button>
+ <button type="button" class="btn btn-default" data-dismiss="modal" {{action 'close'}}>Cancel</button>
<button type="button" class="btn btn-primary" {{action 'save'}}>Save</button>
</div>
</div>
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 @@
</div>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-secondary" data-dismiss="modal" {{action 'close'}}>Cancel</button>
+ <button type="button" class="btn btn-default" data-dismiss="modal" {{action 'close'}}>Cancel</button>
<button type="button" class="btn btn-primary" disabled={{assetNotSelected}} {{action 'importAsset'}}>Import</button>
</div>
</div>
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 @@
</div>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-secondary" data-dismiss="modal" {{action 'close'}}>Cancel</button>
+ <button type="button" class="btn btn-default" data-dismiss="modal" {{action 'close'}}>Cancel</button>
</div>
</div>
</div>
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 @@
<div class="input-group">
{{input type="text" class="form-control" name="appPath" focus-out="showCoordinatorName" value=coordinator.appPath placeholder="Path of the coordinator file"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser" "coordinator.appPath"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser" "coordinator.appPath"}}>Browse</button>
<button class="btn btn-default" type="button" {{action "openTab" 'coord' coordinator.appPath}} name="button"><i class="fa fa-external-link"></i></button>
</span>
</div>
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 @@
</thead>
<tbody>
{{#each model.bundleCoordJobs as |coordJob|}}
- <tr {{action 'showCoord' coordJob.coordJobId}} class="{{if (eq actionInfo model.actionDetails) "active"}}">
- <td class="pointer">{{coordJob.coordJobName}}</td>
+ <tr class="{{if (eq actionInfo model.actionDetails) "active"}}">
+ <td class="pointer action-link" {{action 'showCoord' coordJob.coordJobId}}>{{coordJob.coordJobName}}</td>
<td>{{coordJob.status}}</td>
<td>{{coordJob.user}}</td>
<td>{{coordJob.group}}</td>
@@ -97,7 +97,7 @@
<div role="tabpanel" class="tab-pane" id="jobConfig">
<div class="panel panel-default">
<div class="panel-body preview">
- <table class="table table-striped configuration-property-table">
+ <table class="table table-striped configuration-property-table listing">
<thead>
<tr>
<th class="propertyName">Name</th>
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 @@
<div class="input-group">
{{input type="text" class="form-control" name="appPath" focus-out="showWorkflowName" value=coordinator.workflow.appPath placeholder="Path of the workflow file"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser" "coordinator.workflow.appPath"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser" "coordinator.workflow.appPath"}}>Browse</button>
<button class="btn btn-default" type="button" {{action "openTab" 'wf' coordinator.workflow.appPath}} name="button"><i class="fa fa-external-link"></i></button>
</span>
</div>
@@ -199,10 +199,10 @@
<div class="">
<label for="" class="control-label col-xs-2">Data Input Type</label>
<div class="btn-group">
- <button {{action 'toggleDataTnput' 'simple'}} type="button" class="btn btn-default {{if (eq coordinator.dataInputType 'simple') 'btn-primary' ''}} scope-btn">
+ <button {{action 'toggleDataTnput' 'simple'}} type="button" class="btn btn-default {{if (eq coordinator.dataInputType 'simple') 'btn-secondary' ''}} scope-btn">
Simple
</button>
- <button {{action 'toggleDataTnput' 'logical'}} type="button" class="btn btn-default {{if (eq coordinator.dataInputType 'logical') 'btn-primary' ''}} scope-btn">
+ <button {{action 'toggleDataTnput' 'logical'}} type="button" class="btn btn-default {{if (eq coordinator.dataInputType 'logical') 'btn-secondary' ''}} scope-btn">
Conditional
</button>
</div>
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 @@
</thead>
<tbody>
{{#each model.actions as |actionInfo|}}
- <tr {{action 'showWorkflow' actionInfo.externalId}} class="{{if (eq actionInfo model.actionDetails) "active"}}">
- <td class="pointer">{{actionInfo.id}}</td>
+ <tr class="{{if (eq actionInfo model.actionDetails) "active"}}">
+ {{#if actionInfo.externalId}}
+ <td class="pointer action-link" {{action 'showWorkflow' actionInfo.externalId}}>{{actionInfo.id}}</td>
+ {{else}}
+ <td>{{actionInfo.id}}</td>
+ {{/if}}
<td>{{actionInfo.status}}</td>
<td>{{actionInfo.externalId}}</td>
<td>{{actionInfo.errorCode}}</td>
@@ -121,7 +125,7 @@
<div role="tabpanel" class="tab-pane" id="jobConfig">
<div class="panel panel-default">
<div class="panel-body preview">
- <table class="table table-striped configuration-property-table">
+ <table class="table table-striped configuration-property-table listing">
<thead>
<tr>
<th class="propertyName">Name</th>
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 @@
<div class="col-xs-7">
<div class="input-group">
<div class="input-group-btn">
- <button onclick={{action (mut dateField.type) "date"}} type="button" class="btn btn-default {{if (eq dateField.type 'date') 'btn-primary' ''}} scope-btn">
+ <button onclick={{action (mut dateField.type) "date"}} type="button" class="btn btn-default {{if (eq dateField.type 'date') 'btn-secondary' ''}} scope-btn">
Date
</button>
- <button onclick={{action (mut dateField.type) "expr"}} type="button" class="btn btn-default {{if (eq dateField.type 'expr') 'btn-primary' ''}} scope-btn">
+ <button onclick={{action (mut dateField.type) "expr"}} type="button" class="btn btn-default {{if (eq dateField.type 'expr') 'btn-secondary' ''}} scope-btn">
Expression
</button>
</div>
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.
}}
-<div id="designer-errors" class="paddingtop10">
+<div id="designer-errors">
{{#if (or (gt errors.length 0) (gt validationErrors.length 0))}}
<div id="alert"class="alert alert-danger alert-dismissible fade in workflow-error" role="alert">
{{#if (gt errors.length 0)}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
index f7a93e0..0bd7195 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/designer-workspace.hbs
@@ -163,7 +163,7 @@
{{/if}}
{{#if showingWarning}}
{{#confirmation-dialog title="Confirm workflow reset"
- confirmationMessage="Any unsaved changes may be lost. Do you want to close this tab ?"
+ confirmationMessage="Any unsaved changes will be lost. Do you want to close this tab ?"
okBtnText="Continue" cancelBtnText="Cancel" onOk="closeTab"}}{{/confirmation-dialog}}
{{/if}}
<!--
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/file-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/file-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/file-config.hbs
index 66d3460..11066cb 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/file-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/file-config.hbs
@@ -23,7 +23,7 @@
<div class="input-group">
{{input type="text" class="form-control" value=file.value placeholder=title}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser" index}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser" index}}>Browse</button>
</span>
</div>
</div>
@@ -42,12 +42,12 @@
<div class="input-group">
{{input type="text" class="form-control" value=file placeholder=title}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser"}}>Browse</button>
</span>
</div>
</div>
<div class="col-xs-1">
- <input class="form-control btn btn-success" type="button" {{action "addFile"}} value="+">
+ <input class="form-control btn btn-secondary" type="button" {{action "addFile"}} value="+">
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/global-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/global-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/global-config.hbs
index 923d89e..e3d49ec 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/global-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/global-config.hbs
@@ -22,7 +22,7 @@
<button type="button" class="close" data-dismiss="modal" aria-label="Close" {{action 'close'}}>
<span aria-hidden="true">×</span>
</button>
- <h4 class="modal-title">Global Configuration</h4>
+ <h4 class="modal-title">Global Configurations</h4>
</div>
<div class="modal-body">
<form class="form-horizontal" id="global_properties">
@@ -57,7 +57,7 @@
</form>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-secondary" data-dismiss="modal" {{action 'close'}}>Cancel</button>
+ <button type="button" class="btn btn-default" data-dismiss="modal" {{action 'close'}}>Cancel</button>
<button type="button" class="btn btn-primary" {{action 'save'}}>Save</button>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/help-icon.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/help-icon.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/help-icon.hbs
index a853955..61893e2 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/help-icon.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/help-icon.hbs
@@ -20,3 +20,6 @@
<i class="fa fa-question-circle"></i>
</button>
</a>
+<a class="action-link hide" href="https://oozie.apache.org/docs/4.2.0/WorkflowFunctionalSpec.html" target="_blank">
+ Oozie docs
+</a>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hive-action.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hive-action.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hive-action.hbs
index eb959c3..3d59e23 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hive-action.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hive-action.hbs
@@ -33,7 +33,7 @@
<div class="input-group">
{{input type="text" class="form-control" name="script" value=actionModel.script placeholder="hive.hql"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser" "actionModel.script"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser" "actionModel.script"}}>Browse</button>
</span>
</div>
{{field-error model=this field='actionModel.script' showErrorMessage=showErrorMessage}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hive2-action.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hive2-action.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hive2-action.hbs
index 563cca8..8adf64c 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hive2-action.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/hive2-action.hbs
@@ -34,7 +34,7 @@
<div class="input-group">
{{input type="text" class="form-control" name="script" value=actionModel.script placeholder="hive.hql"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser" "actionModel.script"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser" "actionModel.script"}}>Browse</button>
</span>
</div>
{{field-error model=this field='actionModel.script' showErrorMessage=showErrorMessage}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/instance-list-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/instance-list-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/instance-list-config.hbs
index 94f4e39..266c84c 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/instance-list-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/instance-list-config.hbs
@@ -28,7 +28,7 @@
<div class="form-group">
{{#date-with-expr inputName="instance" label="Instance" inputPlaceholder="Instance" dateField=instance}}
<div class="col-xs-1">
- <input class="form-control btn btn-success" type="button" value="+" {{action "addInstance"}}>
+ <input class="form-control btn btn-secondary" type="button" value="+" {{action "addInstance"}}>
</div>
{{/date-with-expr}}
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-config.hbs
index 7ffdf5f..bca8dfa 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-config.hbs
@@ -45,7 +45,7 @@
<div class="input-group">
{{input class="form-control" type="text" name=path.name value=path.value}}
<span class="input-group-btn">
- <button type="button" class="btn btn-primary" {{action "selectFile" path.name}}>Browse</button>
+ <button type="button" class="btn btn-secondary" {{action "selectFile" path.name}}>Browse</button>
</span>
</div>
{{field-error model=this field='filePath' showErrorMessage=showErrorMessage}}
@@ -57,7 +57,7 @@
{{else if (and (eq type 'coord') containsParameteriedPaths)}}
<div class="col-xs-24">
<div class="alert alert-warning" role="alert">
- Workflow path contains variables. Please provide the absolute path to auto detect templatized variables. Skip this step if you have configured all the templatized varibales of the workflow in the coordinator.
+ Workflow path contains variables. Please provide the absolute path to auto detect templatized variables. Skip this step if you have configured all the templatized variables of the workflow in the coordinator.
</div>
</div>
<div class="row form-group">
@@ -68,7 +68,7 @@
<div class="input-group">
{{input class="form-control" type="text" name='wfPath' value=parameterizedWorkflowPath}}
<span class="input-group-btn">
- <button type="button" class="btn btn-primary" {{action "selectFile" 'wfPath'}}>Browse</button>
+ <button type="button" class="btn btn-secondary" {{action "selectFile" 'wfPath'}}>Browse</button>
</span>
</div>
{{field-error model=this field='filePath' showErrorMessage=showErrorMessage}}
@@ -100,7 +100,7 @@
<div class="input-group">
{{input class="form-control" name="filePath" type="text" value=filePath}}
<span class="input-group-btn">
- <button type="button" class="btn btn-primary" {{action "selectFile" "filePath"}}>Browse</button>
+ <button type="button" class="btn btn-secondary" {{action "selectFile" "filePath"}}>Browse</button>
</span>
</div>
{{field-error model=this field='filePath' showErrorMessage=showErrorMessage}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
index c783ad0..044e053 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-details.hbs
@@ -16,8 +16,12 @@
* limitations under the License.
}}
<div id="job-details" class="panel panel-default">
- <div class="panel-heading">
+ <div class="panel-heading container-custom">
<div class="pull-right">
+ <button type="button" class="btn btn-default" title="Refresh" {{action 'doRefresh'}}>
+ <i class="fa fa-refresh"></i>
+ </button>
+
{{#link-to 'design.dashboardtab' class="backto-dashboard"}}
<button type="button" class="btn btn-default" title="Workflow Dashboard">
<i class="fa fa-th"></i>
@@ -47,7 +51,6 @@
</li>
</ol>
</div>
- <span class="fa fa-refresh fa-1 pointer btn btn-default" title="Refresh" {{action 'doRefresh'}} aria-hidden="true"></span>
</div>
<div class="clearfix"></div>
</div>
@@ -67,9 +70,9 @@
<li role="presentation"><a href="#jobConfig" aria-controls="jobConfig" role="tab" data-toggle="tab">Configuration</a></li>
<li {{action 'getJobDefinition'}} role="presentation"><a href="#jobDefinition" aria-controls="jobDefinition" role="tab" data-toggle="tab">Definition</a></li>
<li role="presentation" class="pull-right">
- <button type="button" class="btn btn-success" title="Edit Workflow" {{action "editWorkflow" model.appPath}}>
- Edit Workflow
- </button>
+ <a class="pointer action-link" href="#" title="Edit Workflow" {{action "editWorkflow" model.appPath}}>
+ Edit Workflow
+ </a>
</li>
</ul>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-row.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-row.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-row.hbs
index 25d81dd..be9310e 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-row.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/job-row.hbs
@@ -26,7 +26,7 @@
{{/if}}
</td>
-<td {{action 'showJobDetails' job.id}} class="pointer"> {{job.appName}}
+<td {{action 'showJobDetails' job.id}} class="pointer action-link"> {{job.appName}}
</td>
<td class="{{job.status}}"> {{job.status}} </td>
<td> {{job.user}}</td>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/name-value-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/name-value-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/name-value-config.hbs
index f69a2d4..f0d2a63 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/name-value-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/name-value-config.hbs
@@ -51,7 +51,7 @@
{{input class="form-control" type="text" indValidations="required" name="value" value=propertyValue placeholder="value"}}
</div>
<div class="col-xs-1">
- <input class="form-control btn btn-success" type="button" {{action "addProperty"}} value="+">
+ <input class="form-control btn btn-secondary" type="button" {{action "addProperty"}} value="+">
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action.hbs
index d0fe490..84ce56c 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/pig-action.hbs
@@ -23,7 +23,7 @@
<div class="input-group">
{{input type="text" class="form-control" validations="required" name="script" value=actionModel.script placeholder="myscript.pig"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser" "actionModel.script"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser" "actionModel.script"}}>Browse</button>
</span>
</div>
{{field-error model=this field='actionModel.script' showErrorMessage=showErrorMessage}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-fs.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-fs.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-fs.hbs
index 545664f..9910071 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-fs.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config-fs.hbs
@@ -33,7 +33,7 @@
</select>
</div>
<div class="col-xs-1">
- <input class="form-control btn btn-success" type="button" {{action "addPrepare" index}} value="+">
+ <input class="form-control btn btn-secondary" type="button" {{action "addPrepare" index}} value="+">
</div>
{{#if (not-eq index 0)}}
<div class="col-xs-1">
@@ -48,7 +48,7 @@
<div class="input-group">
{{input type="text" class="form-control" value=prep.path placeholder="path of the directory"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowserForListItem" index "path"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowserForListItem" index "path"}}>Browse</button>
</span>
</div>
</div>
@@ -70,7 +70,7 @@
<div class="input-group">
{{input type="text" class="form-control" name="name" value=prep.path placeholder="Path"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowserForListItem" index "path"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowserForListItem" index "path"}}>Browse</button>
</span>
</div>
</div>
@@ -117,7 +117,7 @@
<div class="input-group">
{{input type="text" class="form-control" name="name" value=prep.source placeholder="Source"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowserForListItem" index "source"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowserForListItem" index "source"}}>Browse</button>
</span>
</div>
</div>
@@ -138,7 +138,7 @@
<div class="input-group">
{{input class="form-control" type="text" indValidations="required" name="value" value=prep.target placeholder="Target"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowserForListItem" index "target"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowserForListItem" index "target"}}>Browse</button>
</span>
</div>
</div>
@@ -161,7 +161,7 @@
<div class="input-group">
{{input type="text" class="form-control" name="name" value=prep.path placeholder="Path"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowserForListItem" index "path"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowserForListItem" index "path"}}>Browse</button>
</span>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config.hbs
index fab0d97..a9d6037 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/prepare-config.hbs
@@ -29,7 +29,7 @@
<div class="input-group">
{{input type="text" class="form-control" value=prep.path placeholder="path of the directory"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser" index}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser" index}}>Browse</button>
</span>
</div>
</div>
@@ -54,12 +54,12 @@
<div class="input-group">
{{input type="text" class="form-control" value=preparePath placeholder="path of the directory"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser"}}>Browse</button>
</span>
</div>
</div>
<div class="col-xs-1">
- <input class="form-control btn btn-success" type="button" {{action "addPrepare"}} value="+">
+ <input class="form-control btn btn-secondary" type="button" {{action "addPrepare"}} value="+">
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/save-wf.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/save-wf.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/save-wf.hbs
index 913dc04..aafae4a 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/save-wf.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/save-wf.hbs
@@ -48,7 +48,7 @@
<div class="input-group">
{{input class="form-control" type="text" name="{{type}}-path" value=filePath}}
<span class="input-group-btn">
- <button type="button" class="btn btn-primary" {{action "selectFile"}}>Browse</button>
+ <button type="button" class="btn btn-secondary" {{action "selectFile"}}>Browse</button>
</span>
</div>
{{field-error model=this field='filePath' showErrorMessage=showErrorMessage}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/shell-action.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/shell-action.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/shell-action.hbs
index 4673c732..2cd8207 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/shell-action.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/shell-action.hbs
@@ -24,7 +24,7 @@
<div class="input-group">
{{input type="text" class="form-control" name="exec" title="Command or the path of the Shell command to execute" value=actionModel.exec placeholder="Script path or shell command"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser" "actionModel.exec"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser" "actionModel.exec"}}>Browse</button>
</span>
</div>
{{field-error model=this field='actionModel.exec' showErrorMessage=showErrorMessage}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
index 5b7e7a3..de62e77 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/spark-action.hbs
@@ -32,7 +32,7 @@
{{input type="text" class="form-control" name="class" value=actionModel.jar placeholder="jar/python"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser" "actionModel.jar"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser" "actionModel.jar"}}>Browse</button>
</span>
</div>
{{field-error model=this field='actionModel.jar' showErrorMessage=showErrorMessage}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sub-workflow.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sub-workflow.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sub-workflow.hbs
index 2841188..139747f 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sub-workflow.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/sub-workflow.hbs
@@ -24,7 +24,7 @@
<div class="input-group">
{{input type="text" class="form-control" validations="required" name="appPath" value=actionModel.appPath placeholder="app path"}}
<span class="input-group-btn">
- <button class="btn btn-primary" type="button" {{action "openFileBrowser" "actionModel.appPath"}}>Browse</button>
+ <button class="btn btn-secondary" type="button" {{action "openFileBrowser" "actionModel.appPath"}}>Browse</button>
</span>
</div>
{{field-error model=this field='actionModel.appPath' showErrorMessage=showErrorMessage}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-action-editor.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-action-editor.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-action-editor.hbs
index bb089c0..0c569ec 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-action-editor.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-action-editor.hbs
@@ -102,7 +102,7 @@
</div>
</div>
<div class="modal-footer">
- <button type="button" class="btn btn-secondary" data-dismiss="modal" {{action 'closeEditor'}}>Cancel</button>
+ <button type="button" class="btn btn-default" data-dismiss="modal" {{action 'closeEditor'}}>Cancel</button>
<button type="button" class="btn btn-primary" {{action 'save'}}>Save</button>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-config.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-config.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-config.hbs
index d425bd0..0ca8618 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-config.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-config.hbs
@@ -41,7 +41,7 @@
<div class="input-group">
{{input class="form-control" type="text" value=filePath}}
<span class="input-group-btn">
- <button type="button" class="btn btn-primary" {{action "selectWorflowFile"}}>Browse</button>
+ <button type="button" class="btn btn-secondary" {{action "selectWorflowFile"}}>Browse</button>
</span>
</div>
{{input type="checkbox" checked=overwriteWorkflowPath}}Overwrite
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-job-details.hbs
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-job-details.hbs b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-job-details.hbs
index 89997aa..8865663 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-job-details.hbs
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/templates/components/workflow-job-details.hbs
@@ -84,15 +84,15 @@
</thead>
<tbody>
{{#each model.actions as |actionInfo|}}
- <tr {{action 'getActionDetails' actionInfo}} class="{{if (eq actionInfo model.actionDetails) "active"}}">
- <td class="pointer">{{actionInfo.name}}</td>
+ <tr class="{{if (eq actionInfo model.actionDetails) "active"}}">
+ <td class="pointer action-link" {{action 'getActionDetails' actionInfo}}>{{actionInfo.name}}</td>
<td>{{actionInfo.type}}</td>
<td>{{actionInfo.status}}</td>
<td>{{actionInfo.transition}}</td>
<td>{{actionInfo.startTime}}</td>
<td>{{actionInfo.endTime}}</td>
{{#unless (eq "-" actionInfo.consoleUrl)}}
- <td><a target="_blank" href="#" {{action 'openConsoleUrl' actionInfo.consoleUrl preventDefault=true}}><i class="fa fa-external-link" aria-hidden="true"></i></a></td>
+ <td><a target="_blank" href="#" {{action 'openConsoleUrl' actionInfo.consoleUrl preventDefault=true}}><i class="fa fa-external-link action-link" aria-hidden="true"></i></a></td>
{{else}}
<td>{{actionInfo.consoleUrl}}</td>
{{/unless}}
@@ -112,7 +112,7 @@
<li role="presentation"><a href="#actionConf" aria-controls="action-conf" role="tab" data-toggle="tab">Configuration</a></li>
</ul>
<div class="tab-content">
- <div role="tabpanel" class="tab-pane active">
+ <div role="tabpanel" class="tab-pane active" id="actionInfo">
{{#if model.actionDetails}}
{{#workflow-job-action-info actionInfo=model.actionDetails}}
{{/workflow-job-action-info}}
@@ -143,7 +143,7 @@
<div role="tabpanel" class="tab-pane" id="jobConfig">
<div class="panel panel-default">
<div class="panel-body preview">
- <table class="table table-striped configuration-property-table">
+ <table class="table table-striped configuration-property-table listing">
<thead>
<tr>
<th class="propertyName">Name</th>
@@ -231,11 +231,11 @@
</div>
<div class="row">
<div class="col-md-4 text-bold">Job URL</div>
- <div class="col-md-8"><a target="_blank" href="{{model.actionInfo.consoleUrl}}"><i class="fa fa-external-link" aria-hidden="true"></i></a></div>
+ <div class="col-md-8"><a target="_blank" href="{{model.actionInfo.consoleUrl}}"><i class="fa fa-external-link action-link" aria-hidden="true"></i></a></div>
</div>
<div class="row pull-right" {{action 'getActionDetails' model.actionInfo}}>
<div class="col-md-12">
- <a data-toggle="modal" href="#" data-target="#actionDetailsModal">More</a>
+ <a data-toggle="modal" href="#" data-target="#actionDetailsModal" class="action-link">More</a>
</div>
</div>
{{else}}
http://git-wip-us.apache.org/repos/asf/ambari/blob/a9ddb2fd/contrib/views/wfmanager/src/main/resources/ui/app/validators/operand-length.js
----------------------------------------------------------------------
diff --git a/contrib/views/wfmanager/src/main/resources/ui/app/validators/operand-length.js b/contrib/views/wfmanager/src/main/resources/ui/app/validators/operand-length.js
index b79596b..e60fc3d 100644
--- a/contrib/views/wfmanager/src/main/resources/ui/app/validators/operand-length.js
+++ b/contrib/views/wfmanager/src/main/resources/ui/app/validators/operand-length.js
@@ -25,7 +25,7 @@ const OperandLength = BaseValidator.extend({
if(options.message){
return options.message;
}
- return "Atleast two inputs are required";
+ return "At least two inputs are required";
}
}
});