diff --git a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less
index 6b00dc76f5..9e0cc73720 100644
--- a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less
+++ b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.block.less
@@ -35,5 +35,6 @@
margin-bottom: 0;
max-height: 200px;
overflow: scroll;
+ overflow-x: auto;
color: @as-detail-changes-txt;
}
diff --git a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html
index f5d5acf553..67e4452ebc 100644
--- a/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html
+++ b/awx/ui/client/src/activity-stream/streamDetailModal/streamDetailModal.partial.html
@@ -22,7 +22,7 @@
diff --git a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less
index 102188034d..0903b01c74 100644
--- a/awx/ui/client/src/dashboard/lists/dashboard-list.block.less
+++ b/awx/ui/client/src/dashboard/lists/dashboard-list.block.less
@@ -32,34 +32,21 @@
}
.DashboardList-viewAll {
- color: @btn-txt;
- background-color: @btn-bg;
- font-size: 12px;
- border: 1px solid @default-icon-hov;
- border-radius: 5px;
+ font-size: 11px;
margin-right: 15px;
- margin-top: 10px;
+ margin-top: 13px;
margin-bottom: 10px;
padding-left: 10px;
padding-right: 10px;
padding-bottom: 5px;
padding-top: 5px;
- transition: background-color 0.2s;
-}
-
-.DashboardList-viewAll:hover {
- color: @btn-txt;
- background-color: @btn-bg-hov;
-}
-
-.DashboardList-viewAll:focus {
- color: @btn-txt;
}
.DashboardList-container {
flex: 1;
width: 100%;
padding: 20px;
+ padding-top: 0;
}
.DashboardList-tableHeader--name {
diff --git a/awx/ui/client/src/forms/Groups.js b/awx/ui/client/src/forms/Groups.js
index b5c876c3b9..22c33094f1 100644
--- a/awx/ui/client/src/forms/Groups.js
+++ b/awx/ui/client/src/forms/Groups.js
@@ -43,7 +43,7 @@ export default
label: 'Variables',
type: 'textarea',
class: 'Form-textAreaLabel Form-formGroup--fullWidth',
- rows: 12,
+ rows: 6,
'default': '---',
dataTitle: 'Group Variables',
dataPlacement: 'right',
diff --git a/awx/ui/client/src/forms/Inventories.js b/awx/ui/client/src/forms/Inventories.js
index e7106b8277..b78e16064d 100644
--- a/awx/ui/client/src/forms/Inventories.js
+++ b/awx/ui/client/src/forms/Inventories.js
@@ -78,7 +78,7 @@ angular.module('InventoryFormDefinition', ['ScanJobsListDefinition'])
},
close: {
ngClick: 'formCancel()',
- ngHide: '(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
+ ngShow: '!(inventory_obj.summary_fields.user_capabilities.edit || canAdd)'
},
save: {
ngClick: 'formSave()',
diff --git a/awx/ui/client/src/helpers/Jobs.js b/awx/ui/client/src/helpers/Jobs.js
index 9f64ac8906..d7649d1c33 100644
--- a/awx/ui/client/src/helpers/Jobs.js
+++ b/awx/ui/client/src/helpers/Jobs.js
@@ -233,7 +233,7 @@ export default
hdr: hdr,
body: (action_label === 'cancel' || job.status === 'new') ? cancelBody : deleteBody,
action: action,
- actionText: (action_label === 'cancel' || job.status === 'new') ? "YES" : "DELETE"
+ actionText: (action_label === 'cancel' || job.status === 'new') ? "OK" : "DELETE"
});
});
diff --git a/awx/ui/client/src/inventories/add/inventory-add.controller.js b/awx/ui/client/src/inventories/add/inventory-add.controller.js
index 7f08e716a6..e6f9b7e3a3 100644
--- a/awx/ui/client/src/inventories/add/inventory-add.controller.js
+++ b/awx/ui/client/src/inventories/add/inventory-add.controller.js
@@ -11,10 +11,16 @@
*/
function InventoriesAdd($scope, $rootScope, $compile, $location, $log,
- $stateParams, GenerateForm, InventoryForm, Rest, Alert, ProcessErrors,
+ $stateParams, GenerateForm, InventoryForm, rbacUiControlService, Rest, Alert, ProcessErrors,
ClearScope, GetBasePath, ParseTypeChange, Wait, ToJSON,
$state) {
+ $scope.canAdd = false;
+ rbacUiControlService.canAdd(GetBasePath('inventory'))
+ .then(function(canAdd) {
+ $scope.canAdd = canAdd;
+ });
+
Rest.setUrl(GetBasePath('inventory'));
Rest.options()
.success(function(data) {
@@ -91,7 +97,7 @@ function InventoriesAdd($scope, $rootScope, $compile, $location, $log,
}
export default ['$scope', '$rootScope', '$compile', '$location',
- '$log', '$stateParams', 'GenerateForm', 'InventoryForm', 'Rest', 'Alert',
+ '$log', '$stateParams', 'GenerateForm', 'InventoryForm', 'rbacUiControlService', 'Rest', 'Alert',
'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange',
'Wait', 'ToJSON', '$state', InventoriesAdd
];
diff --git a/awx/ui/client/src/inventories/edit/inventory-edit.controller.js b/awx/ui/client/src/inventories/edit/inventory-edit.controller.js
index ba6de0f183..3e26dec8dc 100644
--- a/awx/ui/client/src/inventories/edit/inventory-edit.controller.js
+++ b/awx/ui/client/src/inventories/edit/inventory-edit.controller.js
@@ -32,7 +32,7 @@ function InventoriesEdit($scope, $rootScope, $compile, $location,
form.formFieldSize = null;
$scope.inventory_id = inventory_id;
- $scope.$watch('invnentory_obj.summary_fields.user_capabilities.edit', function(val) {
+ $scope.$watch('inventory_obj.summary_fields.user_capabilities.edit', function(val) {
if (val === false) {
$scope.canAdd = false;
}
diff --git a/awx/ui/client/src/lists/AllJobs.js b/awx/ui/client/src/lists/AllJobs.js
index 16a37e5c04..051375f157 100644
--- a/awx/ui/client/src/lists/AllJobs.js
+++ b/awx/ui/client/src/lists/AllJobs.js
@@ -16,6 +16,8 @@ export default
index: false,
hover: true,
well: false,
+ title: false,
+
fields: {
status: {
label: '',
diff --git a/awx/ui/client/src/lists/Projects.js b/awx/ui/client/src/lists/Projects.js
index bf8fde2d03..0a03058242 100644
--- a/awx/ui/client/src/lists/Projects.js
+++ b/awx/ui/client/src/lists/Projects.js
@@ -42,14 +42,14 @@ export default
scm_revision: {
label: i18n._('Revision'),
excludeModal: true,
- columnClass: 'col-lg-3 col-md-2 col-sm-3 hidden-xs',
+ columnClass: 'col-lg-4 col-md-2 col-sm-3 hidden-xs',
class: 'List-staticColumnAdjacent--monospace'
},
scm_type: {
label: i18n._('Type'),
ngBind: 'project.type_label',
excludeModal: true,
- columnClass: 'col-lg-3 col-md-2 col-sm-3 hidden-xs'
+ columnClass: 'col-lg-2 col-md-2 col-sm-3 hidden-xs'
},
last_updated: {
label: i18n._('Last Updated'),
diff --git a/awx/ui/client/src/partials/jobs.html b/awx/ui/client/src/partials/jobs.html
index 00de9af821..46f7b09761 100644
--- a/awx/ui/client/src/partials/jobs.html
+++ b/awx/ui/client/src/partials/jobs.html
@@ -16,7 +16,7 @@
-
+
diff --git a/awx/ui/client/src/shared/list-generator/list-generator.factory.js b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
index fd664dc167..100ab608ba 100644
--- a/awx/ui/client/src/shared/list-generator/list-generator.factory.js
+++ b/awx/ui/client/src/shared/list-generator/list-generator.factory.js
@@ -134,7 +134,7 @@ export default ['$location', '$compile', '$rootScope', 'Attr', 'Icon',
base, action, fld, cnt, field_action, fAction, itm;
if (options.mode !== 'lookup') {
- if (options.title !== false) {
+ if (options.title !== false && list.title !== false) {
html += "