shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-10-30 13:55:31 +03:00
Code Releases Activity

Makes notification toggles more responsive on smaller screens.

Browse Source
This commit is contained in:
mabashian 2019-09-27 15:40:57 -04:00 committed by beeankha
parent 9ed4e1682d
commit 3182197287
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
awx/ui/client/src/notifications/notifications.list.js
View File

@ -25,19 +25,20 @@ export default ['i18n', 'templateUrl', function(i18n, templateUrl){
name: {
key: true,
label: i18n._('Name'),
columnClass: 'col-md-4 col-sm-9 col-xs-9',
linkTo: '/#/notification_templates/{{notification.id}}'
columnClass: 'col-sm-9 col-xs-9',
linkTo: '/#/notification_templates/{{notification.id}}',
columnNgClass: "{'col-lg-4 col-md-2': showApprovalColumn, 'col-lg-5 col-md-3': !showApprovalColumn}"
},
notification_type: {
label: i18n._('Type'),
searchType: 'select',
searchOptions: [],
excludeModal: true,
columnClass: 'd-none d-sm-flex col-md-4 col-sm-3'
columnClass: 'd-none d-sm-flex col-lg-4 col-md-2 col-sm-3',
},
notification_templates_approvals: {
label: i18n._('Approval'),
columnClass: 'd-none d-md-flex justify-content-start col-md-1',
columnClass: 'd-none d-md-flex justify-content-start col-lg-1 col-md-2',
flag: 'notification_templates_approvals',
type: "toggle",
ngClick: "toggleNotification($event, notification.id, 'notification_templates_approvals')",
@ -58,7 +59,7 @@ export default ['i18n', 'templateUrl', function(i18n, templateUrl){
dataTipWatch: "schedule.play_tip",
dataPlacement: "right",
nosort: true,
columnClass: 'd-none d-md-flex justify-content-start col-md-1'
columnClass: 'd-none d-md-flex justify-content-start col-lg-1 col-md-2'
},
notification_templates_success: {
label: i18n._('Success'),
@ -70,11 +71,11 @@ export default ['i18n', 'templateUrl', function(i18n, templateUrl){
dataTipWatch: "schedule.play_tip",
dataPlacement: "right",
nosort: true,
columnClass: 'd-none d-md-flex justify-content-start col-md-1'
columnClass: 'd-none d-md-flex justify-content-start col-lg-1 col-md-2'
},
notification_templates_error: {
label: i18n._('Failure'),
columnClass: 'd-none d-md-flex justify-content-start col-md-1 NotifierList-lastColumn',
columnClass: 'd-none d-md-flex justify-content-start col-lg-1 col-md-2 NotifierList-lastColumn',
flag: 'notification_templates_error',
type: "toggle",
ngClick: "toggleNotification($event, notification.id, 'notification_templates_error')",

2
awx/ui/client/src/shared/column-sort/column-sort.partial.html
View File

@ -1,4 +1,4 @@
<div id="{{columnIterator}}-{{columnField}}-header" class="List-tableHeader list-header {{columnCustomClass}}" ng-click="columnNoSort !== 'true' && toggleColumnOrderBy()" ng-class="{'list-header-noSort' : columnNoSort === 'true'}" >
<div id="{{columnIterator}}-{{columnField}}-header" class="List-tableHeader list-header {{columnCustomClass}}" ng-click="columnNoSort !== 'true' && toggleColumnOrderBy()" >
{{columnLabel | translate}}
<i ng-if="columnNoSort !== 'true'" class="fa columnSortIcon" ng-class="orderByIcon()">
</div>

1
awx/ui/client/src/shared/list-generator/list-generator.factory.js
View File

@ -558,6 +558,7 @@ export default ['$compile', 'Attr', 'Icon',
column-no-sort="${list.fields[fld].nosort}"
column-label="${list.fields[fld].label}"
column-custom-class="${customClass}"
ng-class="${list.fields[fld].columnNgClass || `{'list-header-noSort': ${list.fields[fld].nosort ? true : false}}`}"
query-set="${list.iterator}_queryset">
</div>`;
}