Merge pull request #298 from christianesperar/master

Update bootstrap-daterangepicker

bower.json

@@ -33,7 +33,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",

build/css/custom.css

@@ -3869,130 +3869,36 @@ 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; }
+/** FullCalendar **/
+.fc-state-default {
+  background: #f5f5f5;
+  color: #73879C; }
 
-.daterangepicker.picker_4 table.table-condensed tbody td.active {
-  background: #536A7F;
-  color: #fff; }
+.fc-state-down,
+.fc-state-active {
+  color: #333;
+  background: #ccc; }
 
-.daterangepicker.picker_4 table.table-condensed thead tr:first-child {
-  background: #34495E;
-  color: #ECF0F1; }
+/** /FullCalendar **/
+/** Dropzone.js **/
+.dropzone {
+  min-height: 300px;
+  border: 1px solid #e5e5e5; }
 
-.xdisplay_input {
-  width: 240px;
-  overflow: hidden;
-  padding: 0; }
+/** /Dropzone.js **/
 
-.xdisplay {
-  background-color: #fff;
-  background-clip: padding-box;
+.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;
-  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; }
-
+  box-shadow: none !important; }
+  .daterangepicker .input-mini.active {
+    border: 1px solid #ccc; }
 .daterangepicker select.monthselect, .daterangepicker select.yearselect {
   font-size: 12px;
   padding: 1px;
@@ -4003,129 +3909,71 @@ ul.notifications {
   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;
+  margin-right: 2%; }
+.daterangepicker td.in-range {
+  background: #E4E7EA;
+  color: #73879C; }
+.daterangepicker td.active, .daterangepicker td.active:hover {
+  background-color: #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;
+.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; }
 
-.fc-state-down,
-.fc-state-active {
-  color: #333;
-  background: #ccc; }
-
-/** /FullCalendar **/
-/** Dropzone.js **/
-.dropzone {
-  min-height: 300px;
-  border: 1px solid #e5e5e5; }
-
-/** /Dropzone.js **/
+.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; }

build/js/custom.js

@@ -39,7 +39,7 @@
  * and open the template in the editor.
  */
 
-var CURRENT_URL = window.location.href.split('?')[0],
+var CURRENT_URL = window.location.href.split('#')[0].split('?')[0],
     $BODY = $('body'),
     $MENU_TOGGLE = $('#menu_toggle'),
     $SIDEBAR_MENU = $('#sidebar-menu'),
@@ -276,4 +276,4 @@ if (typeof NProgress != 'undefined') {
     $(window).load(function () {
         NProgress.done();
     });
-}
+}

production/form.html

@@ -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>

production/index.html

@@ -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>

production/index2.html

@@ -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>

production/index3.html

@@ -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>