Commit a3659da4 authored by Jean-Philippe Levy's avatar Jean-Philippe Levy
Browse files

Merge branch '5.2-0'

Conflicts:
	README.md
	bower.json
	css/eonweb.css
	footer.php
	header.php
	include/arrays.php
	include/classes/Actions.class.php
	include/classes/Translator.class.php
	include/config.php
	include/function.php
	include/languages/messages-fr.json
	include/languages/messages.json
	include/livestatus/query.php
	include/purge.php
	index.php
	js/datatable.js
	js/daterangepicker.js
	js/eonweb.js
	js/side.js
	login.php
	logout.php
	module/admin_auth/admin_auth.js
	module/admin_auth/index.php
	module/admin_bp/add_application.php
	module/admin_bp/add_services.php
	module/admin_bp/admin_bp.css
	module/admin_bp/admin_bp.php
	module/admin_bp/index.php
	module/admin_bp/js/add_application.js
	module/admin_bp/js/add_services.js
	module/admin_bp/js/index.js
	module/admin_bp/php/function_bp.php
	module/admin_conf/admin_conf.php
	module/admin_conf/download.php
	module/admin_conf/index.php
	module/admin_conf/request.php
	module/admin_device/admin_device.js
	module/admin_device/index.php
	module/admin_group/add_modify_group.php
	module/admin_group/admin_group.js
	module/admin_group/admin_group.php
	module/admin_group/ajax.php
	module/admin_group/index.php
	module/admin_group/search.php
	module/admin_import_device/index.php
	module/admin_logs/admin_logs.js
	module/admin_logs/admin_logs.php
	module/admin_logs/ajax_logs.php
	module/admin_logs/index.php
	module/admin_notifier/admin_notifier.php
	module/admin_process/index.php
	module/admin_user/add_modify_user.php
	module/admin_user/admin_user.js
	module/admin_user/admin_user.php
	module/admin_user/index.php
	module/admin_user/search.php
	module/capacity_per_device/index.php
	module/capacity_per_label/index.php
	module/dashboard_view/dashboard_view.js
	module/dashboard_view/dashboard_view.php
	module/dashboard_view/index.php
	module/help_about/index.php
	module/index.php
	module/module_filters/index.php
	module/module_filters/module_filters.php
	module/module_frame/index.php
	module/module_frame/module_frame.php
	module/module_password/index.php
	module/monitoring_ged/ajax.php
	module/monitoring_ged/ged_actions.php
	module/monitoring_ged/ged_functions.php
	module/monitoring_ged/index.php
	module/monitoring_ged/monitoring_ged.js
	module/monitoring_ged/monitoring_ged.php
	module/report_event/ajax.php
	module/report_event/graph.php
	module/report_event/index.php
	module/report_event/report_event.js
	module/report_event/report_event.php
	module/report_performance/display.php
	module/report_performance/index.php
	module/report_performance/report_performance.js
	module/tool_all/index.php
	module/tool_all/select_tool.php
	module/tool_all/tool_all.js
	module/tool_all/tools/interface.php
	module/tool_all/tools/port.php
	module/tool_all/tools/snmpwalk.php
	side.php
parents 5509a7af ecfe6333
# eonweb
EyesOfNetwork web interface 5.1
EyesOfNetwork web interface 5.2
CREATE TABLE IF NOT EXISTS configs (
`name` varchar(255) NOT NULL,
`value` text NOT NULL,
PRIMARY KEY (`name`)
);
Summary: EyesOfNetwork Web Interface
Name: eonweb
Version: 5.2
Release: 0.eon
Source: https://github.com/EyesOfNetworkCommunity/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Group: Applications/System
License: GPL
Requires: eonconf, backup-manager, cacti, ged, ged-mysql, eon4apps, lilac, snmptt, thruk
Requires: httpd, mariadb-server, mod_auth_eon, mod_perl
Requires: php, php-mysql, php-ldap, php-process, php-xml
Requires: nagios >= 3.0, nagios-plugins >= 1.4.0, nagvis, nagiosbp, notifier, nagios-plugins-nrpe, pnp4nagios
Requires: net-snmp
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
# appliance group and users
%define eondir /srv/eyesofnetwork
%define datadir %{eondir}/%{name}-%{version}
%define eonconfdir /srv/eyesofnetworkconf/%{name}
%define linkdir %{eondir}/%{name}
%define snmpdir /etc/snmp
%define backupdir /etc
%description
EONWEB is the web frontend for the EyesOfNetwork appliance : https://www.eyesofnetwork.com.
%prep
%setup -q
%build
%install
install -d -m0755 %{buildroot}%{datadir}
install -d -m0755 %{buildroot}%{eonconfdir}
install -d -m0755 %{buildroot}%{_sysconfdir}/cron.d
install -d -m0755 %{buildroot}%{_sysconfdir}/httpd/conf.d
mv ./appliance/* %{buildroot}%{eonconfdir}
rm -rf ./appliance
cp -afv ./* %{buildroot}%{datadir}
cp -afv %{buildroot}%{eonconfdir}/eonbackup %{buildroot}%{_sysconfdir}/cron.d/
cp -afv %{buildroot}%{eonconfdir}/eonwebpurge %{buildroot}%{_sysconfdir}/cron.d/
cp -afv %{buildroot}%{eonconfdir}/eonweb.conf %{buildroot}%{_sysconfdir}/httpd/conf.d/
%post
ln -nsf %{datadir} %{linkdir}
/bin/chmod 775 %{datadir}/cache
/bin/chown -R root:eyesofnetwork %{datadir}
/bin/chown -h root:eyesofnetwork %{linkdir}
%clean
rm -rf %{buildroot}
%files
%{datadir}
%{eonconfdir}
%config(noreplace) %{_sysconfdir}/cron.d/eonbackup
%config(noreplace) %{_sysconfdir}/cron.d/eonwebpurge
%config(noreplace) %{_sysconfdir}/httpd/conf.d/%{name}.conf
%changelog
* Thu Nov 23 2017 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 5.2-0.eon
- packaged for EyesOfNetwork appliance 5.2
* Wed Jan 11 2017 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 5.1-0.eon
- packaged for EyesOfNetwork appliance 5.1
* Fri Apr 08 2016 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 5.0-0.eon
- packaged for EyesOfNetwork appliance 5.0
* Fri Dec 18 2015 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 4.2-3.eon
- highcharts ie cache false fix
- deashboard events links fix
* Tue Dec 08 2015 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 4.2-2.eon
- livestatus query contact filter fix
- ged query incidents filter fix
* Wed Dec 02 2015 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 4.2-1.eon
- highcharts instead of ezgraph added
- ldap groups added
- csv import fix
- ged refresh during edit fix
* Tue Sep 29 2015 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 4.2-0.eon
- packaged for EyesOfNetwork appliance 4.2
- new search based on thruk
- mysqli php functions
* Tue May 20 2014 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 4.1-2.eon
- ldap special caracters fix
* Thu May 08 2014 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 4.1-1.eon
- suppress ntop and shinken fix
* Mon Jan 06 2014 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 4.1-0.eon
- packaged for EyesOfNetwork appliance 4.1
- ldap special caracters fix
- thruk host without service search fix
* Thu Jul 18 2013 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 4.0-3.eon
- SetEnvIf Cookie for Location / fix
- ldap user creation fix
- ldap location with "'" fix
* Thu Jun 20 2013 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 4.0-2.eon
- new look&feel for IE fix
- ldap alphabetical search fix
- ldap single quote fix
* Fri Jun 07 2013 Michael Aubertin <michael.aubertin@gmail.com> - 4.0-1.eon
- adding new look&feel :) From Wonderful Laurent Belgrain Design. Thank's to him.
- ldap alphabetical search fix
- ldap single quote fix
* Thu Apr 25 2013 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 4.0-0.eon
- packaged for EyesOfNetwork appliance 4.0
* Wed Mar 06 2013 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 3.1-7.eon
- admin_bp based on mysql added
- tool external autocomplete added
- tool snmp community on ip based host fix
* Wed Jan 30 2013 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 3.1-6.eon
- admin_bp added
- summary and recurring downtimes links added
- advanced eonweb search added
* Tue Jan 22 2013 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 3.1-5.eon
- capacity for nagios fix
- new thruk report link fix
* Thu Sep 06 2012 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 3.1-4.eon
- panorama link added
- event browser fix
* Thu Aug 23 2012 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 3.1-3.eon
- side menus https fix
- seconds in clock pix
* Mon Jun 18 2012 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 3.1-2.eon
- advanced notifications added
- clock in header added
* Fri Apr 06 2012 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 3.1-1.eon
- thruk reports interface link added
- event browser optimizations added
- cookie domain added
- safari fix
* Tue Mar 13 2012 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 3.1-0.eon
- packaged for EyesOfNetwork appliance 3.1
* Tue Feb 28 2012 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 3.0-2.eon
- event browser based on mysql queries fix
* Wed Nov 23 2011 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 3.0-1.eon
- login case fix
* Sun Apr 10 2011 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 3.0-0.eon
- packaged for EyesOfNetwork appliance 3.0
- change password page added
- mod_perl dependency added
- downtime scheduling added
- problems thruk view added
- thruk event log view added
- cacti hostname type for synhronization added
- ldap extended search fix
* Mon Mar 14 2011 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 2.2-3.eon
- limited user dashboard fix
* Fri Feb 18 2011 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 2.2-2.eon
- ged reports with sql requests
- nagios url and cgi in variable
* Sun Dec 05 2010 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 2.2-1.eon
- ged trigram added
- default language fix
* Wed Jul 28 2010 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 2.2-0.eon
- packaged for EyesOfNetwork appliance 2.2
- setenvif instead of setenv in apache configuration added
- request services in admin_conf added
- owned and not owned filters in events added
- error messages in events when network/http problems added
- contacts notification commands creation added
- fop check installation link added
- max csv upload size 20480 fix
- users files delete fix
- contacts and contactgroups creation fix
- contacts and contactgroups delete fix
- nagiosbp links fix
- weathermap links fix
- generate report.doc for each users fix
- ldap "," in cn fix
- ldap password encryption
* Wed May 26 2010 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 2.1-1.eon
- hosts and templates links in nagios configuration added
- snmp v3 with "-l authpriv" added
- ged history without 2 ack time selections fix
- users and contacts mail fix
- login page ie6 fix
* Tue Feb 16 2010 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 2.1-0.eon
- apache setenv added
- nagios configuration reports added
- host template display for nagios to cacti importer added
- cacti snmp community in importer added
- jquery 1.4.2 update
- users and contacts mail fix
- ged history duration fix
- autocomplete on report_fop fix
- ged type 1 events sources fix
- gedmysql.cfg fix
- import to cacti space fix
- refresh with _blank links fix
* Fri Jul 17 2009 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 2.0-1.eon
- updates for lilac calls
- new header
- hosts,hostgroups,servicegroups autocomplete
* Fri Jul 10 2009 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 2.0-0.eon
- packaged for EyesOfNetwork appliance 2.0
- new look with navigation bar
- jquery 1.3.2
- jquery-ui 1.7.1
- lilac database rights
- updates for ged 1.2-2
- new header
- hosts,hostgroups,servicegroups autocomplete
* Mon Feb 23 2009 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 1.2-0.eon
- groups, users and ldap_users order by name
- ndo2db process management added
- ged comment with acknowledge functionality added
- ged process management fixed
- ged delete in history queue activated
- nagios hostgroups and servicesgroups links added
- nagios downtimes link renamed
* Mon Dec 22 2008 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 1.1-0.eon
- no more jpgraph welcome to eZcomponents
- french and english languages for titles
- crons for purge and backup
- new ged reports
* Mon Sep 08 2008 Jean-Philippe Levy <jeanphilippe.levy@gmail.com> - 1.0-0.eon
- packaged for EyesOfNetwork appliance
......@@ -46,6 +46,29 @@ INSERT INTO `auth_settings` VALUES (0,NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL);
/*!40000 ALTER TABLE `auth_settings` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `configs`
--
DROP TABLE IF EXISTS `configs`;
/*!40101 SET @saved_cs_client = @@character_set_client */;
/*!40101 SET character_set_client = utf8 */;
CREATE TABLE `configs` (
`name` varchar(255) NOT NULL,
`value` text NOT NULL,
PRIMARY KEY (`name`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
/*!40101 SET character_set_client = @saved_cs_client */;
--
-- Dumping data for table `configs`
--
LOCK TABLES `configs` WRITE;
/*!40000 ALTER TABLE `configs` DISABLE KEYS */;
/*!40000 ALTER TABLE `configs` ENABLE KEYS */;
UNLOCK TABLES;
--
-- Table structure for table `groupright`
--
......
#!/bin/sh
# Define values
eonconfdir="/srv/eyesofnetworkconf/eonweb"
eonconfpath=$(readlink -f "$0")
eonconfdir=$(dirname "$eonconfpath")
eondir="/srv/eyesofnetwork"
datadir="$eondir/eonweb"
eonwebdb="eonweb"
......@@ -11,9 +12,13 @@ backupdir="/etc"
# change right acces for this files
chmod 775 ${datadir}/cache
chmod 666 ${snmpdir}/snmpd.conf
chmod 666 ${snmpdir}/snmptrapd.conf
chmod 666 ${backupdir}/backup-manager.conf
chmod 644 ${snmpdir}/snmpd.conf
chmod 644 ${snmpdir}/snmptrapd.conf
chmod 644 ${backupdir}/backup-manager.conf
chmod 664 /srv/eyesofnetwork/notifier/etc/notifier.cfg
chmod 664 /srv/eyesofnetwork/notifier/etc/notifier.rules
chown root:eyesofnetwork /srv/eyesofnetwork/notifier/etc/notifier.cfg
chown root:eyesofnetwork /srv/eyesofnetwork/notifier/etc/notifier.rules
# change own user for eonweb directory
chown -R root:eyesofnetwork ${datadir}*
......
{
"name": "eonweb-5.1",
"description": "EyesOfNetwork web interface 5.1",
"name": "eonweb-5.2",
"description": "EyesOfNetwork web interface 5.2",
"main": "index.php",
"moduleType": [],
"authors": [
......@@ -17,10 +17,14 @@
"tests"
],
"dependencies": {
"startbootstrap-sb-admin-2": "^3.3.7",
"highcharts": "^4.2.6",
"jquery-ui": "^1.12.0",
"bootstrap-daterangepicker": "^2.1.24",
"bootstrap-select": "^1.10.0"
"startbootstrap-sb-admin-2": "BlackrockDigital/startbootstrap-sb-admin-2#^3.3.7",
"font-awesome": "^4.7.0",
"highcharts": "^5.0.12",
"jquery-ui": "^1.12.1",
"bootstrap-daterangepicker": "^2.1.25",
"bootstrap-select": "^1.12.4"
},
"resolutions": {
"font-awesome": "^4.7.0"
}
}
......@@ -14,18 +14,18 @@
"moment.min.js"
],
"dependencies": {
"jquery": "1.9.1 - 2",
"jquery": "1.9.1 - 3",
"moment": ">=2.9.0"
},
"homepage": "https://github.com/dangrossman/bootstrap-daterangepicker",
"version": "2.1.24",
"_release": "2.1.24",
"version": "2.1.25",
"_release": "2.1.25",
"_resolution": {
"type": "version",
"tag": "v2.1.24",
"commit": "249b7191282c076c290c8e8bc78b3f6eee91097e"
"tag": "v2.1.25",
"commit": "29bbf5a04df69fda363cedb534272ac344524e57"
},
"_source": "https://github.com/dangrossman/bootstrap-daterangepicker.git",
"_target": "^2.1.24",
"_target": "^2.1.25",
"_originalSource": "bootstrap-daterangepicker"
}
\ No newline at end of file
......@@ -14,7 +14,7 @@
"moment.min.js"
],
"dependencies": {
"jquery": "1.9.1 - 2",
"jquery": "1.9.1 - 3",
"moment": ">=2.9.0"
}
}
.daterangepicker {
position: absolute;
color: inherit;
background: #fff;
background-color: #fff;
border-radius: 4px;
width: 278px;
padding: 4px;
......@@ -77,7 +77,7 @@
border: 1px solid #fff;
padding: 4px;
border-radius: 4px;
background: #fff; }
background-color: #fff; }
.daterangepicker table {
width: 100%;
margin: 0; }
......@@ -183,7 +183,7 @@
width: 100%; }
.ranges li {
font-size: 13px;
background: #f5f5f5;
background-color: #f5f5f5;
border: 1px solid #f5f5f5;
border-radius: 4px;
color: #08c;
......@@ -191,11 +191,11 @@
margin-bottom: 8px;
cursor: pointer; }
.ranges li:hover {
background: #08c;
background-color: #08c;
border: 1px solid #08c;
color: #fff; }
.ranges li.active {
background: #08c;
background-color: #08c;
border: 1px solid #08c;
color: #fff; }
......
/**
* @version: 2.1.24
* @version: 2.1.25
* @author: Dan Grossman http://www.dangrossman.info/
* @copyright: Copyright (c) 2012-2016 Dan Grossman. All rights reserved.
* @copyright: Copyright (c) 2012-2017 Dan Grossman. All rights reserved.
* @license: Licensed under the MIT license. See http://www.opensource.org/licenses/mit-license.php
* @website: https://www.improvely.com/
* @website: https://www.daterangepicker.com/
*/
// Follow the UMD template https://github.com/umdjs/umd/blob/master/templates/returnExportsGlobal.js
(function (root, factory) {
......@@ -65,7 +65,7 @@
this.locale = {
direction: 'ltr',
format: 'MM/DD/YYYY',
format: moment.localeData().longDateFormat('L'),
separator: ' - ',
applyLabel: 'Apply',
cancelLabel: 'Cancel',
......@@ -160,9 +160,13 @@
if (typeof options.locale.weekLabel === 'string')
this.locale.weekLabel = options.locale.weekLabel;
if (typeof options.locale.customRangeLabel === 'string')
this.locale.customRangeLabel = options.locale.customRangeLabel;
if (typeof options.locale.customRangeLabel === 'string'){
//Support unicode chars in the custom range name.
var elem = document.createElement('textarea');
elem.innerHTML = options.locale.customRangeLabel;
var rangeHtml = elem.value;
this.locale.customRangeLabel = rangeHtml;
}
}
this.container.addClass(this.locale.direction);
......@@ -470,13 +474,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);
}
......@@ -504,7 +508,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);
......@@ -873,7 +877,7 @@
//Preserve the time already selected
var timeSelector = this.container.find('.calendar.right .calendar-time div');
if (!this.endDate && timeSelector.html() != '') {
if (timeSelector.html() != '') {
selected.hour(timeSelector.find('.hourselect option:selected').val() || selected.hour());
selected.minute(timeSelector.find('.minuteselect option:selected').val() || selected.minute());
......@@ -1267,7 +1271,7 @@
var rightCalendar = this.rightCalendar;
var startDate = this.startDate;
if (!this.endDate) {
this.container.find('.calendar td').each(function(index, el) {
this.container.find('.calendar tbody td').each(function(index, el) {
//skip week numbers, only look at dates
if ($(el).hasClass('week')) return;
......@@ -1362,30 +1366,34 @@
},
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.showCustomRangeLabel) {
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) {
......
......@@ -116,7 +116,7 @@ $daterangepicker-ranges-active-border-radius: $daterangepicker-border-radius !de
.#{$prefix-class} {
position: absolute;
color: $daterangepicker-color;
background: $daterangepicker-bg-color;
background-color: $daterangepicker-bg-color;
border-radius: $daterangepicker-border-radius;
width: $daterangepicker-width;
padding: $daterangepicker-padding;
......@@ -256,7 +256,7 @@ $daterangepicker-ranges-active-border-radius: $daterangepicker-border-radius !de
border: $daterangepicker-calendar-border-size solid $daterangepicker-calendar-border-color;
padding: $daterangepicker-calendar-margin;
border-radius: $daterangepicker-calendar-border-radius;
background: $daterangepicker-calendar-bg-color;
background-color: $daterangepicker-calendar-bg-color;
}
table {
......@@ -452,7 +452,7 @@ $daterangepicker-ranges-active-border-radius: $daterangepicker-border-radius !de
li {
font-size: 13px;
background: $daterangepicker-ranges-bg-color;
background-color: $daterangepicker-ranges-bg-color;
border: $daterangepicker-ranges-border-size solid $daterangepicker-ranges-border-color;
border-radius: $daterangepicker-ranges-border-radius;
color: $daterangepicker-ranges-color;
......@@ -461,13 +461,13 @@ $daterangepicker-ranges-active-border-radius: $daterangepicker-border-radius !de
cursor: pointer;
&:hover {
background: $daterangepicker-ranges-hover-bg-color;
background-color: $daterangepicker-ranges-hover-bg-color;
border: $daterangepicker-ranges-hover-border-size solid $daterangepicker-ranges-hover-border-color;
color: $daterangepicker-ranges-hover-color;
}
&.active {
background: $daterangepicker-ranges-hover-bg-color;
background-color: $daterangepicker-ranges-hover-bg-color;
border: $daterangepicker-ranges-hover-border-size solid $daterangepicker-ranges-hover-border-color;
color: $daterangepicker-ranges-hover-color;
}
......