File tree 10 files changed +15
-666
lines changed
10 files changed +15
-666
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -88,20 +88,19 @@ horizon.forms = {
88
88
datepicker : function ( ) {
89
89
var startDate = $ ( 'input#id_start' ) . datepicker ( )
90
90
. on ( 'changeDate' , function ( ev ) {
91
- if ( ev . date . valueOf ( ) > endDate . date . valueOf ( ) ) {
92
- var newDate = new Date ( ev . date ) ;
91
+ if ( ev . dates [ 0 ] . valueOf ( ) > endDate . dates [ 0 ] . valueOf ( ) ) {
92
+ var newDate = new Date ( ev . dates [ 0 ] ) ;
93
93
newDate . setDate ( newDate . getDate ( ) + 1 ) ;
94
- endDate . setValue ( newDate ) ;
94
+ endDate . setDate ( newDate ) ;
95
95
$ ( 'input#id_end' ) [ 0 ] . focus ( ) ;
96
96
}
97
97
startDate . hide ( ) ;
98
+ endDate . setStartDate ( ev . dates [ 0 ] ) ;
98
99
endDate . update ( ) ;
99
100
} ) . data ( 'datepicker' ) ;
100
101
101
102
var endDate = $ ( 'input#id_end' ) . datepicker ( {
102
- onRender : function ( date ) {
103
- return date . valueOf ( ) < startDate . date . valueOf ( ) ? 'disabled' : '' ;
104
- }
103
+ startDate : startDate ? startDate . dates [ 0 ] : null
105
104
} ) . on ( 'changeDate' , function ( ev ) {
106
105
endDate . hide ( ) ;
107
106
} ) . data ( 'datepicker' ) ;
Original file line number Diff line number Diff line change 27
27
< script src ="{{ STATIC_URL }}horizon/lib/d3.js " type ="text/javascript " charset ="utf-8 "> </ script >
28
28
29
29
< script src ="{{ STATIC_URL }}bootstrap/js/bootstrap.js " type ="text/javascript " charset ="utf-8 "> </ script >
30
- < script src ='{{ STATIC_URL }}bootstrap/js /bootstrap-datepicker.js ' type ='text/javascript ' charset ='utf-8 '> </ script >
30
+ < script src ='{{ STATIC_URL }}horizon/lib/bootstrap_datepicker /bootstrap-datepicker.js ' type ='text/javascript ' charset ='utf-8 '> </ script >
31
31
32
32
< script src ="{{ STATIC_URL }}horizon/lib/hogan.js " type ="text/javascript " charset ='utf-8 '> </ script >
33
33
Original file line number Diff line number Diff line change 26
26
import xstatic .pkg .angular
27
27
import xstatic .pkg .angular_cookies
28
28
import xstatic .pkg .angular_mock
29
+ import xstatic .pkg .bootstrap_datepicker
29
30
import xstatic .pkg .d3
30
31
import xstatic .pkg .font_awesome
31
32
import xstatic .pkg .hogan
159
160
xstatic .main .XStatic (xstatic .pkg .angular_cookies ).base_dir ),
160
161
('horizon/lib/angular' ,
161
162
xstatic .main .XStatic (xstatic .pkg .angular_mock ).base_dir ),
163
+ ('horizon/lib/bootstrap_datepicker' ,
164
+ xstatic .main .XStatic (xstatic .pkg .bootstrap_datepicker ).base_dir ),
162
165
('horizon/lib' ,
163
166
xstatic .main .XStatic (xstatic .pkg .d3 ).base_dir ),
164
167
('horizon/lib' ,
Original file line number Diff line number Diff line change 26
26
import xstatic .pkg .angular
27
27
import xstatic .pkg .angular_cookies
28
28
import xstatic .pkg .angular_mock
29
+ import xstatic .pkg .bootstrap_datepicker
29
30
import xstatic .pkg .d3
30
31
import xstatic .pkg .font_awesome
31
32
import xstatic .pkg .hogan
156
157
xstatic .main .XStatic (xstatic .pkg .angular_cookies ).base_dir ),
157
158
('horizon/lib/angular' ,
158
159
xstatic .main .XStatic (xstatic .pkg .angular_mock ).base_dir ),
160
+ ('horizon/lib/bootstrap_datepicker' ,
161
+ xstatic .main .XStatic (xstatic .pkg .bootstrap_datepicker ).base_dir ),
159
162
('horizon/lib' ,
160
163
xstatic .main .XStatic (xstatic .pkg .d3 ).base_dir ),
161
164
('horizon/lib' ,
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -4,7 +4,6 @@ $font-size-base: 13px;
4
4
$modal-md : 732px ;
5
5
6
6
@import " /bootstrap/scss/bootstrap" ;
7
- @import " /bootstrap/scss/_datepicker" ;
8
7
@import " _variables" ;
9
8
@import " _accordion_nav" ;
10
9
Original file line number Diff line number Diff line change 3
3
{% compress css %}
4
4
< link href ='{{ STATIC_URL }}dashboard/scss/horizon.scss ' type ='text/scss ' media ='screen ' rel ='stylesheet ' />
5
5
< link href ='{{ STATIC_URL }}dashboard/css/rickshaw.css ' type ='text/css ' media ='screen ' rel ='stylesheet ' />
6
+ < link href ='{{ STATIC_URL }}horizon/lib/bootstrap_datepicker/datepicker3.css ' type ='text/css ' media ='screen ' rel ='stylesheet ' />
6
7
< link href ='{{ STATIC_URL }}dashboard/scss/horizon_charts.scss ' type ='text/scss ' media ='screen ' rel ='stylesheet ' />
7
8
< link href ='{{ STATIC_URL }}dashboard/scss/horizon_workflow.scss ' type ='text/scss ' media ='screen ' rel ='stylesheet ' />
8
9
< link href ="{{ STATIC_URL }}horizon/lib/font-awesome/scss/font-awesome.scss " type ="text/scss " media ="screen " rel ="stylesheet " />
Original file line number Diff line number Diff line change @@ -35,6 +35,7 @@ xstatic>=1.0.0 # MIT License
35
35
xstatic-angular >= 1.2.1.1 # MIT License
36
36
xstatic-angular-cookies >= 1.2.1.1 # MIT License
37
37
xstatic-angular-mock >= 1.2.1.1 # MIT License
38
+ xstatic-bootstrap-datepicker >= 1.3.1.0 # Apache 2.0 License
38
39
xstatic-d3 >= 3.1.6.2 # BSD License (3 clause)
39
40
xstatic-hogan >= 2.0.0.2 # Apache 2.0 License
40
41
xstatic-font-awesome >= 4.1.0 # SIL OFL 1.1 License, MIT License
Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ set -o errexit
6
6
# Increment me any time the environment should be rebuilt.
7
7
# This includes dependency changes, directory renames, etc.
8
8
# Simple integer sequence: 1, 2, 3...
9
- environment_version=45
9
+ environment_version=46
10
10
# --------------------------------------------------------#
11
11
12
12
function usage {
You can’t perform that action at this time.
0 commit comments