AC-175 change the edit button to a view button. Edit button is now labeled 'Details' and the color is grey rather than green. Applied the color change to 'Hosts' and 'Events' button as well, so that we're consistent. Changes applied to Jobs, Job Events, and Job Detail pages.

This commit is contained in:
chouseknecht
2013-06-28 13:43:09 -04:00
parent 6e91131ee6
commit 361c085ce5
6 changed files with 51 additions and 17 deletions

View File

@@ -24,8 +24,42 @@
border-color: #e3e3e3; border-color: #e3e3e3;
} }
/* Attempt to make button heights consistent. For some reason success, info, etc. are
taller than plain .btn */
.btn-success, .btn-danger, .btn-info, .btn-primary {
padding-top: 1px;
padding-bottom: 1px;
}
.btn {
padding-left: 5px;
padding-right: 5px;
min-width: 28px;
}
.modal-footer .btn-success,
.modal-footer .btn-danger,
.modal-footer .btn-info,
.modal-footer .btn-primary {
padding-top: 3px;
padding-bottom: 4px;
}
.modal-footer .btn {
padding-left: 10px;
padding-right: 10px;
}
/* End btn heights */
.icon-plus {
font-size: 10px;
}
.container-fluid { .container-fluid {
min-height: 700px ; min-height: 700px;
} }
.navbar-fixed-top .container { .navbar-fixed-top .container {

View File

@@ -212,7 +212,7 @@ angular.module('JobFormDefinition', [])
label: 'Hosts', label: 'Hosts',
icon: 'icon-th-large', icon: 'icon-th-large',
ngClick: "jobSummary()", ngClick: "jobSummary()",
"class": 'btn-info btn-small', "class": 'btn btn-small',
awToolTip: 'View host summary', awToolTip: 'View host summary',
mode: 'all' mode: 'all'
}, },
@@ -220,7 +220,7 @@ angular.module('JobFormDefinition', [])
label: 'Events', label: 'Events',
icon: 'icon-list-ul', icon: 'icon-list-ul',
ngClick: "jobEvents()", ngClick: "jobEvents()",
"class": 'btn-info btn-small', "class": 'btn btn-small',
awToolTip: 'Edit job events', awToolTip: 'Edit job events',
mode: 'all' mode: 'all'
} }

View File

@@ -62,10 +62,10 @@ angular.module('JobEventsListDefinition', [])
mode: 'all' mode: 'all'
}, },
edit: { edit: {
label: 'Edit', label: 'Details',
ngClick: "jobDetails()", ngClick: "jobDetails()",
icon: 'icon-edit', icon: 'icon-zoom-in',
"class": 'btn-small btn-success', "class": 'btn btn-small',
awToolTip: 'Edit job details', awToolTip: 'Edit job details',
mode: 'all' mode: 'all'
}, },
@@ -73,7 +73,7 @@ angular.module('JobEventsListDefinition', [])
label: 'Hosts', label: 'Hosts',
icon: 'icon-th-large', icon: 'icon-th-large',
ngClick: "jobSummary()", ngClick: "jobSummary()",
"class": 'btn-info btn-small', "class": 'btn btn-small',
awToolTip: 'View host summary', awToolTip: 'View host summary',
mode: 'all' mode: 'all'
} }

View File

@@ -57,10 +57,10 @@ angular.module('JobHostDefinition', [])
mode: 'all' mode: 'all'
}, },
edit: { edit: {
label: 'Edit', label: 'Details',
icon: 'icon-edit', icon: 'icon-edit',
ngClick: "jobDetails()", ngClick: "jobDetails()",
"class": 'btn-success btn-small', "class": 'btn btn-small',
awToolTip: 'Edit job details', awToolTip: 'Edit job details',
mode: 'all' mode: 'all'
}, },
@@ -68,7 +68,7 @@ angular.module('JobHostDefinition', [])
label: 'Events', label: 'Events',
icon: 'icon-list-ul', icon: 'icon-list-ul',
ngClick: "jobEvents()", ngClick: "jobEvents()",
"class": 'btn-info btn-small', "class": 'btn btn-small',
awToolTip: 'View job events', awToolTip: 'View job events',
mode: 'all' mode: 'all'
} }

View File

@@ -69,7 +69,7 @@ angular.module('JobsListDefinition', [])
label: 'Hosts', label: 'Hosts',
icon: 'icon-th-large', icon: 'icon-th-large',
ngClick: "viewSummary(\{{ job.id \}\}, '\{\{ job.name \}\}')", ngClick: "viewSummary(\{{ job.id \}\}, '\{\{ job.name \}\}')",
"class": 'btn-info btn-small', "class": 'btn btn-small',
awToolTip: 'View host summary', awToolTip: 'View host summary',
ngDisabled: "job.status == 'new'" ngDisabled: "job.status == 'new'"
}, },
@@ -78,16 +78,16 @@ angular.module('JobsListDefinition', [])
icon: 'icon-list-ul', icon: 'icon-list-ul',
mode: 'all', mode: 'all',
ngClick: "viewEvents(\{{ job.id \}\}, '\{\{ job.name \}\}')", ngClick: "viewEvents(\{{ job.id \}\}, '\{\{ job.name \}\}')",
"class": 'btn-info btn-small', "class": 'btn btn-small',
awToolTip: 'View events', awToolTip: 'View events',
ngDisabled: "job.status == 'new'" ngDisabled: "job.status == 'new'"
}, },
edit: { edit: {
icon: 'icon-edit', label: 'Details',
label: 'Edit', icon: 'icon-zoom-in',
ngClick: "editJob(\{\{ job.id \}\}, '\{\{ job.name \}\}')", ngClick: "editJob(\{\{ job.id \}\}, '\{\{ job.name \}\}')",
"class": 'btn-success btn-small', "class": 'btn btn-small',
awToolTip: 'Edit job details' awToolTip: 'View job details'
}, },
rerun: { rerun: {
icon: 'icon-retweet', icon: 'icon-retweet',

View File

@@ -576,7 +576,7 @@ angular.module('FormGenerator', ['GeneratorHelpers', 'ngCookies'])
var act; var act;
for (action in this.form.statusActions) { for (action in this.form.statusActions) {
act = this.form.statusActions[action]; act = this.form.statusActions[action];
html += "<button " + this.attr(act, 'ngClick') + "class=\"btn"; html += "<button " + this.attr(act, 'ngClick') + "class=\"btn btn-small";
html += (act['class']) ? " " + act['class'] : ""; html += (act['class']) ? " " + act['class'] : "";
html += "\" "; html += "\" ";
html += (act.awToolTip) ? this.attr(act,'awToolTip') : ""; html += (act.awToolTip) ? this.attr(act,'awToolTip') : "";