External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-12 02:19:58 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2504 from kialam/scheduler-template-fix-datepicker

Browse Source 
Restore Date Picker field in Scheduler template.

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot] 2018-10-24 18:46:16 +00:00 committed by GitHub
commit 331e272be0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/lib/theme/index.less
View File

@ -92,6 +92,7 @@
@import '../../src/organizations/orgcards.block.less';
@import '../../src/scheduler/repeatFrequencyOptions.block.less';
@import '../../src/scheduler/schedulerForm.block.less';
@import '../../src/scheduler/schedulerDatePicker.block.less';
@import '../../src/scheduler/schedulerFormDetail.block.less';
@import '../../src/scheduler/schedulertime.block.less';
@import '../../src/scheduler/scheduleToggle.block.less';

37
awx/ui/client/src/scheduler/schedulerDatePicker.block.less Normal file
View File

@ -0,0 +1,37 @@
.DatePicker {
flex: 1 0 auto;
display: flex;
&-icon {
flex: initial;
padding: 6px 12px;
font-size: 14px;
border-radius: 4px 0 0 4px;
border: 1px solid @b7grey;
border-right: 0;
background-color: @default-bg;
}
&-icon:hover {
background-color: @f6grey;
}
&-icon:focus,
&-icon:active {
background-color: @f6grey;
}
&-input {
flex: 1 0 auto;
border-radius: 0 4px 4px 0;
border: 1px solid @b7grey;
padding: 6px 12px;
background-color: @fcgrey;
}
&-input:focus,
&-input:active {
outline-offset: 0;
outline: 0;
}
}

2
awx/ui/client/src/scheduler/schedulerDatePicker.directive.js
View File

@ -20,7 +20,7 @@ export default
inputClass: '&',
disabled: '=?'
},
templateUrl: templateUrl('system-tracking/date-picker/date-picker'),
templateUrl: templateUrl('scheduler/schedulerDatePicker'),
link: function(scope, element, attrs) {
var lang = window.navigator.languages ?
window.navigator.languages[0] :