mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-05 12:48:00 +02:00
Code Issues Releases Wiki Activity

Update datarangepicker to 1.3.2

Browse Source
This commit is contained in:
Awilum
2014-02-16 01:01:08 +02:00
parent c003072a5d
commit 3339ad0ce5
2 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
public/assets/css/daterangepicker-bs3.css
View File

@@ -247,3 +247,16 @@
width: 50px; width: 50px;
margin-bottom: 0; margin-bottom: 0;
} }
.daterangepicker_start_input {
float: left;
}
.daterangepicker_end_input {
float: left;
padding-left: 11px
}
.daterangepicker th.month {
width: auto;
}

16
public/assets/js/daterangepicker.js
View File

@@ -1,7 +1,7 @@
/** /**
* @version: 1.3 * @version: 1.3.2
* @author: Dan Grossman http://www.dangrossman.info/ * @author: Dan Grossman http://www.dangrossman.info/
* @date: 2014-01-14 * @date: 2014-01-22
* @copyright: Copyright (c) 2012-2014 Dan Grossman. All rights reserved. * @copyright: Copyright (c) 2012-2014 Dan Grossman. All rights reserved.
* @license: Licensed under Apache License v2.0. See http://www.apache.org/licenses/LICENSE-2.0 * @license: Licensed under Apache License v2.0. See http://www.apache.org/licenses/LICENSE-2.0
* @website: http://www.improvely.com/ * @website: http://www.improvely.com/
@@ -22,11 +22,11 @@
'<div class="calendar right"></div>' + '<div class="calendar right"></div>' +
'<div class="ranges">' + '<div class="ranges">' +
'<div class="range_inputs">' + '<div class="range_inputs">' +
'<div class="daterangepicker_start_input" style="float: left">' + '<div class="daterangepicker_start_input">' +
'<label for="daterangepicker_start"></label>' + '<label for="daterangepicker_start"></label>' +
'<input class="input-mini" type="text" name="daterangepicker_start" value="" disabled="disabled" />' + '<input class="input-mini" type="text" name="daterangepicker_start" value="" disabled="disabled" />' +
'</div>' + '</div>' +
'<div class="daterangepicker_end_input" style="float: left; padding-left: 11px">' + '<div class="daterangepicker_end_input">' +
'<label for="daterangepicker_end"></label>' + '<label for="daterangepicker_end"></label>' +
'<input class="input-mini" type="text" name="daterangepicker_end" value="" disabled="disabled" />' + '<input class="input-mini" type="text" name="daterangepicker_end" value="" disabled="disabled" />' +
'</div>' + '</div>' +
@@ -184,6 +184,10 @@
this.locale.daysOfWeek = options.locale.daysOfWeek.slice(); this.locale.daysOfWeek = options.locale.daysOfWeek.slice();
} }
if (typeof options.locale.monthNames == 'object') {
this.locale.monthNames = options.locale.monthNames.slice();
}
if (typeof options.locale.firstDay == 'number') { if (typeof options.locale.firstDay == 'number') {
this.locale.firstDay = options.locale.firstDay; this.locale.firstDay = options.locale.firstDay;
var iterator = options.locale.firstDay; var iterator = options.locale.firstDay;
@@ -387,7 +391,7 @@
if (!this.timePicker) if (!this.timePicker)
this.endDate = this.endDate.startOf('day'); this.endDate = this.endDate.startOf('day');
this.endDate = this.endDate.clone(); this.oldEndDate = this.endDate.clone();
this.updateView(); this.updateView();
this.updateCalendars(); this.updateCalendars();
@@ -840,7 +844,7 @@
dateHtml = this.renderDropdowns(calendar[1][1], minDate, maxDate); dateHtml = this.renderDropdowns(calendar[1][1], minDate, maxDate);
} }
html += '<th colspan="5" style="width: auto">' + dateHtml + '</th>'; html += '<th colspan="5" class="month">' + dateHtml + '</th>';
if (!maxDate || maxDate.isAfter(calendar[1][1])) { if (!maxDate || maxDate.isAfter(calendar[1][1])) {
html += '<th class="next available"><i class="fa fa-arrow-right icon-arrow-right glyphicon glyphicon-arrow-right"></i></th>'; html += '<th class="next available"><i class="fa fa-arrow-right icon-arrow-right glyphicon glyphicon-arrow-right"></i></th>';
} else { } else {