mirror of
https://github.com/valitydev/gentelella.git
synced 2024-11-06 00:05:21 +00:00
Update bootstrap-daterangepicker
This commit is contained in:
parent
35d44daad9
commit
5a521ededa
@ -34,7 +34,7 @@
|
||||
"bootstrap-progressbar": "^0.9.0",
|
||||
"iCheck": "icheck#^1.0.2",
|
||||
"Flot": "flot#^0.8.3",
|
||||
"bootstrap-daterangepicker": "^2.1.19",
|
||||
"bootstrap-daterangepicker": "git@github.com:christianesperar/bootstrap-daterangepicker.git#master",
|
||||
"skycons": "https://github.com/darkskyapp/skycons.git",
|
||||
"jquery-sparkline": "^2.1.3",
|
||||
"morris.js": "^0.5.1",
|
||||
|
@ -1,3 +1,94 @@
|
||||
.daterangepicker .ranges li {
|
||||
color: #73879C; }
|
||||
.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
|
||||
background: #536A7F;
|
||||
border: 1px solid #536A7F;
|
||||
color: #fff; }
|
||||
.daterangepicker .input-mini {
|
||||
background-color: #eee;
|
||||
border: 1px solid #ccc;
|
||||
box-shadow: none !important; }
|
||||
.daterangepicker .input-mini.active {
|
||||
border: 1px solid #ccc; }
|
||||
.daterangepicker select.monthselect, .daterangepicker select.yearselect {
|
||||
font-size: 12px;
|
||||
padding: 1px;
|
||||
height: auto;
|
||||
margin: 0;
|
||||
cursor: default;
|
||||
height: 30px;
|
||||
border: 1px solid #ADB2B5;
|
||||
line-height: 30px;
|
||||
border-radius: 0px !important; }
|
||||
.daterangepicker select.monthselect {
|
||||
margin-right: 2%; }
|
||||
.daterangepicker td.in-range {
|
||||
background: #E4E7EA;
|
||||
color: #73879C; }
|
||||
.daterangepicker td.active, .daterangepicker td.active:hover {
|
||||
background-color: #536A7F;
|
||||
color: #fff; }
|
||||
.daterangepicker th.available:hover {
|
||||
background: #eee;
|
||||
color: #34495E; }
|
||||
.daterangepicker:before, .daterangepicker:after {
|
||||
content: none; }
|
||||
.daterangepicker .calendar.single {
|
||||
margin: 0 0 4px 0; }
|
||||
.daterangepicker .calendar.single .calendar-table {
|
||||
width: 224px;
|
||||
padding: 0 0 4px 0 !important; }
|
||||
.daterangepicker .calendar.single .calendar-table thead tr:first-child th {
|
||||
padding: 8px 5px; }
|
||||
.daterangepicker .calendar.single .calendar-table thead th {
|
||||
border-radius: 0; }
|
||||
.daterangepicker.picker_1 {
|
||||
color: #fff;
|
||||
background: #34495E; }
|
||||
.daterangepicker.picker_1 .calendar-table {
|
||||
background: #34495E; }
|
||||
.daterangepicker.picker_1 .calendar-table thead tr {
|
||||
background: #213345; }
|
||||
.daterangepicker.picker_1 .calendar-table thead tr:first-child {
|
||||
background: #1ABB9C; }
|
||||
.daterangepicker.picker_1 .calendar-table td.off {
|
||||
background: #34495E;
|
||||
color: #999; }
|
||||
.daterangepicker.picker_1 .calendar-table td.available:hover {
|
||||
color: #34495E; }
|
||||
.daterangepicker.picker_2 .calendar-table thead tr {
|
||||
color: #1ABB9C; }
|
||||
.daterangepicker.picker_2 .calendar-table thead tr:first-child {
|
||||
color: #73879C; }
|
||||
.daterangepicker.picker_3 .calendar-table thead tr:first-child {
|
||||
color: #fff;
|
||||
background: #1ABB9C; }
|
||||
.daterangepicker.picker_4 .calendar-table thead tr:first-child {
|
||||
color: #fff;
|
||||
background: #34495E; }
|
||||
.daterangepicker.picker_4 .calendar-table td, .daterangepicker.picker_4 .calendar-table td.off {
|
||||
background: #ECF0F1;
|
||||
border: 1px solid #fff;
|
||||
border-radius: 0; }
|
||||
.daterangepicker.picker_4 .calendar-table td.active {
|
||||
background: #34495E; }
|
||||
|
||||
.calendar-exibit .show-calendar {
|
||||
float: none;
|
||||
display: block;
|
||||
position: relative;
|
||||
background-color: #fff;
|
||||
border: 1px solid #ccc;
|
||||
margin-bottom: 20px;
|
||||
border: 1px solid rgba(0, 0, 0, 0.15);
|
||||
overflow: hidden; }
|
||||
.calendar-exibit .show-calendar .calendar {
|
||||
margin: 0 0 4px 0; }
|
||||
.calendar-exibit .show-calendar.picker_1 {
|
||||
background: #34495E; }
|
||||
.calendar-exibit .calendar-table {
|
||||
padding: 0 0 4px 0; }
|
||||
|
||||
@charset "UTF-8";
|
||||
.left_col {
|
||||
background: #2A3F54; }
|
||||
@ -3869,249 +3960,6 @@ ul.notifications {
|
||||
opacity: 1; }
|
||||
|
||||
/** /PNotify **/
|
||||
/** bootstrap-daterangepicker **/
|
||||
.daterangepicker.dropdown-menu {
|
||||
font-size: 13px;
|
||||
padding: 0;
|
||||
overflow: hidden; }
|
||||
|
||||
.daterangepicker.picker_1 {
|
||||
background: #34495E;
|
||||
color: #ECF0F1; }
|
||||
|
||||
.daterangepicker.picker_1 table.table-condensed thead tr:first-child {
|
||||
background: #1ABB9C; }
|
||||
|
||||
.daterangepicker table.table-condensed thead tr:first-child th {
|
||||
line-height: 28px;
|
||||
text-align: center; }
|
||||
|
||||
.daterangepicker.picker_1 table.table-condensed thead tr {
|
||||
background: #213345; }
|
||||
|
||||
.daterangepicker table.table-condensed thead tr {
|
||||
line-height: 14px; }
|
||||
|
||||
.daterangepicker table.table-condensed tbody tr:first-child td {
|
||||
padding-top: 10px; }
|
||||
|
||||
.daterangepicker table.table-condensed th:first-child, .daterangepicker table.table-condensed td:first-child {
|
||||
padding-left: 12px; }
|
||||
|
||||
.daterangepicker table.table-condensed th:last-child, .daterangepicker table.table-condensed td:last-child {
|
||||
padding-right: 12px; }
|
||||
|
||||
.table-condensed > thead > tr > th, .table-condensed > tbody > tr > th, .table-condensed > tfoot > tr > th, .table-condensed > thead > tr > td, .table-condensed > tbody > tr > td, .table-condensed > tfoot > tr > td {
|
||||
padding: 5px 7px;
|
||||
text-align: center; }
|
||||
|
||||
.daterangepicker table.table-condensed tbody tr:last-child td {
|
||||
padding-bottom: 10px; }
|
||||
|
||||
.daterangepicker.picker_2 table.table-condensed thead tr:first-child {
|
||||
color: inherit; }
|
||||
|
||||
.daterangepicker.picker_2 table.table-condensed thead tr {
|
||||
color: #1ABB9C; }
|
||||
|
||||
.daterangepicker.picker_3 table.table-condensed thead tr:first-child {
|
||||
background: #1ABB9C;
|
||||
color: #ECF0F1; }
|
||||
|
||||
.daterangepicker.picker_4 table.table-condensed tbody td {
|
||||
background: #ECF0F1;
|
||||
color: #34495E;
|
||||
border: 1px solid #fff;
|
||||
padding: 4px 7px; }
|
||||
|
||||
.daterangepicker.picker_4 table.table-condensed tbody td.active {
|
||||
background: #536A7F;
|
||||
color: #fff; }
|
||||
|
||||
.daterangepicker.picker_4 table.table-condensed thead tr:first-child {
|
||||
background: #34495E;
|
||||
color: #ECF0F1; }
|
||||
|
||||
.xdisplay_input {
|
||||
width: 240px;
|
||||
overflow: hidden;
|
||||
padding: 0; }
|
||||
|
||||
.xdisplay {
|
||||
background-color: #fff;
|
||||
background-clip: padding-box;
|
||||
border: 1px solid #ccc;
|
||||
margin-bottom: 20px;
|
||||
border: 1px solid rgba(0, 0, 0, 0.15);
|
||||
border-radius: 4px;
|
||||
width: 230px;
|
||||
overflow: hidden;
|
||||
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.175); }
|
||||
|
||||
.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar, .daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
|
||||
float: right; }
|
||||
|
||||
.daterangepicker table {
|
||||
width: 100%;
|
||||
margin: 0; }
|
||||
|
||||
.daterangepicker td, .daterangepicker th {
|
||||
text-align: center;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
cursor: pointer;
|
||||
white-space: nowrap; }
|
||||
|
||||
.daterangepicker td.off {
|
||||
color: #999; }
|
||||
|
||||
.daterangepicker td.disabled {
|
||||
color: #999; }
|
||||
|
||||
.daterangepicker td.available:hover, .daterangepicker th.available:hover {
|
||||
background: #eee;
|
||||
color: #34495E; }
|
||||
|
||||
.daterangepicker td.in-range {
|
||||
background: #E4E7EA;
|
||||
border-radius: 0; }
|
||||
|
||||
.daterangepicker td.available + td.start-date {
|
||||
border-radius: 4px 0 0 4px; }
|
||||
|
||||
.daterangepicker td.in-range + td.end-date {
|
||||
border-radius: 0 4px 4px 0; }
|
||||
|
||||
.daterangepicker td.start-date.end-date {
|
||||
border-radius: 4px !important; }
|
||||
|
||||
.daterangepicker td.active, .daterangepicker td.active:hover {
|
||||
background-color: #536A7F;
|
||||
color: #fff; }
|
||||
|
||||
.daterangepicker td.week, .daterangepicker th.week {
|
||||
font-size: 80%;
|
||||
color: #ccc; }
|
||||
|
||||
.daterangepicker select.monthselect, .daterangepicker select.yearselect {
|
||||
font-size: 12px;
|
||||
padding: 1px;
|
||||
height: auto;
|
||||
margin: 0;
|
||||
cursor: default;
|
||||
height: 30px;
|
||||
border: 1px solid #ADB2B5;
|
||||
line-height: 30px;
|
||||
border-radius: 0px !important; }
|
||||
|
||||
.daterangepicker select.monthselect {
|
||||
margin-right: 2%;
|
||||
width: 56%; }
|
||||
|
||||
.daterangepicker select.yearselect {
|
||||
width: 40%; }
|
||||
|
||||
.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.ampmselect {
|
||||
width: 50px;
|
||||
margin-bottom: 0; }
|
||||
|
||||
.daterangepicker_start_input {
|
||||
float: left; }
|
||||
|
||||
.daterangepicker_end_input {
|
||||
float: left;
|
||||
padding-left: 11px; }
|
||||
|
||||
.daterangepicker th.month {
|
||||
width: auto; }
|
||||
|
||||
.daterangepicker .daterangepicker_start_input label, .daterangepicker .daterangepicker_end_input label {
|
||||
color: #333;
|
||||
display: block;
|
||||
font-size: 11px;
|
||||
font-weight: normal;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
margin-bottom: 2px;
|
||||
text-shadow: #fff 1px 1px 0px;
|
||||
text-transform: uppercase;
|
||||
width: 74px; }
|
||||
|
||||
.daterangepicker .ranges input {
|
||||
font-size: 11px; }
|
||||
|
||||
.daterangepicker .ranges .input-mini {
|
||||
background-color: #eee;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 4px;
|
||||
color: #555;
|
||||
display: block;
|
||||
font-size: 11px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
vertical-align: middle;
|
||||
margin: 0 0 10px 0;
|
||||
padding: 0 6px;
|
||||
width: 74px; }
|
||||
|
||||
.daterangepicker .ranges .input-mini:hover {
|
||||
cursor: pointer; }
|
||||
|
||||
.daterangepicker .ranges ul {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0; }
|
||||
|
||||
.daterangepicker .ranges li {
|
||||
font-size: 13px;
|
||||
background: #f5f5f5;
|
||||
border: 1px solid #f5f5f5;
|
||||
color: #536A7F;
|
||||
padding: 3px 12px;
|
||||
margin-bottom: 8px;
|
||||
border-radius: 5px;
|
||||
cursor: pointer; }
|
||||
|
||||
.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
|
||||
background: #536A7F;
|
||||
border: 1px solid #536A7F;
|
||||
color: #fff; }
|
||||
|
||||
.daterangepicker .calendar {
|
||||
display: none;
|
||||
max-width: 270px; }
|
||||
|
||||
.daterangepicker.show-calendar .calendar {
|
||||
display: block; }
|
||||
|
||||
.daterangepicker .calendar.single .calendar-date {
|
||||
border: none; }
|
||||
|
||||
.daterangepicker.single .ranges, .daterangepicker.single .calendar {
|
||||
float: none; }
|
||||
|
||||
.daterangepicker .ranges {
|
||||
width: 160px;
|
||||
text-align: left;
|
||||
margin: 4px; }
|
||||
|
||||
.daterangepicker .ranges .range_inputs > div {
|
||||
float: left; }
|
||||
|
||||
.daterangepicker .ranges .range_inputs > div:nth-child(2) {
|
||||
padding-left: 11px; }
|
||||
|
||||
.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
|
||||
float: left;
|
||||
margin: 4px; }
|
||||
|
||||
.daterangepicker .icon {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
display: inline-block;
|
||||
vertical-align: middle; }
|
||||
|
||||
/** bootstrap-daterangepicker **/
|
||||
/** FullCalendar **/
|
||||
.fc-state-default {
|
||||
background: #f5f5f5;
|
||||
|
4
build/css/custom.min.css
vendored
4
build/css/custom.min.css
vendored
File diff suppressed because one or more lines are too long
@ -25,6 +25,8 @@
|
||||
<link href="../vendors/switchery/dist/switchery.min.css" rel="stylesheet">
|
||||
<!-- starrr -->
|
||||
<link href="../vendors/starrr/dist/starrr.css" rel="stylesheet">
|
||||
<!-- bootstrap-daterangepicker -->
|
||||
<link href="../vendors/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet">
|
||||
|
||||
<!-- Custom Theme Style -->
|
||||
<link href="../build/css/custom.min.css" rel="stylesheet">
|
||||
@ -1335,8 +1337,8 @@
|
||||
<!-- iCheck -->
|
||||
<script src="../vendors/iCheck/icheck.min.js"></script>
|
||||
<!-- bootstrap-daterangepicker -->
|
||||
<script src="js/moment/moment.min.js"></script>
|
||||
<script src="js/datepicker/daterangepicker.js"></script>
|
||||
<script src="../vendors/moment/min/moment.min.js"></script>
|
||||
<script src="../vendors/bootstrap-daterangepicker/daterangepicker.js"></script>
|
||||
<!-- bootstrap-wysiwyg -->
|
||||
<script src="../vendors/bootstrap-wysiwyg/js/bootstrap-wysiwyg.min.js"></script>
|
||||
<script src="../vendors/jquery.hotkeys/jquery.hotkeys.js"></script>
|
||||
|
File diff suppressed because one or more lines are too long
@ -21,6 +21,8 @@
|
||||
<link href="../vendors/bootstrap-progressbar/css/bootstrap-progressbar-3.3.4.min.css" rel="stylesheet">
|
||||
<!-- JQVMap -->
|
||||
<link href="../vendors/jqvmap/dist/jqvmap.min.css" rel="stylesheet"/>
|
||||
<!-- bootstrap-daterangepicker -->
|
||||
<link href="../vendors/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet">
|
||||
|
||||
<!-- Custom Theme Style -->
|
||||
<link href="../build/css/custom.min.css" rel="stylesheet">
|
||||
@ -1014,8 +1016,8 @@
|
||||
<script src="../vendors/jqvmap/dist/maps/jquery.vmap.world.js"></script>
|
||||
<script src="../vendors/jqvmap/examples/js/jquery.vmap.sampledata.js"></script>
|
||||
<!-- bootstrap-daterangepicker -->
|
||||
<script src="js/moment/moment.min.js"></script>
|
||||
<script src="js/datepicker/daterangepicker.js"></script>
|
||||
<script src="../vendors/moment/min/moment.min.js"></script>
|
||||
<script src="../vendors/bootstrap-daterangepicker/daterangepicker.js"></script>
|
||||
|
||||
<!-- Custom Theme Scripts -->
|
||||
<script src="../build/js/custom.min.js"></script>
|
||||
|
@ -15,6 +15,8 @@
|
||||
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
|
||||
<!-- NProgress -->
|
||||
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
|
||||
<!-- bootstrap-daterangepicker -->
|
||||
<link href="../vendors/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet">
|
||||
|
||||
<!-- Custom Theme Style -->
|
||||
<link href="../build/css/custom.min.css" rel="stylesheet">
|
||||
@ -760,8 +762,8 @@
|
||||
<!-- DateJS -->
|
||||
<script src="../vendors/DateJS/build/date.js"></script>
|
||||
<!-- bootstrap-daterangepicker -->
|
||||
<script src="js/moment/moment.min.js"></script>
|
||||
<script src="js/datepicker/daterangepicker.js"></script>
|
||||
<script src="../vendors/moment/min/moment.min.js"></script>
|
||||
<script src="../vendors/bootstrap-daterangepicker/daterangepicker.js"></script>
|
||||
|
||||
<!-- Custom Theme Scripts -->
|
||||
<script src="../build/js/custom.min.js"></script>
|
||||
|
@ -18,6 +18,8 @@
|
||||
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
|
||||
<!-- bootstrap-progressbar -->
|
||||
<link href="../vendors/bootstrap-progressbar/css/bootstrap-progressbar-3.3.4.min.css" rel="stylesheet">
|
||||
<!-- bootstrap-daterangepicker -->
|
||||
<link href="../vendors/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet">
|
||||
|
||||
<!-- Custom Theme Style -->
|
||||
<link href="../build/css/custom.min.css" rel="stylesheet">
|
||||
@ -876,8 +878,8 @@
|
||||
<!-- DateJS -->
|
||||
<script src="../vendors/DateJS/build/date.js"></script>
|
||||
<!-- bootstrap-daterangepicker -->
|
||||
<script src="js/moment/moment.min.js"></script>
|
||||
<script src="js/datepicker/daterangepicker.js"></script>
|
||||
<script src="../vendors/moment/min/moment.min.js"></script>
|
||||
<script src="../vendors/bootstrap-daterangepicker/daterangepicker.js"></script>
|
||||
|
||||
<!-- Custom Theme Scripts -->
|
||||
<script src="../build/js/custom.min.js"></script>
|
||||
|
@ -15,7 +15,9 @@
|
||||
<link href="../vendors/font-awesome/css/font-awesome.min.css" rel="stylesheet">
|
||||
<!-- NProgress -->
|
||||
<link href="../vendors/nprogress/nprogress.css" rel="stylesheet">
|
||||
|
||||
<!-- bootstrap-daterangepicker -->
|
||||
<link href="../vendors/bootstrap-daterangepicker/daterangepicker.css" rel="stylesheet">
|
||||
|
||||
<!-- Custom Theme Style -->
|
||||
<link href="../build/css/custom.min.css" rel="stylesheet">
|
||||
</head>
|
||||
@ -570,8 +572,8 @@
|
||||
<!-- bootstrap-progressbar -->
|
||||
<script src="../vendors/bootstrap-progressbar/bootstrap-progressbar.min.js"></script>
|
||||
<!-- bootstrap-daterangepicker -->
|
||||
<script src="js/moment/moment.min.js"></script>
|
||||
<script src="js/datepicker/daterangepicker.js"></script>
|
||||
<script src="../vendors/moment/min/moment.min.js"></script>
|
||||
<script src="../vendors/bootstrap-daterangepicker/daterangepicker.js"></script>
|
||||
|
||||
<!-- Custom Theme Scripts -->
|
||||
<script src="../build/js/custom.min.js"></script>
|
||||
|
@ -4319,316 +4319,6 @@ ul.notifications {
|
||||
}
|
||||
/** /PNotify **/
|
||||
|
||||
/** bootstrap-daterangepicker **/
|
||||
.daterangepicker.dropdown-menu {
|
||||
font-size: 13px;
|
||||
padding: 0;
|
||||
overflow: hidden;
|
||||
}
|
||||
|
||||
.daterangepicker.picker_1 {
|
||||
background: #34495E;
|
||||
color: #ECF0F1;
|
||||
}
|
||||
|
||||
.daterangepicker.picker_1 table.table-condensed thead tr:first-child {
|
||||
background: #1ABB9C;
|
||||
}
|
||||
|
||||
.daterangepicker table.table-condensed thead tr:first-child th {
|
||||
line-height: 28px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.daterangepicker.picker_1 table.table-condensed thead tr {
|
||||
background: #213345;
|
||||
}
|
||||
|
||||
.daterangepicker table.table-condensed thead tr {
|
||||
line-height: 14px;
|
||||
}
|
||||
|
||||
.daterangepicker table.table-condensed tbody tr:first-child td {
|
||||
padding-top: 10px;
|
||||
}
|
||||
|
||||
.daterangepicker table.table-condensed th:first-child, .daterangepicker table.table-condensed td:first-child {
|
||||
padding-left: 12px
|
||||
}
|
||||
|
||||
.daterangepicker table.table-condensed th:last-child, .daterangepicker table.table-condensed td:last-child {
|
||||
padding-right: 12px
|
||||
}
|
||||
|
||||
.table-condensed>thead>tr>th, .table-condensed>tbody>tr>th, .table-condensed>tfoot>tr>th, .table-condensed>thead>tr>td, .table-condensed>tbody>tr>td, .table-condensed>tfoot>tr>td {
|
||||
padding: 5px 7px;
|
||||
text-align: center;
|
||||
}
|
||||
|
||||
.daterangepicker table.table-condensed tbody tr:last-child td {
|
||||
padding-bottom: 10px;
|
||||
}
|
||||
|
||||
.daterangepicker.picker_2 table.table-condensed thead tr:first-child {
|
||||
color: inherit;
|
||||
}
|
||||
|
||||
.daterangepicker.picker_2 table.table-condensed thead tr {
|
||||
color: #1ABB9C;
|
||||
}
|
||||
|
||||
.daterangepicker.picker_3 table.table-condensed thead tr:first-child {
|
||||
background: #1ABB9C;
|
||||
color: #ECF0F1;
|
||||
}
|
||||
|
||||
.daterangepicker.picker_4 table.table-condensed tbody td {
|
||||
background: #ECF0F1;
|
||||
color: #34495E;
|
||||
border: 1px solid #fff;
|
||||
padding: 4px 7px;
|
||||
}
|
||||
|
||||
.daterangepicker.picker_4 table.table-condensed tbody td.active {
|
||||
background: #536A7F;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.daterangepicker.picker_4 table.table-condensed thead tr:first-child {
|
||||
background: #34495E;
|
||||
color: #ECF0F1;
|
||||
}
|
||||
|
||||
.xdisplay_input {
|
||||
width: 240px;
|
||||
overflow: hidden;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.xdisplay {
|
||||
background-color: #fff;
|
||||
-webkit-background-clip: padding-box;
|
||||
background-clip: padding-box;
|
||||
border: 1px solid #ccc;
|
||||
margin-bottom: 20px;
|
||||
border: 1px solid rgba(0, 0, 0, .15);
|
||||
border-radius: 4px;
|
||||
width: 230px;
|
||||
overflow: hidden;
|
||||
-webkit-box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
|
||||
box-shadow: 0 6px 12px rgba(0, 0, 0, .175);
|
||||
}
|
||||
|
||||
.daterangepicker.opensright .ranges, .daterangepicker.opensright .calendar, .daterangepicker.openscenter .ranges, .daterangepicker.openscenter .calendar {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.daterangepicker.dropdown-menu .calendar {}
|
||||
.daterangepicker table {
|
||||
width: 100%;
|
||||
margin: 0;
|
||||
}
|
||||
|
||||
.daterangepicker td, .daterangepicker th {
|
||||
text-align: center;
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
cursor: pointer;
|
||||
white-space: nowrap;
|
||||
}
|
||||
|
||||
.daterangepicker td.off {
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.daterangepicker td.disabled {
|
||||
color: #999;
|
||||
}
|
||||
|
||||
.daterangepicker td.available:hover, .daterangepicker th.available:hover {
|
||||
background: #eee;
|
||||
color: #34495E;
|
||||
}
|
||||
|
||||
.daterangepicker td.in-range {
|
||||
background: #E4E7EA;
|
||||
-webkit-border-radius: 0;
|
||||
-moz-border-radius: 0;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
.daterangepicker td.available + td.start-date {
|
||||
-webkit-border-radius: 4px 0 0 4px;
|
||||
-moz-border-radius: 4px 0 0 4px;
|
||||
border-radius: 4px 0 0 4px;
|
||||
}
|
||||
|
||||
.daterangepicker td.in-range + td.end-date {
|
||||
-webkit-border-radius: 0 4px 4px 0;
|
||||
-moz-border-radius: 0 4px 4px 0;
|
||||
border-radius: 0 4px 4px 0;
|
||||
}
|
||||
|
||||
.daterangepicker td.start-date.end-date {
|
||||
-webkit-border-radius: 4px !important;
|
||||
-moz-border-radius: 4px !important;
|
||||
border-radius: 4px !important;
|
||||
}
|
||||
|
||||
.daterangepicker td.active, .daterangepicker td.active:hover {
|
||||
background-color: #536A7F;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.daterangepicker td.week, .daterangepicker th.week {
|
||||
font-size: 80%;
|
||||
color: #ccc;
|
||||
}
|
||||
|
||||
.daterangepicker select.monthselect, .daterangepicker select.yearselect {
|
||||
font-size: 12px;
|
||||
padding: 1px;
|
||||
height: auto;
|
||||
margin: 0;
|
||||
cursor: default;
|
||||
height: 30px;
|
||||
border: 1px solid #ADB2B5;
|
||||
line-height: 30px;
|
||||
border-radius: 0px !important;
|
||||
}
|
||||
|
||||
.daterangepicker select.monthselect {
|
||||
margin-right: 2%;
|
||||
width: 56%;
|
||||
}
|
||||
|
||||
.daterangepicker select.yearselect {
|
||||
width: 40%;
|
||||
}
|
||||
|
||||
.daterangepicker select.hourselect, .daterangepicker select.minuteselect, .daterangepicker select.ampmselect {
|
||||
width: 50px;
|
||||
margin-bottom: 0;
|
||||
}
|
||||
|
||||
.daterangepicker_start_input {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.daterangepicker_end_input {
|
||||
float: left;
|
||||
padding-left: 11px;
|
||||
}
|
||||
|
||||
.daterangepicker th.month {
|
||||
width: auto;
|
||||
}
|
||||
|
||||
.daterangepicker .daterangepicker_start_input label, .daterangepicker .daterangepicker_end_input label {
|
||||
color: #333;
|
||||
display: block;
|
||||
font-size: 11px;
|
||||
font-weight: normal;
|
||||
height: 20px;
|
||||
line-height: 20px;
|
||||
margin-bottom: 2px;
|
||||
text-shadow: #fff 1px 1px 0px;
|
||||
text-transform: uppercase;
|
||||
width: 74px;
|
||||
}
|
||||
|
||||
.daterangepicker .ranges input {
|
||||
font-size: 11px;
|
||||
}
|
||||
|
||||
.daterangepicker .ranges .input-mini {
|
||||
background-color: #eee;
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 4px;
|
||||
color: #555;
|
||||
display: block;
|
||||
font-size: 11px;
|
||||
height: 30px;
|
||||
line-height: 30px;
|
||||
vertical-align: middle;
|
||||
margin: 0 0 10px 0;
|
||||
padding: 0 6px;
|
||||
width: 74px;
|
||||
}
|
||||
|
||||
.daterangepicker .ranges .input-mini:hover {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.daterangepicker .ranges ul {
|
||||
list-style: none;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
}
|
||||
|
||||
.daterangepicker .ranges li {
|
||||
font-size: 13px;
|
||||
background: #f5f5f5;
|
||||
border: 1px solid #f5f5f5;
|
||||
color: #536A7F;
|
||||
padding: 3px 12px;
|
||||
margin-bottom: 8px;
|
||||
-webkit-border-radius: 5px;
|
||||
-moz-border-radius: 5px;
|
||||
border-radius: 5px;
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
.daterangepicker .ranges li.active, .daterangepicker .ranges li:hover {
|
||||
background: #536A7F;
|
||||
border: 1px solid #536A7F;
|
||||
color: #fff;
|
||||
}
|
||||
|
||||
.daterangepicker .calendar {
|
||||
display: none;
|
||||
max-width: 270px;
|
||||
}
|
||||
|
||||
.daterangepicker.show-calendar .calendar {
|
||||
display: block;
|
||||
}
|
||||
|
||||
.daterangepicker .calendar.single .calendar-date {
|
||||
border: none;
|
||||
}
|
||||
|
||||
.daterangepicker.single .ranges, .daterangepicker.single .calendar {
|
||||
float: none;
|
||||
}
|
||||
|
||||
.daterangepicker .ranges {
|
||||
width: 160px;
|
||||
text-align: left;
|
||||
margin: 4px;
|
||||
}
|
||||
|
||||
.daterangepicker .ranges .range_inputs>div {
|
||||
float: left;
|
||||
}
|
||||
|
||||
.daterangepicker .ranges .range_inputs>div:nth-child(2) {
|
||||
padding-left: 11px;
|
||||
}
|
||||
|
||||
.daterangepicker.opensleft .ranges, .daterangepicker.opensleft .calendar {
|
||||
float: left;
|
||||
margin: 4px;
|
||||
}
|
||||
|
||||
.daterangepicker .icon {
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
display: inline-block;
|
||||
vertical-align: middle;
|
||||
}
|
||||
/** bootstrap-daterangepicker **/
|
||||
|
||||
/** FullCalendar **/
|
||||
.fc-state-default {
|
||||
background: #f5f5f5;
|
||||
@ -4647,4 +4337,4 @@ ul.notifications {
|
||||
min-height: 300px;
|
||||
border: 1px solid #e5e5e5;
|
||||
}
|
||||
/** /Dropzone.js **/
|
||||
/** /Dropzone.js **/
|
182
src/scss/daterangepicker.scss
Normal file
182
src/scss/daterangepicker.scss
Normal file
@ -0,0 +1,182 @@
|
||||
.daterangepicker {
|
||||
.ranges {
|
||||
li {
|
||||
color: #73879C;
|
||||
|
||||
&.active, &:hover {
|
||||
background: #536A7F;
|
||||
border: 1px solid #536A7F;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.input-mini {
|
||||
background-color: #eee;
|
||||
border: 1px solid #ccc;
|
||||
box-shadow: none !important;
|
||||
|
||||
&.active {
|
||||
border: 1px solid #ccc;
|
||||
}
|
||||
}
|
||||
|
||||
select {
|
||||
&.monthselect, &.yearselect {
|
||||
font-size: 12px;
|
||||
padding: 1px;
|
||||
height: auto;
|
||||
margin: 0;
|
||||
cursor: default;
|
||||
height: 30px;
|
||||
border: 1px solid #ADB2B5;
|
||||
line-height: 30px;
|
||||
border-radius: 0px !important;
|
||||
}
|
||||
|
||||
&.monthselect {
|
||||
margin-right: 2%;
|
||||
}
|
||||
}
|
||||
|
||||
td {
|
||||
&.in-range {
|
||||
background: #E4E7EA;
|
||||
color: #73879C;
|
||||
}
|
||||
|
||||
&.active, &.active:hover {
|
||||
background-color: #536A7F;
|
||||
color: #fff;
|
||||
}
|
||||
}
|
||||
|
||||
th.available:hover {
|
||||
background: #eee;
|
||||
color: #34495E;
|
||||
}
|
||||
|
||||
&:before, &:after {
|
||||
content: none;
|
||||
}
|
||||
|
||||
.calendar.single {
|
||||
margin: 0 0 4px 0;
|
||||
|
||||
.calendar-table {
|
||||
width: 224px;
|
||||
padding: 0 0 4px 0 !important;
|
||||
|
||||
thead {
|
||||
& tr:first-child {
|
||||
th {
|
||||
padding: 8px 5px;
|
||||
}
|
||||
}
|
||||
|
||||
th {
|
||||
border-radius: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.picker_1 {
|
||||
color: #fff;
|
||||
background: #34495E;
|
||||
|
||||
.calendar-table {
|
||||
background: #34495E;
|
||||
|
||||
thead {
|
||||
& tr {
|
||||
background: #213345;
|
||||
}
|
||||
|
||||
& tr:first-child {
|
||||
background: #1ABB9C;
|
||||
}
|
||||
}
|
||||
|
||||
td.off {
|
||||
background: #34495E;
|
||||
color: #999;
|
||||
}
|
||||
|
||||
td.available:hover {
|
||||
color: #34495E;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.picker_2 {
|
||||
.calendar-table {
|
||||
thead {
|
||||
& tr {
|
||||
color: #1ABB9C;
|
||||
}
|
||||
|
||||
& tr:first-child {
|
||||
color: #73879C;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.picker_3 {
|
||||
.calendar-table {
|
||||
thead {
|
||||
& tr:first-child {
|
||||
color: #fff;
|
||||
background: #1ABB9C;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
&.picker_4 {
|
||||
.calendar-table {
|
||||
thead {
|
||||
& tr:first-child {
|
||||
color: #fff;
|
||||
background: #34495E;;
|
||||
}
|
||||
}
|
||||
|
||||
td, td.off {
|
||||
background: #ECF0F1;
|
||||
border: 1px solid #fff;
|
||||
border-radius: 0;
|
||||
}
|
||||
|
||||
td.active {
|
||||
background: #34495E;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
.calendar-exibit {
|
||||
.show-calendar {
|
||||
float: none;
|
||||
display: block;
|
||||
position: relative;
|
||||
background-color: #fff;
|
||||
border: 1px solid #ccc;
|
||||
margin-bottom: 20px;
|
||||
border: 1px solid rgba(0,0,0,0.15);
|
||||
overflow: hidden;
|
||||
|
||||
.calendar {
|
||||
margin: 0 0 4px 0;
|
||||
}
|
||||
|
||||
&.picker_1 {
|
||||
background: #34495E;
|
||||
}
|
||||
}
|
||||
|
||||
.calendar-table {
|
||||
padding: 0 0 4px 0;
|
||||
}
|
||||
}
|
19
vendors/bootstrap-daterangepicker/.bower.json
vendored
19
vendors/bootstrap-daterangepicker/.bower.json
vendored
@ -14,18 +14,17 @@
|
||||
"moment.min.js"
|
||||
],
|
||||
"dependencies": {
|
||||
"jquery": ">=1.10",
|
||||
"jquery": "1.9.1 - 3",
|
||||
"moment": ">=2.9.0"
|
||||
},
|
||||
"homepage": "https://github.com/dangrossman/bootstrap-daterangepicker",
|
||||
"version": "2.1.21",
|
||||
"_release": "2.1.21",
|
||||
"homepage": "https://github.com/christianesperar/bootstrap-daterangepicker",
|
||||
"_release": "fc748970e8",
|
||||
"_resolution": {
|
||||
"type": "version",
|
||||
"tag": "v2.1.21",
|
||||
"commit": "d39abc8b91b662b8b60a75e18c2de09fd6c04299"
|
||||
"type": "branch",
|
||||
"branch": "master",
|
||||
"commit": "fc748970e8228ab271ba9ca799f57d8f8c6a5013"
|
||||
},
|
||||
"_source": "https://github.com/dangrossman/bootstrap-daterangepicker.git",
|
||||
"_target": "^2.1.19",
|
||||
"_originalSource": "bootstrap-daterangepicker"
|
||||
"_source": "git@github.com:christianesperar/bootstrap-daterangepicker.git",
|
||||
"_target": "master",
|
||||
"_originalSource": "git@github.com:christianesperar/bootstrap-daterangepicker.git"
|
||||
}
|
2
vendors/bootstrap-daterangepicker/bower.json
vendored
2
vendors/bootstrap-daterangepicker/bower.json
vendored
@ -14,7 +14,7 @@
|
||||
"moment.min.js"
|
||||
],
|
||||
"dependencies": {
|
||||
"jquery": ">=1.10",
|
||||
"jquery": "1.9.1 - 3",
|
||||
"moment": ">=2.9.0"
|
||||
}
|
||||
}
|
||||
|
176
vendors/bootstrap-daterangepicker/daterangepicker.js
vendored
176
vendors/bootstrap-daterangepicker/daterangepicker.js
vendored
@ -1,5 +1,5 @@
|
||||
/**
|
||||
* @version: 2.1.21
|
||||
* @version: 2.1.24
|
||||
* @author: Dan Grossman http://www.dangrossman.info/
|
||||
* @copyright: Copyright (c) 2012-2016 Dan Grossman. All rights reserved.
|
||||
* @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
|
||||
@ -41,6 +41,7 @@
|
||||
this.showDropdowns = false;
|
||||
this.showWeekNumbers = false;
|
||||
this.showISOWeekNumbers = false;
|
||||
this.showCustomRangeLabel = true;
|
||||
this.timePicker = false;
|
||||
this.timePicker24Hour = false;
|
||||
this.timePickerIncrement = 1;
|
||||
@ -64,7 +65,7 @@
|
||||
|
||||
this.locale = {
|
||||
direction: 'ltr',
|
||||
format: 'MM/DD/YYYY',
|
||||
format: moment.localeData().longDateFormat('L'),
|
||||
separator: ' - ',
|
||||
applyLabel: 'Apply',
|
||||
cancelLabel: 'Cancel',
|
||||
@ -224,9 +225,19 @@
|
||||
if (typeof options.buttonClasses === 'object')
|
||||
this.buttonClasses = options.buttonClasses.join(' ');
|
||||
|
||||
if (typeof options.singleClasses === 'string')
|
||||
this.singleClasses = options.singleClasses;
|
||||
|
||||
if (typeof options.singleClasses === 'object')
|
||||
this.singleClasses = options.singleClasses.join(' ');
|
||||
|
||||
|
||||
if (typeof options.showDropdowns === 'boolean')
|
||||
this.showDropdowns = options.showDropdowns;
|
||||
|
||||
if (typeof options.showCustomRangeLabel === 'boolean')
|
||||
this.showCustomRangeLabel = options.showCustomRangeLabel;
|
||||
|
||||
if (typeof options.singleDatePicker === 'boolean') {
|
||||
this.singleDatePicker = options.singleDatePicker;
|
||||
if (this.singleDatePicker)
|
||||
@ -336,9 +347,11 @@
|
||||
|
||||
var list = '<ul>';
|
||||
for (range in this.ranges) {
|
||||
list += '<li>' + range + '</li>';
|
||||
list += '<li data-range-key="' + range + '">' + range + '</li>';
|
||||
}
|
||||
if (this.showCustomRangeLabel) {
|
||||
list += '<li data-range-key="' + this.locale.customRangeLabel + '">' + this.locale.customRangeLabel + '</li>';
|
||||
}
|
||||
list += '<li>' + this.locale.customRangeLabel + '</li>';
|
||||
list += '</ul>';
|
||||
this.container.find('.ranges').prepend(list);
|
||||
}
|
||||
@ -365,11 +378,16 @@
|
||||
|
||||
if (this.singleDatePicker) {
|
||||
this.container.addClass('single');
|
||||
if (this.singleClasses) {
|
||||
this.container.addClass(this.singleClasses);
|
||||
}
|
||||
this.container.find('.calendar.left').addClass('single');
|
||||
this.container.find('.calendar.left').show();
|
||||
this.container.find('.calendar.right').hide();
|
||||
this.container.find('.daterangepicker_input input, .daterangepicker_input > i').hide();
|
||||
if (!this.timePicker) {
|
||||
if (this.timePicker) {
|
||||
this.container.find('.ranges ul').hide();
|
||||
} else {
|
||||
this.container.find('.ranges').hide();
|
||||
}
|
||||
}
|
||||
@ -401,14 +419,15 @@
|
||||
this.container.find('.calendar')
|
||||
.on('click.daterangepicker', '.prev', $.proxy(this.clickPrev, this))
|
||||
.on('click.daterangepicker', '.next', $.proxy(this.clickNext, this))
|
||||
.on('click.daterangepicker', 'td.available', $.proxy(this.clickDate, this))
|
||||
.on('mousedown.daterangepicker', 'td.available', $.proxy(this.clickDate, this))
|
||||
.on('mouseenter.daterangepicker', 'td.available', $.proxy(this.hoverDate, this))
|
||||
.on('mouseleave.daterangepicker', 'td.available', $.proxy(this.updateFormInputs, this))
|
||||
.on('change.daterangepicker', 'select.yearselect', $.proxy(this.monthOrYearChanged, this))
|
||||
.on('change.daterangepicker', 'select.monthselect', $.proxy(this.monthOrYearChanged, this))
|
||||
.on('change.daterangepicker', 'select.hourselect,select.minuteselect,select.secondselect,select.ampmselect', $.proxy(this.timeChanged, this))
|
||||
.on('click.daterangepicker', '.daterangepicker_input input', $.proxy(this.showCalendars, this))
|
||||
//.on('keyup.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsChanged, this))
|
||||
.on('focus.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsFocused, this))
|
||||
.on('blur.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsBlurred, this))
|
||||
.on('change.daterangepicker', '.daterangepicker_input input', $.proxy(this.formInputsChanged, this));
|
||||
|
||||
this.container.find('.ranges')
|
||||
@ -461,13 +480,13 @@
|
||||
this.startDate.minute(Math.round(this.startDate.minute() / this.timePickerIncrement) * this.timePickerIncrement);
|
||||
|
||||
if (this.minDate && this.startDate.isBefore(this.minDate)) {
|
||||
this.startDate = this.minDate;
|
||||
this.startDate = this.minDate.clone();
|
||||
if (this.timePicker && this.timePickerIncrement)
|
||||
this.startDate.minute(Math.round(this.startDate.minute() / this.timePickerIncrement) * this.timePickerIncrement);
|
||||
}
|
||||
|
||||
if (this.maxDate && this.startDate.isAfter(this.maxDate)) {
|
||||
this.startDate = this.maxDate;
|
||||
this.startDate = this.maxDate.clone();
|
||||
if (this.timePicker && this.timePickerIncrement)
|
||||
this.startDate.minute(Math.floor(this.startDate.minute() / this.timePickerIncrement) * this.timePickerIncrement);
|
||||
}
|
||||
@ -495,7 +514,7 @@
|
||||
this.endDate = this.startDate.clone();
|
||||
|
||||
if (this.maxDate && this.endDate.isAfter(this.maxDate))
|
||||
this.endDate = this.maxDate;
|
||||
this.endDate = this.maxDate.clone();
|
||||
|
||||
if (this.dateLimit && this.startDate.clone().add(this.dateLimit).isBefore(this.endDate))
|
||||
this.endDate = this.startDate.clone().add(this.dateLimit);
|
||||
@ -846,6 +865,10 @@
|
||||
|
||||
renderTimePicker: function(side) {
|
||||
|
||||
// Don't bother updating the time picker if it's currently disabled
|
||||
// because an end date hasn't been clicked yet
|
||||
if (side == 'right' && !this.endDate) return;
|
||||
|
||||
var html, selected, minDate, maxDate = this.maxDate;
|
||||
|
||||
if (this.dateLimit && (!this.maxDate || this.startDate.clone().add(this.dateLimit).isAfter(this.maxDate)))
|
||||
@ -855,12 +878,12 @@
|
||||
selected = this.startDate.clone();
|
||||
minDate = this.minDate;
|
||||
} else if (side == 'right') {
|
||||
selected = this.endDate ? this.endDate.clone() : this.previousRightTime.clone();
|
||||
selected = this.endDate.clone();
|
||||
minDate = this.startDate;
|
||||
|
||||
//Preserve the time already selected
|
||||
var timeSelector = this.container.find('.calendar.right .calendar-time div');
|
||||
if (timeSelector.html() != '') {
|
||||
if (!this.endDate && timeSelector.html() != '') {
|
||||
|
||||
selected.hour(timeSelector.find('.hourselect option:selected').val() || selected.hour());
|
||||
selected.minute(timeSelector.find('.minuteselect option:selected').val() || selected.minute());
|
||||
@ -874,13 +897,14 @@
|
||||
selected.hour(0);
|
||||
}
|
||||
|
||||
if (selected.isBefore(this.startDate))
|
||||
selected = this.startDate.clone();
|
||||
|
||||
if (maxDate && selected.isAfter(maxDate))
|
||||
selected = maxDate.clone();
|
||||
|
||||
}
|
||||
|
||||
if (selected.isBefore(this.startDate))
|
||||
selected = this.startDate.clone();
|
||||
|
||||
if (maxDate && selected.isAfter(maxDate))
|
||||
selected = maxDate.clone();
|
||||
|
||||
}
|
||||
|
||||
//
|
||||
@ -1149,6 +1173,7 @@
|
||||
target.closest('.calendar-table').length
|
||||
) return;
|
||||
this.hide();
|
||||
this.element.trigger('outsideClick.daterangepicker', this);
|
||||
},
|
||||
|
||||
showCalendars: function() {
|
||||
@ -1168,7 +1193,8 @@
|
||||
if (this.container.find('input[name=daterangepicker_start]').is(":focus") || this.container.find('input[name=daterangepicker_end]').is(":focus"))
|
||||
return;
|
||||
|
||||
var label = e.target.innerHTML;
|
||||
var label = e.target.getAttribute('data-range-key');
|
||||
|
||||
if (label == this.locale.customRangeLabel) {
|
||||
this.updateView();
|
||||
} else {
|
||||
@ -1180,7 +1206,7 @@
|
||||
},
|
||||
|
||||
clickRange: function(e) {
|
||||
var label = e.target.innerHTML;
|
||||
var label = e.target.getAttribute('data-range-key');
|
||||
this.chosenLabel = label;
|
||||
if (label == this.locale.customRangeLabel) {
|
||||
this.showCalendars();
|
||||
@ -1227,8 +1253,8 @@
|
||||
hoverDate: function(e) {
|
||||
|
||||
//ignore mouse movements while an above-calendar text input has focus
|
||||
if (this.container.find('input[name=daterangepicker_start]').is(":focus") || this.container.find('input[name=daterangepicker_end]').is(":focus"))
|
||||
return;
|
||||
//if (this.container.find('input[name=daterangepicker_start]').is(":focus") || this.container.find('input[name=daterangepicker_end]').is(":focus"))
|
||||
// return;
|
||||
|
||||
//ignore dates that can't be selected
|
||||
if (!$(e.target).hasClass('available')) return;
|
||||
@ -1240,9 +1266,9 @@
|
||||
var cal = $(e.target).parents('.calendar');
|
||||
var date = cal.hasClass('left') ? this.leftCalendar.calendar[row][col] : this.rightCalendar.calendar[row][col];
|
||||
|
||||
if (this.endDate) {
|
||||
if (this.endDate && !this.container.find('input[name=daterangepicker_start]').is(":focus")) {
|
||||
this.container.find('input[name=daterangepicker_start]').val(date.format(this.locale.format));
|
||||
} else {
|
||||
} else if (!this.endDate && !this.container.find('input[name=daterangepicker_end]').is(":focus")) {
|
||||
this.container.find('input[name=daterangepicker_end]').val(date.format(this.locale.format));
|
||||
}
|
||||
|
||||
@ -1289,9 +1315,10 @@
|
||||
// * if the time picker is enabled, apply the hour/minute/second from the select boxes to the clicked date
|
||||
// * if autoapply is enabled, and an end date was chosen, apply the selection
|
||||
// * if single date picker mode, and time picker isn't enabled, apply the selection immediately
|
||||
// * if one of the inputs above the calendars was focused, cancel that manual input
|
||||
//
|
||||
|
||||
if (this.endDate || date.isBefore(this.startDate, 'day')) {
|
||||
if (this.endDate || date.isBefore(this.startDate, 'day')) { //picking start
|
||||
if (this.timePicker) {
|
||||
var hour = parseInt(this.container.find('.left .hourselect').val(), 10);
|
||||
if (!this.timePicker24Hour) {
|
||||
@ -1311,7 +1338,7 @@
|
||||
//special case: clicking the same date for start/end,
|
||||
//but the time of the end date is before the start date
|
||||
this.setEndDate(this.startDate.clone());
|
||||
} else {
|
||||
} else { // picking end
|
||||
if (this.timePicker) {
|
||||
var hour = parseInt(this.container.find('.right .hourselect').val(), 10);
|
||||
if (!this.timePicker24Hour) {
|
||||
@ -1340,32 +1367,39 @@
|
||||
|
||||
this.updateView();
|
||||
|
||||
//This is to cancel the blur event handler if the mouse was in one of the inputs
|
||||
e.stopPropagation();
|
||||
|
||||
},
|
||||
|
||||
calculateChosenLabel: function() {
|
||||
var customRange = true;
|
||||
var i = 0;
|
||||
for (var range in this.ranges) {
|
||||
if (this.timePicker) {
|
||||
if (this.startDate.isSame(this.ranges[range][0]) && this.endDate.isSame(this.ranges[range][1])) {
|
||||
customRange = false;
|
||||
this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')').addClass('active').html();
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
//ignore times when comparing dates if time picker is not enabled
|
||||
if (this.startDate.format('YYYY-MM-DD') == this.ranges[range][0].format('YYYY-MM-DD') && this.endDate.format('YYYY-MM-DD') == this.ranges[range][1].format('YYYY-MM-DD')) {
|
||||
customRange = false;
|
||||
this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')').addClass('active').html();
|
||||
break;
|
||||
}
|
||||
}
|
||||
i++;
|
||||
}
|
||||
if (customRange) {
|
||||
this.chosenLabel = this.container.find('.ranges li:last').addClass('active').html();
|
||||
this.showCalendars();
|
||||
}
|
||||
calculateChosenLabel: function () {
|
||||
var customRange = true;
|
||||
var i = 0;
|
||||
for (var range in this.ranges) {
|
||||
if (this.timePicker) {
|
||||
if (this.startDate.isSame(this.ranges[range][0]) && this.endDate.isSame(this.ranges[range][1])) {
|
||||
customRange = false;
|
||||
this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')').addClass('active').html();
|
||||
break;
|
||||
}
|
||||
} else {
|
||||
//ignore times when comparing dates if time picker is not enabled
|
||||
if (this.startDate.format('YYYY-MM-DD') == this.ranges[range][0].format('YYYY-MM-DD') && this.endDate.format('YYYY-MM-DD') == this.ranges[range][1].format('YYYY-MM-DD')) {
|
||||
customRange = false;
|
||||
this.chosenLabel = this.container.find('.ranges li:eq(' + i + ')').addClass('active').html();
|
||||
break;
|
||||
}
|
||||
}
|
||||
i++;
|
||||
}
|
||||
if (customRange) {
|
||||
if (this.showCustomRangeLabel) {
|
||||
this.chosenLabel = this.container.find('.ranges li:last').addClass('active').html();
|
||||
} else {
|
||||
this.chosenLabel = null;
|
||||
}
|
||||
this.showCalendars();
|
||||
}
|
||||
},
|
||||
|
||||
clickApply: function(e) {
|
||||
@ -1491,11 +1525,45 @@
|
||||
|
||||
}
|
||||
|
||||
this.updateCalendars();
|
||||
if (this.timePicker) {
|
||||
this.renderTimePicker('left');
|
||||
this.renderTimePicker('right');
|
||||
this.updateView();
|
||||
},
|
||||
|
||||
formInputsFocused: function(e) {
|
||||
|
||||
// Highlight the focused input
|
||||
this.container.find('input[name="daterangepicker_start"], input[name="daterangepicker_end"]').removeClass('active');
|
||||
$(e.target).addClass('active');
|
||||
|
||||
// Set the state such that if the user goes back to using a mouse,
|
||||
// the calendars are aware we're selecting the end of the range, not
|
||||
// the start. This allows someone to edit the end of a date range without
|
||||
// re-selecting the beginning, by clicking on the end date input then
|
||||
// using the calendar.
|
||||
var isRight = $(e.target).closest('.calendar').hasClass('right');
|
||||
if (isRight) {
|
||||
this.endDate = null;
|
||||
this.setStartDate(this.startDate.clone());
|
||||
this.updateView();
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
formInputsBlurred: function(e) {
|
||||
|
||||
// this function has one purpose right now: if you tab from the first
|
||||
// text input to the second in the UI, the endDate is nulled so that
|
||||
// you can click another, but if you tab out without clicking anything
|
||||
// or changing the input value, the old endDate should be retained
|
||||
|
||||
if (!this.endDate) {
|
||||
var val = this.container.find('input[name="daterangepicker_end"]').val();
|
||||
var end = moment(val, this.locale.format);
|
||||
if (end.isValid()) {
|
||||
this.setEndDate(end);
|
||||
this.updateView();
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
elementChanged: function() {
|
||||
|
17
vendors/bootstrap-daterangepicker/demo.html
vendored
17
vendors/bootstrap-daterangepicker/demo.html
vendored
@ -131,6 +131,15 @@
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="alwaysShowCalendars"> alwaysShowCalendars
|
||||
</label>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="linkedCalendars" checked="checked"> linkedCalendars
|
||||
@ -145,13 +154,10 @@
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="alwaysShowCalendars"> alwaysShowCalendars
|
||||
<input type="checkbox" id="showCustomRangeLabel" checked="checked"> showCustomRangeLabel
|
||||
</label>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
|
||||
<div class="form-group">
|
||||
<label for="opens">opens</label>
|
||||
<select id="opens" class="form-control">
|
||||
@ -314,6 +320,9 @@
|
||||
if (!$('#autoUpdateInput').is(':checked'))
|
||||
options.autoUpdateInput = false;
|
||||
|
||||
if (!$('#showCustomRangeLabel').is(':checked'))
|
||||
options.showCustomRangeLabel = false;
|
||||
|
||||
if ($('#alwaysShowCalendars').is(':checked'))
|
||||
options.alwaysShowCalendars = true;
|
||||
|
||||
|
BIN
vendors/bootstrap-daterangepicker/drp.png
vendored
BIN
vendors/bootstrap-daterangepicker/drp.png
vendored
Binary file not shown.
Before Width: | Height: | Size: 48 KiB After Width: | Height: | Size: 211 KiB |
2
vendors/bootstrap-daterangepicker/package.js
vendored
2
vendors/bootstrap-daterangepicker/package.js
vendored
@ -1,6 +1,6 @@
|
||||
Package.describe({
|
||||
name: 'dangrossman:bootstrap-daterangepicker',
|
||||
version: '2.1.21',
|
||||
version: '2.1.24',
|
||||
summary: 'Date range picker component for Bootstrap',
|
||||
git: 'https://github.com/dangrossman/bootstrap-daterangepicker',
|
||||
documentation: 'README.md'
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "bootstrap-daterangepicker",
|
||||
"version": "2.1.21",
|
||||
"version": "2.1.24",
|
||||
"description": "Date range picker component for Bootstrap",
|
||||
"main": "daterangepicker.js",
|
||||
"style": "daterangepicker.css",
|
||||
|
120
vendors/bootstrap-daterangepicker/website/index.html
vendored
120
vendors/bootstrap-daterangepicker/website/index.html
vendored
@ -137,15 +137,15 @@
|
||||
</ul>
|
||||
|
||||
<script async src="//pagead2.googlesyndication.com/pagead/js/adsbygoogle.js"></script>
|
||||
<!-- DRP 336x280 -->
|
||||
<!-- DRP Responsive -->
|
||||
<ins class="adsbygoogle"
|
||||
style="display:inline-block;width:336px;height:280px"
|
||||
style="display:block"
|
||||
data-ad-client="ca-pub-9095657276960731"
|
||||
data-ad-slot="1626914594"></ins>
|
||||
data-ad-slot="8963174596"
|
||||
data-ad-format="auto"></ins>
|
||||
<script>
|
||||
(adsbygoogle = window.adsbygoogle || []).push({});
|
||||
</script>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -160,7 +160,7 @@
|
||||
for selecting dates, times, or from predefined ranges like "Last 30 Days".
|
||||
</p>
|
||||
|
||||
<a style="display: block; height: 300px; background: url('drp.png') top right no-repeat; background-size: auto 100%; border: 1px solid #ccc; margin-bottom: 20px" href="https://awio.iljmp.com/5/drpdemo" title="Click for a Live Demo"></a>
|
||||
<a style="display: block; height: 300px; background: url('drp.png') top right no-repeat; background-size: cover; border: 1px solid #ccc; margin-bottom: 20px" href="https://awio.iljmp.com/5/drpdemo" title="Click for a Live Demo"></a>
|
||||
|
||||
</div>
|
||||
|
||||
@ -313,15 +313,19 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
<script type="text/javascript">
|
||||
$(function() {
|
||||
|
||||
var start = moment().subtract(29, 'days');
|
||||
var end = moment();
|
||||
|
||||
function cb(start, end) {
|
||||
$('#reportrange span').html(start.format('MMMM D, YYYY') + ' - ' + end.format('MMMM D, YYYY'));
|
||||
}
|
||||
cb(moment().subtract(29, 'days'), moment());
|
||||
|
||||
$('#reportrange').daterangepicker({
|
||||
startDate: start,
|
||||
endDate: end,
|
||||
ranges: {
|
||||
'Today': [moment(), moment()],
|
||||
'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
|
||||
@ -332,6 +336,8 @@
|
||||
}
|
||||
}, cb);
|
||||
|
||||
cb(start, end);
|
||||
|
||||
});
|
||||
</script>
|
||||
|
||||
@ -422,21 +428,26 @@
|
||||
<input type="text" class="form-control" id="maxDate" value="" placeholder="MM/DD/YYYY">
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="opens">opens</label>
|
||||
<select id="opens" class="form-control">
|
||||
<option value="right" selected>right</option>
|
||||
<option value="left">left</option>
|
||||
<option value="center">center</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="drops">drops</label>
|
||||
<select id="drops" class="form-control">
|
||||
<option value="down" selected>down</option>
|
||||
<option value="up">up</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="autoApply"> autoApply
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="singleDatePicker"> singleDatePicker
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="showDropdowns"> showDropdowns
|
||||
@ -455,6 +466,12 @@
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="singleDatePicker"> singleDatePicker
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="timePicker"> timePicker
|
||||
@ -486,13 +503,13 @@
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="ranges"> ranges (with example predefined ranges)
|
||||
<input type="checkbox" id="locale"> locale (with example settings)
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="locale"> locale (with example settings)
|
||||
<input type="checkbox" id="autoApply"> autoApply
|
||||
</label>
|
||||
</div>
|
||||
|
||||
@ -508,32 +525,9 @@
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="alwaysShowCalendars"> alwaysShowCalendars
|
||||
</label>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
|
||||
<div class="form-group">
|
||||
<label for="opens">opens</label>
|
||||
<select id="opens" class="form-control">
|
||||
<option value="right" selected>right</option>
|
||||
<option value="left">left</option>
|
||||
<option value="center">center</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="drops">drops</label>
|
||||
<select id="drops" class="form-control">
|
||||
<option value="down" selected>down</option>
|
||||
<option value="up">up</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div class="form-group">
|
||||
<label for="buttonClasses">buttonClasses</label>
|
||||
<input type="text" class="form-control" id="buttonClasses" value="btn btn-sm">
|
||||
@ -549,6 +543,24 @@
|
||||
<input type="text" class="form-control" id="cancelClass" value="btn-default">
|
||||
</div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="ranges"> ranges (with example predefined ranges)
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="alwaysShowCalendars"> alwaysShowCalendars
|
||||
</label>
|
||||
</div>
|
||||
|
||||
<div class="checkbox">
|
||||
<label>
|
||||
<input type="checkbox" id="showCustomRangeLabel" checked="checked"> showCustomRangeLabel
|
||||
</label>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
@ -620,6 +632,16 @@
|
||||
<li>
|
||||
<code>ranges</code>: (object) Set predefined date ranges the user can select from. Each key is the label for the range, and its value an array with two dates representing the bounds of the range
|
||||
</li>
|
||||
<li>
|
||||
<code>showCustomRangeLabel</code>: (boolean) Displays an item labeled "Custom Range" at
|
||||
the end of the list of predefined ranges, when the <code>ranges</code> option is used.
|
||||
This option will be highlighted whenever the current date range selection does not match
|
||||
one of the predefined ranges. Clicking it will display the calendars to select a new range.
|
||||
</li>
|
||||
<li>
|
||||
<code>alwaysShowCalendars</code>: (boolean) Normally, if you use the <code>ranges</code>
|
||||
option to specify pre-defined date ranges, calendars for choosing a custom date range are not shown until the user clicks "Custom Range". When this option is set to true, the calendars for choosing a custom date range are always shown instead.
|
||||
</li>
|
||||
<li>
|
||||
<code>opens</code>: (string</code>: 'left'/'right'/'center') Whether the picker appears aligned to the left, to the right, or centered under the HTML element it's attached to
|
||||
</li>
|
||||
@ -636,7 +658,9 @@
|
||||
<code>cancelClass</code>: (string) CSS class string that will be added to the cancel button
|
||||
</li>
|
||||
<li>
|
||||
<code>locale</code>: (object) Allows you to provide localized strings for buttons and labels, customize the date display format, and change the first day of week for the calendars
|
||||
<code>locale</code>: (object) Allows you to provide localized strings for buttons and labels, customize the date format, and change the first day of week for the calendars.
|
||||
Check off "locale (with example settings)" in the configuration generator to see how
|
||||
to customize these options.
|
||||
</li>
|
||||
<li>
|
||||
<code>singleDatePicker</code>: (boolean) Show only a single calendar to choose one date, instead of a range picker with two calendars; the start and end dates provided to your callback will be the same single date chosen
|
||||
@ -647,9 +671,6 @@
|
||||
<li>
|
||||
<code>linkedCalendars</code>: (boolean) When enabled, the two calendars displayed will always be for two sequential months (i.e. January and February), and both will be advanced when clicking the left or right arrows above the calendars. When disabled, the two calendars can be individually advanced and display any month/year.
|
||||
</li>
|
||||
<li>
|
||||
<code>parentEl</code>: (string) jQuery selector of the parent element that the date range picker will be added to, if not provided this will be 'body'
|
||||
</li>
|
||||
<li>
|
||||
<code>isInvalidDate</code>: (function) A function that is passed each date in the two
|
||||
calendars before they are displayed, and may return true or false to indicate whether
|
||||
@ -666,8 +687,7 @@
|
||||
at initialization and when the selected dates change.
|
||||
</li>
|
||||
<li>
|
||||
<code>alwaysShowCalendars</code>: (boolean) Normally, if you use the <code>ranges</code>
|
||||
option to specify pre-defined date ranges, calendars for choosing a custom date range are not shown until the user clicks "Custom Range". When this option is set to true, the calendars for choosing a custom date range are always shown instead.
|
||||
<code>parentEl</code>: (string) jQuery selector of the parent element that the date range picker will be added to, if not provided this will be 'body'
|
||||
</li>
|
||||
</ul>
|
||||
|
||||
|
@ -32,7 +32,7 @@ li {
|
||||
}
|
||||
#sidebar {
|
||||
top: 20px;
|
||||
width: 336px;
|
||||
width: 300px;
|
||||
}
|
||||
#sidebar ul {
|
||||
margin-bottom: 5px;
|
||||
@ -108,7 +108,7 @@ input[type="text"] {
|
||||
#config .demo i { position: absolute; bottom: 10px; right: 24px; top: auto; cursor: pointer; }
|
||||
|
||||
#rightcol {
|
||||
margin-left: 366px;
|
||||
margin-left: 330px;
|
||||
}
|
||||
|
||||
#nav-spy {
|
||||
|
@ -90,6 +90,9 @@ $(document).ready(function() {
|
||||
if (!$('#autoUpdateInput').is(':checked'))
|
||||
options.autoUpdateInput = false;
|
||||
|
||||
if (!$('#showCustomRangeLabel').is(':checked'))
|
||||
options.showCustomRangeLabel = false;
|
||||
|
||||
if ($('#alwaysShowCalendars').is(':checked'))
|
||||
options.alwaysShowCalendars = true;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user