diff --git a/.travis.yml b/.travis.yml
index bc7b810de..da05d8970 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: cpp
 sudo: required
-dist: xenial
+dist: bionic
 git:
   depth: 9999999
 notifications:
@@ -37,6 +37,7 @@ env:
   - SMPFLAGS=-j4 OS=el DIST=8 DOCKER_REPO=knnniggett/packpack
   - SMPFLAGS=-j4 OS=fedora DIST=31 DOCKER_REPO=knnniggett/packpack
   - SMPFLAGS=-j4 OS=fedora DIST=32 DOCKER_REPO=knnniggett/packpack
+  - SMPFLAGS=-j4 OS=fedora DIST=33 DOCKER_REPO=knnniggett/packpack
   - SMPFLAGS=-j4 OS=ubuntu DIST=xenial DOCKER_REPO=iconzm/packpack
   - SMPFLAGS=-j4 OS=ubuntu DIST=bionic DOCKER_REPO=iconzm/packpack
   - SMPFLAGS=-j4 OS=ubuntu DIST=focal DOCKER_REPO=iconzm/packpack
diff --git a/README.md b/README.md
index ab946c04c..c7bd801b7 100644
--- a/README.md
+++ b/README.md
@@ -70,18 +70,19 @@ Docker is a system to run applications inside isolated containers. ZoneMinder, a
 Dockerfile contained in this repository. However, there is still work needed to ensure that the main ZM features work 
 properly and are documented. 
 
-## Contribution Model and  Development
+## Contribution Model and Development
 
 * Source hosted at [GitHub](https://github.com/ZoneMinder/ZoneMinder/)
-* Report issues/questions/feature requests on [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)
+* Report issues at [GitHub Issues](https://github.com/ZoneMinder/ZoneMinder/issues)
+* Questions/feature requests in [Slack](https://zoneminder-chat.slack.com/) or [forums](https://forums.zoneminder.com)
 
 Pull requests are very welcome!  If you would like to contribute, please follow
 the following steps.  While step 3 is optional, it is preferred.
 
 1. Fork the repo
 2. Open an issue at our [GitHub Issues Tracker](https://github.com/ZoneMinder/ZoneMinder/issues).
-   Describe the bug that you've found, or the feature which you're asking for.
-   Jot down the issue number (e.g. 456)
+   Follow the issue template to describe the bug or security issue you found. Please note feature
+   requests or questions should be posted in our user forum or Slack channel.
 3. Create your feature branch (`git checkout -b 456-my-new-feature`)
 4. Commit your changes (`git commit -am 'Added some feature'`)
    It is preferred that you 'commit early and often' instead of bunching all
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index af6a17182..cd4622df1 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -536,6 +536,8 @@ CREATE TABLE `Monitors` (
   `ArchivedEventDiskSpace` bigint default NULL,
   `ZoneCount` TINYINT NOT NULL DEFAULT 0,
   `Refresh` int(10) unsigned default NULL,
+  `Latitude`  DECIMAL(10,8),
+  `Longitude`  DECIMAL(10,8),
   PRIMARY KEY (`Id`)
 ) ENGINE=@ZM_MYSQL_ENGINE@;
 
diff --git a/db/zm_update-1.31.13.sql b/db/zm_update-1.31.13.sql
index dd63b347a..150264027 100644
--- a/db/zm_update-1.31.13.sql
+++ b/db/zm_update-1.31.13.sql
@@ -13,6 +13,8 @@ SET @s = (SELECT IF(
 PREPARE stmt FROM @s;
 EXECUTE stmt;
 
+UPDATE `Events` SET `SaveJPEGs`=(SELECT `SaveJPEGs` FROM `Monitors` WHERE Monitors.Id = MonitorId)  WHERE `SaveJPEGs` IS NULL;
+
 SET @s = (SELECT IF(
     (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
      AND table_name = 'Storage'
diff --git a/db/zm_update-1.35.7.sql b/db/zm_update-1.35.7.sql
new file mode 100644
index 000000000..84c3dbb1e
--- /dev/null
+++ b/db/zm_update-1.35.7.sql
@@ -0,0 +1,23 @@
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'Latitude'
+    ) > 0,
+"SELECT 'Column Latitude already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Latitude`  DECIMAL(10,8) AFTER `Refresh`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+    (SELECT COUNT(*) FROM INFORMATION_SCHEMA.COLUMNS WHERE table_schema = DATABASE()
+     AND table_name = 'Monitors'
+     AND column_name = 'Longitude'
+    ) > 0,
+"SELECT 'Column Longitude already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `Longitude`  DECIMAL(10,8) AFTER `Latitude`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/distros/redhat/common/zoneminder.service.in b/distros/redhat/common/zoneminder.service.in
index 8551a60e2..f4b3aad9b 100644
--- a/distros/redhat/common/zoneminder.service.in
+++ b/distros/redhat/common/zoneminder.service.in
@@ -5,6 +5,7 @@
 Description=ZoneMinder CCTV recording and security system
 After=network.target mariadb.service
 Requires=mariadb.service
+BindsTo=mariadb.service
 
 [Service]
 Type=forking
diff --git a/distros/redhat/zoneminder.spec b/distros/redhat/zoneminder.spec
index 9e876324e..b594c2de2 100644
--- a/distros/redhat/zoneminder.spec
+++ b/distros/redhat/zoneminder.spec
@@ -28,7 +28,7 @@
 %global _hardened_build 1
 
 Name: zoneminder
-Version: 1.35.6
+Version: 1.35.7
 Release: 1%{?dist}
 Summary: A camera monitoring and analysis tool
 Group: System Environment/Daemons
@@ -206,8 +206,6 @@ mv -f CakePHP-Enum-Behavior-%{ceb_version} ./web/api/app/Plugin/CakePHP-Enum-Beh
 ./utils/zmeditconfigdata.sh ZM_OPT_CAMBOZOLA yes
 ./utils/zmeditconfigdata.sh ZM_OPT_CONTROL yes
 ./utils/zmeditconfigdata.sh ZM_CHECK_FOR_UPDATES no
-./utils/zmeditconfigdata.sh ZM_DYN_SHOW_DONATE_REMINDER no
-./utils/zmeditconfigdata.sh ZM_OPT_FAST_DELETE no
 
 %build
 # Disable LTO due to top level asm
diff --git a/distros/ubuntu2004/zoneminder.init b/distros/ubuntu2004/zoneminder.init
new file mode 100644
index 000000000..6132481f3
--- /dev/null
+++ b/distros/ubuntu2004/zoneminder.init
@@ -0,0 +1,91 @@
+#!/bin/sh
+### BEGIN INIT INFO
+# Provides:          zoneminder
+# Required-Start:    $network $remote_fs $syslog
+# Required-Stop:     $network $remote_fs $syslog
+# Should-Start:      mysql
+# Should-Stop:       mysql
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description:  Control ZoneMinder as a Service
+# Description: ZoneMinder CCTV recording and surveillance system
+### END INIT INFO
+# chkconfig: 2345 20 20
+
+# Source function library.
+. /lib/lsb/init-functions
+
+prog=ZoneMinder
+ZM_PATH_BIN="/usr/bin"
+RUNDIR="/run/zm"
+TMPDIR="/tmp/zm"
+command="$ZM_PATH_BIN/zmpkg.pl"
+
+start() {
+	echo -n "Starting $prog: "
+	export TZ=:/etc/localtime
+	mkdir -p "$RUNDIR" && chown www-data:www-data "$RUNDIR"
+	mkdir -p "$TMPDIR" && chown www-data:www-data "$TMPDIR"
+	$command start
+	RETVAL=$?
+	[ $RETVAL = 0 ] && echo success
+	[ $RETVAL != 0 ] && echo failure
+	echo
+	[ $RETVAL = 0 ] && touch /var/lock/zm
+	return $RETVAL
+}
+stop() {
+	echo -n "Stopping $prog: "
+	#
+	# Why is this status check being done?
+	# as $command stop returns 1 if zoneminder
+	# is stopped, which will result in
+	# this returning 1, which will stuff
+	# dpkg when it tries to stop zoneminder before
+	# uninstalling . . .
+	#
+	result=`$command status`
+	if [ ! "$result" = "running" ]; then
+		echo "Zoneminder already stopped"
+		echo
+		RETVAL=0
+	else
+		$command stop
+		RETVAL=$?
+		[ $RETVAL = 0 ] && echo success
+		[ $RETVAL != 0 ] && echo failure
+		echo
+		[ $RETVAL = 0 ] && rm -f /var/lock/zm
+	fi
+}
+status() {
+	result=`$command status`
+	if [ "$result" = "running" ]; then
+		echo "ZoneMinder is running"
+		RETVAL=0
+	else
+		echo "ZoneMinder is stopped"
+		RETVAL=1
+	fi
+}
+
+case "$1" in
+'start')
+	start
+	;;
+'stop')
+	stop
+	;;
+'restart' | 'force-reload')
+	stop
+	start
+	;;
+'status')
+	status
+	;;
+*)
+	echo "Usage: $0 { start | stop | restart | status }"
+	RETVAL=1
+	;;
+esac
+exit $RETVAL
diff --git a/distros/ubuntu2004/zoneminder.postinst b/distros/ubuntu2004/zoneminder.postinst
index 5d5ddd6ff..39a2fa1b0 100644
--- a/distros/ubuntu2004/zoneminder.postinst
+++ b/distros/ubuntu2004/zoneminder.postinst
@@ -2,13 +2,47 @@
 
 set +e
 
+create_db () {
+  echo "Checking for db"
+  mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
+  # test if database if already present...
+  if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
+    echo "Creating zm db"
+    cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+    if [ $? -ne 0 ]; then
+      echo "Error creating db."
+      exit 1;
+    fi
+  else
+    echo "Db exists."
+  fi
+  USER_EXISTS="$(mysql --defaults-file=/etc/mysql/debian.cnf  -sse "SELECT EXISTS(SELECT 1 FROM mysql.user WHERE user = '$ZM_DB_USER')")"
+  if [ $USER_EXISTS -ne 1 ]; then
+    echo "Creating zm user $ZM_DB_USER"
+    # This creates the user.
+    echo "CREATE USER '${ZM_DB_USER}'@${ZM_DB_HOST} IDENTIFIED BY '${ZM_DB_PASS}';" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+  fi
+}
+
+update_db () {
+  echo "Updating permissions"
+  echo "GRANT LOCK tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine,trigger,execute ON ${ZM_DB_NAME}.* TO '${ZM_DB_USER}'@${ZM_DB_HOST};" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+
+  zmupdate.pl --nointeractive
+  zmupdate.pl --nointeractive -f
+
+  # Add any new PTZ control configurations to the database (will not overwrite)
+  zmcamtool.pl --import >/dev/null 2>&1
+  echo "Done Updating"
+}
+
 if [ "$1" = "configure" ]; then
-    
+
   . /etc/zm/zm.conf
   for CONFFILE in /etc/zm/conf.d/*.conf; do
     . "$CONFFILE"
   done
-  
+
   # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group
   chown www-data:root /var/log/zm
   chown www-data:www-data /var/lib/zm
@@ -20,16 +54,24 @@ if [ "$1" = "configure" ]; then
     a2enmod cgi
   fi
 
+  SYSTEMD=0
+  if [ -e "/run/systemd/system" ]; then
+    SYSTEMD=1
+    echo "detected systemd"
+    # Ensure zoneminder is stopped
+    deb-systemd-invoke stop zoneminder.service || exit $?
+  else
+    # Ensure zoneminder is stopped
+    invoke-rc.d zoneminder stop || true
+  fi
+
   if [ "$ZM_DB_HOST" = "localhost" ]; then
 
-    if [ -e "/lib/systemd/system/mysql.service" ] || [ -e "/lib/systemd/system/mariadb.service" ] || [ -e "/etc/init.d/mysql" ]; then
-      # Ensure zoneminder is stopped
-      deb-systemd-invoke stop zoneminder.service || exit $?
-          
+    if [ $SYSTEMD -eq 1 ] && ([ -e "/lib/systemd/system/mysql.service" ] || [ -e "/lib/systemd/system/mariadb.service" ]); then
       #
       # Get mysql started if it isn't running
       #
-      
+
       if [ -e "/lib/systemd/system/mariadb.service" ]; then
         DBSERVICE="mariadb.service"
       else
@@ -42,48 +84,48 @@ if [ "$1" = "configure" ]; then
         echo "run sudo systemctl restart $DBSERVICE then run sudo dpkg-reconfigure zoneminder."
         exit 1
       fi
-      
+
       if ! systemctl is-active --quiet mysql.service mariadb.service; then
         # Due to /etc/init.d service autogeneration, mysql.service always returns the status of mariadb.service
         # However, mariadb.service will not return the status of mysql.service.
         deb-systemd-invoke start $DBSERVICE
       fi
-      
+
       # Make sure systemctl status exit code is 0; i.e. the DB is running
       if systemctl is-active --quiet "$DBSERVICE"; then
-        mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
-        # test if database if already present...
-        if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
-            echo "Creating zm db"
-            cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
-            if [ $? -ne 0 ]; then
-              echo "Error creating db."
-              exit 1;
-            fi
-            # This creates the user.
-            echo "CREATE USER '${ZM_DB_USER}'@${ZM_DB_HOST} IDENTIFIED BY '${ZM_DB_PASS}';" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-        fi
-        echo "Updating permissions"
-        echo "GRANT LOCK tables,alter,drop,select,insert,update,delete,create,index,alter routine,create routine,trigger,execute ON ${ZM_DB_NAME}.* TO '${ZM_DB_USER}'@${ZM_DB_HOST};" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-
-        zmupdate.pl --nointeractive
-        zmupdate.pl --nointeractive -f
-
-        # Add any new PTZ control configurations to the database (will not overwrite)
-        zmcamtool.pl --import >/dev/null 2>&1
-        echo "Done Updating; starting ZoneMinder."
+        create_db
+        update_db
       else
         echo 'NOTE: MySQL/MariaDB not running; please start mysql and run dpkg-reconfigure zoneminder when it is running.'
       fi
+
+    elif [ -e "/etc/init.d/mysql" ]; then
+      #
+      # Get mysql started if it isn't
+      #
+      if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+        service mysql start
+      fi
+      if $(/etc/init.d/mysql status >/dev/null 2>&1); then
+        create_db
+        update_db
+      else
+        echo 'NOTE: MySQL/MariaDB not running; please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+      fi
+
     else
       echo 'MySQL/MariaDB not found; assuming remote server.'
     fi
-
-  else
-    echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)."
   fi
-  deb-systemd-invoke restart zoneminder.service
 
+else
+  echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)."
+fi
+
+if [ $SYSTEMD -eq 1 ]; then
+  deb-systemd-invoke restart zoneminder.service
+#else
+  #service zoneminder start || true
 fi
 
 #DEBHELPER#
diff --git a/docs/userguide/gettingstarted.rst b/docs/userguide/gettingstarted.rst
index 0b40d7fb9..99f2ea4ba 100644
--- a/docs/userguide/gettingstarted.rst
+++ b/docs/userguide/gettingstarted.rst
@@ -51,7 +51,7 @@ This screen is called the "console" screen in ZoneMinder and shows a summary of
 
 * **A**: The options menu lets you configure many aspects of ZoneMinder. Refer to :doc:`options`.
 * **B**: This brings up a color coded log window that shows various system and component level logs. This window is useful if you are trying to diagnose issues. Refer to :doc:`logging`.
-* **C**: ZoneMinder allows you to group monitors gor logical separation. This option lets you create new groups, associate monitors to them and edit/delete existing groups.
+* **C**: ZoneMinder allows you to group monitors for logical separation. This option lets you create new groups, associate monitors to them and edit/delete existing groups.
 * **D**: Filters are a powerful mechanism to perform actions when certain conditions are met. ZoneMinder comes with some preset filters that keep a tab of disk space and others. Many users create their own filters for more advanced actions like sending emails when certain events occur and more. Refer to :doc:`filterevents`.
 * **E**: The Cycle option allows you to rotate between live views of each cofigured monitor.
 * **F**: The Montage option shows a collage of your monitors. You can customize them including moving them around.
diff --git a/onvif/modules/MYMETA.json b/onvif/modules/MYMETA.json
deleted file mode 100644
index cab2ae939..000000000
--- a/onvif/modules/MYMETA.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-   "abstract" : "unknown",
-   "author" : [
-      "Jan Hochstein"
-   ],
-   "dynamic_config" : 0,
-   "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
-   "license" : [
-      "unknown"
-   ],
-   "meta-spec" : {
-      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : 2
-   },
-   "name" : "ONVIF",
-   "no_index" : {
-      "directory" : [
-         "t",
-         "inc"
-      ]
-   },
-   "prereqs" : {
-      "build" : {
-         "requires" : {
-            "ExtUtils::MakeMaker" : "0"
-         }
-      },
-      "configure" : {
-         "requires" : {
-            "ExtUtils::MakeMaker" : "0"
-         }
-      },
-      "runtime" : {
-         "requires" : {}
-      }
-   },
-   "release_status" : "stable",
-   "version" : "",
-   "x_serialization_backend" : "JSON::PP version 4.02"
-}
diff --git a/onvif/modules/MYMETA.yml b/onvif/modules/MYMETA.yml
deleted file mode 100644
index ea47256fc..000000000
--- a/onvif/modules/MYMETA.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-abstract: unknown
-author:
-  - 'Jan Hochstein'
-build_requires:
-  ExtUtils::MakeMaker: '0'
-configure_requires:
-  ExtUtils::MakeMaker: '0'
-dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
-license: unknown
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: '1.4'
-name: ONVIF
-no_index:
-  directory:
-    - t
-    - inc
-requires: {}
-version: ''
-x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/onvif/modules/pm_to_blib b/onvif/modules/pm_to_blib
deleted file mode 100644
index e69de29bb..000000000
diff --git a/onvif/proxy/MYMETA.json b/onvif/proxy/MYMETA.json
deleted file mode 100644
index cab2ae939..000000000
--- a/onvif/proxy/MYMETA.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-   "abstract" : "unknown",
-   "author" : [
-      "Jan Hochstein"
-   ],
-   "dynamic_config" : 0,
-   "generated_by" : "ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010",
-   "license" : [
-      "unknown"
-   ],
-   "meta-spec" : {
-      "url" : "http://search.cpan.org/perldoc?CPAN::Meta::Spec",
-      "version" : 2
-   },
-   "name" : "ONVIF",
-   "no_index" : {
-      "directory" : [
-         "t",
-         "inc"
-      ]
-   },
-   "prereqs" : {
-      "build" : {
-         "requires" : {
-            "ExtUtils::MakeMaker" : "0"
-         }
-      },
-      "configure" : {
-         "requires" : {
-            "ExtUtils::MakeMaker" : "0"
-         }
-      },
-      "runtime" : {
-         "requires" : {}
-      }
-   },
-   "release_status" : "stable",
-   "version" : "",
-   "x_serialization_backend" : "JSON::PP version 4.02"
-}
diff --git a/onvif/proxy/MYMETA.yml b/onvif/proxy/MYMETA.yml
deleted file mode 100644
index ea47256fc..000000000
--- a/onvif/proxy/MYMETA.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-abstract: unknown
-author:
-  - 'Jan Hochstein'
-build_requires:
-  ExtUtils::MakeMaker: '0'
-configure_requires:
-  ExtUtils::MakeMaker: '0'
-dynamic_config: 0
-generated_by: 'ExtUtils::MakeMaker version 7.34, CPAN::Meta::Converter version 2.150010'
-license: unknown
-meta-spec:
-  url: http://module-build.sourceforge.net/META-spec-v1.4.html
-  version: '1.4'
-name: ONVIF
-no_index:
-  directory:
-    - t
-    - inc
-requires: {}
-version: ''
-x_serialization_backend: 'CPAN::Meta::YAML version 0.018'
diff --git a/onvif/proxy/pm_to_blib b/onvif/proxy/pm_to_blib
deleted file mode 100644
index e69de29bb..000000000
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index 9b91ff4b9..43fbcb457 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -479,6 +479,33 @@ our @options = (
     type        => $types{string},
     category    => 'system',
   },
+  {
+    name        =>  'ZM_OPT_USE_GEOLOCATION',
+    description =>  'Add geolocation features to ZoneMinder.',
+    help        =>  'Whether or not to enable Latitude/Longitude settings on Monitors and enable mapping options.',
+    type        =>  $types{boolean},
+    category    =>  'system',
+  },
+  {
+    name        =>  'ZM_OPT_GEOLOCATION_TILE_PROVIDER',
+    description =>  'Tile provider to use for maps.',
+    help        =>  'OpenStreetMaps does not itself provide the images to use in the map. There are many to choose from.  Mapbox.com is one example that offers free tiles and has been tested during development of this feature.',
+    requires    =>  [
+                     {name=>'ZM_OPT_USE_GEOLOCATION', value=>'yes'}
+                   ],
+    type        => $types{string},
+    category    => 'system',
+  },
+  {
+    name        =>  'ZM_OPT_GEOLOCATION_ACCESS_TOKEN',
+    description =>  'Access Token for the tile provider used for maps.',
+    help        =>  'OpenStreetMaps does not itself provide the images to use in the map. There are many to choose from.  Mapbox.com is one example that offers free tiles and has been tested during development of this feature. You must go to mapbox.com and sign up and get an access token and cutnpaste it here.',
+    requires    =>  [
+                     {name=>'ZM_OPT_USE_GEOLOCATION', value=>'yes'}
+                   ],
+    type        => $types{string},
+    category    => 'system',
+  },
   {
     name        =>  'ZM_SYSTEM_SHUTDOWN',
     default     =>  'true',
@@ -2621,7 +2648,7 @@ our @options = (
   },
   {
     name        => 'ZM_WEB_EVENT_SORT_FIELD',
-    default     => 'DateTime',
+    default     => 'StartDateTime',
     description => 'Default field the event lists are sorted by',
     help        => q`
       Events in lists can be initially ordered in any way you want.
@@ -2633,7 +2660,7 @@ our @options = (
       `,
     type        => {
       db_type     =>'string',
-      hint        =>'Id|Name|Cause|MonitorName|DateTime|Length|Frames|AlarmFrames|TotScore|AvgScore|MaxScore',
+      hint        =>'Id|Name|Cause|DiskSpace|MonitorName|StartDateTime|Length|Frames|AlarmFrames|TotScore|AvgScore|MaxScore',
       pattern     =>qr|.|,
       format      =>q( $1 )
     },
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
index 827936b86..3fdcab5e2 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Database.pm
@@ -146,15 +146,15 @@ sub zmDbGetMonitors {
 
   if ( $function ) {
     if ( $function == DB_MON_CAPT ) {
-      $sql .= " where `Function` >= 'Monitor'";
+      $sql .= " WHERE `Function` >= 'Monitor'";
     } elsif ( $function == DB_MON_ACTIVE ) {
-      $sql .= " where `Function` > 'Monitor'";
+      $sql .= " WHERE `Function` > 'Monitor'";
     } elsif ( $function == DB_MON_MOTION ) {
-      $sql .= " where `Function` = 'Modect' or Function = 'Mocord'";
+      $sql .= " WHERE `Function` = 'Modect' OR `Function` = 'Mocord'";
     } elsif ( $function == DB_MON_RECORD ) {
-      $sql .= " where `Function` = 'Record' or Function = 'Mocord'";
+      $sql .= " WHERE `Function` = 'Record' OR `Function` = 'Mocord'";
     } elsif ( $function == DB_MON_PASSIVE ) {
-      $sql .= " where `Function` = 'Nodect'";
+      $sql .= " WHERE `Function` = 'Nodect'";
     }
   }
   my $sth = $dbh->prepare_cached( $sql );
diff --git a/scripts/zmcontrol.pl.in b/scripts/zmcontrol.pl.in
index 74886b4d4..c9a548eef 100644
--- a/scripts/zmcontrol.pl.in
+++ b/scripts/zmcontrol.pl.in
@@ -83,7 +83,7 @@ if ( $options{command} ) {
   my $server_up;
   while ( $tries and ! ( $server_up = connect(CLIENT, $saddr) ) ) {
     Debug("Failed to connect to zmcontrol server at $sock_file");
-    runCommand("zmdc.pl start zmcontrol.pl --id=$id");
+    runCommand("zmdc.pl start zmcontrol.pl --id $id");
     sleep 1;
     $tries -= 1;
   }
@@ -142,9 +142,9 @@ if ( $options{command} ) {
     .strftime('%y/%m/%d %H:%M:%S', localtime())
   );
 
-  $0 = $0." --id=$id";
+  $0 = $0.' --id '.$id;
 
-  my $control = "ZoneMinder::Control::$protocol"->new($id);
+  my $control = ('ZoneMinder::Control::'.$protocol)->new($id);
   my $control_key = $control->getKey();
   $control->loadMonitor();
 
diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 5b478316d..5ff316078 100644
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -691,6 +691,7 @@ sub substituteTags {
   $text =~ s/%EC%/$Event->{Cause}/g;
   $text =~ s/%ED%/$Event->{Notes}/g;
   $text =~ s/%ET%/$Event->{StartTime}/g;
+  $text =~ s/%EVF%/$$Event{DefaultVideo}/g; # Event video filename
   $text =~ s/%EL%/$Event->{Length}/g;
   $text =~ s/%EF%/$Event->{Frames}/g;
   $text =~ s/%EFA%/$Event->{AlarmFrames}/g;
@@ -1017,8 +1018,7 @@ sub executeCommand {
 
   my $event_path = $Event->Path();
 
-  my $command = $filter->{AutoExecuteCmd};
-  $command .= " $event_path";
+  my $command = $filter->{AutoExecuteCmd}.' '.$event_path;
   $command = substituteTags($command, $filter, $Event);
 
   Info("Executing '$command'");
diff --git a/src/zm_event.cpp b/src/zm_event.cpp
index 76156c3a5..6ab53cf54 100644
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -280,8 +280,8 @@ Event::~Event() {
 
   // Should not be static because we might be multi-threaded
   char sql[ZM_SQL_LGE_BUFSIZ];
-  snprintf(sql, sizeof(sql), 
-      "UPDATE Events SET Name='%s%" PRIu64 "', EndTime = from_unixtime(%ld), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d WHERE Id = %" PRIu64,
+  snprintf(sql, sizeof(sql),
+      "UPDATE Events SET Name='%s%" PRIu64 "', EndTime = from_unixtime(%ld), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d WHERE Id = %" PRIu64 " AND Name='New Event'",
       monitor->EventPrefix(), id, end_time.tv_sec,
       delta_time.positive?"":"-", delta_time.sec, delta_time.fsec,
       frames, alarm_frames,
@@ -294,6 +294,22 @@ Event::~Event() {
     sleep(1);
     db_mutex.lock();
   }
+  if ( !mysql_affected_rows(&dbconn) ) {
+    // Name might have been changed during recording, so just do the update without changing the name.
+    snprintf(sql, sizeof(sql),
+        "UPDATE Events SET EndTime = from_unixtime(%ld), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d WHERE Id = %" PRIu64,
+        end_time.tv_sec,
+        delta_time.positive?"":"-", delta_time.sec, delta_time.fsec,
+        frames, alarm_frames,
+        tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score,
+        id);
+    while ( mysql_query(&dbconn, sql) && !zm_terminate ) {
+      db_mutex.unlock();
+      Error("Can't update event: %s reason: %s", sql, mysql_error(&dbconn));
+      sleep(1);
+      db_mutex.lock();
+    }
+  }  // end if no changed rows due to Name change during recording
   db_mutex.unlock();
 }  // Event::~Event()
 
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index e020ba391..f1db76195 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -88,7 +88,7 @@ public:
   } Orientation;
 
   typedef enum {
-    UNKNOWN,
+    UNKNOWN=-1,
     IDLE,
     PREALARM,
     ALARM,
diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp
index 9bb8d26e5..974409ff3 100644
--- a/src/zm_zone.cpp
+++ b/src/zm_zone.cpp
@@ -247,7 +247,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
 
   if ( config.record_diag_images_fifo ) {
     FifoDebug(5, "{\"zone\":%d,\"type\":\"ALRM\",\"pixels\":%d,\"avg_diff\":%d}",
-        id,alarm_pixels, pixel_diff);
+        id, alarm_pixels, pixel_diff);
   }
 
   if ( alarm_pixels ) {
@@ -264,11 +264,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
     return false;
   }
 
-  if ( max_alarm_pixels != 0 )
-    score = (100*alarm_pixels)/max_alarm_pixels;
-  else
-    score = (100*alarm_pixels)/polygon.Area();
-  
+  score = (100*alarm_pixels)/(max_alarm_pixels?max_alarm_pixels:polygon.Area());
   if ( score < 1 )
     score = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
   Debug(5, "Current score is %d", score);
@@ -358,8 +354,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
 
     if ( check_method >= BLOBS ) {
       Debug(5, "Checking for blob pixels");
-      typedef struct { unsigned char tag; int count; int lo_x; int hi_x; int lo_y; int hi_y; } BlobStats;
-      BlobStats blob_stats[256];
+      // ICON FIXME Would like to get rid of this memset
       memset(blob_stats, 0, sizeof(BlobStats)*256);
       uint8_t *spdiff;
       uint8_t last_x, last_y;
@@ -369,22 +364,15 @@ bool Zone::CheckAlarms(const Image *delta_image) {
         int lo_x = ranges[y].lo_x;
         int hi_x = ranges[y].hi_x;
 
-        pdiff = (uint8_t*)diff_image->Buffer( lo_x, y );
+        pdiff = (uint8_t*)diff_image->Buffer(lo_x, y);
         for ( int x = lo_x; x <= hi_x; x++, pdiff++ ) {
           if ( *pdiff == WHITE ) {
             Debug(9, "Got white pixel at %d,%d (%p)", x, y, pdiff);
-            //last_x = (x>lo_x)?*(pdiff-1):0;
-            //last_y = (y>lo_y&&x>=last_lo_x&&x<=last_hi_x)?*(pdiff-diff_width):0;
 
-            last_x = 0;
-            if ( x > 0 ) {
-              if ( (x-1) >= lo_x ) {
-                last_x = *(pdiff-1);
-              }
-            }
+            last_x = ((x > 0) && ( (x-1) >= lo_x )) ? *(pdiff-1) : 0;
 
             last_y = 0;
-            if (y > 0 ) {
+            if ( y > 0 ) {
               if ( (y-1) >= lo_y && ranges[(y-1)].lo_x <= x && ranges[(y-1)].hi_x >= x ) {
                 last_y = *(pdiff-diff_width);
               }
@@ -631,7 +619,7 @@ bool Zone::CheckAlarms(const Image *delta_image) {
       }
       
       if ( max_blob_pixels != 0 )
-        score = (100*alarm_blob_pixels)/(max_blob_pixels);
+        score = (100*alarm_blob_pixels)/max_blob_pixels;
       else 
         score = (100*alarm_blob_pixels)/polygon.Area();
       
@@ -758,67 +746,42 @@ bool Zone::CheckAlarms(const Image *delta_image) {
 }
 
 bool Zone::ParsePolygonString(const char *poly_string, Polygon &polygon) {
-  Debug(3, "Parsing polygon string '%s'", poly_string);
-
-  char *str_ptr = new char[strlen(poly_string)+1];
-  char *str = str_ptr;
-  strcpy(str, poly_string);
 
+  char *str = (char *)poly_string;
   char *ws;
+  char *cp;
   int n_coords = 0;
   int max_n_coords = strlen(str)/4;
   Coord *coords = new Coord[max_n_coords];
-  while( true ) {
-    if ( *str == '\0' ) {
-      break;
-    }
-    ws = strchr(str, ' ');
-    if ( ws ) {
-      *ws = '\0';
-    }
-    char *cp = strchr(str, ',');
+  while ( *str != '\0' ) {
+    cp = strchr(str, ',');
     if ( !cp ) {
       Error("Bogus coordinate %s found in polygon string", str);
-      delete[] coords;
-      delete[] str_ptr;
-      return false;
-    } else {
-      *cp = '\0';
-      char *xp = str;
-      char *yp = cp+1;
+      break;
+    } 
+    int x = atoi(str);
+    int y = atoi(cp+1);
+    Debug(3, "Got coordinate %d,%d from polygon string", x, y);
+    coords[n_coords++] = Coord(x, y);
 
-      int x = atoi(xp);
-      int y = atoi(yp);
-
-      Debug(3, "Got coordinate %d,%d from polygon string", x, y);
-#if 0
-      if ( x < 0 )
-        x = 0;
-      else if ( x >= width )
-        x = width-1;
-      if ( y < 0 )
-        y = 0;
-      else if ( y >= height )
-        y = height-1;
-#endif
-      coords[n_coords++] = Coord( x, y );
-    }
+    ws = strchr(cp+2, ' ');
     if ( ws )
       str = ws+1;
     else
       break;
-  }
-  polygon = Polygon(n_coords, coords);
+  }  // end while ! end of string
 
-  Debug(3, "Successfully parsed polygon string");
-  //printf( "Area: %d\n", pg.Area() );
-  //printf( "Centre: %d,%d\n", pg.Centre().X(), pg.Centre().Y() );
+  if ( n_coords > 2 ) {
+    Debug(3, "Successfully parsed polygon string %s", str);
+    polygon = Polygon(n_coords, coords);
+  } else {
+    Error("Not enough coordinates to form a polygon!");
+    n_coords = 0;
+  }
 
   delete[] coords;
-  delete[] str_ptr;
-
-  return true;
-}
+  return n_coords ? true : false;
+}  // end bool Zone::ParsePolygonString(const char *poly_string, Polygon &polygon)
 
 bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, Polygon &polygon) {
   Debug(3, "Parsing zone string '%s'", zone_string);
@@ -827,13 +790,12 @@ bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, P
   char *str = str_ptr;
   strcpy(str, zone_string);
 
+  zone_id = strtol(str, 0, 10);
+  Debug(3, "Got zone %d from zone string", zone_id);
+
   char *ws = strchr(str, ' ');
   if ( !ws ) {
     Debug(3, "No initial whitespace found in zone string '%s', finishing", str);
-  }
-  zone_id = strtol(str, 0, 10);
-  Debug(3, "Got zone %d from zone string", zone_id);
-  if ( !ws ) {
     delete[] str_ptr;
     return true;
   }
@@ -841,13 +803,11 @@ bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, P
   *ws = '\0';
   str = ws+1;
 
+  colour = strtol(str, 0, 16);
+  Debug(3, "Got colour %06x from zone string", colour);
   ws = strchr(str, ' ');
   if ( !ws ) {
     Debug(3, "No secondary whitespace found in zone string '%s', finishing", zone_string);
-  }
-  colour = strtol(str, 0, 16);
-  Debug(3, "Got colour %06x from zone string", colour);
-  if ( !ws ) {
     delete[] str_ptr;
     return true;
   }
@@ -855,27 +815,28 @@ bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, P
   str = ws+1;
 
   bool result = ParsePolygonString(str, polygon);
-
-  //printf( "Area: %d\n", pg.Area() );
-  //printf( "Centre: %d,%d\n", pg.Centre().X(), pg.Centre().Y() );
-
   delete[] str_ptr;
 
   return result;
-}
+}  // end bool Zone::ParseZoneString(const char *zone_string, int &zone_id, int &colour, Polygon &polygon)
 
 int Zone::Load(Monitor *monitor, Zone **&zones) {
   static char sql[ZM_SQL_MED_BUFSIZ];
 
   db_mutex.lock();
-  snprintf(sql, sizeof(sql), "select Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0,MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,FilterX,FilterY,MinFilterPixels,MaxFilterPixels,MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs,OverloadFrames,ExtendAlarmFrames from Zones where MonitorId = %d order by Type, Id", monitor->Id());
+  snprintf(sql, sizeof(sql), "SELECT Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0,"
+      "MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,"
+      "FilterX,FilterY,MinFilterPixels,MaxFilterPixels,"
+      "MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs,"
+      "OverloadFrames,ExtendAlarmFrames"
+      " FROM Zones WHERE MonitorId = %d ORDER BY Type, Id", monitor->Id());
   if ( mysql_query(&dbconn, sql) ) {
     Error("Can't run query: %s", mysql_error(&dbconn));
     db_mutex.unlock();
     return 0;
   }
 
-  MYSQL_RES *result = mysql_store_result( &dbconn );
+  MYSQL_RES *result = mysql_store_result(&dbconn);
   if ( !result ) {
     Error("Can't use query result: %s", mysql_error(&dbconn));
     db_mutex.unlock();
@@ -944,7 +905,13 @@ int Zone::Load(Monitor *monitor, Zone **&zones) {
     } else if ( atoi(dbrow[2]) == Zone::PRIVACY ) {
       zones[i] = new Zone(monitor, Id, Name, (Zone::ZoneType)Type, polygon);
     }
-    zones[i] = new Zone(monitor, Id, Name, (Zone::ZoneType)Type, polygon, AlarmRGB, (Zone::CheckMethod)CheckMethod, MinPixelThreshold, MaxPixelThreshold, MinAlarmPixels, MaxAlarmPixels, Coord( FilterX, FilterY ), MinFilterPixels, MaxFilterPixels, MinBlobPixels, MaxBlobPixels, MinBlobs, MaxBlobs, OverloadFrames, ExtendAlarmFrames);
+    zones[i] = new Zone(
+        monitor, Id, Name, (Zone::ZoneType)Type, polygon, AlarmRGB,
+        (Zone::CheckMethod)CheckMethod, MinPixelThreshold, MaxPixelThreshold,
+        MinAlarmPixels, MaxAlarmPixels, Coord( FilterX, FilterY ), 
+        MinFilterPixels, MaxFilterPixels,
+        MinBlobPixels, MaxBlobPixels, MinBlobs, MaxBlobs,
+        OverloadFrames, ExtendAlarmFrames);
   } // end foreach row
   mysql_free_result(result);
   return n_zones;
@@ -953,9 +920,9 @@ int Zone::Load(Monitor *monitor, Zone **&zones) {
 bool Zone::DumpSettings(char *output, bool /*verbose*/) {
   output[0] = 0;
 
-  sprintf( output+strlen(output), "  Id : %d\n", id );
-  sprintf( output+strlen(output), "  Label : %s\n", label );
-  sprintf( output+strlen(output), "  Type: %d - %s\n", type,
+  sprintf(output+strlen(output), "  Id : %d\n", id );
+  sprintf(output+strlen(output), "  Label : %s\n", label );
+  sprintf(output+strlen(output), "  Type: %d - %s\n", type,
       type==ACTIVE?"Active":(
         type==INCLUSIVE?"Inclusive":(
           type==EXCLUSIVE?"Exclusive":(
@@ -1020,10 +987,10 @@ void Zone::std_alarmedpixels(
         *pdiff = BLACK;
       }
     }
-  }
+  }  // end for y = lo_y to hi_y
 
   /* Store the results */
   *pixel_count = pixelsalarmed;
   *pixel_sum = pixelsdifference;
   Debug(7, "STORED pixelsalarmed(%d), pixelsdifference(%d)", pixelsalarmed, pixelsdifference);
-}
+}  // end void Zone::std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsigned int* pixel_count, unsigned int* pixel_sum)
diff --git a/src/zm_zone.h b/src/zm_zone.h
index 0c7b26a57..7d7797725 100644
--- a/src/zm_zone.h
+++ b/src/zm_zone.h
@@ -32,15 +32,14 @@ class Monitor;
 // This describes a 'zone', or an area of an image that has certain
 // detection characteristics.
 //
-class Zone
-{
+class Zone {
 protected:
-  struct Range
-  {
+  struct Range {
     int lo_x;
     int hi_x;
     int off_x;
   };
+  typedef struct { unsigned char tag; int count; int lo_x; int hi_x; int lo_y; int hi_y; } BlobStats;
 
 public:
   typedef enum { ACTIVE=1, INCLUSIVE, EXCLUSIVE, PRECLUSIVE, INACTIVE, PRIVACY } ZoneType;
@@ -52,8 +51,8 @@ protected:
 
   int        id;
   char      *label;
-  ZoneType    type;
-  Polygon      polygon;
+  ZoneType   type;
+  Polygon    polygon;
   Rgb        alarm_rgb;
   CheckMethod    check_method;
 
@@ -67,17 +66,18 @@ protected:
   int        min_filter_pixels;
   int        max_filter_pixels;
 
+  BlobStats blob_stats[256];
   int        min_blob_pixels;
   int        max_blob_pixels;
   int        min_blobs;
   int        max_blobs;
 
-  int       overload_frames;
+  int        overload_frames;
   int        extend_alarm_frames;
 
   // Outputs/Statistics
-  bool      alarmed;
-  bool      was_alarmed;
+  bool       alarmed;
+  bool       was_alarmed;
   int        pixel_diff;
   unsigned int      alarm_pixels;
   int        alarm_filter_pixels;
@@ -139,8 +139,7 @@ public:
   inline Coord GetAlarmCentre() const { return( alarm_centre ); }
   inline unsigned int Score() const { return( score ); }
 
-  inline void ResetStats()
-  {
+  inline void ResetStats() {
     alarmed = false;
 		was_alarmed = false;
     pixel_diff = 0;
diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index f95cc6523..d6107c5a9 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -156,10 +156,14 @@ if [ ! -d "${GITHUB_FORK}_zoneminder_release" ]; then
   if [ -d "${GITHUB_FORK}_ZoneMinder.git" ]; then
     echo "Using local clone ${GITHUB_FORK}_ZoneMinder.git to pull from."
     cd "${GITHUB_FORK}_ZoneMinder.git"
-    echo "git pull..."
-    git pull
+    echo "git fetch..."
+    git fetch
     echo "git checkout $BRANCH"
     git checkout $BRANCH
+    if [ $? -ne 0 ]; then
+      echo "Failed to switch to branch."
+      exit 1;
+    fi;
     echo "git pull..."
     git pull
     cd ../
@@ -335,7 +339,7 @@ EOF
 
     dput="Y";
     if [ "$INTERACTIVE" != "no" ]; then
-      read -p "Ready to dput $SC to $PPA ? Y/N...";
+      read -p "Ready to dput $SC to $PPA ? Y/n...";
       if [[ "$REPLY" == [yY] ]]; then
         dput $PPA $SC
       fi;
diff --git a/utils/packpack/startpackpack.sh b/utils/packpack/startpackpack.sh
index 1e9f6557f..1b2eafd8f 100755
--- a/utils/packpack/startpackpack.sh
+++ b/utils/packpack/startpackpack.sh
@@ -361,7 +361,7 @@ elif [ "${OS}" == "debian" ] || [ "${OS}" == "ubuntu" ] || [ "${OS}" == "raspbia
   execpackpack
 
   # Try to install and run the newly built zoneminder package
-  if [ "${OS}" == "ubuntu" ] && [ "${DIST}" == "xenial" ] && [ "${ARCH}" == "x86_64" ] && [ "${TRAVIS}" == "true" ]; then
+  if [ "${OS}" == "ubuntu" ] && [ "${DIST}" == "bionic" ] && [ "${ARCH}" == "x86_64" ] && [ "${TRAVIS}" == "true" ]; then
       echo "Begin Deb package installation..."
       install_deb
   fi
diff --git a/utils/resample_event_video.sh b/utils/resample_event_video.sh
new file mode 100755
index 000000000..845216cc0
--- /dev/null
+++ b/utils/resample_event_video.sh
@@ -0,0 +1,45 @@
+#!/bin/sh
+
+FFMPEG=`which ffmpeg`;
+
+if [ -z "$FFMPEG" ]; then
+  echo "You must install the ffmpeg package.  Try sudo apt-get install ffmpeg";
+  exit;
+fi
+
+for i in "$@"
+do
+case $i in
+ -r=*|--rate=*)
+   FPS="${i#*=}"
+   shift
+   ;;
+ -f=*|--file=*)
+   VIDEO_FILE="${i#*=}"
+   shift
+   ;;
+
+ *)
+   EVENT_PATH="${i#*=}"
+   shift
+   ;;
+esac
+done
+
+if [ -z "$EVENT_PATH" ]; then
+  echo "You must specify the path to the event.";
+  exit 255
+fi;
+
+if [ -z "$FPS" ]; then
+  echo "You must specify the new fps.";
+  exit 255
+fi;
+
+$FFMPEG -i "$EVENT_PATH/$VIDEO_FILE" -filter:v fps=fps=$FPS "$EVENT_PATH/output.mp4"
+echo $?
+if [ $? -eq 0 ]; then
+  mv "$EVENT_PATH/output.mp4" "$EVENT_PATH/$VIDEO_FILE"
+fi;
+
+exit 0;
diff --git a/version b/version
index 21cbe96c2..96eced874 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.35.6
+1.35.7
diff --git a/web/ajax/controlcaps.php b/web/ajax/controlcaps.php
new file mode 100644
index 000000000..9e655c128
--- /dev/null
+++ b/web/ajax/controlcaps.php
@@ -0,0 +1,33 @@
+<?php
+if ( !canEdit('Control') ) {
+  ZM\Warning('Need Control permissions to edit control capabilities');
+  return;
+}
+
+if ( empty($_REQUEST['action']) ) {
+  ajaxError('Action Not Provided');
+  return;
+} else {
+  $action = $_REQUEST['action'];
+}
+
+if ( isset($_REQUEST['cids']) ) {
+  $cids = $_REQUEST['cids'];
+} else {
+  ajaxError('At least one Control Id must be Provided.');
+  return;
+}
+
+if ( $action == 'delete' ) {
+    foreach( $cids as $cid ) {
+      dbQuery('UPDATE Monitors SET Controllable = 0, ControlId = 0 WHERE ControlId = ?', array($cid));
+      dbQuery('DELETE FROM Controls WHERE Id = ?', array($cid));
+    }
+} else {
+  ajaxError('Unrecognised action ' .$_REQUEST['action']);
+  return;
+}
+
+ajaxResponse();
+return;
+?>
diff --git a/web/ajax/events.php b/web/ajax/events.php
index 7b852c559..16c777ebf 100644
--- a/web/ajax/events.php
+++ b/web/ajax/events.php
@@ -16,10 +16,10 @@ if ( canEdit('Events') ) {
     switch ( $_REQUEST['action'] ) {
     case 'archive' :
     case 'unarchive' :
-      $archiveVal = ($_REQUEST['action'] == 'archive')?1:0;
+      $archiveVal = ($_REQUEST['action'] == 'archive') ? 1 : 0;
       dbQuery(
         'UPDATE Events SET Archived = ? WHERE Id = ?',
-        array($archiveVal, $_REQUEST['id'])
+        array($archiveVal, $eid)
       );
       break;
     case 'delete' :
diff --git a/web/ajax/log.php b/web/ajax/log.php
index d5483b7ca..16f7ac573 100644
--- a/web/ajax/log.php
+++ b/web/ajax/log.php
@@ -185,7 +185,7 @@ switch ( $_REQUEST['task'] ) {
       $Servers = ZM\Server::find();
     $servers_by_Id = array();
     # There is probably a better way to do this.
-    foreach ( $servers as $server ) {
+    foreach ( $Servers as $server ) {
       $servers_by_Id[$server->Id()] = $server;
     }
 
@@ -245,6 +245,9 @@ switch ( $_REQUEST['task'] ) {
     }
     $exportKey = substr(md5(rand()), 0, 8);
     $exportFile = 'zm-log.'.$exportExt;
+
+    // mkdir will generate a warning if it exists, but that is ok
+    error_reporting(0);
     if ( ! ( mkdir(ZM_DIR_EXPORTS) || file_exists(ZM_DIR_EXPORTS) ) ) {
       ZM\Fatal('Can\'t create exports dir at \''.ZM_DIR_EXPORTS.'\'');
     }
@@ -371,8 +374,16 @@ switch ( $_REQUEST['task'] ) {
             <'.strtolower($field).'>'.htmlspecialchars($value).'</'.strtolower($field).'>
             </filter>' );
         fwrite( $exportFP, 
-          '  <columns>
-          <column field="datetime">'.translate('DateTime').'</column><column field="component">'.translate('Component').'</column><column field="'.translate('Server').'</column><column field="pid">'.translate('Pid').'</column><column field="level">'.translate('Level').'</column><column field="message">'.translate('Message').'</column><column field="file">'.translate('File').'</column><column field="line">'.translate('Line').'</column>
+          '
+          <columns>
+            <column field="datetime">'.translate('DateTime').'</column>
+            <column field="component">'.translate('Component').'</column>
+            <column field="server">'.translate('Server').'</column>
+            <column field="pid">'.translate('Pid').'</column>
+            <column field="level">'.translate('Level').'</column>
+            <column field="message">'.translate('Message').'</column>
+            <column field="file">'.translate('File').'</column>
+            <column field="line">'.translate('Line').'</column>
           </columns>
           <logs count="'.count($logs).'">
           ' );
diff --git a/web/ajax/modal.php b/web/ajax/modal.php
new file mode 100644
index 000000000..bd96b137f
--- /dev/null
+++ b/web/ajax/modal.php
@@ -0,0 +1,24 @@
+<?php
+
+if ( empty($_REQUEST['modal']) ) {
+  ajaxError('Modal Name Not Provided');
+  return;
+}
+
+$modal = validJsStr($_REQUEST['modal']);
+$data = array();
+
+ZM\Logger::Debug("Including modals/$modal.php");
+# Shouldn't be necessary but at the moment we have last .conf file contents
+ob_start();
+@$result = include('modals/'.$modal.'.php');
+$data['html'] = ob_get_contents();
+ob_end_clean();
+if ( !$result ) {
+  ajaxError("Unknown modal '".$modal."'");
+  return;
+}
+
+ajaxResponse($data);
+return;
+?>
diff --git a/web/ajax/modals/delconfirm.php b/web/ajax/modals/delconfirm.php
new file mode 100644
index 000000000..02f742cff
--- /dev/null
+++ b/web/ajax/modals/delconfirm.php
@@ -0,0 +1,26 @@
+<?php
+// This is the HTML representing the Delete confirmation modal on the Events page and other pages
+
+$delTextKey = isset($_REQUEST['key']) ? $_REQUEST['key'] : 'ConfirmDeleteEvents';
+
+?>  
+<div id="deleteConfirm" class="modal fade" class="modal" tabindex="-1">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('ConfirmDeleteTitle') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <p><?php echo translate($delTextKey) ?></p>
+      </div>
+      <div class="modal-footer">
+        <button id="delCancelBtn" type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+        <button id ="delConfirmBtn" type="button" class="btn btn-danger"><?php echo translate('Delete') ?></button>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/web/skins/classic/views/donate.php b/web/ajax/modals/donate.php
similarity index 70%
rename from web/skins/classic/views/donate.php
rename to web/ajax/modals/donate.php
index 502377133..374d4e0d2 100644
--- a/web/skins/classic/views/donate.php
+++ b/web/ajax/modals/donate.php
@@ -18,10 +18,7 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canEdit('System') ) {
-  $view = 'error';
-  return;
-}
+if ( !canEdit('System') ) return;
 
 $options = array( 
   'go'      => translate('DonateYes'),
@@ -45,25 +42,25 @@ $options = array(
         </button>
       </div>
       <div class="modal-body">
-        <form name="contentForm" id="contentForm" method="post" action="?">
-          <input type="hidden" name="view" value="donate"/>
-          <input type="hidden" name="action" value="donate"/>
-          <p>
-            <?php echo translate('DonateEnticement') ?>
-          </p>
-          <p>
-            <?php echo buildSelect('option', $options); ?>
-          </p>
-          <div id="contentButtons">
-            <button type="submit"><?php echo translate('Apply') ?></button>
-            <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
-          </div>
-        </form>
+      <form name="contentForm" id="donateForm" method="post" action="?">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="donate"/>
+        <input type="hidden" name="action" value="donate"/>
+        <p>
+          <?php echo translate('DonateEnticement') ?>
+        </p>
+        <p>
+          <?php echo buildSelect('option', $options); ?>
+        </p>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
-        <button type="button" class="btn btn-primary">Understood</button>
+        <button type="submit" class="btn btn-primary" id="donateApplyBtn"><?php echo translate('Apply') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Close') ?></button>
       </div>
+    </form>
     </div>
   </div>
 </div>
diff --git a/web/ajax/modals/enoperm.php b/web/ajax/modals/enoperm.php
new file mode 100644
index 000000000..6fd2fbe23
--- /dev/null
+++ b/web/ajax/modals/enoperm.php
@@ -0,0 +1,24 @@
+<?php
+// Return an Error No Permissions Modal
+
+?>
+<div id="ENoPerm" class="modal fade" id="staticBackdrop" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title">ZoneMinder <?php echo translate('Error') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <p><?php echo translate('YouNoPerms') ?></p>
+        <p><?php echo translate('ContactAdmin') ?></p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" id="enpCloseBtn" class="btn btn-secondary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/web/ajax/modals/eventdetail.php b/web/ajax/modals/eventdetail.php
new file mode 100644
index 000000000..bb2f53ecc
--- /dev/null
+++ b/web/ajax/modals/eventdetail.php
@@ -0,0 +1,89 @@
+<?php
+// This is the HTML representing the Event Detail modal on the Events page
+
+$eid = isset($_REQUEST['eid']) ? $_REQUEST['eid'] : '';
+$eids = isset($_REQUEST['eids']) ? $_REQUEST['eids'] : '';
+
+$result = '';
+$inputs = '';
+$disabled = 'disabled="disabled"';
+$null = '';
+  
+if ( !canEdit('Events') ) return;
+
+if ( $eid ){ // Single Event Mode
+  $eid = validInt($eid);
+  $title = translate('Event').' '.$eid.PHP_EOL;
+  $inputs .= '<input type="hidden" name="markEids[]" value="' .$eid. '"/>';
+  $newEvent = dbFetchOne('SELECT E.* FROM Events AS E WHERE E.Id = ?', NULL, array($eid));
+
+} elseif ( $eids ) { // Multi Event Mode
+
+  $title = translate('Events');
+  $sql = 'SELECT E.* FROM Events AS E WHERE ';
+  $sqlWhere = array();
+  $sqlValues = array();
+  foreach ( $eids as $eid ) {
+    $eid = validInt($eid);
+    $inputs .= '<input type="hidden" name="markEids[]" value="' .$eid. '"/>';
+    $sqlWhere[] = 'E.Id = ?';
+    $sqlValues[] = $eid;
+  }
+  unset($eid);
+  $sql .= join(' OR ', $sqlWhere);
+  foreach( dbFetchAll( $sql, NULL, $sqlValues ) as $row ) {
+    if ( !isset($newEvent) ) {
+      $newEvent = $row;
+    } else {
+      if ( $newEvent['Cause'] && $newEvent['Cause'] != $row['Cause'] )
+        $newEvent['Cause'] = '';
+      if ( $newEvent['Notes'] && $newEvent['Notes'] != $row['Notes'] )
+        $newEvent['Notes'] = '';
+    }
+  }
+
+} else { // Event Mode not specified - should we really proceed if neither eid nor eids is set?
+  $title = translate('Events');
+}
+
+?>
+<div class="modal fade" id="eventDetailModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo $title ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <form name="contentForm" id="eventDetailForm" method="post" action="?view=eventdetail&action=eventdetail">
+          <?php
+          // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+          echo getCSRFinputHTML();
+          echo $inputs;
+          ?>
+          <input type="hidden" name="action" value="eventdetail"/>
+          <input type="hidden" name="view" value="eventdetail"/>
+          <table class="table-sm">
+            <tbody>
+              <tr>
+                <th scope="row"><?php echo translate('Cause') ?></th>
+                <td><input type="text" name="newEvent[Cause]" value="<?php echo validHtmlStr($newEvent['Cause']) ?>" size="32"/></td>
+              </tr>
+              <tr>
+                <th scope="row" class="align-middle"><?php echo translate('Notes') ?></th>
+                <td><textarea name="newEvent[Notes]" rows="6" cols="33"><?php echo validHtmlStr($newEvent['Notes']) ?></textarea></td>
+              </tr>
+            </tbody>
+          </table>
+      </div>
+      <div class="modal-footer">
+        <button type="submit" name="action" id="eventDetailSaveBtn" class="btn btn-primary" value="save" <?php echo !canEdit('Events') ? $disabled : $null .'>'. translate('Save') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+      </div>
+      </form>
+    </div>
+  </div>
+</div>
+
diff --git a/web/ajax/modals/filterdebug.php b/web/ajax/modals/filterdebug.php
new file mode 100644
index 000000000..725539a99
--- /dev/null
+++ b/web/ajax/modals/filterdebug.php
@@ -0,0 +1,35 @@
+<div class="modal fade" id="filterdebugModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+     <div class="modal-header">
+     <h5 class="modal-title"><?php echo translate('FilterDebug') ?></h5>
+       <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+         <span aria-hidden="true">&times;</span>
+       </button>
+     </div>
+     <div class="modal-body">
+<?php
+  //require_once('includes/Filter.php');
+  $fid = validInt($_REQUEST['fid']);
+  if ( !$fid ) {
+    echo '<div class="error">No filter id specified.</div>';
+  } else {
+    $filter = new ZM\Filter($_REQUEST['fid']);
+    if ( ! $filter->Id() ) {
+      echo '<div class="error">Filter not found for id '.$_REQUEST['fid'].'</div>';
+    }
+  }
+?>
+       <form name="contentForm" id="filterdebugForm" method="post" action="?">
+<?php 
+            // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+            echo getCSRFinputHTML();
+?>
+          <p><label>SQL</label><?php echo $filter->sql() ?></p>
+         <div class="modal-footer">
+          <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel')?> </button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
diff --git a/web/skins/classic/views/function.php b/web/ajax/modals/function.php
similarity index 85%
rename from web/skins/classic/views/function.php
rename to web/ajax/modals/function.php
index 83d67d54a..e6bab2718 100644
--- a/web/skins/classic/views/function.php
+++ b/web/ajax/modals/function.php
@@ -18,17 +18,18 @@
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
 
-if ( !canEdit('Monitors') ) {
-  $view = 'error';
-  return;
-}
-?>
+if ( !canEdit('Monitors') ) return;
 
+?>
 <div id="modalFunction" class="modal" tabindex="-1">
   <div class="modal-dialog">
     <div class="modal-content">
-<form id="function_form" action="?view=function&action=function" method="post">
-  <input type="hidden" name="mid"/>
+    <form id="function_form" action="?view=function&action=function" method="post">
+      <?php
+      // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+      echo getCSRFinputHTML();
+      ?>
+      <input type="hidden" name="mid"/>
       <div class="modal-header">
         <h5 class="modal-title"><?php echo translate('Function') ?> - <span id="function_monitor_name"></span></h5>
         <button type="button" class="close" data-dismiss="modal" aria-label="Close">
@@ -46,7 +47,7 @@ if ( !canEdit('Monitors') ) {
         <button type="button" class="funcSaveBtn btn btn-primary"><?php echo translate('Save') ?></button>
         <button type="button" class="funcCancelBtn btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
       </div>
-</form>
+    </form>
     </div>
   </div>
 </div>
diff --git a/web/ajax/modals/group.php b/web/ajax/modals/group.php
new file mode 100644
index 000000000..119149951
--- /dev/null
+++ b/web/ajax/modals/group.php
@@ -0,0 +1,135 @@
+<?php
+// This is the HTML representing the Group modal accessed from the Groups (plural) view
+
+//
+// DEFINE SUPPORTING FUNCTIONS
+//
+
+function get_Id( $G ) {
+  return $G->Id();
+}
+
+function get_children($Group) {
+  global $children;
+
+  $kids = array();
+  if ( isset( $children[$Group->Id()] ) ) {
+    $kids += array_map('get_Id', $children[$Group->Id()]);
+    foreach ( $children[$Group->Id()] as $G ) {
+      foreach ( get_children($G) as $id ) {
+        $kids[] = $id;
+      }
+    }
+  }
+  return $kids;
+}
+
+function parentGrpSelect($newGroup) {
+  $Groups = array();
+  foreach ( ZM\Group::find() as $Group ) {
+    $Groups[$Group->Id()] = $Group;
+  }
+
+  # This  array is indexed by parent_id
+  $children = array();
+
+  foreach ( $Groups as $id=>$Group ) {
+    if ( $Group->ParentId() != null ) {
+      if ( ! isset( $children[$Group->ParentId()] ) )
+        $children[$Group->ParentId()] = array();
+      $children[$Group->ParentId()][] = $Group;
+    }
+  }
+
+  $kids = get_children($newGroup);
+  if ( $newGroup->Id() )
+    $kids[] = $newGroup->Id();
+  $sql = 'SELECT Id,Name FROM `Groups`'.(count($kids)?' WHERE Id NOT IN ('.implode(',',array_map(function(){return '?';}, $kids)).')' : '').' ORDER BY Name';
+  $options = array(''=>'None');
+
+  foreach ( dbFetchAll($sql, null, $kids) as $option ) {
+    $options[$option['Id']] = str_repeat('&nbsp;&nbsp;', $Groups[$option['Id']]->depth()) . $option['Name'];
+  }
+
+  return htmlSelect('newGroup[ParentId]', $options, $newGroup->ParentId(), array('data-on-change'=>'configModalBtns'));
+}
+
+function monitorList($newGroup) {
+  $result = '';
+
+  $monitors = dbFetchAll('SELECT Id,Name FROM Monitors ORDER BY Sequence ASC');
+  $monitorIds = $newGroup->MonitorIds();
+  foreach ( $monitors as $monitor ) {
+    if ( visibleMonitor($monitor['Id']) ) {
+      $result .= '<option value="' .$monitor['Id']. '"' .( in_array( $monitor['Id'], $monitorIds ) ? ' selected="selected"' : ''). '>' .validHtmlStr($monitor['Name']). '</option>'.PHP_EOL;
+    }
+  }
+  
+  return $result;
+}
+
+//
+// INITIAL SANITY CHECKS
+//
+
+if ( !canEdit('Groups') ) {
+  $view = 'error';
+  return;
+}
+
+if ( !empty($_REQUEST['gid']) ) {
+  $newGroup = new ZM\Group($_REQUEST['gid']);
+} else {
+  $newGroup = new ZM\Group();
+}
+
+//
+// BEGIN HTML
+//
+?>
+<div id="groupModal" class="modal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('Group').($newGroup->Name() ? ' - ' .validHtmlStr($newGroup->Name()) : '') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      <form id="groupForm" name="groupForm" method="post" action="?view=group&action=save">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="group"/>
+        <input type="hidden" name="gid" value="<?php echo $newGroup->Id() ?>"/>
+        <table id="groupModalTable" class="table-sm table-borderless">
+          <tbody>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Name') ?></th>
+              <td><input type="text" name="newGroup[Name]" value="<?php echo validHtmlStr($newGroup->Name()) ?>" data-on-input="configModalBtns"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('ParentGroup') ?></th>
+              <td><?php echo parentGrpSelect($newGroup) ?></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Monitor') ?></th>
+              <td>
+                <select name="newGroup[MonitorIds][]" class="chosen" multiple="multiple" data-on-change="configModalBtns">
+                  <?php echo monitorList($newGroup) ?>
+                </select>
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="modal-footer">
+        <button type="submit" class="btn btn-primary" name="action" id="grpModalSaveBtn" value="save"<?php $newGroup->Id() ? '' : ' disabled="disabled"'?>><?php echo translate('Save') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+      </div>
+    </form>
+    </div>
+  </div>
+</div>
diff --git a/web/ajax/modals/log_export.php b/web/ajax/modals/log_export.php
new file mode 100644
index 000000000..8f359bb86
--- /dev/null
+++ b/web/ajax/modals/log_export.php
@@ -0,0 +1,46 @@
+<div class="modal fade" id="log_exportModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('ExportLog') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+
+        <form id="exportForm" action="" method="post">
+          <?php
+          // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+          echo getCSRFinputHTML();
+          echo $inputs;
+          ?>
+          <fieldset title="<?php echo translate('ChooseLogSelection') ?>">
+            <legend><?php echo translate('SelectLog') ?></legend>
+            <label for="selectorAll"><?php echo translate('All') ?></label>
+            <input type="radio" id="selectorAll" name="selector" value="all"/>
+            <label for="selectorFilter"><?php echo translate('Filter') ?></label>
+            <input type="radio" id="selectorFilter" name="selector" value="filter"/>
+            <label for="selectorCurrent"><?php echo translate('Current') ?></label>
+            <input type="radio" id="selectorCurrent" name="selector" value="current" data-validators="validate-one-required"/>
+          </fieldset>
+          <fieldset title="<?php echo translate('ChooseLogFormat') ?>">
+            <legend><?php echo translate('SelectFormat') ?></legend>
+            <label for="formatText">TXT</label><input type="radio" id="formatText" name="format" value="text"/>
+            <label for="formatTSV">TSV</label><input type="radio" id="formatTSV" name="format" value="tsv"/>
+            <label for="formatXML">HTML</label><input type="radio" id="formatHTML" name="format" value="html"/>
+            <label for="formatXML">XML</label><input type="radio" id="formatXML" name="format" value="xml" class="validate-one-required"/>
+          </fieldset>
+          <div id="exportError">
+            <?php echo translate('ExportFailed') ?>: <span id="exportErrorText"></span>
+          </div>
+
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary" id="exportButton" value="Export" data-on-click="exportRequest"><?php echo translate('Export') ?></button>
+          <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+        </div>
+      </form>
+    </div>
+  </div>
+</div>
+
diff --git a/web/skins/classic/views/logout.php b/web/ajax/modals/logout.php
similarity index 91%
rename from web/skins/classic/views/logout.php
rename to web/ajax/modals/logout.php
index 86e07605a..565e80cc2 100644
--- a/web/skins/classic/views/logout.php
+++ b/web/ajax/modals/logout.php
@@ -33,6 +33,10 @@ global $CLANG;
       </div>
       <div class="modal-footer">
         <form name="logoutForm" id="logoutForm" method="post" action="?">
+          <?php
+          // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+          echo getCSRFinputHTML();
+          ?>
           <input type="hidden" name="view" value="logout"/>
           <button type="submit" name="action" value="logout"><?php echo translate('Logout') ?></button>
           <?php if ( ZM_USER_SELF_EDIT ) echo '<button type="submit" name="action" value="config">'.translate('Config').'</button>'.PHP_EOL; ?>
diff --git a/web/ajax/modals/optionhelp.php b/web/ajax/modals/optionhelp.php
new file mode 100644
index 000000000..424354dd2
--- /dev/null
+++ b/web/ajax/modals/optionhelp.php
@@ -0,0 +1,43 @@
+<?php
+
+// Returns the modal html representing the selected Option Help item
+if ( empty($_REQUEST['ohndx']) ) {
+  ajaxError('Option Help Index Not Provided');
+  return;
+}
+
+global $OLANG;
+$result = '';
+$optionHelpIndex = $_REQUEST['ohndx'];
+$ZMoptionHelpIndex = 'ZM_'.$optionHelpIndex;
+ 
+if ( !empty($OLANG[$optionHelpIndex]) ) {
+  $optionHelpText = $OLANG[$optionHelpIndex]['Help'];
+} else {
+  $optionHelpText = dbFetchOne('SELECT Help FROM Config WHERE Name=?', 'Help', array($optionHelpIndex));
+}
+$optionHelpText = validHtmlStr($optionHelpText);
+$optionHelpText = preg_replace('/~~/', '<br/>', $optionHelpText );
+$optionHelpText = preg_replace('/\[(.+)\]\((.+)\)/', '<a href="$2" target="_blank">$1</a>', $optionHelpText);
+
+?>
+<div id="optionhelp" class="modal" tabindex="-1" role="dialog">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('OptionHelp') ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <h3><?php echo validHtmlStr($optionHelpIndex) ?></h3>
+        <p class="textblock"><?php echo $optionHelpText ?></p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" id="ohCloseBtn" class="btn btn-secondary" data-dismiss="modal">Close</button>
+      </div>
+    </div>
+  </div>
+</div>
+
diff --git a/web/skins/classic/views/server.php b/web/ajax/modals/server.php
similarity index 54%
rename from web/skins/classic/views/server.php
rename to web/ajax/modals/server.php
index f3f177a62..6c5ec8c67 100644
--- a/web/skins/classic/views/server.php
+++ b/web/ajax/modals/server.php
@@ -1,49 +1,40 @@
 <?php
-//
-// ZoneMinder web user view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canEdit('System') ) {
-  $view = 'error';
+// This is the HTML representing the Server modal from Options -> Server
+if ( !isset($_REQUEST['id']) ) {
+  ajaxError('Server Id Not Provided');
   return;
 }
 
-$Server = new ZM\Server($_REQUEST['id']);
-if ( $_REQUEST['id'] and ! $Server->Id() ) {
-  $view = 'error';
-  return;
-}
+$result = '';
+$checked = ' checked="checked"';
+$null = '';
+$sid = $_REQUEST['id'];
 
-$focusWindow = true;
+if ( !canEdit('System') ) return;
+
+$Server = new ZM\Server($sid);
+if ( $sid and ! $Server->Id() ) return;
 
-xhtmlHeaders(__FILE__, translate('Server').' - '.$Server->Name());
-getBodyTopHTML();
 ?>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Server').' - '.$Server->Name() ?></h2>
-    </div>
-    <div id="content">
-      <form name="contentForm" method="post" action="?" class="validateFormOnSubmit">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
+<div class="modal fade" id="ServerModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('Server') .' - '. $Server->Name() ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      <form id="serverModalForm" name="contentForm" method="post" action="?view=server&action=save" class="validateFormOnSubmit">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="server"/>
         <input type="hidden" name="object" value="server"/>
         <input type="hidden" name="id" value="<?php echo validHtmlStr($_REQUEST['id']) ?>"/>
-        <table id="contentTable" class="major">
+        <table class="table-sm">
           <tbody>
             <tr>
               <th scope="row"><?php echo translate('Name') ?></th>
@@ -76,38 +67,39 @@ getBodyTopHTML();
             <tr>
               <th scope="row"><?php echo translate('RunStats') ?></th>
               <td>
-                <input type="radio" name="newServer[zmstats]" value="1"<?php echo $Server->zmstats() ? ' checked="checked"' : '' ?>/> Yes
-                <input type="radio" name="newServer[zmstats]" value="0"<?php echo $Server->zmstats() ? '' : ' checked="checked"' ?>/> No
+                <input type="radio" name="newServer[zmstats]" value="1" <?php echo $Server->zmstats() ? $checked : $null ?>/> Yes
+                <input type="radio" name="newServer[zmstats]" value="0" <?php echo $Server->zmstats() ? $null : $checked ?>/> No
               </td>
             </tr>
             <tr>
               <th scope="row"><?php echo translate('RunAudit') ?></th>
               <td>
-                <input type="radio" name="newServer[zmaudit]" value="1"<?php echo $Server->zmaudit() ? ' checked="checked"' : '' ?>/> Yes
-                <input type="radio" name="newServer[zmaudit]" value="0"<?php echo $Server->zmaudit() ? '' : ' checked="checked"' ?>/> No
+                <input type="radio" name="newServer[zmaudit]" value="1"<?php echo $Server->zmaudit() ? $checked : $null ?>/> Yes
+                <input type="radio" name="newServer[zmaudit]" value="0"<?php echo $Server->zmaudit() ? $null : $checked ?>/> No
               </td>
             </tr>
             <tr>
               <th scope="row"><?php echo translate('RunTrigger') ?></th>
               <td>
-                <input type="radio" name="newServer[zmtrigger]" value="1"<?php echo $Server->zmtrigger() ? ' checked="checked"' : '' ?>/> Yes
-                <input type="radio" name="newServer[zmtrigger]" value="0"<?php echo $Server->zmtrigger() ? '' : ' checked="checked"' ?>/> No
+                <input type="radio" name="newServer[zmtrigger]" value="1" <?php echo $Server->zmtrigger() ? $checked : $null ?>/> Yes
+                <input type="radio" name="newServer[zmtrigger]" value="0" <?php echo $Server->zmtrigger() ? $null : $checked ?>/> No
               </td>
             </tr>
             <tr>
               <th scope="row"><?php echo translate('RunEventNotification') ?></th>
               <td>
-                <input type="radio" name="newServer[zmeventnotification]" value="1"<?php echo $Server->zmeventnotification() ? ' checked="checked"' : '' ?>/> Yes
-                <input type="radio" name="newServer[zmeventnotification]" value="0"<?php echo $Server->zmeventnotification() ? '' : ' checked="checked"' ?>/> No
+                <input type="radio" name="newServer[zmeventnotification]" value="1" <?php echo $Server->zmeventnotification() ? $checked : $null ?>/> Yes
+                <input type="radio" name="newServer[zmeventnotification]" value="0" <?php echo $Server->zmeventnotification() ? $null : $checked ?>/> No
               </td>
             </tr>
           </tbody>
         </table>
-        <div id="contentButtons">
-          <button type="submit" name="action" value="Save" ><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
-        </div>
-      </form>
+      </div>
+      <div class="modal-footer">
+        <button name="action" id="serverSubmitBtn" type="submit" class="btn btn-primary" value="Save"><?php echo translate('Save') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+      </div>
     </div>
   </div>
-<?php xhtmlFooter() ?>
+</div>
+
diff --git a/web/skins/classic/views/state.php b/web/ajax/modals/state.php
similarity index 93%
rename from web/skins/classic/views/state.php
rename to web/ajax/modals/state.php
index d10b28e41..a3b6734a3 100644
--- a/web/skins/classic/views/state.php
+++ b/web/ajax/modals/state.php
@@ -17,12 +17,10 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
-global $running;
 
-if ( !canEdit('System') ) {
-  $view = 'error';
-  return;
-}
+if ( !canEdit('System') ) return;
+
+$running = daemonCheck();
 
 $content = '';
 if ( $running ) {
@@ -53,6 +51,10 @@ foreach ( $states as $state ) {
       </div>
       <div class="modal-body">
           <form class="" name="contentForm" method="get" action="?view=state">
+            <?php
+            // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+            echo getCSRFinputHTML();
+            ?>
             <input type="hidden" name="view" value="state"/>
             <input type="hidden" name="action" value="state"/>
             <input type="hidden" name="apply" value="1"/>
diff --git a/web/ajax/modals/storage.php b/web/ajax/modals/storage.php
new file mode 100644
index 000000000..70cc956dc
--- /dev/null
+++ b/web/ajax/modals/storage.php
@@ -0,0 +1,110 @@
+<?php
+// This is the HTML representing the Storage modal from Options -> Storage
+  if ( !isset($_REQUEST['id']) ) {
+    ajaxError('Storage Id Not Provided');
+    return;
+  }
+
+  $null = '';
+  $checked = 'checked="checked"';
+  $sid = $_REQUEST['id'];
+  
+  if ( !canEdit('System') ) return;
+
+  require_once('includes/Server.php');
+  require_once('includes/Storage.php');
+
+  if ( $_REQUEST['id'] ) {
+    if ( !($newStorage = ZM\Storage::find_one(array('Id'=>$sid)) ) ) {
+      // Perhaps do something different here, rather than return nothing
+      return;
+    }
+  } else {
+    $newStorage = new ZM\Storage();
+    $newStorage->Name(translate('NewStorage'));
+  }
+
+  $type_options = array( 'local' => translate('Local'), 's3fs' => translate('s3fs') );
+  $scheme_options = array(
+    'Deep' => translate('Deep'),
+    'Medium' => translate('Medium'),
+    'Shallow' => translate('Shallow'),
+  );
+
+  $servers = ZM\Server::find( null, array('order'=>'lower(Name)') );
+  $ServersById = array();
+  foreach ( $servers as $S ) {
+    $ServersById[$S->Id()] = $S;
+  }
+
+?>
+<div class="modal fade" id="storageModal" data-backdrop="static" data-keyboard="false" tabindex="-1" aria-labelledby="staticBackdropLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title"><?php echo translate('Storage') .' - '. $newStorage->Name() ?></h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+      <form id="storageModalForm" name="contentForm" method="post" action="?view=storage&action=save" class="validateFormOnSubmit">
+        <?php
+        // We have to manually insert the csrf key into the form when using a modal generated via ajax call
+        echo getCSRFinputHTML();
+        ?>
+        <input type="hidden" name="view" value="storage"/>
+        <input type="hidden" name="object" value="storage"/>
+        <input type="hidden" name="id" value="<?php echo validHtmlStr($sid) ?>"/>
+        <table class="major table-sm">
+          <tbody>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Name') ?></th>
+              <td><input type="text" name="newStorage[Name]" value="<?php echo $newStorage->Name() ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Path') ?></th>
+              <td><input type="text" name="newStorage[Path]" value="<?php echo $newStorage->Path() ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Url') ?></th>
+              <td><input type="text" name="newStorage[Url]" value="<?php echo $newStorage->Url() ?>"/></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Server') ?></th>
+              <td><?php echo htmlSelect('newStorage[ServerId]', array(''=>'Remote / No Specific Server') + $ServersById, $newStorage->ServerId()) ?></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Type') ?></th>
+              <td><?php echo htmlSelect('newStorage[Type]', $type_options, $newStorage->Type()) ?></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('StorageScheme') ?></th>
+              <td><?php echo htmlSelect('newStorage[Scheme]', $scheme_options, $newStorage->Scheme()) ?></td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('StorageDoDelete') ?></th>
+              <td>
+              <input type="radio" name="newStorage[DoDelete]" value="1" <?php echo $newStorage->DoDelete() ? $checked : $null ?>>Yes
+              <input type="radio" name="newStorage[DoDelete]" value="0" <?php echo $newStorage->DoDelete() ? $null : $checked ?>>No
+              </td>
+            </tr>
+            <tr>
+              <th class="text-right pr-3" scope="row"><?php echo translate('Enabled') ?></th>
+              <td>
+              <input type="radio" name="newStorage[Enabled]" value="1" <?php echo $newStorage->Enabled() ? $checked : $null ?>>Yes
+              <input type="radio" name="newStorage[Enabled]" value="0" <?php echo $newStorage->Enabled() ? $null : $checked ?>>No
+              </td>
+            </tr>
+          </tbody>
+        </table>
+      </div>
+      <div class="modal-footer">
+        <button name="action" id="storageSubmitBtn" type="submit" class="btn btn-primary" value="Save"><?php echo translate('Save') ?></button>
+        <button type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
+      </div>
+    </form>
+    </div>
+  </div>
+</div>
+
diff --git a/web/ajax/newlog.php b/web/ajax/newlog.php
new file mode 100644
index 000000000..9e6bd9585
--- /dev/null
+++ b/web/ajax/newlog.php
@@ -0,0 +1,132 @@
+<?php
+global $Servers;
+
+if ( !canView('System') ) {
+  ajaxError('Insufficient permissions to view log entries');
+  return;
+}
+
+// Only the query task is supported at the moment
+if ( !isset($_REQUEST['task']) or $_REQUEST['task'] != 'query' ) {
+  ajaxError('Unrecognised action');
+  return;
+}
+// The table we want our data from
+$table = 'Logs';
+
+// The names of the dB columns in the log table we are interested in
+$columns = array('TimeKey', 'Component', 'ServerId', 'Pid', 'Code', 'Message', 'File', 'Line');
+
+// The names of columns shown in the log view that are NOT dB columns in the database
+$col_alt = array('DateTime', 'Server');
+
+// Search contains a user entered string to search on
+$search = isset($_REQUEST['search']) ? $_REQUEST['search'] : '';
+
+// Advanced search contains an array of "column name" => "search text" pairs
+// Bootstrap table sends json_ecoded array, which we must decode
+$advsearch = isset($_REQUEST['filter']) ? json_decode($_REQUEST['filter'], JSON_OBJECT_AS_ARRAY) : array();
+
+// Sort specifies the name of the column to sort on
+$sort = 'TimeKey';
+if ( isset($_REQUEST['sort']) ) {
+  if ( !in_array($_REQUEST['sort'], array_merge($columns, $col_alt)) ) {
+    ZM\Error('Invalid sort field: ' . $_REQUEST['sort']);
+  } else {
+    $sort = $_REQUEST['sort'];
+    if ( $sort == 'DateTime' ) $sort = 'TimeKey';
+  }
+}
+
+// Offset specifies the starting row to return, used for pagination
+$offset = 0;
+if ( isset($_REQUEST['offset']) ) {
+  if ( ( !is_int($_REQUEST['offset']) and !ctype_digit($_REQUEST['offset']) ) ) {
+    ZM\Error('Invalid value for offset: ' . $_REQUEST['offset']);
+  } else {
+    $offset = $_REQUEST['offset'];
+  }
+}
+
+// Order specifies the sort direction, either asc or desc
+$order = (isset($_REQUEST['order']) and (strtolower($_REQUEST['order']) == 'asc')) ? 'ASC' : 'DESC';
+
+// Limit specifies the number of rows to return
+$limit = 100;
+if ( isset($_REQUEST['limit']) ) {
+  if ( ( !is_int($_REQUEST['limit']) and !ctype_digit($_REQUEST['limit']) ) ) {
+    ZM\Error('Invalid value for limit: ' . $_REQUEST['limit']);
+  } else {
+    $limit = $_REQUEST['limit'];
+  }
+}
+
+$col_str = implode(', ', $columns);
+$data = array();
+$query = array();
+$query['values'] = array();
+$likes = array();
+$where = '';
+// There are two search bars in the log view, normal and advanced
+// Making an exuctive decision to ignore the normal search, when advanced search is in use
+// Alternatively we could try to do both
+if ( count($advsearch) ) {
+
+  foreach ( $advsearch as $col=>$text ) {
+    if ( !in_array($col, array_merge($columns, $col_alt)) ) {
+      ZM\Error("'$col' is not a sortable column name");
+      continue;
+    }
+    $text = '%' .$text. '%';
+    array_push($likes, $col.' LIKE ?');
+    array_push($query['values'], $text);
+  }
+  $wherevalues = $query['values'];
+  $where = ' WHERE (' .implode(' OR ', $likes). ')';
+
+} else if ( $search != '' ) {
+
+  $search = '%' .$search. '%';
+  foreach ( $columns as $col ) {
+    array_push($likes, $col.' LIKE ?');
+    array_push($query['values'], $search);
+  }
+  $wherevalues = $query['values'];
+  $where = ' WHERE (' .implode(' OR ', $likes). ')';
+}  
+
+$query['sql'] = 'SELECT ' .$col_str. ' FROM `' .$table. '` ' .$where. ' ORDER BY ' .$sort. ' ' .$order. ' LIMIT ?, ?';
+array_push($query['values'], $offset, $limit);
+
+//ZM\Warning('Calling the following sql query: ' .$query['sql']);
+
+$data['totalNotFiltered'] = dbFetchOne('SELECT count(*) AS Total FROM ' .$table, 'Total');
+if ( $search != '' || count($advsearch) ) {
+  $data['total'] = dbFetchOne('SELECT count(*) AS Total FROM ' .$table.$where , 'Total', $wherevalues);
+} else {
+  $data['total'] = $data['totalNotFiltered'];
+}
+
+if ( !$Servers )
+  $Servers = ZM\Server::find();
+$servers_by_Id = array();
+# There is probably a better way to do this.
+foreach ( $Servers as $server ) {
+  $servers_by_Id[$server->Id()] = $server;
+}
+
+$rows = array();
+foreach ( dbFetchAll($query['sql'], NULL, $query['values']) as $row ) {
+  $row['DateTime'] = strftime('%Y-%m-%d %H:%M:%S', intval($row['TimeKey']));
+  $row['Server'] = ( $row['ServerId'] and isset($servers_by_Id[$row['ServerId']]) ) ? $servers_by_Id[$row['ServerId']]->Name() : '';
+  // First strip out any html tags
+  // Second strip out all characters that are not ASCII 32-126 (yes, 126)
+  $row['Message'] = preg_replace('/[^\x20-\x7E]/', '', strip_tags($row['Message']));
+  $rows[] = $row;
+}
+$data['rows'] = $rows;
+$data['logstate'] = logState();
+$data['updated'] = preg_match('/%/', DATE_FMT_CONSOLE_LONG) ? strftime(DATE_FMT_CONSOLE_LONG) : date(DATE_FMT_CONSOLE_LONG);
+
+ajaxResponse($data);
+
diff --git a/web/ajax/stats.php b/web/ajax/stats.php
new file mode 100644
index 000000000..3789ff448
--- /dev/null
+++ b/web/ajax/stats.php
@@ -0,0 +1,24 @@
+<?php
+
+if ( empty($_REQUEST['eid']) ) ajaxError('Event Id Not Provided');
+if ( empty($_REQUEST['fid']) ) ajaxError('Frame Id Not Provided');
+
+$eid = $_REQUEST['eid'];
+$fid = $_REQUEST['fid'];
+$row = ( isset($_REQUEST['row']) ) ? $_REQUEST['row'] : '';
+$data = array();
+
+// Not sure if this is required
+if ( ZM_OPT_USE_AUTH && (ZM_AUTH_RELAY == 'hashed') ) {
+  $auth_hash = generateAuthHash(ZM_AUTH_HASH_IPS);
+  if ( isset($_REQUEST['auth']) and ($_REQUEST['auth'] != $auth_hash) ) {
+    $data['auth'] = $auth_hash;
+  }
+}
+
+$data['html'] = getStatsTableHTML($eid, $fid, $row);
+$data['id'] = '#contentStatsTable' .$row;
+
+ajaxResponse($data);
+return;
+?>
diff --git a/web/api/app/Controller/EventsController.php b/web/api/app/Controller/EventsController.php
index 5188c18b4..3b132e932 100644
--- a/web/api/app/Controller/EventsController.php
+++ b/web/api/app/Controller/EventsController.php
@@ -434,14 +434,11 @@ class EventsController extends AppController {
     // Find the max Frame for this Event.  Error out otherwise.
     $this->loadModel('Frame');
 
-    if (! $frame = $this->Frame->find('first', array(
+    $frame = $this->Frame->find('first', array(
       'conditions' => array(
-        'EventId' => $event['Event']['Id'],
-        'Score' => $event['Event']['MaxScore']
-      )
-    ))) {
-      throw new NotFoundException(__('Can not find Frame for Event ' . $event['Event']['Id']));
-    }
-    return $frame['Frame']['Id'];
+      'EventId' => $event['Event']['Id'],
+      'Score' => $event['Event']['MaxScore']
+    )));
+    return empty($frame)?null:$frame['Frame']['Id'];
   }
 } // end class EventsController
diff --git a/web/api/app/Controller/ZonesController.php b/web/api/app/Controller/ZonesController.php
index f01931f65..8d5e661bb 100644
--- a/web/api/app/Controller/ZonesController.php
+++ b/web/api/app/Controller/ZonesController.php
@@ -115,6 +115,7 @@ class ZonesController extends AppController {
     if ( !$this->Zone->exists($id) ) {
       throw new NotFoundException(__('Invalid zone'));
     }
+    $message = '';
     if ( $this->request->is(array('post', 'put')) ) {
       global $user;
       $canEdit = (!$user) || $user['Monitors'] == 'Edit';
@@ -123,14 +124,15 @@ class ZonesController extends AppController {
         return;
       }
       if ( $this->Zone->save($this->request->data) ) {
-        return $this->flash(__('The zone has been saved.'), array('action' => 'index'));
+        $message = 'The zone has been saved.';
+      } else {
+        $message = 'Error ' . print_r($this->Zone->invalidFields());
       }
-    } else {
-      $options = array('conditions' => array('Zone.' . $this->Zone->primaryKey => $id));
-      $this->request->data = $this->Zone->find('first', $options);
     }
-    $monitors = $this->Zone->Monitor->find('list');
-    $this->set(compact('monitors'));
+    $this->set(array(
+      'message' => $message,
+      '_serialize' => array('message')
+    ));
   }
 
   /**
diff --git a/web/api/app/Model/Zone.php b/web/api/app/Model/Zone.php
index 0f5e4d653..cdf8464e2 100644
--- a/web/api/app/Model/Zone.php
+++ b/web/api/app/Model/Zone.php
@@ -41,19 +41,15 @@ class Zone extends AppModel {
       //array('naturalNumber'),
       'message' => 'Zones must have a valid MonitorId',
       'allowEmpty' => false,
-      'required' => true,
         //'last' => false, // Stop validation after this rule
         //'on' => 'create', // Limit validation to 'create' or 'update' operations
     ),
     'Name' => array(
        'required' => array(
-         //'on'         => 'create',
          'rule'       => 'notBlank',
          'message'    => 'Zone Name must be specified for creation',
-         'required'   => true,
        ),
      )
-
   );
 
 	//The Associations below have been created with all possible keys, those that are not needed can be removed
diff --git a/web/css/bootstrap-table-page-jump-to.min.css b/web/css/bootstrap-table-page-jump-to.min.css
index 0c8e7d527..cfa51a197 100644
--- a/web/css/bootstrap-table-page-jump-to.min.css
+++ b/web/css/bootstrap-table-page-jump-to.min.css
@@ -1,7 +1,7 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.17.1
+  * @version v1.18.0
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT
diff --git a/web/css/bootstrap-table.min.css b/web/css/bootstrap-table.min.css
index 00a219e7d..dc0113c73 100644
--- a/web/css/bootstrap-table.min.css
+++ b/web/css/bootstrap-table.min.css
@@ -1,10 +1,10 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.17.1
+  * @version v1.18.0
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT
   */
 
-.bootstrap-table .fixed-table-toolbar::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-toolbar .bs-bars,.bootstrap-table .fixed-table-toolbar .columns,.bootstrap-table .fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group>.btn{border-radius:0}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .dropdown-menu{text-align:left;max-height:300px;overflow:auto;-ms-overflow-style:scrollbar;z-index:1001}.bootstrap-table .fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.bootstrap-table .fixed-table-toolbar .columns-left{margin-right:5px}.bootstrap-table .fixed-table-toolbar .columns-right{margin-left:5px}.bootstrap-table .fixed-table-toolbar .pull-right .dropdown-menu{right:0;left:auto}.bootstrap-table .fixed-table-container{position:relative;clear:both}.bootstrap-table .fixed-table-container .table{width:100%;margin-bottom:0!important}.bootstrap-table .fixed-table-container .table td,.bootstrap-table .fixed-table-container .table th{vertical-align:middle;box-sizing:border-box}.bootstrap-table .fixed-table-container .table thead th{vertical-align:bottom;padding:0;margin:0}.bootstrap-table .fixed-table-container .table thead th:focus{outline:0 solid transparent}.bootstrap-table .fixed-table-container .table thead th.detail{width:30px}.bootstrap-table .fixed-table-container .table thead th .th-inner{padding:.75rem;vertical-align:bottom;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.bootstrap-table .fixed-table-container .table thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px!important}.bootstrap-table .fixed-table-container .table thead th .both{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC")}.bootstrap-table .fixed-table-container .table thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.bootstrap-table .fixed-table-container .table thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.bootstrap-table .fixed-table-container .table tbody tr.selected td{background-color:rgba(0,0,0,.075)}.bootstrap-table .fixed-table-container .table tbody tr.no-records-found td{text-align:center}.bootstrap-table .fixed-table-container .table tbody tr .card-view{display:flex}.bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.bootstrap-table .fixed-table-container .table .bs-checkbox{text-align:center}.bootstrap-table .fixed-table-container .table .bs-checkbox label{margin-bottom:0}.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=checkbox],.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=radio]{margin:0 auto!important}.bootstrap-table .fixed-table-container .table.table-sm .th-inner{padding:.3rem}.bootstrap-table .fixed-table-container.fixed-height:not(.has-footer){border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height.has-card-view{border-top:1px solid #dee2e6;border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .fixed-table-border{border-left:1px solid #dee2e6;border-right:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table thead th{border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table-dark thead th{border-bottom:1px solid #32383e}.bootstrap-table .fixed-table-container .fixed-table-header{overflow:hidden}.bootstrap-table .fixed-table-container .fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading{align-items:center;background:#fff;display:none;justify-content:center;position:absolute;bottom:0;width:100%;z-index:1000}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap{align-items:baseline;display:flex;justify-content:center}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .loading-text{margin-right:6px}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap{align-items:center;display:flex;justify-content:center}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::before{content:"";animation-duration:1.5s;animation-iteration-count:infinite;animation-name:LOADING;background:#212529;border-radius:50%;display:block;height:5px;margin:0 4px;opacity:0;width:5px}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot{animation-delay:.3s}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after{animation-delay:.6s}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark{background:#212529}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-dot,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::after,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::before{background:#fff}.bootstrap-table .fixed-table-container .fixed-table-footer{overflow:hidden}.bootstrap-table .fixed-table-pagination::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-pagination>.pagination,.bootstrap-table .fixed-table-pagination>.pagination-detail{margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-pagination>.pagination-detail .pagination-info{line-height:34px;margin-right:5px}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list{display:inline-block}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list .btn-group{position:relative;display:inline-block;vertical-align:middle}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list .btn-group .dropdown-menu{margin-bottom:0}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination{margin:0}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination a{padding:6px 12px;line-height:1.428571429}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a{color:#c8c8c8}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a::before{content:'\2B05'}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a::after{content:'\27A1'}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.disabled a{pointer-events:none;cursor:default}.bootstrap-table.fullscreen{position:fixed;top:0;left:0;z-index:1050;width:100%!important;background:#fff;height:calc(100vh);overflow-y:scroll}div.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden}@keyframes LOADING{0%{opacity:0}50%{opacity:1}to{opacity:0}}
\ No newline at end of file
+.bootstrap-table .fixed-table-toolbar::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-toolbar .bs-bars,.bootstrap-table .fixed-table-toolbar .columns,.bootstrap-table .fixed-table-toolbar .search{position:relative;margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group{display:inline-block;margin-left:-1px!important}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group>.btn{border-radius:0}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:first-child>.btn{border-top-left-radius:4px;border-bottom-left-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .btn-group>.btn-group:last-child>.btn{border-top-right-radius:4px;border-bottom-right-radius:4px}.bootstrap-table .fixed-table-toolbar .columns .dropdown-menu{text-align:left;max-height:300px;overflow:auto;-ms-overflow-style:scrollbar;z-index:1001}.bootstrap-table .fixed-table-toolbar .columns label{display:block;padding:3px 20px;clear:both;font-weight:400;line-height:1.428571429}.bootstrap-table .fixed-table-toolbar .columns-left{margin-right:5px}.bootstrap-table .fixed-table-toolbar .columns-right{margin-left:5px}.bootstrap-table .fixed-table-toolbar .pull-right .dropdown-menu{right:0;left:auto}.bootstrap-table .fixed-table-container{position:relative;clear:both}.bootstrap-table .fixed-table-container .table{width:100%;margin-bottom:0!important}.bootstrap-table .fixed-table-container .table td,.bootstrap-table .fixed-table-container .table th{vertical-align:middle;box-sizing:border-box}.bootstrap-table .fixed-table-container .table thead th{vertical-align:bottom;padding:0;margin:0}.bootstrap-table .fixed-table-container .table thead th:focus{outline:0 solid transparent}.bootstrap-table .fixed-table-container .table thead th.detail{width:30px}.bootstrap-table .fixed-table-container .table thead th .th-inner{padding:.75rem;vertical-align:bottom;overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.bootstrap-table .fixed-table-container .table thead th .sortable{cursor:pointer;background-position:right;background-repeat:no-repeat;padding-right:30px!important}.bootstrap-table .fixed-table-container .table thead th .both{background-image:url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAQAAADYWf5HAAAAkElEQVQoz7X QMQ5AQBCF4dWQSJxC5wwax1Cq1e7BAdxD5SL+Tq/QCM1oNiJidwox0355mXnG/DrEtIQ6azioNZQxI0ykPhTQIwhCR+BmBYtlK7kLJYwWCcJA9M4qdrZrd8pPjZWPtOqdRQy320YSV17OatFC4euts6z39GYMKRPCTKY9UnPQ6P+GtMRfGtPnBCiqhAeJPmkqAAAAAElFTkSuQmCC")}.bootstrap-table .fixed-table-container .table thead th .asc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZ0lEQVQ4y2NgGLKgquEuFxBPAGI2ahhWCsS/gDibUoO0gPgxEP8H4ttArEyuQYxAPBdqEAxPBImTY5gjEL9DM+wTENuQahAvEO9DMwiGdwAxOymGJQLxTyD+jgWDxCMZRsEoGAVoAADeemwtPcZI2wAAAABJRU5ErkJggg==)}.bootstrap-table .fixed-table-container .table thead th .desc{background-image:url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABMAAAATCAYAAAByUDbMAAAAZUlEQVQ4y2NgGAWjYBSggaqGu5FA/BOIv2PBIPFEUgxjB+IdQPwfC94HxLykus4GiD+hGfQOiB3J8SojEE9EM2wuSJzcsFMG4ttQgx4DsRalkZENxL+AuJQaMcsGxBOAmGvopk8AVz1sLZgg0bsAAAAASUVORK5CYII=)}.bootstrap-table .fixed-table-container .table tbody tr.selected td{background-color:rgba(0,0,0,.075)}.bootstrap-table .fixed-table-container .table tbody tr.no-records-found td{text-align:center}.bootstrap-table .fixed-table-container .table tbody tr .card-view{display:flex}.bootstrap-table .fixed-table-container .table tbody tr .card-view .card-view-title{font-weight:700;display:inline-block;min-width:30%;text-align:left!important}.bootstrap-table .fixed-table-container .table .bs-checkbox{text-align:center}.bootstrap-table .fixed-table-container .table .bs-checkbox label{margin-bottom:0}.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=checkbox],.bootstrap-table .fixed-table-container .table .bs-checkbox label input[type=radio]{margin:0 auto!important}.bootstrap-table .fixed-table-container .table.table-sm .th-inner{padding:.3rem}.bootstrap-table .fixed-table-container.fixed-height:not(.has-footer){border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height.has-card-view{border-top:1px solid #dee2e6;border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .fixed-table-border{border-left:1px solid #dee2e6;border-right:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table thead th{border-bottom:1px solid #dee2e6}.bootstrap-table .fixed-table-container.fixed-height .table-dark thead th{border-bottom:1px solid #32383e}.bootstrap-table .fixed-table-container .fixed-table-header{overflow:hidden}.bootstrap-table .fixed-table-container .fixed-table-body{overflow-x:auto;overflow-y:auto;height:100%}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading{align-items:center;background:#fff;display:flex;justify-content:center;position:absolute;bottom:0;width:100%;z-index:1000;transition:visibility 0s,opacity .15s ease-in-out;opacity:0;visibility:hidden}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.open{visibility:visible;opacity:1}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap{align-items:baseline;display:flex;justify-content:center}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .loading-text{margin-right:6px}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap{align-items:center;display:flex;justify-content:center}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::before{content:"";animation-duration:1.5s;animation-iteration-count:infinite;animation-name:LOADING;background:#212529;border-radius:50%;display:block;height:5px;margin:0 4px;opacity:0;width:5px}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-dot{animation-delay:.3s}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading .loading-wrap .animation-wrap::after{animation-delay:.6s}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark{background:#212529}.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-dot,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::after,.bootstrap-table .fixed-table-container .fixed-table-body .fixed-table-loading.table-dark .animation-wrap::before{background:#fff}.bootstrap-table .fixed-table-container .fixed-table-footer{overflow:hidden}.bootstrap-table .fixed-table-pagination::after{content:"";display:block;clear:both}.bootstrap-table .fixed-table-pagination>.pagination,.bootstrap-table .fixed-table-pagination>.pagination-detail{margin-top:10px;margin-bottom:10px}.bootstrap-table .fixed-table-pagination>.pagination-detail .pagination-info{line-height:34px;margin-right:5px}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list{display:inline-block}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list .btn-group{position:relative;display:inline-block;vertical-align:middle}.bootstrap-table .fixed-table-pagination>.pagination-detail .page-list .btn-group .dropdown-menu{margin-bottom:0}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination{margin:0}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination a{padding:6px 12px;line-height:1.428571429}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a{color:#c8c8c8}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a::before{content:'\2B05'}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.page-intermediate a::after{content:'\27A1'}.bootstrap-table .fixed-table-pagination>.pagination ul.pagination li.disabled a{pointer-events:none;cursor:default}.bootstrap-table.fullscreen{position:fixed;top:0;left:0;z-index:1050;width:100%!important;background:#fff;height:calc(100vh);overflow-y:scroll}div.fixed-table-scroll-inner{width:100%;height:200px}div.fixed-table-scroll-outer{top:0;left:0;visibility:hidden;width:200px;height:150px;overflow:hidden}@keyframes LOADING{0%{opacity:0}50%{opacity:1}to{opacity:0}}
\ No newline at end of file
diff --git a/web/includes/Filter.php b/web/includes/Filter.php
index 4405a7688..3490c276c 100644
--- a/web/includes/Filter.php
+++ b/web/includes/Filter.php
@@ -9,7 +9,7 @@ class Filter extends ZM_Object {
     'Id'              =>  null,
     'Name'            =>  '',
     'AutoExecute'     =>  0,
-    'AutoExecuteCmd'  =>  0,
+    'AutoExecuteCmd'  =>  '',
     'AutoEmail'       =>  0,
 		'EmailTo'					=>	'',
 		'EmailSubject'		=>	'',
@@ -50,10 +50,10 @@ class Filter extends ZM_Object {
     return $this->_sql;
   }
 
-  public function querystring() {
-    if ( ! isset($this->_querystring) ) {
+  public function querystring($separator='&amp;') {
+    if ( (! isset($this->_querystring)) or ( $separator != '&amp;' ) ) {
       foreach ( $this->FilterTerms() as $term ) {
-        $this->_querystring .= $term->querystring();
+        $this->_querystring .= $term->querystring($separator);
       } # end foreach term
     }
     return $this->_querystring;
@@ -196,7 +196,7 @@ class Filter extends ZM_Object {
     if ( isset( $this->Query()['sort_asc'] ) ) {
       return $this->{'Query'}['sort_asc'];
     }
-    return ZM_WEB_EVENT_SORT_ORDER;
+    return ZM_WEB_EVENT_SORT_ORDER == 'asc' ? 1 : 0;
     #return $this->defaults{'sort_asc'};
   }
 
@@ -308,6 +308,312 @@ class Filter extends ZM_Object {
     return $failed;
   }
 
+  function tree() {
+    $terms = $this->terms();
+
+    if ( count($terms) <= 0 ) {
+      return false;
+    }
+
+    $StorageArea = NULL;
+
+    $postfixExpr = array();
+    $postfixStack = array();
+
+    $priorities = array(
+      '<' => 1,
+      '<=' => 1,
+      '>' => 1,
+      '>=' => 1,
+      '=' => 2,
+      '!=' => 2,
+      '=~' => 2,
+      '!~' => 2,
+      '=[]' => 2,
+      '![]' => 2,
+      'and' => 3,
+      'or' => 4,
+    );
+
+    for ( $i = 0; $i < count($terms); $i++ ) {
+      $term = $terms[$i];
+      if ( !empty($term['cnj']) ) {
+        while( true ) {
+          if ( !count($postfixStack) ) {
+            $postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
+            break;
+          } elseif ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
+            $postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
+            break;
+          } elseif ( $priorities[$term['cnj']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
+            $postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
+            break;
+          } else {
+            $postfixExpr[] = array_pop($postfixStack);
+          }
+        }
+      } # end if ! empty cnj
+
+      if ( !empty($term['obr']) ) {
+        for ( $j = 0; $j < $term['obr']; $j++ ) {
+          $postfixStack[] = array('type'=>'obr', 'value'=>$term['obr']);
+        }
+      }
+      if ( !empty($term['attr']) ) {
+        $dtAttr = false;
+        switch ( $term['attr']) {
+        case 'MonitorName':
+          $sqlValue = 'M.'.preg_replace( '/^Monitor/', '', $term['attr']);
+          break;
+        case 'ServerId':
+          $sqlValue .= 'M.ServerId';
+          break;
+        case 'StorageServerId':
+          $sqlValue .= 'S.ServerId';
+          break;
+        case 'FilterServerId':
+          $sqlValue .= ZM_SERVER_ID;
+          break;
+        case 'DateTime':
+        case 'StartDateTime':
+          $sqlValue = 'E.StartTime';
+          $dtAttr = true;
+          break;
+        case 'Date':
+        case 'StartDate':
+          $sqlValue = 'to_days(E.StartTime)';
+          $dtAttr = true;
+          break;
+        case 'Time':
+        case 'StartTime':
+          $sqlValue = 'extract(hour_second from E.StartTime)';
+          break;
+        case 'Weekday':
+        case 'StartWeekday':
+          $sqlValue = 'weekday(E.StartTime)';
+          break;
+        case 'EndDateTime':
+          $sqlValue = 'E.EndTime';
+          $dtAttr = true;
+          break;
+        case 'EndDate':
+          $sqlValue = 'to_days(E.EndTime)';
+          $dtAttr = true;
+          break;
+        case 'EndTime':
+          $sqlValue = 'extract(hour_second from E.EndTime)';
+          break;
+        case 'EndWeekday':
+          $sqlValue = 'weekday(E.EndTime)';
+          break;
+        case 'Id':
+        case 'Name':
+        case 'MonitorId':
+        case 'StorageId':
+        case 'SecondaryStorageId':
+        case 'Length':
+        case 'Frames':
+        case 'AlarmFrames':
+        case 'TotScore':
+        case 'AvgScore':
+        case 'MaxScore':
+        case 'Cause':
+        case 'Notes':
+        case 'StateId':
+        case 'Archived':
+          $sqlValue = 'E.'.$term['attr'];
+          break;
+        case 'DiskPercent':
+          // Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
+          if ( ! $StorageArea ) {
+            for ( $j = 0; $j < count($terms); $j++ ) {
+              if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
+                $StorageArea = new Storage($terms[$j]['val']);
+                break;
+              }
+            } // end foreach remaining term
+            if ( ! $StorageArea ) $StorageArea = new Storage();
+          } // end no StorageArea found yet
+          $sqlValue = getDiskPercent($StorageArea);
+          break;
+        case 'DiskBlocks':
+          // Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
+          if ( ! $StorageArea ) {
+            for ( $j = 0; $j < count($terms); $j++ ) {
+              if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
+                $StorageArea = new Storage($terms[$j]['val']);
+                break;
+              }
+            } // end foreach remaining term
+            if ( ! $StorageArea ) $StorageArea = new Storage();
+          } // end no StorageArea found yet
+          $sqlValue = getDiskBlocks($StorageArea);
+          break;
+        default :
+          $sqlValue = $term['attr'];
+          break;
+        }
+        if ( $dtAttr ) {
+          $postfixExpr[] = array('type'=>'attr', 'value'=>$term['attr'], 'sqlValue'=>$sqlValue, 'dtAttr'=>true);
+        } else {
+          $postfixExpr[] = array('type'=>'attr', 'value'=>$term['attr'], 'sqlValue'=>$sqlValue);
+        }
+      } # end if attr
+
+      if ( isset($term['op']) ) {
+        if ( empty($term['op']) ) {
+          $term['op'] = '=';
+        }
+        switch ( $term['op']) {
+        case '=' :
+        case '!=' :
+        case '>=' :
+        case '>' :
+        case '<' :
+        case '<=' :
+        case 'LIKE' :
+        case 'NOT LIKE':
+          $sqlValue = $term['op'];
+          break;
+        case '=~' :
+          $sqlValue = 'regexp';
+          break;
+        case '!~' :
+          $sqlValue = 'not regexp';
+          break;
+        case '=[]' :
+        case 'IN' :
+          $sqlValue = 'in (';
+          break;
+        case '![]' :
+          $sqlValue = 'not in (';
+          break;
+        case 'IS' :
+        case 'IS NOT' :
+          if ( $term['val'] == 'Odd' )  {
+            $sqlValue .= ' % 2 = 1';
+          } else if ( $term['val'] == 'Even' )  {
+            $sqlValue .= ' % 2 = 0';
+          } else {
+            $sqlValue .= ' '.$term['op'];
+          }
+          break;
+        default :
+          ZM\Error('Unknown operator in filter '.$term['op']);
+        }
+
+        while( true ) {
+          if ( !count($postfixStack) ) {
+            $postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue);
+            break;
+          } elseif ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
+            $postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue);
+            break;
+          } elseif ( $priorities[$term['op']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
+            $postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue );
+            break;
+          } else {
+            $postfixExpr[] = array_pop($postfixStack);
+          }
+        } // end while
+      } // end if operator
+
+      if ( isset($term['val']) ) {
+        $valueList = array();
+        foreach ( preg_split('/["\'\s]*?,["\'\s]*?/', preg_replace('/^["\']+?(.+)["\']+?$/', '$1', $term['val'])) as $value ) {
+          switch ( $term['attr'] ) {
+          case 'MonitorName':
+          case 'Name':
+          case 'Cause':
+          case 'Notes':
+            if ( $term['op'] == 'LIKE' || $term['op'] == 'NOT LIKE' ) {
+              $value = '%'.$value.'%';
+            }
+            $value = dbEscape($value);
+            break;
+          case 'MonitorServerId':
+          case 'FilterServerId':
+          case 'StorageServerId':
+          case 'ServerId':
+            if ( $value == 'ZM_SERVER_ID' ) {
+              $value = ZM_SERVER_ID;
+            } else if ( $value == 'NULL' ) {
+
+            } else {
+              $value = dbEscape($value);
+            }
+            break;
+          case 'StorageId':
+            $StorageArea = new Storage($value);
+            if ( $value != 'NULL' )
+              $value = dbEscape($value);
+            break;
+          case 'DateTime':
+          case 'EndDateTime':
+          case 'StartDateTime':
+            $value = "'".strftime(STRF_FMT_DATETIME_DB, strtotime($value))."'";
+            break;
+          case 'Date':
+          case 'EndDate':
+          case 'StartDate':
+            $value = 'to_days(\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
+            break;
+          case 'Time':
+          case 'EndTime':
+          case 'StartTime':
+            $value = 'extract(hour_second from \''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
+            break;
+          case 'Weekday':
+          case 'EndWeekday':
+          case 'StartWeekday':
+            $value = 'weekday(\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
+            break;
+          default :
+            if ( $value != 'NULL' )
+              $value = dbEscape($value);
+          } // end switch attribute
+          $valueList[] = $value;
+        } // end foreach value
+        $postfixExpr[] = array('type'=>'val', 'value'=>$term['val'], 'sqlValue'=>join(',', $valueList));
+      } // end if has val
+
+      if ( !empty($term['cbr']) ) {
+        for ( $j = 0; $j < $term['cbr']; $j++ ) {
+          while ( count($postfixStack) ) {
+            $element = array_pop($postfixStack);
+            if ( $element['type'] == 'obr' ) {
+              $postfixExpr[count($postfixExpr)-1]['bracket'] = true;
+              break;
+            }
+            $postfixExpr[] = $element;
+          }
+        }
+      } #end if cbr
+    } # end foreach term
+
+    while ( count($postfixStack) ) {
+      $postfixExpr[] = array_pop($postfixStack);
+    }
+
+    $exprStack = array();
+    foreach ( $postfixExpr as $element ) {
+      if ( $element['type'] == 'attr' || $element['type'] == 'val' ) {
+        $node = array('data'=>$element, 'count'=>0);
+        $exprStack[] = $node;
+      } elseif ( $element['type'] == 'op' || $element['type'] == 'cnj' ) {
+        $right = array_pop($exprStack);
+        $left = array_pop($exprStack);
+        $node = array('data'=>$element, 'count'=>2+$left['count']+$right['count'], 'right'=>$right, 'left'=>$left);
+        $exprStack[] = $node;
+      } else {
+        ZM\Fatal('Unexpected element type \''.$element['type'].'\', value \''.$element['value'].'\'');
+      }
+    }
+    if ( count($exprStack) != 1 ) {
+      ZM\Fatal('Expression stack has '.count($exprStack).' elements');
+    }
+    return array_pop($exprStack);
+  } # end function tree
 
 } # end class Filter
 
diff --git a/web/includes/FilterTerm.php b/web/includes/FilterTerm.php
index 1e3af259e..02be63833 100644
--- a/web/includes/FilterTerm.php
+++ b/web/includes/FilterTerm.php
@@ -50,7 +50,7 @@ class FilterTerm {
     }
     if ( isset($term['cbr']) ) {
       if ( (string)(int)$term['cbr'] == $term['cbr'] ) {
-        $this->obr = $term['cbr'];
+        $this->cbr = $term['cbr'];
       } else {
         Warning('Invalid cbr ' . $term['cbr'] . ' in ' . print_r($term, true));
       }
@@ -61,7 +61,7 @@ class FilterTerm {
   public function sql_values() {
     $values = array();
     if ( !isset($this->val) ) {
-      Logger::Warning("No value in term ");
+      Logger::Warning('No value in term'.$this->attr);
       return $values;
     }
 
@@ -75,6 +75,10 @@ class FilterTerm {
       case 'ExistsInFileSystem':
         $value = '';
         break;
+      case 'DiskSpace':
+        $value = '';
+        break;
+      case 'MonitorName':
       case 'MonitorName':
       case 'Name':
       case 'Cause':
@@ -137,10 +141,11 @@ class FilterTerm {
   } # end function sql_values
 
   public function sql_operator() {
-    if ( $this->attr == 'AlarmZoneId' ) {
+    switch ( $this->attr ) {
+    case 'AlarmZoneId':
       return ' EXISTS ';
-    }
-    if ( $this->attr == 'ExistsInFileSystem' ) {
+    case 'ExistsInFileSystem':
+    case 'DiskSpace':
       return '';
     }
 
@@ -197,6 +202,7 @@ class FilterTerm {
 
     switch ( $this->attr ) {
     case 'ExistsInFileSystem':
+    case 'DiskSpace':
       $sql .= 'TRUE /*'.$this->attr.'*/';
       break;
     case 'MonitorName':
@@ -256,7 +262,7 @@ class FilterTerm {
       break;
     case 'Id':
     case 'Name':
-    case 'DiskSpace':
+    case 'EventDiskSpace':
     case 'MonitorId':
     case 'StorageId':
     case 'SecondaryStorageId':
diff --git a/web/includes/Monitor.php b/web/includes/Monitor.php
index 02911aa73..d1bd51509 100644
--- a/web/includes/Monitor.php
+++ b/web/includes/Monitor.php
@@ -129,6 +129,8 @@ class Monitor extends ZM_Object {
     'Refresh' => null,
     'DefaultCodec'  => 'auto',
     'GroupIds'    => array('default'=>array(), 'do_not_update'=>1),
+    'Latitude'  =>  null,
+    'Longitude' =>  null,
   );
   private $status_fields = array(
     'Status'  =>  null,
@@ -567,7 +569,7 @@ class Monitor extends ZM_Object {
           return false;
         }
       } else if ( $command != 'quit' ) {
-        $command = ZM_PATH_BIN.'/zmcontrol.pl '.$command.' --id='.$this->{'Id'};
+        $command = ZM_PATH_BIN.'/zmcontrol.pl '.$command.' --id '.$this->{'Id'};
 
         // Can't connect so use script
         $ctrlOutput = exec(escapeshellcmd($command));
@@ -628,5 +630,9 @@ class Monitor extends ZM_Object {
     return $this->connKey;
   }
 
+  function canEdit() {
+    global $user;
+    return ( $user && ($user['Monitors'] == 'Edit') && ( !$this->{'Id'} || visibleMonitor($this->{'Id'}) ));
+  }
 } // end class Monitor
 ?>
diff --git a/web/includes/Object.php b/web/includes/Object.php
index 75477c08a..e8fff930b 100644
--- a/web/includes/Object.php
+++ b/web/includes/Object.php
@@ -144,7 +144,6 @@ class ZM_Object {
   public function _remove_from_cache($class, $object) {
     global $object_cache;
     unset($object_cache[$class][$object->Id()]);
-    Logger::Debug("Unsset $class " . $object->Id() . " " . count($object_cache[$class]));
   }
 
   public static function Objects_Indexed_By_Id($class, $params=null) {
diff --git a/web/includes/Zone.php b/web/includes/Zone.php
index 7a19df9d2..9f3850bb1 100644
--- a/web/includes/Zone.php
+++ b/web/includes/Zone.php
@@ -8,8 +8,9 @@ class Zone extends ZM_Object {
   protected static $table = 'Zones';
 
 	protected $defaults = array(
-			'Id'                   => null,
-			'Name'                 => '',
+			'Id'                  => null,
+      'MonitorId'           => null,
+			'Name'                => '',
 			'Type' => 'Active',
 			'Units' => 'Pixels',
 			'CheckMethod' => 'Blobs',
@@ -36,6 +37,14 @@ class Zone extends ZM_Object {
   public static function find_one( $parameters = array(), $options = array() ) {
     return ZM_Object::_find_one(get_class(), $parameters, $options);
   }
+  public function Monitor() {
+    if ( isset($this->{'MonitorId'}) ) {
+      $Monitor = Monitor::find_one(array('Id'=>$this->{'MonitorId'}));
+      if ( $Monitor )
+        return $Monitor;
+    }
+    return new Monitor();
+  }
 
 } # end class Zone
 ?>
diff --git a/web/includes/actions/controlcap.php b/web/includes/actions/controlcap.php
index ad4985f11..0958a2492 100644
--- a/web/includes/actions/controlcap.php
+++ b/web/includes/actions/controlcap.php
@@ -89,7 +89,6 @@ if ( $action == 'controlcap' ) {
 
   //$changes = getFormChanges( $control, $_REQUEST['newControl'], $types, $columns );
   $Control->save($_REQUEST['newControl']);
-  $refreshParent = true;
-  $view = 'none';
+  $redirect = '?view=controlcaps';
 } // end if action
 ?>
diff --git a/web/includes/actions/donate.php b/web/includes/actions/donate.php
index b8659b269..c85f4509e 100644
--- a/web/includes/actions/donate.php
+++ b/web/includes/actions/donate.php
@@ -49,6 +49,6 @@ if ( $action == 'donate' && isset($_REQUEST['option']) ) {
       Warning("Unknown value for option in donate: $option");
       break;
   } // end switch option
-  $view = 'none';
+  $redirect = '?view=console';
 }
 ?>
diff --git a/web/includes/actions/eventdetail.php b/web/includes/actions/eventdetail.php
index 20bd084ee..d0a05829c 100644
--- a/web/includes/actions/eventdetail.php
+++ b/web/includes/actions/eventdetail.php
@@ -41,7 +41,6 @@ if ( $action == 'eventdetail' ) {
     );
   }
   $dbConn->commit();
-  $refreshParent = true;
-  $closePopup = true;
+  $redirect = $_SERVER['HTTP_REFERER'];
 }
 ?>
diff --git a/web/includes/actions/function.php b/web/includes/actions/function.php
index adf85de38..9667b8c24 100644
--- a/web/includes/actions/function.php
+++ b/web/includes/actions/function.php
@@ -51,11 +51,9 @@ if ( $action == 'function' ) {
 			if ( $newFunction != 'None' && $newFunction != 'NoDect' )
         zmaControl($monitor, 'start');
     }
-    $refreshParent = true;
   } else {
     ZM\Logger::Debug('No change to function, not doing anything.');
   }
 } // end if action 
-$view = 'none';
-$closePopup = true;
+$view = 'console';
 ?>
diff --git a/web/includes/actions/group.php b/web/includes/actions/group.php
index b23659d18..ec7a1dc87 100644
--- a/web/includes/actions/group.php
+++ b/web/includes/actions/group.php
@@ -26,26 +26,24 @@ if ( !canEdit('Groups') ) {
   return;
 }
 
-if ( $action == 'Save' ) {
+if ( $action == 'save' ) {
   $group_id = null;
-  if ( !empty($_POST['gid']) )
-    $group_id = $_POST['gid'];
+  if ( !empty($_REQUEST['gid']) )
+    $group_id = $_REQUEST['gid'];
   $group = new ZM\Group($group_id);
   $group->save(
       array(
-      'Name'=>  $_POST['newGroup']['Name'],
-      'ParentId'=>( $_POST['newGroup']['ParentId'] == '' ? null : $_POST['newGroup']['ParentId'] ),
+      'Name'=>  $_REQUEST['newGroup']['Name'],
+      'ParentId'=>( $_REQUEST['newGroup']['ParentId'] == '' ? null : $_REQUEST['newGroup']['ParentId'] ),
       )
     );
   dbQuery('DELETE FROM `Groups_Monitors` WHERE `GroupId`=?', array($group_id));
   $group_id = $group->Id();
   if ( $group_id ) {
-    foreach ( $_POST['newGroup']['MonitorIds'] as $mid ) {
+    foreach ( $_REQUEST['newGroup']['MonitorIds'] as $mid ) {
       dbQuery('INSERT INTO `Groups_Monitors` (`GroupId`,`MonitorId`) VALUES (?,?)', array($group_id, $mid));
     }
   }
-  $view = 'none';
-  $refreshParent = true;
-  $closePopup = true;
+  $redirect = '?view=groups';
 }
 ?>
diff --git a/web/includes/actions/monitor.php b/web/includes/actions/monitor.php
index fe8581f54..b1a7d4726 100644
--- a/web/includes/actions/monitor.php
+++ b/web/includes/actions/monitor.php
@@ -24,7 +24,7 @@ if ( ! canEdit('Monitors') ) {
   return;
 }
 
-if ( $action == 'monitor' ) {
+if ( $action == 'save' ) {
   $mid = 0;
   if ( !empty($_REQUEST['mid']) ) {
     $mid = validInt($_REQUEST['mid']);
@@ -273,7 +273,7 @@ if ( $action == 'monitor' ) {
     // really should thump zmwatch and maybe zmtrigger too.
     //daemonControl( 'restart', 'zmwatch.pl' );
   } // end if restart
-  $view = 'console';
+  $redirect = '?view=console';
 } else {
   ZM\Warning("Unknown action $action in Monitor");
 } // end if action == Delete
diff --git a/web/includes/actions/server.php b/web/includes/actions/server.php
index 1ffe4933d..dc0ae4b45 100644
--- a/web/includes/actions/server.php
+++ b/web/includes/actions/server.php
@@ -24,7 +24,7 @@ if ( ! canEdit('System') ) {
   return;
 }
 
-if ( $action == 'Save' ) {
+if ( $action == 'save' ) {
   if ( !empty($_REQUEST['id']) ) {
     $dbServer = dbFetchOne(
       'SELECT * FROM Servers WHERE Id=?',
@@ -46,7 +46,7 @@ if ( $action == 'Save' ) {
     }
     $refreshParent = true;
   }
-  $view = 'none';
+  $redirect = '?view=options&tab=servers';
 } else {
   ZM\Error("Unknown action $action in saving Server");
 }
diff --git a/web/includes/actions/storage.php b/web/includes/actions/storage.php
index 49b5de3de..69ebfae0b 100644
--- a/web/includes/actions/storage.php
+++ b/web/includes/actions/storage.php
@@ -24,7 +24,7 @@ if ( !canEdit('System') ) {
   return;
 }
 
-if ( $action == 'Save' ) {
+if ( $action == 'save' ) {
   $storage = new ZM\Storage($_REQUEST['id']);
 
   $changes = $storage->changes($_REQUEST['newStorage']);
@@ -33,7 +33,7 @@ if ( $action == 'Save' ) {
     $storage->save($changes);
     $refreshParent = true;
   }
-  $view = 'none';
+  $redirect = '?view=options&tab=storage';
 } else {
   ZM\Error("Unknown action $action in saving Storage");
 }
diff --git a/web/includes/actions/zones.php b/web/includes/actions/zones.php
index babb4fa7b..48f5a6091 100644
--- a/web/includes/actions/zones.php
+++ b/web/includes/actions/zones.php
@@ -17,33 +17,39 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
+require_once('includes/Zone.php');
+global $error_message;
 
-if ( !empty($_REQUEST['mid']) && canEdit('Monitors', $_REQUEST['mid']) ) {
-  $mid = validInt($_REQUEST['mid']);
-  $monitor = new ZM\Monitor($mid);
-  
-  if ( $action == 'delete' ) {
-    if ( isset($_REQUEST['markZids']) ) {
-      $restart_zmc = 0;
-      foreach ( $_REQUEST['markZids'] as $markZid ) {
+$monitors_to_restart = array();
 
-        if ( ! $restart_zmc ) {
-          $zone = dbFetchOne('SELECT * FROM Zones WHERE Id=?', NULL, array($markZid));
-          if ( $zone['Type'] == 'Privacy' ) {
-            $restart_zmc = 1;
-          }
-        }
-        dbQuery('DELETE FROM Zones WHERE MonitorId=? AND Id=?', array($mid, $markZid));
+if ( $action == 'delete' ) {
+  if ( isset($_REQUEST['markZids']) ) {
+    foreach ( $_REQUEST['markZids'] as $markZid ) {
+      $zone = new ZM\Zone($markZid);
+      if ( ! $zone->Id() ) {
+        $error_message .= 'Zone not found for id ' . $markZid.'<br/>';
+        continue;
       }
-      if ( daemonCheck() && $monitor->Type() != 'WebSite' ) {
+      $monitor = $zone->Monitor();
+      if ( !$monitor->CanEdit() ) {
+        $error_message .= 'You do not have permission to edit zones for monitor ' . $monitor->Name().'.<br/>';
+        continue;
+      }
+      # Could use true but store the object instead for easy access later
+      $monitors_to_restart[$monitor->Id()] = $monitor;
+      $error_message .= $zone->delete();
+    } # end foreach Zone
+
+    foreach ( $monitors_to_restart as $mid => $monitor ) {
+      if ( daemonCheck() and ($monitor->Type() != 'WebSite') ) {
         zmaControl($mid, 'stop');
-        if ( $restart_zmc )
+        if ( $monitor->Type() == 'Privacy' )
           zmcControl($mid, 'restart');
         zmaControl($mid, 'start');
       } // end if daemonCheck()
-      $refreshParent = true;
-    } // end if isset($_REQUEST['markZids'])
-  } // end if action 
-} // end if $mid and canEdit($mid)
+    }
+    $refreshParent = true;
+  } // end if isset($_REQUEST['markZids'])
+} // end if action 
 
 ?>
diff --git a/web/includes/database.php b/web/includes/database.php
index 4298b4ce8..8e621e2f9 100644
--- a/web/includes/database.php
+++ b/web/includes/database.php
@@ -64,7 +64,8 @@ function dbConnect() {
     $dbConn->setAttribute(PDO::ATTR_EMULATE_PREPARES, false);
     $dbConn->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
   } catch(PDOException $ex) {
-    echo "Unable to connect to ZM db using dsn $dsn host".ZM_DB_HOST.' user: ('.ZM_DB_USER.') password ('.ZM_DB_PASS.': '.$ex->getMessage();
+    global $error_message;
+    $error_message = "Unable to connect to ZM db using dsn $dsn<br/><br/>".$ex->getMessage();
     error_log('Unable to connect to ZM DB ' . $ex->getMessage());
     $dbConn = null;
   }
@@ -72,7 +73,8 @@ function dbConnect() {
 }  // end function dbConnect
 
 if ( !dbConnect() ) {
-  ZM\Fatal('Failed db connection');
+  include('views/no_database_connection.php');
+  exit();
 }
 
 function dbDisconnect() {
diff --git a/web/includes/functions.php b/web/includes/functions.php
index 4e361025a..b10e74eac 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -79,14 +79,12 @@ function CSPHeaders($view, $nonce) {
     case 'storage':
     case 'version': {
       // Enforce script-src on pages where inline scripts and event handlers have been fixed.
-      // 'unsafe-inline' is only for backwards compatibility with browsers which
-      // only support CSP 1 (with no nonce-* support).
-      header("Content-Security-Policy: script-src 'unsafe-inline' 'self' 'nonce-$nonce' $additionalScriptSrc");
+      header("Content-Security-Policy: script-src 'self' 'nonce-$nonce' $additionalScriptSrc");
       break;
     }
     default: {
       // Use Report-Only mode on all other pages.
-      header("Content-Security-Policy-Report-Only: script-src 'unsafe-inline' 'self' 'nonce-$nonce' $additionalScriptSrc;".
+      header("Content-Security-Policy-Report-Only: script-src 'self' 'nonce-$nonce' $additionalScriptSrc;".
         (ZM_CSP_REPORT_URI ? ' report-uri '.ZM_CSP_REPORT_URI : '' )
       );
       break;
@@ -438,6 +436,13 @@ function makeLink($url, $label, $condition=1, $options='') {
   return $string;
 }
 
+//Make it slightly easier to create a link to help text modal
+function makeHelpLink($ohndx) {
+  $string = '&nbsp;(<a id="' .$ohndx. '" class="optionhelp" href="#">?</a>)';
+
+  return $string;
+}
+
 /**
  * $label must be already escaped. It can't be done here since it sometimes contains HTML tags.
  */
@@ -482,6 +487,16 @@ function makePopupButton($url, $winName, $winSize, $buttonValue, $condition=1, $
   return $string;
 }
 
+function makeButton($url, $buttonValue, $condition=1, $options='') {
+  $string = '<button type="button" data-on-click-this="'.$buttonValue.'"';
+  $string .= ' data-url="' .$url. '"';
+  if (!$condition) {
+    $string .= ' disabled="disabled"';
+  }
+  $string .= ($options ? (' ' . $options) : '') . '/>'.translate($buttonValue).'</button>'.PHP_EOL;
+  return $string;
+}
+
 function htmlSelect($name, $contents, $values, $behaviours=false) {
   $behaviourText = '';
   if ( !empty($behaviours) ) {
@@ -1104,7 +1119,7 @@ function parseFilter(&$filter, $saveToSession=false, $querySep='&amp;') {
   $Filter = ZM\Filter::parse($filter, $querySep);
 
   $filter['sql'] = $Filter->sql();
-  $filter['querystring'] = $Filter->querystring();
+  $filter['querystring'] = $Filter->querystring($querySep);
   $filter['hidden_fields'] = $Filter->hidden_fields();
   $filter['pre_sql_conditions'] = $Filter->pre_sql_conditions();
   $filter['post_sql_conditions'] = $Filter->post_sql_conditions();
@@ -2143,7 +2158,10 @@ function getStreamHTML($monitor, $options = array()) {
     }
     $options['mode'] = 'single';
     $streamSrc = $monitor->getStreamSrc($options);
-    return getImageStill('liveStream'.$monitor->Id(), $streamSrc, $options['width'], $options['height'], $monitor->Name());
+    return getImageStill('liveStream'.$monitor->Id(), $streamSrc,
+      (isset($options['width']) ? $options['width'] : null),
+      (isset($options['height']) ? $options['height'] : null),
+      $monitor->Name());
   }
 } // end function getStreamHTML
 
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index fb730d86a..561ad2cb5 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -125,7 +125,8 @@ $SLANG = array(
     'AttrEndDate'           => 'End Date',
     'AttrStartDateTime'     => 'Start Date/Time',
     'AttrEndDateTime'       => 'End Date/Time',
-    'AttrDiskSpace'         => 'Disk Space',
+    'AttrEventDiskSpace'    => 'Event Disk Space',
+    'AttrDiskSpace'         => 'File System Disk Space',
     'AttrDiskBlocks'        => 'Disk Blocks',
     'AttrDiskPercent'       => 'Disk Percent',
     'AttrDuration'          => 'Duration',
@@ -260,7 +261,9 @@ $SLANG = array(
     'ConfigType'            => 'Config Type',
     'ConfiguredFor'         => 'Configured for',
     'ConfigURL'             => 'Config Base URL',
+    'ConfirmDeleteControl'  => 'Warning, deleting a control will reset all monitors that use it to be uncontrollable.<br><br>Are you sure you wish to delete?',
     'ConfirmDeleteEvents'   => 'Are you sure you wish to delete the selected events?',
+    'ConfirmDeleteTitle'    => 'Delete Confirmation',
     'ConfirmPassword'       => 'Confirm Password',
     'ConjAnd'               => 'and',
     'ConjOr'                => 'or',
@@ -319,6 +322,7 @@ $SLANG = array(
     'DuplicateMonitorName'  => 'Duplicate Monitor Name',
     'Duration'              => 'Duration',
     'Edit'                  => 'Edit',
+    'EditControl'           => 'Edit Control',
     'EditLayout'            => 'Edit Layout',
     'Email'                 => 'Email',
     'EnableAlarms'          => 'Enable Alarms',
diff --git a/web/skins/classic/css/base/skin.css b/web/skins/classic/css/base/skin.css
index baff90992..a347cee39 100644
--- a/web/skins/classic/css/base/skin.css
+++ b/web/skins/classic/css/base/skin.css
@@ -326,24 +326,10 @@ ul.tabList li.active a {
     color: #dc143c;
 }
 
-fieldset {
-    border: 1px solid black;
-    padding: 4px;
-    margin-bottom: 8px;
-    border-radius: 2px;
-    -moz-border-radius: 2px;
-    -webkit-border-radius: 2px;
-}
-
-fieldset > legend {
-    padding: 0 2px;
-}
-
 /*
  * Behavior classes
  */
 
-
 .ok, .infoText {
     color: #0fb9b1;
 }
diff --git a/web/skins/classic/css/base/views/newlog.css b/web/skins/classic/css/base/views/newlog.css
new file mode 100644
index 000000000..918c1097c
--- /dev/null
+++ b/web/skins/classic/css/base/views/newlog.css
@@ -0,0 +1,18 @@
+tr.log-fat td {
+    background-color:#ffcccc;
+    font-weight: bold;
+}
+
+tr.log-err td {
+    background-color:#ffcccc;
+}
+
+tr.log-war td {
+    background-color: #ffe4b5;
+}
+
+tr.log-dbg td {
+    color: #666666;
+    font-style: italic;
+}
+
diff --git a/web/skins/classic/css/base/views/options.css b/web/skins/classic/css/base/views/options.css
index 89e43fd96..e13409b35 100644
--- a/web/skins/classic/css/base/views/options.css
+++ b/web/skins/classic/css/base/views/options.css
@@ -21,6 +21,9 @@ input.large {
 #contentTable.userTable .colMonitor, #contentTable.userTable .colUsername {
     text-align: left;
 }
+#contentTable th {
+  text-align: left;
+}
 
 input[name="newConfig[ZM_OPT_GOOG_RECAPTCHA_SITEKEY]"],
 input[name="newConfig[ZM_OPT_GOOG_RECAPTCHA_SECRETKEY]"] {
diff --git a/web/skins/classic/css/base/views/settings.css b/web/skins/classic/css/base/views/settings.css
new file mode 100644
index 000000000..622976b2a
--- /dev/null
+++ b/web/skins/classic/css/base/views/settings.css
@@ -0,0 +1,3 @@
+input[type="number"] {
+    width: 50px;
+}
diff --git a/web/skins/classic/includes/functions.php b/web/skins/classic/includes/functions.php
index e19e2af8d..bd20dc534 100644
--- a/web/skins/classic/includes/functions.php
+++ b/web/skins/classic/includes/functions.php
@@ -39,12 +39,37 @@ function xhtmlHeaders($file, $title) {
   $baseViewCssPhpFile = getSkinFile('/css/base/views/'.$basename.'.css.php');
   $viewCssPhpFile = getSkinFile('/css/'.$css.'/views/'.$basename.'.css.php');
 
-  function output_link_if_exists($files) {
+  function output_link_if_exists($files, $cache_bust=true) {
     global $skin;
     $html = array();
     foreach ( $files as $file ) {
       if ( getSkinFile($file) ) {
+        if ( $cache_bust ) {
         $html[] = '<link rel="stylesheet" href="'.cache_bust('skins/'.$skin.'/'.$file).'" type="text/css"/>';
+        } else  {
+        $html[] = '<link rel="stylesheet" href="skins/'.$skin.'/'.$file.'" type="text/css"/>';
+        }
+      }
+    }
+    $html[] = ''; // So we ge a trailing \n
+    return implode(PHP_EOL, $html);
+  }
+  function output_script_if_exists($files, $cache_bust=true) {
+    global $skin;
+    $html = array();
+    foreach ( $files as $file ) {
+      if ( file_exists('skins/'.$skin.'/'.$file) ) {
+        if ( $cache_bust ) {
+          $html[] = '<script src="'.cache_bust('skins/'.$skin.'/'.$file).'"></script>';
+        } else {
+          $html[] = '<script src="skins/'.$skin.'/'.$file.'"></script>';
+        }
+      } else if ( file_exists($file) ) {
+        if ( $cache_bust ) {
+          $html[] = '<script src="'.cache_bust($file).'"></script>';
+        } else {
+          $html[] = '<script src="'.$file.'"></script>';
+        }
       }
     }
     $html[] = ''; // So we ge a trailing \n
@@ -56,6 +81,9 @@ function xhtmlHeaders($file, $title) {
     foreach ( $files as $file ) {
         $html[] = '<link rel="stylesheet" href="'.cache_bust($file).'" type="text/css"/>';
     }
+    if ( ! count($html) ) {
+      ZM\Warning("No files found for $files");
+    }
     $html[] = ''; // So we ge a trailing \n
     return implode(PHP_EOL, $html);
   }
@@ -109,6 +137,8 @@ if ( $css != 'base' )
     echo output_link_if_exists(array('/css/base/views/control.css'));
     if ( $css != 'base' )
       echo output_link_if_exists(array('/css/'.$css.'/views/control.css'));
+  } else if ( $basename == 'monitor' ) {
+      echo output_link_if_exists(array('js/leaflet/leaflet.css'), false);
   }
 ?>
   <style>
@@ -572,7 +602,7 @@ function getLogHTML() {
     if ( ZM\logToDatabase() > ZM\Logger::NOLOG ) { 
       $logstate = logState();
       $class = ($logstate == 'ok') ? 'text-success' : ($logstate == 'alert' ? 'text-warning' : (($logstate == 'alarm' ? 'text-danger' : '')));
-      $result .= '<li id="getLogHTML" class="nav-item dropdown mx-2">'.makePopupLink('?view=log', 'zmLog', 'log', '<span class="nav-link '.$class.'">'.translate('Log').'</span>').'</li>'.PHP_EOL;
+      $result .= '<li id="getLogHTML" class="nav-item dropdown mx-2">'.makeLink('?view=log', '<span class="nav-link '.$class.'">'.translate('Log').'</span>').'</li>'.PHP_EOL;
     }
   }
   
@@ -588,7 +618,7 @@ function getLogIconHTML() {
       $logstate = logState();
       $class = ( $logstate == 'alert' ) ? 'text-warning' : (( $logstate == 'alarm' ) ? 'text-danger' : '');
       $result .= '<li id="getLogIconHTML" class="nav-item dropdown">'.
-        makePopupLink('?view=log', 'zmLog', 'log', '<span class="mx-1 ' .$class. '"><i class="material-icons md-18">report</i>'.translate('Log').'</span>').
+        makeLink('?view=log', '<span class="mx-1 ' .$class. '"><i class="material-icons md-18">report</i>'.translate('Log').'</span>').
         '</li>'.PHP_EOL;
     }
   }
@@ -702,8 +732,6 @@ function getHeaderFlipHTML() {
 
 // Returns the html representing the logged in user name and avatar
 function getAcctCircleHTML($skin, $user=null) {
-  // Include Logout modal
-  include("skins/$skin/views/logout.php");
   $result = '';
   
   if ( ZM_OPT_USE_AUTH and $user ) {
@@ -723,7 +751,7 @@ function getStatusBtnHTML($status) {
   if ( canEdit('System') ) {
     //$result .= '<li class="nav-item dropdown">'.PHP_EOL;
     $result .= '<form id="getStatusBtnHTML" class="form-inline">'.PHP_EOL;
-    $result .= '<button type="button" class="btn btn-default navbar-btn" data-toggle="modal" data-target="#modalState">' .$status. '</button>'.PHP_EOL;
+    $result .= '<button type="button" class="btn btn-default navbar-btn" id="stateModalBtn">' .$status. '</button>'.PHP_EOL;
     $result .= '</form>'.PHP_EOL;
     //$result .= '</li>'.PHP_EOL;
 
@@ -754,15 +782,84 @@ function runtimeStatus($running=null) {
   return $running ? ($state ? $state : translate('Running')) : translate('Stopped');
 }
 
+function getStatsTableHTML($eid, $fid, $row='') {
+  if ( !canView('Events') ) return;
+  $result = '';
+  
+  $sql = 'SELECT S.*,E.*,Z.Name AS ZoneName,Z.Units,Z.Area,M.Name AS MonitorName FROM Stats AS S LEFT JOIN Events AS E ON S.EventId = E.Id LEFT JOIN Zones AS Z ON S.ZoneId = Z.Id LEFT JOIN Monitors AS M ON E.MonitorId = M.Id WHERE S.EventId = ? AND S.FrameId = ? ORDER BY S.ZoneId';
+  $stats = dbFetchAll( $sql, NULL, array( $eid, $fid ) );
+  
+  $result .= '<table id="contentStatsTable' .$row. '"'.PHP_EOL;
+    $result .= 'data-toggle="table"'.PHP_EOL;
+    $result .= 'data-toolbar="#toolbar"'.PHP_EOL;
+    $result .= 'class="table-sm table-borderless contentStatsTable"'.PHP_EOL;
+    $result .= 'cellspacing="0">'.PHP_EOL;
+    
+    $result .= '<caption>' .translate('Stats'). ' - ' .$eid. ' - ' .$fid. '</caption>'.PHP_EOL;
+    $result .= '<thead>'.PHP_EOL;
+      $result .= '<tr>'.PHP_EOL;
+        $result .= '<th class="colZone font-weight-bold" data-align="center">' .translate('Zone'). '</th>'.PHP_EOL;
+        $result .= '<th class="colPixelDiff font-weight-bold" data-align="center">' .translate('PixelDiff'). '</th>'.PHP_EOL;
+        $result .= '<th class="colAlarmPx font-weight-bold" data-align="center">' .translate('AlarmPx'). '</th>'.PHP_EOL;
+        $result .= '<th class="colFilterPx font-weight-bold" data-align="center">' .translate('FilterPx'). '</th>'.PHP_EOL;
+        $result .= '<th class="colBlobPx font-weight-bold" data-align="center">' .translate('BlobPx'). '</th>'.PHP_EOL;
+        $result .= '<th class="colBlobs font-weight-bold" data-align="center">' .translate('Blobs'). '</th>'.PHP_EOL;
+        $result .= '<th class="colBlobSizes font-weight-bold" data-align="center">' .translate('BlobSizes'). '</th>'.PHP_EOL;
+        $result .= '<th class="colAlarmLimits font-weight-bold" data-align="center">' .translate('AlarmLimits'). '</th>'.PHP_EOL;
+        $result .= '<th class="colScore font-weight-bold" data-align="center">' .translate('Score'). '</th>'.PHP_EOL;
+      $result .= '</tr>'.PHP_EOL;
+    $result .= '</thead>'.PHP_EOL;
+
+    $result .= '<tbody>'.PHP_EOL;
+    
+    if ( count($stats) ) {
+      foreach ( $stats as $stat ) {
+        $result .= '<tr>'.PHP_EOL;
+          $result .= '<td class="colZone">' .validHtmlStr($stat['ZoneName']). '</td>'.PHP_EOL;
+          $result .= '<td class="colPixelDiff">' .validHtmlStr($stat['PixelDiff']). '</td>'.PHP_EOL;
+          $result .= '<td class="colAlarmPx">' .sprintf( "%d (%d%%)", $stat['AlarmPixels'], (100*$stat['AlarmPixels']/$stat['Area']) ). '</td>'.PHP_EOL;
+          $result .= '<td class="colFilterPx">' .sprintf( "%d (%d%%)", $stat['FilterPixels'], (100*$stat['FilterPixels']/$stat['Area']) ).'</td>'.PHP_EOL;
+          $result .= '<td class="colBlobPx">' .sprintf( "%d (%d%%)", $stat['BlobPixels'], (100*$stat['BlobPixels']/$stat['Area']) ). '</td>'.PHP_EOL;
+          $result .= '<td class="colBlobs">' .validHtmlStr($stat['Blobs']). '</td>'.PHP_EOL;
+          
+          if ( $stat['Blobs'] > 1 ) {
+            $result .= '<td class="colBlobSizes">' .sprintf( "%d-%d (%d%%-%d%%)", $stat['MinBlobSize'], $stat['MaxBlobSize'], (100*$stat['MinBlobSize']/$stat['Area']), (100*$stat['MaxBlobSize']/$stat['Area']) ). '</td>'.PHP_EOL;
+          } else {
+            $result .= '<td class="colBlobSizes">' .sprintf( "%d (%d%%)", $stat['MinBlobSize'], 100*$stat['MinBlobSize']/$stat['Area'] ). '</td>'.PHP_EOL;
+          }
+          
+          $result .= '<td class="colAlarmLimits">' .validHtmlStr($stat['MinX'].",".$stat['MinY']."-".$stat['MaxX'].",".$stat['MaxY']). '</td>'.PHP_EOL;
+          $result .= '<td class="colScore">' .$stat['Score']. '</td>'.PHP_EOL;
+      }
+    } else {
+      $result .= '<tr>'.PHP_EOL;
+        $result .= '<td class="rowNoStats" colspan="9">' .translate('NoStatisticsRecorded'). '</td>'.PHP_EOL;
+      $result .= '</tr>'.PHP_EOL;
+    }
+
+    $result .= '</tbody>'.PHP_EOL;
+  $result .= '</table>'.PHP_EOL;
+  
+  return $result;
+}
+
+// Use this function to manually insert the csrf key into the form when using a modal generated via ajax call
+function getCSRFinputHTML() {
+  if ( isset($GLOBALS['csrf']['key']) ) {
+    $result = '<input type="hidden" name="__csrf_magic" value="key:' .csrf_hash($GLOBALS['csrf']['key']). '" />'.PHP_EOL;
+  } else {
+    $result = '';
+  }
+  
+  return $result;
+}
+
 function xhtmlFooter() {
   global $css;
   global $cspNonce;
   global $view;
   global $skin;
   global $basename;
-  if ( canEdit('System') ) {
-    include("skins/$skin/views/state.php");
-  }
   $skinJsPhpFile = getSkinFile('js/skin.js.php');
   $cssJsFile = getSkinFile('js/'.$css.'.js');
   $viewJsFile = getSkinFile('views/js/'.$basename.'.js');
@@ -776,17 +873,20 @@ function xhtmlFooter() {
   <script src="skins/<?php echo $skin; ?>/js/jquery.js"></script>
   <script src="skins/<?php echo $skin; ?>/js/jquery-ui-1.12.1/jquery-ui.js"></script>
   <script src="skins/<?php echo $skin; ?>/js/bootstrap.min.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table.min.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/tableExport.min.js"></script> 
-  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table-export.min.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table-page-jump-to.min.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/bootstrap-table-cookie.min.js"></script> 
-  <script src="skins/<?php echo $skin; ?>/js/chosen/chosen.jquery.min.js"></script>
-  <script src="skins/<?php echo $skin; ?>/js/dateTimePicker/jquery-ui-timepicker-addon.js"></script>
-
-  <script src="<?php echo cache_bust('js/Server.js'); ?>"></script>
+<?php echo output_script_if_exists(array(
+  'js/bootstrap-table.min.js',
+  'js/tableExport.min.js',
+  'js/bootstrap-table-export.min.js',
+  'js/bootstrap-table-page-jump-to.min.js',
+  'js/bootstrap-table-cookie.min.js',
+  'js/bootstrap-table-toolbar.min.js',
+  'js/bootstrap-table-auto-refresh.min.js',
+  'js/chosen/chosen.jquery.min.js',
+  'js/dateTimePicker/jquery-ui-timepicker-addon.js',
+  'js/Server.js',
+), true );
+?>
   <script nonce="<?php echo $cspNonce; ?>">var $j = jQuery.noConflict();</script>
-  <script src="<?php echo cache_bust('skins/'.$skin.'/views/js/state.js') ?>"></script>
 <?php
   if ( $view == 'event' ) {
 ?>
@@ -834,7 +934,10 @@ function xhtmlFooter() {
   // This is used in the log popup for the export function. Not sure if it's used anywhere else
 ?>
     <script src="<?php echo cache_bust('js/overlay.js') ?>"></script>
-<?php } ?>
+<?php
+  } else if ( $basename == 'monitor' ) {
+    echo output_script_if_exists(array('js/leaflet/leaflet.js'), false);
+  } ?>
   <script nonce="<?php echo $cspNonce; ?>">$j('.chosen').chosen();</script>
   </body>
 </html>
diff --git a/web/skins/classic/includes/timeline_functions.php b/web/skins/classic/includes/timeline_functions.php
index 1c0995df4..c81f150d2 100644
--- a/web/skins/classic/includes/timeline_functions.php
+++ b/web/skins/classic/includes/timeline_functions.php
@@ -43,316 +43,6 @@ function getSlotFrame($slot) {
 	return $slotFrame;
 }
 
-function parseFilterToTree($filter) {
-	if ( count($filter['terms']) <= 0 ) {
-		return false;
-	}
-	$terms = $filter['terms'];
-
-	$StorageArea = NULL;
-
-	$postfixExpr = array();
-	$postfixStack = array();
-
-	$priorities = array(
-			'<' => 1,
-			'<=' => 1,
-			'>' => 1,
-			'>=' => 1,
-			'=' => 2,
-			'!=' => 2,
-			'=~' => 2,
-			'!~' => 2,
-			'=[]' => 2,
-			'![]' => 2,
-			'and' => 3,
-			'or' => 4,
-			);
-
-	for ( $i = 0; $i < count($terms); $i++ ) {
-    $term = $terms[$i];
-		if ( !empty($term['cnj']) ) {
-			while( true ) {
-				if ( !count($postfixStack) ) {
-					$postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
-					break;
-				} elseif ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
-					$postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
-					break;
-				} elseif ( $priorities[$term['cnj']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
-					$postfixStack[] = array('type'=>'cnj', 'value'=>$term['cnj'], 'sqlValue'=>$term['cnj']);
-					break;
-				} else {
-					$postfixExpr[] = array_pop($postfixStack);
-				}
-			}
-		} # end if ! empty cnj
-
-		if ( !empty($term['obr']) ) {
-			for ( $j = 0; $j < $term['obr']; $j++ ) {
-				$postfixStack[] = array('type'=>'obr', 'value'=>$term['obr']);
-			}
-		}
-		if ( !empty($term['attr']) ) {
-			$dtAttr = false;
-			switch ( $term['attr']) {
-				case 'MonitorName':
-					$sqlValue = 'M.'.preg_replace( '/^Monitor/', '', $term['attr']);
-					break;
-				case 'ServerId':
-					$sqlValue .= 'M.ServerId';
-          break;
-        case 'StorageServerId':
-          $sqlValue .= 'S.ServerId';
-          break;
-        case 'FilterServerId':
-          $sqlValue .= ZM_SERVER_ID;
-          break;
-				case 'DateTime':
-				case 'StartDateTime':
-					$sqlValue = 'E.StartTime';
-					$dtAttr = true;
-					break;
-				case 'Date':
-				case 'StartDate':
-					$sqlValue = 'to_days(E.StartTime)';
-					$dtAttr = true;
-					break;
-				case 'Time':
-				case 'StartTime':
-					$sqlValue = 'extract(hour_second from E.StartTime)';
-					break;
-				case 'Weekday':
-				case 'StartWeekday':
-					$sqlValue = 'weekday(E.StartTime)';
-					break;
-				case 'EndDateTime':
-					$sqlValue = 'E.EndTime';
-					$dtAttr = true;
-					break;
-				case 'EndDate':
-					$sqlValue = 'to_days(E.EndTime)';
-					$dtAttr = true;
-					break;
-				case 'EndTime':
-					$sqlValue = 'extract(hour_second from E.EndTime)';
-					break;
-				case 'EndWeekday':
-					$sqlValue = 'weekday(E.EndTime)';
-					break;
-				case 'Id':
-				case 'Name':
-				case 'MonitorId':
-				case 'StorageId':
-        case 'SecondaryStorageId':
-				case 'Length':
-				case 'Frames':
-				case 'AlarmFrames':
-				case 'TotScore':
-				case 'AvgScore':
-				case 'MaxScore':
-				case 'Cause':
-				case 'Notes':
-				case 'StateId':
-				case 'Archived':
-					$sqlValue = 'E.'.$term['attr'];
-					break;
-				case 'DiskPercent':
-					// Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
-					if ( ! $StorageArea ) {
-						for ( $j = 0; $j < count($terms); $j++ ) {
-							if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
-								$StorageArea = new Storage($terms[$j]['val']);
-								break;
-							}
-						} // end foreach remaining term
-						if ( ! $StorageArea ) $StorageArea = new Storage();
-					} // end no StorageArea found yet
-					$sqlValue = getDiskPercent($StorageArea);
-					break;
-				case 'DiskBlocks':
-					// Need to specify a storage area, so need to look through other terms looking for a storage area, else we default to ZM_EVENTS_PATH
-					if ( ! $StorageArea ) {
-						for ( $j = 0; $j < count($terms); $j++ ) {
-							if ( isset($terms[$j]['attr']) and $terms[$j]['attr'] == 'StorageId' and isset($terms[$j]['val']) ) {
-								$StorageArea = new Storage($terms[$j]['val']);
-								break;
-							}
-						} // end foreach remaining term
-						if ( ! $StorageArea ) $StorageArea = new Storage();
-					} // end no StorageArea found yet
-					$sqlValue = getDiskBlocks($StorageArea);
-					break;
-				default :
-					$sqlValue = $term['attr'];
-					break;
-			}
-			if ( $dtAttr ) {
-				$postfixExpr[] = array('type'=>'attr', 'value'=>$term['attr'], 'sqlValue'=>$sqlValue, 'dtAttr'=>true);
-			} else {
-				$postfixExpr[] = array('type'=>'attr', 'value'=>$term['attr'], 'sqlValue'=>$sqlValue);
-			}
-		} # end if attr
-
-		if ( isset($term['op']) ) {
-			if ( empty($term['op']) ) {
-				$term['op'] = '=';
-			}
-			switch ( $term['op']) {
-				case '=' :
-				case '!=' :
-				case '>=' :
-				case '>' :
-				case '<' :
-				case '<=' :
-        case 'LIKE' :
-        case 'NOT LIKE':
-					$sqlValue = $term['op'];
-					break;
-        case '=~' :
-					$sqlValue = 'regexp';
-					break;
-				case '!~' :
-					$sqlValue = 'not regexp';
-					break;
-				case '=[]' :
-				case 'IN' :
-					$sqlValue = 'in (';
-					break;
-				case '![]' :
-					$sqlValue = 'not in (';
-					break;
-        case 'IS' :
-        case 'IS NOT' :
-          if ( $term['val'] == 'Odd' )  {
-            $sqlValue .= ' % 2 = 1';
-          } else if ( $term['val'] == 'Even' )  {
-            $sqlValue .= ' % 2 = 0';
-          } else {
-            $sqlValue .= ' '.$term['op'];
-          }
-          break;
-				default :
-					ZM\Error('Unknown operator in filter '.$term['op']);
-			}
-			while( true ) {
-				if ( !count($postfixStack) ) {
-					$postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue);
-					break;
-				} elseif ( $postfixStack[count($postfixStack)-1]['type'] == 'obr' ) {
-					$postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue);
-					break;
-				} elseif ( $priorities[$term['op']] < $priorities[$postfixStack[count($postfixStack)-1]['value']] ) {
-					$postfixStack[] = array('type'=>'op', 'value'=>$term['op'], 'sqlValue'=>$sqlValue );
-					break;
-				} else {
-					$postfixExpr[] = array_pop($postfixStack);
-				}
-			} // end while
-		} // end if operator
-
-		if ( isset($term['val']) ) {
-			$valueList = array();
-			foreach ( preg_split('/["\'\s]*?,["\'\s]*?/', preg_replace('/^["\']+?(.+)["\']+?$/', '$1', $term['val'])) as $value ) {
-				switch ( $term['attr'] ) {
-					case 'MonitorName':
-					case 'Name':
-					case 'Cause':
-					case 'Notes':
-            if ( $term['op'] == 'LIKE' || $term['op'] == 'NOT LIKE' ) {
-              $value = '%'.$value.'%';
-            }
-            $value = dbEscape($value);
-            break;
-          case 'MonitorServerId':
-          case 'FilterServerId':
-          case 'StorageServerId':
-          case 'ServerId':
-						if ( $value == 'ZM_SERVER_ID' ) {
-							$value = ZM_SERVER_ID;
-						} else if ( $value == 'NULL' ) {
-
-						} else {
-							$value = dbEscape($value);
-						}
-						break;
-					case 'StorageId':
-						$StorageArea = new Storage($value);
-						if ( $value != 'NULL' )
-							$value = dbEscape($value);
-						break;
-					case 'DateTime':
-					case 'EndDateTime':
-					case 'StartDateTime':
-						$value = "'".strftime(STRF_FMT_DATETIME_DB, strtotime($value))."'";
-						break;
-					case 'Date':
-					case 'EndDate':
-					case 'StartDate':
-						$value = 'to_days(\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
-						break;
-					case 'Time':
-					case 'EndTime':
-					case 'StartTime':
-						$value = 'extract(hour_second from \''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
-						break;
-					case 'Weekday':
-					case 'EndWeekday':
-					case 'StartWeekday':
-						$value = 'weekday(\''.strftime(STRF_FMT_DATETIME_DB, strtotime($value)).'\')';
-						break;
-					default :
-						if ( $value != 'NULL' )
-							$value = dbEscape($value);
-				} // end switch attribute
-				$valueList[] = $value;
-			} // end foreach value
-			$postfixExpr[] = array('type'=>'val', 'value'=>$term['val'], 'sqlValue'=>join(',', $valueList));
-		} // end if has val
-
-		if ( !empty($term['cbr']) ) {
-			for ( $j = 0; $j < $term['cbr']; $j++ ) {
-				while ( count($postfixStack) ) {
-					$element = array_pop($postfixStack);
-					if ( $element['type'] == 'obr' ) {
-						$postfixExpr[count($postfixExpr)-1]['bracket'] = true;
-						break;
-					}
-					$postfixExpr[] = $element;
-				}
-			}
-		} #end if cbr
-  } # end foreach term
-
-	while ( count($postfixStack) ) {
-		$postfixExpr[] = array_pop($postfixStack);
-	}
-
-	$exprStack = array();
-	//foreach ( $postfixExpr as $element )
-	//{
-	//echo $element['value'].' '; 
-	//}
-	//echo "<br>";
-	foreach ( $postfixExpr as $element ) {
-		if ( $element['type'] == 'attr' || $element['type'] == 'val' ) {
-			$node = array('data'=>$element, 'count'=>0);
-			$exprStack[] = $node;
-		} elseif ( $element['type'] == 'op' || $element['type'] == 'cnj' ) {
-			$right = array_pop($exprStack);
-			$left = array_pop($exprStack);
-			$node = array('data'=>$element, 'count'=>2+$left['count']+$right['count'], 'right'=>$right, 'left'=>$left);
-			$exprStack[] = $node;
-		} else {
-			ZM\Fatal('Unexpected element type \''.$element['type'].'\', value \''.$element['value'].'\'');
-		}
-	}
-	if ( count($exprStack) != 1 ) {
-		ZM\Fatal('Expression stack has '.count($exprStack).' elements');
-	}
-	return array_pop($exprStack);
-}
-
 function _parseTreeToInfix($node) {
 	$expression = '';
 	if ( isset($node) ) {
@@ -443,7 +133,7 @@ function parseTreeToFilter($tree) {
 function parseTreeToQuery($tree) {
 	$filter = parseTreeToFilter($tree);
 	parseFilter($filter, false, '&');
-	return $filter['query'];
+	return $filter['querystring'];
 }
 
 function _drawTree($node, $level) {
diff --git a/web/skins/classic/js/bootstrap-table-auto-refresh.min.js b/web/skins/classic/js/bootstrap-table-auto-refresh.min.js
new file mode 100644
index 000000000..4eba327a1
--- /dev/null
+++ b/web/skins/classic/js/bootstrap-table-auto-refresh.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function n(t,e){return t(e={exports:{}},e.exports),e.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof e&&e)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,a=Object.getOwnPropertyDescriptor,f={f:a&&!c.call({1:2},1)?function(t){var e=a(this,t);return!!e&&e.enumerable}:c},s=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},l={}.toString,p=function(t){return l.call(t).slice(8,-1)},h="".split,y=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?h.call(t,""):Object(t)}:Object,b=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},v=function(t){return y(b(t))},d=function(t){return"object"==typeof t?null!==t:"function"==typeof t},g=function(t,e){if(!d(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!d(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!d(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!d(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")},m={}.hasOwnProperty,O=function(t,e){return m.call(t,e)},w=o.document,j=d(w)&&d(w.createElement),S=function(t){return j?w.createElement(t):{}},R=!u&&!i((function(){return 7!=Object.defineProperty(S("div"),"a",{get:function(){return 7}}).a})),T=Object.getOwnPropertyDescriptor,P={f:u?T:function(t,e){if(t=v(t),e=g(e,!0),R)try{return T(t,e)}catch(t){}if(O(t,e))return s(!f.f.call(t,e),t[e])}},A=function(t){if(!d(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,x={f:u?E:function(t,e,n){if(A(t),e=g(e,!0),A(n),R)try{return E(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},_=u?function(t,e,n){return x.f(t,e,s(1,n))}:function(t,e,n){return t[e]=n,t},I=function(t,e){try{_(o,t,e)}catch(n){o[t]=e}return e},k="__core-js_shared__",F=o[k]||I(k,{}),M=Function.toString;"function"!=typeof F.inspectSource&&(F.inspectSource=function(t){return M.call(t)});var C,q,B,L=F.inspectSource,N=o.WeakMap,z="function"==typeof N&&/native code/.test(L(N)),D=n((function(t){(t.exports=function(t,e){return F[t]||(F[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),W=0,G=Math.random(),$=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++W+G).toString(36)},K=D("keys"),Q=function(t){return K[t]||(K[t]=$(t))},V={},X=o.WeakMap;if(z){var Y=new X,H=Y.get,J=Y.has,U=Y.set;C=function(t,e){return U.call(Y,t,e),e},q=function(t){return H.call(Y,t)||{}},B=function(t){return J.call(Y,t)}}else{var Z=Q("state");V[Z]=!0,C=function(t,e){return _(t,Z,e),e},q=function(t){return O(t,Z)?t[Z]:{}},B=function(t){return O(t,Z)}}var tt,et,nt={set:C,get:q,has:B,enforce:function(t){return B(t)?q(t):C(t,{})},getterFor:function(t){return function(e){var n;if(!d(e)||(n=q(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}},rt=n((function(t){var e=nt.get,n=nt.enforce,r=String(String).split("String");(t.exports=function(t,e,i,u){var c=!!u&&!!u.unsafe,a=!!u&&!!u.enumerable,f=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof e||O(i,"name")||_(i,"name",e),n(i).source=r.join("string"==typeof e?e:"")),t!==o?(c?!f&&t[e]&&(a=!0):delete t[e],a?t[e]=i:_(t,e,i)):a?t[e]=i:I(e,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||L(this)}))})),ot=o,it=function(t){return"function"==typeof t?t:void 0},ut=function(t,e){return arguments.length<2?it(ot[t])||it(o[t]):ot[t]&&ot[t][e]||o[t]&&o[t][e]},ct=Math.ceil,at=Math.floor,ft=function(t){return isNaN(t=+t)?0:(t>0?at:ct)(t)},st=Math.min,lt=function(t){return t>0?st(ft(t),9007199254740991):0},pt=Math.max,ht=Math.min,yt=function(t){return function(e,n,r){var o,i=v(e),u=lt(i.length),c=function(t,e){var n=ft(t);return n<0?pt(n+e,0):ht(n,e)}(r,u);if(t&&n!=n){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===n)return t||c||0;return!t&&-1}},bt={includes:yt(!0),indexOf:yt(!1)}.indexOf,vt=function(t,e){var n,r=v(t),o=0,i=[];for(n in r)!O(V,n)&&O(r,n)&&i.push(n);for(;e.length>o;)O(r,n=e[o++])&&(~bt(i,n)||i.push(n));return i},dt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],gt=dt.concat("length","prototype"),mt={f:Object.getOwnPropertyNames||function(t){return vt(t,gt)}},Ot={f:Object.getOwnPropertySymbols},wt=ut("Reflect","ownKeys")||function(t){var e=mt.f(A(t)),n=Ot.f;return n?e.concat(n(t)):e},jt=function(t,e){for(var n=wt(e),r=x.f,o=P.f,i=0;i<n.length;i++){var u=n[i];O(t,u)||r(t,u,o(e,u))}},St=/#|\.prototype\./,Rt=function(t,e){var n=Pt[Tt(t)];return n==Et||n!=At&&("function"==typeof e?i(e):!!e)},Tt=Rt.normalize=function(t){return String(t).replace(St,".").toLowerCase()},Pt=Rt.data={},At=Rt.NATIVE="N",Et=Rt.POLYFILL="P",xt=Rt,_t=P.f,It=function(t,e){var n,r,i,u,c,a=t.target,f=t.global,s=t.stat;if(n=f?o:s?o[a]||I(a,{}):(o[a]||{}).prototype)for(r in e){if(u=e[r],i=t.noTargetGet?(c=_t(n,r))&&c.value:n[r],!xt(f?r:a+(s?".":"#")+r,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;jt(u,i)}(t.sham||i&&i.sham)&&_(u,"sham",!0),rt(n,r,u,t)}},kt=Array.isArray||function(t){return"Array"==p(t)},Ft=function(t){return Object(b(t))},Mt=function(t,e,n){var r=g(e);r in t?x.f(t,r,s(0,n)):t[r]=n},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),qt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),Bt=D("wks"),Lt=o.Symbol,Nt=qt?Lt:$,zt=function(t){return O(Bt,t)||(Ct&&O(Lt,t)?Bt[t]=Lt[t]:Bt[t]=Nt("Symbol."+t)),Bt[t]},Dt=zt("species"),Wt=function(t,e){var n;return kt(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!kt(n.prototype)?d(n)&&null===(n=n[Dt])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===e?0:e)},Gt=ut("navigator","userAgent")||"",$t=o.process,Kt=$t&&$t.versions,Qt=Kt&&Kt.v8;Qt?et=(tt=Qt.split("."))[0]+tt[1]:Gt&&(!(tt=Gt.match(/Edge\/(\d+)/))||tt[1]>=74)&&(tt=Gt.match(/Chrome\/(\d+)/))&&(et=tt[1]);var Vt,Xt=et&&+et,Yt=zt("species"),Ht=zt("isConcatSpreadable"),Jt=9007199254740991,Ut="Maximum allowed index exceeded",Zt=Xt>=51||!i((function(){var t=[];return t[Ht]=!1,t.concat()[0]!==t})),te=(Vt="concat",Xt>=51||!i((function(){var t=[];return(t.constructor={})[Yt]=function(){return{foo:1}},1!==t[Vt](Boolean).foo}))),ee=function(t){if(!d(t))return!1;var e=t[Ht];return void 0!==e?!!e:kt(t)};It({target:"Array",proto:!0,forced:!Zt||!te},{concat:function(t){var e,n,r,o,i,u=Ft(this),c=Wt(u,0),a=0;for(e=-1,r=arguments.length;e<r;e++)if(ee(i=-1===e?u:arguments[e])){if(a+(o=lt(i.length))>Jt)throw TypeError(Ut);for(n=0;n<o;n++,a++)n in i&&Mt(c,a,i[n])}else{if(a>=Jt)throw TypeError(Ut);Mt(c,a++,i)}return c.length=a,c}});var ne,re=function(t,e,n){if(function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function")}(t),void 0===e)return t;switch(n){case 0:return function(){return t.call(e)};case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}},oe=[].push,ie=function(t){var e=1==t,n=2==t,r=3==t,o=4==t,i=6==t,u=5==t||i;return function(c,a,f,s){for(var l,p,h=Ft(c),b=y(h),v=re(a,f,3),d=lt(b.length),g=0,m=s||Wt,O=e?m(c,d):n?m(c,0):void 0;d>g;g++)if((u||g in b)&&(p=v(l=b[g],g,h),t))if(e)O[g]=p;else if(p)switch(t){case 3:return!0;case 5:return l;case 6:return g;case 2:oe.call(O,l)}else if(o)return!1;return i?-1:r||o?o:O}},ue={forEach:ie(0),map:ie(1),filter:ie(2),some:ie(3),every:ie(4),find:ie(5),findIndex:ie(6)},ce=Object.keys||function(t){return vt(t,dt)},ae=u?Object.defineProperties:function(t,e){A(t);for(var n,r=ce(e),o=r.length,i=0;o>i;)x.f(t,n=r[i++],e[n]);return t},fe=ut("document","documentElement"),se=Q("IE_PROTO"),le=function(){},pe=function(t){return"<script>"+t+"</"+"script>"},he=function(){try{ne=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;he=ne?function(t){t.write(pe("")),t.close();var e=t.parentWindow.Object;return t=null,e}(ne):((e=S("iframe")).style.display="none",fe.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(pe("document.F=Object")),t.close(),t.F);for(var n=dt.length;n--;)delete he.prototype[dt[n]];return he()};V[se]=!0;var ye=Object.create||function(t,e){var n;return null!==t?(le.prototype=A(t),n=new le,le.prototype=null,n[se]=t):n=he(),void 0===e?n:ae(n,e)},be=zt("unscopables"),ve=Array.prototype;null==ve[be]&&x.f(ve,be,{configurable:!0,value:ye(null)});var de,ge=ue.find,me="find",Oe=!0;me in[]&&Array(1).find((function(){Oe=!1})),It({target:"Array",proto:!0,forced:Oe},{find:function(t){return ge(this,t,arguments.length>1?arguments[1]:void 0)}}),de=me,ve[be][de]=!0;var we=Object.assign,je=Object.defineProperty,Se=!we||i((function(){if(u&&1!==we({b:1},we(je({},"a",{enumerable:!0,get:function(){je(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},n=Symbol(),r="abcdefghijklmnopqrst";return t[n]=7,r.split("").forEach((function(t){e[t]=t})),7!=we({},t)[n]||ce(we({},e)).join("")!=r}))?function(t,e){for(var n=Ft(t),r=arguments.length,o=1,i=Ot.f,c=f.f;r>o;)for(var a,s=y(arguments[o++]),l=i?ce(s).concat(i(s)):ce(s),p=l.length,h=0;p>h;)a=l[h++],u&&!c.call(s,a)||(n[a]=s[a]);return n}:we;function Re(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Te(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Pe(t){return(Pe=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Ae(t,e){return(Ae=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Ee(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function xe(t,e,n){return(xe="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=Pe(t)););return t}(t,e);if(r){var o=Object.getOwnPropertyDescriptor(r,e);return o.get?o.get.call(n):o.value}})(t,e,n||t)}It({target:"Object",stat:!0,forced:Object.assign!==Se},{assign:Se});var _e=t.fn.bootstrapTable.utils;t.extend(t.fn.bootstrapTable.defaults,{autoRefresh:!1,autoRefreshInterval:60,autoRefreshSilent:!0,autoRefreshStatus:!0,autoRefreshFunction:null}),t.extend(t.fn.bootstrapTable.defaults.icons,{autoRefresh:{bootstrap3:"glyphicon-time icon-time",materialize:"access_time","bootstrap-table":"icon-clock"}[t.fn.bootstrapTable.theme]||"fa-clock"}),t.extend(t.fn.bootstrapTable.locales,{formatAutoRefresh:function(){return"Auto Refresh"}}),t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales),t.BootstrapTable=function(t){function e(){return Re(this,e),Ee(this,Pe(e).apply(this,arguments))}var n,r,o;return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ae(t,e)}(e,t),n=e,(r=[{key:"init",value:function(){for(var t,n=this,r=arguments.length,o=new Array(r),i=0;i<r;i++)o[i]=arguments[i];(t=xe(Pe(e.prototype),"init",this)).call.apply(t,[this].concat(o)),this.options.autoRefresh&&this.options.autoRefreshStatus&&(this.options.autoRefreshFunction=setInterval((function(){n.refresh({silent:n.options.autoRefreshSilent})}),1e3*this.options.autoRefreshInterval))}},{key:"initToolbar",value:function(){var t;this.options.autoRefresh&&(this.buttons=Object.assign(this.buttons,{autoRefresh:{html:'\n            <button class="auto-refresh '.concat(this.constants.buttonsClass,"\n              ").concat(this.options.autoRefreshStatus?" ".concat(this.constants.classes.buttonActive):"",'"\n              type="button" name="autoRefresh" title="').concat(this.options.formatAutoRefresh(),'">\n              ').concat(this.options.showButtonIcons?_e.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.autoRefresh):"","\n              ").concat(this.options.showButtonText?this.options.formatAutoRefresh():"","\n            </button>\n           "),event:this.toggleAutoRefresh}}));for(var n=arguments.length,r=new Array(n),o=0;o<n;o++)r[o]=arguments[o];(t=xe(Pe(e.prototype),"initToolbar",this)).call.apply(t,[this].concat(r))}},{key:"toggleAutoRefresh",value:function(){var t=this;this.options.autoRefresh&&(this.options.autoRefreshStatus?(clearInterval(this.options.autoRefreshFunction),this.$toolbar.find(">.columns .auto-refresh").removeClass(this.constants.classes.buttonActive)):(this.options.autoRefreshFunction=setInterval((function(){t.refresh({silent:t.options.autoRefreshSilent})}),1e3*this.options.autoRefreshInterval),this.$toolbar.find(">.columns .auto-refresh").addClass(this.constants.classes.buttonActive)),this.options.autoRefreshStatus=!this.options.autoRefreshStatus)}}])&&Te(n.prototype,r),o&&Te(n,o),e}(t.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table-cookie.min.js b/web/skins/classic/js/bootstrap-table-cookie.min.js
index 11df359ee..f3a4a70c4 100644
--- a/web/skins/classic/js/bootstrap-table-cookie.min.js
+++ b/web/skins/classic/js/bootstrap-table-cookie.min.js
@@ -1,8 +1,10 @@
 /**
- * @author: Dennis Hernández
- * @webSite: http://djhvscf.github.io/Blog
- * @update zhixin wen <wenzhixin2010@gmail.com>
- * git a84b084
- */
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
 
-const Utils=$.fn.bootstrapTable.utils,UtilsCookie={cookieIds:{sortOrder:"bs.table.sortOrder",sortName:"bs.table.sortName",pageNumber:"bs.table.pageNumber",pageList:"bs.table.pageList",columns:"bs.table.columns",searchText:"bs.table.searchText",reorderColumns:"bs.table.reorderColumns",filterControl:"bs.table.filterControl",filterBy:"bs.table.filterBy"},getCurrentHeader(o){let e=o.$header;return o.options.height&&(e=o.$tableHeader),e},getCurrentSearchControls(o){let e="select, input";return o.options.height&&(e="table select, table input"),e},cookieEnabled:()=>!!navigator.cookieEnabled,inArrayCookiesEnabled(o,e){let t=-1;for(let i=0;i<e.length;i++)if(o.toLowerCase()===e[i].toLowerCase()){t=i;break}return t},setCookie(o,e,t){if(o.options.cookie&&UtilsCookie.cookieEnabled()&&""!==o.options.cookieIdTable&&-1!==UtilsCookie.inArrayCookiesEnabled(e,o.options.cookiesEnabled)){switch(e=`${o.options.cookieIdTable}.${e}`,o.options.cookieStorage){case"cookieStorage":document.cookie=[e,"=",encodeURIComponent(t),`; expires=${UtilsCookie.calculateExpiration(o.options.cookieExpire)}`,o.options.cookiePath?`; path=${o.options.cookiePath}`:"",o.options.cookieDomain?`; domain=${o.options.cookieDomain}`:"",o.options.cookieSecure?"; secure":""].join("");break;case"localStorage":localStorage.setItem(e,t);break;case"sessionStorage":sessionStorage.setItem(e,t);break;case"customStorage":if(!o.options.cookieCustomStorageSet||!o.options.cookieCustomStorageGet||!o.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");Utils.calculateObjectValue(o.options,o.options.cookieCustomStorageSet,[e,t],"");break;default:return!1}return!0}},getCookie(o,e,t){if(!t)return null;if(-1===UtilsCookie.inArrayCookiesEnabled(t,o.options.cookiesEnabled))return null;switch(t=`${e}.${t}`,o.options.cookieStorage){case"cookieStorage":const i=`; ${document.cookie}`.split(`; ${t}=`);return 2===i.length?decodeURIComponent(i.pop().split(";").shift()):null;case"localStorage":return localStorage.getItem(t);case"sessionStorage":return sessionStorage.getItem(t);case"customStorage":if(!o.options.cookieCustomStorageSet||!o.options.cookieCustomStorageGet||!o.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");return Utils.calculateObjectValue(o.options,o.options.cookieCustomStorageGet,[t],"");default:return null}},deleteCookie(o,e,t){switch(t=`${e}.${t}`,o.options.cookieStorage){case"cookieStorage":document.cookie=[encodeURIComponent(t),"=","; expires=Thu, 01 Jan 1970 00:00:00 GMT",o.options.cookiePath?`; path=${o.options.cookiePath}`:"",o.options.cookieDomain?`; domain=${o.options.cookieDomain}`:""].join("");break;case"localStorage":localStorage.removeItem(t);break;case"sessionStorage":sessionStorage.removeItem(t);break;case"customStorage":if(!o.options.cookieCustomStorageSet||!o.options.cookieCustomStorageGet||!o.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");Utils.calculateObjectValue(o.options,o.options.cookieCustomStorageDelete,[t],"");break;default:return!1}return!0},calculateExpiration(o){const e=o.replace(/[0-9]*/,"");switch(o=o.replace(/[A-Za-z]{1,2}/,""),e.toLowerCase()){case"s":o=+o;break;case"mi":o*=60;break;case"h":o=60*o*60;break;case"d":o=24*o*60*60;break;case"m":o=30*o*24*60*60;break;case"y":o=365*o*24*60*60;break;default:o=void 0}if(!o)return"";const t=new Date;return t.setTime(t.getTime()+1e3*o),t.toGMTString()},initCookieFilters(o){setTimeout(()=>{const e=JSON.parse(UtilsCookie.getCookie(o,o.options.cookieIdTable,UtilsCookie.cookieIds.filterControl));if(!o.options.filterControlValuesLoaded&&e){const t={},i=UtilsCookie.getCurrentHeader(o),s=UtilsCookie.getCurrentSearchControls(o),r=(e,i)=>{i.forEach(i=>{if(""!==i.text&&("radio"!==e.type||e.value.toString()===i.text.toString()))if("INPUT"===e.tagName&&"radio"===e.type&&e.value.toString()===i.text.toString())e.checked=!0,t[i.field]=i.text;else if("INPUT"===e.tagName)e.value=i.text,t[i.field]=i.text;else if("SELECT"===e.tagName&&o.options.filterControlContainer)e.value=i.text,t[i.field]=i.text;else if(""!==i.text&&"SELECT"===e.tagName){for(let o=0;o<e.length;o++){const t=e[o];if(t.value===i.text)return void(t.selected=!0)}const o=document.createElement("option");o.value=i.text,o.text=i.text,e.add(o,e[1]),e.selectedIndex=1,t[i.field]=i.text}})};let l=i;o.options.filterControlContainer&&(l=$(`${o.options.filterControlContainer}`)),l.find(s).each(function(){const o=$(this).closest("[data-field]").data("field"),t=e.filter(e=>e.field===o);r(this,t)}),o.initColumnSearch(t),o.options.filterControlValuesLoaded=!0,o.initServer()}},250)}};$.extend($.fn.bootstrapTable.defaults,{cookie:!1,cookieExpire:"2h",cookiePath:null,cookieDomain:null,cookieSecure:null,cookieIdTable:"",cookiesEnabled:["bs.table.sortOrder","bs.table.sortName","bs.table.pageNumber","bs.table.pageList","bs.table.columns","bs.table.searchText","bs.table.filterControl","bs.table.filterBy","bs.table.reorderColumns"],cookieStorage:"cookieStorage",cookieCustomStorageGet:null,cookieCustomStorageSet:null,cookieCustomStorageDelete:null,filterControls:[],filterControlValuesLoaded:!1}),$.fn.bootstrapTable.methods.push("getCookies"),$.fn.bootstrapTable.methods.push("deleteCookie"),$.extend($.fn.bootstrapTable.utils,{setCookie:UtilsCookie.setCookie,getCookie:UtilsCookie.getCookie}),$.BootstrapTable=class extends $.BootstrapTable{init(){if(this.options.cookie){const o=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.filterBy);if("boolean"==typeof o&&!o)throw new Error("The cookie value of filterBy must be a json!");let e={};try{e=JSON.parse(o)}catch(o){throw new Error("Could not parse the json of the filterBy cookie!")}if(this.filterColumns=e||{},this.options.filterControls=[],this.options.filterControlValuesLoaded=!1,this.options.cookiesEnabled="string"==typeof this.options.cookiesEnabled?this.options.cookiesEnabled.replace("[","").replace("]","").replace(/'/g,"").replace(/ /g,"").toLowerCase().split(","):this.options.cookiesEnabled,this.options.filterControl){const o=this;this.$el.on("column-search.bs.table",(e,t,i)=>{let s=!0;for(let e=0;e<o.options.filterControls.length;e++)if(o.options.filterControls[e].field===t){o.options.filterControls[e].text=i,s=!1;break}s&&o.options.filterControls.push({field:t,text:i}),UtilsCookie.setCookie(o,UtilsCookie.cookieIds.filterControl,JSON.stringify(o.options.filterControls))}).on("created-controls.bs.table",UtilsCookie.initCookieFilters(o))}}super.init()}initServer(...o){if(this.options.cookie&&this.options.filterControl&&!this.options.filterControlValuesLoaded){if(JSON.parse(UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.filterControl)))return}super.initServer(...o)}initTable(...o){super.initTable(...o),this.initCookie()}onSort(...o){super.onSort(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.sortOrder,this.options.sortOrder),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.sortName,this.options.sortName)}onPageNumber(...o){super.onPageNumber(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageNumber,this.options.pageNumber)}onPageListChange(...o){super.onPageListChange(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageList,this.options.pageSize),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageNumber,this.options.pageNumber)}onPagePre(...o){super.onPagePre(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageNumber,this.options.pageNumber)}onPageNext(...o){super.onPageNext(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageNumber,this.options.pageNumber)}_toggleColumn(...o){super._toggleColumn(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.columns,JSON.stringify(this.getVisibleColumns().map(o=>o.field)))}_toggleAllColumns(...o){super._toggleAllColumns(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.columns,JSON.stringify(this.getVisibleColumns().map(o=>o.field)))}selectPage(o){super.selectPage(o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageNumber,o)}onSearch(o){super.onSearch(o),this.options.search&&UtilsCookie.setCookie(this,UtilsCookie.cookieIds.searchText,this.searchText),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.pageNumber,this.options.pageNumber)}initHeader(...o){this.options.reorderableColumns&&(this.columnsSortOrder=JSON.parse(UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.reorderColumns))),super.initHeader(...o)}persistReorderColumnsState(o){UtilsCookie.setCookie(o,UtilsCookie.cookieIds.reorderColumns,JSON.stringify(o.columnsSortOrder))}filterBy(...o){super.filterBy(...o),UtilsCookie.setCookie(this,UtilsCookie.cookieIds.filterBy,JSON.stringify(this.filterColumns))}initCookie(){if(!this.options.cookie)return;if(""===this.options.cookieIdTable||""===this.options.cookieExpire||!UtilsCookie.cookieEnabled())return console.error("Configuration error. Please review the cookieIdTable and the cookieExpire property. If the properties are correct, then this browser does not support cookies."),void(this.options.cookie=!1);const o=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.sortOrder),e=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.sortName),t=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.pageNumber),i=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.pageList),s=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.searchText),r=UtilsCookie.getCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds.columns);if("boolean"==typeof r&&!r)throw new Error("The cookie value of filterBy must be a json!");let l={};try{l=JSON.parse(r)}catch(o){throw new Error("Could not parse the json of the columns cookie!",r)}if(this.options.sortOrder=o||this.options.sortOrder,this.options.sortName=e||this.options.sortName,this.options.pageNumber=t?+t:this.options.pageNumber,this.options.pageSize=i?i===this.options.formatAllRows()?i:+i:this.options.pageSize,this.options.searchText=s||"",l)for(const o of this.columns)o.visible=l.filter(e=>!!this.isSelectionColumn(o)||(e instanceof Object?e.field===o.field:e===o.field)).length>0||!o.switchable}getCookies(){const o=this,e={};return $.each(UtilsCookie.cookieIds,(t,i)=>{e[t]=UtilsCookie.getCookie(o,o.options.cookieIdTable,i),"columns"===t&&(e[t]=JSON.parse(e[t]))}),e}deleteCookie(o){""!==o&&UtilsCookie.cookieEnabled()&&UtilsCookie.deleteCookie(this,this.options.cookieIdTable,UtilsCookie.cookieIds[o])}};
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function o(t,e){return t(e={exports:{}},e.exports),e.exports}var r=function(t){return t&&t.Math==Math&&t},n=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof e&&e)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},a=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,s=Object.getOwnPropertyDescriptor,l={f:s&&!c.call({1:2},1)?function(t){var e=s(this,t);return!!e&&e.enumerable}:c},u=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},f={}.toString,p=function(t){return f.call(t).slice(8,-1)},h="".split,g=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?h.call(t,""):Object(t)}:Object,d=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},y=function(t){return g(d(t))},v=function(t){return"object"==typeof t?null!==t:"function"==typeof t},b=function(t,e){if(!v(t))return t;var o,r;if(e&&"function"==typeof(o=t.toString)&&!v(r=o.call(t)))return r;if("function"==typeof(o=t.valueOf)&&!v(r=o.call(t)))return r;if(!e&&"function"==typeof(o=t.toString)&&!v(r=o.call(t)))return r;throw TypeError("Can't convert object to primitive value")},m={}.hasOwnProperty,k=function(t,e){return m.call(t,e)},S=n.document,C=v(S)&&v(S.createElement),w=function(t){return C?S.createElement(t):{}},x=!a&&!i((function(){return 7!=Object.defineProperty(w("div"),"a",{get:function(){return 7}}).a})),O=Object.getOwnPropertyDescriptor,E={f:a?O:function(t,e){if(t=y(t),e=b(e,!0),x)try{return O(t,e)}catch(t){}if(k(t,e))return u(!l.f.call(t,e),t[e])}},I=function(t){if(!v(t))throw TypeError(String(t)+" is not an object");return t},T=Object.defineProperty,j={f:a?T:function(t,e,o){if(I(t),e=b(e,!0),I(o),x)try{return T(t,e,o)}catch(t){}if("get"in o||"set"in o)throw TypeError("Accessors not supported");return"value"in o&&(t[e]=o.value),t}},P=a?function(t,e,o){return j.f(t,e,u(1,o))}:function(t,e,o){return t[e]=o,t},A=function(t,e){try{P(n,t,e)}catch(o){n[t]=e}return e},N="__core-js_shared__",L=n[N]||A(N,{}),R=Function.toString;"function"!=typeof L.inspectSource&&(L.inspectSource=function(t){return R.call(t)});var _,D,M,G=L.inspectSource,B=n.WeakMap,V="function"==typeof B&&/native code/.test(G(B)),$=o((function(t){(t.exports=function(t,e){return L[t]||(L[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),F=0,J=Math.random(),U=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++F+J).toString(36)},z=$("keys"),H=function(t){return z[t]||(z[t]=U(t))},q={},K=n.WeakMap;if(V){var W=new K,Y=W.get,Q=W.has,X=W.set;_=function(t,e){return X.call(W,t,e),e},D=function(t){return Y.call(W,t)||{}},M=function(t){return Q.call(W,t)}}else{var Z=H("state");q[Z]=!0,_=function(t,e){return P(t,Z,e),e},D=function(t){return k(t,Z)?t[Z]:{}},M=function(t){return k(t,Z)}}var tt,et={set:_,get:D,has:M,enforce:function(t){return M(t)?D(t):_(t,{})},getterFor:function(t){return function(e){var o;if(!v(e)||(o=D(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return o}}},ot=o((function(t){var e=et.get,o=et.enforce,r=String(String).split("String");(t.exports=function(t,e,i,a){var c=!!a&&!!a.unsafe,s=!!a&&!!a.enumerable,l=!!a&&!!a.noTargetGet;"function"==typeof i&&("string"!=typeof e||k(i,"name")||P(i,"name",e),o(i).source=r.join("string"==typeof e?e:"")),t!==n?(c?!l&&t[e]&&(s=!0):delete t[e],s?t[e]=i:P(t,e,i)):s?t[e]=i:A(e,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||G(this)}))})),rt=n,nt=function(t){return"function"==typeof t?t:void 0},it=function(t,e){return arguments.length<2?nt(rt[t])||nt(n[t]):rt[t]&&rt[t][e]||n[t]&&n[t][e]},at=Math.ceil,ct=Math.floor,st=function(t){return isNaN(t=+t)?0:(t>0?ct:at)(t)},lt=Math.min,ut=function(t){return t>0?lt(st(t),9007199254740991):0},ft=Math.max,pt=Math.min,ht=function(t){return function(e,o,r){var n,i=y(e),a=ut(i.length),c=function(t,e){var o=st(t);return o<0?ft(o+e,0):pt(o,e)}(r,a);if(t&&o!=o){for(;a>c;)if((n=i[c++])!=n)return!0}else for(;a>c;c++)if((t||c in i)&&i[c]===o)return t||c||0;return!t&&-1}},gt={includes:ht(!0),indexOf:ht(!1)}.indexOf,dt=function(t,e){var o,r=y(t),n=0,i=[];for(o in r)!k(q,o)&&k(r,o)&&i.push(o);for(;e.length>n;)k(r,o=e[n++])&&(~gt(i,o)||i.push(o));return i},yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],vt=yt.concat("length","prototype"),bt={f:Object.getOwnPropertyNames||function(t){return dt(t,vt)}},mt={f:Object.getOwnPropertySymbols},kt=it("Reflect","ownKeys")||function(t){var e=bt.f(I(t)),o=mt.f;return o?e.concat(o(t)):e},St=function(t,e){for(var o=kt(e),r=j.f,n=E.f,i=0;i<o.length;i++){var a=o[i];k(t,a)||r(t,a,n(e,a))}},Ct=/#|\.prototype\./,wt=function(t,e){var o=Ot[xt(t)];return o==It||o!=Et&&("function"==typeof e?i(e):!!e)},xt=wt.normalize=function(t){return String(t).replace(Ct,".").toLowerCase()},Ot=wt.data={},Et=wt.NATIVE="N",It=wt.POLYFILL="P",Tt=wt,jt=E.f,Pt=function(t,e){var o,r,i,a,c,s=t.target,l=t.global,u=t.stat;if(o=l?n:u?n[s]||A(s,{}):(n[s]||{}).prototype)for(r in e){if(a=e[r],i=t.noTargetGet?(c=jt(o,r))&&c.value:o[r],!Tt(l?r:s+(u?".":"#")+r,t.forced)&&void 0!==i){if(typeof a==typeof i)continue;St(a,i)}(t.sham||i&&i.sham)&&P(a,"sham",!0),ot(o,r,a,t)}},At=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Nt=At&&!Symbol.sham&&"symbol"==typeof Symbol(),Lt=Array.isArray||function(t){return"Array"==p(t)},Rt=function(t){return Object(d(t))},_t=Object.keys||function(t){return dt(t,yt)},Dt=a?Object.defineProperties:function(t,e){I(t);for(var o,r=_t(e),n=r.length,i=0;n>i;)j.f(t,o=r[i++],e[o]);return t},Mt=it("document","documentElement"),Gt=H("IE_PROTO"),Bt=function(){},Vt=function(t){return"<script>"+t+"</"+"script>"},$t=function(){try{tt=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;$t=tt?function(t){t.write(Vt("")),t.close();var e=t.parentWindow.Object;return t=null,e}(tt):((e=w("iframe")).style.display="none",Mt.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(Vt("document.F=Object")),t.close(),t.F);for(var o=yt.length;o--;)delete $t.prototype[yt[o]];return $t()};q[Gt]=!0;var Ft=Object.create||function(t,e){var o;return null!==t?(Bt.prototype=I(t),o=new Bt,Bt.prototype=null,o[Gt]=t):o=$t(),void 0===e?o:Dt(o,e)},Jt=bt.f,Ut={}.toString,zt="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Ht={f:function(t){return zt&&"[object Window]"==Ut.call(t)?function(t){try{return Jt(t)}catch(t){return zt.slice()}}(t):Jt(y(t))}},qt=$("wks"),Kt=n.Symbol,Wt=Nt?Kt:U,Yt=function(t){return k(qt,t)||(At&&k(Kt,t)?qt[t]=Kt[t]:qt[t]=Wt("Symbol."+t)),qt[t]},Qt={f:Yt},Xt=j.f,Zt=function(t){var e=rt.Symbol||(rt.Symbol={});k(e,t)||Xt(e,t,{value:Qt.f(t)})},te=j.f,ee=Yt("toStringTag"),oe=function(t,e,o){t&&!k(t=o?t:t.prototype,ee)&&te(t,ee,{configurable:!0,value:e})},re=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},ne=Yt("species"),ie=function(t,e){var o;return Lt(t)&&("function"!=typeof(o=t.constructor)||o!==Array&&!Lt(o.prototype)?v(o)&&null===(o=o[ne])&&(o=void 0):o=void 0),new(void 0===o?Array:o)(0===e?0:e)},ae=[].push,ce=function(t){var e=1==t,o=2==t,r=3==t,n=4==t,i=6==t,a=5==t||i;return function(c,s,l,u){for(var f,p,h=Rt(c),d=g(h),y=function(t,e,o){if(re(t),void 0===e)return t;switch(o){case 0:return function(){return t.call(e)};case 1:return function(o){return t.call(e,o)};case 2:return function(o,r){return t.call(e,o,r)};case 3:return function(o,r,n){return t.call(e,o,r,n)}}return function(){return t.apply(e,arguments)}}(s,l,3),v=ut(d.length),b=0,m=u||ie,k=e?m(c,v):o?m(c,0):void 0;v>b;b++)if((a||b in d)&&(p=y(f=d[b],b,h),t))if(e)k[b]=p;else if(p)switch(t){case 3:return!0;case 5:return f;case 6:return b;case 2:ae.call(k,f)}else if(n)return!1;return i?-1:r||n?n:k}},se={forEach:ce(0),map:ce(1),filter:ce(2),some:ce(3),every:ce(4),find:ce(5),findIndex:ce(6)},le=se.forEach,ue=H("hidden"),fe="Symbol",pe=Yt("toPrimitive"),he=et.set,ge=et.getterFor(fe),de=Object.prototype,ye=n.Symbol,ve=it("JSON","stringify"),be=E.f,me=j.f,ke=Ht.f,Se=l.f,Ce=$("symbols"),we=$("op-symbols"),xe=$("string-to-symbol-registry"),Oe=$("symbol-to-string-registry"),Ee=$("wks"),Ie=n.QObject,Te=!Ie||!Ie.prototype||!Ie.prototype.findChild,je=a&&i((function(){return 7!=Ft(me({},"a",{get:function(){return me(this,"a",{value:7}).a}})).a}))?function(t,e,o){var r=be(de,e);r&&delete de[e],me(t,e,o),r&&t!==de&&me(de,e,r)}:me,Pe=function(t,e){var o=Ce[t]=Ft(ye.prototype);return he(o,{type:fe,tag:t,description:e}),a||(o.description=e),o},Ae=At&&"symbol"==typeof ye.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof ye},Ne=function(t,e,o){t===de&&Ne(we,e,o),I(t);var r=b(e,!0);return I(o),k(Ce,r)?(o.enumerable?(k(t,ue)&&t[ue][r]&&(t[ue][r]=!1),o=Ft(o,{enumerable:u(0,!1)})):(k(t,ue)||me(t,ue,u(1,{})),t[ue][r]=!0),je(t,r,o)):me(t,r,o)},Le=function(t,e){I(t);var o=y(e),r=_t(o).concat(Me(o));return le(r,(function(e){a&&!Re.call(o,e)||Ne(t,e,o[e])})),t},Re=function(t){var e=b(t,!0),o=Se.call(this,e);return!(this===de&&k(Ce,e)&&!k(we,e))&&(!(o||!k(this,e)||!k(Ce,e)||k(this,ue)&&this[ue][e])||o)},_e=function(t,e){var o=y(t),r=b(e,!0);if(o!==de||!k(Ce,r)||k(we,r)){var n=be(o,r);return!n||!k(Ce,r)||k(o,ue)&&o[ue][r]||(n.enumerable=!0),n}},De=function(t){var e=ke(y(t)),o=[];return le(e,(function(t){k(Ce,t)||k(q,t)||o.push(t)})),o},Me=function(t){var e=t===de,o=ke(e?we:y(t)),r=[];return le(o,(function(t){!k(Ce,t)||e&&!k(de,t)||r.push(Ce[t])})),r};if(At||(ot((ye=function(){if(this instanceof ye)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=U(t),o=function(t){this===de&&o.call(we,t),k(this,ue)&&k(this[ue],e)&&(this[ue][e]=!1),je(this,e,u(1,t))};return a&&Te&&je(de,e,{configurable:!0,set:o}),Pe(e,t)}).prototype,"toString",(function(){return ge(this).tag})),l.f=Re,j.f=Ne,E.f=_e,bt.f=Ht.f=De,mt.f=Me,a&&(me(ye.prototype,"description",{configurable:!0,get:function(){return ge(this).description}}),ot(de,"propertyIsEnumerable",Re,{unsafe:!0}))),Nt||(Qt.f=function(t){return Pe(Yt(t),t)}),Pt({global:!0,wrap:!0,forced:!At,sham:!At},{Symbol:ye}),le(_t(Ee),(function(t){Zt(t)})),Pt({target:fe,stat:!0,forced:!At},{for:function(t){var e=String(t);if(k(xe,e))return xe[e];var o=ye(e);return xe[e]=o,Oe[o]=e,o},keyFor:function(t){if(!Ae(t))throw TypeError(t+" is not a symbol");if(k(Oe,t))return Oe[t]},useSetter:function(){Te=!0},useSimple:function(){Te=!1}}),Pt({target:"Object",stat:!0,forced:!At,sham:!a},{create:function(t,e){return void 0===e?Ft(t):Le(Ft(t),e)},defineProperty:Ne,defineProperties:Le,getOwnPropertyDescriptor:_e}),Pt({target:"Object",stat:!0,forced:!At},{getOwnPropertyNames:De,getOwnPropertySymbols:Me}),Pt({target:"Object",stat:!0,forced:i((function(){mt.f(1)}))},{getOwnPropertySymbols:function(t){return mt.f(Rt(t))}}),ve){var Ge=!At||i((function(){var t=ye();return"[null]"!=ve([t])||"{}"!=ve({a:t})||"{}"!=ve(Object(t))}));Pt({target:"JSON",stat:!0,forced:Ge},{stringify:function(t,e,o){for(var r,n=[t],i=1;arguments.length>i;)n.push(arguments[i++]);if(r=e,(v(e)||void 0!==t)&&!Ae(t))return Lt(e)||(e=function(t,e){if("function"==typeof r&&(e=r.call(this,t,e)),!Ae(e))return e}),n[1]=e,ve.apply(null,n)}})}ye.prototype[pe]||P(ye.prototype,pe,ye.prototype.valueOf),oe(ye,fe),q[ue]=!0;var Be=j.f,Ve=n.Symbol;if(a&&"function"==typeof Ve&&(!("description"in Ve.prototype)||void 0!==Ve().description)){var $e={},Fe=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof Fe?new Ve(t):void 0===t?Ve():Ve(t);return""===t&&($e[e]=!0),e};St(Fe,Ve);var Je=Fe.prototype=Ve.prototype;Je.constructor=Fe;var Ue=Je.toString,ze="Symbol(test)"==String(Ve("test")),He=/^Symbol\((.*)\)[^)]+$/;Be(Je,"description",{configurable:!0,get:function(){var t=v(this)?this.valueOf():this,e=Ue.call(t);if(k($e,t))return"";var o=ze?e.slice(7,-1):e.replace(He,"$1");return""===o?void 0:o}}),Pt({global:!0,forced:!0},{Symbol:Fe})}Zt("iterator");var qe,Ke,We=function(t,e,o){var r=b(e);r in t?j.f(t,r,u(0,o)):t[r]=o},Ye=it("navigator","userAgent")||"",Qe=n.process,Xe=Qe&&Qe.versions,Ze=Xe&&Xe.v8;Ze?Ke=(qe=Ze.split("."))[0]+qe[1]:Ye&&(!(qe=Ye.match(/Edge\/(\d+)/))||qe[1]>=74)&&(qe=Ye.match(/Chrome\/(\d+)/))&&(Ke=qe[1]);var to=Ke&&+Ke,eo=Yt("species"),oo=function(t){return to>=51||!i((function(){var e=[];return(e.constructor={})[eo]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},ro=Yt("isConcatSpreadable"),no=9007199254740991,io="Maximum allowed index exceeded",ao=to>=51||!i((function(){var t=[];return t[ro]=!1,t.concat()[0]!==t})),co=oo("concat"),so=function(t){if(!v(t))return!1;var e=t[ro];return void 0!==e?!!e:Lt(t)};Pt({target:"Array",proto:!0,forced:!ao||!co},{concat:function(t){var e,o,r,n,i,a=Rt(this),c=ie(a,0),s=0;for(e=-1,r=arguments.length;e<r;e++)if(so(i=-1===e?a:arguments[e])){if(s+(n=ut(i.length))>no)throw TypeError(io);for(o=0;o<n;o++,s++)o in i&&We(c,s,i[o])}else{if(s>=no)throw TypeError(io);We(c,s++,i)}return c.length=s,c}});var lo=se.filter,uo=oo("filter"),fo=uo&&!i((function(){[].filter.call({length:-1,0:1},(function(t){throw t}))}));Pt({target:"Array",proto:!0,forced:!uo||!fo},{filter:function(t){return lo(this,t,arguments.length>1?arguments[1]:void 0)}});var po=Yt("unscopables"),ho=Array.prototype;null==ho[po]&&j.f(ho,po,{configurable:!0,value:Ft(null)});var go=function(t){ho[po][t]=!0},yo=se.find,vo="find",bo=!0;vo in[]&&Array(1).find((function(){bo=!1})),Pt({target:"Array",proto:!0,forced:bo},{find:function(t){return yo(this,t,arguments.length>1?arguments[1]:void 0)}}),go(vo);var mo,ko,So,Co=!i((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),wo=H("IE_PROTO"),xo=Object.prototype,Oo=Co?Object.getPrototypeOf:function(t){return t=Rt(t),k(t,wo)?t[wo]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?xo:null},Eo=Yt("iterator"),Io=!1;[].keys&&("next"in(So=[].keys())?(ko=Oo(Oo(So)))!==Object.prototype&&(mo=ko):Io=!0),null==mo&&(mo={}),k(mo,Eo)||P(mo,Eo,(function(){return this}));var To={IteratorPrototype:mo,BUGGY_SAFARI_ITERATORS:Io},jo=To.IteratorPrototype,Po=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,o={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(o,[]),e=o instanceof Array}catch(t){}return function(o,r){return I(o),function(t){if(!v(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(r),e?t.call(o,r):o.__proto__=r,o}}():void 0),Ao=To.IteratorPrototype,No=To.BUGGY_SAFARI_ITERATORS,Lo=Yt("iterator"),Ro="keys",_o="values",Do="entries",Mo=function(){return this},Go=function(t,e,o,r,n,i,a){!function(t,e,o){var r=e+" Iterator";t.prototype=Ft(jo,{next:u(1,o)}),oe(t,r,!1)}(o,e,r);var c,s,l,f=function(t){if(t===n&&y)return y;if(!No&&t in g)return g[t];switch(t){case Ro:case _o:case Do:return function(){return new o(this,t)}}return function(){return new o(this)}},p=e+" Iterator",h=!1,g=t.prototype,d=g[Lo]||g["@@iterator"]||n&&g[n],y=!No&&d||f(n),v="Array"==e&&g.entries||d;if(v&&(c=Oo(v.call(new t)),Ao!==Object.prototype&&c.next&&(Oo(c)!==Ao&&(Po?Po(c,Ao):"function"!=typeof c[Lo]&&P(c,Lo,Mo)),oe(c,p,!0))),n==_o&&d&&d.name!==_o&&(h=!0,y=function(){return d.call(this)}),g[Lo]!==y&&P(g,Lo,y),n)if(s={values:f(_o),keys:i?y:f(Ro),entries:f(Do)},a)for(l in s)(No||h||!(l in g))&&ot(g,l,s[l]);else Pt({target:e,proto:!0,forced:No||h},s);return s},Bo="Array Iterator",Vo=et.set,$o=et.getterFor(Bo),Fo=Go(Array,"Array",(function(t,e){Vo(this,{type:Bo,target:y(t),index:0,kind:e})}),(function(){var t=$o(this),e=t.target,o=t.kind,r=t.index++;return!e||r>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==o?{value:r,done:!1}:"values"==o?{value:e[r],done:!1}:{value:[r,e[r]],done:!1}}),"values");go("keys"),go("values"),go("entries");var Jo=function(t,e){var o=[][t];return!o||!i((function(){o.call(null,e||function(){throw 1},1)}))},Uo=[].join,zo=g!=Object,Ho=Jo("join",",");Pt({target:"Array",proto:!0,forced:zo||Ho},{join:function(t){return Uo.call(y(this),void 0===t?",":t)}});var qo=se.map,Ko=oo("map"),Wo=Ko&&!i((function(){[].map.call({length:-1,0:1},(function(t){throw t}))}));Pt({target:"Array",proto:!0,forced:!Ko||!Wo},{map:function(t){return qo(this,t,arguments.length>1?arguments[1]:void 0)}});var Yo={};Yo[Yt("toStringTag")]="z";var Qo="[object z]"===String(Yo),Xo=Yt("toStringTag"),Zo="Arguments"==p(function(){return arguments}()),tr=Qo?p:function(t){var e,o,r;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(o=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),Xo))?o:Zo?p(e):"Object"==(r=p(e))&&"function"==typeof e.callee?"Arguments":r},er=Qo?{}.toString:function(){return"[object "+tr(this)+"]"};Qo||ot(Object.prototype,"toString",er,{unsafe:!0});var or=function(){var t=I(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function rr(t,e){return RegExp(t,e)}var nr,ir,ar={UNSUPPORTED_Y:i((function(){var t=rr("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:i((function(){var t=rr("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},cr=RegExp.prototype.exec,sr=String.prototype.replace,lr=cr,ur=(nr=/a/,ir=/b*/g,cr.call(nr,"a"),cr.call(ir,"a"),0!==nr.lastIndex||0!==ir.lastIndex),fr=ar.UNSUPPORTED_Y||ar.BROKEN_CARET,pr=void 0!==/()??/.exec("")[1];(ur||pr||fr)&&(lr=function(t){var e,o,r,n,i=this,a=fr&&i.sticky,c=or.call(i),s=i.source,l=0,u=t;return a&&(-1===(c=c.replace("y","")).indexOf("g")&&(c+="g"),u=String(t).slice(i.lastIndex),i.lastIndex>0&&(!i.multiline||i.multiline&&"\n"!==t[i.lastIndex-1])&&(s="(?: "+s+")",u=" "+u,l++),o=new RegExp("^(?:"+s+")",c)),pr&&(o=new RegExp("^"+s+"$(?!\\s)",c)),ur&&(e=i.lastIndex),r=cr.call(a?o:i,u),a?r?(r.input=r.input.slice(l),r[0]=r[0].slice(l),r.index=i.lastIndex,i.lastIndex+=r[0].length):i.lastIndex=0:ur&&r&&(i.lastIndex=i.global?r.index+r[0].length:e),pr&&r&&r.length>1&&sr.call(r[0],o,(function(){for(n=1;n<arguments.length-2;n++)void 0===arguments[n]&&(r[n]=void 0)})),r});var hr=lr;Pt({target:"RegExp",proto:!0,forced:/./.exec!==hr},{exec:hr});var gr="toString",dr=RegExp.prototype,yr=dr.toString,vr=i((function(){return"/a/b"!=yr.call({source:"a",flags:"b"})})),br=yr.name!=gr;(vr||br)&&ot(RegExp.prototype,gr,(function(){var t=I(this),e=String(t.source),o=t.flags;return"/"+e+"/"+String(void 0===o&&t instanceof RegExp&&!("flags"in dr)?or.call(t):o)}),{unsafe:!0});var mr=function(t){return function(e,o){var r,n,i=String(d(e)),a=st(o),c=i.length;return a<0||a>=c?t?"":void 0:(r=i.charCodeAt(a))<55296||r>56319||a+1===c||(n=i.charCodeAt(a+1))<56320||n>57343?t?i.charAt(a):r:t?i.slice(a,a+2):n-56320+(r-55296<<10)+65536}},kr={codeAt:mr(!1),charAt:mr(!0)},Sr=kr.charAt,Cr="String Iterator",wr=et.set,xr=et.getterFor(Cr);Go(String,"String",(function(t){wr(this,{type:Cr,string:String(t),index:0})}),(function(){var t,e=xr(this),o=e.string,r=e.index;return r>=o.length?{value:void 0,done:!0}:(t=Sr(o,r),e.index+=t.length,{value:t,done:!1})}));var Or=Yt("species"),Er=!i((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),Ir="$0"==="a".replace(/./,"$0"),Tr=!i((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var o="ab".split(t);return 2!==o.length||"a"!==o[0]||"b"!==o[1]})),jr=function(t,e,o,r){var n=Yt(t),a=!i((function(){var e={};return e[n]=function(){return 7},7!=""[t](e)})),c=a&&!i((function(){var e=!1,o=/a/;return"split"===t&&((o={}).constructor={},o.constructor[Or]=function(){return o},o.flags="",o[n]=/./[n]),o.exec=function(){return e=!0,null},o[n](""),!e}));if(!a||!c||"replace"===t&&(!Er||!Ir)||"split"===t&&!Tr){var s=/./[n],l=o(n,""[t],(function(t,e,o,r,n){return e.exec===hr?a&&!n?{done:!0,value:s.call(e,o,r)}:{done:!0,value:t.call(o,e,r)}:{done:!1}}),{REPLACE_KEEPS_$0:Ir}),u=l[0],f=l[1];ot(String.prototype,t,u),ot(RegExp.prototype,n,2==e?function(t,e){return f.call(t,this,e)}:function(t){return f.call(t,this)})}r&&P(RegExp.prototype[n],"sham",!0)},Pr=kr.charAt,Ar=function(t,e,o){return e+(o?Pr(t,e).length:1)},Nr=function(t,e){var o=t.exec;if("function"==typeof o){var r=o.call(t,e);if("object"!=typeof r)throw TypeError("RegExp exec method returned something other than an Object or null");return r}if("RegExp"!==p(t))throw TypeError("RegExp#exec called on incompatible receiver");return hr.call(t,e)},Lr=Math.max,Rr=Math.min,_r=Math.floor,Dr=/\$([$&'`]|\d\d?|<[^>]*>)/g,Mr=/\$([$&'`]|\d\d?)/g;jr("replace",2,(function(t,e,o,r){return[function(o,r){var n=d(this),i=null==o?void 0:o[t];return void 0!==i?i.call(o,n,r):e.call(String(n),o,r)},function(t,i){if(r.REPLACE_KEEPS_$0||"string"==typeof i&&-1===i.indexOf("$0")){var a=o(e,t,this,i);if(a.done)return a.value}var c=I(t),s=String(this),l="function"==typeof i;l||(i=String(i));var u=c.global;if(u){var f=c.unicode;c.lastIndex=0}for(var p=[];;){var h=Nr(c,s);if(null===h)break;if(p.push(h),!u)break;""===String(h[0])&&(c.lastIndex=Ar(s,ut(c.lastIndex),f))}for(var g,d="",y=0,v=0;v<p.length;v++){h=p[v];for(var b=String(h[0]),m=Lr(Rr(st(h.index),s.length),0),k=[],S=1;S<h.length;S++)k.push(void 0===(g=h[S])?g:String(g));var C=h.groups;if(l){var w=[b].concat(k,m,s);void 0!==C&&w.push(C);var x=String(i.apply(void 0,w))}else x=n(b,s,m,k,C,i);m>=y&&(d+=s.slice(y,m)+x,y=m+b.length)}return d+s.slice(y)}];function n(t,o,r,n,i,a){var c=r+t.length,s=n.length,l=Mr;return void 0!==i&&(i=Rt(i),l=Dr),e.call(a,l,(function(e,a){var l;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return o.slice(0,r);case"'":return o.slice(c);case"<":l=i[a.slice(1,-1)];break;default:var u=+a;if(0===u)return e;if(u>s){var f=_r(u/10);return 0===f?e:f<=s?void 0===n[f-1]?a.charAt(1):n[f-1]+a.charAt(1):e}l=n[u-1]}return void 0===l?"":l}))}}));var Gr=Object.is||function(t,e){return t===e?0!==t||1/t==1/e:t!=t&&e!=e};jr("search",1,(function(t,e,o){return[function(e){var o=d(this),r=null==e?void 0:e[t];return void 0!==r?r.call(e,o):new RegExp(e)[t](String(o))},function(t){var r=o(e,t,this);if(r.done)return r.value;var n=I(t),i=String(this),a=n.lastIndex;Gr(a,0)||(n.lastIndex=0);var c=Nr(n,i);return Gr(n.lastIndex,a)||(n.lastIndex=a),null===c?-1:c.index}]}));var Br=Yt("match"),Vr=Yt("species"),$r=[].push,Fr=Math.min,Jr=4294967295,Ur=!i((function(){return!RegExp(Jr,"y")}));jr("split",2,(function(t,e,o){var r;return r="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,o){var r,n,i=String(d(this)),a=void 0===o?Jr:o>>>0;if(0===a)return[];if(void 0===t)return[i];if(!v(r=t)||!(void 0!==(n=r[Br])?n:"RegExp"==p(r)))return e.call(i,t,a);for(var c,s,l,u=[],f=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),h=0,g=new RegExp(t.source,f+"g");(c=hr.call(g,i))&&!((s=g.lastIndex)>h&&(u.push(i.slice(h,c.index)),c.length>1&&c.index<i.length&&$r.apply(u,c.slice(1)),l=c[0].length,h=s,u.length>=a));)g.lastIndex===c.index&&g.lastIndex++;return h===i.length?!l&&g.test("")||u.push(""):u.push(i.slice(h)),u.length>a?u.slice(0,a):u}:"0".split(void 0,0).length?function(t,o){return void 0===t&&0===o?[]:e.call(this,t,o)}:e,[function(e,o){var n=d(this),i=null==e?void 0:e[t];return void 0!==i?i.call(e,n,o):r.call(String(n),e,o)},function(t,n){var i=o(r,t,this,n,r!==e);if(i.done)return i.value;var a=I(t),c=String(this),s=function(t,e){var o,r=I(t).constructor;return void 0===r||null==(o=I(r)[Vr])?e:re(o)}(a,RegExp),l=a.unicode,u=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(Ur?"y":"g"),f=new s(Ur?a:"^(?:"+a.source+")",u),p=void 0===n?Jr:n>>>0;if(0===p)return[];if(0===c.length)return null===Nr(f,c)?[c]:[];for(var h=0,g=0,d=[];g<c.length;){f.lastIndex=Ur?g:0;var y,v=Nr(f,Ur?c:c.slice(g));if(null===v||(y=Fr(ut(f.lastIndex+(Ur?0:g)),c.length))===h)g=Ar(c,g,l);else{if(d.push(c.slice(h,g)),d.length===p)return d;for(var b=1;b<=v.length-1;b++)if(d.push(v[b]),d.length===p)return d;g=h=y}}return d.push(c.slice(h)),d}]}),!Ur);var zr={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},Hr=se.forEach,qr=Jo("forEach")?function(t){return Hr(this,t,arguments.length>1?arguments[1]:void 0)}:[].forEach;for(var Kr in zr){var Wr=n[Kr],Yr=Wr&&Wr.prototype;if(Yr&&Yr.forEach!==qr)try{P(Yr,"forEach",qr)}catch(t){Yr.forEach=qr}}var Qr=Yt("iterator"),Xr=Yt("toStringTag"),Zr=Fo.values;for(var tn in zr){var en=n[tn],on=en&&en.prototype;if(on){if(on[Qr]!==Zr)try{P(on,Qr,Zr)}catch(t){on[Qr]=Zr}if(on[Xr]||P(on,Xr,tn),zr[tn])for(var rn in Fo)if(on[rn]!==Fo[rn])try{P(on,rn,Fo[rn])}catch(t){on[rn]=Fo[rn]}}}function nn(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function an(t,e){for(var o=0;o<e.length;o++){var r=e[o];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function cn(t){return(cn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function sn(t,e){return(sn=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function ln(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function un(t,e,o){return(un="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,o){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=cn(t)););return t}(t,e);if(r){var n=Object.getOwnPropertyDescriptor(r,e);return n.get?n.get.call(o):n.value}})(t,e,o||t)}var fn=t.fn.bootstrapTable.utils,pn={cookieIds:{sortOrder:"bs.table.sortOrder",sortName:"bs.table.sortName",pageNumber:"bs.table.pageNumber",pageList:"bs.table.pageList",columns:"bs.table.columns",searchText:"bs.table.searchText",reorderColumns:"bs.table.reorderColumns",filterControl:"bs.table.filterControl",filterBy:"bs.table.filterBy"},getCurrentHeader:function(t){var e=t.$header;return t.options.height&&(e=t.$tableHeader),e},getCurrentSearchControls:function(t){var e="select, input";return t.options.height&&(e="table select, table input"),e},cookieEnabled:function(){return!!navigator.cookieEnabled},inArrayCookiesEnabled:function(t,e){for(var o=-1,r=0;r<e.length;r++)if(t.toLowerCase()===e[r].toLowerCase()){o=r;break}return o},setCookie:function(t,e,o){if(t.options.cookie&&pn.cookieEnabled()&&""!==t.options.cookieIdTable&&-1!==pn.inArrayCookiesEnabled(e,t.options.cookiesEnabled)){switch(e="".concat(t.options.cookieIdTable,".").concat(e),t.options.cookieStorage){case"cookieStorage":document.cookie=[e,"=",encodeURIComponent(o),"; expires=".concat(pn.calculateExpiration(t.options.cookieExpire)),t.options.cookiePath?"; path=".concat(t.options.cookiePath):"",t.options.cookieDomain?"; domain=".concat(t.options.cookieDomain):"",t.options.cookieSecure?"; secure":"",";SameSite="+t.options.cookieSameSite].join("");break;case"localStorage":localStorage.setItem(e,o);break;case"sessionStorage":sessionStorage.setItem(e,o);break;case"customStorage":if(!t.options.cookieCustomStorageSet||!t.options.cookieCustomStorageGet||!t.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");fn.calculateObjectValue(t.options,t.options.cookieCustomStorageSet,[e,o],"");break;default:return!1}return!0}},getCookie:function(t,e,o){if(!o)return null;if(-1===pn.inArrayCookiesEnabled(o,t.options.cookiesEnabled))return null;switch(o="".concat(e,".").concat(o),t.options.cookieStorage){case"cookieStorage":var r="; ".concat(document.cookie).split("; ".concat(o,"="));return 2===r.length?decodeURIComponent(r.pop().split(";").shift()):null;case"localStorage":return localStorage.getItem(o);case"sessionStorage":return sessionStorage.getItem(o);case"customStorage":if(!t.options.cookieCustomStorageSet||!t.options.cookieCustomStorageGet||!t.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");return fn.calculateObjectValue(t.options,t.options.cookieCustomStorageGet,[o],"");default:return null}},deleteCookie:function(t,e,o){switch(o="".concat(e,".").concat(o),t.options.cookieStorage){case"cookieStorage":document.cookie=[encodeURIComponent(o),"=","; expires=Thu, 01 Jan 1970 00:00:00 GMT",t.options.cookiePath?"; path=".concat(t.options.cookiePath):"",t.options.cookieDomain?"; domain=".concat(t.options.cookieDomain):""].join("");break;case"localStorage":localStorage.removeItem(o);break;case"sessionStorage":sessionStorage.removeItem(o);break;case"customStorage":if(!t.options.cookieCustomStorageSet||!t.options.cookieCustomStorageGet||!t.options.cookieCustomStorageDelete)throw new Error("The following options must be set while using the customStorage: cookieCustomStorageSet, cookieCustomStorageGet and cookieCustomStorageDelete");fn.calculateObjectValue(t.options,t.options.cookieCustomStorageDelete,[o],"");break;default:return!1}return!0},calculateExpiration:function(t){var e=t.replace(/[0-9]*/,"");switch(t=t.replace(/[A-Za-z]{1,2}/,""),e.toLowerCase()){case"s":t=+t;break;case"mi":t*=60;break;case"h":t=60*t*60;break;case"d":t=24*t*60*60;break;case"m":t=30*t*24*60*60;break;case"y":t=365*t*24*60*60;break;default:t=void 0}if(!t)return"";var o=new Date;return o.setTime(o.getTime()+1e3*t),o.toGMTString()},initCookieFilters:function(e){setTimeout((function(){var o=JSON.parse(pn.getCookie(e,e.options.cookieIdTable,pn.cookieIds.filterControl));if(!e.options.filterControlValuesLoaded&&o){var r={},n=pn.getCurrentHeader(e),i=pn.getCurrentSearchControls(e),a=n;e.options.filterControlContainer&&(a=t("".concat(e.options.filterControlContainer))),a.find(i).each((function(){var n=t(this).closest("[data-field]").data("field");!function(t,o){o.forEach((function(o){if(""!==o.text&&("radio"!==t.type||t.value.toString()===o.text.toString()))if("INPUT"===t.tagName&&"radio"===t.type&&t.value.toString()===o.text.toString())t.checked=!0,r[o.field]=o.text;else if("INPUT"===t.tagName)t.value=o.text,r[o.field]=o.text;else if("SELECT"===t.tagName&&e.options.filterControlContainer)t.value=o.text,r[o.field]=o.text;else if(""!==o.text&&"SELECT"===t.tagName){for(var n=0;n<t.length;n++){var i=t[n];if(i.value===o.text)return void(i.selected=!0)}var a=document.createElement("option");a.value=o.text,a.text=o.text,t.add(a,t[1]),t.selectedIndex=1,r[o.field]=o.text}}))}(this,o.filter((function(t){return t.field===n})))})),e.initColumnSearch(r),e.options.filterControlValuesLoaded=!0,e.initServer()}}),250)}};t.extend(t.fn.bootstrapTable.defaults,{cookie:!1,cookieExpire:"2h",cookiePath:null,cookieDomain:null,cookieSecure:null,cookieSameSite:"Lax",cookieIdTable:"",cookiesEnabled:["bs.table.sortOrder","bs.table.sortName","bs.table.pageNumber","bs.table.pageList","bs.table.columns","bs.table.searchText","bs.table.filterControl","bs.table.filterBy","bs.table.reorderColumns"],cookieStorage:"cookieStorage",cookieCustomStorageGet:null,cookieCustomStorageSet:null,cookieCustomStorageDelete:null,filterControls:[],filterControlValuesLoaded:!1}),t.fn.bootstrapTable.methods.push("getCookies"),t.fn.bootstrapTable.methods.push("deleteCookie"),t.extend(t.fn.bootstrapTable.utils,{setCookie:pn.setCookie,getCookie:pn.getCookie}),t.BootstrapTable=function(e){function o(){return nn(this,o),ln(this,cn(o).apply(this,arguments))}var r,n,i;return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&sn(t,e)}(o,e),r=o,(n=[{key:"init",value:function(){if(this.options.cookie){var t=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.filterBy);if("boolean"==typeof t&&!t)throw new Error("The cookie value of filterBy must be a json!");var e={};try{e=JSON.parse(t)}catch(t){throw new Error("Could not parse the json of the filterBy cookie!")}if(this.filterColumns=e||{},this.options.filterControls=[],this.options.filterControlValuesLoaded=!1,this.options.cookiesEnabled="string"==typeof this.options.cookiesEnabled?this.options.cookiesEnabled.replace("[","").replace("]","").replace(/'/g,"").replace(/ /g,"").toLowerCase().split(","):this.options.cookiesEnabled,this.options.filterControl){var r=this;this.$el.on("column-search.bs.table",(function(t,e,o){for(var n=!0,i=0;i<r.options.filterControls.length;i++)if(r.options.filterControls[i].field===e){r.options.filterControls[i].text=o,n=!1;break}n&&r.options.filterControls.push({field:e,text:o}),pn.setCookie(r,pn.cookieIds.filterControl,JSON.stringify(r.options.filterControls))})).on("created-controls.bs.table",pn.initCookieFilters(r))}}un(cn(o.prototype),"init",this).call(this)}},{key:"initServer",value:function(){var t;if(this.options.cookie&&this.options.filterControl&&!this.options.filterControlValuesLoaded){var e=JSON.parse(pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.filterControl));if(e)return}for(var r=arguments.length,n=new Array(r),i=0;i<r;i++)n[i]=arguments[i];(t=un(cn(o.prototype),"initServer",this)).call.apply(t,[this].concat(n))}},{key:"initTable",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"initTable",this)).call.apply(t,[this].concat(r)),this.initCookie()}},{key:"onSort",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"onSort",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.sortOrder,this.options.sortOrder),pn.setCookie(this,pn.cookieIds.sortName,this.options.sortName)}},{key:"onPageNumber",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"onPageNumber",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.pageNumber,this.options.pageNumber)}},{key:"onPageListChange",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"onPageListChange",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.pageList,this.options.pageSize),pn.setCookie(this,pn.cookieIds.pageNumber,this.options.pageNumber)}},{key:"onPagePre",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"onPagePre",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.pageNumber,this.options.pageNumber)}},{key:"onPageNext",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"onPageNext",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.pageNumber,this.options.pageNumber)}},{key:"_toggleColumn",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"_toggleColumn",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.columns,JSON.stringify(this.getVisibleColumns().map((function(t){return t.field}))))}},{key:"_toggleAllColumns",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"_toggleAllColumns",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.columns,JSON.stringify(this.getVisibleColumns().map((function(t){return t.field}))))}},{key:"selectPage",value:function(t){un(cn(o.prototype),"selectPage",this).call(this,t),pn.setCookie(this,pn.cookieIds.pageNumber,t)}},{key:"onSearch",value:function(t){un(cn(o.prototype),"onSearch",this).call(this,t),this.options.search&&pn.setCookie(this,pn.cookieIds.searchText,this.searchText),pn.setCookie(this,pn.cookieIds.pageNumber,this.options.pageNumber)}},{key:"initHeader",value:function(){var t;this.options.reorderableColumns&&(this.columnsSortOrder=JSON.parse(pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.reorderColumns)));for(var e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"initHeader",this)).call.apply(t,[this].concat(r))}},{key:"persistReorderColumnsState",value:function(t){pn.setCookie(t,pn.cookieIds.reorderColumns,JSON.stringify(t.columnsSortOrder))}},{key:"filterBy",value:function(){for(var t,e=arguments.length,r=new Array(e),n=0;n<e;n++)r[n]=arguments[n];(t=un(cn(o.prototype),"filterBy",this)).call.apply(t,[this].concat(r)),pn.setCookie(this,pn.cookieIds.filterBy,JSON.stringify(this.filterColumns))}},{key:"initCookie",value:function(){var t=this;if(this.options.cookie){if(""===this.options.cookieIdTable||""===this.options.cookieExpire||!pn.cookieEnabled())return console.error("Configuration error. Please review the cookieIdTable and the cookieExpire property. If the properties are correct, then this browser does not support cookies."),void(this.options.cookie=!1);var e=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.sortOrder),o=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.sortName),r=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.pageNumber),n=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.pageList),i=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.searchText),a=pn.getCookie(this,this.options.cookieIdTable,pn.cookieIds.columns);if("boolean"==typeof a&&!a)throw new Error("The cookie value of filterBy must be a json!");var c={};try{c=JSON.parse(a)}catch(t){throw new Error("Could not parse the json of the columns cookie!",a)}if(this.options.sortOrder=e||this.options.sortOrder,this.options.sortName=o||this.options.sortName,this.options.pageNumber=r?+r:this.options.pageNumber,this.options.pageSize=n?n===this.options.formatAllRows()?n:+n:this.options.pageSize,this.options.searchText=i||"",c){var s=!0,l=!1,u=void 0;try{for(var f,p=function(){var e=f.value;e.visible=c.filter((function(o){return!!t.isSelectionColumn(e)||(o instanceof Object?o.field===e.field:o===e.field)})).length>0||!e.switchable},h=this.columns[Symbol.iterator]();!(s=(f=h.next()).done);s=!0)p()}catch(t){l=!0,u=t}finally{try{s||null==h.return||h.return()}finally{if(l)throw u}}}}}},{key:"getCookies",value:function(){var e=this,o={};return t.each(pn.cookieIds,(function(t,r){o[t]=pn.getCookie(e,e.options.cookieIdTable,r),"columns"===t&&(o[t]=JSON.parse(o[t]))})),o}},{key:"deleteCookie",value:function(t){""!==t&&pn.cookieEnabled()&&pn.deleteCookie(this,this.options.cookieIdTable,pn.cookieIds[t])}}])&&an(r.prototype,n),i&&an(r,i),o}(t.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table-export.min.js b/web/skins/classic/js/bootstrap-table-export.min.js
index 44d05ba4c..cefc8d0a4 100644
--- a/web/skins/classic/js/bootstrap-table-export.min.js
+++ b/web/skins/classic/js/bootstrap-table-export.min.js
@@ -1,10 +1,10 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.17.1
+  * @version v1.18.0
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT
   */
 
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function n(t,e){return t(e={exports:{}},e.exports),e.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof e&&e)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},a=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,u=Object.getOwnPropertyDescriptor,l={f:u&&!c.call({1:2},1)?function(t){var e=u(this,t);return!!e&&e.enumerable}:c},s=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},f={}.toString,p=function(t){return f.call(t).slice(8,-1)},d="".split,h=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?d.call(t,""):Object(t)}:Object,g=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},y=function(t){return h(g(t))},v=function(t){return"object"==typeof t?null!==t:"function"==typeof t},b=function(t,e){if(!v(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!v(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!v(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!v(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")},x={}.hasOwnProperty,m=function(t,e){return x.call(t,e)},S=o.document,w=v(S)&&v(S.createElement),O=function(t){return w?S.createElement(t):{}},E=!a&&!i((function(){return 7!=Object.defineProperty(O("div"),"a",{get:function(){return 7}}).a})),T=Object.getOwnPropertyDescriptor,j={f:a?T:function(t,e){if(t=y(t),e=b(e,!0),E)try{return T(t,e)}catch(t){}if(m(t,e))return s(!l.f.call(t,e),t[e])}},P=function(t){if(!v(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,I={f:a?A:function(t,e,n){if(P(t),e=b(e,!0),P(n),E)try{return A(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},_=a?function(t,e,n){return I.f(t,e,s(1,n))}:function(t,e,n){return t[e]=n,t},R=function(t,e){try{_(o,t,e)}catch(n){o[t]=e}return e},C=o["__core-js_shared__"]||R("__core-js_shared__",{}),L=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return L.call(t)});var k,M,$,D=C.inspectSource,N=o.WeakMap,F="function"==typeof N&&/native code/.test(D(N)),B=n((function(t){(t.exports=function(t,e){return C[t]||(C[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,V=Math.random(),H=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+V).toString(36)},q=B("keys"),z=function(t){return q[t]||(q[t]=H(t))},U={},W=o.WeakMap;if(F){var K=new W,Y=K.get,X=K.has,J=K.set;k=function(t,e){return J.call(K,t,e),e},M=function(t){return Y.call(K,t)||{}},$=function(t){return X.call(K,t)}}else{var Q=z("state");U[Q]=!0,k=function(t,e){return _(t,Q,e),e},M=function(t){return m(t,Q)?t[Q]:{}},$=function(t){return m(t,Q)}}var Z,tt={set:k,get:M,has:$,enforce:function(t){return $(t)?M(t):k(t,{})},getterFor:function(t){return function(e){var n;if(!v(e)||(n=M(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}},et=n((function(t){var e=tt.get,n=tt.enforce,r=String(String).split("String");(t.exports=function(t,e,i,a){var c=!!a&&!!a.unsafe,u=!!a&&!!a.enumerable,l=!!a&&!!a.noTargetGet;"function"==typeof i&&("string"!=typeof e||m(i,"name")||_(i,"name",e),n(i).source=r.join("string"==typeof e?e:"")),t!==o?(c?!l&&t[e]&&(u=!0):delete t[e],u?t[e]=i:_(t,e,i)):u?t[e]=i:R(e,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||D(this)}))})),nt=o,rt=function(t){return"function"==typeof t?t:void 0},ot=function(t,e){return arguments.length<2?rt(nt[t])||rt(o[t]):nt[t]&&nt[t][e]||o[t]&&o[t][e]},it=Math.ceil,at=Math.floor,ct=function(t){return isNaN(t=+t)?0:(t>0?at:it)(t)},ut=Math.min,lt=function(t){return t>0?ut(ct(t),9007199254740991):0},st=Math.max,ft=Math.min,pt=function(t,e){var n=ct(t);return n<0?st(n+e,0):ft(n,e)},dt=function(t){return function(e,n,r){var o,i=y(e),a=lt(i.length),c=pt(r,a);if(t&&n!=n){for(;a>c;)if((o=i[c++])!=o)return!0}else for(;a>c;c++)if((t||c in i)&&i[c]===n)return t||c||0;return!t&&-1}},ht={includes:dt(!0),indexOf:dt(!1)}.indexOf,gt=function(t,e){var n,r=y(t),o=0,i=[];for(n in r)!m(U,n)&&m(r,n)&&i.push(n);for(;e.length>o;)m(r,n=e[o++])&&(~ht(i,n)||i.push(n));return i},yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],vt=yt.concat("length","prototype"),bt={f:Object.getOwnPropertyNames||function(t){return gt(t,vt)}},xt={f:Object.getOwnPropertySymbols},mt=ot("Reflect","ownKeys")||function(t){var e=bt.f(P(t)),n=xt.f;return n?e.concat(n(t)):e},St=function(t,e){for(var n=mt(e),r=I.f,o=j.f,i=0;i<n.length;i++){var a=n[i];m(t,a)||r(t,a,o(e,a))}},wt=/#|\.prototype\./,Ot=function(t,e){var n=Tt[Et(t)];return n==Pt||n!=jt&&("function"==typeof e?i(e):!!e)},Et=Ot.normalize=function(t){return String(t).replace(wt,".").toLowerCase()},Tt=Ot.data={},jt=Ot.NATIVE="N",Pt=Ot.POLYFILL="P",At=Ot,It=j.f,_t=function(t,e){var n,r,i,a,c,u=t.target,l=t.global,s=t.stat;if(n=l?o:s?o[u]||R(u,{}):(o[u]||{}).prototype)for(r in e){if(a=e[r],i=t.noTargetGet?(c=It(n,r))&&c.value:n[r],!At(l?r:u+(s?".":"#")+r,t.forced)&&void 0!==i){if(typeof a==typeof i)continue;St(a,i)}(t.sham||i&&i.sham)&&_(a,"sham",!0),et(n,r,a,t)}},Rt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Ct=Rt&&!Symbol.sham&&"symbol"==typeof Symbol(),Lt=Array.isArray||function(t){return"Array"==p(t)},kt=function(t){return Object(g(t))},Mt=Object.keys||function(t){return gt(t,yt)},$t=a?Object.defineProperties:function(t,e){P(t);for(var n,r=Mt(e),o=r.length,i=0;o>i;)I.f(t,n=r[i++],e[n]);return t},Dt=ot("document","documentElement"),Nt=z("IE_PROTO"),Ft=function(){},Bt=function(t){return"<script>"+t+"<\/script>"},Gt=function(){try{Z=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;Gt=Z?function(t){t.write(Bt("")),t.close();var e=t.parentWindow.Object;return t=null,e}(Z):((e=O("iframe")).style.display="none",Dt.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(Bt("document.F=Object")),t.close(),t.F);for(var n=yt.length;n--;)delete Gt.prototype[yt[n]];return Gt()};U[Nt]=!0;var Vt=Object.create||function(t,e){var n;return null!==t?(Ft.prototype=P(t),n=new Ft,Ft.prototype=null,n[Nt]=t):n=Gt(),void 0===e?n:$t(n,e)},Ht=bt.f,qt={}.toString,zt="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Ut={f:function(t){return zt&&"[object Window]"==qt.call(t)?function(t){try{return Ht(t)}catch(t){return zt.slice()}}(t):Ht(y(t))}},Wt=B("wks"),Kt=o.Symbol,Yt=Ct?Kt:H,Xt=function(t){return m(Wt,t)||(Rt&&m(Kt,t)?Wt[t]=Kt[t]:Wt[t]=Yt("Symbol."+t)),Wt[t]},Jt={f:Xt},Qt=I.f,Zt=function(t){var e=nt.Symbol||(nt.Symbol={});m(e,t)||Qt(e,t,{value:Jt.f(t)})},te=I.f,ee=Xt("toStringTag"),ne=function(t,e,n){t&&!m(t=n?t:t.prototype,ee)&&te(t,ee,{configurable:!0,value:e})},re=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},oe=Xt("species"),ie=function(t,e){var n;return Lt(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!Lt(n.prototype)?v(n)&&null===(n=n[oe])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===e?0:e)},ae=[].push,ce=function(t){var e=1==t,n=2==t,r=3==t,o=4==t,i=6==t,a=5==t||i;return function(c,u,l,s){for(var f,p,d=kt(c),g=h(d),y=function(t,e,n){if(re(t),void 0===e)return t;switch(n){case 0:return function(){return t.call(e)};case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}}(u,l,3),v=lt(g.length),b=0,x=s||ie,m=e?x(c,v):n?x(c,0):void 0;v>b;b++)if((a||b in g)&&(p=y(f=g[b],b,d),t))if(e)m[b]=p;else if(p)switch(t){case 3:return!0;case 5:return f;case 6:return b;case 2:ae.call(m,f)}else if(o)return!1;return i?-1:r||o?o:m}},ue={forEach:ce(0),map:ce(1),filter:ce(2),some:ce(3),every:ce(4),find:ce(5),findIndex:ce(6)},le=ue.forEach,se=z("hidden"),fe=Xt("toPrimitive"),pe=tt.set,de=tt.getterFor("Symbol"),he=Object.prototype,ge=o.Symbol,ye=ot("JSON","stringify"),ve=j.f,be=I.f,xe=Ut.f,me=l.f,Se=B("symbols"),we=B("op-symbols"),Oe=B("string-to-symbol-registry"),Ee=B("symbol-to-string-registry"),Te=B("wks"),je=o.QObject,Pe=!je||!je.prototype||!je.prototype.findChild,Ae=a&&i((function(){return 7!=Vt(be({},"a",{get:function(){return be(this,"a",{value:7}).a}})).a}))?function(t,e,n){var r=ve(he,e);r&&delete he[e],be(t,e,n),r&&t!==he&&be(he,e,r)}:be,Ie=function(t,e){var n=Se[t]=Vt(ge.prototype);return pe(n,{type:"Symbol",tag:t,description:e}),a||(n.description=e),n},_e=Rt&&"symbol"==typeof ge.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof ge},Re=function(t,e,n){t===he&&Re(we,e,n),P(t);var r=b(e,!0);return P(n),m(Se,r)?(n.enumerable?(m(t,se)&&t[se][r]&&(t[se][r]=!1),n=Vt(n,{enumerable:s(0,!1)})):(m(t,se)||be(t,se,s(1,{})),t[se][r]=!0),Ae(t,r,n)):be(t,r,n)},Ce=function(t,e){P(t);var n=y(e),r=Mt(n).concat($e(n));return le(r,(function(e){a&&!Le.call(n,e)||Re(t,e,n[e])})),t},Le=function(t){var e=b(t,!0),n=me.call(this,e);return!(this===he&&m(Se,e)&&!m(we,e))&&(!(n||!m(this,e)||!m(Se,e)||m(this,se)&&this[se][e])||n)},ke=function(t,e){var n=y(t),r=b(e,!0);if(n!==he||!m(Se,r)||m(we,r)){var o=ve(n,r);return!o||!m(Se,r)||m(n,se)&&n[se][r]||(o.enumerable=!0),o}},Me=function(t){var e=xe(y(t)),n=[];return le(e,(function(t){m(Se,t)||m(U,t)||n.push(t)})),n},$e=function(t){var e=t===he,n=xe(e?we:y(t)),r=[];return le(n,(function(t){!m(Se,t)||e&&!m(he,t)||r.push(Se[t])})),r};if(Rt||(et((ge=function(){if(this instanceof ge)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=H(t),n=function(t){this===he&&n.call(we,t),m(this,se)&&m(this[se],e)&&(this[se][e]=!1),Ae(this,e,s(1,t))};return a&&Pe&&Ae(he,e,{configurable:!0,set:n}),Ie(e,t)}).prototype,"toString",(function(){return de(this).tag})),l.f=Le,I.f=Re,j.f=ke,bt.f=Ut.f=Me,xt.f=$e,a&&(be(ge.prototype,"description",{configurable:!0,get:function(){return de(this).description}}),et(he,"propertyIsEnumerable",Le,{unsafe:!0}))),Ct||(Jt.f=function(t){return Ie(Xt(t),t)}),_t({global:!0,wrap:!0,forced:!Rt,sham:!Rt},{Symbol:ge}),le(Mt(Te),(function(t){Zt(t)})),_t({target:"Symbol",stat:!0,forced:!Rt},{for:function(t){var e=String(t);if(m(Oe,e))return Oe[e];var n=ge(e);return Oe[e]=n,Ee[n]=e,n},keyFor:function(t){if(!_e(t))throw TypeError(t+" is not a symbol");if(m(Ee,t))return Ee[t]},useSetter:function(){Pe=!0},useSimple:function(){Pe=!1}}),_t({target:"Object",stat:!0,forced:!Rt,sham:!a},{create:function(t,e){return void 0===e?Vt(t):Ce(Vt(t),e)},defineProperty:Re,defineProperties:Ce,getOwnPropertyDescriptor:ke}),_t({target:"Object",stat:!0,forced:!Rt},{getOwnPropertyNames:Me,getOwnPropertySymbols:$e}),_t({target:"Object",stat:!0,forced:i((function(){xt.f(1)}))},{getOwnPropertySymbols:function(t){return xt.f(kt(t))}}),ye){var De=!Rt||i((function(){var t=ge();return"[null]"!=ye([t])||"{}"!=ye({a:t})||"{}"!=ye(Object(t))}));_t({target:"JSON",stat:!0,forced:De},{stringify:function(t,e,n){for(var r,o=[t],i=1;arguments.length>i;)o.push(arguments[i++]);if(r=e,(v(e)||void 0!==t)&&!_e(t))return Lt(e)||(e=function(t,e){if("function"==typeof r&&(e=r.call(this,t,e)),!_e(e))return e}),o[1]=e,ye.apply(null,o)}})}ge.prototype[fe]||_(ge.prototype,fe,ge.prototype.valueOf),ne(ge,"Symbol"),U[se]=!0;var Ne=I.f,Fe=o.Symbol;if(a&&"function"==typeof Fe&&(!("description"in Fe.prototype)||void 0!==Fe().description)){var Be={},Ge=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof Ge?new Fe(t):void 0===t?Fe():Fe(t);return""===t&&(Be[e]=!0),e};St(Ge,Fe);var Ve=Ge.prototype=Fe.prototype;Ve.constructor=Ge;var He=Ve.toString,qe="Symbol(test)"==String(Fe("test")),ze=/^Symbol\((.*)\)[^)]+$/;Ne(Ve,"description",{configurable:!0,get:function(){var t=v(this)?this.valueOf():this,e=He.call(t);if(m(Be,t))return"";var n=qe?e.slice(7,-1):e.replace(ze,"$1");return""===n?void 0:n}}),_t({global:!0,forced:!0},{Symbol:Ge})}Zt("iterator");var Ue,We,Ke=function(t,e,n){var r=b(e);r in t?I.f(t,r,s(0,n)):t[r]=n},Ye=ot("navigator","userAgent")||"",Xe=o.process,Je=Xe&&Xe.versions,Qe=Je&&Je.v8;Qe?We=(Ue=Qe.split("."))[0]+Ue[1]:Ye&&(!(Ue=Ye.match(/Edge\/(\d+)/))||Ue[1]>=74)&&(Ue=Ye.match(/Chrome\/(\d+)/))&&(We=Ue[1]);var Ze=We&&+We,tn=Xt("species"),en=function(t){return Ze>=51||!i((function(){var e=[];return(e.constructor={})[tn]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},nn=Xt("isConcatSpreadable"),rn=Ze>=51||!i((function(){var t=[];return t[nn]=!1,t.concat()[0]!==t})),on=en("concat"),an=function(t){if(!v(t))return!1;var e=t[nn];return void 0!==e?!!e:Lt(t)};_t({target:"Array",proto:!0,forced:!rn||!on},{concat:function(t){var e,n,r,o,i,a=kt(this),c=ie(a,0),u=0;for(e=-1,r=arguments.length;e<r;e++)if(an(i=-1===e?a:arguments[e])){if(u+(o=lt(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(n=0;n<o;n++,u++)n in i&&Ke(c,u,i[n])}else{if(u>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Ke(c,u++,i)}return c.length=u,c}});var cn=Xt("unscopables"),un=Array.prototype;null==un[cn]&&I.f(un,cn,{configurable:!0,value:Vt(null)});var ln=function(t){un[cn][t]=!0},sn=ue.find,fn=!0;"find"in[]&&Array(1).find((function(){fn=!1})),_t({target:"Array",proto:!0,forced:fn},{find:function(t){return sn(this,t,arguments.length>1?arguments[1]:void 0)}}),ln("find");var pn,dn,hn,gn=!i((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),yn=z("IE_PROTO"),vn=Object.prototype,bn=gn?Object.getPrototypeOf:function(t){return t=kt(t),m(t,yn)?t[yn]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?vn:null},xn=Xt("iterator"),mn=!1;[].keys&&("next"in(hn=[].keys())?(dn=bn(bn(hn)))!==Object.prototype&&(pn=dn):mn=!0),null==pn&&(pn={}),m(pn,xn)||_(pn,xn,(function(){return this}));var Sn={IteratorPrototype:pn,BUGGY_SAFARI_ITERATORS:mn},wn=Sn.IteratorPrototype,On=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,n={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(n,[]),e=n instanceof Array}catch(t){}return function(n,r){return P(n),function(t){if(!v(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(r),e?t.call(n,r):n.__proto__=r,n}}():void 0),En=Sn.IteratorPrototype,Tn=Sn.BUGGY_SAFARI_ITERATORS,jn=Xt("iterator"),Pn=function(){return this},An=function(t,e,n,r,o,i,a){!function(t,e,n){var r=e+" Iterator";t.prototype=Vt(wn,{next:s(1,n)}),ne(t,r,!1)}(n,e,r);var c,u,l,f=function(t){if(t===o&&y)return y;if(!Tn&&t in h)return h[t];switch(t){case"keys":case"values":case"entries":return function(){return new n(this,t)}}return function(){return new n(this)}},p=e+" Iterator",d=!1,h=t.prototype,g=h[jn]||h["@@iterator"]||o&&h[o],y=!Tn&&g||f(o),v="Array"==e&&h.entries||g;if(v&&(c=bn(v.call(new t)),En!==Object.prototype&&c.next&&(bn(c)!==En&&(On?On(c,En):"function"!=typeof c[jn]&&_(c,jn,Pn)),ne(c,p,!0))),"values"==o&&g&&"values"!==g.name&&(d=!0,y=function(){return g.call(this)}),h[jn]!==y&&_(h,jn,y),o)if(u={values:f("values"),keys:i?y:f("keys"),entries:f("entries")},a)for(l in u)(Tn||d||!(l in h))&&et(h,l,u[l]);else _t({target:e,proto:!0,forced:Tn||d},u);return u},In=tt.set,_n=tt.getterFor("Array Iterator"),Rn=An(Array,"Array",(function(t,e){In(this,{type:"Array Iterator",target:y(t),index:0,kind:e})}),(function(){var t=_n(this),e=t.target,n=t.kind,r=t.index++;return!e||r>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==n?{value:r,done:!1}:"values"==n?{value:e[r],done:!1}:{value:[r,e[r]],done:!1}}),"values");ln("keys"),ln("values"),ln("entries");var Cn=function(t,e){var n=[][t];return!n||!i((function(){n.call(null,e||function(){throw 1},1)}))},Ln=[].join,kn=h!=Object,Mn=Cn("join",",");_t({target:"Array",proto:!0,forced:kn||Mn},{join:function(t){return Ln.call(y(this),void 0===t?",":t)}});var $n=ue.map,Dn=en("map"),Nn=Dn&&!i((function(){[].map.call({length:-1,0:1},(function(t){throw t}))}));_t({target:"Array",proto:!0,forced:!Dn||!Nn},{map:function(t){return $n(this,t,arguments.length>1?arguments[1]:void 0)}});var Fn=Xt("species"),Bn=[].slice,Gn=Math.max;_t({target:"Array",proto:!0,forced:!en("slice")},{slice:function(t,e){var n,r,o,i=y(this),a=lt(i.length),c=pt(t,a),u=pt(void 0===e?a:e,a);if(Lt(i)&&("function"!=typeof(n=i.constructor)||n!==Array&&!Lt(n.prototype)?v(n)&&null===(n=n[Fn])&&(n=void 0):n=void 0,n===Array||void 0===n))return Bn.call(i,c,u);for(r=new(void 0===n?Array:n)(Gn(u-c,0)),o=0;c<u;c++,o++)c in i&&Ke(r,o,i[c]);return r.length=o,r}});var Vn={};Vn[Xt("toStringTag")]="z";var Hn="[object z]"===String(Vn),qn=Xt("toStringTag"),zn="Arguments"==p(function(){return arguments}()),Un=Hn?p:function(t){var e,n,r;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),qn))?n:zn?p(e):"Object"==(r=p(e))&&"function"==typeof e.callee?"Arguments":r},Wn=Hn?{}.toString:function(){return"[object "+Un(this)+"]"};Hn||et(Object.prototype,"toString",Wn,{unsafe:!0});var Kn=function(){var t=P(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function Yn(t,e){return RegExp(t,e)}var Xn,Jn,Qn={UNSUPPORTED_Y:i((function(){var t=Yn("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:i((function(){var t=Yn("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},Zn=RegExp.prototype.exec,tr=String.prototype.replace,er=Zn,nr=(Xn=/a/,Jn=/b*/g,Zn.call(Xn,"a"),Zn.call(Jn,"a"),0!==Xn.lastIndex||0!==Jn.lastIndex),rr=Qn.UNSUPPORTED_Y||Qn.BROKEN_CARET,or=void 0!==/()??/.exec("")[1];(nr||or||rr)&&(er=function(t){var e,n,r,o,i=this,a=rr&&i.sticky,c=Kn.call(i),u=i.source,l=0,s=t;return a&&(-1===(c=c.replace("y","")).indexOf("g")&&(c+="g"),s=String(t).slice(i.lastIndex),i.lastIndex>0&&(!i.multiline||i.multiline&&"\n"!==t[i.lastIndex-1])&&(u="(?: "+u+")",s=" "+s,l++),n=new RegExp("^(?:"+u+")",c)),or&&(n=new RegExp("^"+u+"$(?!\\s)",c)),nr&&(e=i.lastIndex),r=Zn.call(a?n:i,s),a?r?(r.input=r.input.slice(l),r[0]=r[0].slice(l),r.index=i.lastIndex,i.lastIndex+=r[0].length):i.lastIndex=0:nr&&r&&(i.lastIndex=i.global?r.index+r[0].length:e),or&&r&&r.length>1&&tr.call(r[0],n,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(r[o]=void 0)})),r});var ir=er;_t({target:"RegExp",proto:!0,forced:/./.exec!==ir},{exec:ir});var ar=function(t){return function(e,n){var r,o,i=String(g(e)),a=ct(n),c=i.length;return a<0||a>=c?t?"":void 0:(r=i.charCodeAt(a))<55296||r>56319||a+1===c||(o=i.charCodeAt(a+1))<56320||o>57343?t?i.charAt(a):r:t?i.slice(a,a+2):o-56320+(r-55296<<10)+65536}},cr={codeAt:ar(!1),charAt:ar(!0)},ur=cr.charAt,lr=tt.set,sr=tt.getterFor("String Iterator");An(String,"String",(function(t){lr(this,{type:"String Iterator",string:String(t),index:0})}),(function(){var t,e=sr(this),n=e.string,r=e.index;return r>=n.length?{value:void 0,done:!0}:(t=ur(n,r),e.index+=t.length,{value:t,done:!1})}));var fr=Xt("species"),pr=!i((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),dr="$0"==="a".replace(/./,"$0"),hr=!i((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var n="ab".split(t);return 2!==n.length||"a"!==n[0]||"b"!==n[1]})),gr=function(t,e,n,r){var o=Xt(t),a=!i((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),c=a&&!i((function(){var e=!1,n=/a/;return"split"===t&&((n={}).constructor={},n.constructor[fr]=function(){return n},n.flags="",n[o]=/./[o]),n.exec=function(){return e=!0,null},n[o](""),!e}));if(!a||!c||"replace"===t&&(!pr||!dr)||"split"===t&&!hr){var u=/./[o],l=n(o,""[t],(function(t,e,n,r,o){return e.exec===ir?a&&!o?{done:!0,value:u.call(e,n,r)}:{done:!0,value:t.call(n,e,r)}:{done:!1}}),{REPLACE_KEEPS_$0:dr}),s=l[0],f=l[1];et(String.prototype,t,s),et(RegExp.prototype,o,2==e?function(t,e){return f.call(t,this,e)}:function(t){return f.call(t,this)})}r&&_(RegExp.prototype[o],"sham",!0)},yr=cr.charAt,vr=function(t,e,n){return e+(n?yr(t,e).length:1)},br=function(t,e){var n=t.exec;if("function"==typeof n){var r=n.call(t,e);if("object"!=typeof r)throw TypeError("RegExp exec method returned something other than an Object or null");return r}if("RegExp"!==p(t))throw TypeError("RegExp#exec called on incompatible receiver");return ir.call(t,e)},xr=Math.max,mr=Math.min,Sr=Math.floor,wr=/\$([$&'`]|\d\d?|<[^>]*>)/g,Or=/\$([$&'`]|\d\d?)/g;gr("replace",2,(function(t,e,n,r){return[function(n,r){var o=g(this),i=null==n?void 0:n[t];return void 0!==i?i.call(n,o,r):e.call(String(o),n,r)},function(t,i){if(r.REPLACE_KEEPS_$0||"string"==typeof i&&-1===i.indexOf("$0")){var a=n(e,t,this,i);if(a.done)return a.value}var c=P(t),u=String(this),l="function"==typeof i;l||(i=String(i));var s=c.global;if(s){var f=c.unicode;c.lastIndex=0}for(var p=[];;){var d=br(c,u);if(null===d)break;if(p.push(d),!s)break;""===String(d[0])&&(c.lastIndex=vr(u,lt(c.lastIndex),f))}for(var h,g="",y=0,v=0;v<p.length;v++){d=p[v];for(var b=String(d[0]),x=xr(mr(ct(d.index),u.length),0),m=[],S=1;S<d.length;S++)m.push(void 0===(h=d[S])?h:String(h));var w=d.groups;if(l){var O=[b].concat(m,x,u);void 0!==w&&O.push(w);var E=String(i.apply(void 0,O))}else E=o(b,u,x,m,w,i);x>=y&&(g+=u.slice(y,x)+E,y=x+b.length)}return g+u.slice(y)}];function o(t,n,r,o,i,a){var c=r+t.length,u=o.length,l=Or;return void 0!==i&&(i=kt(i),l=wr),e.call(a,l,(function(e,a){var l;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return n.slice(0,r);case"'":return n.slice(c);case"<":l=i[a.slice(1,-1)];break;default:var s=+a;if(0===s)return e;if(s>u){var f=Sr(s/10);return 0===f?e:f<=u?void 0===o[f-1]?a.charAt(1):o[f-1]+a.charAt(1):e}l=o[s-1]}return void 0===l?"":l}))}}));var Er=Xt("match"),Tr=Xt("species"),jr=[].push,Pr=Math.min,Ar=!i((function(){return!RegExp(4294967295,"y")}));gr("split",2,(function(t,e,n){var r;return r="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,n){var r,o,i=String(g(this)),a=void 0===n?4294967295:n>>>0;if(0===a)return[];if(void 0===t)return[i];if(!v(r=t)||!(void 0!==(o=r[Er])?o:"RegExp"==p(r)))return e.call(i,t,a);for(var c,u,l,s=[],f=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),d=0,h=new RegExp(t.source,f+"g");(c=ir.call(h,i))&&!((u=h.lastIndex)>d&&(s.push(i.slice(d,c.index)),c.length>1&&c.index<i.length&&jr.apply(s,c.slice(1)),l=c[0].length,d=u,s.length>=a));)h.lastIndex===c.index&&h.lastIndex++;return d===i.length?!l&&h.test("")||s.push(""):s.push(i.slice(d)),s.length>a?s.slice(0,a):s}:"0".split(void 0,0).length?function(t,n){return void 0===t&&0===n?[]:e.call(this,t,n)}:e,[function(e,n){var o=g(this),i=null==e?void 0:e[t];return void 0!==i?i.call(e,o,n):r.call(String(o),e,n)},function(t,o){var i=n(r,t,this,o,r!==e);if(i.done)return i.value;var a=P(t),c=String(this),u=function(t,e){var n,r=P(t).constructor;return void 0===r||null==(n=P(r)[Tr])?e:re(n)}(a,RegExp),l=a.unicode,s=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(Ar?"y":"g"),f=new u(Ar?a:"^(?:"+a.source+")",s),p=void 0===o?4294967295:o>>>0;if(0===p)return[];if(0===c.length)return null===br(f,c)?[c]:[];for(var d=0,h=0,g=[];h<c.length;){f.lastIndex=Ar?h:0;var y,v=br(f,Ar?c:c.slice(h));if(null===v||(y=Pr(lt(f.lastIndex+(Ar?0:h)),c.length))===d)h=vr(c,h,l);else{if(g.push(c.slice(d,h)),g.length===p)return g;for(var b=1;b<=v.length-1;b++)if(g.push(v[b]),g.length===p)return g;h=d=y}}return g.push(c.slice(d)),g}]}),!Ar);var Ir={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},_r=ue.forEach,Rr=Cn("forEach")?function(t){return _r(this,t,arguments.length>1?arguments[1]:void 0)}:[].forEach;for(var Cr in Ir){var Lr=o[Cr],kr=Lr&&Lr.prototype;if(kr&&kr.forEach!==Rr)try{_(kr,"forEach",Rr)}catch(t){kr.forEach=Rr}}var Mr=Xt("iterator"),$r=Xt("toStringTag"),Dr=Rn.values;for(var Nr in Ir){var Fr=o[Nr],Br=Fr&&Fr.prototype;if(Br){if(Br[Mr]!==Dr)try{_(Br,Mr,Dr)}catch(t){Br[Mr]=Dr}if(Br[$r]||_(Br,$r,Nr),Ir[Nr])for(var Gr in Rn)if(Br[Gr]!==Rn[Gr])try{_(Br,Gr,Rn[Gr])}catch(t){Br[Gr]=Rn[Gr]}}}function Vr(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Hr(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function qr(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function zr(t){return(zr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Ur(t,e){return(Ur=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function Wr(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function Kr(t,e,n){return(Kr="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=zr(t)););return t}(t,e);if(r){var o=Object.getOwnPropertyDescriptor(r,e);return o.get?o.get.call(n):o.value}})(t,e,n||t)}var Yr=t.fn.bootstrapTable.utils,Xr={json:"JSON",xml:"XML",png:"PNG",csv:"CSV",txt:"TXT",sql:"SQL",doc:"MS-Word",excel:"MS-Excel",xlsx:"MS-Excel (OpenXML)",powerpoint:"MS-Powerpoint",pdf:"PDF"};t.extend(t.fn.bootstrapTable.defaults,{showExport:!1,exportDataType:"basic",exportTypes:["json","xml","csv","txt","sql","excel"],exportOptions:{onCellHtmlData:function(t,e,n,r){return t.is("th")?t.find(".th-inner").text():r}},exportFooter:!1}),t.extend(t.fn.bootstrapTable.columnDefaults,{forceExport:!1,forceHide:!1}),t.extend(t.fn.bootstrapTable.defaults.icons,{export:{bootstrap3:"glyphicon-export icon-share",materialize:"file_download","bootstrap-table":"icon-download"}[t.fn.bootstrapTable.theme]||"fa-download"}),t.extend(t.fn.bootstrapTable.locales,{formatExport:function(){return"Export data"}}),t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales),t.fn.bootstrapTable.methods.push("exportTable"),t.extend(t.fn.bootstrapTable.defaults,{onExportSaved:function(t){return!1}}),t.extend(t.fn.bootstrapTable.Constructor.EVENTS,{"export-saved.bs.table":"onExportSaved"}),t.BootstrapTable=function(e){function n(){return Vr(this,n),Wr(this,zr(n).apply(this,arguments))}var r,o,i;return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&Ur(t,e)}(n,e),r=n,(o=[{key:"initToolbar",value:function(){var e,r=this,o=this.options;this.showToolbar=this.showToolbar||o.showExport;for(var i=arguments.length,a=new Array(i),c=0;c<i;c++)a[c]=arguments[c];if((e=Kr(zr(n.prototype),"initToolbar",this)).call.apply(e,[this].concat(a)),this.options.showExport){var u=this.$toolbar.find(">.columns");if(this.$export=u.find("div.export"),this.$export.length)this.updateExportButton();else{var l=t(this.constants.html.toolbarDropdown.join("")),s=o.exportTypes;if("string"==typeof s){var f=s.slice(1,-1).replace(/ /g,"").split(",");s=f.map((function(t){return t.slice(1,-1)}))}this.$export=t(1===s.length?'\n      <div class="export '.concat(this.constants.classes.buttonsDropdown,'"\n      data-type="').concat(s[0],'">\n      <button class="').concat(this.constants.buttonsClass,'"\n      aria-label="Export"\n      type="button"\n      title="').concat(o.formatExport(),'">\n      ').concat(o.showButtonIcons?Yr.sprintf(this.constants.html.icon,o.iconsPrefix,o.icons.export):"","\n      ").concat(o.showButtonText?o.formatExport():"","\n      </button>\n      </div>\n    "):'\n      <div class="export '.concat(this.constants.classes.buttonsDropdown,'">\n      <button class="').concat(this.constants.buttonsClass,' dropdown-toggle"\n      aria-label="Export"\n      data-toggle="dropdown"\n      type="button"\n      title="').concat(o.formatExport(),'">\n      ').concat(o.showButtonIcons?Yr.sprintf(this.constants.html.icon,o.iconsPrefix,o.icons.export):"","\n      ").concat(o.showButtonText?o.formatExport():"","\n      ").concat(this.constants.html.dropdownCaret,"\n      </button>\n      </div>\n    ")).appendTo(u);var p=this.$export;if(s.length>1){this.$export.append(l),l.children().length&&(l=l.children().eq(0));var d=!0,h=!1,g=void 0;try{for(var y,v=s[Symbol.iterator]();!(d=(y=v.next()).done);d=!0){var b=y.value;if(Xr.hasOwnProperty(b)){var x=t(Yr.sprintf(this.constants.html.pageDropdownItem,"",Xr[b]));x.attr("data-type",b),l.append(x)}}}catch(t){h=!0,g=t}finally{try{d||null==v.return||v.return()}finally{if(h)throw g}}p=l.children()}this.updateExportButton(),p.click((function(e){e.preventDefault();var n={type:t(e.currentTarget).data("type"),escape:!1};r.exportTable(n)})),this.handleToolbar()}}}},{key:"handleToolbar",value:function(){this.$export&&("foundation"===t.fn.bootstrapTable.theme?this.$export.find(".dropdown-pane").attr("id","toolbar-export-id"):"materialize"===t.fn.bootstrapTable.theme&&this.$export.find(".dropdown-content").attr("id","toolbar-export-id"),Kr(zr(n.prototype),"handleToolbar",this)&&Kr(zr(n.prototype),"handleToolbar",this).call(this))}},{key:"exportTable",value:function(e){var n=this,r=this.options,o=this.header.stateField,i=r.cardView,a=function(a){o&&n.hideColumn(o),i&&n.toggleView(),n.columns.forEach((function(t){t.forceHide&&n.hideColumn(t.field)}));var c=n.getData();if(r.exportFooter){var u=n.$tableFooter.find("tr").first(),l={},s=[];t.each(u.children(),(function(e,r){var o=t(r).children(".th-inner").first().html();l[n.columns[e].field]="&nbsp;"===o?null:o,s.push(o)})),n.$body.append(n.$body.children().last()[0].outerHTML);var f=n.$body.children().last();t.each(f.children(),(function(e,n){t(n).html(s[e])}))}var p=n.getHiddenColumns();p.forEach((function(t){t.forceExport&&n.showColumn(t.field)})),"function"==typeof r.exportOptions.fileName&&(e.fileName=r.exportOptions.fileName()),n.$el.tableExport(t.extend({onAfterSaveToFile:function(){r.exportFooter&&n.load(c),o&&n.showColumn(o),i&&n.toggleView(),p.forEach((function(t){t.forceExport&&n.hideColumn(t.field)})),n.columns.forEach((function(t){t.forceHide&&n.showColumn(t.field)})),a&&a()}},r.exportOptions,e))};if("all"===r.exportDataType&&r.pagination){var c="server"===r.sidePagination?"post-body.bs.table":"page-change.bs.table",u=this.options.virtualScroll;this.$el.one(c,(function(){a((function(){n.options.virtualScroll=u,n.togglePagination()}))})),this.options.virtualScroll=!1,this.togglePagination(),this.trigger("export-saved",this.getData())}else if("selected"===r.exportDataType){var l=this.getData(),s=this.getSelections(),f=r.pagination;if(!s.length)return;"server"===r.sidePagination&&(l=qr({total:r.totalRows},this.options.dataField,l),s=qr({total:s.length},this.options.dataField,s)),this.load(s),f&&this.togglePagination(),a((function(){f&&n.togglePagination(),n.load(l)})),this.trigger("export-saved",s)}else a(),this.trigger("export-saved",this.getData(!0))}},{key:"updateSelected",value:function(){Kr(zr(n.prototype),"updateSelected",this).call(this),this.updateExportButton()}},{key:"updateExportButton",value:function(){"selected"===this.options.exportDataType&&this.$export.find("> button").prop("disabled",!this.getSelections().length)}}])&&Hr(r.prototype,o),i&&Hr(r,i),n}(t.BootstrapTable)}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):e((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function n(t,e){return t(e={exports:{}},e.exports),e.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof e&&e)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},a=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,u=Object.getOwnPropertyDescriptor,l={f:u&&!c.call({1:2},1)?function(t){var e=u(this,t);return!!e&&e.enumerable}:c},s=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},f={}.toString,p=function(t){return f.call(t).slice(8,-1)},h="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?h.call(t,""):Object(t)}:Object,g=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},v=function(t){return d(g(t))},y=function(t){return"object"==typeof t?null!==t:"function"==typeof t},b=function(t,e){if(!y(t))return t;var n,r;if(e&&"function"==typeof(n=t.toString)&&!y(r=n.call(t)))return r;if("function"==typeof(n=t.valueOf)&&!y(r=n.call(t)))return r;if(!e&&"function"==typeof(n=t.toString)&&!y(r=n.call(t)))return r;throw TypeError("Can't convert object to primitive value")},x={}.hasOwnProperty,m=function(t,e){return x.call(t,e)},S=o.document,w=y(S)&&y(S.createElement),O=function(t){return w?S.createElement(t):{}},E=!a&&!i((function(){return 7!=Object.defineProperty(O("div"),"a",{get:function(){return 7}}).a})),T=Object.getOwnPropertyDescriptor,j={f:a?T:function(t,e){if(t=v(t),e=b(e,!0),E)try{return T(t,e)}catch(t){}if(m(t,e))return s(!l.f.call(t,e),t[e])}},P=function(t){if(!y(t))throw TypeError(String(t)+" is not an object");return t},A=Object.defineProperty,I={f:a?A:function(t,e,n){if(P(t),e=b(e,!0),P(n),E)try{return A(t,e,n)}catch(t){}if("get"in n||"set"in n)throw TypeError("Accessors not supported");return"value"in n&&(t[e]=n.value),t}},_=a?function(t,e,n){return I.f(t,e,s(1,n))}:function(t,e,n){return t[e]=n,t},R=function(t,e){try{_(o,t,e)}catch(n){o[t]=e}return e},C="__core-js_shared__",L=o[C]||R(C,{}),k=Function.toString;"function"!=typeof L.inspectSource&&(L.inspectSource=function(t){return k.call(t)});var M,$,D,N=L.inspectSource,F=o.WeakMap,B="function"==typeof F&&/native code/.test(N(F)),G=n((function(t){(t.exports=function(t,e){return L[t]||(L[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),V=0,H=Math.random(),q=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++V+H).toString(36)},z=G("keys"),U=function(t){return z[t]||(z[t]=q(t))},W={},K=o.WeakMap;if(B){var Y=new K,X=Y.get,J=Y.has,Q=Y.set;M=function(t,e){return Q.call(Y,t,e),e},$=function(t){return X.call(Y,t)||{}},D=function(t){return J.call(Y,t)}}else{var Z=U("state");W[Z]=!0,M=function(t,e){return _(t,Z,e),e},$=function(t){return m(t,Z)?t[Z]:{}},D=function(t){return m(t,Z)}}var tt,et={set:M,get:$,has:D,enforce:function(t){return D(t)?$(t):M(t,{})},getterFor:function(t){return function(e){var n;if(!y(e)||(n=$(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return n}}},nt=n((function(t){var e=et.get,n=et.enforce,r=String(String).split("String");(t.exports=function(t,e,i,a){var c=!!a&&!!a.unsafe,u=!!a&&!!a.enumerable,l=!!a&&!!a.noTargetGet;"function"==typeof i&&("string"!=typeof e||m(i,"name")||_(i,"name",e),n(i).source=r.join("string"==typeof e?e:"")),t!==o?(c?!l&&t[e]&&(u=!0):delete t[e],u?t[e]=i:_(t,e,i)):u?t[e]=i:R(e,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||N(this)}))})),rt=o,ot=function(t){return"function"==typeof t?t:void 0},it=function(t,e){return arguments.length<2?ot(rt[t])||ot(o[t]):rt[t]&&rt[t][e]||o[t]&&o[t][e]},at=Math.ceil,ct=Math.floor,ut=function(t){return isNaN(t=+t)?0:(t>0?ct:at)(t)},lt=Math.min,st=function(t){return t>0?lt(ut(t),9007199254740991):0},ft=Math.max,pt=Math.min,ht=function(t,e){var n=ut(t);return n<0?ft(n+e,0):pt(n,e)},dt=function(t){return function(e,n,r){var o,i=v(e),a=st(i.length),c=ht(r,a);if(t&&n!=n){for(;a>c;)if((o=i[c++])!=o)return!0}else for(;a>c;c++)if((t||c in i)&&i[c]===n)return t||c||0;return!t&&-1}},gt={includes:dt(!0),indexOf:dt(!1)}.indexOf,vt=function(t,e){var n,r=v(t),o=0,i=[];for(n in r)!m(W,n)&&m(r,n)&&i.push(n);for(;e.length>o;)m(r,n=e[o++])&&(~gt(i,n)||i.push(n));return i},yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],bt=yt.concat("length","prototype"),xt={f:Object.getOwnPropertyNames||function(t){return vt(t,bt)}},mt={f:Object.getOwnPropertySymbols},St=it("Reflect","ownKeys")||function(t){var e=xt.f(P(t)),n=mt.f;return n?e.concat(n(t)):e},wt=function(t,e){for(var n=St(e),r=I.f,o=j.f,i=0;i<n.length;i++){var a=n[i];m(t,a)||r(t,a,o(e,a))}},Ot=/#|\.prototype\./,Et=function(t,e){var n=jt[Tt(t)];return n==At||n!=Pt&&("function"==typeof e?i(e):!!e)},Tt=Et.normalize=function(t){return String(t).replace(Ot,".").toLowerCase()},jt=Et.data={},Pt=Et.NATIVE="N",At=Et.POLYFILL="P",It=Et,_t=j.f,Rt=function(t,e){var n,r,i,a,c,u=t.target,l=t.global,s=t.stat;if(n=l?o:s?o[u]||R(u,{}):(o[u]||{}).prototype)for(r in e){if(a=e[r],i=t.noTargetGet?(c=_t(n,r))&&c.value:n[r],!It(l?r:u+(s?".":"#")+r,t.forced)&&void 0!==i){if(typeof a==typeof i)continue;wt(a,i)}(t.sham||i&&i.sham)&&_(a,"sham",!0),nt(n,r,a,t)}},Ct=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Lt=Ct&&!Symbol.sham&&"symbol"==typeof Symbol(),kt=Array.isArray||function(t){return"Array"==p(t)},Mt=function(t){return Object(g(t))},$t=Object.keys||function(t){return vt(t,yt)},Dt=a?Object.defineProperties:function(t,e){P(t);for(var n,r=$t(e),o=r.length,i=0;o>i;)I.f(t,n=r[i++],e[n]);return t},Nt=it("document","documentElement"),Ft=U("IE_PROTO"),Bt=function(){},Gt=function(t){return"<script>"+t+"</"+"script>"},Vt=function(){try{tt=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;Vt=tt?function(t){t.write(Gt("")),t.close();var e=t.parentWindow.Object;return t=null,e}(tt):((e=O("iframe")).style.display="none",Nt.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(Gt("document.F=Object")),t.close(),t.F);for(var n=yt.length;n--;)delete Vt.prototype[yt[n]];return Vt()};W[Ft]=!0;var Ht=Object.create||function(t,e){var n;return null!==t?(Bt.prototype=P(t),n=new Bt,Bt.prototype=null,n[Ft]=t):n=Vt(),void 0===e?n:Dt(n,e)},qt=xt.f,zt={}.toString,Ut="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Wt={f:function(t){return Ut&&"[object Window]"==zt.call(t)?function(t){try{return qt(t)}catch(t){return Ut.slice()}}(t):qt(v(t))}},Kt=G("wks"),Yt=o.Symbol,Xt=Lt?Yt:q,Jt=function(t){return m(Kt,t)||(Ct&&m(Yt,t)?Kt[t]=Yt[t]:Kt[t]=Xt("Symbol."+t)),Kt[t]},Qt={f:Jt},Zt=I.f,te=function(t){var e=rt.Symbol||(rt.Symbol={});m(e,t)||Zt(e,t,{value:Qt.f(t)})},ee=I.f,ne=Jt("toStringTag"),re=function(t,e,n){t&&!m(t=n?t:t.prototype,ne)&&ee(t,ne,{configurable:!0,value:e})},oe=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},ie=Jt("species"),ae=function(t,e){var n;return kt(t)&&("function"!=typeof(n=t.constructor)||n!==Array&&!kt(n.prototype)?y(n)&&null===(n=n[ie])&&(n=void 0):n=void 0),new(void 0===n?Array:n)(0===e?0:e)},ce=[].push,ue=function(t){var e=1==t,n=2==t,r=3==t,o=4==t,i=6==t,a=5==t||i;return function(c,u,l,s){for(var f,p,h=Mt(c),g=d(h),v=function(t,e,n){if(oe(t),void 0===e)return t;switch(n){case 0:return function(){return t.call(e)};case 1:return function(n){return t.call(e,n)};case 2:return function(n,r){return t.call(e,n,r)};case 3:return function(n,r,o){return t.call(e,n,r,o)}}return function(){return t.apply(e,arguments)}}(u,l,3),y=st(g.length),b=0,x=s||ae,m=e?x(c,y):n?x(c,0):void 0;y>b;b++)if((a||b in g)&&(p=v(f=g[b],b,h),t))if(e)m[b]=p;else if(p)switch(t){case 3:return!0;case 5:return f;case 6:return b;case 2:ce.call(m,f)}else if(o)return!1;return i?-1:r||o?o:m}},le={forEach:ue(0),map:ue(1),filter:ue(2),some:ue(3),every:ue(4),find:ue(5),findIndex:ue(6)},se=le.forEach,fe=U("hidden"),pe="Symbol",he=Jt("toPrimitive"),de=et.set,ge=et.getterFor(pe),ve=Object.prototype,ye=o.Symbol,be=it("JSON","stringify"),xe=j.f,me=I.f,Se=Wt.f,we=l.f,Oe=G("symbols"),Ee=G("op-symbols"),Te=G("string-to-symbol-registry"),je=G("symbol-to-string-registry"),Pe=G("wks"),Ae=o.QObject,Ie=!Ae||!Ae.prototype||!Ae.prototype.findChild,_e=a&&i((function(){return 7!=Ht(me({},"a",{get:function(){return me(this,"a",{value:7}).a}})).a}))?function(t,e,n){var r=xe(ve,e);r&&delete ve[e],me(t,e,n),r&&t!==ve&&me(ve,e,r)}:me,Re=function(t,e){var n=Oe[t]=Ht(ye.prototype);return de(n,{type:pe,tag:t,description:e}),a||(n.description=e),n},Ce=Ct&&"symbol"==typeof ye.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof ye},Le=function(t,e,n){t===ve&&Le(Ee,e,n),P(t);var r=b(e,!0);return P(n),m(Oe,r)?(n.enumerable?(m(t,fe)&&t[fe][r]&&(t[fe][r]=!1),n=Ht(n,{enumerable:s(0,!1)})):(m(t,fe)||me(t,fe,s(1,{})),t[fe][r]=!0),_e(t,r,n)):me(t,r,n)},ke=function(t,e){P(t);var n=v(e),r=$t(n).concat(Ne(n));return se(r,(function(e){a&&!Me.call(n,e)||Le(t,e,n[e])})),t},Me=function(t){var e=b(t,!0),n=we.call(this,e);return!(this===ve&&m(Oe,e)&&!m(Ee,e))&&(!(n||!m(this,e)||!m(Oe,e)||m(this,fe)&&this[fe][e])||n)},$e=function(t,e){var n=v(t),r=b(e,!0);if(n!==ve||!m(Oe,r)||m(Ee,r)){var o=xe(n,r);return!o||!m(Oe,r)||m(n,fe)&&n[fe][r]||(o.enumerable=!0),o}},De=function(t){var e=Se(v(t)),n=[];return se(e,(function(t){m(Oe,t)||m(W,t)||n.push(t)})),n},Ne=function(t){var e=t===ve,n=Se(e?Ee:v(t)),r=[];return se(n,(function(t){!m(Oe,t)||e&&!m(ve,t)||r.push(Oe[t])})),r};if(Ct||(nt((ye=function(){if(this instanceof ye)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=q(t),n=function(t){this===ve&&n.call(Ee,t),m(this,fe)&&m(this[fe],e)&&(this[fe][e]=!1),_e(this,e,s(1,t))};return a&&Ie&&_e(ve,e,{configurable:!0,set:n}),Re(e,t)}).prototype,"toString",(function(){return ge(this).tag})),l.f=Me,I.f=Le,j.f=$e,xt.f=Wt.f=De,mt.f=Ne,a&&(me(ye.prototype,"description",{configurable:!0,get:function(){return ge(this).description}}),nt(ve,"propertyIsEnumerable",Me,{unsafe:!0}))),Lt||(Qt.f=function(t){return Re(Jt(t),t)}),Rt({global:!0,wrap:!0,forced:!Ct,sham:!Ct},{Symbol:ye}),se($t(Pe),(function(t){te(t)})),Rt({target:pe,stat:!0,forced:!Ct},{for:function(t){var e=String(t);if(m(Te,e))return Te[e];var n=ye(e);return Te[e]=n,je[n]=e,n},keyFor:function(t){if(!Ce(t))throw TypeError(t+" is not a symbol");if(m(je,t))return je[t]},useSetter:function(){Ie=!0},useSimple:function(){Ie=!1}}),Rt({target:"Object",stat:!0,forced:!Ct,sham:!a},{create:function(t,e){return void 0===e?Ht(t):ke(Ht(t),e)},defineProperty:Le,defineProperties:ke,getOwnPropertyDescriptor:$e}),Rt({target:"Object",stat:!0,forced:!Ct},{getOwnPropertyNames:De,getOwnPropertySymbols:Ne}),Rt({target:"Object",stat:!0,forced:i((function(){mt.f(1)}))},{getOwnPropertySymbols:function(t){return mt.f(Mt(t))}}),be){var Fe=!Ct||i((function(){var t=ye();return"[null]"!=be([t])||"{}"!=be({a:t})||"{}"!=be(Object(t))}));Rt({target:"JSON",stat:!0,forced:Fe},{stringify:function(t,e,n){for(var r,o=[t],i=1;arguments.length>i;)o.push(arguments[i++]);if(r=e,(y(e)||void 0!==t)&&!Ce(t))return kt(e)||(e=function(t,e){if("function"==typeof r&&(e=r.call(this,t,e)),!Ce(e))return e}),o[1]=e,be.apply(null,o)}})}ye.prototype[he]||_(ye.prototype,he,ye.prototype.valueOf),re(ye,pe),W[fe]=!0;var Be=I.f,Ge=o.Symbol;if(a&&"function"==typeof Ge&&(!("description"in Ge.prototype)||void 0!==Ge().description)){var Ve={},He=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof He?new Ge(t):void 0===t?Ge():Ge(t);return""===t&&(Ve[e]=!0),e};wt(He,Ge);var qe=He.prototype=Ge.prototype;qe.constructor=He;var ze=qe.toString,Ue="Symbol(test)"==String(Ge("test")),We=/^Symbol\((.*)\)[^)]+$/;Be(qe,"description",{configurable:!0,get:function(){var t=y(this)?this.valueOf():this,e=ze.call(t);if(m(Ve,t))return"";var n=Ue?e.slice(7,-1):e.replace(We,"$1");return""===n?void 0:n}}),Rt({global:!0,forced:!0},{Symbol:He})}te("iterator");var Ke,Ye,Xe=function(t,e,n){var r=b(e);r in t?I.f(t,r,s(0,n)):t[r]=n},Je=it("navigator","userAgent")||"",Qe=o.process,Ze=Qe&&Qe.versions,tn=Ze&&Ze.v8;tn?Ye=(Ke=tn.split("."))[0]+Ke[1]:Je&&(!(Ke=Je.match(/Edge\/(\d+)/))||Ke[1]>=74)&&(Ke=Je.match(/Chrome\/(\d+)/))&&(Ye=Ke[1]);var en=Ye&&+Ye,nn=Jt("species"),rn=function(t){return en>=51||!i((function(){var e=[];return(e.constructor={})[nn]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},on=Jt("isConcatSpreadable"),an=9007199254740991,cn="Maximum allowed index exceeded",un=en>=51||!i((function(){var t=[];return t[on]=!1,t.concat()[0]!==t})),ln=rn("concat"),sn=function(t){if(!y(t))return!1;var e=t[on];return void 0!==e?!!e:kt(t)};Rt({target:"Array",proto:!0,forced:!un||!ln},{concat:function(t){var e,n,r,o,i,a=Mt(this),c=ae(a,0),u=0;for(e=-1,r=arguments.length;e<r;e++)if(sn(i=-1===e?a:arguments[e])){if(u+(o=st(i.length))>an)throw TypeError(cn);for(n=0;n<o;n++,u++)n in i&&Xe(c,u,i[n])}else{if(u>=an)throw TypeError(cn);Xe(c,u++,i)}return c.length=u,c}});var fn=Jt("unscopables"),pn=Array.prototype;null==pn[fn]&&I.f(pn,fn,{configurable:!0,value:Ht(null)});var hn=function(t){pn[fn][t]=!0},dn=le.find,gn="find",vn=!0;gn in[]&&Array(1).find((function(){vn=!1})),Rt({target:"Array",proto:!0,forced:vn},{find:function(t){return dn(this,t,arguments.length>1?arguments[1]:void 0)}}),hn(gn);var yn,bn,xn,mn=!i((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),Sn=U("IE_PROTO"),wn=Object.prototype,On=mn?Object.getPrototypeOf:function(t){return t=Mt(t),m(t,Sn)?t[Sn]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?wn:null},En=Jt("iterator"),Tn=!1;[].keys&&("next"in(xn=[].keys())?(bn=On(On(xn)))!==Object.prototype&&(yn=bn):Tn=!0),null==yn&&(yn={}),m(yn,En)||_(yn,En,(function(){return this}));var jn={IteratorPrototype:yn,BUGGY_SAFARI_ITERATORS:Tn},Pn=jn.IteratorPrototype,An=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,n={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(n,[]),e=n instanceof Array}catch(t){}return function(n,r){return P(n),function(t){if(!y(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(r),e?t.call(n,r):n.__proto__=r,n}}():void 0),In=jn.IteratorPrototype,_n=jn.BUGGY_SAFARI_ITERATORS,Rn=Jt("iterator"),Cn="keys",Ln="values",kn="entries",Mn=function(){return this},$n=function(t,e,n,r,o,i,a){!function(t,e,n){var r=e+" Iterator";t.prototype=Ht(Pn,{next:s(1,n)}),re(t,r,!1)}(n,e,r);var c,u,l,f=function(t){if(t===o&&v)return v;if(!_n&&t in d)return d[t];switch(t){case Cn:case Ln:case kn:return function(){return new n(this,t)}}return function(){return new n(this)}},p=e+" Iterator",h=!1,d=t.prototype,g=d[Rn]||d["@@iterator"]||o&&d[o],v=!_n&&g||f(o),y="Array"==e&&d.entries||g;if(y&&(c=On(y.call(new t)),In!==Object.prototype&&c.next&&(On(c)!==In&&(An?An(c,In):"function"!=typeof c[Rn]&&_(c,Rn,Mn)),re(c,p,!0))),o==Ln&&g&&g.name!==Ln&&(h=!0,v=function(){return g.call(this)}),d[Rn]!==v&&_(d,Rn,v),o)if(u={values:f(Ln),keys:i?v:f(Cn),entries:f(kn)},a)for(l in u)(_n||h||!(l in d))&&nt(d,l,u[l]);else Rt({target:e,proto:!0,forced:_n||h},u);return u},Dn="Array Iterator",Nn=et.set,Fn=et.getterFor(Dn),Bn=$n(Array,"Array",(function(t,e){Nn(this,{type:Dn,target:v(t),index:0,kind:e})}),(function(){var t=Fn(this),e=t.target,n=t.kind,r=t.index++;return!e||r>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==n?{value:r,done:!1}:"values"==n?{value:e[r],done:!1}:{value:[r,e[r]],done:!1}}),"values");hn("keys"),hn("values"),hn("entries");var Gn=function(t,e){var n=[][t];return!n||!i((function(){n.call(null,e||function(){throw 1},1)}))},Vn=[].join,Hn=d!=Object,qn=Gn("join",",");Rt({target:"Array",proto:!0,forced:Hn||qn},{join:function(t){return Vn.call(v(this),void 0===t?",":t)}});var zn=le.map,Un=rn("map"),Wn=Un&&!i((function(){[].map.call({length:-1,0:1},(function(t){throw t}))}));Rt({target:"Array",proto:!0,forced:!Un||!Wn},{map:function(t){return zn(this,t,arguments.length>1?arguments[1]:void 0)}});var Kn=Jt("species"),Yn=[].slice,Xn=Math.max;Rt({target:"Array",proto:!0,forced:!rn("slice")},{slice:function(t,e){var n,r,o,i=v(this),a=st(i.length),c=ht(t,a),u=ht(void 0===e?a:e,a);if(kt(i)&&("function"!=typeof(n=i.constructor)||n!==Array&&!kt(n.prototype)?y(n)&&null===(n=n[Kn])&&(n=void 0):n=void 0,n===Array||void 0===n))return Yn.call(i,c,u);for(r=new(void 0===n?Array:n)(Xn(u-c,0)),o=0;c<u;c++,o++)c in i&&Xe(r,o,i[c]);return r.length=o,r}});var Jn=Object.assign,Qn=Object.defineProperty,Zn=!Jn||i((function(){if(a&&1!==Jn({b:1},Jn(Qn({},"a",{enumerable:!0,get:function(){Qn(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},n=Symbol(),r="abcdefghijklmnopqrst";return t[n]=7,r.split("").forEach((function(t){e[t]=t})),7!=Jn({},t)[n]||$t(Jn({},e)).join("")!=r}))?function(t,e){for(var n=Mt(t),r=arguments.length,o=1,i=mt.f,c=l.f;r>o;)for(var u,s=d(arguments[o++]),f=i?$t(s).concat(i(s)):$t(s),p=f.length,h=0;p>h;)u=f[h++],a&&!c.call(s,u)||(n[u]=s[u]);return n}:Jn;Rt({target:"Object",stat:!0,forced:Object.assign!==Zn},{assign:Zn});var tr={};tr[Jt("toStringTag")]="z";var er="[object z]"===String(tr),nr=Jt("toStringTag"),rr="Arguments"==p(function(){return arguments}()),or=er?p:function(t){var e,n,r;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(n=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),nr))?n:rr?p(e):"Object"==(r=p(e))&&"function"==typeof e.callee?"Arguments":r},ir=er?{}.toString:function(){return"[object "+or(this)+"]"};er||nt(Object.prototype,"toString",ir,{unsafe:!0});var ar=function(){var t=P(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function cr(t,e){return RegExp(t,e)}var ur,lr,sr={UNSUPPORTED_Y:i((function(){var t=cr("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:i((function(){var t=cr("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},fr=RegExp.prototype.exec,pr=String.prototype.replace,hr=fr,dr=(ur=/a/,lr=/b*/g,fr.call(ur,"a"),fr.call(lr,"a"),0!==ur.lastIndex||0!==lr.lastIndex),gr=sr.UNSUPPORTED_Y||sr.BROKEN_CARET,vr=void 0!==/()??/.exec("")[1];(dr||vr||gr)&&(hr=function(t){var e,n,r,o,i=this,a=gr&&i.sticky,c=ar.call(i),u=i.source,l=0,s=t;return a&&(-1===(c=c.replace("y","")).indexOf("g")&&(c+="g"),s=String(t).slice(i.lastIndex),i.lastIndex>0&&(!i.multiline||i.multiline&&"\n"!==t[i.lastIndex-1])&&(u="(?: "+u+")",s=" "+s,l++),n=new RegExp("^(?:"+u+")",c)),vr&&(n=new RegExp("^"+u+"$(?!\\s)",c)),dr&&(e=i.lastIndex),r=fr.call(a?n:i,s),a?r?(r.input=r.input.slice(l),r[0]=r[0].slice(l),r.index=i.lastIndex,i.lastIndex+=r[0].length):i.lastIndex=0:dr&&r&&(i.lastIndex=i.global?r.index+r[0].length:e),vr&&r&&r.length>1&&pr.call(r[0],n,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(r[o]=void 0)})),r});var yr=hr;Rt({target:"RegExp",proto:!0,forced:/./.exec!==yr},{exec:yr});var br=function(t){return function(e,n){var r,o,i=String(g(e)),a=ut(n),c=i.length;return a<0||a>=c?t?"":void 0:(r=i.charCodeAt(a))<55296||r>56319||a+1===c||(o=i.charCodeAt(a+1))<56320||o>57343?t?i.charAt(a):r:t?i.slice(a,a+2):o-56320+(r-55296<<10)+65536}},xr={codeAt:br(!1),charAt:br(!0)},mr=xr.charAt,Sr="String Iterator",wr=et.set,Or=et.getterFor(Sr);$n(String,"String",(function(t){wr(this,{type:Sr,string:String(t),index:0})}),(function(){var t,e=Or(this),n=e.string,r=e.index;return r>=n.length?{value:void 0,done:!0}:(t=mr(n,r),e.index+=t.length,{value:t,done:!1})}));var Er=Jt("species"),Tr=!i((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),jr="$0"==="a".replace(/./,"$0"),Pr=!i((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var n="ab".split(t);return 2!==n.length||"a"!==n[0]||"b"!==n[1]})),Ar=function(t,e,n,r){var o=Jt(t),a=!i((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),c=a&&!i((function(){var e=!1,n=/a/;return"split"===t&&((n={}).constructor={},n.constructor[Er]=function(){return n},n.flags="",n[o]=/./[o]),n.exec=function(){return e=!0,null},n[o](""),!e}));if(!a||!c||"replace"===t&&(!Tr||!jr)||"split"===t&&!Pr){var u=/./[o],l=n(o,""[t],(function(t,e,n,r,o){return e.exec===yr?a&&!o?{done:!0,value:u.call(e,n,r)}:{done:!0,value:t.call(n,e,r)}:{done:!1}}),{REPLACE_KEEPS_$0:jr}),s=l[0],f=l[1];nt(String.prototype,t,s),nt(RegExp.prototype,o,2==e?function(t,e){return f.call(t,this,e)}:function(t){return f.call(t,this)})}r&&_(RegExp.prototype[o],"sham",!0)},Ir=xr.charAt,_r=function(t,e,n){return e+(n?Ir(t,e).length:1)},Rr=function(t,e){var n=t.exec;if("function"==typeof n){var r=n.call(t,e);if("object"!=typeof r)throw TypeError("RegExp exec method returned something other than an Object or null");return r}if("RegExp"!==p(t))throw TypeError("RegExp#exec called on incompatible receiver");return yr.call(t,e)},Cr=Math.max,Lr=Math.min,kr=Math.floor,Mr=/\$([$&'`]|\d\d?|<[^>]*>)/g,$r=/\$([$&'`]|\d\d?)/g;Ar("replace",2,(function(t,e,n,r){return[function(n,r){var o=g(this),i=null==n?void 0:n[t];return void 0!==i?i.call(n,o,r):e.call(String(o),n,r)},function(t,i){if(r.REPLACE_KEEPS_$0||"string"==typeof i&&-1===i.indexOf("$0")){var a=n(e,t,this,i);if(a.done)return a.value}var c=P(t),u=String(this),l="function"==typeof i;l||(i=String(i));var s=c.global;if(s){var f=c.unicode;c.lastIndex=0}for(var p=[];;){var h=Rr(c,u);if(null===h)break;if(p.push(h),!s)break;""===String(h[0])&&(c.lastIndex=_r(u,st(c.lastIndex),f))}for(var d,g="",v=0,y=0;y<p.length;y++){h=p[y];for(var b=String(h[0]),x=Cr(Lr(ut(h.index),u.length),0),m=[],S=1;S<h.length;S++)m.push(void 0===(d=h[S])?d:String(d));var w=h.groups;if(l){var O=[b].concat(m,x,u);void 0!==w&&O.push(w);var E=String(i.apply(void 0,O))}else E=o(b,u,x,m,w,i);x>=v&&(g+=u.slice(v,x)+E,v=x+b.length)}return g+u.slice(v)}];function o(t,n,r,o,i,a){var c=r+t.length,u=o.length,l=$r;return void 0!==i&&(i=Mt(i),l=Mr),e.call(a,l,(function(e,a){var l;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return n.slice(0,r);case"'":return n.slice(c);case"<":l=i[a.slice(1,-1)];break;default:var s=+a;if(0===s)return e;if(s>u){var f=kr(s/10);return 0===f?e:f<=u?void 0===o[f-1]?a.charAt(1):o[f-1]+a.charAt(1):e}l=o[s-1]}return void 0===l?"":l}))}}));var Dr=Jt("match"),Nr=Jt("species"),Fr=[].push,Br=Math.min,Gr=4294967295,Vr=!i((function(){return!RegExp(Gr,"y")}));Ar("split",2,(function(t,e,n){var r;return r="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,n){var r,o,i=String(g(this)),a=void 0===n?Gr:n>>>0;if(0===a)return[];if(void 0===t)return[i];if(!y(r=t)||!(void 0!==(o=r[Dr])?o:"RegExp"==p(r)))return e.call(i,t,a);for(var c,u,l,s=[],f=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),h=0,d=new RegExp(t.source,f+"g");(c=yr.call(d,i))&&!((u=d.lastIndex)>h&&(s.push(i.slice(h,c.index)),c.length>1&&c.index<i.length&&Fr.apply(s,c.slice(1)),l=c[0].length,h=u,s.length>=a));)d.lastIndex===c.index&&d.lastIndex++;return h===i.length?!l&&d.test("")||s.push(""):s.push(i.slice(h)),s.length>a?s.slice(0,a):s}:"0".split(void 0,0).length?function(t,n){return void 0===t&&0===n?[]:e.call(this,t,n)}:e,[function(e,n){var o=g(this),i=null==e?void 0:e[t];return void 0!==i?i.call(e,o,n):r.call(String(o),e,n)},function(t,o){var i=n(r,t,this,o,r!==e);if(i.done)return i.value;var a=P(t),c=String(this),u=function(t,e){var n,r=P(t).constructor;return void 0===r||null==(n=P(r)[Nr])?e:oe(n)}(a,RegExp),l=a.unicode,s=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(Vr?"y":"g"),f=new u(Vr?a:"^(?:"+a.source+")",s),p=void 0===o?Gr:o>>>0;if(0===p)return[];if(0===c.length)return null===Rr(f,c)?[c]:[];for(var h=0,d=0,g=[];d<c.length;){f.lastIndex=Vr?d:0;var v,y=Rr(f,Vr?c:c.slice(d));if(null===y||(v=Br(st(f.lastIndex+(Vr?0:d)),c.length))===h)d=_r(c,d,l);else{if(g.push(c.slice(h,d)),g.length===p)return g;for(var b=1;b<=y.length-1;b++)if(g.push(y[b]),g.length===p)return g;d=h=v}}return g.push(c.slice(h)),g}]}),!Vr);var Hr={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},qr=le.forEach,zr=Gn("forEach")?function(t){return qr(this,t,arguments.length>1?arguments[1]:void 0)}:[].forEach;for(var Ur in Hr){var Wr=o[Ur],Kr=Wr&&Wr.prototype;if(Kr&&Kr.forEach!==zr)try{_(Kr,"forEach",zr)}catch(t){Kr.forEach=zr}}var Yr=Jt("iterator"),Xr=Jt("toStringTag"),Jr=Bn.values;for(var Qr in Hr){var Zr=o[Qr],to=Zr&&Zr.prototype;if(to){if(to[Yr]!==Jr)try{_(to,Yr,Jr)}catch(t){to[Yr]=Jr}if(to[Xr]||_(to,Xr,Qr),Hr[Qr])for(var eo in Bn)if(to[eo]!==Bn[eo])try{_(to,eo,Bn[eo])}catch(t){to[eo]=Bn[eo]}}}function no(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function ro(t,e){for(var n=0;n<e.length;n++){var r=e[n];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function oo(t,e,n){return e in t?Object.defineProperty(t,e,{value:n,enumerable:!0,configurable:!0,writable:!0}):t[e]=n,t}function io(t){return(io=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function ao(t,e){return(ao=Object.setPrototypeOf||function(t,e){return t.__proto__=e,t})(t,e)}function co(t,e){return!e||"object"!=typeof e&&"function"!=typeof e?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):e}function uo(t,e,n){return(uo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,e,n){var r=function(t,e){for(;!Object.prototype.hasOwnProperty.call(t,e)&&null!==(t=io(t)););return t}(t,e);if(r){var o=Object.getOwnPropertyDescriptor(r,e);return o.get?o.get.call(n):o.value}})(t,e,n||t)}var lo=t.fn.bootstrapTable.utils,so={json:"JSON",xml:"XML",png:"PNG",csv:"CSV",txt:"TXT",sql:"SQL",doc:"MS-Word",excel:"MS-Excel",xlsx:"MS-Excel (OpenXML)",powerpoint:"MS-Powerpoint",pdf:"PDF"};t.extend(t.fn.bootstrapTable.defaults,{showExport:!1,exportDataType:"basic",exportTypes:["json","xml","csv","txt","sql","excel"],exportOptions:{onCellHtmlData:function(t,e,n,r){return t.is("th")?t.find(".th-inner").text():r}},exportFooter:!1}),t.extend(t.fn.bootstrapTable.columnDefaults,{forceExport:!1,forceHide:!1}),t.extend(t.fn.bootstrapTable.defaults.icons,{export:{bootstrap3:"glyphicon-export icon-share",materialize:"file_download","bootstrap-table":"icon-download"}[t.fn.bootstrapTable.theme]||"fa-download"}),t.extend(t.fn.bootstrapTable.locales,{formatExport:function(){return"Export data"}}),t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales),t.fn.bootstrapTable.methods.push("exportTable"),t.extend(t.fn.bootstrapTable.defaults,{onExportSaved:function(t){return!1}}),t.extend(t.fn.bootstrapTable.Constructor.EVENTS,{"export-saved.bs.table":"onExportSaved"}),t.BootstrapTable=function(e){function n(){return no(this,n),co(this,io(n).apply(this,arguments))}var r,o,i;return function(t,e){if("function"!=typeof e&&null!==e)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(e&&e.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),e&&ao(t,e)}(n,e),r=n,(o=[{key:"initToolbar",value:function(){var e,r=this,o=this.options;if(this.showToolbar=this.showToolbar||o.showExport,this.$toolbar.find(">.columns"),this.options.showExport){var i=o.exportTypes;if("string"==typeof i){var a=i.slice(1,-1).replace(/ /g,"").split(",");i=a.map((function(t){return t.slice(1,-1)}))}if(this.$export=this.$toolbar.find(">.columns div.export"),this.$export.length)return void this.updateExportButton();this.buttons=Object.assign(this.buttons,{export:{html:1===i.length?'\n            <div class="export '.concat(this.constants.classes.buttonsDropdown,'"\n            data-type="').concat(i[0],'">\n            <button class="').concat(this.constants.buttonsClass,'"\n            aria-label="Export"\n            type="button"\n            title="').concat(o.formatExport(),'">\n            ').concat(o.showButtonIcons?lo.sprintf(this.constants.html.icon,o.iconsPrefix,o.icons.export):"","\n            ").concat(o.showButtonText?o.formatExport():"","\n            </button>\n            </div>\n          "):'\n            <div class="export '.concat(this.constants.classes.buttonsDropdown,'">\n            <button class="').concat(this.constants.buttonsClass,' dropdown-toggle"\n            aria-label="Export"\n            data-toggle="dropdown"\n            type="button"\n            title="').concat(o.formatExport(),'">\n            ').concat(o.showButtonIcons?lo.sprintf(this.constants.html.icon,o.iconsPrefix,o.icons.export):"","\n            ").concat(o.showButtonText?o.formatExport():"","\n            ").concat(this.constants.html.dropdownCaret,"\n            </button>\n            </div>\n          ")}})}for(var c=arguments.length,u=new Array(c),l=0;l<c;l++)u[l]=arguments[l];if((e=uo(io(n.prototype),"initToolbar",this)).call.apply(e,[this].concat(u)),this.$export=this.$toolbar.find(">.columns div.export"),this.options.showExport){var s=t(this.constants.html.toolbarDropdown.join("")),f=this.$export;if(i.length>1){this.$export.append(s),s.children().length&&(s=s.children().eq(0));var p=!0,h=!1,d=void 0;try{for(var g,v=i[Symbol.iterator]();!(p=(g=v.next()).done);p=!0){var y=g.value;if(so.hasOwnProperty(y)){var b=t(lo.sprintf(this.constants.html.pageDropdownItem,"",so[y]));b.attr("data-type",y),s.append(b)}}}catch(t){h=!0,d=t}finally{try{p||null==v.return||v.return()}finally{if(h)throw d}}f=s.children()}this.updateExportButton(),f.click((function(e){e.preventDefault();var n={type:t(e.currentTarget).data("type"),escape:!1};r.exportTable(n)})),this.handleToolbar()}}},{key:"handleToolbar",value:function(){this.$export&&("foundation"===t.fn.bootstrapTable.theme?this.$export.find(".dropdown-pane").attr("id","toolbar-export-id"):"materialize"===t.fn.bootstrapTable.theme&&this.$export.find(".dropdown-content").attr("id","toolbar-export-id"),uo(io(n.prototype),"handleToolbar",this)&&uo(io(n.prototype),"handleToolbar",this).call(this))}},{key:"exportTable",value:function(e){var n=this,r=this.options,o=this.header.stateField,i=r.cardView,a=function(a){o&&n.hideColumn(o),i&&n.toggleView(),n.columns.forEach((function(t){t.forceHide&&n.hideColumn(t.field)}));var c=n.getData();if(r.exportFooter){var u=n.$tableFooter.find("tr").first(),l={},s=[];t.each(u.children(),(function(e,r){var o=t(r).children(".th-inner").first().html();l[n.columns[e].field]="&nbsp;"===o?null:o,s.push(o)})),n.$body.append(n.$body.children().last()[0].outerHTML);var f=n.$body.children().last();t.each(f.children(),(function(e,n){t(n).html(s[e])}))}var p=n.getHiddenColumns();p.forEach((function(t){t.forceExport&&n.showColumn(t.field)})),"function"==typeof r.exportOptions.fileName&&(e.fileName=r.exportOptions.fileName()),n.$el.tableExport(t.extend({onAfterSaveToFile:function(){r.exportFooter&&n.load(c),o&&n.showColumn(o),i&&n.toggleView(),p.forEach((function(t){t.forceExport&&n.hideColumn(t.field)})),n.columns.forEach((function(t){t.forceHide&&n.showColumn(t.field)})),a&&a()}},r.exportOptions,e))};if("all"===r.exportDataType&&r.pagination){var c="server"===r.sidePagination?"post-body.bs.table":"page-change.bs.table",u=this.options.virtualScroll;this.$el.one(c,(function(){setTimeout((function(){a((function(){n.options.virtualScroll=u,n.togglePagination()}))}),0)})),this.options.virtualScroll=!1,this.togglePagination(),this.trigger("export-saved",this.getData())}else if("selected"===r.exportDataType){var l=this.getData(),s=this.getSelections(),f=r.pagination;if(!s.length)return;"server"===r.sidePagination&&(l=oo({total:r.totalRows},this.options.dataField,l),s=oo({total:s.length},this.options.dataField,s)),this.load(s),f&&this.togglePagination(),a((function(){f&&n.togglePagination(),n.load(l)})),this.trigger("export-saved",s)}else a(),this.trigger("export-saved",this.getData(!0))}},{key:"updateSelected",value:function(){uo(io(n.prototype),"updateSelected",this).call(this),this.updateExportButton()}},{key:"updateExportButton",value:function(){"selected"===this.options.exportDataType&&this.$export.find("> button").prop("disabled",!this.getSelections().length)}}])&&ro(r.prototype,o),i&&ro(r,i),n}(t.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table-page-jump-to.min.js b/web/skins/classic/js/bootstrap-table-page-jump-to.min.js
index f4bb237ad..e2cad7b35 100644
--- a/web/skins/classic/js/bootstrap-table-page-jump-to.min.js
+++ b/web/skins/classic/js/bootstrap-table-page-jump-to.min.js
@@ -1,10 +1,10 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.17.1
+  * @version v1.18.0
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT
   */
 
-!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function e(t,n){return t(n={exports:{}},n.exports),n.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},y="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?y.call(t,""):Object(t)}:Object,h=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},b=function(t){return d(h(t))},v=function(t){return"object"==typeof t?null!==t:"function"==typeof t},g=function(t,n){if(!v(t))return t;var e,r;if(n&&"function"==typeof(e=t.toString)&&!v(r=e.call(t)))return r;if("function"==typeof(e=t.valueOf)&&!v(r=e.call(t)))return r;if(!n&&"function"==typeof(e=t.toString)&&!v(r=e.call(t)))return r;throw TypeError("Can't convert object to primitive value")},m={}.hasOwnProperty,w=function(t,n){return m.call(t,n)},O=o.document,j=v(O)&&v(O.createElement),S=function(t){return j?O.createElement(t):{}},T=!u&&!i((function(){return 7!=Object.defineProperty(S("div"),"a",{get:function(){return 7}}).a})),P=Object.getOwnPropertyDescriptor,E={f:u?P:function(t,n){if(t=b(t),n=g(n,!0),T)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!v(t))throw TypeError(String(t)+" is not an object");return t},_=Object.defineProperty,A={f:u?_:function(t,n,e){if(x(t),n=g(n,!0),x(e),T)try{return _(t,n,e)}catch(t){}if("get"in e||"set"in e)throw TypeError("Accessors not supported");return"value"in e&&(t[n]=e.value),t}},M=u?function(t,n,e){return A.f(t,n,l(1,e))}:function(t,n,e){return t[n]=e,t},k=function(t,n){try{M(o,t,n)}catch(e){o[t]=n}return n},C=o["__core-js_shared__"]||k("__core-js_shared__",{}),I=Function.toString;"function"!=typeof C.inspectSource&&(C.inspectSource=function(t){return I.call(t)});var F,N,R,L=C.inspectSource,q=o.WeakMap,z="function"==typeof q&&/native code/.test(L(q)),D=e((function(t){(t.exports=function(t,n){return C[t]||(C[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),G=0,J=Math.random(),W=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++G+J).toString(36)},B=D("keys"),K=function(t){return B[t]||(B[t]=W(t))},Q={},V=o.WeakMap;if(z){var X=new V,Y=X.get,$=X.has,H=X.set;F=function(t,n){return H.call(X,t,n),n},N=function(t){return Y.call(X,t)||{}},R=function(t){return $.call(X,t)}}else{var U=K("state");Q[U]=!0,F=function(t,n){return M(t,U,n),n},N=function(t){return w(t,U)?t[U]:{}},R=function(t){return w(t,U)}}var Z,tt,nt={set:F,get:N,has:R,enforce:function(t){return R(t)?N(t):F(t,{})},getterFor:function(t){return function(n){var e;if(!v(n)||(e=N(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return e}}},et=e((function(t){var n=nt.get,e=nt.enforce,r=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),e(i).source=r.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:k(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||L(this)}))})),rt=o,ot=function(t){return"function"==typeof t?t:void 0},it=function(t,n){return arguments.length<2?ot(rt[t])||ot(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},ut=Math.ceil,ct=Math.floor,ft=function(t){return isNaN(t=+t)?0:(t>0?ct:ut)(t)},at=Math.min,lt=function(t){return t>0?at(ft(t),9007199254740991):0},st=Math.max,pt=Math.min,yt=function(t){return function(n,e,r){var o,i=b(n),u=lt(i.length),c=function(t,n){var e=ft(t);return e<0?st(e+n,0):pt(e,n)}(r,u);if(t&&e!=e){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===e)return t||c||0;return!t&&-1}},dt={includes:yt(!0),indexOf:yt(!1)}.indexOf,ht=function(t,n){var e,r=b(t),o=0,i=[];for(e in r)!w(Q,e)&&w(r,e)&&i.push(e);for(;n.length>o;)w(r,e=n[o++])&&(~dt(i,e)||i.push(e));return i},bt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],vt=bt.concat("length","prototype"),gt={f:Object.getOwnPropertyNames||function(t){return ht(t,vt)}},mt={f:Object.getOwnPropertySymbols},wt=it("Reflect","ownKeys")||function(t){var n=gt.f(x(t)),e=mt.f;return e?n.concat(e(t)):n},Ot=function(t,n){for(var e=wt(n),r=A.f,o=E.f,i=0;i<e.length;i++){var u=e[i];w(t,u)||r(t,u,o(n,u))}},jt=/#|\.prototype\./,St=function(t,n){var e=Pt[Tt(t)];return e==xt||e!=Et&&("function"==typeof n?i(n):!!n)},Tt=St.normalize=function(t){return String(t).replace(jt,".").toLowerCase()},Pt=St.data={},Et=St.NATIVE="N",xt=St.POLYFILL="P",_t=St,At=E.f,Mt=function(t,n){var e,r,i,u,c,f=t.target,a=t.global,l=t.stat;if(e=a?o:l?o[f]||k(f,{}):(o[f]||{}).prototype)for(r in n){if(u=n[r],i=t.noTargetGet?(c=At(e,r))&&c.value:e[r],!_t(a?r:f+(l?".":"#")+r,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;Ot(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),et(e,r,u,t)}},kt=Array.isArray||function(t){return"Array"==p(t)},Ct=function(t){return Object(h(t))},It=function(t,n,e){var r=g(n);r in t?A.f(t,r,l(0,e)):t[r]=e},Ft=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Nt=Ft&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=D("wks"),Lt=o.Symbol,qt=Nt?Lt:W,zt=function(t){return w(Rt,t)||(Ft&&w(Lt,t)?Rt[t]=Lt[t]:Rt[t]=qt("Symbol."+t)),Rt[t]},Dt=zt("species"),Gt=function(t,n){var e;return kt(t)&&("function"!=typeof(e=t.constructor)||e!==Array&&!kt(e.prototype)?v(e)&&null===(e=e[Dt])&&(e=void 0):e=void 0),new(void 0===e?Array:e)(0===n?0:n)},Jt=it("navigator","userAgent")||"",Wt=o.process,Bt=Wt&&Wt.versions,Kt=Bt&&Bt.v8;Kt?tt=(Z=Kt.split("."))[0]+Z[1]:Jt&&(!(Z=Jt.match(/Edge\/(\d+)/))||Z[1]>=74)&&(Z=Jt.match(/Chrome\/(\d+)/))&&(tt=Z[1]);var Qt,Vt=tt&&+tt,Xt=zt("species"),Yt=zt("isConcatSpreadable"),$t=Vt>=51||!i((function(){var t=[];return t[Yt]=!1,t.concat()[0]!==t})),Ht=(Qt="concat",Vt>=51||!i((function(){var t=[];return(t.constructor={})[Xt]=function(){return{foo:1}},1!==t[Qt](Boolean).foo}))),Ut=function(t){if(!v(t))return!1;var n=t[Yt];return void 0!==n?!!n:kt(t)};Mt({target:"Array",proto:!0,forced:!$t||!Ht},{concat:function(t){var n,e,r,o,i,u=Ct(this),c=Gt(u,0),f=0;for(n=-1,r=arguments.length;n<r;n++)if(Ut(i=-1===n?u:arguments[n])){if(f+(o=lt(i.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(e=0;e<o;e++,f++)e in i&&It(c,f,i[e])}else{if(f>=9007199254740991)throw TypeError("Maximum allowed index exceeded");It(c,f++,i)}return c.length=f,c}});var Zt,tn=function(t,n,e){if(function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function")}(t),void 0===n)return t;switch(e){case 0:return function(){return t.call(n)};case 1:return function(e){return t.call(n,e)};case 2:return function(e,r){return t.call(n,e,r)};case 3:return function(e,r,o){return t.call(n,e,r,o)}}return function(){return t.apply(n,arguments)}},nn=[].push,en=function(t){var n=1==t,e=2==t,r=3==t,o=4==t,i=6==t,u=5==t||i;return function(c,f,a,l){for(var s,p,y=Ct(c),h=d(y),b=tn(f,a,3),v=lt(h.length),g=0,m=l||Gt,w=n?m(c,v):e?m(c,0):void 0;v>g;g++)if((u||g in h)&&(p=b(s=h[g],g,y),t))if(n)w[g]=p;else if(p)switch(t){case 3:return!0;case 5:return s;case 6:return g;case 2:nn.call(w,s)}else if(o)return!1;return i?-1:r||o?o:w}},rn={forEach:en(0),map:en(1),filter:en(2),some:en(3),every:en(4),find:en(5),findIndex:en(6)},on=Object.keys||function(t){return ht(t,bt)},un=u?Object.defineProperties:function(t,n){x(t);for(var e,r=on(n),o=r.length,i=0;o>i;)A.f(t,e=r[i++],n[e]);return t},cn=it("document","documentElement"),fn=K("IE_PROTO"),an=function(){},ln=function(t){return"<script>"+t+"<\/script>"},sn=function(){try{Zt=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,n;sn=Zt?function(t){t.write(ln("")),t.close();var n=t.parentWindow.Object;return t=null,n}(Zt):((n=S("iframe")).style.display="none",cn.appendChild(n),n.src=String("javascript:"),(t=n.contentWindow.document).open(),t.write(ln("document.F=Object")),t.close(),t.F);for(var e=bt.length;e--;)delete sn.prototype[bt[e]];return sn()};Q[fn]=!0;var pn=Object.create||function(t,n){var e;return null!==t?(an.prototype=x(t),e=new an,an.prototype=null,e[fn]=t):e=sn(),void 0===n?e:un(e,n)},yn=zt("unscopables"),dn=Array.prototype;null==dn[yn]&&A.f(dn,yn,{configurable:!0,value:pn(null)});var hn,bn=rn.find,vn=!0;function gn(t,n){if(!(t instanceof n))throw new TypeError("Cannot call a class as a function")}function mn(t,n){for(var e=0;e<n.length;e++){var r=n[e];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function wn(t){return(wn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function On(t,n){return(On=Object.setPrototypeOf||function(t,n){return t.__proto__=n,t})(t,n)}function jn(t,n){return!n||"object"!=typeof n&&"function"!=typeof n?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):n}function Sn(t,n,e){return(Sn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,n,e){var r=function(t,n){for(;!Object.prototype.hasOwnProperty.call(t,n)&&null!==(t=wn(t)););return t}(t,n);if(r){var o=Object.getOwnPropertyDescriptor(r,n);return o.get?o.get.call(e):o.value}})(t,n,e||t)}"find"in[]&&Array(1).find((function(){vn=!1})),Mt({target:"Array",proto:!0,forced:vn},{find:function(t){return bn(this,t,arguments.length>1?arguments[1]:void 0)}}),hn="find",dn[yn][hn]=!0;var Tn=t.fn.bootstrapTable.utils;t.extend(t.fn.bootstrapTable.defaults,{showJumpTo:!1}),t.extend(t.fn.bootstrapTable.locales,{formatJumpTo:function(){return"GO"}}),t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales),t.BootstrapTable=function(n){function e(){return gn(this,e),jn(this,wn(e).apply(this,arguments))}var r,o,i;return function(t,n){if("function"!=typeof n&&null!==n)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(n&&n.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),n&&On(t,n)}(e,n),r=e,(o=[{key:"initPagination",value:function(){for(var n,r=this,o=arguments.length,i=new Array(o),u=0;u<o;u++)i[u]=arguments[u];if((n=Sn(wn(e.prototype),"initPagination",this)).call.apply(n,[this].concat(i)),this.options.showJumpTo){var c=this.$pagination.find("> .pagination"),f=c.find(".page-jump-to");f.length||(f=t('\n          <div class="page-jump-to '.concat(this.constants.classes.inputGroup,'">\n          <input type="number" class="').concat(this.constants.classes.input).concat(Tn.sprintf(" input-%s",this.options.iconSize),'" value="').concat(this.options.pageNumber,'">\n          <button class="').concat(this.constants.buttonsClass,'"  type="button">\n          ').concat(this.options.formatJumpTo(),"\n          </button>\n          </div>\n        ")).appendTo(c)).on("click","button",(function(n){r.selectPage(+t(n.target).parent(".page-jump-to").find("input").val())}))}}}])&&mn(r.prototype,o),i&&mn(r,i),e}(t.BootstrapTable)}));
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function e(t,n){return t(n={exports:{}},n.exports),n.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof n&&n)||Function("return this")(),i=function(t){try{return!!t()}catch(t){return!0}},u=!i((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,f=Object.getOwnPropertyDescriptor,a={f:f&&!c.call({1:2},1)?function(t){var n=f(this,t);return!!n&&n.enumerable}:c},l=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},s={}.toString,p=function(t){return s.call(t).slice(8,-1)},y="".split,d=i((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==p(t)?y.call(t,""):Object(t)}:Object,h=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},b=function(t){return d(h(t))},v=function(t){return"object"==typeof t?null!==t:"function"==typeof t},g=function(t,n){if(!v(t))return t;var e,r;if(n&&"function"==typeof(e=t.toString)&&!v(r=e.call(t)))return r;if("function"==typeof(e=t.valueOf)&&!v(r=e.call(t)))return r;if(!n&&"function"==typeof(e=t.toString)&&!v(r=e.call(t)))return r;throw TypeError("Can't convert object to primitive value")},m={}.hasOwnProperty,w=function(t,n){return m.call(t,n)},O=o.document,j=v(O)&&v(O.createElement),S=function(t){return j?O.createElement(t):{}},T=!u&&!i((function(){return 7!=Object.defineProperty(S("div"),"a",{get:function(){return 7}}).a})),P=Object.getOwnPropertyDescriptor,E={f:u?P:function(t,n){if(t=b(t),n=g(n,!0),T)try{return P(t,n)}catch(t){}if(w(t,n))return l(!a.f.call(t,n),t[n])}},x=function(t){if(!v(t))throw TypeError(String(t)+" is not an object");return t},_=Object.defineProperty,A={f:u?_:function(t,n,e){if(x(t),n=g(n,!0),x(e),T)try{return _(t,n,e)}catch(t){}if("get"in e||"set"in e)throw TypeError("Accessors not supported");return"value"in e&&(t[n]=e.value),t}},M=u?function(t,n,e){return A.f(t,n,l(1,e))}:function(t,n,e){return t[n]=e,t},k=function(t,n){try{M(o,t,n)}catch(e){o[t]=n}return n},C="__core-js_shared__",I=o[C]||k(C,{}),F=Function.toString;"function"!=typeof I.inspectSource&&(I.inspectSource=function(t){return F.call(t)});var N,R,L,q=I.inspectSource,z=o.WeakMap,D="function"==typeof z&&/native code/.test(q(z)),G=e((function(t){(t.exports=function(t,n){return I[t]||(I[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),J=0,W=Math.random(),B=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++J+W).toString(36)},K=G("keys"),Q=function(t){return K[t]||(K[t]=B(t))},V={},X=o.WeakMap;if(D){var Y=new X,$=Y.get,H=Y.has,U=Y.set;N=function(t,n){return U.call(Y,t,n),n},R=function(t){return $.call(Y,t)||{}},L=function(t){return H.call(Y,t)}}else{var Z=Q("state");V[Z]=!0,N=function(t,n){return M(t,Z,n),n},R=function(t){return w(t,Z)?t[Z]:{}},L=function(t){return w(t,Z)}}var tt,nt,et={set:N,get:R,has:L,enforce:function(t){return L(t)?R(t):N(t,{})},getterFor:function(t){return function(n){var e;if(!v(n)||(e=R(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return e}}},rt=e((function(t){var n=et.get,e=et.enforce,r=String(String).split("String");(t.exports=function(t,n,i,u){var c=!!u&&!!u.unsafe,f=!!u&&!!u.enumerable,a=!!u&&!!u.noTargetGet;"function"==typeof i&&("string"!=typeof n||w(i,"name")||M(i,"name",n),e(i).source=r.join("string"==typeof n?n:"")),t!==o?(c?!a&&t[n]&&(f=!0):delete t[n],f?t[n]=i:M(t,n,i)):f?t[n]=i:k(n,i)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||q(this)}))})),ot=o,it=function(t){return"function"==typeof t?t:void 0},ut=function(t,n){return arguments.length<2?it(ot[t])||it(o[t]):ot[t]&&ot[t][n]||o[t]&&o[t][n]},ct=Math.ceil,ft=Math.floor,at=function(t){return isNaN(t=+t)?0:(t>0?ft:ct)(t)},lt=Math.min,st=function(t){return t>0?lt(at(t),9007199254740991):0},pt=Math.max,yt=Math.min,dt=function(t){return function(n,e,r){var o,i=b(n),u=st(i.length),c=function(t,n){var e=at(t);return e<0?pt(e+n,0):yt(e,n)}(r,u);if(t&&e!=e){for(;u>c;)if((o=i[c++])!=o)return!0}else for(;u>c;c++)if((t||c in i)&&i[c]===e)return t||c||0;return!t&&-1}},ht={includes:dt(!0),indexOf:dt(!1)}.indexOf,bt=function(t,n){var e,r=b(t),o=0,i=[];for(e in r)!w(V,e)&&w(r,e)&&i.push(e);for(;n.length>o;)w(r,e=n[o++])&&(~ht(i,e)||i.push(e));return i},vt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],gt=vt.concat("length","prototype"),mt={f:Object.getOwnPropertyNames||function(t){return bt(t,gt)}},wt={f:Object.getOwnPropertySymbols},Ot=ut("Reflect","ownKeys")||function(t){var n=mt.f(x(t)),e=wt.f;return e?n.concat(e(t)):n},jt=function(t,n){for(var e=Ot(n),r=A.f,o=E.f,i=0;i<e.length;i++){var u=e[i];w(t,u)||r(t,u,o(n,u))}},St=/#|\.prototype\./,Tt=function(t,n){var e=Et[Pt(t)];return e==_t||e!=xt&&("function"==typeof n?i(n):!!n)},Pt=Tt.normalize=function(t){return String(t).replace(St,".").toLowerCase()},Et=Tt.data={},xt=Tt.NATIVE="N",_t=Tt.POLYFILL="P",At=Tt,Mt=E.f,kt=function(t,n){var e,r,i,u,c,f=t.target,a=t.global,l=t.stat;if(e=a?o:l?o[f]||k(f,{}):(o[f]||{}).prototype)for(r in n){if(u=n[r],i=t.noTargetGet?(c=Mt(e,r))&&c.value:e[r],!At(a?r:f+(l?".":"#")+r,t.forced)&&void 0!==i){if(typeof u==typeof i)continue;jt(u,i)}(t.sham||i&&i.sham)&&M(u,"sham",!0),rt(e,r,u,t)}},Ct=Array.isArray||function(t){return"Array"==p(t)},It=function(t){return Object(h(t))},Ft=function(t,n,e){var r=g(n);r in t?A.f(t,r,l(0,e)):t[r]=e},Nt=!!Object.getOwnPropertySymbols&&!i((function(){return!String(Symbol())})),Rt=Nt&&!Symbol.sham&&"symbol"==typeof Symbol(),Lt=G("wks"),qt=o.Symbol,zt=Rt?qt:B,Dt=function(t){return w(Lt,t)||(Nt&&w(qt,t)?Lt[t]=qt[t]:Lt[t]=zt("Symbol."+t)),Lt[t]},Gt=Dt("species"),Jt=function(t,n){var e;return Ct(t)&&("function"!=typeof(e=t.constructor)||e!==Array&&!Ct(e.prototype)?v(e)&&null===(e=e[Gt])&&(e=void 0):e=void 0),new(void 0===e?Array:e)(0===n?0:n)},Wt=ut("navigator","userAgent")||"",Bt=o.process,Kt=Bt&&Bt.versions,Qt=Kt&&Kt.v8;Qt?nt=(tt=Qt.split("."))[0]+tt[1]:Wt&&(!(tt=Wt.match(/Edge\/(\d+)/))||tt[1]>=74)&&(tt=Wt.match(/Chrome\/(\d+)/))&&(nt=tt[1]);var Vt,Xt=nt&&+nt,Yt=Dt("species"),$t=Dt("isConcatSpreadable"),Ht=9007199254740991,Ut="Maximum allowed index exceeded",Zt=Xt>=51||!i((function(){var t=[];return t[$t]=!1,t.concat()[0]!==t})),tn=(Vt="concat",Xt>=51||!i((function(){var t=[];return(t.constructor={})[Yt]=function(){return{foo:1}},1!==t[Vt](Boolean).foo}))),nn=function(t){if(!v(t))return!1;var n=t[$t];return void 0!==n?!!n:Ct(t)};kt({target:"Array",proto:!0,forced:!Zt||!tn},{concat:function(t){var n,e,r,o,i,u=It(this),c=Jt(u,0),f=0;for(n=-1,r=arguments.length;n<r;n++)if(nn(i=-1===n?u:arguments[n])){if(f+(o=st(i.length))>Ht)throw TypeError(Ut);for(e=0;e<o;e++,f++)e in i&&Ft(c,f,i[e])}else{if(f>=Ht)throw TypeError(Ut);Ft(c,f++,i)}return c.length=f,c}});var en,rn=function(t,n,e){if(function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function")}(t),void 0===n)return t;switch(e){case 0:return function(){return t.call(n)};case 1:return function(e){return t.call(n,e)};case 2:return function(e,r){return t.call(n,e,r)};case 3:return function(e,r,o){return t.call(n,e,r,o)}}return function(){return t.apply(n,arguments)}},on=[].push,un=function(t){var n=1==t,e=2==t,r=3==t,o=4==t,i=6==t,u=5==t||i;return function(c,f,a,l){for(var s,p,y=It(c),h=d(y),b=rn(f,a,3),v=st(h.length),g=0,m=l||Jt,w=n?m(c,v):e?m(c,0):void 0;v>g;g++)if((u||g in h)&&(p=b(s=h[g],g,y),t))if(n)w[g]=p;else if(p)switch(t){case 3:return!0;case 5:return s;case 6:return g;case 2:on.call(w,s)}else if(o)return!1;return i?-1:r||o?o:w}},cn={forEach:un(0),map:un(1),filter:un(2),some:un(3),every:un(4),find:un(5),findIndex:un(6)},fn=Object.keys||function(t){return bt(t,vt)},an=u?Object.defineProperties:function(t,n){x(t);for(var e,r=fn(n),o=r.length,i=0;o>i;)A.f(t,e=r[i++],n[e]);return t},ln=ut("document","documentElement"),sn=Q("IE_PROTO"),pn=function(){},yn=function(t){return"<script>"+t+"</"+"script>"},dn=function(){try{en=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,n;dn=en?function(t){t.write(yn("")),t.close();var n=t.parentWindow.Object;return t=null,n}(en):((n=S("iframe")).style.display="none",ln.appendChild(n),n.src=String("javascript:"),(t=n.contentWindow.document).open(),t.write(yn("document.F=Object")),t.close(),t.F);for(var e=vt.length;e--;)delete dn.prototype[vt[e]];return dn()};V[sn]=!0;var hn=Object.create||function(t,n){var e;return null!==t?(pn.prototype=x(t),e=new pn,pn.prototype=null,e[sn]=t):e=dn(),void 0===n?e:an(e,n)},bn=Dt("unscopables"),vn=Array.prototype;null==vn[bn]&&A.f(vn,bn,{configurable:!0,value:hn(null)});var gn,mn=cn.find,wn="find",On=!0;function jn(t,n){if(!(t instanceof n))throw new TypeError("Cannot call a class as a function")}function Sn(t,n){for(var e=0;e<n.length;e++){var r=n[e];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Tn(t){return(Tn=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function Pn(t,n){return(Pn=Object.setPrototypeOf||function(t,n){return t.__proto__=n,t})(t,n)}function En(t,n){return!n||"object"!=typeof n&&"function"!=typeof n?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):n}function xn(t,n,e){return(xn="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,n,e){var r=function(t,n){for(;!Object.prototype.hasOwnProperty.call(t,n)&&null!==(t=Tn(t)););return t}(t,n);if(r){var o=Object.getOwnPropertyDescriptor(r,n);return o.get?o.get.call(e):o.value}})(t,n,e||t)}wn in[]&&Array(1).find((function(){On=!1})),kt({target:"Array",proto:!0,forced:On},{find:function(t){return mn(this,t,arguments.length>1?arguments[1]:void 0)}}),gn=wn,vn[bn][gn]=!0;var _n=t.fn.bootstrapTable.utils;t.extend(t.fn.bootstrapTable.defaults,{showJumpTo:!1}),t.extend(t.fn.bootstrapTable.locales,{formatJumpTo:function(){return"GO"}}),t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales),t.BootstrapTable=function(n){function e(){return jn(this,e),En(this,Tn(e).apply(this,arguments))}var r,o,i;return function(t,n){if("function"!=typeof n&&null!==n)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(n&&n.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),n&&Pn(t,n)}(e,n),r=e,(o=[{key:"initPagination",value:function(){for(var n,r=this,o=arguments.length,i=new Array(o),u=0;u<o;u++)i[u]=arguments[u];if((n=xn(Tn(e.prototype),"initPagination",this)).call.apply(n,[this].concat(i)),this.options.showJumpTo){var c=this.$pagination.find("> .pagination"),f=c.find(".page-jump-to");f.length||(f=t('\n          <div class="page-jump-to '.concat(this.constants.classes.inputGroup,'">\n          <input type="number" class="').concat(this.constants.classes.input).concat(_n.sprintf(" input-%s",this.options.iconSize),'" value="').concat(this.options.pageNumber,'">\n          <button class="').concat(this.constants.buttonsClass,'"  type="button">\n          ').concat(this.options.formatJumpTo(),"\n          </button>\n          </div>\n        ")).appendTo(c)).on("click","button",(function(n){r.selectPage(+t(n.target).parent(".page-jump-to").find("input").val())}))}}}])&&Sn(r.prototype,o),i&&Sn(r,i),e}(t.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table-toolbar.min.js b/web/skins/classic/js/bootstrap-table-toolbar.min.js
new file mode 100644
index 000000000..2c96323d7
--- /dev/null
+++ b/web/skins/classic/js/bootstrap-table-toolbar.min.js
@@ -0,0 +1,10 @@
+/**
+  * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
+  *
+  * @version v1.18.0
+  * @homepage https://bootstrap-table.com
+  * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
+  * @license MIT
+  */
+
+!function(t,n){"object"==typeof exports&&"undefined"!=typeof module?n(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],n):n((t=t||self).jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var n="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function e(t,n){return t(n={exports:{}},n.exports),n.exports}var r=function(t){return t&&t.Math==Math&&t},o=r("object"==typeof globalThis&&globalThis)||r("object"==typeof window&&window)||r("object"==typeof self&&self)||r("object"==typeof n&&n)||Function("return this")(),a=function(t){try{return!!t()}catch(t){return!0}},i=!a((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),c={}.propertyIsEnumerable,l=Object.getOwnPropertyDescriptor,s={f:l&&!c.call({1:2},1)?function(t){var n=l(this,t);return!!n&&n.enumerable}:c},u=function(t,n){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:n}},d={}.toString,f=function(t){return d.call(t).slice(8,-1)},p="".split,h=a((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==f(t)?p.call(t,""):Object(t)}:Object,v=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},b=function(t){return h(v(t))},y=function(t){return"object"==typeof t?null!==t:"function"==typeof t},m=function(t,n){if(!y(t))return t;var e,r;if(n&&"function"==typeof(e=t.toString)&&!y(r=e.call(t)))return r;if("function"==typeof(e=t.valueOf)&&!y(r=e.call(t)))return r;if(!n&&"function"==typeof(e=t.toString)&&!y(r=e.call(t)))return r;throw TypeError("Can't convert object to primitive value")},g={}.hasOwnProperty,S=function(t,n){return g.call(t,n)},O=o.document,w=y(O)&&y(O.createElement),x=function(t){return w?O.createElement(t):{}},T=!i&&!a((function(){return 7!=Object.defineProperty(x("div"),"a",{get:function(){return 7}}).a})),j=Object.getOwnPropertyDescriptor,A={f:i?j:function(t,n){if(t=b(t),n=m(n,!0),T)try{return j(t,n)}catch(t){}if(S(t,n))return u(!s.f.call(t,n),t[n])}},_=function(t){if(!y(t))throw TypeError(String(t)+" is not an object");return t},E=Object.defineProperty,P={f:i?E:function(t,n,e){if(_(t),n=m(n,!0),_(e),T)try{return E(t,n,e)}catch(t){}if("get"in e||"set"in e)throw TypeError("Accessors not supported");return"value"in e&&(t[n]=e.value),t}},C=i?function(t,n,e){return P.f(t,n,u(1,e))}:function(t,n,e){return t[n]=e,t},M=function(t,n){try{C(o,t,n)}catch(e){o[t]=n}return n},I="__core-js_shared__",k=o[I]||M(I,{}),R=Function.toString;"function"!=typeof k.inspectSource&&(k.inspectSource=function(t){return R.call(t)});var L,F,N,D=k.inspectSource,G=o.WeakMap,B="function"==typeof G&&/native code/.test(D(G)),V=e((function(t){(t.exports=function(t,n){return k[t]||(k[t]=void 0!==n?n:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),z=0,$=Math.random(),U=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++z+$).toString(36)},q=V("keys"),W=function(t){return q[t]||(q[t]=U(t))},Y={},H=o.WeakMap;if(B){var K=new H,J=K.get,Q=K.has,X=K.set;L=function(t,n){return X.call(K,t,n),n},F=function(t){return J.call(K,t)||{}},N=function(t){return Q.call(K,t)}}else{var Z=W("state");Y[Z]=!0,L=function(t,n){return C(t,Z,n),n},F=function(t){return S(t,Z)?t[Z]:{}},N=function(t){return S(t,Z)}}var tt,nt={set:L,get:F,has:N,enforce:function(t){return N(t)?F(t):L(t,{})},getterFor:function(t){return function(n){var e;if(!y(n)||(e=F(n)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return e}}},et=e((function(t){var n=nt.get,e=nt.enforce,r=String(String).split("String");(t.exports=function(t,n,a,i){var c=!!i&&!!i.unsafe,l=!!i&&!!i.enumerable,s=!!i&&!!i.noTargetGet;"function"==typeof a&&("string"!=typeof n||S(a,"name")||C(a,"name",n),e(a).source=r.join("string"==typeof n?n:"")),t!==o?(c?!s&&t[n]&&(l=!0):delete t[n],l?t[n]=a:C(t,n,a)):l?t[n]=a:M(n,a)})(Function.prototype,"toString",(function(){return"function"==typeof this&&n(this).source||D(this)}))})),rt=o,ot=function(t){return"function"==typeof t?t:void 0},at=function(t,n){return arguments.length<2?ot(rt[t])||ot(o[t]):rt[t]&&rt[t][n]||o[t]&&o[t][n]},it=Math.ceil,ct=Math.floor,lt=function(t){return isNaN(t=+t)?0:(t>0?ct:it)(t)},st=Math.min,ut=function(t){return t>0?st(lt(t),9007199254740991):0},dt=Math.max,ft=Math.min,pt=function(t){return function(n,e,r){var o,a=b(n),i=ut(a.length),c=function(t,n){var e=lt(t);return e<0?dt(e+n,0):ft(e,n)}(r,i);if(t&&e!=e){for(;i>c;)if((o=a[c++])!=o)return!0}else for(;i>c;c++)if((t||c in a)&&a[c]===e)return t||c||0;return!t&&-1}},ht={includes:pt(!0),indexOf:pt(!1)},vt=ht.indexOf,bt=function(t,n){var e,r=b(t),o=0,a=[];for(e in r)!S(Y,e)&&S(r,e)&&a.push(e);for(;n.length>o;)S(r,e=n[o++])&&(~vt(a,e)||a.push(e));return a},yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],mt=yt.concat("length","prototype"),gt={f:Object.getOwnPropertyNames||function(t){return bt(t,mt)}},St={f:Object.getOwnPropertySymbols},Ot=at("Reflect","ownKeys")||function(t){var n=gt.f(_(t)),e=St.f;return e?n.concat(e(t)):n},wt=function(t,n){for(var e=Ot(n),r=P.f,o=A.f,a=0;a<e.length;a++){var i=e[a];S(t,i)||r(t,i,o(n,i))}},xt=/#|\.prototype\./,Tt=function(t,n){var e=At[jt(t)];return e==Et||e!=_t&&("function"==typeof n?a(n):!!n)},jt=Tt.normalize=function(t){return String(t).replace(xt,".").toLowerCase()},At=Tt.data={},_t=Tt.NATIVE="N",Et=Tt.POLYFILL="P",Pt=Tt,Ct=A.f,Mt=function(t,n){var e,r,a,i,c,l=t.target,s=t.global,u=t.stat;if(e=s?o:u?o[l]||M(l,{}):(o[l]||{}).prototype)for(r in n){if(i=n[r],a=t.noTargetGet?(c=Ct(e,r))&&c.value:e[r],!Pt(s?r:l+(u?".":"#")+r,t.forced)&&void 0!==a){if(typeof i==typeof a)continue;wt(i,a)}(t.sham||a&&a.sham)&&C(i,"sham",!0),et(e,r,i,t)}},It=!!Object.getOwnPropertySymbols&&!a((function(){return!String(Symbol())})),kt=It&&!Symbol.sham&&"symbol"==typeof Symbol(),Rt=Array.isArray||function(t){return"Array"==f(t)},Lt=function(t){return Object(v(t))},Ft=Object.keys||function(t){return bt(t,yt)},Nt=i?Object.defineProperties:function(t,n){_(t);for(var e,r=Ft(n),o=r.length,a=0;o>a;)P.f(t,e=r[a++],n[e]);return t},Dt=at("document","documentElement"),Gt=W("IE_PROTO"),Bt=function(){},Vt=function(t){return"<script>"+t+"</"+"script>"},zt=function(){try{tt=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,n;zt=tt?function(t){t.write(Vt("")),t.close();var n=t.parentWindow.Object;return t=null,n}(tt):((n=x("iframe")).style.display="none",Dt.appendChild(n),n.src=String("javascript:"),(t=n.contentWindow.document).open(),t.write(Vt("document.F=Object")),t.close(),t.F);for(var e=yt.length;e--;)delete zt.prototype[yt[e]];return zt()};Y[Gt]=!0;var $t=Object.create||function(t,n){var e;return null!==t?(Bt.prototype=_(t),e=new Bt,Bt.prototype=null,e[Gt]=t):e=zt(),void 0===n?e:Nt(e,n)},Ut=gt.f,qt={}.toString,Wt="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Yt={f:function(t){return Wt&&"[object Window]"==qt.call(t)?function(t){try{return Ut(t)}catch(t){return Wt.slice()}}(t):Ut(b(t))}},Ht=V("wks"),Kt=o.Symbol,Jt=kt?Kt:U,Qt=function(t){return S(Ht,t)||(It&&S(Kt,t)?Ht[t]=Kt[t]:Ht[t]=Jt("Symbol."+t)),Ht[t]},Xt={f:Qt},Zt=P.f,tn=function(t){var n=rt.Symbol||(rt.Symbol={});S(n,t)||Zt(n,t,{value:Xt.f(t)})},nn=P.f,en=Qt("toStringTag"),rn=function(t,n,e){t&&!S(t=e?t:t.prototype,en)&&nn(t,en,{configurable:!0,value:n})},on=function(t,n,e){if(function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function")}(t),void 0===n)return t;switch(e){case 0:return function(){return t.call(n)};case 1:return function(e){return t.call(n,e)};case 2:return function(e,r){return t.call(n,e,r)};case 3:return function(e,r,o){return t.call(n,e,r,o)}}return function(){return t.apply(n,arguments)}},an=Qt("species"),cn=function(t,n){var e;return Rt(t)&&("function"!=typeof(e=t.constructor)||e!==Array&&!Rt(e.prototype)?y(e)&&null===(e=e[an])&&(e=void 0):e=void 0),new(void 0===e?Array:e)(0===n?0:n)},ln=[].push,sn=function(t){var n=1==t,e=2==t,r=3==t,o=4==t,a=6==t,i=5==t||a;return function(c,l,s,u){for(var d,f,p=Lt(c),v=h(p),b=on(l,s,3),y=ut(v.length),m=0,g=u||cn,S=n?g(c,y):e?g(c,0):void 0;y>m;m++)if((i||m in v)&&(f=b(d=v[m],m,p),t))if(n)S[m]=f;else if(f)switch(t){case 3:return!0;case 5:return d;case 6:return m;case 2:ln.call(S,d)}else if(o)return!1;return a?-1:r||o?o:S}},un={forEach:sn(0),map:sn(1),filter:sn(2),some:sn(3),every:sn(4),find:sn(5),findIndex:sn(6)},dn=un.forEach,fn=W("hidden"),pn="Symbol",hn=Qt("toPrimitive"),vn=nt.set,bn=nt.getterFor(pn),yn=Object.prototype,mn=o.Symbol,gn=at("JSON","stringify"),Sn=A.f,On=P.f,wn=Yt.f,xn=s.f,Tn=V("symbols"),jn=V("op-symbols"),An=V("string-to-symbol-registry"),_n=V("symbol-to-string-registry"),En=V("wks"),Pn=o.QObject,Cn=!Pn||!Pn.prototype||!Pn.prototype.findChild,Mn=i&&a((function(){return 7!=$t(On({},"a",{get:function(){return On(this,"a",{value:7}).a}})).a}))?function(t,n,e){var r=Sn(yn,n);r&&delete yn[n],On(t,n,e),r&&t!==yn&&On(yn,n,r)}:On,In=function(t,n){var e=Tn[t]=$t(mn.prototype);return vn(e,{type:pn,tag:t,description:n}),i||(e.description=n),e},kn=It&&"symbol"==typeof mn.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof mn},Rn=function(t,n,e){t===yn&&Rn(jn,n,e),_(t);var r=m(n,!0);return _(e),S(Tn,r)?(e.enumerable?(S(t,fn)&&t[fn][r]&&(t[fn][r]=!1),e=$t(e,{enumerable:u(0,!1)})):(S(t,fn)||On(t,fn,u(1,{})),t[fn][r]=!0),Mn(t,r,e)):On(t,r,e)},Ln=function(t,n){_(t);var e=b(n),r=Ft(e).concat(Gn(e));return dn(r,(function(n){i&&!Fn.call(e,n)||Rn(t,n,e[n])})),t},Fn=function(t){var n=m(t,!0),e=xn.call(this,n);return!(this===yn&&S(Tn,n)&&!S(jn,n))&&(!(e||!S(this,n)||!S(Tn,n)||S(this,fn)&&this[fn][n])||e)},Nn=function(t,n){var e=b(t),r=m(n,!0);if(e!==yn||!S(Tn,r)||S(jn,r)){var o=Sn(e,r);return!o||!S(Tn,r)||S(e,fn)&&e[fn][r]||(o.enumerable=!0),o}},Dn=function(t){var n=wn(b(t)),e=[];return dn(n,(function(t){S(Tn,t)||S(Y,t)||e.push(t)})),e},Gn=function(t){var n=t===yn,e=wn(n?jn:b(t)),r=[];return dn(e,(function(t){!S(Tn,t)||n&&!S(yn,t)||r.push(Tn[t])})),r};if(It||(et((mn=function(){if(this instanceof mn)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,n=U(t),e=function(t){this===yn&&e.call(jn,t),S(this,fn)&&S(this[fn],n)&&(this[fn][n]=!1),Mn(this,n,u(1,t))};return i&&Cn&&Mn(yn,n,{configurable:!0,set:e}),In(n,t)}).prototype,"toString",(function(){return bn(this).tag})),s.f=Fn,P.f=Rn,A.f=Nn,gt.f=Yt.f=Dn,St.f=Gn,i&&(On(mn.prototype,"description",{configurable:!0,get:function(){return bn(this).description}}),et(yn,"propertyIsEnumerable",Fn,{unsafe:!0}))),kt||(Xt.f=function(t){return In(Qt(t),t)}),Mt({global:!0,wrap:!0,forced:!It,sham:!It},{Symbol:mn}),dn(Ft(En),(function(t){tn(t)})),Mt({target:pn,stat:!0,forced:!It},{for:function(t){var n=String(t);if(S(An,n))return An[n];var e=mn(n);return An[n]=e,_n[e]=n,e},keyFor:function(t){if(!kn(t))throw TypeError(t+" is not a symbol");if(S(_n,t))return _n[t]},useSetter:function(){Cn=!0},useSimple:function(){Cn=!1}}),Mt({target:"Object",stat:!0,forced:!It,sham:!i},{create:function(t,n){return void 0===n?$t(t):Ln($t(t),n)},defineProperty:Rn,defineProperties:Ln,getOwnPropertyDescriptor:Nn}),Mt({target:"Object",stat:!0,forced:!It},{getOwnPropertyNames:Dn,getOwnPropertySymbols:Gn}),Mt({target:"Object",stat:!0,forced:a((function(){St.f(1)}))},{getOwnPropertySymbols:function(t){return St.f(Lt(t))}}),gn){var Bn=!It||a((function(){var t=mn();return"[null]"!=gn([t])||"{}"!=gn({a:t})||"{}"!=gn(Object(t))}));Mt({target:"JSON",stat:!0,forced:Bn},{stringify:function(t,n,e){for(var r,o=[t],a=1;arguments.length>a;)o.push(arguments[a++]);if(r=n,(y(n)||void 0!==t)&&!kn(t))return Rt(n)||(n=function(t,n){if("function"==typeof r&&(n=r.call(this,t,n)),!kn(n))return n}),o[1]=n,gn.apply(null,o)}})}mn.prototype[hn]||C(mn.prototype,hn,mn.prototype.valueOf),rn(mn,pn),Y[fn]=!0;var Vn=P.f,zn=o.Symbol;if(i&&"function"==typeof zn&&(!("description"in zn.prototype)||void 0!==zn().description)){var $n={},Un=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),n=this instanceof Un?new zn(t):void 0===t?zn():zn(t);return""===t&&($n[n]=!0),n};wt(Un,zn);var qn=Un.prototype=zn.prototype;qn.constructor=Un;var Wn=qn.toString,Yn="Symbol(test)"==String(zn("test")),Hn=/^Symbol\((.*)\)[^)]+$/;Vn(qn,"description",{configurable:!0,get:function(){var t=y(this)?this.valueOf():this,n=Wn.call(t);if(S($n,t))return"";var e=Yn?n.slice(7,-1):n.replace(Hn,"$1");return""===e?void 0:e}}),Mt({global:!0,forced:!0},{Symbol:Un})}tn("iterator");var Kn,Jn,Qn=function(t,n,e){var r=m(n);r in t?P.f(t,r,u(0,e)):t[r]=e},Xn=at("navigator","userAgent")||"",Zn=o.process,te=Zn&&Zn.versions,ne=te&&te.v8;ne?Jn=(Kn=ne.split("."))[0]+Kn[1]:Xn&&(!(Kn=Xn.match(/Edge\/(\d+)/))||Kn[1]>=74)&&(Kn=Xn.match(/Chrome\/(\d+)/))&&(Jn=Kn[1]);var ee=Jn&&+Jn,re=Qt("species"),oe=function(t){return ee>=51||!a((function(){var n=[];return(n.constructor={})[re]=function(){return{foo:1}},1!==n[t](Boolean).foo}))},ae=Qt("isConcatSpreadable"),ie=9007199254740991,ce="Maximum allowed index exceeded",le=ee>=51||!a((function(){var t=[];return t[ae]=!1,t.concat()[0]!==t})),se=oe("concat"),ue=function(t){if(!y(t))return!1;var n=t[ae];return void 0!==n?!!n:Rt(t)};Mt({target:"Array",proto:!0,forced:!le||!se},{concat:function(t){var n,e,r,o,a,i=Lt(this),c=cn(i,0),l=0;for(n=-1,r=arguments.length;n<r;n++)if(ue(a=-1===n?i:arguments[n])){if(l+(o=ut(a.length))>ie)throw TypeError(ce);for(e=0;e<o;e++,l++)e in a&&Qn(c,l,a[e])}else{if(l>=ie)throw TypeError(ce);Qn(c,l++,a)}return c.length=l,c}});var de=un.filter,fe=oe("filter"),pe=fe&&!a((function(){[].filter.call({length:-1,0:1},(function(t){throw t}))}));Mt({target:"Array",proto:!0,forced:!fe||!pe},{filter:function(t){return de(this,t,arguments.length>1?arguments[1]:void 0)}});var he=Qt("unscopables"),ve=Array.prototype;null==ve[he]&&P.f(ve,he,{configurable:!0,value:$t(null)});var be=function(t){ve[he][t]=!0},ye=un.find,me="find",ge=!0;me in[]&&Array(1).find((function(){ge=!1})),Mt({target:"Array",proto:!0,forced:ge},{find:function(t){return ye(this,t,arguments.length>1?arguments[1]:void 0)}}),be(me);var Se=ht.includes;Mt({target:"Array",proto:!0},{includes:function(t){return Se(this,t,arguments.length>1?arguments[1]:void 0)}}),be("includes");var Oe=function(t,n){var e=[][t];return!e||!a((function(){e.call(null,n||function(){throw 1},1)}))},we=ht.indexOf,xe=[].indexOf,Te=!!xe&&1/[1].indexOf(1,-0)<0,je=Oe("indexOf");Mt({target:"Array",proto:!0,forced:Te||je},{indexOf:function(t){return Te?xe.apply(this,arguments)||0:we(this,t,arguments.length>1?arguments[1]:void 0)}});var Ae,_e,Ee,Pe=!a((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),Ce=W("IE_PROTO"),Me=Object.prototype,Ie=Pe?Object.getPrototypeOf:function(t){return t=Lt(t),S(t,Ce)?t[Ce]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?Me:null},ke=Qt("iterator"),Re=!1;[].keys&&("next"in(Ee=[].keys())?(_e=Ie(Ie(Ee)))!==Object.prototype&&(Ae=_e):Re=!0),null==Ae&&(Ae={}),S(Ae,ke)||C(Ae,ke,(function(){return this}));var Le={IteratorPrototype:Ae,BUGGY_SAFARI_ITERATORS:Re},Fe=Le.IteratorPrototype,Ne=Object.setPrototypeOf||("__proto__"in{}?function(){var t,n=!1,e={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(e,[]),n=e instanceof Array}catch(t){}return function(e,r){return _(e),function(t){if(!y(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(r),n?t.call(e,r):e.__proto__=r,e}}():void 0),De=Le.IteratorPrototype,Ge=Le.BUGGY_SAFARI_ITERATORS,Be=Qt("iterator"),Ve="keys",ze="values",$e="entries",Ue=function(){return this},qe=function(t,n,e,r,o,a,i){!function(t,n,e){var r=n+" Iterator";t.prototype=$t(Fe,{next:u(1,e)}),rn(t,r,!1)}(e,n,r);var c,l,s,d=function(t){if(t===o&&b)return b;if(!Ge&&t in h)return h[t];switch(t){case Ve:case ze:case $e:return function(){return new e(this,t)}}return function(){return new e(this)}},f=n+" Iterator",p=!1,h=t.prototype,v=h[Be]||h["@@iterator"]||o&&h[o],b=!Ge&&v||d(o),y="Array"==n&&h.entries||v;if(y&&(c=Ie(y.call(new t)),De!==Object.prototype&&c.next&&(Ie(c)!==De&&(Ne?Ne(c,De):"function"!=typeof c[Be]&&C(c,Be,Ue)),rn(c,f,!0))),o==ze&&v&&v.name!==ze&&(p=!0,b=function(){return v.call(this)}),h[Be]!==b&&C(h,Be,b),o)if(l={values:d(ze),keys:a?b:d(Ve),entries:d($e)},i)for(s in l)(Ge||p||!(s in h))&&et(h,s,l[s]);else Mt({target:n,proto:!0,forced:Ge||p},l);return l},We="Array Iterator",Ye=nt.set,He=nt.getterFor(We),Ke=qe(Array,"Array",(function(t,n){Ye(this,{type:We,target:b(t),index:0,kind:n})}),(function(){var t=He(this),n=t.target,e=t.kind,r=t.index++;return!n||r>=n.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==e?{value:r,done:!1}:"values"==e?{value:n[r],done:!1}:{value:[r,n[r]],done:!1}}),"values");be("keys"),be("values"),be("entries");var Je=[].join,Qe=h!=Object,Xe=Oe("join",",");Mt({target:"Array",proto:!0,forced:Qe||Xe},{join:function(t){return Je.call(b(this),void 0===t?",":t)}});var Ze=Object.assign,tr=Object.defineProperty,nr=!Ze||a((function(){if(i&&1!==Ze({b:1},Ze(tr({},"a",{enumerable:!0,get:function(){tr(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},n={},e=Symbol(),r="abcdefghijklmnopqrst";return t[e]=7,r.split("").forEach((function(t){n[t]=t})),7!=Ze({},t)[e]||Ft(Ze({},n)).join("")!=r}))?function(t,n){for(var e=Lt(t),r=arguments.length,o=1,a=St.f,c=s.f;r>o;)for(var l,u=h(arguments[o++]),d=a?Ft(u).concat(a(u)):Ft(u),f=d.length,p=0;f>p;)l=d[p++],i&&!c.call(u,l)||(e[l]=u[l]);return e}:Ze;Mt({target:"Object",stat:!0,forced:Object.assign!==nr},{assign:nr});var er=s.f,rr=function(t){return function(n){for(var e,r=b(n),o=Ft(r),a=o.length,c=0,l=[];a>c;)e=o[c++],i&&!er.call(r,e)||l.push(t?[e,r[e]]:r[e]);return l}},or={entries:rr(!0),values:rr(!1)}.entries;Mt({target:"Object",stat:!0},{entries:function(t){return or(t)}});var ar={};ar[Qt("toStringTag")]="z";var ir="[object z]"===String(ar),cr=Qt("toStringTag"),lr="Arguments"==f(function(){return arguments}()),sr=ir?f:function(t){var n,e,r;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(e=function(t,n){try{return t[n]}catch(t){}}(n=Object(t),cr))?e:lr?f(n):"Object"==(r=f(n))&&"function"==typeof n.callee?"Arguments":r},ur=ir?{}.toString:function(){return"[object "+sr(this)+"]"};ir||et(Object.prototype,"toString",ur,{unsafe:!0});var dr=function(){var t=_(this),n="";return t.global&&(n+="g"),t.ignoreCase&&(n+="i"),t.multiline&&(n+="m"),t.dotAll&&(n+="s"),t.unicode&&(n+="u"),t.sticky&&(n+="y"),n};function fr(t,n){return RegExp(t,n)}var pr,hr,vr={UNSUPPORTED_Y:a((function(){var t=fr("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:a((function(){var t=fr("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},br=RegExp.prototype.exec,yr=String.prototype.replace,mr=br,gr=(pr=/a/,hr=/b*/g,br.call(pr,"a"),br.call(hr,"a"),0!==pr.lastIndex||0!==hr.lastIndex),Sr=vr.UNSUPPORTED_Y||vr.BROKEN_CARET,Or=void 0!==/()??/.exec("")[1];(gr||Or||Sr)&&(mr=function(t){var n,e,r,o,a=this,i=Sr&&a.sticky,c=dr.call(a),l=a.source,s=0,u=t;return i&&(-1===(c=c.replace("y","")).indexOf("g")&&(c+="g"),u=String(t).slice(a.lastIndex),a.lastIndex>0&&(!a.multiline||a.multiline&&"\n"!==t[a.lastIndex-1])&&(l="(?: "+l+")",u=" "+u,s++),e=new RegExp("^(?:"+l+")",c)),Or&&(e=new RegExp("^"+l+"$(?!\\s)",c)),gr&&(n=a.lastIndex),r=br.call(i?e:a,u),i?r?(r.input=r.input.slice(s),r[0]=r[0].slice(s),r.index=a.lastIndex,a.lastIndex+=r[0].length):a.lastIndex=0:gr&&r&&(a.lastIndex=a.global?r.index+r[0].length:n),Or&&r&&r.length>1&&yr.call(r[0],e,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(r[o]=void 0)})),r});var wr=mr;Mt({target:"RegExp",proto:!0,forced:/./.exec!==wr},{exec:wr});var xr=Qt("match"),Tr=function(t){if(function(t){var n;return y(t)&&(void 0!==(n=t[xr])?!!n:"RegExp"==f(t))}(t))throw TypeError("The method doesn't accept regular expressions");return t},jr=Qt("match");Mt({target:"String",proto:!0,forced:!function(t){var n=/./;try{"/./"[t](n)}catch(e){try{return n[jr]=!1,"/./"[t](n)}catch(t){}}return!1}("includes")},{includes:function(t){return!!~String(v(this)).indexOf(Tr(t),arguments.length>1?arguments[1]:void 0)}});var Ar=function(t){return function(n,e){var r,o,a=String(v(n)),i=lt(e),c=a.length;return i<0||i>=c?t?"":void 0:(r=a.charCodeAt(i))<55296||r>56319||i+1===c||(o=a.charCodeAt(i+1))<56320||o>57343?t?a.charAt(i):r:t?a.slice(i,i+2):o-56320+(r-55296<<10)+65536}},_r={codeAt:Ar(!1),charAt:Ar(!0)}.charAt,Er="String Iterator",Pr=nt.set,Cr=nt.getterFor(Er);qe(String,"String",(function(t){Pr(this,{type:Er,string:String(t),index:0})}),(function(){var t,n=Cr(this),e=n.string,r=n.index;return r>=e.length?{value:void 0,done:!0}:(t=_r(e,r),n.index+=t.length,{value:t,done:!1})}));var Mr=Qt("species"),Ir=!a((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),kr="$0"==="a".replace(/./,"$0"),Rr=!a((function(){var t=/(?:)/,n=t.exec;t.exec=function(){return n.apply(this,arguments)};var e="ab".split(t);return 2!==e.length||"a"!==e[0]||"b"!==e[1]})),Lr=Object.is||function(t,n){return t===n?0!==t||1/t==1/n:t!=t&&n!=n};!function(t,n,e,r){var o=Qt(t),i=!a((function(){var n={};return n[o]=function(){return 7},7!=""[t](n)})),c=i&&!a((function(){var n=!1,e=/a/;return"split"===t&&((e={}).constructor={},e.constructor[Mr]=function(){return e},e.flags="",e[o]=/./[o]),e.exec=function(){return n=!0,null},e[o](""),!n}));if(!i||!c||"replace"===t&&(!Ir||!kr)||"split"===t&&!Rr){var l=/./[o],s=e(o,""[t],(function(t,n,e,r,o){return n.exec===wr?i&&!o?{done:!0,value:l.call(n,e,r)}:{done:!0,value:t.call(e,n,r)}:{done:!1}}),{REPLACE_KEEPS_$0:kr}),u=s[0],d=s[1];et(String.prototype,t,u),et(RegExp.prototype,o,2==n?function(t,n){return d.call(t,this,n)}:function(t){return d.call(t,this)})}r&&C(RegExp.prototype[o],"sham",!0)}("search",1,(function(t,n,e){return[function(n){var e=v(this),r=null==n?void 0:n[t];return void 0!==r?r.call(n,e):new RegExp(n)[t](String(e))},function(t){var r=e(n,t,this);if(r.done)return r.value;var o=_(t),a=String(this),i=o.lastIndex;Lr(i,0)||(o.lastIndex=0);var c=function(t,n){var e=t.exec;if("function"==typeof e){var r=e.call(t,n);if("object"!=typeof r)throw TypeError("RegExp exec method returned something other than an Object or null");return r}if("RegExp"!==f(t))throw TypeError("RegExp#exec called on incompatible receiver");return wr.call(t,n)}(o,a);return Lr(o.lastIndex,i)||(o.lastIndex=i),null===c?-1:c.index}]}));var Fr="\t\n\v\f\r                　\u2028\u2029\ufeff",Nr="["+Fr+"]",Dr=RegExp("^"+Nr+Nr+"*"),Gr=RegExp(Nr+Nr+"*$"),Br=function(t){return function(n){var e=String(v(n));return 1&t&&(e=e.replace(Dr,"")),2&t&&(e=e.replace(Gr,"")),e}},Vr={start:Br(1),end:Br(2),trim:Br(3)},zr=Vr.trim;Mt({target:"String",proto:!0,forced:function(t){return a((function(){return!!Fr[t]()||"​…᠎"!="​…᠎"[t]()||Fr[t].name!==t}))}("trim")},{trim:function(){return zr(this)}});var $r={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},Ur=Qt("iterator"),qr=Qt("toStringTag"),Wr=Ke.values;for(var Yr in $r){var Hr=o[Yr],Kr=Hr&&Hr.prototype;if(Kr){if(Kr[Ur]!==Wr)try{C(Kr,Ur,Wr)}catch(t){Kr[Ur]=Wr}if(Kr[qr]||C(Kr,qr,Yr),$r[Yr])for(var Jr in Ke)if(Kr[Jr]!==Ke[Jr])try{C(Kr,Jr,Ke[Jr])}catch(t){Kr[Jr]=Ke[Jr]}}}function Qr(t,n){if(!(t instanceof n))throw new TypeError("Cannot call a class as a function")}function Xr(t,n){for(var e=0;e<n.length;e++){var r=n[e];r.enumerable=r.enumerable||!1,r.configurable=!0,"value"in r&&(r.writable=!0),Object.defineProperty(t,r.key,r)}}function Zr(t){return(Zr=Object.setPrototypeOf?Object.getPrototypeOf:function(t){return t.__proto__||Object.getPrototypeOf(t)})(t)}function to(t,n){return(to=Object.setPrototypeOf||function(t,n){return t.__proto__=n,t})(t,n)}function no(t,n){return!n||"object"!=typeof n&&"function"!=typeof n?function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(t):n}function eo(t,n,e){return(eo="undefined"!=typeof Reflect&&Reflect.get?Reflect.get:function(t,n,e){var r=function(t,n){for(;!Object.prototype.hasOwnProperty.call(t,n)&&null!==(t=Zr(t)););return t}(t,n);if(r){var o=Object.getOwnPropertyDescriptor(r,n);return o.get?o.get.call(e):o.value}})(t,n,e||t)}function ro(t,n){return function(t){if(Array.isArray(t))return t}(t)||function(t,n){if(!(Symbol.iterator in Object(t))&&"[object Arguments]"!==Object.prototype.toString.call(t))return;var e=[],r=!0,o=!1,a=void 0;try{for(var i,c=t[Symbol.iterator]();!(r=(i=c.next()).done)&&(e.push(i.value),!n||e.length!==n);r=!0);}catch(t){o=!0,a=t}finally{try{r||null==c.return||c.return()}finally{if(o)throw a}}return e}(t,n)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}function oo(t){return function(t){if(Array.isArray(t)){for(var n=0,e=new Array(t.length);n<t.length;n++)e[n]=t[n];return e}}(t)||function(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance")}()}var ao=t.fn.bootstrapTable.utils,io={bootstrap3:{icons:{advancedSearchIcon:"glyphicon-chevron-down"},html:{modal:'\n        <div id="avdSearchModal_%s"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">\n          <div class="modal-dialog modal-xs">\n            <div class="modal-content">\n              <div class="modal-header">\n                <h4 class="modal-title">%s</h4>\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close">\n                  <span aria-hidden="true">&times;</span>\n                </button>\n              </div>\n              <div class="modal-body modal-body-custom">\n                <div class="container-fluid" id="avdSearchModalContent_%s"\n                  style="padding-right: 0px; padding-left: 0px;" >\n                </div>\n              </div>\n              <div class="modal-footer">\n                <button type="button" id="btnCloseAvd_%s" class="btn btn-%s">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      '}},bootstrap4:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div id="avdSearchModal_%s"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">\n          <div class="modal-dialog modal-xs">\n            <div class="modal-content">\n              <div class="modal-header">\n                <h4 class="modal-title">%s</h4>\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close">\n                  <span aria-hidden="true">&times;</span>\n                </button>\n              </div>\n              <div class="modal-body modal-body-custom">\n                <div class="container-fluid" id="avdSearchModalContent_%s"\n                  style="padding-right: 0; padding-left: 0;" >\n                </div>\n              </div>\n              <div class="modal-footer">\n                <button type="button" id="btnCloseAvd_%s" class="btn btn-%s">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      '}},bootstrap5:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div id="avdSearchModal_%s"  class="modal fade" tabindex="-1" role="dialog" aria-labelledby="mySmallModalLabel" aria-hidden="true">\n          <div class="modal-dialog modal-xs">\n            <div class="modal-content">\n              <div class="modal-header">\n                <h4 class="modal-title">%s</h4>\n                <button type="button" class="close" data-dismiss="modal" aria-label="Close">\n                  <span aria-hidden="true">&times;</span>\n                </button>\n              </div>\n              <div class="modal-body modal-body-custom">\n                <div class="container-fluid" id="avdSearchModalContent_%s"\n                  style="padding-right: 0; padding-left: 0;" >\n                </div>\n              </div>\n              <div class="modal-footer">\n                <button type="button" id="btnCloseAvd_%s" class="btn btn-%s">%s</button>\n              </div>\n            </div>\n          </div>\n        </div>\n      '}},bulma:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div class="modal" id="avdSearchModal_%s">\n          <div class="modal-background"></div>\n          <div class="modal-card">\n            <header class="modal-card-head">\n              <p class="modal-card-title">%s</p>\n              <button class="delete" aria-label="close"></button>\n            </header>\n            <section class="modal-card-body" id="avdSearchModalContent_%s"></section>\n            <footer class="modal-card-foot">\n              <button class="button" id="btnCloseAvd_%s" data-close="btn btn-%s">%s</button>\n            </footer>\n          </div>\n        </div>\n      '}},foundation:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div class="reveal" id="avdSearchModal_%s" data-reveal>\n          <h1>%s</h1>\n          <div id="avdSearchModalContent_%s">\n\n          </div>\n          <button class="close-button" data-close aria-label="Close modal" type="button">\n            <span aria-hidden="true">&times;</span>\n          </button>\n\n          <button id="btnCloseAvd_%s" class="%s" type="button">%s</button>\n        </div>\n      '}},materialize:{icons:{advancedSearchIcon:"expand_more"},html:{modal:'\n        <div id="avdSearchModal_%s" class="modal">\n          <div class="modal-content">\n            <h4>%s</h4>\n            <div id="avdSearchModalContent_%s">\n\n            </div>\n          </div>\n          <div class="modal-footer">\n            <a href="javascript:void(0)"" id="btnCloseAvd_%s" class="modal-close waves-effect waves-green btn-flat %s">%s</a>\n          </div>\n        </div>\n      '}},semantic:{icons:{advancedSearchIcon:"fa-chevron-down"},html:{modal:'\n        <div class="ui modal" id="avdSearchModal_%s">\n          <i class="close icon"></i>\n          <div class="header">\n            %s\n          </div>\n          <div class="image content ui form" id="avdSearchModalContent_%s"></div>\n          <div class="actions">\n            <div id="btnCloseAvd_%s" class="ui black deny button %s">%s</div>\n          </div>\n        </div>\n      '}}}[t.fn.bootstrapTable.theme];t.extend(t.fn.bootstrapTable.defaults,{advancedSearch:!1,idForm:"advancedSearch",actionForm:"",idTable:void 0,onColumnAdvancedSearch:function(t,n){return!1}}),t.extend(t.fn.bootstrapTable.defaults.icons,{advancedSearchIcon:io.icons.advancedSearchIcon}),t.extend(t.fn.bootstrapTable.Constructor.EVENTS,{"column-advanced-search.bs.table":"onColumnAdvancedSearch"}),t.extend(t.fn.bootstrapTable.locales,{formatAdvancedSearch:function(){return"Advanced search"},formatAdvancedCloseButton:function(){return"Close"}}),t.extend(t.fn.bootstrapTable.defaults,t.fn.bootstrapTable.locales),t.BootstrapTable=function(n){function e(){return Qr(this,e),no(this,Zr(e).apply(this,arguments))}var r,o,a;return function(t,n){if("function"!=typeof n&&null!==n)throw new TypeError("Super expression must either be null or a function");t.prototype=Object.create(n&&n.prototype,{constructor:{value:t,writable:!0,configurable:!0}}),n&&to(t,n)}(e,n),r=e,(o=[{key:"initToolbar",value:function(){var t=this.options;this.showToolbar=this.showToolbar||t.search&&t.advancedSearch&&t.idTable,t.search&&t.advancedSearch&&t.idTable&&(this.buttons=Object.assign(this.buttons,{advancedSearch:{text:this.options.formatAdvancedSearch(),icon:this.options.icons.advancedSearchIcon,event:this.showAvdSearch,attributes:{"aria-label":this.options.formatAdvancedSearch(),title:this.options.formatAdvancedSearch()}}})),eo(Zr(e.prototype),"initToolbar",this).call(this)}},{key:"showAvdSearch",value:function(){var n=this,e=this.options,r="#avdSearchModal_"+e.idTable;if(t(r).length<=0){t("body").append(ao.sprintf(io.html.modal,e.idTable,e.formatAdvancedSearch(),e.idTable,e.idTable,e.buttonsClass,e.formatAdvancedCloseButton()));var o=0;t("#avdSearchModalContent_".concat(e.idTable)).append(this.createFormAvd().join("")),t("#".concat(e.idForm)).off("keyup blur","input").on("keyup blur","input",(function(t){"server"===e.sidePagination?n.onColumnAdvancedSearch(t):(clearTimeout(o),o=setTimeout((function(){n.onColumnAdvancedSearch(t)}),e.searchTimeOut))})),t("#btnCloseAvd_".concat(e.idTable)).click((function(){return n.hideModal()})),"bulma"===t.fn.bootstrapTable.theme&&t(r).find(".delete").off("click").on("click",(function(){return n.hideModal()})),this.showModal()}else this.showModal()}},{key:"showModal",value:function(){var n="#avdSearchModal_"+this.options.idTable;-1!==t.inArray(t.fn.bootstrapTable.theme,["bootstrap3","bootstrap4"])?t(n).modal():"bootstrap5"===t.fn.bootstrapTable.theme?(this.toolbarModal||(this.toolbarModal=new bootstrap.Modal(document.getElementById("avdSearchModal_"+this.options.idTable),{})),this.toolbarModal.show()):"bulma"===t.fn.bootstrapTable.theme?t(n).toggleClass("is-active"):"foundation"===t.fn.bootstrapTable.theme?(this.toolbarModal||(this.toolbarModal=new Foundation.Reveal(t(n))),this.toolbarModal.open()):"materialize"===t.fn.bootstrapTable.theme?(t(n).modal(),t(n).modal("open")):"semantic"===t.fn.bootstrapTable.theme&&t(n).modal("show")}},{key:"hideModal",value:function(){var n=t("#avdSearchModal_".concat(this.options.idTable)),e="#avdSearchModal_"+this.options.idTable;-1!==t.inArray(t.fn.bootstrapTable.theme,["bootstrap3","bootstrap4"])?n.modal("hide"):"bootstrap5"===t.fn.bootstrapTable.theme?this.toolbarModal.hide():"bulma"===t.fn.bootstrapTable.theme?(t("html").toggleClass("is-clipped"),t(e).toggleClass("is-active")):"foundation"===t.fn.bootstrapTable.theme?this.toolbarModal.close():"materialize"===t.fn.bootstrapTable.theme?t(e).modal("open"):"semantic"===t.fn.bootstrapTable.theme&&t(e).modal("close"),"server"===this.options.sidePagination&&(this.options.pageNumber=1,this.updatePagination(),this.trigger("column-advanced-search",this.filterColumnsPartial))}},{key:"createFormAvd",value:function(){var t=this.options,n=['<form class="form-horizontal" id="'.concat(t.idForm,'" action="').concat(t.actionForm,'">')],e=!0,r=!1,o=void 0;try{for(var a,i=this.columns[Symbol.iterator]();!(e=(a=i.next()).done);e=!0){var c=a.value;!c.checkbox&&c.visible&&c.searchable&&n.push('\n          <div class="form-group row">\n            <label class="col-sm-4 control-label">'.concat(c.title,'</label>\n            <div class="col-sm-6">\n              <input type="text" class="form-control ').concat(this.constants.classes.input,'" name="').concat(c.field,'" placeholder="').concat(c.title,'" id="').concat(c.field,'">\n            </div>\n          </div>\n        '))}}catch(t){r=!0,o=t}finally{try{e||null==i.return||i.return()}finally{if(r)throw o}}return n.push("</form>"),n}},{key:"initSearch",value:function(){var n=this;if(eo(Zr(e.prototype),"initSearch",this).call(this),this.options.advancedSearch&&"server"!==this.options.sidePagination){var r=t.isEmptyObject(this.filterColumnsPartial)?null:this.filterColumnsPartial;this.data=r?this.data.filter((function(t,e){for(var o=0,a=Object.entries(r);o<a.length;o++){var i=ro(a[o],2),c=i[0],l=i[1].toLowerCase(),s=t[c],u=n.header.fields.indexOf(c);if(s=ao.calculateObjectValue(n.header,n.header.formatters[u],[s,t,e],s),-1===u||"string"!=typeof s&&"number"!=typeof s||!"".concat(s).toLowerCase().includes(l))return!1}return!0})):this.data,this.unsortedData=oo(this.data)}}},{key:"onColumnAdvancedSearch",value:function(n){var e=t.trim(t(n.currentTarget).val()),r=t(n.currentTarget)[0].id;t.isEmptyObject(this.filterColumnsPartial)&&(this.filterColumnsPartial={}),e?this.filterColumnsPartial[r]=e:delete this.filterColumnsPartial[r],"server"!==this.options.sidePagination&&(this.options.pageNumber=1,this.onSearch(n),this.updatePagination(),this.trigger("column-advanced-search",r,e))}}])&&Xr(r.prototype,o),a&&Xr(r,a),e}(t.BootstrapTable)}));
diff --git a/web/skins/classic/js/bootstrap-table.min.js b/web/skins/classic/js/bootstrap-table.min.js
index 57ea49dc0..cea3aca2e 100644
--- a/web/skins/classic/js/bootstrap-table.min.js
+++ b/web/skins/classic/js/bootstrap-table.min.js
@@ -1,10 +1,10 @@
 /**
   * bootstrap-table - An extended table to integration with some of the most widely used CSS frameworks. (Supports Bootstrap, Semantic UI, Bulma, Material Design, Foundation)
   *
-  * @version v1.17.1
+  * @version v1.18.0
   * @homepage https://bootstrap-table.com
   * @author wenzhixin <wenzhixin2010@gmail.com> (http://wenzhixin.net.cn/)
   * @license MIT
   */
 
-!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):(t=t||self).BootstrapTable=e(t.jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function i(t,e){return t(e={exports:{}},e.exports),e.exports}var n=function(t){return t&&t.Math==Math&&t},o=n("object"==typeof globalThis&&globalThis)||n("object"==typeof window&&window)||n("object"==typeof self&&self)||n("object"==typeof e&&e)||Function("return this")(),r=function(t){try{return!!t()}catch(t){return!0}},a=!r((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),s={}.propertyIsEnumerable,l=Object.getOwnPropertyDescriptor,c={f:l&&!s.call({1:2},1)?function(t){var e=l(this,t);return!!e&&e.enumerable}:s},h=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},u={}.toString,d=function(t){return u.call(t).slice(8,-1)},p="".split,f=r((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==d(t)?p.call(t,""):Object(t)}:Object,g=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},v=function(t){return f(g(t))},b=function(t){return"object"==typeof t?null!==t:"function"==typeof t},m=function(t,e){if(!b(t))return t;var i,n;if(e&&"function"==typeof(i=t.toString)&&!b(n=i.call(t)))return n;if("function"==typeof(i=t.valueOf)&&!b(n=i.call(t)))return n;if(!e&&"function"==typeof(i=t.toString)&&!b(n=i.call(t)))return n;throw TypeError("Can't convert object to primitive value")},y={}.hasOwnProperty,w=function(t,e){return y.call(t,e)},S=o.document,x=b(S)&&b(S.createElement),k=function(t){return x?S.createElement(t):{}},O=!a&&!r((function(){return 7!=Object.defineProperty(k("div"),"a",{get:function(){return 7}}).a})),C=Object.getOwnPropertyDescriptor,T={f:a?C:function(t,e){if(t=v(t),e=m(e,!0),O)try{return C(t,e)}catch(t){}if(w(t,e))return h(!c.f.call(t,e),t[e])}},P=function(t){if(!b(t))throw TypeError(String(t)+" is not an object");return t},I=Object.defineProperty,A={f:a?I:function(t,e,i){if(P(t),e=m(e,!0),P(i),O)try{return I(t,e,i)}catch(t){}if("get"in i||"set"in i)throw TypeError("Accessors not supported");return"value"in i&&(t[e]=i.value),t}},$=a?function(t,e,i){return A.f(t,e,h(1,i))}:function(t,e,i){return t[e]=i,t},E=function(t,e){try{$(o,t,e)}catch(i){o[t]=e}return e},R=o["__core-js_shared__"]||E("__core-js_shared__",{}),j=Function.toString;"function"!=typeof R.inspectSource&&(R.inspectSource=function(t){return j.call(t)});var N,F,_,B=R.inspectSource,V=o.WeakMap,D="function"==typeof V&&/native code/.test(B(V)),L=i((function(t){(t.exports=function(t,e){return R[t]||(R[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),H=0,M=Math.random(),U=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++H+M).toString(36)},z=L("keys"),q=function(t){return z[t]||(z[t]=U(t))},W={},G=o.WeakMap;if(D){var K=new G,J=K.get,Y=K.has,X=K.set;N=function(t,e){return X.call(K,t,e),e},F=function(t){return J.call(K,t)||{}},_=function(t){return Y.call(K,t)}}else{var Q=q("state");W[Q]=!0,N=function(t,e){return $(t,Q,e),e},F=function(t){return w(t,Q)?t[Q]:{}},_=function(t){return w(t,Q)}}var Z,tt={set:N,get:F,has:_,enforce:function(t){return _(t)?F(t):N(t,{})},getterFor:function(t){return function(e){var i;if(!b(e)||(i=F(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return i}}},et=i((function(t){var e=tt.get,i=tt.enforce,n=String(String).split("String");(t.exports=function(t,e,r,a){var s=!!a&&!!a.unsafe,l=!!a&&!!a.enumerable,c=!!a&&!!a.noTargetGet;"function"==typeof r&&("string"!=typeof e||w(r,"name")||$(r,"name",e),i(r).source=n.join("string"==typeof e?e:"")),t!==o?(s?!c&&t[e]&&(l=!0):delete t[e],l?t[e]=r:$(t,e,r)):l?t[e]=r:E(e,r)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||B(this)}))})),it=o,nt=function(t){return"function"==typeof t?t:void 0},ot=function(t,e){return arguments.length<2?nt(it[t])||nt(o[t]):it[t]&&it[t][e]||o[t]&&o[t][e]},rt=Math.ceil,at=Math.floor,st=function(t){return isNaN(t=+t)?0:(t>0?at:rt)(t)},lt=Math.min,ct=function(t){return t>0?lt(st(t),9007199254740991):0},ht=Math.max,ut=Math.min,dt=function(t,e){var i=st(t);return i<0?ht(i+e,0):ut(i,e)},pt=function(t){return function(e,i,n){var o,r=v(e),a=ct(r.length),s=dt(n,a);if(t&&i!=i){for(;a>s;)if((o=r[s++])!=o)return!0}else for(;a>s;s++)if((t||s in r)&&r[s]===i)return t||s||0;return!t&&-1}},ft={includes:pt(!0),indexOf:pt(!1)},gt=ft.indexOf,vt=function(t,e){var i,n=v(t),o=0,r=[];for(i in n)!w(W,i)&&w(n,i)&&r.push(i);for(;e.length>o;)w(n,i=e[o++])&&(~gt(r,i)||r.push(i));return r},bt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],mt=bt.concat("length","prototype"),yt={f:Object.getOwnPropertyNames||function(t){return vt(t,mt)}},wt={f:Object.getOwnPropertySymbols},St=ot("Reflect","ownKeys")||function(t){var e=yt.f(P(t)),i=wt.f;return i?e.concat(i(t)):e},xt=function(t,e){for(var i=St(e),n=A.f,o=T.f,r=0;r<i.length;r++){var a=i[r];w(t,a)||n(t,a,o(e,a))}},kt=/#|\.prototype\./,Ot=function(t,e){var i=Tt[Ct(t)];return i==It||i!=Pt&&("function"==typeof e?r(e):!!e)},Ct=Ot.normalize=function(t){return String(t).replace(kt,".").toLowerCase()},Tt=Ot.data={},Pt=Ot.NATIVE="N",It=Ot.POLYFILL="P",At=Ot,$t=T.f,Et=function(t,e){var i,n,r,a,s,l=t.target,c=t.global,h=t.stat;if(i=c?o:h?o[l]||E(l,{}):(o[l]||{}).prototype)for(n in e){if(a=e[n],r=t.noTargetGet?(s=$t(i,n))&&s.value:i[n],!At(c?n:l+(h?".":"#")+n,t.forced)&&void 0!==r){if(typeof a==typeof r)continue;xt(a,r)}(t.sham||r&&r.sham)&&$(a,"sham",!0),et(i,n,a,t)}},Rt=!!Object.getOwnPropertySymbols&&!r((function(){return!String(Symbol())})),jt=Rt&&!Symbol.sham&&"symbol"==typeof Symbol(),Nt=Array.isArray||function(t){return"Array"==d(t)},Ft=function(t){return Object(g(t))},_t=Object.keys||function(t){return vt(t,bt)},Bt=a?Object.defineProperties:function(t,e){P(t);for(var i,n=_t(e),o=n.length,r=0;o>r;)A.f(t,i=n[r++],e[i]);return t},Vt=ot("document","documentElement"),Dt=q("IE_PROTO"),Lt=function(){},Ht=function(t){return"<script>"+t+"<\/script>"},Mt=function(){try{Z=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;Mt=Z?function(t){t.write(Ht("")),t.close();var e=t.parentWindow.Object;return t=null,e}(Z):((e=k("iframe")).style.display="none",Vt.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(Ht("document.F=Object")),t.close(),t.F);for(var i=bt.length;i--;)delete Mt.prototype[bt[i]];return Mt()};W[Dt]=!0;var Ut=Object.create||function(t,e){var i;return null!==t?(Lt.prototype=P(t),i=new Lt,Lt.prototype=null,i[Dt]=t):i=Mt(),void 0===e?i:Bt(i,e)},zt=yt.f,qt={}.toString,Wt="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Gt={f:function(t){return Wt&&"[object Window]"==qt.call(t)?function(t){try{return zt(t)}catch(t){return Wt.slice()}}(t):zt(v(t))}},Kt=L("wks"),Jt=o.Symbol,Yt=jt?Jt:U,Xt=function(t){return w(Kt,t)||(Rt&&w(Jt,t)?Kt[t]=Jt[t]:Kt[t]=Yt("Symbol."+t)),Kt[t]},Qt={f:Xt},Zt=A.f,te=function(t){var e=it.Symbol||(it.Symbol={});w(e,t)||Zt(e,t,{value:Qt.f(t)})},ee=A.f,ie=Xt("toStringTag"),ne=function(t,e,i){t&&!w(t=i?t:t.prototype,ie)&&ee(t,ie,{configurable:!0,value:e})},oe=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},re=Xt("species"),ae=function(t,e){var i;return Nt(t)&&("function"!=typeof(i=t.constructor)||i!==Array&&!Nt(i.prototype)?b(i)&&null===(i=i[re])&&(i=void 0):i=void 0),new(void 0===i?Array:i)(0===e?0:e)},se=[].push,le=function(t){var e=1==t,i=2==t,n=3==t,o=4==t,r=6==t,a=5==t||r;return function(s,l,c,h){for(var u,d,p=Ft(s),g=f(p),v=function(t,e,i){if(oe(t),void 0===e)return t;switch(i){case 0:return function(){return t.call(e)};case 1:return function(i){return t.call(e,i)};case 2:return function(i,n){return t.call(e,i,n)};case 3:return function(i,n,o){return t.call(e,i,n,o)}}return function(){return t.apply(e,arguments)}}(l,c,3),b=ct(g.length),m=0,y=h||ae,w=e?y(s,b):i?y(s,0):void 0;b>m;m++)if((a||m in g)&&(d=v(u=g[m],m,p),t))if(e)w[m]=d;else if(d)switch(t){case 3:return!0;case 5:return u;case 6:return m;case 2:se.call(w,u)}else if(o)return!1;return r?-1:n||o?o:w}},ce={forEach:le(0),map:le(1),filter:le(2),some:le(3),every:le(4),find:le(5),findIndex:le(6)},he=ce.forEach,ue=q("hidden"),de=Xt("toPrimitive"),pe=tt.set,fe=tt.getterFor("Symbol"),ge=Object.prototype,ve=o.Symbol,be=ot("JSON","stringify"),me=T.f,ye=A.f,we=Gt.f,Se=c.f,xe=L("symbols"),ke=L("op-symbols"),Oe=L("string-to-symbol-registry"),Ce=L("symbol-to-string-registry"),Te=L("wks"),Pe=o.QObject,Ie=!Pe||!Pe.prototype||!Pe.prototype.findChild,Ae=a&&r((function(){return 7!=Ut(ye({},"a",{get:function(){return ye(this,"a",{value:7}).a}})).a}))?function(t,e,i){var n=me(ge,e);n&&delete ge[e],ye(t,e,i),n&&t!==ge&&ye(ge,e,n)}:ye,$e=function(t,e){var i=xe[t]=Ut(ve.prototype);return pe(i,{type:"Symbol",tag:t,description:e}),a||(i.description=e),i},Ee=Rt&&"symbol"==typeof ve.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof ve},Re=function(t,e,i){t===ge&&Re(ke,e,i),P(t);var n=m(e,!0);return P(i),w(xe,n)?(i.enumerable?(w(t,ue)&&t[ue][n]&&(t[ue][n]=!1),i=Ut(i,{enumerable:h(0,!1)})):(w(t,ue)||ye(t,ue,h(1,{})),t[ue][n]=!0),Ae(t,n,i)):ye(t,n,i)},je=function(t,e){P(t);var i=v(e),n=_t(i).concat(Be(i));return he(n,(function(e){a&&!Ne.call(i,e)||Re(t,e,i[e])})),t},Ne=function(t){var e=m(t,!0),i=Se.call(this,e);return!(this===ge&&w(xe,e)&&!w(ke,e))&&(!(i||!w(this,e)||!w(xe,e)||w(this,ue)&&this[ue][e])||i)},Fe=function(t,e){var i=v(t),n=m(e,!0);if(i!==ge||!w(xe,n)||w(ke,n)){var o=me(i,n);return!o||!w(xe,n)||w(i,ue)&&i[ue][n]||(o.enumerable=!0),o}},_e=function(t){var e=we(v(t)),i=[];return he(e,(function(t){w(xe,t)||w(W,t)||i.push(t)})),i},Be=function(t){var e=t===ge,i=we(e?ke:v(t)),n=[];return he(i,(function(t){!w(xe,t)||e&&!w(ge,t)||n.push(xe[t])})),n};if(Rt||(et((ve=function(){if(this instanceof ve)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=U(t),i=function(t){this===ge&&i.call(ke,t),w(this,ue)&&w(this[ue],e)&&(this[ue][e]=!1),Ae(this,e,h(1,t))};return a&&Ie&&Ae(ge,e,{configurable:!0,set:i}),$e(e,t)}).prototype,"toString",(function(){return fe(this).tag})),c.f=Ne,A.f=Re,T.f=Fe,yt.f=Gt.f=_e,wt.f=Be,a&&(ye(ve.prototype,"description",{configurable:!0,get:function(){return fe(this).description}}),et(ge,"propertyIsEnumerable",Ne,{unsafe:!0}))),jt||(Qt.f=function(t){return $e(Xt(t),t)}),Et({global:!0,wrap:!0,forced:!Rt,sham:!Rt},{Symbol:ve}),he(_t(Te),(function(t){te(t)})),Et({target:"Symbol",stat:!0,forced:!Rt},{for:function(t){var e=String(t);if(w(Oe,e))return Oe[e];var i=ve(e);return Oe[e]=i,Ce[i]=e,i},keyFor:function(t){if(!Ee(t))throw TypeError(t+" is not a symbol");if(w(Ce,t))return Ce[t]},useSetter:function(){Ie=!0},useSimple:function(){Ie=!1}}),Et({target:"Object",stat:!0,forced:!Rt,sham:!a},{create:function(t,e){return void 0===e?Ut(t):je(Ut(t),e)},defineProperty:Re,defineProperties:je,getOwnPropertyDescriptor:Fe}),Et({target:"Object",stat:!0,forced:!Rt},{getOwnPropertyNames:_e,getOwnPropertySymbols:Be}),Et({target:"Object",stat:!0,forced:r((function(){wt.f(1)}))},{getOwnPropertySymbols:function(t){return wt.f(Ft(t))}}),be){var Ve=!Rt||r((function(){var t=ve();return"[null]"!=be([t])||"{}"!=be({a:t})||"{}"!=be(Object(t))}));Et({target:"JSON",stat:!0,forced:Ve},{stringify:function(t,e,i){for(var n,o=[t],r=1;arguments.length>r;)o.push(arguments[r++]);if(n=e,(b(e)||void 0!==t)&&!Ee(t))return Nt(e)||(e=function(t,e){if("function"==typeof n&&(e=n.call(this,t,e)),!Ee(e))return e}),o[1]=e,be.apply(null,o)}})}ve.prototype[de]||$(ve.prototype,de,ve.prototype.valueOf),ne(ve,"Symbol"),W[ue]=!0;var De=A.f,Le=o.Symbol;if(a&&"function"==typeof Le&&(!("description"in Le.prototype)||void 0!==Le().description)){var He={},Me=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof Me?new Le(t):void 0===t?Le():Le(t);return""===t&&(He[e]=!0),e};xt(Me,Le);var Ue=Me.prototype=Le.prototype;Ue.constructor=Me;var ze=Ue.toString,qe="Symbol(test)"==String(Le("test")),We=/^Symbol\((.*)\)[^)]+$/;De(Ue,"description",{configurable:!0,get:function(){var t=b(this)?this.valueOf():this,e=ze.call(t);if(w(He,t))return"";var i=qe?e.slice(7,-1):e.replace(We,"$1");return""===i?void 0:i}}),Et({global:!0,forced:!0},{Symbol:Me})}te("iterator");var Ge,Ke,Je=function(t,e,i){var n=m(e);n in t?A.f(t,n,h(0,i)):t[n]=i},Ye=ot("navigator","userAgent")||"",Xe=o.process,Qe=Xe&&Xe.versions,Ze=Qe&&Qe.v8;Ze?Ke=(Ge=Ze.split("."))[0]+Ge[1]:Ye&&(!(Ge=Ye.match(/Edge\/(\d+)/))||Ge[1]>=74)&&(Ge=Ye.match(/Chrome\/(\d+)/))&&(Ke=Ge[1]);var ti=Ke&&+Ke,ei=Xt("species"),ii=function(t){return ti>=51||!r((function(){var e=[];return(e.constructor={})[ei]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},ni=Xt("isConcatSpreadable"),oi=ti>=51||!r((function(){var t=[];return t[ni]=!1,t.concat()[0]!==t})),ri=ii("concat"),ai=function(t){if(!b(t))return!1;var e=t[ni];return void 0!==e?!!e:Nt(t)};Et({target:"Array",proto:!0,forced:!oi||!ri},{concat:function(t){var e,i,n,o,r,a=Ft(this),s=ae(a,0),l=0;for(e=-1,n=arguments.length;e<n;e++)if(ai(r=-1===e?a:arguments[e])){if(l+(o=ct(r.length))>9007199254740991)throw TypeError("Maximum allowed index exceeded");for(i=0;i<o;i++,l++)i in r&&Je(s,l,r[i])}else{if(l>=9007199254740991)throw TypeError("Maximum allowed index exceeded");Je(s,l++,r)}return s.length=l,s}});var si=ce.filter,li=ii("filter"),ci=li&&!r((function(){[].filter.call({length:-1,0:1},(function(t){throw t}))}));Et({target:"Array",proto:!0,forced:!li||!ci},{filter:function(t){return si(this,t,arguments.length>1?arguments[1]:void 0)}});var hi=Xt("unscopables"),ui=Array.prototype;null==ui[hi]&&A.f(ui,hi,{configurable:!0,value:Ut(null)});var di=function(t){ui[hi][t]=!0},pi=ce.find,fi=!0;"find"in[]&&Array(1).find((function(){fi=!1})),Et({target:"Array",proto:!0,forced:fi},{find:function(t){return pi(this,t,arguments.length>1?arguments[1]:void 0)}}),di("find");var gi=ce.findIndex,vi=!0;"findIndex"in[]&&Array(1).findIndex((function(){vi=!1})),Et({target:"Array",proto:!0,forced:vi},{findIndex:function(t){return gi(this,t,arguments.length>1?arguments[1]:void 0)}}),di("findIndex");var bi=ft.includes;Et({target:"Array",proto:!0},{includes:function(t){return bi(this,t,arguments.length>1?arguments[1]:void 0)}}),di("includes");var mi=function(t,e){var i=[][t];return!i||!r((function(){i.call(null,e||function(){throw 1},1)}))},yi=ft.indexOf,wi=[].indexOf,Si=!!wi&&1/[1].indexOf(1,-0)<0,xi=mi("indexOf");Et({target:"Array",proto:!0,forced:Si||xi},{indexOf:function(t){return Si?wi.apply(this,arguments)||0:yi(this,t,arguments.length>1?arguments[1]:void 0)}});var ki,Oi,Ci,Ti=!r((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),Pi=q("IE_PROTO"),Ii=Object.prototype,Ai=Ti?Object.getPrototypeOf:function(t){return t=Ft(t),w(t,Pi)?t[Pi]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?Ii:null},$i=Xt("iterator"),Ei=!1;[].keys&&("next"in(Ci=[].keys())?(Oi=Ai(Ai(Ci)))!==Object.prototype&&(ki=Oi):Ei=!0),null==ki&&(ki={}),w(ki,$i)||$(ki,$i,(function(){return this}));var Ri={IteratorPrototype:ki,BUGGY_SAFARI_ITERATORS:Ei},ji=Ri.IteratorPrototype,Ni=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,i={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(i,[]),e=i instanceof Array}catch(t){}return function(i,n){return P(i),function(t){if(!b(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(n),e?t.call(i,n):i.__proto__=n,i}}():void 0),Fi=Ri.IteratorPrototype,_i=Ri.BUGGY_SAFARI_ITERATORS,Bi=Xt("iterator"),Vi=function(){return this},Di=function(t,e,i,n,o,r,a){!function(t,e,i){var n=e+" Iterator";t.prototype=Ut(ji,{next:h(1,i)}),ne(t,n,!1)}(i,e,n);var s,l,c,u=function(t){if(t===o&&v)return v;if(!_i&&t in f)return f[t];switch(t){case"keys":case"values":case"entries":return function(){return new i(this,t)}}return function(){return new i(this)}},d=e+" Iterator",p=!1,f=t.prototype,g=f[Bi]||f["@@iterator"]||o&&f[o],v=!_i&&g||u(o),b="Array"==e&&f.entries||g;if(b&&(s=Ai(b.call(new t)),Fi!==Object.prototype&&s.next&&(Ai(s)!==Fi&&(Ni?Ni(s,Fi):"function"!=typeof s[Bi]&&$(s,Bi,Vi)),ne(s,d,!0))),"values"==o&&g&&"values"!==g.name&&(p=!0,v=function(){return g.call(this)}),f[Bi]!==v&&$(f,Bi,v),o)if(l={values:u("values"),keys:r?v:u("keys"),entries:u("entries")},a)for(c in l)(_i||p||!(c in f))&&et(f,c,l[c]);else Et({target:e,proto:!0,forced:_i||p},l);return l},Li=tt.set,Hi=tt.getterFor("Array Iterator"),Mi=Di(Array,"Array",(function(t,e){Li(this,{type:"Array Iterator",target:v(t),index:0,kind:e})}),(function(){var t=Hi(this),e=t.target,i=t.kind,n=t.index++;return!e||n>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==i?{value:n,done:!1}:"values"==i?{value:e[n],done:!1}:{value:[n,e[n]],done:!1}}),"values");di("keys"),di("values"),di("entries");var Ui=[].join,zi=f!=Object,qi=mi("join",",");Et({target:"Array",proto:!0,forced:zi||qi},{join:function(t){return Ui.call(v(this),void 0===t?",":t)}});var Wi=ce.map,Gi=ii("map"),Ki=Gi&&!r((function(){[].map.call({length:-1,0:1},(function(t){throw t}))}));Et({target:"Array",proto:!0,forced:!Gi||!Ki},{map:function(t){return Wi(this,t,arguments.length>1?arguments[1]:void 0)}});var Ji=[].reverse,Yi=[1,2];Et({target:"Array",proto:!0,forced:String(Yi)===String(Yi.reverse())},{reverse:function(){return Nt(this)&&(this.length=this.length),Ji.call(this)}});var Xi=Xt("species"),Qi=[].slice,Zi=Math.max;Et({target:"Array",proto:!0,forced:!ii("slice")},{slice:function(t,e){var i,n,o,r=v(this),a=ct(r.length),s=dt(t,a),l=dt(void 0===e?a:e,a);if(Nt(r)&&("function"!=typeof(i=r.constructor)||i!==Array&&!Nt(i.prototype)?b(i)&&null===(i=i[Xi])&&(i=void 0):i=void 0,i===Array||void 0===i))return Qi.call(r,s,l);for(n=new(void 0===i?Array:i)(Zi(l-s,0)),o=0;s<l;s++,o++)s in r&&Je(n,o,r[s]);return n.length=o,n}});var tn=[],en=tn.sort,nn=r((function(){tn.sort(void 0)})),on=r((function(){tn.sort(null)})),rn=mi("sort");Et({target:"Array",proto:!0,forced:nn||!on||rn},{sort:function(t){return void 0===t?en.call(Ft(this)):en.call(Ft(this),oe(t))}});var an=Math.max,sn=Math.min;Et({target:"Array",proto:!0,forced:!ii("splice")},{splice:function(t,e){var i,n,o,r,a,s,l=Ft(this),c=ct(l.length),h=dt(t,c),u=arguments.length;if(0===u?i=n=0:1===u?(i=0,n=c-h):(i=u-2,n=sn(an(st(e),0),c-h)),c+i-n>9007199254740991)throw TypeError("Maximum allowed length exceeded");for(o=ae(l,n),r=0;r<n;r++)(a=h+r)in l&&Je(o,r,l[a]);if(o.length=n,i<n){for(r=h;r<c-n;r++)s=r+i,(a=r+n)in l?l[s]=l[a]:delete l[s];for(r=c;r>c-n+i;r--)delete l[r-1]}else if(i>n)for(r=c-n;r>h;r--)s=r+i-1,(a=r+n-1)in l?l[s]=l[a]:delete l[s];for(r=0;r<i;r++)l[r+h]=arguments[r+2];return l.length=c-n+i,o}});var ln=function(t,e,i){var n,o;return Ni&&"function"==typeof(n=e.constructor)&&n!==i&&b(o=n.prototype)&&o!==i.prototype&&Ni(t,o),t},cn="\t\n\v\f\r                　\u2028\u2029\ufeff",hn="["+cn+"]",un=RegExp("^"+hn+hn+"*"),dn=RegExp(hn+hn+"*$"),pn=function(t){return function(e){var i=String(g(e));return 1&t&&(i=i.replace(un,"")),2&t&&(i=i.replace(dn,"")),i}},fn={start:pn(1),end:pn(2),trim:pn(3)},gn=yt.f,vn=T.f,bn=A.f,mn=fn.trim,yn=o.Number,wn=yn.prototype,Sn="Number"==d(Ut(wn)),xn=function(t){var e,i,n,o,r,a,s,l,c=m(t,!1);if("string"==typeof c&&c.length>2)if(43===(e=(c=mn(c)).charCodeAt(0))||45===e){if(88===(i=c.charCodeAt(2))||120===i)return NaN}else if(48===e){switch(c.charCodeAt(1)){case 66:case 98:n=2,o=49;break;case 79:case 111:n=8,o=55;break;default:return+c}for(a=(r=c.slice(2)).length,s=0;s<a;s++)if((l=r.charCodeAt(s))<48||l>o)return NaN;return parseInt(r,n)}return+c};if(At("Number",!yn(" 0o1")||!yn("0b1")||yn("+0x1"))){for(var kn,On=function(t){var e=arguments.length<1?0:t,i=this;return i instanceof On&&(Sn?r((function(){wn.valueOf.call(i)})):"Number"!=d(i))?ln(new yn(xn(e)),i,On):xn(e)},Cn=a?gn(yn):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger".split(","),Tn=0;Cn.length>Tn;Tn++)w(yn,kn=Cn[Tn])&&!w(On,kn)&&bn(On,kn,vn(yn,kn));On.prototype=wn,wn.constructor=On,et(o,"Number",On)}var Pn=Object.assign,In=Object.defineProperty,An=!Pn||r((function(){if(a&&1!==Pn({b:1},Pn(In({},"a",{enumerable:!0,get:function(){In(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},i=Symbol();return t[i]=7,"abcdefghijklmnopqrst".split("").forEach((function(t){e[t]=t})),7!=Pn({},t)[i]||"abcdefghijklmnopqrst"!=_t(Pn({},e)).join("")}))?function(t,e){for(var i=Ft(t),n=arguments.length,o=1,r=wt.f,s=c.f;n>o;)for(var l,h=f(arguments[o++]),u=r?_t(h).concat(r(h)):_t(h),d=u.length,p=0;d>p;)l=u[p++],a&&!s.call(h,l)||(i[l]=h[l]);return i}:Pn;Et({target:"Object",stat:!0,forced:Object.assign!==An},{assign:An});var $n=c.f,En=function(t){return function(e){for(var i,n=v(e),o=_t(n),r=o.length,s=0,l=[];r>s;)i=o[s++],a&&!$n.call(n,i)||l.push(t?[i,n[i]]:n[i]);return l}},Rn={entries:En(!0),values:En(!1)}.entries;Et({target:"Object",stat:!0},{entries:function(t){return Rn(t)}});var jn={};jn[Xt("toStringTag")]="z";var Nn="[object z]"===String(jn),Fn=Xt("toStringTag"),_n="Arguments"==d(function(){return arguments}()),Bn=Nn?d:function(t){var e,i,n;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(i=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),Fn))?i:_n?d(e):"Object"==(n=d(e))&&"function"==typeof e.callee?"Arguments":n},Vn=Nn?{}.toString:function(){return"[object "+Bn(this)+"]"};Nn||et(Object.prototype,"toString",Vn,{unsafe:!0});var Dn=fn.trim,Ln=o.parseFloat,Hn=1/Ln(cn+"-0")!=-1/0?function(t){var e=Dn(String(t)),i=Ln(e);return 0===i&&"-"==e.charAt(0)?-0:i}:Ln;Et({global:!0,forced:parseFloat!=Hn},{parseFloat:Hn});var Mn=fn.trim,Un=o.parseInt,zn=/^[+-]?0[Xx]/,qn=8!==Un(cn+"08")||22!==Un(cn+"0x16")?function(t,e){var i=Mn(String(t));return Un(i,e>>>0||(zn.test(i)?16:10))}:Un;Et({global:!0,forced:parseInt!=qn},{parseInt:qn});var Wn=function(){var t=P(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function Gn(t,e){return RegExp(t,e)}var Kn,Jn,Yn={UNSUPPORTED_Y:r((function(){var t=Gn("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:r((function(){var t=Gn("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},Xn=RegExp.prototype.exec,Qn=String.prototype.replace,Zn=Xn,to=(Kn=/a/,Jn=/b*/g,Xn.call(Kn,"a"),Xn.call(Jn,"a"),0!==Kn.lastIndex||0!==Jn.lastIndex),eo=Yn.UNSUPPORTED_Y||Yn.BROKEN_CARET,io=void 0!==/()??/.exec("")[1];(to||io||eo)&&(Zn=function(t){var e,i,n,o,r=this,a=eo&&r.sticky,s=Wn.call(r),l=r.source,c=0,h=t;return a&&(-1===(s=s.replace("y","")).indexOf("g")&&(s+="g"),h=String(t).slice(r.lastIndex),r.lastIndex>0&&(!r.multiline||r.multiline&&"\n"!==t[r.lastIndex-1])&&(l="(?: "+l+")",h=" "+h,c++),i=new RegExp("^(?:"+l+")",s)),io&&(i=new RegExp("^"+l+"$(?!\\s)",s)),to&&(e=r.lastIndex),n=Xn.call(a?i:r,h),a?n?(n.input=n.input.slice(c),n[0]=n[0].slice(c),n.index=r.lastIndex,r.lastIndex+=n[0].length):r.lastIndex=0:to&&n&&(r.lastIndex=r.global?n.index+n[0].length:e),io&&n&&n.length>1&&Qn.call(n[0],i,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(n[o]=void 0)})),n});var no=Zn;Et({target:"RegExp",proto:!0,forced:/./.exec!==no},{exec:no});var oo=RegExp.prototype,ro=oo.toString,ao=r((function(){return"/a/b"!=ro.call({source:"a",flags:"b"})})),so="toString"!=ro.name;(ao||so)&&et(RegExp.prototype,"toString",(function(){var t=P(this),e=String(t.source),i=t.flags;return"/"+e+"/"+String(void 0===i&&t instanceof RegExp&&!("flags"in oo)?Wn.call(t):i)}),{unsafe:!0});var lo=Xt("match"),co=function(t){var e;return b(t)&&(void 0!==(e=t[lo])?!!e:"RegExp"==d(t))},ho=function(t){if(co(t))throw TypeError("The method doesn't accept regular expressions");return t},uo=Xt("match"),po=function(t){var e=/./;try{"/./"[t](e)}catch(i){try{return e[uo]=!1,"/./"[t](e)}catch(t){}}return!1};Et({target:"String",proto:!0,forced:!po("includes")},{includes:function(t){return!!~String(g(this)).indexOf(ho(t),arguments.length>1?arguments[1]:void 0)}});var fo=function(t){return function(e,i){var n,o,r=String(g(e)),a=st(i),s=r.length;return a<0||a>=s?t?"":void 0:(n=r.charCodeAt(a))<55296||n>56319||a+1===s||(o=r.charCodeAt(a+1))<56320||o>57343?t?r.charAt(a):n:t?r.slice(a,a+2):o-56320+(n-55296<<10)+65536}},go={codeAt:fo(!1),charAt:fo(!0)},vo=go.charAt,bo=tt.set,mo=tt.getterFor("String Iterator");Di(String,"String",(function(t){bo(this,{type:"String Iterator",string:String(t),index:0})}),(function(){var t,e=mo(this),i=e.string,n=e.index;return n>=i.length?{value:void 0,done:!0}:(t=vo(i,n),e.index+=t.length,{value:t,done:!1})}));var yo=Xt("species"),wo=!r((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),So="$0"==="a".replace(/./,"$0"),xo=!r((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var i="ab".split(t);return 2!==i.length||"a"!==i[0]||"b"!==i[1]})),ko=function(t,e,i,n){var o=Xt(t),a=!r((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),s=a&&!r((function(){var e=!1,i=/a/;return"split"===t&&((i={}).constructor={},i.constructor[yo]=function(){return i},i.flags="",i[o]=/./[o]),i.exec=function(){return e=!0,null},i[o](""),!e}));if(!a||!s||"replace"===t&&(!wo||!So)||"split"===t&&!xo){var l=/./[o],c=i(o,""[t],(function(t,e,i,n,o){return e.exec===no?a&&!o?{done:!0,value:l.call(e,i,n)}:{done:!0,value:t.call(i,e,n)}:{done:!1}}),{REPLACE_KEEPS_$0:So}),h=c[0],u=c[1];et(String.prototype,t,h),et(RegExp.prototype,o,2==e?function(t,e){return u.call(t,this,e)}:function(t){return u.call(t,this)})}n&&$(RegExp.prototype[o],"sham",!0)},Oo=go.charAt,Co=function(t,e,i){return e+(i?Oo(t,e).length:1)},To=function(t,e){var i=t.exec;if("function"==typeof i){var n=i.call(t,e);if("object"!=typeof n)throw TypeError("RegExp exec method returned something other than an Object or null");return n}if("RegExp"!==d(t))throw TypeError("RegExp#exec called on incompatible receiver");return no.call(t,e)},Po=Math.max,Io=Math.min,Ao=Math.floor,$o=/\$([$&'`]|\d\d?|<[^>]*>)/g,Eo=/\$([$&'`]|\d\d?)/g;ko("replace",2,(function(t,e,i,n){return[function(i,n){var o=g(this),r=null==i?void 0:i[t];return void 0!==r?r.call(i,o,n):e.call(String(o),i,n)},function(t,r){if(n.REPLACE_KEEPS_$0||"string"==typeof r&&-1===r.indexOf("$0")){var a=i(e,t,this,r);if(a.done)return a.value}var s=P(t),l=String(this),c="function"==typeof r;c||(r=String(r));var h=s.global;if(h){var u=s.unicode;s.lastIndex=0}for(var d=[];;){var p=To(s,l);if(null===p)break;if(d.push(p),!h)break;""===String(p[0])&&(s.lastIndex=Co(l,ct(s.lastIndex),u))}for(var f,g="",v=0,b=0;b<d.length;b++){p=d[b];for(var m=String(p[0]),y=Po(Io(st(p.index),l.length),0),w=[],S=1;S<p.length;S++)w.push(void 0===(f=p[S])?f:String(f));var x=p.groups;if(c){var k=[m].concat(w,y,l);void 0!==x&&k.push(x);var O=String(r.apply(void 0,k))}else O=o(m,l,y,w,x,r);y>=v&&(g+=l.slice(v,y)+O,v=y+m.length)}return g+l.slice(v)}];function o(t,i,n,o,r,a){var s=n+t.length,l=o.length,c=Eo;return void 0!==r&&(r=Ft(r),c=$o),e.call(a,c,(function(e,a){var c;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return i.slice(0,n);case"'":return i.slice(s);case"<":c=r[a.slice(1,-1)];break;default:var h=+a;if(0===h)return e;if(h>l){var u=Ao(h/10);return 0===u?e:u<=l?void 0===o[u-1]?a.charAt(1):o[u-1]+a.charAt(1):e}c=o[h-1]}return void 0===c?"":c}))}}));var Ro=Object.is||function(t,e){return t===e?0!==t||1/t==1/e:t!=t&&e!=e};ko("search",1,(function(t,e,i){return[function(e){var i=g(this),n=null==e?void 0:e[t];return void 0!==n?n.call(e,i):new RegExp(e)[t](String(i))},function(t){var n=i(e,t,this);if(n.done)return n.value;var o=P(t),r=String(this),a=o.lastIndex;Ro(a,0)||(o.lastIndex=0);var s=To(o,r);return Ro(o.lastIndex,a)||(o.lastIndex=a),null===s?-1:s.index}]}));var jo=Xt("species"),No=[].push,Fo=Math.min,_o=!r((function(){return!RegExp(4294967295,"y")}));ko("split",2,(function(t,e,i){var n;return n="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,i){var n=String(g(this)),o=void 0===i?4294967295:i>>>0;if(0===o)return[];if(void 0===t)return[n];if(!co(t))return e.call(n,t,o);for(var r,a,s,l=[],c=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),h=0,u=new RegExp(t.source,c+"g");(r=no.call(u,n))&&!((a=u.lastIndex)>h&&(l.push(n.slice(h,r.index)),r.length>1&&r.index<n.length&&No.apply(l,r.slice(1)),s=r[0].length,h=a,l.length>=o));)u.lastIndex===r.index&&u.lastIndex++;return h===n.length?!s&&u.test("")||l.push(""):l.push(n.slice(h)),l.length>o?l.slice(0,o):l}:"0".split(void 0,0).length?function(t,i){return void 0===t&&0===i?[]:e.call(this,t,i)}:e,[function(e,i){var o=g(this),r=null==e?void 0:e[t];return void 0!==r?r.call(e,o,i):n.call(String(o),e,i)},function(t,o){var r=i(n,t,this,o,n!==e);if(r.done)return r.value;var a=P(t),s=String(this),l=function(t,e){var i,n=P(t).constructor;return void 0===n||null==(i=P(n)[jo])?e:oe(i)}(a,RegExp),c=a.unicode,h=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(_o?"y":"g"),u=new l(_o?a:"^(?:"+a.source+")",h),d=void 0===o?4294967295:o>>>0;if(0===d)return[];if(0===s.length)return null===To(u,s)?[s]:[];for(var p=0,f=0,g=[];f<s.length;){u.lastIndex=_o?f:0;var v,b=To(u,_o?s:s.slice(f));if(null===b||(v=Fo(ct(u.lastIndex+(_o?0:f)),s.length))===p)f=Co(s,f,c);else{if(g.push(s.slice(p,f)),g.length===d)return g;for(var m=1;m<=b.length-1;m++)if(g.push(b[m]),g.length===d)return g;f=p=v}}return g.push(s.slice(p)),g}]}),!_o);var Bo=fn.trim;Et({target:"String",proto:!0,forced:function(t){return r((function(){return!!cn[t]()||"​…᠎"!="​…᠎"[t]()||cn[t].name!==t}))}("trim")},{trim:function(){return Bo(this)}});var Vo={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},Do=ce.forEach,Lo=mi("forEach")?function(t){return Do(this,t,arguments.length>1?arguments[1]:void 0)}:[].forEach;for(var Ho in Vo){var Mo=o[Ho],Uo=Mo&&Mo.prototype;if(Uo&&Uo.forEach!==Lo)try{$(Uo,"forEach",Lo)}catch(t){Uo.forEach=Lo}}var zo=Xt("iterator"),qo=Xt("toStringTag"),Wo=Mi.values;for(var Go in Vo){var Ko=o[Go],Jo=Ko&&Ko.prototype;if(Jo){if(Jo[zo]!==Wo)try{$(Jo,zo,Wo)}catch(t){Jo[zo]=Wo}if(Jo[qo]||$(Jo,qo,Go),Vo[Go])for(var Yo in Mi)if(Jo[Yo]!==Mi[Yo])try{$(Jo,Yo,Mi[Yo])}catch(t){Jo[Yo]=Mi[Yo]}}}function Xo(t){return(Xo="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Qo(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Zo(t,e){for(var i=0;i<e.length;i++){var n=e[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function tr(t,e,i){return e&&Zo(t.prototype,e),i&&Zo(t,i),t}function er(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if(!(Symbol.iterator in Object(t))&&"[object Arguments]"!==Object.prototype.toString.call(t))return;var i=[],n=!0,o=!1,r=void 0;try{for(var a,s=t[Symbol.iterator]();!(n=(a=s.next()).done)&&(i.push(a.value),!e||i.length!==e);n=!0);}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}return i}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}function ir(t){return function(t){if(Array.isArray(t)){for(var e=0,i=new Array(t.length);e<t.length;e++)i[e]=t[e];return i}}(t)||function(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance")}()}var nr=4;try{var or=t.fn.dropdown.Constructor.VERSION;void 0!==or&&(nr=parseInt(or,10))}catch(t){}try{var rr=bootstrap.Tooltip.VERSION;void 0!==rr&&(nr=parseInt(rr,10))}catch(t){}var ar={3:{iconsPrefix:"glyphicon",icons:{paginationSwitchDown:"glyphicon-collapse-down icon-chevron-down",paginationSwitchUp:"glyphicon-collapse-up icon-chevron-up",refresh:"glyphicon-refresh icon-refresh",toggleOff:"glyphicon-list-alt icon-list-alt",toggleOn:"glyphicon-list-alt icon-list-alt",columns:"glyphicon-th icon-th",detailOpen:"glyphicon-plus icon-plus",detailClose:"glyphicon-minus icon-minus",fullscreen:"glyphicon-fullscreen",search:"glyphicon-search",clearSearch:"glyphicon-trash"},classes:{buttonsPrefix:"btn",buttons:"default",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"pull",inputGroup:"input-group",inputPrefix:"input-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<ul class="dropdown-menu" role="menu">',"</ul>"],toolbarDropdownItem:'<li class="dropdown-item-marker" role="menuitem"><label>%s</label></li>',toolbarDropdownSeparator:'<li class="divider"></li>',pageDropdown:['<ul class="dropdown-menu" role="menu">',"</ul>"],pageDropdownItem:'<li role="menuitem" class="%s"><a href="#">%s</a></li>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<span class="input-group-btn">%s</span></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}},4:{iconsPrefix:"fa",icons:{paginationSwitchDown:"fa-caret-square-down",paginationSwitchUp:"fa-caret-square-up",refresh:"fa-sync",toggleOff:"fa-toggle-off",toggleOn:"fa-toggle-on",columns:"fa-th-list",detailOpen:"fa-plus",detailClose:"fa-minus",fullscreen:"fa-arrows-alt",search:"fa-search",clearSearch:"fa-trash"},classes:{buttonsPrefix:"btn",buttons:"secondary",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"float",inputGroup:"btn-group",inputPrefix:"form-control-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<div class="dropdown-menu dropdown-menu-right">',"</div>"],toolbarDropdownItem:'<label class="dropdown-item dropdown-item-marker">%s</label>',pageDropdown:['<div class="dropdown-menu">',"</div>"],pageDropdownItem:'<a class="dropdown-item %s" href="#">%s</a>',toolbarDropdownSeparator:'<div class="dropdown-divider"></div>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<div class="input-group-append">%s</div></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}},5:{iconsPrefix:"fa",icons:{paginationSwitchDown:"fa-caret-square-down",paginationSwitchUp:"fa-caret-square-up",refresh:"fa-sync",toggleOff:"fa-toggle-off",toggleOn:"fa-toggle-on",columns:"fa-th-list",detailOpen:"fa-plus",detailClose:"fa-minus",fullscreen:"fa-arrows-alt",search:"fa-search",clearSearch:"fa-trash"},classes:{buttonsPrefix:"btn",buttons:"secondary",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"float",inputGroup:"btn-group",inputPrefix:"form-control-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<div class="dropdown-menu dropdown-menu-right">',"</div>"],toolbarDropdownItem:'<label class="dropdown-item dropdown-item-marker">%s</label>',pageDropdown:['<div class="dropdown-menu">',"</div>"],pageDropdownItem:'<a class="dropdown-item %s" href="#">%s</a>',toolbarDropdownSeparator:'<div class="dropdown-divider"></div>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<div class="input-group-append">%s</div></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}}}[nr],sr={height:void 0,classes:"table table-bordered table-hover",theadClasses:"",headerStyle:function(t){return{}},rowStyle:function(t,e){return{}},rowAttributes:function(t,e){return{}},undefinedText:"-",locale:void 0,virtualScroll:!1,virtualScrollItemHeight:void 0,sortable:!0,sortClass:void 0,silentSort:!0,sortName:void 0,sortOrder:void 0,sortReset:!1,sortStable:!1,rememberOrder:!1,serverSort:!0,customSort:void 0,columns:[[]],data:[],url:void 0,method:"get",cache:!0,contentType:"application/json",dataType:"json",ajax:void 0,ajaxOptions:{},queryParams:function(t){return t},queryParamsType:"limit",responseHandler:function(t){return t},totalField:"total",totalNotFilteredField:"totalNotFiltered",dataField:"rows",pagination:!1,paginationParts:["pageInfo","pageSize","pageList"],showExtendedPagination:!1,paginationLoop:!0,sidePagination:"client",totalRows:0,totalNotFiltered:0,pageNumber:1,pageSize:10,pageList:[10,25,50,100],paginationHAlign:"right",paginationVAlign:"bottom",paginationDetailHAlign:"left",paginationPreText:"&lsaquo;",paginationNextText:"&rsaquo;",paginationSuccessivelySize:5,paginationPagesBySide:1,paginationUseIntermediate:!1,search:!1,searchOnEnterKey:!1,strictSearch:!1,visibleSearch:!1,showButtonIcons:!0,showButtonText:!1,showSearchButton:!1,showSearchClearButton:!1,trimOnSearch:!0,searchAlign:"right",searchTimeOut:500,searchText:"",customSearch:void 0,showHeader:!0,showFooter:!1,footerStyle:function(t){return{}},searchAccentNeutralise:!1,showColumns:!1,showColumnsToggleAll:!1,showColumnsSearch:!1,minimumCountColumns:1,showPaginationSwitch:!1,showRefresh:!1,showToggle:!1,showFullscreen:!1,smartDisplay:!0,escape:!1,filterOptions:{filterAlgorithm:"and"},idField:void 0,selectItemName:"btSelectItem",clickToSelect:!1,ignoreClickToSelectOn:function(t){var e=t.tagName;return["A","BUTTON"].includes(e)},singleSelect:!1,checkboxHeader:!0,maintainMetaData:!1,multipleSelectRow:!1,uniqueId:void 0,cardView:!1,detailView:!1,detailViewIcon:!0,detailViewByClick:!1,detailViewAlign:"left",detailFormatter:function(t,e){return""},detailFilter:function(t,e){return!0},toolbar:void 0,toolbarAlign:"left",buttonsToolbar:void 0,buttonsAlign:"right",buttonsOrder:["paginationSwitch","refresh","toggle","fullscreen","columns"],buttonsPrefix:ar.classes.buttonsPrefix,buttonsClass:ar.classes.buttons,icons:ar.icons,iconSize:void 0,iconsPrefix:ar.iconsPrefix,loadingFontSize:"auto",loadingTemplate:function(t){return'<span class="loading-wrap">\n      <span class="loading-text">'.concat(t,'</span>\n      <span class="animation-wrap"><span class="animation-dot"></span></span>\n      </span>\n    ')},onAll:function(t,e){return!1},onClickCell:function(t,e,i,n){return!1},onDblClickCell:function(t,e,i,n){return!1},onClickRow:function(t,e){return!1},onDblClickRow:function(t,e){return!1},onSort:function(t,e){return!1},onCheck:function(t){return!1},onUncheck:function(t){return!1},onCheckAll:function(t){return!1},onUncheckAll:function(t){return!1},onCheckSome:function(t){return!1},onUncheckSome:function(t){return!1},onLoadSuccess:function(t){return!1},onLoadError:function(t){return!1},onColumnSwitch:function(t,e){return!1},onPageChange:function(t,e){return!1},onSearch:function(t){return!1},onToggle:function(t){return!1},onPreBody:function(t){return!1},onPostBody:function(){return!1},onPostHeader:function(){return!1},onPostFooter:function(){return!1},onExpandRow:function(t,e,i){return!1},onCollapseRow:function(t,e){return!1},onRefreshOptions:function(t){return!1},onRefresh:function(t){return!1},onResetView:function(){return!1},onScrollBody:function(){return!1}},lr={formatLoadingMessage:function(){return"Loading, please wait"},formatRecordsPerPage:function(t){return"".concat(t," rows per page")},formatShowingRows:function(t,e,i,n){return void 0!==n&&n>0&&n>i?"Showing ".concat(t," to ").concat(e," of ").concat(i," rows (filtered from ").concat(n," total rows)"):"Showing ".concat(t," to ").concat(e," of ").concat(i," rows")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatSearch:function(){return"Search"},formatClearSearch:function(){return"Clear Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"}},cr={field:void 0,title:void 0,titleTooltip:void 0,class:void 0,width:void 0,widthUnit:"px",rowspan:void 0,colspan:void 0,align:void 0,halign:void 0,falign:void 0,valign:void 0,cellStyle:void 0,radio:!1,checkbox:!1,checkboxEnabled:!0,clickToSelect:!0,showSelectTitle:!1,sortable:!1,sortName:void 0,order:"asc",sorter:void 0,visible:!0,switchable:!0,cardVisible:!0,searchable:!0,formatter:void 0,footerFormatter:void 0,detailFormatter:void 0,searchFormatter:!0,escape:!1,events:void 0};Object.assign(sr,lr);var hr={VERSION:"1.17.1",THEME:"bootstrap".concat(nr),CONSTANTS:ar,DEFAULTS:sr,COLUMN_DEFAULTS:cr,METHODS:["getOptions","refreshOptions","getData","getSelections","getAllSelections","load","append","prepend","remove","removeAll","insertRow","updateRow","getRowByUniqueId","updateByUniqueId","removeByUniqueId","updateCell","updateCellByUniqueId","showRow","hideRow","getHiddenRows","showColumn","hideColumn","getVisibleColumns","getHiddenColumns","showAllColumns","hideAllColumns","mergeCells","checkAll","uncheckAll","checkInvert","check","uncheck","checkBy","uncheckBy","refresh","destroy","resetView","showLoading","hideLoading","togglePagination","toggleFullscreen","toggleView","resetSearch","filterBy","scrollTo","getScrollPosition","selectPage","prevPage","nextPage","toggleDetailView","expandRow","collapseRow","expandRowByUniqueId","collapseRowByUniqueId","expandAllRows","collapseAllRows","updateColumnTitle","updateFormatText"],EVENTS:{"all.bs.table":"onAll","click-row.bs.table":"onClickRow","dbl-click-row.bs.table":"onDblClickRow","click-cell.bs.table":"onClickCell","dbl-click-cell.bs.table":"onDblClickCell","sort.bs.table":"onSort","check.bs.table":"onCheck","uncheck.bs.table":"onUncheck","check-all.bs.table":"onCheckAll","uncheck-all.bs.table":"onUncheckAll","check-some.bs.table":"onCheckSome","uncheck-some.bs.table":"onUncheckSome","load-success.bs.table":"onLoadSuccess","load-error.bs.table":"onLoadError","column-switch.bs.table":"onColumnSwitch","page-change.bs.table":"onPageChange","search.bs.table":"onSearch","toggle.bs.table":"onToggle","pre-body.bs.table":"onPreBody","post-body.bs.table":"onPostBody","post-header.bs.table":"onPostHeader","post-footer.bs.table":"onPostFooter","expand-row.bs.table":"onExpandRow","collapse-row.bs.table":"onCollapseRow","refresh-options.bs.table":"onRefreshOptions","reset-view.bs.table":"onResetView","refresh.bs.table":"onRefresh","scroll-body.bs.table":"onScrollBody"},LOCALES:{en:lr,"en-US":lr}},ur=r((function(){_t(1)}));Et({target:"Object",stat:!0,forced:ur},{keys:function(t){return _t(Ft(t))}});var dr,pr=T.f,fr="".endsWith,gr=Math.min,vr=po("endsWith"),br=!(vr||(dr=pr(String.prototype,"endsWith"),!dr||dr.writable));Et({target:"String",proto:!0,forced:!br&&!vr},{endsWith:function(t){var e=String(g(this));ho(t);var i=arguments.length>1?arguments[1]:void 0,n=ct(e.length),o=void 0===i?n:gr(ct(i),n),r=String(t);return fr?fr.call(e,r,o):e.slice(o-r.length,o)===r}});var mr=T.f,yr="".startsWith,wr=Math.min,Sr=po("startsWith"),xr=!Sr&&!!function(){var t=mr(String.prototype,"startsWith");return t&&!t.writable}();Et({target:"String",proto:!0,forced:!xr&&!Sr},{startsWith:function(t){var e=String(g(this));ho(t);var i=ct(wr(arguments.length>1?arguments[1]:void 0,e.length)),n=String(t);return yr?yr.call(e,n,i):e.slice(i,i+n.length)===n}});var kr={sprintf:function(t){for(var e=arguments.length,i=new Array(e>1?e-1:0),n=1;n<e;n++)i[n-1]=arguments[n];var o=!0,r=0,a=t.replace(/%s/g,(function(){var t=i[r++];return void 0===t?(o=!1,""):t}));return o?a:""},isEmptyObject:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return 0===Object.entries(t).length&&t.constructor===Object},isNumeric:function(t){return!isNaN(parseFloat(t))&&isFinite(t)},getFieldTitle:function(t,e){var i=!0,n=!1,o=void 0;try{for(var r,a=t[Symbol.iterator]();!(i=(r=a.next()).done);i=!0){var s=r.value;if(s.field===e)return s.title}}catch(t){n=!0,o=t}finally{try{i||null==a.return||a.return()}finally{if(n)throw o}}return""},setFieldIndex:function(t){var e=0,i=[],n=!0,o=!1,r=void 0;try{for(var a,s=t[0][Symbol.iterator]();!(n=(a=s.next()).done);n=!0){e+=a.value.colspan||1}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}for(var l=0;l<t.length;l++){i[l]=[];for(var c=0;c<e;c++)i[l][c]=!1}for(var h=0;h<t.length;h++){var u=!0,d=!1,p=void 0;try{for(var f,g=t[h][Symbol.iterator]();!(u=(f=g.next()).done);u=!0){var v=f.value,b=v.rowspan||1,m=v.colspan||1,y=i[h].indexOf(!1);v.colspanIndex=y,1===m?(v.fieldIndex=y,void 0===v.field&&(v.field=y)):v.colspanGroup=v.colspan;for(var w=0;w<b;w++)i[h+w][y]=!0;for(var S=0;S<m;S++)i[h][y+S]=!0}}catch(t){d=!0,p=t}finally{try{u||null==g.return||g.return()}finally{if(d)throw p}}}},normalizeAccent:function(t){return t.normalize("NFD").replace(/[\u0300-\u036f]/g,"")},updateFieldGroup:function(t){var e,i=(e=[]).concat.apply(e,ir(t)),n=!0,o=!1,r=void 0;try{for(var a,s=t[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value,c=!0,h=!1,u=void 0;try{for(var d,p=l[Symbol.iterator]();!(c=(d=p.next()).done);c=!0){var f=d.value;if(f.colspanGroup>1){for(var g=0,v=function(t){i.find((function(e){return e.fieldIndex===t})).visible&&g++},b=f.colspanIndex;b<f.colspanIndex+f.colspanGroup;b++)v(b);f.colspan=g,f.visible=g>0}}}catch(t){h=!0,u=t}finally{try{c||null==p.return||p.return()}finally{if(h)throw u}}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}},getScrollBarWidth:function(){if(void 0===this.cachedWidth){var e=t("<div/>").addClass("fixed-table-scroll-inner"),i=t("<div/>").addClass("fixed-table-scroll-outer");i.append(e),t("body").append(i);var n=e[0].offsetWidth;i.css("overflow","scroll");var o=e[0].offsetWidth;n===o&&(o=i[0].clientWidth),i.remove(),this.cachedWidth=n-o}return this.cachedWidth},calculateObjectValue:function(t,e,i,n){var o=e;if("string"==typeof e){var r=e.split(".");if(r.length>1){o=window;var a=!0,s=!1,l=void 0;try{for(var c,h=r[Symbol.iterator]();!(a=(c=h.next()).done);a=!0){o=o[c.value]}}catch(t){s=!0,l=t}finally{try{a||null==h.return||h.return()}finally{if(s)throw l}}}else o=window[e]}return null!==o&&"object"===Xo(o)?o:"function"==typeof o?o.apply(t,i||[]):!o&&"string"==typeof e&&this.sprintf.apply(this,[e].concat(ir(i)))?this.sprintf.apply(this,[e].concat(ir(i))):n},compareObjects:function(t,e,i){var n=Object.keys(t),o=Object.keys(e);if(i&&n.length!==o.length)return!1;for(var r=0,a=n;r<a.length;r++){var s=a[r];if(o.includes(s)&&t[s]!==e[s])return!1}return!0},escapeHTML:function(t){return"string"==typeof t?t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#039;").replace(/`/g,"&#x60;"):t},unescapeHTML:function(t){return"string"==typeof t?t.replace(/&amp;/g,"&").replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&#039;/g,"'").replace(/&#x60;/g,"`"):t},getRealDataAttr:function(t){for(var e=0,i=Object.entries(t);e<i.length;e++){var n=er(i[e],2),o=n[0],r=n[1],a=o.split(/(?=[A-Z])/).join("-").toLowerCase();a!==o&&(t[a]=r,delete t[o])}return t},getItemField:function(t,e,i){var n=t;if("string"!=typeof e||t.hasOwnProperty(e))return i?this.escapeHTML(t[e]):t[e];var o=e.split("."),r=!0,a=!1,s=void 0;try{for(var l,c=o[Symbol.iterator]();!(r=(l=c.next()).done);r=!0){var h=l.value;n=n&&n[h]}}catch(t){a=!0,s=t}finally{try{r||null==c.return||c.return()}finally{if(a)throw s}}return i?this.escapeHTML(n):n},isIEBrowser:function(){return navigator.userAgent.includes("MSIE ")||/Trident.*rv:11\./.test(navigator.userAgent)},findIndex:function(t,e){var i=!0,n=!1,o=void 0;try{for(var r,a=t[Symbol.iterator]();!(i=(r=a.next()).done);i=!0){var s=r.value;if(JSON.stringify(s)===JSON.stringify(e))return t.indexOf(s)}}catch(t){n=!0,o=t}finally{try{i||null==a.return||a.return()}finally{if(n)throw o}}return-1},trToData:function(e,i){var n=this,o=[],r=[];return i.each((function(i,a){var s={};s._id=t(a).attr("id"),s._class=t(a).attr("class"),s._data=n.getRealDataAttr(t(a).data()),t(a).find(">td,>th").each((function(o,a){for(var l=+t(a).attr("colspan")||1,c=+t(a).attr("rowspan")||1,h=o;r[i]&&r[i][h];h++);for(var u=h;u<h+l;u++)for(var d=i;d<i+c;d++)r[d]||(r[d]=[]),r[d][u]=!0;var p=e[h].field;s[p]=t(a).html().trim(),s["_".concat(p,"_id")]=t(a).attr("id"),s["_".concat(p,"_class")]=t(a).attr("class"),s["_".concat(p,"_rowspan")]=t(a).attr("rowspan"),s["_".concat(p,"_colspan")]=t(a).attr("colspan"),s["_".concat(p,"_title")]=t(a).attr("title"),s["_".concat(p,"_data")]=n.getRealDataAttr(t(a).data())})),o.push(s)})),o},sort:function(t,e,i,n,o,r){return null==t&&(t=""),null==e&&(e=""),n&&t===e&&(t=o,e=r),this.isNumeric(t)&&this.isNumeric(e)?(t=parseFloat(t))<(e=parseFloat(e))?-1*i:t>e?i:0:t===e?0:("string"!=typeof t&&(t=t.toString()),-1===t.localeCompare(e)?-1*i:i)},getResizeEventName:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:"";return t=t||"".concat(+new Date).concat(~~(1e6*Math.random())),"resize.bootstrap-table-".concat(t)},hasDetailViewIcon:function(t){return t.detailView&&t.detailViewIcon&&!t.cardView},checkAutoMergeCells:function(t){var e=!0,i=!1,n=void 0;try{for(var o,r=t[Symbol.iterator]();!(e=(o=r.next()).done);e=!0)for(var a=o.value,s=0,l=Object.keys(a);s<l.length;s++){var c=l[s];if(c.startsWith("_")&&(c.endsWith("_rowspan")||c.endsWith("_colspan")))return!0}}catch(t){i=!0,n=t}finally{try{e||null==r.return||r.return()}finally{if(i)throw n}}return!1}},Or=function(){function t(e){var i=this;Qo(this,t),this.rows=e.rows,this.scrollEl=e.scrollEl,this.contentEl=e.contentEl,this.callback=e.callback,this.itemHeight=e.itemHeight,this.cache={},this.scrollTop=this.scrollEl.scrollTop,this.initDOM(this.rows,e.fixedScroll),this.scrollEl.scrollTop=this.scrollTop,this.lastCluster=0;var n=function(){i.lastCluster!==(i.lastCluster=i.getNum())&&(i.initDOM(i.rows),i.callback())};this.scrollEl.addEventListener("scroll",n,!1),this.destroy=function(){i.contentEl.innerHtml="",i.scrollEl.removeEventListener("scroll",n,!1)}}return tr(t,[{key:"initDOM",value:function(t,e){void 0===this.clusterHeight&&(this.cache.scrollTop=this.scrollEl.scrollTop,this.cache.data=this.contentEl.innerHTML=t[0]+t[0]+t[0],this.getRowsHeight(t));var i=this.initData(t,this.getNum(e)),n=i.rows.join(""),o=this.checkChanges("data",n),r=this.checkChanges("top",i.topOffset),a=this.checkChanges("bottom",i.bottomOffset),s=[];o&&r?(i.topOffset&&s.push(this.getExtra("top",i.topOffset)),s.push(n),i.bottomOffset&&s.push(this.getExtra("bottom",i.bottomOffset)),this.contentEl.innerHTML=s.join(""),e&&(this.contentEl.scrollTop=this.cache.scrollTop)):a&&(this.contentEl.lastChild.style.height="".concat(i.bottomOffset,"px"))}},{key:"getRowsHeight",value:function(){if(void 0===this.itemHeight){var t=this.contentEl.children,e=t[Math.floor(t.length/2)];this.itemHeight=e.offsetHeight}this.blockHeight=50*this.itemHeight,this.clusterRows=200,this.clusterHeight=4*this.blockHeight}},{key:"getNum",value:function(t){return this.scrollTop=t?this.cache.scrollTop:this.scrollEl.scrollTop,Math.floor(this.scrollTop/(this.clusterHeight-this.blockHeight))||0}},{key:"initData",value:function(t,e){if(t.length<50)return{topOffset:0,bottomOffset:0,rowsAbove:0,rows:t};var i=Math.max((this.clusterRows-50)*e,0),n=i+this.clusterRows,o=Math.max(i*this.itemHeight,0),r=Math.max((t.length-n)*this.itemHeight,0),a=[],s=i;o<1&&s++;for(var l=i;l<n;l++)t[l]&&a.push(t[l]);return{topOffset:o,bottomOffset:r,rowsAbove:s,rows:a}}},{key:"checkChanges",value:function(t,e){var i=e!==this.cache[t];return this.cache[t]=e,i}},{key:"getExtra",value:function(t,e){var i=document.createElement("tr");return i.className="virtual-scroll-".concat(t),e&&(i.style.height="".concat(e,"px")),i.outerHTML}}]),t}(),Cr=function(){function e(i,n){Qo(this,e),this.options=n,this.$el=t(i),this.$el_=this.$el.clone(),this.timeoutId_=0,this.timeoutFooter_=0,this.init()}return tr(e,[{key:"init",value:function(){this.initConstants(),this.initLocale(),this.initContainer(),this.initTable(),this.initHeader(),this.initData(),this.initHiddenRows(),this.initToolbar(),this.initPagination(),this.initBody(),this.initSearchText(),this.initServer()}},{key:"initConstants",value:function(){var e=this.options;this.constants=hr.CONSTANTS,this.constants.theme=t.fn.bootstrapTable.theme;var i=e.buttonsPrefix?"".concat(e.buttonsPrefix,"-"):"";this.constants.buttonsClass=[e.buttonsPrefix,i+e.buttonsClass,kr.sprintf("".concat(i,"%s"),e.iconSize)].join(" ").trim()}},{key:"initLocale",value:function(){if(this.options.locale){var e=t.fn.bootstrapTable.locales,i=this.options.locale.split(/-|_/);i[0]=i[0].toLowerCase(),i[1]&&(i[1]=i[1].toUpperCase()),e[this.options.locale]?t.extend(this.options,e[this.options.locale]):e[i.join("-")]?t.extend(this.options,e[i.join("-")]):e[i[0]]&&t.extend(this.options,e[i[0]])}}},{key:"initContainer",value:function(){var e=["top","both"].includes(this.options.paginationVAlign)?'<div class="fixed-table-pagination clearfix"></div>':"",i=["bottom","both"].includes(this.options.paginationVAlign)?'<div class="fixed-table-pagination"></div>':"",n=kr.calculateObjectValue(this.options,this.options.loadingTemplate,[this.options.formatLoadingMessage()]);this.$container=t('\n      <div class="bootstrap-table '.concat(this.constants.theme,'">\n      <div class="fixed-table-toolbar"></div>\n      ').concat(e,'\n      <div class="fixed-table-container">\n      <div class="fixed-table-header"><table></table></div>\n      <div class="fixed-table-body">\n      <div class="fixed-table-loading">\n      ').concat(n,'\n      </div>\n      </div>\n      <div class="fixed-table-footer"><table><thead><tr></tr></thead></table></div>\n      </div>\n      ').concat(i,"\n      </div>\n    ")),this.$container.insertAfter(this.$el),this.$tableContainer=this.$container.find(".fixed-table-container"),this.$tableHeader=this.$container.find(".fixed-table-header"),this.$tableBody=this.$container.find(".fixed-table-body"),this.$tableLoading=this.$container.find(".fixed-table-loading"),this.$tableFooter=this.$el.find("tfoot"),this.options.buttonsToolbar?this.$toolbar=t("body").find(this.options.buttonsToolbar):this.$toolbar=this.$container.find(".fixed-table-toolbar"),this.$pagination=this.$container.find(".fixed-table-pagination"),this.$tableBody.append(this.$el),this.$container.after('<div class="clearfix"></div>'),this.$el.addClass(this.options.classes),this.$tableLoading.addClass(this.options.classes),this.options.height&&(this.$tableContainer.addClass("fixed-height"),this.options.showFooter&&this.$tableContainer.addClass("has-footer"),this.options.classes.split(" ").includes("table-bordered")&&(this.$tableBody.append('<div class="fixed-table-border"></div>'),this.$tableBorder=this.$tableBody.find(".fixed-table-border"),this.$tableLoading.addClass("fixed-table-border")),this.$tableFooter=this.$container.find(".fixed-table-footer"))}},{key:"initTable",value:function(){var i=this,n=[];if(this.$header=this.$el.find(">thead"),this.$header.length?this.options.theadClasses&&this.$header.addClass(this.options.theadClasses):this.$header=t('<thead class="'.concat(this.options.theadClasses,'"></thead>')).appendTo(this.$el),this._headerTrClasses=[],this.$header.find("tr").each((function(e,o){var r=t(o),a=[];r.find("th").each((function(e,i){var n=t(i);void 0!==n.data("field")&&n.data("field","".concat(n.data("field"))),a.push(t.extend({},{title:n.html(),class:n.attr("class"),titleTooltip:n.attr("title"),rowspan:n.attr("rowspan")?+n.attr("rowspan"):void 0,colspan:n.attr("colspan")?+n.attr("colspan"):void 0},n.data()))})),n.push(a),r.attr("class")&&i._headerTrClasses.push(r.attr("class"))})),Array.isArray(this.options.columns[0])||(this.options.columns=[this.options.columns]),this.options.columns=t.extend(!0,[],n,this.options.columns),this.columns=[],this.fieldsColumnsIndex=[],kr.setFieldIndex(this.options.columns),this.options.columns.forEach((function(n,o){n.forEach((function(n,r){var a=t.extend({},e.COLUMN_DEFAULTS,n);void 0!==a.fieldIndex&&(i.columns[a.fieldIndex]=a,i.fieldsColumnsIndex[a.field]=a.fieldIndex),i.options.columns[o][r]=a}))})),!this.options.data.length){var o=kr.trToData(this.columns,this.$el.find(">tbody>tr"));o.length&&(this.options.data=o,this.fromHtml=!0)}this.footerData=kr.trToData(this.columns,this.$el.find(">tfoot>tr")),this.footerData&&this.$el.find("tfoot").html("<tr></tr>"),!this.options.showFooter||this.options.cardView?this.$tableFooter.hide():this.$tableFooter.show()}},{key:"initHeader",value:function(){var e=this,i={},n=[];this.header={fields:[],styles:[],classes:[],formatters:[],detailFormatters:[],events:[],sorters:[],sortNames:[],cellStyles:[],searchables:[]},kr.updateFieldGroup(this.options.columns),this.options.columns.forEach((function(t,o){n.push("<tr".concat(kr.sprintf(' class="%s"',e._headerTrClasses[o]),">"));var r="";0===o&&kr.hasDetailViewIcon(e.options)&&(r='<th class="detail" rowspan="'.concat(e.options.columns.length,'">\n          <div class="fht-cell"></div>\n          </th>')),r&&"right"!==e.options.detailViewAlign&&n.push(r),t.forEach((function(t,r){var a=kr.sprintf(' class="%s"',t.class),s=t.widthUnit,l=parseFloat(t.width),c=kr.sprintf("text-align: %s; ",t.halign?t.halign:t.align),h=kr.sprintf("text-align: %s; ",t.align),u=kr.sprintf("vertical-align: %s; ",t.valign);if(u+=kr.sprintf("width: %s; ",!t.checkbox&&!t.radio||l?l?l+s:void 0:t.showSelectTitle?void 0:"36px"),void 0!==t.fieldIndex||t.visible){var d=kr.calculateObjectValue(null,e.options.headerStyle,[t]),p=[],f="";if(d&&d.css)for(var g=0,v=Object.entries(d.css);g<v.length;g++){var b=er(v[g],2),m=b[0],y=b[1];p.push("".concat(m,": ").concat(y))}if(d&&d.classes&&(f=kr.sprintf(' class="%s"',t.class?[t.class,d.classes].join(" "):d.classes)),void 0!==t.fieldIndex){if(e.header.fields[t.fieldIndex]=t.field,e.header.styles[t.fieldIndex]=h+u,e.header.classes[t.fieldIndex]=a,e.header.formatters[t.fieldIndex]=t.formatter,e.header.detailFormatters[t.fieldIndex]=t.detailFormatter,e.header.events[t.fieldIndex]=t.events,e.header.sorters[t.fieldIndex]=t.sorter,e.header.sortNames[t.fieldIndex]=t.sortName,e.header.cellStyles[t.fieldIndex]=t.cellStyle,e.header.searchables[t.fieldIndex]=t.searchable,!t.visible)return;if(e.options.cardView&&!t.cardVisible)return;i[t.field]=t}n.push("<th".concat(kr.sprintf(' title="%s"',t.titleTooltip)),t.checkbox||t.radio?kr.sprintf(' class="bs-checkbox %s"',t.class||""):f||a,kr.sprintf(' style="%s"',c+u+p.join("; ")),kr.sprintf(' rowspan="%s"',t.rowspan),kr.sprintf(' colspan="%s"',t.colspan),kr.sprintf(' data-field="%s"',t.field),0===r&&o>0?" data-not-first-th":"",">"),n.push(kr.sprintf('<div class="th-inner %s">',e.options.sortable&&t.sortable?"sortable both":""));var w=e.options.escape?kr.escapeHTML(t.title):t.title,S=w;t.checkbox&&(w="",!e.options.singleSelect&&e.options.checkboxHeader&&(w='<label><input name="btSelectAll" type="checkbox" /><span></span></label>'),e.header.stateField=t.field),t.radio&&(w="",e.header.stateField=t.field),!w&&t.showSelectTitle&&(w+=S),n.push(w),n.push("</div>"),n.push('<div class="fht-cell"></div>'),n.push("</div>"),n.push("</th>")}})),r&&"right"===e.options.detailViewAlign&&n.push(r),n.push("</tr>")})),this.$header.html(n.join("")),this.$header.find("th[data-field]").each((function(e,n){t(n).data(i[t(n).data("field")])})),this.$container.off("click",".th-inner").on("click",".th-inner",(function(i){var n=t(i.currentTarget);if(e.options.detailView&&!n.parent().hasClass("bs-checkbox")&&n.closest(".bootstrap-table")[0]!==e.$container[0])return!1;e.options.sortable&&n.parent().data().sortable&&e.onSort(i)})),this.$header.children().children().off("keypress").on("keypress",(function(i){e.options.sortable&&t(i.currentTarget).data().sortable&&(13===(i.keyCode||i.which)&&e.onSort(i))}));var o=kr.getResizeEventName(this.$el.attr("id"));t(window).off(o),!this.options.showHeader||this.options.cardView?(this.$header.hide(),this.$tableHeader.hide(),this.$tableLoading.css("top",0)):(this.$header.show(),this.$tableHeader.show(),this.$tableLoading.css("top",this.$header.outerHeight()+1),this.getCaret(),t(window).on(o,(function(){return e.resetView()}))),this.$selectAll=this.$header.find('[name="btSelectAll"]'),this.$selectAll.off("click").on("click",(function(i){i.stopPropagation();var n=t(i.currentTarget).prop("checked");e[n?"checkAll":"uncheckAll"](),e.updateSelected()}))}},{key:"initData",value:function(t,e){"append"===e?this.options.data=this.options.data.concat(t):"prepend"===e?this.options.data=[].concat(t).concat(this.options.data):(t=t||this.options.data,this.options.data=Array.isArray(t)?t:t[this.options.dataField]),this.data=ir(this.options.data),this.options.sortReset&&(this.unsortedData=ir(this.data)),"server"!==this.options.sidePagination&&this.initSort()}},{key:"initSort",value:function(){var t=this,e=this.options.sortName,i="desc"===this.options.sortOrder?-1:1,n=this.header.fields.indexOf(this.options.sortName),o=0;-1!==n?(this.options.sortStable&&this.data.forEach((function(t,e){t.hasOwnProperty("_position")||(t._position=e)})),this.options.customSort?kr.calculateObjectValue(this.options,this.options.customSort,[this.options.sortName,this.options.sortOrder,this.data]):this.data.sort((function(o,r){t.header.sortNames[n]&&(e=t.header.sortNames[n]);var a=kr.getItemField(o,e,t.options.escape),s=kr.getItemField(r,e,t.options.escape),l=kr.calculateObjectValue(t.header,t.header.sorters[n],[a,s,o,r]);return void 0!==l?t.options.sortStable&&0===l?i*(o._position-r._position):i*l:kr.sort(a,s,i,t.options.sortStable,o._position,r._position)})),void 0!==this.options.sortClass&&(clearTimeout(o),o=setTimeout((function(){t.$el.removeClass(t.options.sortClass);var e=t.$header.find('[data-field="'.concat(t.options.sortName,'"]')).index();t.$el.find("tr td:nth-child(".concat(e+1,")")).addClass(t.options.sortClass)}),250))):this.options.sortReset&&(this.data=ir(this.unsortedData))}},{key:"onSort",value:function(e){var i=e.type,n=e.currentTarget,o="keypress"===i?t(n):t(n).parent(),r=this.$header.find("th").eq(o.index());if(this.$header.add(this.$header_).find("span.order").remove(),this.options.sortName===o.data("field")){var a=this.options.sortOrder;void 0===a?this.options.sortOrder="asc":"asc"===a?this.options.sortOrder="desc":"desc"===this.options.sortOrder&&(this.options.sortOrder=this.options.sortReset?void 0:"asc"),void 0===this.options.sortOrder&&(this.options.sortName=void 0)}else this.options.sortName=o.data("field"),this.options.rememberOrder?this.options.sortOrder="asc"===o.data("order")?"desc":"asc":this.options.sortOrder=this.columns[this.fieldsColumnsIndex[o.data("field")]].sortOrder||this.columns[this.fieldsColumnsIndex[o.data("field")]].order;if(this.trigger("sort",this.options.sortName,this.options.sortOrder),o.add(r).data("order",this.options.sortOrder),this.getCaret(),"server"===this.options.sidePagination&&this.options.serverSort)return this.options.pageNumber=1,void this.initServer(this.options.silentSort);this.initSort(),this.initBody()}},{key:"initToolbar",value:function(){var e,i=this,n=this.options,o=[],r=0,a=0;this.$toolbar.find(".bs-bars").children().length&&t("body").append(t(n.toolbar)),this.$toolbar.html(""),"string"!=typeof n.toolbar&&"object"!==Xo(n.toolbar)||t(kr.sprintf('<div class="bs-bars %s-%s"></div>',this.constants.classes.pull,n.toolbarAlign)).appendTo(this.$toolbar).append(t(n.toolbar)),o=['<div class="'.concat(["columns","columns-".concat(n.buttonsAlign),this.constants.classes.buttonsGroup,"".concat(this.constants.classes.pull,"-").concat(n.buttonsAlign)].join(" "),'">')],"string"==typeof n.icons&&(n.icons=kr.calculateObjectValue(null,n.icons));var s={paginationSwitch:'<button class="'.concat(this.constants.buttonsClass,'" type="button" name="paginationSwitch"\n        aria-label="Pagination Switch" title="').concat(n.formatPaginationSwitch(),'">\n        ').concat(n.showButtonIcons?kr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.paginationSwitchDown):"","\n        ").concat(n.showButtonText?n.formatPaginationSwitchUp():"","\n        </button>"),refresh:'<button class="'.concat(this.constants.buttonsClass,'" type="button" name="refresh"\n        aria-label="Refresh" title="').concat(n.formatRefresh(),'">\n        ').concat(n.showButtonIcons?kr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.refresh):"","\n        ").concat(n.showButtonText?n.formatRefresh():"","\n        </button>"),toggle:'<button class="'.concat(this.constants.buttonsClass,'" type="button" name="toggle"\n        aria-label="Toggle" title="').concat(n.formatToggle(),'">\n        ').concat(n.showButtonIcons?kr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.toggleOff):"","\n        ").concat(n.showButtonText?n.formatToggleOn():"","\n        </button>"),fullscreen:'<button class="'.concat(this.constants.buttonsClass,'" type="button" name="fullscreen"\n        aria-label="Fullscreen" title="').concat(n.formatFullscreen(),'">\n        ').concat(n.showButtonIcons?kr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.fullscreen):"","\n        ").concat(n.showButtonText?n.formatFullscreen():"","\n        </button>"),columns:function(){var t=[];if(t.push('<div class="keep-open '.concat(i.constants.classes.buttonsDropdown,'" title="').concat(n.formatColumns(),'">\n          <button class="').concat(i.constants.buttonsClass,' dropdown-toggle" type="button" data-toggle="dropdown"\n          aria-label="Columns" title="').concat(n.formatColumns(),'">\n          ').concat(n.showButtonIcons?kr.sprintf(i.constants.html.icon,n.iconsPrefix,n.icons.columns):"","\n          ").concat(n.showButtonText?n.formatColumns():"","\n          ").concat(i.constants.html.dropdownCaret,"\n          </button>\n          ").concat(i.constants.html.toolbarDropdown[0])),n.showColumnsSearch&&(t.push(kr.sprintf(i.constants.html.toolbarDropdownItem,kr.sprintf('<input type="text" class="%s" name="columnsSearch" placeholder="%s" autocomplete="off">',i.constants.classes.input,n.formatSearch()))),t.push(i.constants.html.toolbarDropdownSeparator)),n.showColumnsToggleAll){var e=i.getVisibleColumns().length===i.columns.filter((function(t){return!i.isSelectionColumn(t)})).length;t.push(kr.sprintf(i.constants.html.toolbarDropdownItem,kr.sprintf('<input type="checkbox" class="toggle-all" %s> <span>%s</span>',e?'checked="checked"':"",n.formatColumnsToggleAll()))),t.push(i.constants.html.toolbarDropdownSeparator)}var o=0;return i.columns.forEach((function(t,e){t.visible&&o++})),i.columns.forEach((function(e,r){if(!i.isSelectionColumn(e)&&(!n.cardView||e.cardVisible)){var s=e.visible?' checked="checked"':"",l=o<=i.options.minimumCountColumns&&s?' disabled="disabled"':"";e.switchable&&(t.push(kr.sprintf(i.constants.html.toolbarDropdownItem,kr.sprintf('<input type="checkbox" data-field="%s" value="%s"%s%s> <span>%s</span>',e.field,r,s,l,e.title))),a++)}})),t.push(i.constants.html.toolbarDropdown[1],"</div>"),t.join("")}()};"string"==typeof n.buttonsOrder&&(n.buttonsOrder=n.buttonsOrder.replace(/\[|\]| |'/g,"").toLowerCase().split(","));var l=!0,c=!1,h=void 0;try{for(var u,d=n.buttonsOrder[Symbol.iterator]();!(l=(u=d.next()).done);l=!0){var p=u.value;n["show"+p.charAt(0).toUpperCase()+p.substring(1)]&&o.push(s[p])}}catch(t){c=!0,h=t}finally{try{l||null==d.return||d.return()}finally{if(c)throw h}}if(o.push("</div>"),(this.showToolbar||o.length>2)&&this.$toolbar.append(o.join("")),n.showPaginationSwitch&&this.$toolbar.find('button[name="paginationSwitch"]').off("click").on("click",(function(){return i.togglePagination()})),n.showFullscreen&&this.$toolbar.find('button[name="fullscreen"]').off("click").on("click",(function(){return i.toggleFullscreen()})),n.showRefresh&&this.$toolbar.find('button[name="refresh"]').off("click").on("click",(function(){return i.refresh()})),n.showToggle&&this.$toolbar.find('button[name="toggle"]').off("click").on("click",(function(){i.toggleView()})),n.showColumns){var f=(e=this.$toolbar.find(".keep-open")).find('input[type="checkbox"]:not(".toggle-all")'),g=e.find('input[type="checkbox"].toggle-all');if(a<=n.minimumCountColumns&&e.find("input").prop("disabled",!0),e.find("li, label").off("click").on("click",(function(t){t.stopImmediatePropagation()})),f.off("click").on("click",(function(e){var n=e.currentTarget,o=t(n);i._toggleColumn(o.val(),o.prop("checked"),!1),i.trigger("column-switch",o.data("field"),o.prop("checked")),g.prop("checked",f.filter(":checked").length===i.columns.filter((function(t){return!i.isSelectionColumn(t)})).length)})),g.off("click").on("click",(function(e){var n=e.currentTarget;i._toggleAllColumns(t(n).prop("checked"))})),n.showColumnsSearch){var v=e.find('[name="columnsSearch"]'),b=e.find(".dropdown-item-marker");v.on("keyup paste change",(function(e){var i=e.currentTarget,n=t(i).val().toLowerCase();b.show(),f.each((function(e,i){var o=t(i).parents(".dropdown-item-marker");o.text().toLowerCase().includes(n)||o.hide()}))}))}}if(n.search||this.showSearchClearButton){o=[];var m=kr.sprintf(this.constants.html.searchButton,this.constants.buttonsClass,n.formatSearch(),n.showButtonIcons?kr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.search):"",n.showButtonText?n.formatSearch():""),y=kr.sprintf(this.constants.html.searchClearButton,this.constants.buttonsClass,n.formatClearSearch(),n.showButtonIcons?kr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.clearSearch):"",n.showButtonText?n.formatClearSearch():""),w='<input class="'.concat(this.constants.classes.input,"\n        ").concat(kr.sprintf(" %s%s",this.constants.classes.inputPrefix,n.iconSize),'\n        search-input" type="text" placeholder="').concat(n.formatSearch(),'" autocomplete="off">'),S=w;if(n.showSearchButton||n.showSearchClearButton){var x=(n.showSearchButton?m:"")+(n.showSearchClearButton?y:"");S=n.search?kr.sprintf(this.constants.html.inputGroup,w,x):x}o.push(kr.sprintf('\n        <div class="'.concat(this.constants.classes.pull,"-").concat(n.searchAlign," search ").concat(this.constants.classes.inputGroup,'">\n          %s\n        </div>\n      '),S)),this.$toolbar.append(o.join(""));var k=this.$toolbar.find(".search input"),O=function(){var t="keyup drop blur ".concat(kr.isIEBrowser()?"mouseup":"");k.off(t).on(t,(function(t){n.searchOnEnterKey&&13!==t.keyCode||[37,38,39,40].includes(t.keyCode)||(clearTimeout(r),r=setTimeout((function(){i.onSearch({currentTarget:t.currentTarget})}),n.searchTimeOut))}))};n.showSearchButton?(this.$toolbar.find(".search button[name=search]").off("click").on("click",(function(t){clearTimeout(r),r=setTimeout((function(){i.onSearch({currentTarget:k})}),n.searchTimeOut)})),n.searchOnEnterKey&&O()):O(),n.showSearchClearButton&&this.$toolbar.find(".search button[name=clearSearch]").click((function(){i.resetSearch()}))}}},{key:"onSearch",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},i=e.currentTarget,n=e.firedByInitSearchText,o=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(void 0!==i&&t(i).length&&o){var r=t(i).val().trim();if(this.options.trimOnSearch&&t(i).val()!==r&&t(i).val(r),this.searchText===r&&r.length>0)return;t(i).hasClass("search-input")&&(this.searchText=r,this.options.searchText=r)}n||(this.options.pageNumber=1),this.initSearch(),n?"client"===this.options.sidePagination&&this.updatePagination():this.updatePagination(),this.trigger("search",this.searchText)}},{key:"initSearch",value:function(){var t=this;if(this.filterOptions=this.filterOptions||this.options.filterOptions,"server"!==this.options.sidePagination){if(this.options.customSearch)return void(this.data=kr.calculateObjectValue(this.options,this.options.customSearch,[this.options.data,this.searchText,this.filterColumns]));var e=this.searchText&&(this.fromHtml?kr.escapeHTML(this.searchText):this.searchText).toLowerCase(),i=kr.isEmptyObject(this.filterColumns)?null:this.filterColumns;"function"==typeof this.filterOptions.filterAlgorithm?this.data=this.options.data.filter((function(e,n){return t.filterOptions.filterAlgorithm.apply(null,[e,i])})):"string"==typeof this.filterOptions.filterAlgorithm&&(this.data=i?this.options.data.filter((function(e,n){var o=t.filterOptions.filterAlgorithm;if("and"===o){for(var r in i)if(Array.isArray(i[r])&&!i[r].includes(e[r])||!Array.isArray(i[r])&&e[r]!==i[r])return!1}else if("or"===o){var a=!1;for(var s in i)(Array.isArray(i[s])&&i[s].includes(e[s])||!Array.isArray(i[s])&&e[s]===i[s])&&(a=!0);return a}return!0})):ir(this.options.data));var n=this.getVisibleFields();this.data=e?this.data.filter((function(i,o){for(var r=0;r<t.header.fields.length;r++)if(t.header.searchables[r]&&(!t.options.visibleSearch||-1!==n.indexOf(t.header.fields[r]))){var a=kr.isNumeric(t.header.fields[r])?parseInt(t.header.fields[r],10):t.header.fields[r],s=t.columns[t.fieldsColumnsIndex[a]],l=void 0;if("string"==typeof a){l=i;for(var c=a.split("."),h=0;h<c.length;h++)null!==l[c[h]]&&(l=l[c[h]])}else l=i[a];if(t.options.searchAccentNeutralise&&(l=kr.normalizeAccent(l)),s&&s.searchFormatter&&(l=kr.calculateObjectValue(s,t.header.formatters[r],[l,i,o,s.field],l)),"string"==typeof l||"number"==typeof l)if(t.options.strictSearch){if("".concat(l).toLowerCase()===e)return!0}else{var u=/(?:(<=|=>|=<|>=|>|<)(?:\s+)?(\d+)?|(\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm.exec(e),d=!1;if(u){var p=u[1]||"".concat(u[5],"l"),f=u[2]||u[3],g=parseInt(l,10),v=parseInt(f,10);switch(p){case">":case"<l":d=g>v;break;case"<":case">l":d=g<v;break;case"<=":case"=<":case">=l":case"=>l":d=g<=v;break;case">=":case"=>":case"<=l":case"=<l":d=g>=v}}if(d||"".concat(l).toLowerCase().includes(e))return!0}}return!1})):this.data,this.options.sortReset&&(this.unsortedData=ir(this.data)),this.initSort()}}},{key:"initPagination",value:function(){var t=this,e=this.options;if(e.pagination){this.$pagination.show();var i,n,o,r,a,s,l,c=[],h=!1,u=this.getData({includeHiddenRows:!1}),d=e.pageList;if("string"==typeof d&&(d=d.replace(/\[|\]| /g,"").toLowerCase().split(",")),d=d.map((function(t){return"string"==typeof t?t.toLowerCase()===e.formatAllRows().toLowerCase()||["all","unlimited"].includes(t.toLowerCase())?e.formatAllRows():+t:t})),this.paginationParts=e.paginationParts,"string"==typeof this.paginationParts&&(this.paginationParts=this.paginationParts.replace(/\[|\]| |'/g,"").split(",")),"server"!==e.sidePagination&&(e.totalRows=u.length),this.totalPages=0,e.totalRows&&(e.pageSize===e.formatAllRows()&&(e.pageSize=e.totalRows,h=!0),this.totalPages=1+~~((e.totalRows-1)/e.pageSize),e.totalPages=this.totalPages),this.totalPages>0&&e.pageNumber>this.totalPages&&(e.pageNumber=this.totalPages),this.pageFrom=(e.pageNumber-1)*e.pageSize+1,this.pageTo=e.pageNumber*e.pageSize,this.pageTo>e.totalRows&&(this.pageTo=e.totalRows),this.options.pagination&&"server"!==this.options.sidePagination&&(this.options.totalNotFiltered=this.options.data.length),this.options.showExtendedPagination||(this.options.totalNotFiltered=void 0),(this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")||this.paginationParts.includes("pageSize"))&&c.push('<div class="'.concat(this.constants.classes.pull,"-").concat(e.paginationDetailHAlign,' pagination-detail">')),this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")){var p=this.paginationParts.includes("pageInfoShort")?e.formatDetailPagination(e.totalRows):e.formatShowingRows(this.pageFrom,this.pageTo,e.totalRows,e.totalNotFiltered);c.push('<span class="pagination-info">\n      '.concat(p,"\n      </span>"))}if(this.paginationParts.includes("pageSize")){c.push('<span class="page-list">');var f=['<span class="'.concat(this.constants.classes.paginationDropdown,'">\n        <button class="').concat(this.constants.buttonsClass,' dropdown-toggle" type="button" data-toggle="dropdown">\n        <span class="page-size">\n        ').concat(h?e.formatAllRows():e.pageSize,"\n        </span>\n        ").concat(this.constants.html.dropdownCaret,"\n        </button>\n        ").concat(this.constants.html.pageDropdown[0])];d.forEach((function(i,n){var o;(!e.smartDisplay||0===n||d[n-1]<e.totalRows)&&(o=h?i===e.formatAllRows()?t.constants.classes.dropdownActive:"":i===e.pageSize?t.constants.classes.dropdownActive:"",f.push(kr.sprintf(t.constants.html.pageDropdownItem,o,i)))})),f.push("".concat(this.constants.html.pageDropdown[1],"</span>")),c.push(e.formatRecordsPerPage(f.join("")))}if((this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")||this.paginationParts.includes("pageSize"))&&c.push("</span></div>"),this.paginationParts.includes("pageList")){c.push('<div class="'.concat(this.constants.classes.pull,"-").concat(e.paginationHAlign,' pagination">'),kr.sprintf(this.constants.html.pagination[0],kr.sprintf(" pagination-%s",e.iconSize)),kr.sprintf(this.constants.html.paginationItem," page-pre",e.formatSRPaginationPreText(),e.paginationPreText)),this.totalPages<e.paginationSuccessivelySize?(n=1,o=this.totalPages):o=(n=e.pageNumber-e.paginationPagesBySide)+2*e.paginationPagesBySide,e.pageNumber<e.paginationSuccessivelySize-1&&(o=e.paginationSuccessivelySize),e.paginationSuccessivelySize>this.totalPages-n&&(n=n-(e.paginationSuccessivelySize-(this.totalPages-n))+1),n<1&&(n=1),o>this.totalPages&&(o=this.totalPages);var g=Math.round(e.paginationPagesBySide/2),v=function(i){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return kr.sprintf(t.constants.html.paginationItem,n+(i===e.pageNumber?" ".concat(t.constants.classes.paginationActive):""),e.formatSRPaginationPageText(i),i)};if(n>1){var b=e.paginationPagesBySide;for(b>=n&&(b=n-1),i=1;i<=b;i++)c.push(v(i));n-1===b+1?(i=n-1,c.push(v(i))):n-1>b&&(n-2*e.paginationPagesBySide>e.paginationPagesBySide&&e.paginationUseIntermediate?(i=Math.round((n-g)/2+g),c.push(v(i," page-intermediate"))):c.push(kr.sprintf(this.constants.html.paginationItem," page-first-separator disabled","","...")))}for(i=n;i<=o;i++)c.push(v(i));if(this.totalPages>o){var m=this.totalPages-(e.paginationPagesBySide-1);for(o>=m&&(m=o+1),o+1===m-1?(i=o+1,c.push(v(i))):m>o+1&&(this.totalPages-o>2*e.paginationPagesBySide&&e.paginationUseIntermediate?(i=Math.round((this.totalPages-g-o)/2+o),c.push(v(i," page-intermediate"))):c.push(kr.sprintf(this.constants.html.paginationItem," page-last-separator disabled","","..."))),i=m;i<=this.totalPages;i++)c.push(v(i))}c.push(kr.sprintf(this.constants.html.paginationItem," page-next",e.formatSRPaginationNextText(),e.paginationNextText)),c.push(this.constants.html.pagination[1],"</div>")}this.$pagination.html(c.join(""));var y=["bottom","both"].includes(e.paginationVAlign)?" ".concat(this.constants.classes.dropup):"";this.$pagination.last().find(".page-list > span").addClass(y),e.onlyInfoPagination||(r=this.$pagination.find(".page-list a"),a=this.$pagination.find(".page-pre"),s=this.$pagination.find(".page-next"),l=this.$pagination.find(".page-item").not(".page-next, .page-pre, .page-last-separator, .page-first-separator"),this.totalPages<=1&&this.$pagination.find("div.pagination").hide(),e.smartDisplay&&(d.length<2||e.totalRows<=d[0])&&this.$pagination.find("span.page-list").hide(),this.$pagination[this.getData().length?"show":"hide"](),e.paginationLoop||(1===e.pageNumber&&a.addClass("disabled"),e.pageNumber===this.totalPages&&s.addClass("disabled")),h&&(e.pageSize=e.formatAllRows()),r.off("click").on("click",(function(e){return t.onPageListChange(e)})),a.off("click").on("click",(function(e){return t.onPagePre(e)})),s.off("click").on("click",(function(e){return t.onPageNext(e)})),l.off("click").on("click",(function(e){return t.onPageNumber(e)})))}else this.$pagination.hide()}},{key:"updatePagination",value:function(e){e&&t(e.currentTarget).hasClass("disabled")||(this.options.maintainMetaData||this.resetRows(),this.initPagination(),this.trigger("page-change",this.options.pageNumber,this.options.pageSize),"server"===this.options.sidePagination?this.initServer():this.initBody())}},{key:"onPageListChange",value:function(e){e.preventDefault();var i=t(e.currentTarget);return i.parent().addClass(this.constants.classes.dropdownActive).siblings().removeClass(this.constants.classes.dropdownActive),this.options.pageSize=i.text().toUpperCase()===this.options.formatAllRows().toUpperCase()?this.options.formatAllRows():+i.text(),this.$toolbar.find(".page-size").text(this.options.pageSize),this.updatePagination(e),!1}},{key:"onPagePre",value:function(t){return t.preventDefault(),this.options.pageNumber-1==0?this.options.pageNumber=this.options.totalPages:this.options.pageNumber--,this.updatePagination(t),!1}},{key:"onPageNext",value:function(t){return t.preventDefault(),this.options.pageNumber+1>this.options.totalPages?this.options.pageNumber=1:this.options.pageNumber++,this.updatePagination(t),!1}},{key:"onPageNumber",value:function(e){if(e.preventDefault(),this.options.pageNumber!==+t(e.currentTarget).text())return this.options.pageNumber=+t(e.currentTarget).text(),this.updatePagination(e),!1}},{key:"initRow",value:function(t,e,i,n){var o=this,r=[],a={},s=[],l="",c={},h=[];if(!(kr.findIndex(this.hiddenRows,t)>-1)){if((a=kr.calculateObjectValue(this.options,this.options.rowStyle,[t,e],a))&&a.css)for(var u=0,d=Object.entries(a.css);u<d.length;u++){var p=er(d[u],2),f=p[0],g=p[1];s.push("".concat(f,": ").concat(g))}if(c=kr.calculateObjectValue(this.options,this.options.rowAttributes,[t,e],c))for(var v=0,b=Object.entries(c);v<b.length;v++){var m=er(b[v],2),y=m[0],w=m[1];h.push("".concat(y,'="').concat(kr.escapeHTML(w),'"'))}if(t._data&&!kr.isEmptyObject(t._data))for(var S=0,x=Object.entries(t._data);S<x.length;S++){var k=er(x[S],2),O=k[0],C=k[1];if("index"===O)return;l+=" data-".concat(O,"='").concat("object"===Xo(C)?JSON.stringify(C):C,"'")}r.push("<tr",kr.sprintf(" %s",h.length?h.join(" "):void 0),kr.sprintf(' id="%s"',Array.isArray(t)?void 0:t._id),kr.sprintf(' class="%s"',a.classes||(Array.isArray(t)?void 0:t._class)),' data-index="'.concat(e,'"'),kr.sprintf(' data-uniqueid="%s"',kr.getItemField(t,this.options.uniqueId,!1)),kr.sprintf(' data-has-detail-view="%s"',this.options.detailView&&kr.calculateObjectValue(null,this.options.detailFilter,[e,t])?"true":void 0),kr.sprintf("%s",l),">"),this.options.cardView&&r.push('<td colspan="'.concat(this.header.fields.length,'"><div class="card-views">'));var T="";return kr.hasDetailViewIcon(this.options)&&(T="<td>",kr.calculateObjectValue(null,this.options.detailFilter,[e,t])&&(T+='\n          <a class="detail-icon" href="#">\n          '.concat(kr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailOpen),"\n          </a>\n        ")),T+="</td>"),T&&"right"!==this.options.detailViewAlign&&r.push(T),this.header.fields.forEach((function(i,n){var a="",l=kr.getItemField(t,i,o.options.escape),c="",h="",u={},d="",p=o.header.classes[n],f="",g="",v="",b="",m="",y=o.columns[n];if((!o.fromHtml&&!o.autoMergeCells||void 0!==l||y.checkbox||y.radio)&&y.visible&&(!o.options.cardView||y.cardVisible)){if(y.escape&&(l=kr.escapeHTML(l)),s.concat([o.header.styles[n]]).length&&(f=' style="'.concat(s.concat([o.header.styles[n]]).join("; "),'"')),t["_".concat(i,"_id")]&&(d=kr.sprintf(' id="%s"',t["_".concat(i,"_id")])),t["_".concat(i,"_class")]&&(p=kr.sprintf(' class="%s"',t["_".concat(i,"_class")])),t["_".concat(i,"_rowspan")]&&(v=kr.sprintf(' rowspan="%s"',t["_".concat(i,"_rowspan")])),t["_".concat(i,"_colspan")]&&(b=kr.sprintf(' colspan="%s"',t["_".concat(i,"_colspan")])),t["_".concat(i,"_title")]&&(m=kr.sprintf(' title="%s"',t["_".concat(i,"_title")])),(u=kr.calculateObjectValue(o.header,o.header.cellStyles[n],[l,t,e,i],u)).classes&&(p=' class="'.concat(u.classes,'"')),u.css){for(var w=[],S=0,x=Object.entries(u.css);S<x.length;S++){var k=er(x[S],2),O=k[0],C=k[1];w.push("".concat(O,": ").concat(C))}f=' style="'.concat(w.concat(o.header.styles[n]).join("; "),'"')}if(c=kr.calculateObjectValue(y,o.header.formatters[n],[l,t,e,i],l),t["_".concat(i,"_data")]&&!kr.isEmptyObject(t["_".concat(i,"_data")]))for(var T=0,P=Object.entries(t["_".concat(i,"_data")]);T<P.length;T++){var I=er(P[T],2),A=I[0],$=I[1];if("index"===A)return;g+=" data-".concat(A,'="').concat($,'"')}if(y.checkbox||y.radio){h=y.checkbox?"checkbox":h,h=y.radio?"radio":h;var E=y.class||"",R=(!0===c||l||c&&c.checked)&&!1!==c,j=!y.checkboxEnabled||c&&c.disabled;a=[o.options.cardView?'<div class="card-view '.concat(E,'">'):'<td class="bs-checkbox '.concat(E,'"').concat(p).concat(f,">"),'<label>\n            <input\n            data-index="'.concat(e,'"\n            name="').concat(o.options.selectItemName,'"\n            type="').concat(h,'"\n            ').concat(kr.sprintf('value="%s"',t[o.options.idField]),"\n            ").concat(kr.sprintf('checked="%s"',R?"checked":void 0),"\n            ").concat(kr.sprintf('disabled="%s"',j?"disabled":void 0)," />\n            <span></span>\n            </label>"),o.header.formatters[n]&&"string"==typeof c?c:"",o.options.cardView?"</div>":"</td>"].join(""),t[o.header.stateField]=!0===c||!!l||c&&c.checked}else if(c=null==c?o.options.undefinedText:c,o.options.cardView){var N=o.options.showHeader?'<span class="card-view-title"'.concat(f,">").concat(kr.getFieldTitle(o.columns,i),"</span>"):"";a='<div class="card-view">'.concat(N,'<span class="card-view-value">').concat(c,"</span></div>"),o.options.smartDisplay&&""===c&&(a='<div class="card-view"></div>')}else a="<td".concat(d).concat(p).concat(f).concat(g).concat(v).concat(b).concat(m,">").concat(c,"</td>");r.push(a)}})),T&&"right"===this.options.detailViewAlign&&r.push(T),this.options.cardView&&r.push("</div></td>"),r.push("</tr>"),r.join("")}}},{key:"initBody",value:function(e){var i=this,n=this.getData();this.trigger("pre-body",n),this.$body=this.$el.find(">tbody"),this.$body.length||(this.$body=t("<tbody></tbody>").appendTo(this.$el)),this.options.pagination&&"server"!==this.options.sidePagination||(this.pageFrom=1,this.pageTo=n.length);var o=[],r=t(document.createDocumentFragment()),a=!1;this.autoMergeCells=kr.checkAutoMergeCells(n.slice(this.pageFrom-1,this.pageTo));for(var s=this.pageFrom-1;s<this.pageTo;s++){var l=n[s],c=this.initRow(l,s,n,r);a=a||!!c,c&&"string"==typeof c&&(this.options.virtualScroll?o.push(c):r.append(c))}a?this.options.virtualScroll?(this.virtualScroll&&this.virtualScroll.destroy(),this.virtualScroll=new Or({rows:o,fixedScroll:e,scrollEl:this.$tableBody[0],contentEl:this.$body[0],itemHeight:this.options.virtualScrollItemHeight,callback:function(){i.fitHeader(),i.initBodyEvent()}})):this.$body.html(r):this.$body.html('<tr class="no-records-found">'.concat(kr.sprintf('<td colspan="%s">%s</td>',this.getVisibleFields().length,this.options.formatNoMatches()),"</tr>")),e||this.scrollTo(0),this.initBodyEvent(),this.updateSelected(),this.initFooter(),this.resetView(),"server"!==this.options.sidePagination&&(this.options.totalRows=n.length),this.trigger("post-body",n)}},{key:"initBodyEvent",value:function(){var e=this;this.$body.find("> tr[data-index] > td").off("click dblclick").on("click dblclick",(function(i){var n=t(i.currentTarget),o=n.parent(),r=t(i.target).parents(".card-views").children(),a=t(i.target).parents(".card-view"),s=o.data("index"),l=e.data[s],c=e.options.cardView?r.index(a):n[0].cellIndex,h=e.getVisibleFields()[kr.hasDetailViewIcon(e.options)&&"right"!==e.options.detailViewAlign?c-1:c],u=e.columns[e.fieldsColumnsIndex[h]],d=kr.getItemField(l,h,e.options.escape);if(!n.find(".detail-icon").length){if(e.trigger("click"===i.type?"click-cell":"dbl-click-cell",h,d,l,n),e.trigger("click"===i.type?"click-row":"dbl-click-row",l,o,h),"click"===i.type&&e.options.clickToSelect&&u.clickToSelect&&!kr.calculateObjectValue(e.options,e.options.ignoreClickToSelectOn,[i.target])){var p=o.find(kr.sprintf('[name="%s"]',e.options.selectItemName));p.length&&p[0].click()}"click"===i.type&&e.options.detailViewByClick&&e.toggleDetailView(s,e.header.detailFormatters[e.fieldsColumnsIndex[h]])}})).off("mousedown").on("mousedown",(function(t){e.multipleSelectRowCtrlKey=t.ctrlKey||t.metaKey,e.multipleSelectRowShiftKey=t.shiftKey})),this.$body.find("> tr[data-index] > td > .detail-icon").off("click").on("click",(function(i){return i.preventDefault(),e.toggleDetailView(t(i.currentTarget).parent().parent().data("index")),!1})),this.$selectItem=this.$body.find(kr.sprintf('[name="%s"]',this.options.selectItemName)),this.$selectItem.off("click").on("click",(function(i){i.stopImmediatePropagation();var n=t(i.currentTarget);e._toggleCheck(n.prop("checked"),n.data("index"))})),this.header.events.forEach((function(i,n){var o=i;if(o){"string"==typeof o&&(o=kr.calculateObjectValue(null,o));var r=e.header.fields[n],a=e.getVisibleFields().indexOf(r);if(-1!==a){kr.hasDetailViewIcon(e.options)&&"right"!==e.options.detailViewAlign&&(a+=1);var s=function(i){if(!o.hasOwnProperty(i))return"continue";var n=o[i];e.$body.find(">tr:not(.no-records-found)").each((function(o,s){var l=t(s),c=l.find(e.options.cardView?".card-views>.card-view":">td").eq(a),h=i.indexOf(" "),u=i.substring(0,h),d=i.substring(h+1);c.find(d).off(u).on(u,(function(t){var i=l.data("index"),o=e.data[i],a=o[r];n.apply(e,[t,a,o,i])}))}))};for(var l in o)s(l)}}}))}},{key:"initServer",value:function(e,i,n){var o=this,r={},a=this.header.fields.indexOf(this.options.sortName),s={searchText:this.searchText,sortName:this.options.sortName,sortOrder:this.options.sortOrder};if(this.header.sortNames[a]&&(s.sortName=this.header.sortNames[a]),this.options.pagination&&"server"===this.options.sidePagination&&(s.pageSize=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,s.pageNumber=this.options.pageNumber),n||this.options.url||this.options.ajax){if("limit"===this.options.queryParamsType&&(s={search:s.searchText,sort:s.sortName,order:s.sortOrder},this.options.pagination&&"server"===this.options.sidePagination&&(s.offset=this.options.pageSize===this.options.formatAllRows()?0:this.options.pageSize*(this.options.pageNumber-1),s.limit=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,0===s.limit&&delete s.limit)),this.options.search&&"server"===this.options.sidePagination&&this.columns.filter((function(t){return!t.searchable})).length){s.searchable=[];var l=!0,c=!1,h=void 0;try{for(var u,d=this.columns[Symbol.iterator]();!(l=(u=d.next()).done);l=!0){var p=u.value;!p.checkbox&&p.searchable&&(this.options.visibleSearch&&p.visible||!this.options.visibleSearch)&&s.searchable.push(p.field)}}catch(t){c=!0,h=t}finally{try{l||null==d.return||d.return()}finally{if(c)throw h}}}if(kr.isEmptyObject(this.filterColumnsPartial)||(s.filter=JSON.stringify(this.filterColumnsPartial,null)),t.extend(s,i||{}),!1!==(r=kr.calculateObjectValue(this.options,this.options.queryParams,[s],r))){e||this.showLoading();var f=t.extend({},kr.calculateObjectValue(null,this.options.ajaxOptions),{type:this.options.method,url:n||this.options.url,data:"application/json"===this.options.contentType&&"post"===this.options.method?JSON.stringify(r):r,cache:this.options.cache,contentType:this.options.contentType,dataType:this.options.dataType,success:function(t,i,n){var r=kr.calculateObjectValue(o.options,o.options.responseHandler,[t,n],t);o.load(r),o.trigger("load-success",r,n&&n.status,n),e||o.hideLoading(),"server"===o.options.sidePagination&&r[o.options.totalField]>0&&!r[o.options.dataField].length&&o.updatePagination()},error:function(t){var i=[];"server"===o.options.sidePagination&&((i={})[o.options.totalField]=0,i[o.options.dataField]=[]),o.load(i),o.trigger("load-error",t&&t.status,t),e||o.$tableLoading.hide()}});return this.options.ajax?kr.calculateObjectValue(this,this.options.ajax,[f],null):(this._xhr&&4!==this._xhr.readyState&&this._xhr.abort(),this._xhr=t.ajax(f)),r}}}},{key:"initSearchText",value:function(){if(this.options.search&&(this.searchText="",""!==this.options.searchText)){var t=this.$toolbar.find(".search input");t.val(this.options.searchText),this.onSearch({currentTarget:t,firedByInitSearchText:!0})}}},{key:"getCaret",value:function(){var e=this;this.$header.find("th").each((function(i,n){t(n).find(".sortable").removeClass("desc asc").addClass(t(n).data("field")===e.options.sortName?e.options.sortOrder:"both")}))}},{key:"updateSelected",value:function(){var e=this.$selectItem.filter(":enabled").length&&this.$selectItem.filter(":enabled").length===this.$selectItem.filter(":enabled").filter(":checked").length;this.$selectAll.add(this.$selectAll_).prop("checked",e),this.$selectItem.each((function(e,i){t(i).closest("tr")[t(i).prop("checked")?"addClass":"removeClass"]("selected")}))}},{key:"updateRows",value:function(){var e=this;this.$selectItem.each((function(i,n){e.data[t(n).data("index")][e.header.stateField]=t(n).prop("checked")}))}},{key:"resetRows",value:function(){var t=!0,e=!1,i=void 0;try{for(var n,o=this.data[Symbol.iterator]();!(t=(n=o.next()).done);t=!0){var r=n.value;this.$selectAll.prop("checked",!1),this.$selectItem.prop("checked",!1),this.header.stateField&&(r[this.header.stateField]=!1)}}catch(t){e=!0,i=t}finally{try{t||null==o.return||o.return()}finally{if(e)throw i}}this.initHiddenRows()}},{key:"trigger",value:function(i){for(var n,o="".concat(i,".bs.table"),r=arguments.length,a=new Array(r>1?r-1:0),s=1;s<r;s++)a[s-1]=arguments[s];(n=this.options)[e.EVENTS[o]].apply(n,a),this.$el.trigger(t.Event(o),a),this.options.onAll(o,a),this.$el.trigger(t.Event("all.bs.table"),[o,a])}},{key:"resetHeader",value:function(){var t=this;clearTimeout(this.timeoutId_),this.timeoutId_=setTimeout((function(){return t.fitHeader()}),this.$el.is(":hidden")?100:0)}},{key:"fitHeader",value:function(){var e=this;if(this.$el.is(":hidden"))this.timeoutId_=setTimeout((function(){return e.fitHeader()}),100);else{var i=this.$tableBody.get(0),n=i.scrollWidth>i.clientWidth&&i.scrollHeight>i.clientHeight+this.$header.outerHeight()?kr.getScrollBarWidth():0;this.$el.css("margin-top",-this.$header.outerHeight());var o=t(":focus");if(o.length>0){var r=o.parents("th");if(r.length>0){var a=r.attr("data-field");if(void 0!==a){var s=this.$header.find("[data-field='".concat(a,"']"));s.length>0&&s.find(":input").addClass("focus-temp")}}}this.$header_=this.$header.clone(!0,!0),this.$selectAll_=this.$header_.find('[name="btSelectAll"]'),this.$tableHeader.css("margin-right",n).find("table").css("width",this.$el.outerWidth()).html("").attr("class",this.$el.attr("class")).append(this.$header_),this.$tableLoading.css("width",this.$el.outerWidth());var l=t(".focus-temp:visible:eq(0)");l.length>0&&(l.focus(),this.$header.find(".focus-temp").removeClass("focus-temp")),this.$header.find("th[data-field]").each((function(i,n){e.$header_.find(kr.sprintf('th[data-field="%s"]',t(n).data("field"))).data(t(n).data())}));for(var c=this.getVisibleFields(),h=this.$header_.find("th"),u=this.$body.find(">tr:not(.no-records-found,.virtual-scroll-top)").eq(0);u.length&&u.find('>td[colspan]:not([colspan="1"])').length;)u=u.next();var d=u.find("> *").length;u.find("> *").each((function(i,n){var o=t(n);if(kr.hasDetailViewIcon(e.options)&&(0===i&&"right"!==e.options.detailViewAlign||i===d-1&&"right"===e.options.detailViewAlign)){var r=h.filter(".detail"),a=r.innerWidth()-r.find(".fht-cell").width();r.find(".fht-cell").width(o.innerWidth()-a)}else{var s=kr.hasDetailViewIcon(e.options)&&"right"!==e.options.detailViewAlign?i-1:i,l=e.$header_.find(kr.sprintf('th[data-field="%s"]',c[s]));l.length>1&&(l=t(h[o[0].cellIndex]));var u=l.innerWidth()-l.find(".fht-cell").width();l.find(".fht-cell").width(o.innerWidth()-u)}})),this.horizontalScroll(),this.trigger("post-header")}}},{key:"initFooter",value:function(){if(this.options.showFooter&&!this.options.cardView){var t=this.getData(),e=[],i="";kr.hasDetailViewIcon(this.options)&&(i='<th class="detail"><div class="th-inner"></div><div class="fht-cell"></div></th>'),i&&"right"!==this.options.detailViewAlign&&e.push(i);var n=!0,o=!1,r=void 0;try{for(var a,s=this.columns[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l,c,h=a.value,u=[],d={},p=kr.sprintf(' class="%s"',h.class);if(h.visible){if(this.options.cardView&&!h.cardVisible)return;if(l=kr.sprintf("text-align: %s; ",h.falign?h.falign:h.align),c=kr.sprintf("vertical-align: %s; ",h.valign),(d=kr.calculateObjectValue(null,this.options.footerStyle,[h]))&&d.css)for(var f=0,g=Object.entries(d.css);f<g.length;f++){var v=er(g[f],2),b=v[0],m=v[1];u.push("".concat(b,": ").concat(m))}d&&d.classes&&(p=kr.sprintf(' class="%s"',h.class?[h.class,d.classes].join(" "):d.classes)),e.push("<th",p,kr.sprintf(' style="%s"',l+c+u.concat().join("; ")),">"),e.push('<div class="th-inner">'),e.push(kr.calculateObjectValue(h,h.footerFormatter,[t],this.footerData[0]&&this.footerData[0][h.field]||"")),e.push("</div>"),e.push('<div class="fht-cell"></div>'),e.push("</div>"),e.push("</th>")}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}i&&"right"===this.options.detailViewAlign&&e.push(i),this.options.height||this.$tableFooter.length||(this.$el.append("<tfoot><tr></tr></tfoot>"),this.$tableFooter=this.$el.find("tfoot")),this.$tableFooter.find("tr").html(e.join("")),this.trigger("post-footer",this.$tableFooter)}}},{key:"fitFooter",value:function(){var e=this;if(this.$el.is(":hidden"))setTimeout((function(){return e.fitFooter()}),100);else{var i=this.$tableBody.get(0),n=i.scrollWidth>i.clientWidth&&i.scrollHeight>i.clientHeight+this.$header.outerHeight()?kr.getScrollBarWidth():0;this.$tableFooter.css("margin-right",n).find("table").css("width",this.$el.outerWidth()).attr("class",this.$el.attr("class"));this.getVisibleFields();for(var o=this.$tableFooter.find("th"),r=this.$body.find(">tr:first-child:not(.no-records-found)");r.length&&r.find('>td[colspan]:not([colspan="1"])').length;)r=r.next();var a=r.find("> *").length;r.find("> *").each((function(i,n){var r=t(n);if(kr.hasDetailViewIcon(e.options)&&(0===i&&"left"===e.options.detailViewAlign||i===a-1&&"right"===e.options.detailViewAlign)){var s=o.filter(".detail"),l=s.innerWidth()-s.find(".fht-cell").width();s.find(".fht-cell").width(r.innerWidth()-l)}else{var c=o.eq(i),h=c.innerWidth()-c.find(".fht-cell").width();c.find(".fht-cell").width(r.innerWidth()-h)}})),this.horizontalScroll()}}},{key:"horizontalScroll",value:function(){var t=this;this.$tableBody.off("scroll").on("scroll",(function(){var e=t.$tableBody.scrollLeft();t.options.showHeader&&t.options.height&&t.$tableHeader.scrollLeft(e),t.options.showFooter&&!t.options.cardView&&t.$tableFooter.scrollLeft(e),t.trigger("scroll-body",t.$tableBody)}))}},{key:"getVisibleFields",value:function(){var t=[],e=!0,i=!1,n=void 0;try{for(var o,r=this.header.fields[Symbol.iterator]();!(e=(o=r.next()).done);e=!0){var a=o.value,s=this.columns[this.fieldsColumnsIndex[a]];s&&s.visible&&t.push(a)}}catch(t){i=!0,n=t}finally{try{e||null==r.return||r.return()}finally{if(i)throw n}}return t}},{key:"initHiddenRows",value:function(){this.hiddenRows=[]}},{key:"getOptions",value:function(){var e=t.extend({},this.options);return delete e.data,t.extend(!0,{},e)}},{key:"refreshOptions",value:function(e){kr.compareObjects(this.options,e,!0)||(this.options=t.extend(this.options,e),this.trigger("refresh-options",this.options),this.destroy(),this.init())}},{key:"getData",value:function(t){var e=this,i=this.options.data;if(!(this.searchText||this.options.customSearch||this.options.sortName)&&kr.isEmptyObject(this.filterColumns)&&kr.isEmptyObject(this.filterColumnsPartial)||t&&t.unfiltered||(i=this.data),t&&t.useCurrentPage&&(i=i.slice(this.pageFrom-1,this.pageTo)),t&&!t.includeHiddenRows){var n=this.getHiddenRows();i=i.filter((function(t){return-1===kr.findIndex(n,t)}))}return t&&t.formatted&&i.forEach((function(t){for(var i=0,n=Object.entries(t);i<n.length;i++){var o=er(n[i],2),r=o[0],a=o[1],s=e.columns[e.fieldsColumnsIndex[r]];if(!s)return;t[r]=kr.calculateObjectValue(s,e.header.formatters[s.fieldIndex],[a,t,t.index,s.field],a)}})),i}},{key:"getSelections",value:function(){var t=this;return this.data.filter((function(e){return!0===e[t.header.stateField]}))}},{key:"getAllSelections",value:function(){var t=this;return this.options.data.filter((function(e){return!0===e[t.header.stateField]}))}},{key:"load",value:function(t){var e,i=t;this.options.pagination&&"server"===this.options.sidePagination&&(this.options.totalRows=i[this.options.totalField]),this.options.pagination&&"server"===this.options.sidePagination&&(this.options.totalNotFiltered=i[this.options.totalNotFilteredField]),e=i.fixedScroll,i=Array.isArray(i)?i:i[this.options.dataField],this.initData(i),this.initSearch(),this.initPagination(),this.initBody(e)}},{key:"append",value:function(t){this.initData(t,"append"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"prepend",value:function(t){this.initData(t,"prepend"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"remove",value:function(t){var e,i,n=this.options.data.length;if(t.hasOwnProperty("field")&&t.hasOwnProperty("values")){for(e=n-1;e>=0;e--){((i=this.options.data[e]).hasOwnProperty(t.field)||"$index"===t.field)&&((i.hasOwnProperty(t.field)||"$index"!==t.field?t.values.includes(i[t.field]):t.values.includes(e))&&(this.options.data.splice(e,1),"server"===this.options.sidePagination&&(this.options.totalRows-=1)))}n!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}}},{key:"removeAll",value:function(){this.options.data.length>0&&(this.options.data.splice(0,this.options.data.length),this.initSearch(),this.initPagination(),this.initBody(!0))}},{key:"insertRow",value:function(t){t.hasOwnProperty("index")&&t.hasOwnProperty("row")&&(this.options.data.splice(t.index,0,t.row),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}},{key:"updateRow",value:function(e){var i=Array.isArray(e)?e:[e],n=!0,o=!1,r=void 0;try{for(var a,s=i[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;l.hasOwnProperty("index")&&l.hasOwnProperty("row")&&(l.hasOwnProperty("replace")&&l.replace?this.options.data[l.index]=l.row:t.extend(this.options.data[l.index],l.row))}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"getRowByUniqueId",value:function(t){var e,i,n,o=this.options.uniqueId,r=t,a=null;for(e=this.options.data.length-1;e>=0;e--){if((i=this.options.data[e]).hasOwnProperty(o))n=i[o];else{if(!i._data||!i._data.hasOwnProperty(o))continue;n=i._data[o]}if("string"==typeof n?r=r.toString():"number"==typeof n&&(Number(n)===n&&n%1==0?r=parseInt(r):n===Number(n)&&0!==n&&(r=parseFloat(r))),n===r){a=i;break}}return a}},{key:"updateByUniqueId",value:function(e){var i=Array.isArray(e)?e:[e],n=!0,o=!1,r=void 0;try{for(var a,s=i[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;if(l.hasOwnProperty("id")&&l.hasOwnProperty("row")){var c=this.options.data.indexOf(this.getRowByUniqueId(l.id));-1!==c&&(l.hasOwnProperty("replace")&&l.replace?this.options.data[c]=l.row:t.extend(this.options.data[c],l.row))}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"removeByUniqueId",value:function(t){var e=this.options.data.length,i=this.getRowByUniqueId(t);i&&this.options.data.splice(this.options.data.indexOf(i),1),e!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initBody(!0))}},{key:"updateCell",value:function(t){t.hasOwnProperty("index")&&t.hasOwnProperty("field")&&t.hasOwnProperty("value")&&(this.data[t.index][t.field]=t.value,!1!==t.reinit&&(this.initSort(),this.initBody(!0)))}},{key:"updateCellByUniqueId",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){var i=t.id,n=t.field,o=t.value,r=e.options.data.indexOf(e.getRowByUniqueId(i));-1!==r&&(e.options.data[r][n]=o)})),!1!==t.reinit&&(this.initSort(),this.initBody(!0))}},{key:"showRow",value:function(t){this._toggleRow(t,!0)}},{key:"hideRow",value:function(t){this._toggleRow(t,!1)}},{key:"_toggleRow",value:function(t,e){var i;if(t.hasOwnProperty("index")?i=this.getData()[t.index]:t.hasOwnProperty("uniqueId")&&(i=this.getRowByUniqueId(t.uniqueId)),i){var n=kr.findIndex(this.hiddenRows,i);e||-1!==n?e&&n>-1&&this.hiddenRows.splice(n,1):this.hiddenRows.push(i),this.initBody(!0),this.initPagination()}}},{key:"getHiddenRows",value:function(t){if(t)return this.initHiddenRows(),this.initBody(!0),void this.initPagination();var e=this.getData(),i=[],n=!0,o=!1,r=void 0;try{for(var a,s=e[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;this.hiddenRows.includes(l)&&i.push(l)}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}return this.hiddenRows=i,i}},{key:"showColumn",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){e._toggleColumn(e.fieldsColumnsIndex[t],!0,!0)}))}},{key:"hideColumn",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){e._toggleColumn(e.fieldsColumnsIndex[t],!1,!0)}))}},{key:"_toggleColumn",value:function(t,e,i){if(-1!==t&&this.columns[t].visible!==e&&(this.columns[t].visible=e,this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns)){var n=this.$toolbar.find('.keep-open input:not(".toggle-all")').prop("disabled",!1);i&&n.filter(kr.sprintf('[value="%s"]',t)).prop("checked",e),n.filter(":checked").length<=this.options.minimumCountColumns&&n.filter(":checked").prop("disabled",!0)}}},{key:"getVisibleColumns",value:function(){var t=this;return this.columns.filter((function(e){return e.visible&&!t.isSelectionColumn(e)}))}},{key:"getHiddenColumns",value:function(){return this.columns.filter((function(t){return!t.visible}))}},{key:"isSelectionColumn",value:function(t){return t.radio||t.checkbox}},{key:"showAllColumns",value:function(){this._toggleAllColumns(!0)}},{key:"hideAllColumns",value:function(){this._toggleAllColumns(!1)}},{key:"_toggleAllColumns",value:function(e){var i=this,n=!0,o=!1,r=void 0;try{for(var a,s=this.columns.slice().reverse()[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;if(l.switchable){if(!e&&this.options.showColumns&&this.getVisibleColumns().length===this.options.minimumCountColumns)continue;l.visible=e}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}if(this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns){var c=this.$toolbar.find('.keep-open input[type="checkbox"]:not(".toggle-all")').prop("disabled",!1);e?c.prop("checked",e):c.get().reverse().forEach((function(n){c.filter(":checked").length>i.options.minimumCountColumns&&t(n).prop("checked",e)})),c.filter(":checked").length<=this.options.minimumCountColumns&&c.filter(":checked").prop("disabled",!0)}}},{key:"mergeCells",value:function(t){var e,i,n=t.index,o=this.getVisibleFields().indexOf(t.field),r=t.rowspan||1,a=t.colspan||1,s=this.$body.find(">tr");kr.hasDetailViewIcon(this.options)&&(o+=1);var l=s.eq(n).find(">td").eq(o);if(!(n<0||o<0||n>=this.data.length)){for(e=n;e<n+r;e++)for(i=o;i<o+a;i++)s.eq(e).find(">td").eq(i).hide();l.attr("rowspan",r).attr("colspan",a).show()}}},{key:"checkAll",value:function(){this._toggleCheckAll(!0)}},{key:"uncheckAll",value:function(){this._toggleCheckAll(!1)}},{key:"_toggleCheckAll",value:function(t){var e=this.getSelections();this.$selectAll.add(this.$selectAll_).prop("checked",t),this.$selectItem.filter(":enabled").prop("checked",t),this.updateRows();var i=this.getSelections();t?this.trigger("check-all",i,e):this.trigger("uncheck-all",i,e)}},{key:"checkInvert",value:function(){var e=this.$selectItem.filter(":enabled"),i=e.filter(":checked");e.each((function(e,i){t(i).prop("checked",!t(i).prop("checked"))})),this.updateRows(),this.updateSelected(),this.trigger("uncheck-some",i),i=this.getSelections(),this.trigger("check-some",i)}},{key:"check",value:function(t){this._toggleCheck(!0,t)}},{key:"uncheck",value:function(t){this._toggleCheck(!1,t)}},{key:"_toggleCheck",value:function(t,e){var i=this.$selectItem.filter('[data-index="'.concat(e,'"]')),n=this.data[e];if(i.is(":radio")||this.options.singleSelect||this.options.multipleSelectRow&&!this.multipleSelectRowCtrlKey&&!this.multipleSelectRowShiftKey){var o=!0,r=!1,a=void 0;try{for(var s,l=this.options.data[Symbol.iterator]();!(o=(s=l.next()).done);o=!0){s.value[this.header.stateField]=!1}}catch(t){r=!0,a=t}finally{try{o||null==l.return||l.return()}finally{if(r)throw a}}this.$selectItem.filter(":checked").not(i).prop("checked",!1)}if(n[this.header.stateField]=t,this.options.multipleSelectRow){if(this.multipleSelectRowShiftKey&&this.multipleSelectRowLastSelectedIndex>=0)for(var c=[this.multipleSelectRowLastSelectedIndex,e].sort(),h=c[0]+1;h<c[1];h++)this.data[h][this.header.stateField]=!0,this.$selectItem.filter('[data-index="'.concat(h,'"]')).prop("checked",!0);this.multipleSelectRowCtrlKey=!1,this.multipleSelectRowShiftKey=!1,this.multipleSelectRowLastSelectedIndex=t?e:-1}i.prop("checked",t),this.updateSelected(),this.trigger(t?"check":"uncheck",this.data[e],i)}},{key:"checkBy",value:function(t){this._toggleCheckBy(!0,t)}},{key:"uncheckBy",value:function(t){this._toggleCheckBy(!1,t)}},{key:"_toggleCheckBy",value:function(t,e){var i=this;if(e.hasOwnProperty("field")&&e.hasOwnProperty("values")){var n=[];this.data.forEach((function(o,r){if(!o.hasOwnProperty(e.field))return!1;if(e.values.includes(o[e.field])){var a=i.$selectItem.filter(":enabled").filter(kr.sprintf('[data-index="%s"]',r));if(!(a=t?a.not(":checked"):a.filter(":checked")).length)return;a.prop("checked",t),o[i.header.stateField]=t,n.push(o),i.trigger(t?"check":"uncheck",o,a)}})),this.updateSelected(),this.trigger(t?"check-some":"uncheck-some",n)}}},{key:"refresh",value:function(t){t&&t.url&&(this.options.url=t.url),t&&t.pageNumber&&(this.options.pageNumber=t.pageNumber),t&&t.pageSize&&(this.options.pageSize=t.pageSize),this.trigger("refresh",this.initServer(t&&t.silent,t&&t.query,t&&t.url))}},{key:"destroy",value:function(){this.$el.insertBefore(this.$container),t(this.options.toolbar).insertBefore(this.$el),this.$container.next().remove(),this.$container.remove(),this.$el.html(this.$el_.html()).css("margin-top","0").attr("class",this.$el_.attr("class")||"")}},{key:"resetView",value:function(t){var e=0;if(t&&t.height&&(this.options.height=t.height),this.$selectAll.prop("checked",this.$selectItem.length>0&&this.$selectItem.length===this.$selectItem.filter(":checked").length),this.$tableContainer.toggleClass("has-card-view",this.options.cardView),!this.options.cardView&&this.options.showHeader&&this.options.height?(this.$tableHeader.show(),this.resetHeader(),e+=this.$header.outerHeight(!0)+1):(this.$tableHeader.hide(),this.trigger("post-header")),!this.options.cardView&&this.options.showFooter&&(this.$tableFooter.show(),this.fitFooter(),this.options.height&&(e+=this.$tableFooter.outerHeight(!0))),this.$container.hasClass("fullscreen"))this.$tableContainer.css("height",""),this.$tableContainer.css("width","");else if(this.options.height){this.$tableBorder&&(this.$tableBorder.css("width",""),this.$tableBorder.css("height",""));var i=this.$toolbar.outerHeight(!0),n=this.$pagination.outerHeight(!0),o=this.options.height-i-n,r=this.$tableBody.find(">table"),a=r.outerHeight();if(this.$tableContainer.css("height","".concat(o,"px")),this.$tableBorder&&r.is(":visible")){var s=o-a-2;this.$tableBody[0].scrollWidth-this.$tableBody.innerWidth()&&(s-=kr.getScrollBarWidth()),this.$tableBorder.css("width","".concat(r.outerWidth(),"px")),this.$tableBorder.css("height","".concat(s,"px"))}}this.options.cardView?(this.$el.css("margin-top","0"),this.$tableContainer.css("padding-bottom","0"),this.$tableFooter.hide()):(this.getCaret(),this.$tableContainer.css("padding-bottom","".concat(e,"px"))),this.trigger("reset-view")}},{key:"showLoading",value:function(){this.$tableLoading.css("display","flex");var t=this.options.loadingFontSize;"auto"===this.options.loadingFontSize&&(t=.04*this.$tableLoading.width(),t=Math.max(12,t),t=Math.min(32,t),t="".concat(t,"px")),this.$tableLoading.find(".loading-text").css("font-size",t)}},{key:"hideLoading",value:function(){this.$tableLoading.css("display","none")}},{key:"togglePagination",value:function(){this.options.pagination=!this.options.pagination;var t=this.options.showButtonIcons?this.options.pagination?this.options.icons.paginationSwitchDown:this.options.icons.paginationSwitchUp:"",e=this.options.showButtonText?this.options.pagination?this.options.formatPaginationSwitchUp():this.options.formatPaginationSwitchDown():"";this.$toolbar.find('button[name="paginationSwitch"]').html(kr.sprintf(this.constants.html.icon,this.options.iconsPrefix,t)+" "+e),this.updatePagination()}},{key:"toggleFullscreen",value:function(){this.$el.closest(".bootstrap-table").toggleClass("fullscreen"),this.resetView()}},{key:"toggleView",value:function(){this.options.cardView=!this.options.cardView,this.initHeader();var t=this.options.showButtonIcons?this.options.cardView?this.options.icons.toggleOn:this.options.icons.toggleOff:"",e=this.options.showButtonText?this.options.cardView?this.options.formatToggleOff():this.options.formatToggleOn():"";this.$toolbar.find('button[name="toggle"]').html(kr.sprintf(this.constants.html.icon,this.options.iconsPrefix,t)+" "+e),this.initBody(),this.trigger("toggle",this.options.cardView)}},{key:"resetSearch",value:function(t){var e=this.$toolbar.find(".search input");e.val(t||""),this.onSearch({currentTarget:e})}},{key:"filterBy",value:function(e,i){this.filterOptions=kr.isEmptyObject(i)?this.options.filterOptions:t.extend(this.options.filterOptions,i),this.filterColumns=kr.isEmptyObject(e)?{}:e,this.options.pageNumber=1,this.initSearch(),this.updatePagination()}},{key:"scrollTo",value:function(e){if(void 0===e)return this.$tableBody.scrollTop();var i={unit:"px",value:0};"object"===Xo(e)?i=Object.assign(i,e):"string"==typeof e&&"bottom"===e?i.value=this.$tableBody[0].scrollHeight:"string"!=typeof e&&"number"!=typeof e||(i.value=e);var n=i.value;"rows"===i.unit&&(n=0,this.$body.find("> tr:lt(".concat(i.value,")")).each((function(e,i){n+=t(i).outerHeight(!0)}))),this.$tableBody.scrollTop(n)}},{key:"getScrollPosition",value:function(){return this.scrollTo()}},{key:"selectPage",value:function(t){t>0&&t<=this.options.totalPages&&(this.options.pageNumber=t,this.updatePagination())}},{key:"prevPage",value:function(){this.options.pageNumber>1&&(this.options.pageNumber--,this.updatePagination())}},{key:"nextPage",value:function(){this.options.pageNumber<this.options.totalPages&&(this.options.pageNumber++,this.updatePagination())}},{key:"toggleDetailView",value:function(t,e){this.$body.find(kr.sprintf('> tr[data-index="%s"]',t)).next().is("tr.detail-view")?this.collapseRow(t):this.expandRow(t,e),this.resetView()}},{key:"expandRow",value:function(t,e){var i=this.data[t],n=this.$body.find(kr.sprintf('> tr[data-index="%s"][data-has-detail-view]',t));if(!n.next().is("tr.detail-view")){this.options.detailViewIcon&&n.find("a.detail-icon").html(kr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailClose)),n.after(kr.sprintf('<tr class="detail-view"><td colspan="%s"></td></tr>',n.children("td").length));var o=n.next().find("td"),r=e||this.options.detailFormatter,a=kr.calculateObjectValue(this.options,r,[t,i,o],"");1===o.length&&o.append(a),this.trigger("expand-row",t,i,o)}}},{key:"expandRowByUniqueId",value:function(t){var e=this.getRowByUniqueId(t);e&&this.expandRow(this.data.indexOf(e))}},{key:"collapseRow",value:function(t){var e=this.data[t],i=this.$body.find(kr.sprintf('> tr[data-index="%s"][data-has-detail-view]',t));i.next().is("tr.detail-view")&&(this.options.detailViewIcon&&i.find("a.detail-icon").html(kr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailOpen)),this.trigger("collapse-row",t,e,i.next()),i.next().remove())}},{key:"collapseRowByUniqueId",value:function(t){var e=this.getRowByUniqueId(t);e&&this.collapseRow(this.data.indexOf(e))}},{key:"expandAllRows",value:function(){for(var e=this.$body.find("> tr[data-index][data-has-detail-view]"),i=0;i<e.length;i++)this.expandRow(t(e[i]).data("index"))}},{key:"collapseAllRows",value:function(){for(var e=this.$body.find("> tr[data-index][data-has-detail-view]"),i=0;i<e.length;i++)this.collapseRow(t(e[i]).data("index"))}},{key:"updateColumnTitle",value:function(e){e.hasOwnProperty("field")&&e.hasOwnProperty("title")&&(this.columns[this.fieldsColumnsIndex[e.field]].title=this.options.escape?kr.escapeHTML(e.title):e.title,this.columns[this.fieldsColumnsIndex[e.field]].visible&&(void 0!==this.options.height?this.$tableHeader:this.$header).find("th[data-field]").each((function(i,n){if(t(n).data("field")===e.field)return t(t(n).find(".th-inner")[0]).text(e.title),!1})))}},{key:"updateFormatText",value:function(t,e){/^format/.test(t)&&this.options[t]&&("string"==typeof e?this.options[t]=function(){return e}:"function"==typeof e&&(this.options[t]=e),this.initToolbar(),this.initPagination(),this.initBody())}}]),e}();return Cr.VERSION=hr.VERSION,Cr.DEFAULTS=hr.DEFAULTS,Cr.LOCALES=hr.LOCALES,Cr.COLUMN_DEFAULTS=hr.COLUMN_DEFAULTS,Cr.METHODS=hr.METHODS,Cr.EVENTS=hr.EVENTS,t.BootstrapTable=Cr,t.fn.bootstrapTable=function(e){for(var i=arguments.length,n=new Array(i>1?i-1:0),o=1;o<i;o++)n[o-1]=arguments[o];var r;return this.each((function(i,o){var a=t(o).data("bootstrap.table"),s=t.extend({},Cr.DEFAULTS,t(o).data(),"object"===Xo(e)&&e);if("string"==typeof e){var l;if(!hr.METHODS.includes(e))throw new Error("Unknown method: ".concat(e));if(!a)return;r=(l=a)[e].apply(l,n),"destroy"===e&&t(o).removeData("bootstrap.table")}a||t(o).data("bootstrap.table",a=new t.BootstrapTable(o,s))})),void 0===r?this:r},t.fn.bootstrapTable.Constructor=Cr,t.fn.bootstrapTable.theme=hr.THEME,t.fn.bootstrapTable.VERSION=hr.VERSION,t.fn.bootstrapTable.defaults=Cr.DEFAULTS,t.fn.bootstrapTable.columnDefaults=Cr.COLUMN_DEFAULTS,t.fn.bootstrapTable.events=Cr.EVENTS,t.fn.bootstrapTable.locales=Cr.LOCALES,t.fn.bootstrapTable.methods=Cr.METHODS,t.fn.bootstrapTable.utils=kr,t((function(){t('[data-toggle="table"]').bootstrapTable()})),Cr}));
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?module.exports=e(require("jquery")):"function"==typeof define&&define.amd?define(["jquery"],e):(t=t||self).BootstrapTable=e(t.jQuery)}(this,(function(t){"use strict";t=t&&Object.prototype.hasOwnProperty.call(t,"default")?t.default:t;var e="undefined"!=typeof globalThis?globalThis:"undefined"!=typeof window?window:"undefined"!=typeof global?global:"undefined"!=typeof self?self:{};function i(t,e){return t(e={exports:{}},e.exports),e.exports}var n=function(t){return t&&t.Math==Math&&t},o=n("object"==typeof globalThis&&globalThis)||n("object"==typeof window&&window)||n("object"==typeof self&&self)||n("object"==typeof e&&e)||Function("return this")(),r=function(t){try{return!!t()}catch(t){return!0}},a=!r((function(){return 7!=Object.defineProperty({},"a",{get:function(){return 7}}).a})),s={}.propertyIsEnumerable,l=Object.getOwnPropertyDescriptor,c={f:l&&!s.call({1:2},1)?function(t){var e=l(this,t);return!!e&&e.enumerable}:s},h=function(t,e){return{enumerable:!(1&t),configurable:!(2&t),writable:!(4&t),value:e}},u={}.toString,d=function(t){return u.call(t).slice(8,-1)},p="".split,f=r((function(){return!Object("z").propertyIsEnumerable(0)}))?function(t){return"String"==d(t)?p.call(t,""):Object(t)}:Object,g=function(t){if(null==t)throw TypeError("Can't call method on "+t);return t},v=function(t){return f(g(t))},b=function(t){return"object"==typeof t?null!==t:"function"==typeof t},y=function(t,e){if(!b(t))return t;var i,n;if(e&&"function"==typeof(i=t.toString)&&!b(n=i.call(t)))return n;if("function"==typeof(i=t.valueOf)&&!b(n=i.call(t)))return n;if(!e&&"function"==typeof(i=t.toString)&&!b(n=i.call(t)))return n;throw TypeError("Can't convert object to primitive value")},m={}.hasOwnProperty,w=function(t,e){return m.call(t,e)},S=o.document,x=b(S)&&b(S.createElement),k=function(t){return x?S.createElement(t):{}},O=!a&&!r((function(){return 7!=Object.defineProperty(k("div"),"a",{get:function(){return 7}}).a})),C=Object.getOwnPropertyDescriptor,P={f:a?C:function(t,e){if(t=v(t),e=y(e,!0),O)try{return C(t,e)}catch(t){}if(w(t,e))return h(!c.f.call(t,e),t[e])}},T=function(t){if(!b(t))throw TypeError(String(t)+" is not an object");return t},I=Object.defineProperty,A={f:a?I:function(t,e,i){if(T(t),e=y(e,!0),T(i),O)try{return I(t,e,i)}catch(t){}if("get"in i||"set"in i)throw TypeError("Accessors not supported");return"value"in i&&(t[e]=i.value),t}},$=a?function(t,e,i){return A.f(t,e,h(1,i))}:function(t,e,i){return t[e]=i,t},E=function(t,e){try{$(o,t,e)}catch(i){o[t]=e}return e},R="__core-js_shared__",j=o[R]||E(R,{}),N=Function.toString;"function"!=typeof j.inspectSource&&(j.inspectSource=function(t){return N.call(t)});var _,F,V,D=j.inspectSource,B=o.WeakMap,L="function"==typeof B&&/native code/.test(D(B)),H=i((function(t){(t.exports=function(t,e){return j[t]||(j[t]=void 0!==e?e:{})})("versions",[]).push({version:"3.6.0",mode:"global",copyright:"© 2019 Denis Pushkarev (zloirock.ru)"})})),M=0,U=Math.random(),z=function(t){return"Symbol("+String(void 0===t?"":t)+")_"+(++M+U).toString(36)},q=H("keys"),W=function(t){return q[t]||(q[t]=z(t))},G={},K=o.WeakMap;if(L){var Y=new K,J=Y.get,X=Y.has,Q=Y.set;_=function(t,e){return Q.call(Y,t,e),e},F=function(t){return J.call(Y,t)||{}},V=function(t){return X.call(Y,t)}}else{var Z=W("state");G[Z]=!0,_=function(t,e){return $(t,Z,e),e},F=function(t){return w(t,Z)?t[Z]:{}},V=function(t){return w(t,Z)}}var tt,et={set:_,get:F,has:V,enforce:function(t){return V(t)?F(t):_(t,{})},getterFor:function(t){return function(e){var i;if(!b(e)||(i=F(e)).type!==t)throw TypeError("Incompatible receiver, "+t+" required");return i}}},it=i((function(t){var e=et.get,i=et.enforce,n=String(String).split("String");(t.exports=function(t,e,r,a){var s=!!a&&!!a.unsafe,l=!!a&&!!a.enumerable,c=!!a&&!!a.noTargetGet;"function"==typeof r&&("string"!=typeof e||w(r,"name")||$(r,"name",e),i(r).source=n.join("string"==typeof e?e:"")),t!==o?(s?!c&&t[e]&&(l=!0):delete t[e],l?t[e]=r:$(t,e,r)):l?t[e]=r:E(e,r)})(Function.prototype,"toString",(function(){return"function"==typeof this&&e(this).source||D(this)}))})),nt=o,ot=function(t){return"function"==typeof t?t:void 0},rt=function(t,e){return arguments.length<2?ot(nt[t])||ot(o[t]):nt[t]&&nt[t][e]||o[t]&&o[t][e]},at=Math.ceil,st=Math.floor,lt=function(t){return isNaN(t=+t)?0:(t>0?st:at)(t)},ct=Math.min,ht=function(t){return t>0?ct(lt(t),9007199254740991):0},ut=Math.max,dt=Math.min,pt=function(t,e){var i=lt(t);return i<0?ut(i+e,0):dt(i,e)},ft=function(t){return function(e,i,n){var o,r=v(e),a=ht(r.length),s=pt(n,a);if(t&&i!=i){for(;a>s;)if((o=r[s++])!=o)return!0}else for(;a>s;s++)if((t||s in r)&&r[s]===i)return t||s||0;return!t&&-1}},gt={includes:ft(!0),indexOf:ft(!1)},vt=gt.indexOf,bt=function(t,e){var i,n=v(t),o=0,r=[];for(i in n)!w(G,i)&&w(n,i)&&r.push(i);for(;e.length>o;)w(n,i=e[o++])&&(~vt(r,i)||r.push(i));return r},yt=["constructor","hasOwnProperty","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","valueOf"],mt=yt.concat("length","prototype"),wt={f:Object.getOwnPropertyNames||function(t){return bt(t,mt)}},St={f:Object.getOwnPropertySymbols},xt=rt("Reflect","ownKeys")||function(t){var e=wt.f(T(t)),i=St.f;return i?e.concat(i(t)):e},kt=function(t,e){for(var i=xt(e),n=A.f,o=P.f,r=0;r<i.length;r++){var a=i[r];w(t,a)||n(t,a,o(e,a))}},Ot=/#|\.prototype\./,Ct=function(t,e){var i=Tt[Pt(t)];return i==At||i!=It&&("function"==typeof e?r(e):!!e)},Pt=Ct.normalize=function(t){return String(t).replace(Ot,".").toLowerCase()},Tt=Ct.data={},It=Ct.NATIVE="N",At=Ct.POLYFILL="P",$t=Ct,Et=P.f,Rt=function(t,e){var i,n,r,a,s,l=t.target,c=t.global,h=t.stat;if(i=c?o:h?o[l]||E(l,{}):(o[l]||{}).prototype)for(n in e){if(a=e[n],r=t.noTargetGet?(s=Et(i,n))&&s.value:i[n],!$t(c?n:l+(h?".":"#")+n,t.forced)&&void 0!==r){if(typeof a==typeof r)continue;kt(a,r)}(t.sham||r&&r.sham)&&$(a,"sham",!0),it(i,n,a,t)}},jt=!!Object.getOwnPropertySymbols&&!r((function(){return!String(Symbol())})),Nt=jt&&!Symbol.sham&&"symbol"==typeof Symbol(),_t=Array.isArray||function(t){return"Array"==d(t)},Ft=function(t){return Object(g(t))},Vt=Object.keys||function(t){return bt(t,yt)},Dt=a?Object.defineProperties:function(t,e){T(t);for(var i,n=Vt(e),o=n.length,r=0;o>r;)A.f(t,i=n[r++],e[i]);return t},Bt=rt("document","documentElement"),Lt=W("IE_PROTO"),Ht=function(){},Mt=function(t){return"<script>"+t+"</"+"script>"},Ut=function(){try{tt=document.domain&&new ActiveXObject("htmlfile")}catch(t){}var t,e;Ut=tt?function(t){t.write(Mt("")),t.close();var e=t.parentWindow.Object;return t=null,e}(tt):((e=k("iframe")).style.display="none",Bt.appendChild(e),e.src=String("javascript:"),(t=e.contentWindow.document).open(),t.write(Mt("document.F=Object")),t.close(),t.F);for(var i=yt.length;i--;)delete Ut.prototype[yt[i]];return Ut()};G[Lt]=!0;var zt=Object.create||function(t,e){var i;return null!==t?(Ht.prototype=T(t),i=new Ht,Ht.prototype=null,i[Lt]=t):i=Ut(),void 0===e?i:Dt(i,e)},qt=wt.f,Wt={}.toString,Gt="object"==typeof window&&window&&Object.getOwnPropertyNames?Object.getOwnPropertyNames(window):[],Kt={f:function(t){return Gt&&"[object Window]"==Wt.call(t)?function(t){try{return qt(t)}catch(t){return Gt.slice()}}(t):qt(v(t))}},Yt=H("wks"),Jt=o.Symbol,Xt=Nt?Jt:z,Qt=function(t){return w(Yt,t)||(jt&&w(Jt,t)?Yt[t]=Jt[t]:Yt[t]=Xt("Symbol."+t)),Yt[t]},Zt={f:Qt},te=A.f,ee=function(t){var e=nt.Symbol||(nt.Symbol={});w(e,t)||te(e,t,{value:Zt.f(t)})},ie=A.f,ne=Qt("toStringTag"),oe=function(t,e,i){t&&!w(t=i?t:t.prototype,ne)&&ie(t,ne,{configurable:!0,value:e})},re=function(t){if("function"!=typeof t)throw TypeError(String(t)+" is not a function");return t},ae=Qt("species"),se=function(t,e){var i;return _t(t)&&("function"!=typeof(i=t.constructor)||i!==Array&&!_t(i.prototype)?b(i)&&null===(i=i[ae])&&(i=void 0):i=void 0),new(void 0===i?Array:i)(0===e?0:e)},le=[].push,ce=function(t){var e=1==t,i=2==t,n=3==t,o=4==t,r=6==t,a=5==t||r;return function(s,l,c,h){for(var u,d,p=Ft(s),g=f(p),v=function(t,e,i){if(re(t),void 0===e)return t;switch(i){case 0:return function(){return t.call(e)};case 1:return function(i){return t.call(e,i)};case 2:return function(i,n){return t.call(e,i,n)};case 3:return function(i,n,o){return t.call(e,i,n,o)}}return function(){return t.apply(e,arguments)}}(l,c,3),b=ht(g.length),y=0,m=h||se,w=e?m(s,b):i?m(s,0):void 0;b>y;y++)if((a||y in g)&&(d=v(u=g[y],y,p),t))if(e)w[y]=d;else if(d)switch(t){case 3:return!0;case 5:return u;case 6:return y;case 2:le.call(w,u)}else if(o)return!1;return r?-1:n||o?o:w}},he={forEach:ce(0),map:ce(1),filter:ce(2),some:ce(3),every:ce(4),find:ce(5),findIndex:ce(6)},ue=he.forEach,de=W("hidden"),pe="Symbol",fe=Qt("toPrimitive"),ge=et.set,ve=et.getterFor(pe),be=Object.prototype,ye=o.Symbol,me=rt("JSON","stringify"),we=P.f,Se=A.f,xe=Kt.f,ke=c.f,Oe=H("symbols"),Ce=H("op-symbols"),Pe=H("string-to-symbol-registry"),Te=H("symbol-to-string-registry"),Ie=H("wks"),Ae=o.QObject,$e=!Ae||!Ae.prototype||!Ae.prototype.findChild,Ee=a&&r((function(){return 7!=zt(Se({},"a",{get:function(){return Se(this,"a",{value:7}).a}})).a}))?function(t,e,i){var n=we(be,e);n&&delete be[e],Se(t,e,i),n&&t!==be&&Se(be,e,n)}:Se,Re=function(t,e){var i=Oe[t]=zt(ye.prototype);return ge(i,{type:pe,tag:t,description:e}),a||(i.description=e),i},je=jt&&"symbol"==typeof ye.iterator?function(t){return"symbol"==typeof t}:function(t){return Object(t)instanceof ye},Ne=function(t,e,i){t===be&&Ne(Ce,e,i),T(t);var n=y(e,!0);return T(i),w(Oe,n)?(i.enumerable?(w(t,de)&&t[de][n]&&(t[de][n]=!1),i=zt(i,{enumerable:h(0,!1)})):(w(t,de)||Se(t,de,h(1,{})),t[de][n]=!0),Ee(t,n,i)):Se(t,n,i)},_e=function(t,e){T(t);var i=v(e),n=Vt(i).concat(Be(i));return ue(n,(function(e){a&&!Fe.call(i,e)||Ne(t,e,i[e])})),t},Fe=function(t){var e=y(t,!0),i=ke.call(this,e);return!(this===be&&w(Oe,e)&&!w(Ce,e))&&(!(i||!w(this,e)||!w(Oe,e)||w(this,de)&&this[de][e])||i)},Ve=function(t,e){var i=v(t),n=y(e,!0);if(i!==be||!w(Oe,n)||w(Ce,n)){var o=we(i,n);return!o||!w(Oe,n)||w(i,de)&&i[de][n]||(o.enumerable=!0),o}},De=function(t){var e=xe(v(t)),i=[];return ue(e,(function(t){w(Oe,t)||w(G,t)||i.push(t)})),i},Be=function(t){var e=t===be,i=xe(e?Ce:v(t)),n=[];return ue(i,(function(t){!w(Oe,t)||e&&!w(be,t)||n.push(Oe[t])})),n};if(jt||(it((ye=function(){if(this instanceof ye)throw TypeError("Symbol is not a constructor");var t=arguments.length&&void 0!==arguments[0]?String(arguments[0]):void 0,e=z(t),i=function(t){this===be&&i.call(Ce,t),w(this,de)&&w(this[de],e)&&(this[de][e]=!1),Ee(this,e,h(1,t))};return a&&$e&&Ee(be,e,{configurable:!0,set:i}),Re(e,t)}).prototype,"toString",(function(){return ve(this).tag})),c.f=Fe,A.f=Ne,P.f=Ve,wt.f=Kt.f=De,St.f=Be,a&&(Se(ye.prototype,"description",{configurable:!0,get:function(){return ve(this).description}}),it(be,"propertyIsEnumerable",Fe,{unsafe:!0}))),Nt||(Zt.f=function(t){return Re(Qt(t),t)}),Rt({global:!0,wrap:!0,forced:!jt,sham:!jt},{Symbol:ye}),ue(Vt(Ie),(function(t){ee(t)})),Rt({target:pe,stat:!0,forced:!jt},{for:function(t){var e=String(t);if(w(Pe,e))return Pe[e];var i=ye(e);return Pe[e]=i,Te[i]=e,i},keyFor:function(t){if(!je(t))throw TypeError(t+" is not a symbol");if(w(Te,t))return Te[t]},useSetter:function(){$e=!0},useSimple:function(){$e=!1}}),Rt({target:"Object",stat:!0,forced:!jt,sham:!a},{create:function(t,e){return void 0===e?zt(t):_e(zt(t),e)},defineProperty:Ne,defineProperties:_e,getOwnPropertyDescriptor:Ve}),Rt({target:"Object",stat:!0,forced:!jt},{getOwnPropertyNames:De,getOwnPropertySymbols:Be}),Rt({target:"Object",stat:!0,forced:r((function(){St.f(1)}))},{getOwnPropertySymbols:function(t){return St.f(Ft(t))}}),me){var Le=!jt||r((function(){var t=ye();return"[null]"!=me([t])||"{}"!=me({a:t})||"{}"!=me(Object(t))}));Rt({target:"JSON",stat:!0,forced:Le},{stringify:function(t,e,i){for(var n,o=[t],r=1;arguments.length>r;)o.push(arguments[r++]);if(n=e,(b(e)||void 0!==t)&&!je(t))return _t(e)||(e=function(t,e){if("function"==typeof n&&(e=n.call(this,t,e)),!je(e))return e}),o[1]=e,me.apply(null,o)}})}ye.prototype[fe]||$(ye.prototype,fe,ye.prototype.valueOf),oe(ye,pe),G[de]=!0;var He=A.f,Me=o.Symbol;if(a&&"function"==typeof Me&&(!("description"in Me.prototype)||void 0!==Me().description)){var Ue={},ze=function(){var t=arguments.length<1||void 0===arguments[0]?void 0:String(arguments[0]),e=this instanceof ze?new Me(t):void 0===t?Me():Me(t);return""===t&&(Ue[e]=!0),e};kt(ze,Me);var qe=ze.prototype=Me.prototype;qe.constructor=ze;var We=qe.toString,Ge="Symbol(test)"==String(Me("test")),Ke=/^Symbol\((.*)\)[^)]+$/;He(qe,"description",{configurable:!0,get:function(){var t=b(this)?this.valueOf():this,e=We.call(t);if(w(Ue,t))return"";var i=Ge?e.slice(7,-1):e.replace(Ke,"$1");return""===i?void 0:i}}),Rt({global:!0,forced:!0},{Symbol:ze})}ee("iterator");var Ye,Je,Xe=function(t,e,i){var n=y(e);n in t?A.f(t,n,h(0,i)):t[n]=i},Qe=rt("navigator","userAgent")||"",Ze=o.process,ti=Ze&&Ze.versions,ei=ti&&ti.v8;ei?Je=(Ye=ei.split("."))[0]+Ye[1]:Qe&&(!(Ye=Qe.match(/Edge\/(\d+)/))||Ye[1]>=74)&&(Ye=Qe.match(/Chrome\/(\d+)/))&&(Je=Ye[1]);var ii=Je&&+Je,ni=Qt("species"),oi=function(t){return ii>=51||!r((function(){var e=[];return(e.constructor={})[ni]=function(){return{foo:1}},1!==e[t](Boolean).foo}))},ri=Qt("isConcatSpreadable"),ai=9007199254740991,si="Maximum allowed index exceeded",li=ii>=51||!r((function(){var t=[];return t[ri]=!1,t.concat()[0]!==t})),ci=oi("concat"),hi=function(t){if(!b(t))return!1;var e=t[ri];return void 0!==e?!!e:_t(t)};Rt({target:"Array",proto:!0,forced:!li||!ci},{concat:function(t){var e,i,n,o,r,a=Ft(this),s=se(a,0),l=0;for(e=-1,n=arguments.length;e<n;e++)if(hi(r=-1===e?a:arguments[e])){if(l+(o=ht(r.length))>ai)throw TypeError(si);for(i=0;i<o;i++,l++)i in r&&Xe(s,l,r[i])}else{if(l>=ai)throw TypeError(si);Xe(s,l++,r)}return s.length=l,s}});var ui=he.filter,di=oi("filter"),pi=di&&!r((function(){[].filter.call({length:-1,0:1},(function(t){throw t}))}));Rt({target:"Array",proto:!0,forced:!di||!pi},{filter:function(t){return ui(this,t,arguments.length>1?arguments[1]:void 0)}});var fi=Qt("unscopables"),gi=Array.prototype;null==gi[fi]&&A.f(gi,fi,{configurable:!0,value:zt(null)});var vi=function(t){gi[fi][t]=!0},bi=he.find,yi="find",mi=!0;yi in[]&&Array(1).find((function(){mi=!1})),Rt({target:"Array",proto:!0,forced:mi},{find:function(t){return bi(this,t,arguments.length>1?arguments[1]:void 0)}}),vi(yi);var wi=he.findIndex,Si="findIndex",xi=!0;Si in[]&&Array(1).findIndex((function(){xi=!1})),Rt({target:"Array",proto:!0,forced:xi},{findIndex:function(t){return wi(this,t,arguments.length>1?arguments[1]:void 0)}}),vi(Si);var ki=gt.includes;Rt({target:"Array",proto:!0},{includes:function(t){return ki(this,t,arguments.length>1?arguments[1]:void 0)}}),vi("includes");var Oi=function(t,e){var i=[][t];return!i||!r((function(){i.call(null,e||function(){throw 1},1)}))},Ci=gt.indexOf,Pi=[].indexOf,Ti=!!Pi&&1/[1].indexOf(1,-0)<0,Ii=Oi("indexOf");Rt({target:"Array",proto:!0,forced:Ti||Ii},{indexOf:function(t){return Ti?Pi.apply(this,arguments)||0:Ci(this,t,arguments.length>1?arguments[1]:void 0)}});var Ai,$i,Ei,Ri=!r((function(){function t(){}return t.prototype.constructor=null,Object.getPrototypeOf(new t)!==t.prototype})),ji=W("IE_PROTO"),Ni=Object.prototype,_i=Ri?Object.getPrototypeOf:function(t){return t=Ft(t),w(t,ji)?t[ji]:"function"==typeof t.constructor&&t instanceof t.constructor?t.constructor.prototype:t instanceof Object?Ni:null},Fi=Qt("iterator"),Vi=!1;[].keys&&("next"in(Ei=[].keys())?($i=_i(_i(Ei)))!==Object.prototype&&(Ai=$i):Vi=!0),null==Ai&&(Ai={}),w(Ai,Fi)||$(Ai,Fi,(function(){return this}));var Di={IteratorPrototype:Ai,BUGGY_SAFARI_ITERATORS:Vi},Bi=Di.IteratorPrototype,Li=Object.setPrototypeOf||("__proto__"in{}?function(){var t,e=!1,i={};try{(t=Object.getOwnPropertyDescriptor(Object.prototype,"__proto__").set).call(i,[]),e=i instanceof Array}catch(t){}return function(i,n){return T(i),function(t){if(!b(t)&&null!==t)throw TypeError("Can't set "+String(t)+" as a prototype")}(n),e?t.call(i,n):i.__proto__=n,i}}():void 0),Hi=Di.IteratorPrototype,Mi=Di.BUGGY_SAFARI_ITERATORS,Ui=Qt("iterator"),zi="keys",qi="values",Wi="entries",Gi=function(){return this},Ki=function(t,e,i,n,o,r,a){!function(t,e,i){var n=e+" Iterator";t.prototype=zt(Bi,{next:h(1,i)}),oe(t,n,!1)}(i,e,n);var s,l,c,u=function(t){if(t===o&&v)return v;if(!Mi&&t in f)return f[t];switch(t){case zi:case qi:case Wi:return function(){return new i(this,t)}}return function(){return new i(this)}},d=e+" Iterator",p=!1,f=t.prototype,g=f[Ui]||f["@@iterator"]||o&&f[o],v=!Mi&&g||u(o),b="Array"==e&&f.entries||g;if(b&&(s=_i(b.call(new t)),Hi!==Object.prototype&&s.next&&(_i(s)!==Hi&&(Li?Li(s,Hi):"function"!=typeof s[Ui]&&$(s,Ui,Gi)),oe(s,d,!0))),o==qi&&g&&g.name!==qi&&(p=!0,v=function(){return g.call(this)}),f[Ui]!==v&&$(f,Ui,v),o)if(l={values:u(qi),keys:r?v:u(zi),entries:u(Wi)},a)for(c in l)(Mi||p||!(c in f))&&it(f,c,l[c]);else Rt({target:e,proto:!0,forced:Mi||p},l);return l},Yi="Array Iterator",Ji=et.set,Xi=et.getterFor(Yi),Qi=Ki(Array,"Array",(function(t,e){Ji(this,{type:Yi,target:v(t),index:0,kind:e})}),(function(){var t=Xi(this),e=t.target,i=t.kind,n=t.index++;return!e||n>=e.length?(t.target=void 0,{value:void 0,done:!0}):"keys"==i?{value:n,done:!1}:"values"==i?{value:e[n],done:!1}:{value:[n,e[n]],done:!1}}),"values");vi("keys"),vi("values"),vi("entries");var Zi=[].join,tn=f!=Object,en=Oi("join",",");Rt({target:"Array",proto:!0,forced:tn||en},{join:function(t){return Zi.call(v(this),void 0===t?",":t)}});var nn=he.map,on=oi("map"),rn=on&&!r((function(){[].map.call({length:-1,0:1},(function(t){throw t}))}));Rt({target:"Array",proto:!0,forced:!on||!rn},{map:function(t){return nn(this,t,arguments.length>1?arguments[1]:void 0)}});var an=[].reverse,sn=[1,2];Rt({target:"Array",proto:!0,forced:String(sn)===String(sn.reverse())},{reverse:function(){return _t(this)&&(this.length=this.length),an.call(this)}});var ln=Qt("species"),cn=[].slice,hn=Math.max;Rt({target:"Array",proto:!0,forced:!oi("slice")},{slice:function(t,e){var i,n,o,r=v(this),a=ht(r.length),s=pt(t,a),l=pt(void 0===e?a:e,a);if(_t(r)&&("function"!=typeof(i=r.constructor)||i!==Array&&!_t(i.prototype)?b(i)&&null===(i=i[ln])&&(i=void 0):i=void 0,i===Array||void 0===i))return cn.call(r,s,l);for(n=new(void 0===i?Array:i)(hn(l-s,0)),o=0;s<l;s++,o++)s in r&&Xe(n,o,r[s]);return n.length=o,n}});var un=[],dn=un.sort,pn=r((function(){un.sort(void 0)})),fn=r((function(){un.sort(null)})),gn=Oi("sort");Rt({target:"Array",proto:!0,forced:pn||!fn||gn},{sort:function(t){return void 0===t?dn.call(Ft(this)):dn.call(Ft(this),re(t))}});var vn=Math.max,bn=Math.min,yn=9007199254740991,mn="Maximum allowed length exceeded";Rt({target:"Array",proto:!0,forced:!oi("splice")},{splice:function(t,e){var i,n,o,r,a,s,l=Ft(this),c=ht(l.length),h=pt(t,c),u=arguments.length;if(0===u?i=n=0:1===u?(i=0,n=c-h):(i=u-2,n=bn(vn(lt(e),0),c-h)),c+i-n>yn)throw TypeError(mn);for(o=se(l,n),r=0;r<n;r++)(a=h+r)in l&&Xe(o,r,l[a]);if(o.length=n,i<n){for(r=h;r<c-n;r++)s=r+i,(a=r+n)in l?l[s]=l[a]:delete l[s];for(r=c;r>c-n+i;r--)delete l[r-1]}else if(i>n)for(r=c-n;r>h;r--)s=r+i-1,(a=r+n-1)in l?l[s]=l[a]:delete l[s];for(r=0;r<i;r++)l[r+h]=arguments[r+2];return l.length=c-n+i,o}});var wn=function(t,e,i){var n,o;return Li&&"function"==typeof(n=e.constructor)&&n!==i&&b(o=n.prototype)&&o!==i.prototype&&Li(t,o),t},Sn="\t\n\v\f\r                　\u2028\u2029\ufeff",xn="["+Sn+"]",kn=RegExp("^"+xn+xn+"*"),On=RegExp(xn+xn+"*$"),Cn=function(t){return function(e){var i=String(g(e));return 1&t&&(i=i.replace(kn,"")),2&t&&(i=i.replace(On,"")),i}},Pn={start:Cn(1),end:Cn(2),trim:Cn(3)},Tn=wt.f,In=P.f,An=A.f,$n=Pn.trim,En="Number",Rn=o.Number,jn=Rn.prototype,Nn=d(zt(jn))==En,_n=function(t){var e,i,n,o,r,a,s,l,c=y(t,!1);if("string"==typeof c&&c.length>2)if(43===(e=(c=$n(c)).charCodeAt(0))||45===e){if(88===(i=c.charCodeAt(2))||120===i)return NaN}else if(48===e){switch(c.charCodeAt(1)){case 66:case 98:n=2,o=49;break;case 79:case 111:n=8,o=55;break;default:return+c}for(a=(r=c.slice(2)).length,s=0;s<a;s++)if((l=r.charCodeAt(s))<48||l>o)return NaN;return parseInt(r,n)}return+c};if($t(En,!Rn(" 0o1")||!Rn("0b1")||Rn("+0x1"))){for(var Fn,Vn=function(t){var e=arguments.length<1?0:t,i=this;return i instanceof Vn&&(Nn?r((function(){jn.valueOf.call(i)})):d(i)!=En)?wn(new Rn(_n(e)),i,Vn):_n(e)},Dn=a?Tn(Rn):"MAX_VALUE,MIN_VALUE,NaN,NEGATIVE_INFINITY,POSITIVE_INFINITY,EPSILON,isFinite,isInteger,isNaN,isSafeInteger,MAX_SAFE_INTEGER,MIN_SAFE_INTEGER,parseFloat,parseInt,isInteger".split(","),Bn=0;Dn.length>Bn;Bn++)w(Rn,Fn=Dn[Bn])&&!w(Vn,Fn)&&An(Vn,Fn,In(Rn,Fn));Vn.prototype=jn,jn.constructor=Vn,it(o,En,Vn)}var Ln=Object.assign,Hn=Object.defineProperty,Mn=!Ln||r((function(){if(a&&1!==Ln({b:1},Ln(Hn({},"a",{enumerable:!0,get:function(){Hn(this,"b",{value:3,enumerable:!1})}}),{b:2})).b)return!0;var t={},e={},i=Symbol(),n="abcdefghijklmnopqrst";return t[i]=7,n.split("").forEach((function(t){e[t]=t})),7!=Ln({},t)[i]||Vt(Ln({},e)).join("")!=n}))?function(t,e){for(var i=Ft(t),n=arguments.length,o=1,r=St.f,s=c.f;n>o;)for(var l,h=f(arguments[o++]),u=r?Vt(h).concat(r(h)):Vt(h),d=u.length,p=0;d>p;)l=u[p++],a&&!s.call(h,l)||(i[l]=h[l]);return i}:Ln;Rt({target:"Object",stat:!0,forced:Object.assign!==Mn},{assign:Mn});var Un=c.f,zn=function(t){return function(e){for(var i,n=v(e),o=Vt(n),r=o.length,s=0,l=[];r>s;)i=o[s++],a&&!Un.call(n,i)||l.push(t?[i,n[i]]:n[i]);return l}},qn={entries:zn(!0),values:zn(!1)}.entries;Rt({target:"Object",stat:!0},{entries:function(t){return qn(t)}});var Wn={};Wn[Qt("toStringTag")]="z";var Gn="[object z]"===String(Wn),Kn=Qt("toStringTag"),Yn="Arguments"==d(function(){return arguments}()),Jn=Gn?d:function(t){var e,i,n;return void 0===t?"Undefined":null===t?"Null":"string"==typeof(i=function(t,e){try{return t[e]}catch(t){}}(e=Object(t),Kn))?i:Yn?d(e):"Object"==(n=d(e))&&"function"==typeof e.callee?"Arguments":n},Xn=Gn?{}.toString:function(){return"[object "+Jn(this)+"]"};Gn||it(Object.prototype,"toString",Xn,{unsafe:!0});var Qn=Pn.trim,Zn=o.parseFloat,to=1/Zn(Sn+"-0")!=-1/0?function(t){var e=Qn(String(t)),i=Zn(e);return 0===i&&"-"==e.charAt(0)?-0:i}:Zn;Rt({global:!0,forced:parseFloat!=to},{parseFloat:to});var eo=Pn.trim,io=o.parseInt,no=/^[+-]?0[Xx]/,oo=8!==io(Sn+"08")||22!==io(Sn+"0x16")?function(t,e){var i=eo(String(t));return io(i,e>>>0||(no.test(i)?16:10))}:io;Rt({global:!0,forced:parseInt!=oo},{parseInt:oo});var ro=Qt("match"),ao=function(t){var e;return b(t)&&(void 0!==(e=t[ro])?!!e:"RegExp"==d(t))},so=function(){var t=T(this),e="";return t.global&&(e+="g"),t.ignoreCase&&(e+="i"),t.multiline&&(e+="m"),t.dotAll&&(e+="s"),t.unicode&&(e+="u"),t.sticky&&(e+="y"),e};function lo(t,e){return RegExp(t,e)}var co={UNSUPPORTED_Y:r((function(){var t=lo("a","y");return t.lastIndex=2,null!=t.exec("abcd")})),BROKEN_CARET:r((function(){var t=lo("^r","gy");return t.lastIndex=2,null!=t.exec("str")}))},ho=Qt("species"),uo=A.f,po=wt.f,fo=et.set,go=Qt("match"),vo=o.RegExp,bo=vo.prototype,yo=/a/g,mo=/a/g,wo=new vo(yo)!==yo,So=co.UNSUPPORTED_Y;if(a&&$t("RegExp",!wo||So||r((function(){return mo[go]=!1,vo(yo)!=yo||vo(mo)==mo||"/a/i"!=vo(yo,"i")})))){for(var xo=function(t,e){var i,n=this instanceof xo,o=ao(t),r=void 0===e;if(!n&&o&&t.constructor===xo&&r)return t;wo?o&&!r&&(t=t.source):t instanceof xo&&(r&&(e=so.call(t)),t=t.source),So&&(i=!!e&&e.indexOf("y")>-1)&&(e=e.replace(/y/g,""));var a=wn(wo?new vo(t,e):vo(t,e),n?this:bo,xo);return So&&i&&fo(a,{sticky:i}),a},ko=function(t){t in xo||uo(xo,t,{configurable:!0,get:function(){return vo[t]},set:function(e){vo[t]=e}})},Oo=po(vo),Co=0;Oo.length>Co;)ko(Oo[Co++]);bo.constructor=xo,xo.prototype=bo,it(o,"RegExp",xo)}!function(t){var e=rt(t),i=A.f;a&&e&&!e[ho]&&i(e,ho,{configurable:!0,get:function(){return this}})}("RegExp");var Po=RegExp.prototype.exec,To=String.prototype.replace,Io=Po,Ao=function(){var t=/a/,e=/b*/g;return Po.call(t,"a"),Po.call(e,"a"),0!==t.lastIndex||0!==e.lastIndex}(),$o=co.UNSUPPORTED_Y||co.BROKEN_CARET,Eo=void 0!==/()??/.exec("")[1];(Ao||Eo||$o)&&(Io=function(t){var e,i,n,o,r=this,a=$o&&r.sticky,s=so.call(r),l=r.source,c=0,h=t;return a&&(-1===(s=s.replace("y","")).indexOf("g")&&(s+="g"),h=String(t).slice(r.lastIndex),r.lastIndex>0&&(!r.multiline||r.multiline&&"\n"!==t[r.lastIndex-1])&&(l="(?: "+l+")",h=" "+h,c++),i=new RegExp("^(?:"+l+")",s)),Eo&&(i=new RegExp("^"+l+"$(?!\\s)",s)),Ao&&(e=r.lastIndex),n=Po.call(a?i:r,h),a?n?(n.input=n.input.slice(c),n[0]=n[0].slice(c),n.index=r.lastIndex,r.lastIndex+=n[0].length):r.lastIndex=0:Ao&&n&&(r.lastIndex=r.global?n.index+n[0].length:e),Eo&&n&&n.length>1&&To.call(n[0],i,(function(){for(o=1;o<arguments.length-2;o++)void 0===arguments[o]&&(n[o]=void 0)})),n});var Ro=Io;Rt({target:"RegExp",proto:!0,forced:/./.exec!==Ro},{exec:Ro});var jo="toString",No=RegExp.prototype,_o=No.toString,Fo=r((function(){return"/a/b"!=_o.call({source:"a",flags:"b"})})),Vo=_o.name!=jo;(Fo||Vo)&&it(RegExp.prototype,jo,(function(){var t=T(this),e=String(t.source),i=t.flags;return"/"+e+"/"+String(void 0===i&&t instanceof RegExp&&!("flags"in No)?so.call(t):i)}),{unsafe:!0});var Do=function(t){if(ao(t))throw TypeError("The method doesn't accept regular expressions");return t},Bo=Qt("match"),Lo=function(t){var e=/./;try{"/./"[t](e)}catch(i){try{return e[Bo]=!1,"/./"[t](e)}catch(t){}}return!1};Rt({target:"String",proto:!0,forced:!Lo("includes")},{includes:function(t){return!!~String(g(this)).indexOf(Do(t),arguments.length>1?arguments[1]:void 0)}});var Ho=function(t){return function(e,i){var n,o,r=String(g(e)),a=lt(i),s=r.length;return a<0||a>=s?t?"":void 0:(n=r.charCodeAt(a))<55296||n>56319||a+1===s||(o=r.charCodeAt(a+1))<56320||o>57343?t?r.charAt(a):n:t?r.slice(a,a+2):o-56320+(n-55296<<10)+65536}},Mo={codeAt:Ho(!1),charAt:Ho(!0)},Uo=Mo.charAt,zo="String Iterator",qo=et.set,Wo=et.getterFor(zo);Ki(String,"String",(function(t){qo(this,{type:zo,string:String(t),index:0})}),(function(){var t,e=Wo(this),i=e.string,n=e.index;return n>=i.length?{value:void 0,done:!0}:(t=Uo(i,n),e.index+=t.length,{value:t,done:!1})}));var Go=Qt("species"),Ko=!r((function(){var t=/./;return t.exec=function(){var t=[];return t.groups={a:"7"},t},"7"!=="".replace(t,"$<a>")})),Yo="$0"==="a".replace(/./,"$0"),Jo=!r((function(){var t=/(?:)/,e=t.exec;t.exec=function(){return e.apply(this,arguments)};var i="ab".split(t);return 2!==i.length||"a"!==i[0]||"b"!==i[1]})),Xo=function(t,e,i,n){var o=Qt(t),a=!r((function(){var e={};return e[o]=function(){return 7},7!=""[t](e)})),s=a&&!r((function(){var e=!1,i=/a/;return"split"===t&&((i={}).constructor={},i.constructor[Go]=function(){return i},i.flags="",i[o]=/./[o]),i.exec=function(){return e=!0,null},i[o](""),!e}));if(!a||!s||"replace"===t&&(!Ko||!Yo)||"split"===t&&!Jo){var l=/./[o],c=i(o,""[t],(function(t,e,i,n,o){return e.exec===Ro?a&&!o?{done:!0,value:l.call(e,i,n)}:{done:!0,value:t.call(i,e,n)}:{done:!1}}),{REPLACE_KEEPS_$0:Yo}),h=c[0],u=c[1];it(String.prototype,t,h),it(RegExp.prototype,o,2==e?function(t,e){return u.call(t,this,e)}:function(t){return u.call(t,this)})}n&&$(RegExp.prototype[o],"sham",!0)},Qo=Mo.charAt,Zo=function(t,e,i){return e+(i?Qo(t,e).length:1)},tr=function(t,e){var i=t.exec;if("function"==typeof i){var n=i.call(t,e);if("object"!=typeof n)throw TypeError("RegExp exec method returned something other than an Object or null");return n}if("RegExp"!==d(t))throw TypeError("RegExp#exec called on incompatible receiver");return Ro.call(t,e)},er=Math.max,ir=Math.min,nr=Math.floor,or=/\$([$&'`]|\d\d?|<[^>]*>)/g,rr=/\$([$&'`]|\d\d?)/g;Xo("replace",2,(function(t,e,i,n){return[function(i,n){var o=g(this),r=null==i?void 0:i[t];return void 0!==r?r.call(i,o,n):e.call(String(o),i,n)},function(t,r){if(n.REPLACE_KEEPS_$0||"string"==typeof r&&-1===r.indexOf("$0")){var a=i(e,t,this,r);if(a.done)return a.value}var s=T(t),l=String(this),c="function"==typeof r;c||(r=String(r));var h=s.global;if(h){var u=s.unicode;s.lastIndex=0}for(var d=[];;){var p=tr(s,l);if(null===p)break;if(d.push(p),!h)break;""===String(p[0])&&(s.lastIndex=Zo(l,ht(s.lastIndex),u))}for(var f,g="",v=0,b=0;b<d.length;b++){p=d[b];for(var y=String(p[0]),m=er(ir(lt(p.index),l.length),0),w=[],S=1;S<p.length;S++)w.push(void 0===(f=p[S])?f:String(f));var x=p.groups;if(c){var k=[y].concat(w,m,l);void 0!==x&&k.push(x);var O=String(r.apply(void 0,k))}else O=o(y,l,m,w,x,r);m>=v&&(g+=l.slice(v,m)+O,v=m+y.length)}return g+l.slice(v)}];function o(t,i,n,o,r,a){var s=n+t.length,l=o.length,c=rr;return void 0!==r&&(r=Ft(r),c=or),e.call(a,c,(function(e,a){var c;switch(a.charAt(0)){case"$":return"$";case"&":return t;case"`":return i.slice(0,n);case"'":return i.slice(s);case"<":c=r[a.slice(1,-1)];break;default:var h=+a;if(0===h)return e;if(h>l){var u=nr(h/10);return 0===u?e:u<=l?void 0===o[u-1]?a.charAt(1):o[u-1]+a.charAt(1):e}c=o[h-1]}return void 0===c?"":c}))}}));var ar=Object.is||function(t,e){return t===e?0!==t||1/t==1/e:t!=t&&e!=e};Xo("search",1,(function(t,e,i){return[function(e){var i=g(this),n=null==e?void 0:e[t];return void 0!==n?n.call(e,i):new RegExp(e)[t](String(i))},function(t){var n=i(e,t,this);if(n.done)return n.value;var o=T(t),r=String(this),a=o.lastIndex;ar(a,0)||(o.lastIndex=0);var s=tr(o,r);return ar(o.lastIndex,a)||(o.lastIndex=a),null===s?-1:s.index}]}));var sr=Qt("species"),lr=[].push,cr=Math.min,hr=4294967295,ur=!r((function(){return!RegExp(hr,"y")}));Xo("split",2,(function(t,e,i){var n;return n="c"=="abbc".split(/(b)*/)[1]||4!="test".split(/(?:)/,-1).length||2!="ab".split(/(?:ab)*/).length||4!=".".split(/(.?)(.?)/).length||".".split(/()()/).length>1||"".split(/.?/).length?function(t,i){var n=String(g(this)),o=void 0===i?hr:i>>>0;if(0===o)return[];if(void 0===t)return[n];if(!ao(t))return e.call(n,t,o);for(var r,a,s,l=[],c=(t.ignoreCase?"i":"")+(t.multiline?"m":"")+(t.unicode?"u":"")+(t.sticky?"y":""),h=0,u=new RegExp(t.source,c+"g");(r=Ro.call(u,n))&&!((a=u.lastIndex)>h&&(l.push(n.slice(h,r.index)),r.length>1&&r.index<n.length&&lr.apply(l,r.slice(1)),s=r[0].length,h=a,l.length>=o));)u.lastIndex===r.index&&u.lastIndex++;return h===n.length?!s&&u.test("")||l.push(""):l.push(n.slice(h)),l.length>o?l.slice(0,o):l}:"0".split(void 0,0).length?function(t,i){return void 0===t&&0===i?[]:e.call(this,t,i)}:e,[function(e,i){var o=g(this),r=null==e?void 0:e[t];return void 0!==r?r.call(e,o,i):n.call(String(o),e,i)},function(t,o){var r=i(n,t,this,o,n!==e);if(r.done)return r.value;var a=T(t),s=String(this),l=function(t,e){var i,n=T(t).constructor;return void 0===n||null==(i=T(n)[sr])?e:re(i)}(a,RegExp),c=a.unicode,h=(a.ignoreCase?"i":"")+(a.multiline?"m":"")+(a.unicode?"u":"")+(ur?"y":"g"),u=new l(ur?a:"^(?:"+a.source+")",h),d=void 0===o?hr:o>>>0;if(0===d)return[];if(0===s.length)return null===tr(u,s)?[s]:[];for(var p=0,f=0,g=[];f<s.length;){u.lastIndex=ur?f:0;var v,b=tr(u,ur?s:s.slice(f));if(null===b||(v=cr(ht(u.lastIndex+(ur?0:f)),s.length))===p)f=Zo(s,f,c);else{if(g.push(s.slice(p,f)),g.length===d)return g;for(var y=1;y<=b.length-1;y++)if(g.push(b[y]),g.length===d)return g;f=p=v}}return g.push(s.slice(p)),g}]}),!ur);var dr=Pn.trim;Rt({target:"String",proto:!0,forced:function(t){return r((function(){return!!Sn[t]()||"​…᠎"!="​…᠎"[t]()||Sn[t].name!==t}))}("trim")},{trim:function(){return dr(this)}});var pr={CSSRuleList:0,CSSStyleDeclaration:0,CSSValueList:0,ClientRectList:0,DOMRectList:0,DOMStringList:0,DOMTokenList:1,DataTransferItemList:0,FileList:0,HTMLAllCollection:0,HTMLCollection:0,HTMLFormElement:0,HTMLSelectElement:0,MediaList:0,MimeTypeArray:0,NamedNodeMap:0,NodeList:1,PaintRequestList:0,Plugin:0,PluginArray:0,SVGLengthList:0,SVGNumberList:0,SVGPathSegList:0,SVGPointList:0,SVGStringList:0,SVGTransformList:0,SourceBufferList:0,StyleSheetList:0,TextTrackCueList:0,TextTrackList:0,TouchList:0},fr=he.forEach,gr=Oi("forEach")?function(t){return fr(this,t,arguments.length>1?arguments[1]:void 0)}:[].forEach;for(var vr in pr){var br=o[vr],yr=br&&br.prototype;if(yr&&yr.forEach!==gr)try{$(yr,"forEach",gr)}catch(t){yr.forEach=gr}}var mr=Qt("iterator"),wr=Qt("toStringTag"),Sr=Qi.values;for(var xr in pr){var kr=o[xr],Or=kr&&kr.prototype;if(Or){if(Or[mr]!==Sr)try{$(Or,mr,Sr)}catch(t){Or[mr]=Sr}if(Or[wr]||$(Or,wr,xr),pr[xr])for(var Cr in Qi)if(Or[Cr]!==Qi[Cr])try{$(Or,Cr,Qi[Cr])}catch(t){Or[Cr]=Qi[Cr]}}}function Pr(t){return(Pr="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t})(t)}function Tr(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}function Ir(t,e){for(var i=0;i<e.length;i++){var n=e[i];n.enumerable=n.enumerable||!1,n.configurable=!0,"value"in n&&(n.writable=!0),Object.defineProperty(t,n.key,n)}}function Ar(t,e,i){return e&&Ir(t.prototype,e),i&&Ir(t,i),t}function $r(t,e){return function(t){if(Array.isArray(t))return t}(t)||function(t,e){if(!(Symbol.iterator in Object(t))&&"[object Arguments]"!==Object.prototype.toString.call(t))return;var i=[],n=!0,o=!1,r=void 0;try{for(var a,s=t[Symbol.iterator]();!(n=(a=s.next()).done)&&(i.push(a.value),!e||i.length!==e);n=!0);}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}return i}(t,e)||function(){throw new TypeError("Invalid attempt to destructure non-iterable instance")}()}function Er(t){return function(t){if(Array.isArray(t)){for(var e=0,i=new Array(t.length);e<t.length;e++)i[e]=t[e];return i}}(t)||function(t){if(Symbol.iterator in Object(t)||"[object Arguments]"===Object.prototype.toString.call(t))return Array.from(t)}(t)||function(){throw new TypeError("Invalid attempt to spread non-iterable instance")}()}var Rr=4;try{var jr=t.fn.dropdown.Constructor.VERSION;void 0!==jr&&(Rr=parseInt(jr,10))}catch(t){}try{var Nr=bootstrap.Tooltip.VERSION;void 0!==Nr&&(Rr=parseInt(Nr,10))}catch(t){}var _r={3:{iconsPrefix:"glyphicon",icons:{paginationSwitchDown:"glyphicon-collapse-down icon-chevron-down",paginationSwitchUp:"glyphicon-collapse-up icon-chevron-up",refresh:"glyphicon-refresh icon-refresh",toggleOff:"glyphicon-list-alt icon-list-alt",toggleOn:"glyphicon-list-alt icon-list-alt",columns:"glyphicon-th icon-th",detailOpen:"glyphicon-plus icon-plus",detailClose:"glyphicon-minus icon-minus",fullscreen:"glyphicon-fullscreen",search:"glyphicon-search",clearSearch:"glyphicon-trash"},classes:{buttonsPrefix:"btn",buttons:"default",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"pull",inputGroup:"input-group",inputPrefix:"input-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<ul class="dropdown-menu" role="menu">',"</ul>"],toolbarDropdownItem:'<li class="dropdown-item-marker" role="menuitem"><label>%s</label></li>',toolbarDropdownSeparator:'<li class="divider"></li>',pageDropdown:['<ul class="dropdown-menu" role="menu">',"</ul>"],pageDropdownItem:'<li role="menuitem" class="%s"><a href="#">%s</a></li>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<span class="input-group-btn">%s</span></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}},4:{iconsPrefix:"fa",icons:{paginationSwitchDown:"fa-caret-square-down",paginationSwitchUp:"fa-caret-square-up",refresh:"fa-sync",toggleOff:"fa-toggle-off",toggleOn:"fa-toggle-on",columns:"fa-th-list",detailOpen:"fa-plus",detailClose:"fa-minus",fullscreen:"fa-arrows-alt",search:"fa-search",clearSearch:"fa-trash"},classes:{buttonsPrefix:"btn",buttons:"secondary",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"float",inputGroup:"btn-group",inputPrefix:"form-control-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<div class="dropdown-menu dropdown-menu-right">',"</div>"],toolbarDropdownItem:'<label class="dropdown-item dropdown-item-marker">%s</label>',pageDropdown:['<div class="dropdown-menu">',"</div>"],pageDropdownItem:'<a class="dropdown-item %s" href="#">%s</a>',toolbarDropdownSeparator:'<div class="dropdown-divider"></div>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<div class="input-group-append">%s</div></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}},5:{iconsPrefix:"fa",icons:{paginationSwitchDown:"fa-caret-square-down",paginationSwitchUp:"fa-caret-square-up",refresh:"fa-sync",toggleOff:"fa-toggle-off",toggleOn:"fa-toggle-on",columns:"fa-th-list",detailOpen:"fa-plus",detailClose:"fa-minus",fullscreen:"fa-arrows-alt",search:"fa-search",clearSearch:"fa-trash"},classes:{buttonsPrefix:"btn",buttons:"secondary",buttonsGroup:"btn-group",buttonsDropdown:"btn-group",pull:"float",inputGroup:"btn-group",inputPrefix:"form-control-",input:"form-control",paginationDropdown:"btn-group dropdown",dropup:"dropup",dropdownActive:"active",paginationActive:"active",buttonActive:"active"},html:{toolbarDropdown:['<div class="dropdown-menu dropdown-menu-right">',"</div>"],toolbarDropdownItem:'<label class="dropdown-item dropdown-item-marker">%s</label>',pageDropdown:['<div class="dropdown-menu">',"</div>"],pageDropdownItem:'<a class="dropdown-item %s" href="#">%s</a>',toolbarDropdownSeparator:'<div class="dropdown-divider"></div>',dropdownCaret:'<span class="caret"></span>',pagination:['<ul class="pagination%s">',"</ul>"],paginationItem:'<li class="page-item%s"><a class="page-link" aria-label="%s" href="javascript:void(0)">%s</a></li>',icon:'<i class="%s %s"></i>',inputGroup:'<div class="input-group">%s<div class="input-group-append">%s</div></div>',searchInput:'<input class="%s%s" type="text" placeholder="%s">',searchButton:'<button class="%s" type="button" name="search" title="%s">%s %s</button>',searchClearButton:'<button class="%s" type="button" name="clearSearch" title="%s">%s %s</button>'}}}[Rr],Fr={height:void 0,classes:"table table-bordered table-hover",buttons:{},theadClasses:"",headerStyle:function(t){return{}},rowStyle:function(t,e){return{}},rowAttributes:function(t,e){return{}},undefinedText:"-",locale:void 0,virtualScroll:!1,virtualScrollItemHeight:void 0,sortable:!0,sortClass:void 0,silentSort:!0,sortName:void 0,sortOrder:void 0,sortReset:!1,sortStable:!1,rememberOrder:!1,serverSort:!0,customSort:void 0,columns:[[]],data:[],url:void 0,method:"get",cache:!0,contentType:"application/json",dataType:"json",ajax:void 0,ajaxOptions:{},queryParams:function(t){return t},queryParamsType:"limit",responseHandler:function(t){return t},totalField:"total",totalNotFilteredField:"totalNotFiltered",dataField:"rows",footerField:"footer",pagination:!1,paginationParts:["pageInfo","pageSize","pageList"],showExtendedPagination:!1,paginationLoop:!0,sidePagination:"client",totalRows:0,totalNotFiltered:0,pageNumber:1,pageSize:10,pageList:[10,25,50,100],paginationHAlign:"right",paginationVAlign:"bottom",paginationDetailHAlign:"left",paginationPreText:"&lsaquo;",paginationNextText:"&rsaquo;",paginationSuccessivelySize:5,paginationPagesBySide:1,paginationUseIntermediate:!1,search:!1,searchHighlight:!1,searchOnEnterKey:!1,strictSearch:!1,searchSelector:!1,visibleSearch:!1,showButtonIcons:!0,showButtonText:!1,showSearchButton:!1,showSearchClearButton:!1,trimOnSearch:!0,searchAlign:"right",searchTimeOut:500,searchText:"",customSearch:void 0,showHeader:!0,showFooter:!1,footerStyle:function(t){return{}},searchAccentNeutralise:!1,showColumns:!1,showColumnsToggleAll:!1,showColumnsSearch:!1,minimumCountColumns:1,showPaginationSwitch:!1,showRefresh:!1,showToggle:!1,showFullscreen:!1,smartDisplay:!0,escape:!1,filterOptions:{filterAlgorithm:"and"},idField:void 0,selectItemName:"btSelectItem",clickToSelect:!1,ignoreClickToSelectOn:function(t){var e=t.tagName;return["A","BUTTON"].includes(e)},singleSelect:!1,checkboxHeader:!0,maintainMetaData:!1,multipleSelectRow:!1,uniqueId:void 0,cardView:!1,detailView:!1,detailViewIcon:!0,detailViewByClick:!1,detailViewAlign:"left",detailFormatter:function(t,e){return""},detailFilter:function(t,e){return!0},toolbar:void 0,toolbarAlign:"left",buttonsToolbar:void 0,buttonsAlign:"right",buttonsOrder:["paginationSwitch","refresh","toggle","fullscreen","columns"],buttonsPrefix:_r.classes.buttonsPrefix,buttonsClass:_r.classes.buttons,icons:_r.icons,iconSize:void 0,iconsPrefix:_r.iconsPrefix,loadingFontSize:"auto",loadingTemplate:function(t){return'<span class="loading-wrap">\n      <span class="loading-text">'.concat(t,'</span>\n      <span class="animation-wrap"><span class="animation-dot"></span></span>\n      </span>\n    ')},onAll:function(t,e){return!1},onClickCell:function(t,e,i,n){return!1},onDblClickCell:function(t,e,i,n){return!1},onClickRow:function(t,e){return!1},onDblClickRow:function(t,e){return!1},onSort:function(t,e){return!1},onCheck:function(t){return!1},onUncheck:function(t){return!1},onCheckAll:function(t){return!1},onUncheckAll:function(t){return!1},onCheckSome:function(t){return!1},onUncheckSome:function(t){return!1},onLoadSuccess:function(t){return!1},onLoadError:function(t){return!1},onColumnSwitch:function(t,e){return!1},onPageChange:function(t,e){return!1},onSearch:function(t){return!1},onToggle:function(t){return!1},onPreBody:function(t){return!1},onPostBody:function(){return!1},onPostHeader:function(){return!1},onPostFooter:function(){return!1},onExpandRow:function(t,e,i){return!1},onCollapseRow:function(t,e){return!1},onRefreshOptions:function(t){return!1},onRefresh:function(t){return!1},onResetView:function(){return!1},onScrollBody:function(){return!1}},Vr={formatLoadingMessage:function(){return"Loading, please wait"},formatRecordsPerPage:function(t){return"".concat(t," rows per page")},formatShowingRows:function(t,e,i,n){return void 0!==n&&n>0&&n>i?"Showing ".concat(t," to ").concat(e," of ").concat(i," rows (filtered from ").concat(n," total rows)"):"Showing ".concat(t," to ").concat(e," of ").concat(i," rows")},formatSRPaginationPreText:function(){return"previous page"},formatSRPaginationPageText:function(t){return"to page ".concat(t)},formatSRPaginationNextText:function(){return"next page"},formatDetailPagination:function(t){return"Showing ".concat(t," rows")},formatSearch:function(){return"Search"},formatClearSearch:function(){return"Clear Search"},formatNoMatches:function(){return"No matching records found"},formatPaginationSwitch:function(){return"Hide/Show pagination"},formatPaginationSwitchDown:function(){return"Show pagination"},formatPaginationSwitchUp:function(){return"Hide pagination"},formatRefresh:function(){return"Refresh"},formatToggle:function(){return"Toggle"},formatToggleOn:function(){return"Show card view"},formatToggleOff:function(){return"Hide card view"},formatColumns:function(){return"Columns"},formatColumnsToggleAll:function(){return"Toggle all"},formatFullscreen:function(){return"Fullscreen"},formatAllRows:function(){return"All"}},Dr={field:void 0,title:void 0,titleTooltip:void 0,class:void 0,width:void 0,widthUnit:"px",rowspan:void 0,colspan:void 0,align:void 0,halign:void 0,falign:void 0,valign:void 0,cellStyle:void 0,radio:!1,checkbox:!1,checkboxEnabled:!0,clickToSelect:!0,showSelectTitle:!1,sortable:!1,sortName:void 0,order:"asc",sorter:void 0,visible:!0,switchable:!0,cardVisible:!0,searchable:!0,formatter:void 0,footerFormatter:void 0,detailFormatter:void 0,searchFormatter:!0,searchHighlightFormatter:!1,escape:!1,events:void 0};Object.assign(Fr,Vr);var Br={VERSION:"1.18.0",THEME:"bootstrap".concat(Rr),CONSTANTS:_r,DEFAULTS:Fr,COLUMN_DEFAULTS:Dr,METHODS:["getOptions","refreshOptions","getData","getSelections","load","append","prepend","remove","removeAll","insertRow","updateRow","getRowByUniqueId","updateByUniqueId","removeByUniqueId","updateCell","updateCellByUniqueId","showRow","hideRow","getHiddenRows","showColumn","hideColumn","getVisibleColumns","getHiddenColumns","showAllColumns","hideAllColumns","mergeCells","checkAll","uncheckAll","checkInvert","check","uncheck","checkBy","uncheckBy","refresh","destroy","resetView","showLoading","hideLoading","togglePagination","toggleFullscreen","toggleView","resetSearch","filterBy","scrollTo","getScrollPosition","selectPage","prevPage","nextPage","toggleDetailView","expandRow","collapseRow","expandRowByUniqueId","collapseRowByUniqueId","expandAllRows","collapseAllRows","updateColumnTitle","updateFormatText"],EVENTS:{"all.bs.table":"onAll","click-row.bs.table":"onClickRow","dbl-click-row.bs.table":"onDblClickRow","click-cell.bs.table":"onClickCell","dbl-click-cell.bs.table":"onDblClickCell","sort.bs.table":"onSort","check.bs.table":"onCheck","uncheck.bs.table":"onUncheck","check-all.bs.table":"onCheckAll","uncheck-all.bs.table":"onUncheckAll","check-some.bs.table":"onCheckSome","uncheck-some.bs.table":"onUncheckSome","load-success.bs.table":"onLoadSuccess","load-error.bs.table":"onLoadError","column-switch.bs.table":"onColumnSwitch","page-change.bs.table":"onPageChange","search.bs.table":"onSearch","toggle.bs.table":"onToggle","pre-body.bs.table":"onPreBody","post-body.bs.table":"onPostBody","post-header.bs.table":"onPostHeader","post-footer.bs.table":"onPostFooter","expand-row.bs.table":"onExpandRow","collapse-row.bs.table":"onCollapseRow","refresh-options.bs.table":"onRefreshOptions","reset-view.bs.table":"onResetView","refresh.bs.table":"onRefresh","scroll-body.bs.table":"onScrollBody"},LOCALES:{en:Vr,"en-US":Vr}},Lr=r((function(){Vt(1)}));Rt({target:"Object",stat:!0,forced:Lr},{keys:function(t){return Vt(Ft(t))}});var Hr,Mr=P.f,Ur="".endsWith,zr=Math.min,qr=Lo("endsWith"),Wr=!(qr||(Hr=Mr(String.prototype,"endsWith"),!Hr||Hr.writable));Rt({target:"String",proto:!0,forced:!Wr&&!qr},{endsWith:function(t){var e=String(g(this));Do(t);var i=arguments.length>1?arguments[1]:void 0,n=ht(e.length),o=void 0===i?n:zr(ht(i),n),r=String(t);return Ur?Ur.call(e,r,o):e.slice(o-r.length,o)===r}});var Gr=P.f,Kr="".startsWith,Yr=Math.min,Jr=Lo("startsWith"),Xr=!Jr&&!!function(){var t=Gr(String.prototype,"startsWith");return t&&!t.writable}();Rt({target:"String",proto:!0,forced:!Xr&&!Jr},{startsWith:function(t){var e=String(g(this));Do(t);var i=ht(Yr(arguments.length>1?arguments[1]:void 0,e.length)),n=String(t);return Kr?Kr.call(e,n,i):e.slice(i,i+n.length)===n}});var Qr={getSearchInput:function(e){return"string"==typeof e.options.searchSelector?t(e.options.searchSelector):e.$toolbar.find(".search input")},sprintf:function(t){for(var e=arguments.length,i=new Array(e>1?e-1:0),n=1;n<e;n++)i[n-1]=arguments[n];var o=!0,r=0,a=t.replace(/%s/g,(function(){var t=i[r++];return void 0===t?(o=!1,""):t}));return o?a:""},isObject:function(t){return t instanceof Object&&!Array.isArray(t)},isEmptyObject:function(){var t=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};return 0===Object.entries(t).length&&t.constructor===Object},isNumeric:function(t){return!isNaN(parseFloat(t))&&isFinite(t)},getFieldTitle:function(t,e){var i=!0,n=!1,o=void 0;try{for(var r,a=t[Symbol.iterator]();!(i=(r=a.next()).done);i=!0){var s=r.value;if(s.field===e)return s.title}}catch(t){n=!0,o=t}finally{try{i||null==a.return||a.return()}finally{if(n)throw o}}return""},setFieldIndex:function(t){var e=0,i=[],n=!0,o=!1,r=void 0;try{for(var a,s=t[0][Symbol.iterator]();!(n=(a=s.next()).done);n=!0){e+=a.value.colspan||1}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}for(var l=0;l<t.length;l++){i[l]=[];for(var c=0;c<e;c++)i[l][c]=!1}for(var h=0;h<t.length;h++){var u=!0,d=!1,p=void 0;try{for(var f,g=t[h][Symbol.iterator]();!(u=(f=g.next()).done);u=!0){var v=f.value,b=v.rowspan||1,y=v.colspan||1,m=i[h].indexOf(!1);v.colspanIndex=m,1===y?(v.fieldIndex=m,void 0===v.field&&(v.field=m)):v.colspanGroup=v.colspan;for(var w=0;w<b;w++)for(var S=0;S<y;S++)i[h+w][m+S]=!0}}catch(t){d=!0,p=t}finally{try{u||null==g.return||g.return()}finally{if(d)throw p}}}},normalizeAccent:function(t){return"string"!=typeof t?t:t.normalize("NFD").replace(/[\u0300-\u036f]/g,"")},updateFieldGroup:function(t){var e,i=(e=[]).concat.apply(e,Er(t)),n=!0,o=!1,r=void 0;try{for(var a,s=t[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value,c=!0,h=!1,u=void 0;try{for(var d,p=l[Symbol.iterator]();!(c=(d=p.next()).done);c=!0){var f=d.value;if(f.colspanGroup>1){for(var g=0,v=function(t){i.find((function(e){return e.fieldIndex===t})).visible&&g++},b=f.colspanIndex;b<f.colspanIndex+f.colspanGroup;b++)v(b);f.colspan=g,f.visible=g>0}}}catch(t){h=!0,u=t}finally{try{c||null==p.return||p.return()}finally{if(h)throw u}}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}},getScrollBarWidth:function(){if(void 0===this.cachedWidth){var e=t("<div/>").addClass("fixed-table-scroll-inner"),i=t("<div/>").addClass("fixed-table-scroll-outer");i.append(e),t("body").append(i);var n=e[0].offsetWidth;i.css("overflow","scroll");var o=e[0].offsetWidth;n===o&&(o=i[0].clientWidth),i.remove(),this.cachedWidth=n-o}return this.cachedWidth},calculateObjectValue:function(t,e){var i=arguments.length>2&&void 0!==arguments[2]?arguments[2]:[],n=arguments.length>3?arguments[3]:void 0,o=e;if("string"==typeof e){var r=e.split(".");if(r.length>1){o=window;var a=!0,s=!1,l=void 0;try{for(var c,h=r[Symbol.iterator]();!(a=(c=h.next()).done);a=!0){var u=c.value;o=o[u]}}catch(t){s=!0,l=t}finally{try{a||null==h.return||h.return()}finally{if(s)throw l}}}else o=window[e]}return null!==o&&"object"===Pr(o)?o:"function"==typeof o?o.apply(t,i||[]):!o&&"string"==typeof e&&this.sprintf.apply(this,[e].concat(Er(i)))?this.sprintf.apply(this,[e].concat(Er(i))):n},compareObjects:function(t,e,i){var n=Object.keys(t),o=Object.keys(e);if(i&&n.length!==o.length)return!1;for(var r=0,a=n;r<a.length;r++){var s=a[r];if(o.includes(s)&&t[s]!==e[s])return!1}return!0},escapeHTML:function(t){return"string"==typeof t?t.replace(/&/g,"&amp;").replace(/</g,"&lt;").replace(/>/g,"&gt;").replace(/"/g,"&quot;").replace(/'/g,"&#039;").replace(/`/g,"&#x60;"):t},unescapeHTML:function(t){return"string"==typeof t?t.replace(/&amp;/g,"&").replace(/&lt;/g,"<").replace(/&gt;/g,">").replace(/&quot;/g,'"').replace(/&#039;/g,"'").replace(/&#x60;/g,"`"):t},getRealDataAttr:function(t){for(var e=0,i=Object.entries(t);e<i.length;e++){var n=$r(i[e],2),o=n[0],r=n[1],a=o.split(/(?=[A-Z])/).join("-").toLowerCase();a!==o&&(t[a]=r,delete t[o])}return t},getItemField:function(t,e,i){var n=t;if("string"!=typeof e||t.hasOwnProperty(e))return i?this.escapeHTML(t[e]):t[e];var o=e.split("."),r=!0,a=!1,s=void 0;try{for(var l,c=o[Symbol.iterator]();!(r=(l=c.next()).done);r=!0){var h=l.value;n=n&&n[h]}}catch(t){a=!0,s=t}finally{try{r||null==c.return||c.return()}finally{if(a)throw s}}return i?this.escapeHTML(n):n},isIEBrowser:function(){return navigator.userAgent.includes("MSIE ")||/Trident.*rv:11\./.test(navigator.userAgent)},findIndex:function(t,e){var i=!0,n=!1,o=void 0;try{for(var r,a=t[Symbol.iterator]();!(i=(r=a.next()).done);i=!0){var s=r.value;if(JSON.stringify(s)===JSON.stringify(e))return t.indexOf(s)}}catch(t){n=!0,o=t}finally{try{i||null==a.return||a.return()}finally{if(n)throw o}}return-1},trToData:function(e,i){var n=this,o=[],r=[];return i.each((function(i,a){var s=t(a),l={};l._id=s.attr("id"),l._class=s.attr("class"),l._data=n.getRealDataAttr(s.data()),l._style=s.attr("style"),s.find(">td,>th").each((function(o,a){for(var s=t(a),c=+s.attr("colspan")||1,h=+s.attr("rowspan")||1,u=o;r[i]&&r[i][u];u++);for(var d=u;d<u+c;d++)for(var p=i;p<i+h;p++)r[p]||(r[p]=[]),r[p][d]=!0;var f=e[u].field;l[f]=s.html().trim(),l["_".concat(f,"_id")]=s.attr("id"),l["_".concat(f,"_class")]=s.attr("class"),l["_".concat(f,"_rowspan")]=s.attr("rowspan"),l["_".concat(f,"_colspan")]=s.attr("colspan"),l["_".concat(f,"_title")]=s.attr("title"),l["_".concat(f,"_data")]=n.getRealDataAttr(s.data()),l["_".concat(f,"_style")]=s.attr("style")})),o.push(l)})),o},sort:function(t,e,i,n,o,r){return null==t&&(t=""),null==e&&(e=""),n&&t===e&&(t=o,e=r),this.isNumeric(t)&&this.isNumeric(e)?(t=parseFloat(t))<(e=parseFloat(e))?-1*i:t>e?i:0:t===e?0:("string"!=typeof t&&(t=t.toString()),-1===t.localeCompare(e)?-1*i:i)},getEventName:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return e=e||"".concat(+new Date).concat(~~(1e6*Math.random())),"".concat(t,"-").concat(e)},hasDetailViewIcon:function(t){return t.detailView&&t.detailViewIcon&&!t.cardView},getDetailViewIndexOffset:function(t){return this.hasDetailViewIcon(t)&&"right"!==t.detailViewAlign?1:0},checkAutoMergeCells:function(t){var e=!0,i=!1,n=void 0;try{for(var o,r=t[Symbol.iterator]();!(e=(o=r.next()).done);e=!0)for(var a=o.value,s=0,l=Object.keys(a);s<l.length;s++){var c=l[s];if(c.startsWith("_")&&(c.endsWith("_rowspan")||c.endsWith("_colspan")))return!0}}catch(t){i=!0,n=t}finally{try{e||null==r.return||r.return()}finally{if(i)throw n}}return!1},deepCopy:function(e){return void 0===e?e:t.extend(!0,Array.isArray(e)?[]:{},e)}},Zr=function(){function t(e){var i=this;Tr(this,t),this.rows=e.rows,this.scrollEl=e.scrollEl,this.contentEl=e.contentEl,this.callback=e.callback,this.itemHeight=e.itemHeight,this.cache={},this.scrollTop=this.scrollEl.scrollTop,this.initDOM(this.rows,e.fixedScroll),this.scrollEl.scrollTop=this.scrollTop,this.lastCluster=0;var n=function(){i.lastCluster!==(i.lastCluster=i.getNum())&&(i.initDOM(i.rows),i.callback())};this.scrollEl.addEventListener("scroll",n,!1),this.destroy=function(){i.contentEl.innerHtml="",i.scrollEl.removeEventListener("scroll",n,!1)}}return Ar(t,[{key:"initDOM",value:function(t,e){void 0===this.clusterHeight&&(this.cache.scrollTop=this.scrollEl.scrollTop,this.cache.data=this.contentEl.innerHTML=t[0]+t[0]+t[0],this.getRowsHeight(t));var i=this.initData(t,this.getNum(e)),n=i.rows.join(""),o=this.checkChanges("data",n),r=this.checkChanges("top",i.topOffset),a=this.checkChanges("bottom",i.bottomOffset),s=[];o&&r?(i.topOffset&&s.push(this.getExtra("top",i.topOffset)),s.push(n),i.bottomOffset&&s.push(this.getExtra("bottom",i.bottomOffset)),this.contentEl.innerHTML=s.join(""),e&&(this.contentEl.scrollTop=this.cache.scrollTop)):a&&(this.contentEl.lastChild.style.height="".concat(i.bottomOffset,"px"))}},{key:"getRowsHeight",value:function(){if(void 0===this.itemHeight){var t=this.contentEl.children,e=t[Math.floor(t.length/2)];this.itemHeight=e.offsetHeight}this.blockHeight=50*this.itemHeight,this.clusterRows=200,this.clusterHeight=4*this.blockHeight}},{key:"getNum",value:function(t){return this.scrollTop=t?this.cache.scrollTop:this.scrollEl.scrollTop,Math.floor(this.scrollTop/(this.clusterHeight-this.blockHeight))||0}},{key:"initData",value:function(t,e){if(t.length<50)return{topOffset:0,bottomOffset:0,rowsAbove:0,rows:t};var i=Math.max((this.clusterRows-50)*e,0),n=i+this.clusterRows,o=Math.max(i*this.itemHeight,0),r=Math.max((t.length-n)*this.itemHeight,0),a=[],s=i;o<1&&s++;for(var l=i;l<n;l++)t[l]&&a.push(t[l]);return{topOffset:o,bottomOffset:r,rowsAbove:s,rows:a}}},{key:"checkChanges",value:function(t,e){var i=e!==this.cache[t];return this.cache[t]=e,i}},{key:"getExtra",value:function(t,e){var i=document.createElement("tr");return i.className="virtual-scroll-".concat(t),e&&(i.style.height="".concat(e,"px")),i.outerHTML}}]),t}(),ta=function(){function e(i,n){Tr(this,e),this.options=n,this.$el=t(i),this.$el_=this.$el.clone(),this.timeoutId_=0,this.timeoutFooter_=0}return Ar(e,[{key:"init",value:function(){this.initConstants(),this.initLocale(),this.initContainer(),this.initTable(),this.initHeader(),this.initData(),this.initHiddenRows(),this.initToolbar(),this.initPagination(),this.initBody(),this.initSearchText(),this.initServer()}},{key:"initConstants",value:function(){var e=this.options;this.constants=Br.CONSTANTS,this.constants.theme=t.fn.bootstrapTable.theme;var i=e.buttonsPrefix?"".concat(e.buttonsPrefix,"-"):"";this.constants.buttonsClass=[e.buttonsPrefix,i+e.buttonsClass,Qr.sprintf("".concat(i,"%s"),e.iconSize)].join(" ").trim(),this.buttons=Qr.calculateObjectValue(this,e.buttons,[],[])}},{key:"initLocale",value:function(){if(this.options.locale){var e=t.fn.bootstrapTable.locales,i=this.options.locale.split(/-|_/);i[0]=i[0].toLowerCase(),i[1]&&(i[1]=i[1].toUpperCase()),e[this.options.locale]?t.extend(this.options,e[this.options.locale]):e[i.join("-")]?t.extend(this.options,e[i.join("-")]):e[i[0]]&&t.extend(this.options,e[i[0]])}}},{key:"initContainer",value:function(){var e=["top","both"].includes(this.options.paginationVAlign)?'<div class="fixed-table-pagination clearfix"></div>':"",i=["bottom","both"].includes(this.options.paginationVAlign)?'<div class="fixed-table-pagination"></div>':"",n=Qr.calculateObjectValue(this.options,this.options.loadingTemplate,[this.options.formatLoadingMessage()]);this.$container=t('\n      <div class="bootstrap-table '.concat(this.constants.theme,'">\n      <div class="fixed-table-toolbar"></div>\n      ').concat(e,'\n      <div class="fixed-table-container">\n      <div class="fixed-table-header"><table></table></div>\n      <div class="fixed-table-body">\n      <div class="fixed-table-loading">\n      ').concat(n,'\n      </div>\n      </div>\n      <div class="fixed-table-footer"><table><thead><tr></tr></thead></table></div>\n      </div>\n      ').concat(i,"\n      </div>\n    ")),this.$container.insertAfter(this.$el),this.$tableContainer=this.$container.find(".fixed-table-container"),this.$tableHeader=this.$container.find(".fixed-table-header"),this.$tableBody=this.$container.find(".fixed-table-body"),this.$tableLoading=this.$container.find(".fixed-table-loading"),this.$tableFooter=this.$el.find("tfoot"),this.options.buttonsToolbar?this.$toolbar=t("body").find(this.options.buttonsToolbar):this.$toolbar=this.$container.find(".fixed-table-toolbar"),this.$pagination=this.$container.find(".fixed-table-pagination"),this.$tableBody.append(this.$el),this.$container.after('<div class="clearfix"></div>'),this.$el.addClass(this.options.classes),this.$tableLoading.addClass(this.options.classes),this.options.height&&(this.$tableContainer.addClass("fixed-height"),this.options.showFooter&&this.$tableContainer.addClass("has-footer"),this.options.classes.split(" ").includes("table-bordered")&&(this.$tableBody.append('<div class="fixed-table-border"></div>'),this.$tableBorder=this.$tableBody.find(".fixed-table-border"),this.$tableLoading.addClass("fixed-table-border")),this.$tableFooter=this.$container.find(".fixed-table-footer"))}},{key:"initTable",value:function(){var i=this,n=[];if(this.$header=this.$el.find(">thead"),this.$header.length?this.options.theadClasses&&this.$header.addClass(this.options.theadClasses):this.$header=t('<thead class="'.concat(this.options.theadClasses,'"></thead>')).appendTo(this.$el),this._headerTrClasses=[],this._headerTrStyles=[],this.$header.find("tr").each((function(e,o){var r=t(o),a=[];r.find("th").each((function(e,i){var n=t(i);void 0!==n.data("field")&&n.data("field","".concat(n.data("field"))),a.push(t.extend({},{title:n.html(),class:n.attr("class"),titleTooltip:n.attr("title"),rowspan:n.attr("rowspan")?+n.attr("rowspan"):void 0,colspan:n.attr("colspan")?+n.attr("colspan"):void 0},n.data()))})),n.push(a),r.attr("class")&&i._headerTrClasses.push(r.attr("class")),r.attr("style")&&i._headerTrStyles.push(r.attr("style"))})),Array.isArray(this.options.columns[0])||(this.options.columns=[this.options.columns]),this.options.columns=t.extend(!0,[],n,this.options.columns),this.columns=[],this.fieldsColumnsIndex=[],Qr.setFieldIndex(this.options.columns),this.options.columns.forEach((function(n,o){n.forEach((function(n,r){var a=t.extend({},e.COLUMN_DEFAULTS,n);void 0!==a.fieldIndex&&(i.columns[a.fieldIndex]=a,i.fieldsColumnsIndex[a.field]=a.fieldIndex),i.options.columns[o][r]=a}))})),!this.options.data.length){var o=Qr.trToData(this.columns,this.$el.find(">tbody>tr"));o.length&&(this.options.data=o,this.fromHtml=!0)}this.options.pagination&&"server"!==this.options.sidePagination||(this.footerData=Qr.trToData(this.columns,this.$el.find(">tfoot>tr"))),this.footerData&&this.$el.find("tfoot").html("<tr></tr>"),!this.options.showFooter||this.options.cardView?this.$tableFooter.hide():this.$tableFooter.show()}},{key:"initHeader",value:function(){var e=this,i={},n=[];this.header={fields:[],styles:[],classes:[],formatters:[],detailFormatters:[],events:[],sorters:[],sortNames:[],cellStyles:[],searchables:[]},Qr.updateFieldGroup(this.options.columns),this.options.columns.forEach((function(t,o){n.push("<tr".concat(Qr.sprintf(' class="%s"',e._headerTrClasses[o])," ").concat(Qr.sprintf(' style="%s"',e._headerTrStyles[o]),">"));var r="";0===o&&Qr.hasDetailViewIcon(e.options)&&(r='<th class="detail" rowspan="'.concat(e.options.columns.length,'">\n          <div class="fht-cell"></div>\n          </th>')),r&&"right"!==e.options.detailViewAlign&&n.push(r),t.forEach((function(t,r){var a=Qr.sprintf(' class="%s"',t.class),s=t.widthUnit,l=parseFloat(t.width),c=Qr.sprintf("text-align: %s; ",t.halign?t.halign:t.align),h=Qr.sprintf("text-align: %s; ",t.align),u=Qr.sprintf("vertical-align: %s; ",t.valign);if(u+=Qr.sprintf("width: %s; ",!t.checkbox&&!t.radio||l?l?l+s:void 0:t.showSelectTitle?void 0:"36px"),void 0!==t.fieldIndex||t.visible){var d=Qr.calculateObjectValue(null,e.options.headerStyle,[t]),p=[],f="";if(d&&d.css)for(var g=0,v=Object.entries(d.css);g<v.length;g++){var b=$r(v[g],2),y=b[0],m=b[1];p.push("".concat(y,": ").concat(m))}if(d&&d.classes&&(f=Qr.sprintf(' class="%s"',t.class?[t.class,d.classes].join(" "):d.classes)),void 0!==t.fieldIndex){if(e.header.fields[t.fieldIndex]=t.field,e.header.styles[t.fieldIndex]=h+u,e.header.classes[t.fieldIndex]=a,e.header.formatters[t.fieldIndex]=t.formatter,e.header.detailFormatters[t.fieldIndex]=t.detailFormatter,e.header.events[t.fieldIndex]=t.events,e.header.sorters[t.fieldIndex]=t.sorter,e.header.sortNames[t.fieldIndex]=t.sortName,e.header.cellStyles[t.fieldIndex]=t.cellStyle,e.header.searchables[t.fieldIndex]=t.searchable,!t.visible)return;if(e.options.cardView&&!t.cardVisible)return;i[t.field]=t}n.push("<th".concat(Qr.sprintf(' title="%s"',t.titleTooltip)),t.checkbox||t.radio?Qr.sprintf(' class="bs-checkbox %s"',t.class||""):f||a,Qr.sprintf(' style="%s"',c+u+p.join("; ")),Qr.sprintf(' rowspan="%s"',t.rowspan),Qr.sprintf(' colspan="%s"',t.colspan),Qr.sprintf(' data-field="%s"',t.field),0===r&&o>0?" data-not-first-th":"",">"),n.push(Qr.sprintf('<div class="th-inner %s">',e.options.sortable&&t.sortable?"sortable both":""));var w=e.options.escape?Qr.escapeHTML(t.title):t.title,S=w;t.checkbox&&(w="",!e.options.singleSelect&&e.options.checkboxHeader&&(w='<label><input name="btSelectAll" type="checkbox" /><span></span></label>'),e.header.stateField=t.field),t.radio&&(w="",e.header.stateField=t.field),!w&&t.showSelectTitle&&(w+=S),n.push(w),n.push("</div>"),n.push('<div class="fht-cell"></div>'),n.push("</div>"),n.push("</th>")}})),r&&"right"===e.options.detailViewAlign&&n.push(r),n.push("</tr>")})),this.$header.html(n.join("")),this.$header.find("th[data-field]").each((function(e,n){t(n).data(i[t(n).data("field")])})),this.$container.off("click",".th-inner").on("click",".th-inner",(function(i){var n=t(i.currentTarget);if(e.options.detailView&&!n.parent().hasClass("bs-checkbox")&&n.closest(".bootstrap-table")[0]!==e.$container[0])return!1;e.options.sortable&&n.parent().data().sortable&&e.onSort(i)})),this.$header.children().children().off("keypress").on("keypress",(function(i){e.options.sortable&&t(i.currentTarget).data().sortable&&(13===(i.keyCode||i.which)&&e.onSort(i))}));var o=Qr.getEventName("resize.bootstrap-table",this.$el.attr("id"));t(window).off(o),!this.options.showHeader||this.options.cardView?(this.$header.hide(),this.$tableHeader.hide(),this.$tableLoading.css("top",0)):(this.$header.show(),this.$tableHeader.show(),this.$tableLoading.css("top",this.$header.outerHeight()+1),this.getCaret(),t(window).on(o,(function(){return e.resetView()}))),this.$selectAll=this.$header.find('[name="btSelectAll"]'),this.$selectAll.off("click").on("click",(function(i){i.stopPropagation();var n=t(i.currentTarget).prop("checked");e[n?"checkAll":"uncheckAll"](),e.updateSelected()}))}},{key:"initData",value:function(t,e){"append"===e?this.options.data=this.options.data.concat(t):"prepend"===e?this.options.data=[].concat(t).concat(this.options.data):(t=t||Qr.deepCopy(this.options.data),this.options.data=Array.isArray(t)?t:t[this.options.dataField]),this.data=Er(this.options.data),this.options.sortReset&&(this.unsortedData=Er(this.data)),"server"!==this.options.sidePagination&&this.initSort()}},{key:"initSort",value:function(){var t=this,e=this.options.sortName,i="desc"===this.options.sortOrder?-1:1,n=this.header.fields.indexOf(this.options.sortName),o=0;-1!==n?(this.options.sortStable&&this.data.forEach((function(t,e){t.hasOwnProperty("_position")||(t._position=e)})),this.options.customSort?Qr.calculateObjectValue(this.options,this.options.customSort,[this.options.sortName,this.options.sortOrder,this.data]):this.data.sort((function(o,r){t.header.sortNames[n]&&(e=t.header.sortNames[n]);var a=Qr.getItemField(o,e,t.options.escape),s=Qr.getItemField(r,e,t.options.escape),l=Qr.calculateObjectValue(t.header,t.header.sorters[n],[a,s,o,r]);return void 0!==l?t.options.sortStable&&0===l?i*(o._position-r._position):i*l:Qr.sort(a,s,i,t.options.sortStable,o._position,r._position)})),void 0!==this.options.sortClass&&(clearTimeout(o),o=setTimeout((function(){t.$el.removeClass(t.options.sortClass);var e=t.$header.find('[data-field="'.concat(t.options.sortName,'"]')).index();t.$el.find("tr td:nth-child(".concat(e+1,")")).addClass(t.options.sortClass)}),250))):this.options.sortReset&&(this.data=Er(this.unsortedData))}},{key:"onSort",value:function(e){var i=e.type,n=e.currentTarget,o="keypress"===i?t(n):t(n).parent(),r=this.$header.find("th").eq(o.index());if(this.$header.add(this.$header_).find("span.order").remove(),this.options.sortName===o.data("field")){var a=this.options.sortOrder;void 0===a?this.options.sortOrder="asc":"asc"===a?this.options.sortOrder="desc":"desc"===this.options.sortOrder&&(this.options.sortOrder=this.options.sortReset?void 0:"asc"),void 0===this.options.sortOrder&&(this.options.sortName=void 0)}else this.options.sortName=o.data("field"),this.options.rememberOrder?this.options.sortOrder="asc"===o.data("order")?"desc":"asc":this.options.sortOrder=this.columns[this.fieldsColumnsIndex[o.data("field")]].sortOrder||this.columns[this.fieldsColumnsIndex[o.data("field")]].order;if(this.trigger("sort",this.options.sortName,this.options.sortOrder),o.add(r).data("order",this.options.sortOrder),this.getCaret(),"server"===this.options.sidePagination&&this.options.serverSort)return this.options.pageNumber=1,void this.initServer(this.options.silentSort);this.initSort(),this.initBody()}},{key:"initToolbar",value:function(){var e,i=this,n=this.options,o=[],r=0,a=0;this.$toolbar.find(".bs-bars").children().length&&t("body").append(t(n.toolbar)),this.$toolbar.html(""),"string"!=typeof n.toolbar&&"object"!==Pr(n.toolbar)||t(Qr.sprintf('<div class="bs-bars %s-%s"></div>',this.constants.classes.pull,n.toolbarAlign)).appendTo(this.$toolbar).append(t(n.toolbar)),o=['<div class="'.concat(["columns","columns-".concat(n.buttonsAlign),this.constants.classes.buttonsGroup,"".concat(this.constants.classes.pull,"-").concat(n.buttonsAlign)].join(" "),'">')],"string"==typeof n.icons&&(n.icons=Qr.calculateObjectValue(null,n.icons)),"string"==typeof n.buttonsOrder&&(n.buttonsOrder=n.buttonsOrder.replace(/\[|\]| |'/g,"").toLowerCase().split(",")),this.buttons=Object.assign(this.buttons,{paginationSwitch:{text:n.pagination?n.formatPaginationSwitchUp():n.formatPaginationSwitchDown(),icon:n.pagination?n.icons.paginationSwitchDown:n.icons.paginationSwitchUp,render:!1,event:this.togglePagination,attributes:{"aria-label":n.formatPaginationSwitch(),title:n.formatPaginationSwitch()}},refresh:{text:n.formatRefresh(),icon:n.icons.refresh,render:!1,event:this.refresh,attributes:{"aria-label":n.formatRefresh(),title:n.formatRefresh()}},toggle:{text:n.formatToggle(),icon:n.icons.toggleOff,render:!1,event:this.toggleView,attributes:{"aria-label":n.formatToggleOn(),title:n.formatToggleOn()}},fullscreen:{text:n.formatFullscreen(),icon:n.icons.fullscreen,render:!1,event:this.toggleFullscreen,attributes:{"aria-label":n.formatFullscreen(),title:n.formatFullscreen()}},columns:{render:!1,html:function(){var t=[];if(t.push('<div class="keep-open '.concat(i.constants.classes.buttonsDropdown,'" title="').concat(n.formatColumns(),'">\n            <button class="').concat(i.constants.buttonsClass,' dropdown-toggle" type="button" data-toggle="dropdown"\n            aria-label="Columns" title="').concat(n.formatColumns(),'">\n            ').concat(n.showButtonIcons?Qr.sprintf(i.constants.html.icon,n.iconsPrefix,n.icons.columns):"","\n            ").concat(n.showButtonText?n.formatColumns():"","\n            ").concat(i.constants.html.dropdownCaret,"\n            </button>\n            ").concat(i.constants.html.toolbarDropdown[0])),n.showColumnsSearch&&(t.push(Qr.sprintf(i.constants.html.toolbarDropdownItem,Qr.sprintf('<input type="text" class="%s" name="columnsSearch" placeholder="%s" autocomplete="off">',i.constants.classes.input,n.formatSearch()))),t.push(i.constants.html.toolbarDropdownSeparator)),n.showColumnsToggleAll){var e=i.getVisibleColumns().length===i.columns.filter((function(t){return!i.isSelectionColumn(t)})).length;t.push(Qr.sprintf(i.constants.html.toolbarDropdownItem,Qr.sprintf('<input type="checkbox" class="toggle-all" %s> <span>%s</span>',e?'checked="checked"':"",n.formatColumnsToggleAll()))),t.push(i.constants.html.toolbarDropdownSeparator)}var o=0;return i.columns.forEach((function(t,e){t.visible&&o++})),i.columns.forEach((function(e,r){if(!i.isSelectionColumn(e)&&(!n.cardView||e.cardVisible)){var s=e.visible?' checked="checked"':"",l=o<=n.minimumCountColumns&&s?' disabled="disabled"':"";e.switchable&&(t.push(Qr.sprintf(i.constants.html.toolbarDropdownItem,Qr.sprintf('<input type="checkbox" data-field="%s" value="%s"%s%s> <span>%s</span>',e.field,r,s,l,e.title))),a++)}})),t.push(i.constants.html.toolbarDropdown[1],"</div>"),t.join("")}}});for(var s={},l=0,c=Object.entries(this.buttons);l<c.length;l++){var h=$r(c[l],2),u=h[0],d=h[1],p=void 0;if(d.hasOwnProperty("html"))p=Qr.calculateObjectValue(n,d.html);else{if(p='<button class="'.concat(this.constants.buttonsClass,'" type="button" name="').concat(u,'"'),d.hasOwnProperty("attributes"))for(var f=0,g=Object.entries(d.attributes);f<g.length;f++){var v=$r(g[f],2),b=v[0],y=v[1];p+=" ".concat(b,'="').concat(Qr.calculateObjectValue(n,y),'"')}if(p+=">",n.showButtonIcons&&d.hasOwnProperty("icon")){var m=Qr.calculateObjectValue(n,d.icon);p+=Qr.sprintf(this.constants.html.icon,n.iconsPrefix,m)+" "}n.showButtonText&&d.hasOwnProperty("text")&&(p+=Qr.calculateObjectValue(n,d.text)),p+="</button>"}s[u]=p;var w="show".concat(u.charAt(0).toUpperCase()).concat(u.substring(1)),S=n[w];!(!d.hasOwnProperty("render")||d.hasOwnProperty("render")&&d.render)||void 0!==S&&!0!==S||(n[w]=!0),n.buttonsOrder.includes(u)||n.buttonsOrder.push(u)}var x=!0,k=!1,O=void 0;try{for(var C,P=n.buttonsOrder[Symbol.iterator]();!(x=(C=P.next()).done);x=!0){var T=C.value;n["show".concat(T.charAt(0).toUpperCase()).concat(T.substring(1))]&&o.push(s[T])}}catch(t){k=!0,O=t}finally{try{x||null==P.return||P.return()}finally{if(k)throw O}}o.push("</div>"),(this.showToolbar||o.length>2)&&this.$toolbar.append(o.join(""));for(var I=0,A=Object.entries(this.buttons);I<A.length;I++){var $=$r(A[I],2),E=$[0],R=$[1];if(R.hasOwnProperty("event")){if("function"==typeof R.event||"string"==typeof R.event)if("continue"===function(){var t="string"==typeof R.event?window[R.event]:R.event;return i.$toolbar.find('button[name="'.concat(E,'"]')).off("click").on("click",(function(){return t.call(i)})),"continue"}())continue;for(var j=function(){var t=$r(_[N],2),e=t[0],n=t[1],o="string"==typeof n?window[n]:n;i.$toolbar.find('button[name="'.concat(E,'"]')).off(e).on(e,(function(){return o.call(i)}))},N=0,_=Object.entries(R.event);N<_.length;N++)j()}}if(n.showColumns){var F=(e=this.$toolbar.find(".keep-open")).find('input[type="checkbox"]:not(".toggle-all")'),V=e.find('input[type="checkbox"].toggle-all');if(a<=n.minimumCountColumns&&e.find("input").prop("disabled",!0),e.find("li, label").off("click").on("click",(function(t){t.stopImmediatePropagation()})),F.off("click").on("click",(function(e){var n=e.currentTarget,o=t(n);i._toggleColumn(o.val(),o.prop("checked"),!1),i.trigger("column-switch",o.data("field"),o.prop("checked")),V.prop("checked",F.filter(":checked").length===i.columns.filter((function(t){return!i.isSelectionColumn(t)})).length)})),V.off("click").on("click",(function(e){var n=e.currentTarget;i._toggleAllColumns(t(n).prop("checked"))})),n.showColumnsSearch){var D=e.find('[name="columnsSearch"]'),B=e.find(".dropdown-item-marker");D.on("keyup paste change",(function(e){var i=e.currentTarget,n=t(i).val().toLowerCase();B.show(),F.each((function(e,i){var o=t(i).parents(".dropdown-item-marker");o.text().toLowerCase().includes(n)||o.hide()}))}))}}var L=function(t){var e="keyup drop blur mouseup";t.off(e).on(e,(function(t){n.searchOnEnterKey&&13!==t.keyCode||[37,38,39,40].includes(t.keyCode)||(clearTimeout(r),r=setTimeout((function(){i.onSearch({currentTarget:t.currentTarget})}),n.searchTimeOut))}))};if((n.search||this.showSearchClearButton)&&"string"!=typeof n.searchSelector){o=[];var H=Qr.sprintf(this.constants.html.searchButton,this.constants.buttonsClass,n.formatSearch(),n.showButtonIcons?Qr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.search):"",n.showButtonText?n.formatSearch():""),M=Qr.sprintf(this.constants.html.searchClearButton,this.constants.buttonsClass,n.formatClearSearch(),n.showButtonIcons?Qr.sprintf(this.constants.html.icon,n.iconsPrefix,n.icons.clearSearch):"",n.showButtonText?n.formatClearSearch():""),U='<input class="'.concat(this.constants.classes.input,"\n        ").concat(Qr.sprintf(" %s%s",this.constants.classes.inputPrefix,n.iconSize),'\n        search-input" type="search" placeholder="').concat(n.formatSearch(),'" autocomplete="off">'),z=U;if(n.showSearchButton||n.showSearchClearButton){var q=(n.showSearchButton?H:"")+(n.showSearchClearButton?M:"");z=n.search?Qr.sprintf(this.constants.html.inputGroup,U,q):q}o.push(Qr.sprintf('\n        <div class="'.concat(this.constants.classes.pull,"-").concat(n.searchAlign," search ").concat(this.constants.classes.inputGroup,'">\n          %s\n        </div>\n      '),z)),this.$toolbar.append(o.join(""));var W=Qr.getSearchInput(this);n.showSearchButton?(this.$toolbar.find(".search button[name=search]").off("click").on("click",(function(t){clearTimeout(r),r=setTimeout((function(){i.onSearch({currentTarget:W})}),n.searchTimeOut)})),n.searchOnEnterKey&&L(W)):L(W),n.showSearchClearButton&&this.$toolbar.find(".search button[name=clearSearch]").click((function(){i.resetSearch()}))}else if("string"==typeof n.searchSelector){L(Qr.getSearchInput(this))}}},{key:"onSearch",value:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},i=e.currentTarget,n=e.firedByInitSearchText,o=!(arguments.length>1&&void 0!==arguments[1])||arguments[1];if(void 0!==i&&t(i).length&&o){var r=t(i).val().trim();if(this.options.trimOnSearch&&t(i).val()!==r&&t(i).val(r),this.searchText===r)return;(i===Qr.getSearchInput(this)[0]||t(i).hasClass("search-input"))&&(this.searchText=r,this.options.searchText=r)}n||(this.options.pageNumber=1),this.initSearch(),n?"client"===this.options.sidePagination&&this.updatePagination():this.updatePagination(),this.trigger("search",this.searchText)}},{key:"initSearch",value:function(){var t=this;if(this.filterOptions=this.filterOptions||this.options.filterOptions,"server"!==this.options.sidePagination){if(this.options.customSearch)return this.data=Qr.calculateObjectValue(this.options,this.options.customSearch,[this.options.data,this.searchText,this.filterColumns]),void(this.options.sortReset&&(this.unsortedData=Er(this.data)));var e=this.searchText&&(this.fromHtml?Qr.escapeHTML(this.searchText):this.searchText).toLowerCase(),i=Qr.isEmptyObject(this.filterColumns)?null:this.filterColumns;"function"==typeof this.filterOptions.filterAlgorithm?this.data=this.options.data.filter((function(e,n){return t.filterOptions.filterAlgorithm.apply(null,[e,i])})):"string"==typeof this.filterOptions.filterAlgorithm&&(this.data=i?this.options.data.filter((function(e,n){var o=t.filterOptions.filterAlgorithm;if("and"===o){for(var r in i)if(Array.isArray(i[r])&&!i[r].includes(e[r])||!Array.isArray(i[r])&&e[r]!==i[r])return!1}else if("or"===o){var a=!1;for(var s in i)(Array.isArray(i[s])&&i[s].includes(e[s])||!Array.isArray(i[s])&&e[s]===i[s])&&(a=!0);return a}return!0})):Er(this.options.data));var n=this.getVisibleFields();this.data=e?this.data.filter((function(i,o){for(var r=0;r<t.header.fields.length;r++)if(t.header.searchables[r]&&(!t.options.visibleSearch||-1!==n.indexOf(t.header.fields[r]))){var a=Qr.isNumeric(t.header.fields[r])?parseInt(t.header.fields[r],10):t.header.fields[r],s=t.columns[t.fieldsColumnsIndex[a]],l=void 0;if("string"==typeof a){l=i;for(var c=a.split("."),h=0;h<c.length;h++)null!==l[c[h]]&&(l=l[c[h]])}else l=i[a];if(t.options.searchAccentNeutralise&&(l=Qr.normalizeAccent(l)),s&&s.searchFormatter&&(l=Qr.calculateObjectValue(s,t.header.formatters[r],[l,i,o,s.field],l)),"string"==typeof l||"number"==typeof l)if(t.options.strictSearch){if("".concat(l).toLowerCase()===e)return!0}else{var u=/(?:(<=|=>|=<|>=|>|<)(?:\s+)?(\d+)?|(\d+)?(\s+)?(<=|=>|=<|>=|>|<))/gm.exec(e),d=!1;if(u){var p=u[1]||"".concat(u[5],"l"),f=u[2]||u[3],g=parseInt(l,10),v=parseInt(f,10);switch(p){case">":case"<l":d=g>v;break;case"<":case">l":d=g<v;break;case"<=":case"=<":case">=l":case"=>l":d=g<=v;break;case">=":case"=>":case"<=l":case"=<l":d=g>=v}}if(d||"".concat(l).toLowerCase().includes(e))return!0}}return!1})):this.data,this.options.sortReset&&(this.unsortedData=Er(this.data)),this.initSort()}}},{key:"initPagination",value:function(){var t=this,e=this.options;if(e.pagination){this.$pagination.show();var i,n,o,r,a,s,l,c=[],h=!1,u=this.getData({includeHiddenRows:!1}),d=e.pageList;if("string"==typeof d&&(d=d.replace(/\[|\]| /g,"").toLowerCase().split(",")),d=d.map((function(t){return"string"==typeof t?t.toLowerCase()===e.formatAllRows().toLowerCase()||["all","unlimited"].includes(t.toLowerCase())?e.formatAllRows():+t:t})),this.paginationParts=e.paginationParts,"string"==typeof this.paginationParts&&(this.paginationParts=this.paginationParts.replace(/\[|\]| |'/g,"").split(",")),"server"!==e.sidePagination&&(e.totalRows=u.length),this.totalPages=0,e.totalRows&&(e.pageSize===e.formatAllRows()&&(e.pageSize=e.totalRows,h=!0),this.totalPages=1+~~((e.totalRows-1)/e.pageSize),e.totalPages=this.totalPages),this.totalPages>0&&e.pageNumber>this.totalPages&&(e.pageNumber=this.totalPages),this.pageFrom=(e.pageNumber-1)*e.pageSize+1,this.pageTo=e.pageNumber*e.pageSize,this.pageTo>e.totalRows&&(this.pageTo=e.totalRows),this.options.pagination&&"server"!==this.options.sidePagination&&(this.options.totalNotFiltered=this.options.data.length),this.options.showExtendedPagination||(this.options.totalNotFiltered=void 0),(this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")||this.paginationParts.includes("pageSize"))&&c.push('<div class="'.concat(this.constants.classes.pull,"-").concat(e.paginationDetailHAlign,' pagination-detail">')),this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")){var p=this.paginationParts.includes("pageInfoShort")?e.formatDetailPagination(e.totalRows):e.formatShowingRows(this.pageFrom,this.pageTo,e.totalRows,e.totalNotFiltered);c.push('<span class="pagination-info">\n      '.concat(p,"\n      </span>"))}if(this.paginationParts.includes("pageSize")){c.push('<span class="page-list">');var f=['<span class="'.concat(this.constants.classes.paginationDropdown,'">\n        <button class="').concat(this.constants.buttonsClass,' dropdown-toggle" type="button" data-toggle="dropdown">\n        <span class="page-size">\n        ').concat(h?e.formatAllRows():e.pageSize,"\n        </span>\n        ").concat(this.constants.html.dropdownCaret,"\n        </button>\n        ").concat(this.constants.html.pageDropdown[0])];d.forEach((function(i,n){var o;(!e.smartDisplay||0===n||d[n-1]<e.totalRows)&&(o=h?i===e.formatAllRows()?t.constants.classes.dropdownActive:"":i===e.pageSize?t.constants.classes.dropdownActive:"",f.push(Qr.sprintf(t.constants.html.pageDropdownItem,o,i)))})),f.push("".concat(this.constants.html.pageDropdown[1],"</span>")),c.push(e.formatRecordsPerPage(f.join("")))}if((this.paginationParts.includes("pageInfo")||this.paginationParts.includes("pageInfoShort")||this.paginationParts.includes("pageSize"))&&c.push("</span></div>"),this.paginationParts.includes("pageList")){c.push('<div class="'.concat(this.constants.classes.pull,"-").concat(e.paginationHAlign,' pagination">'),Qr.sprintf(this.constants.html.pagination[0],Qr.sprintf(" pagination-%s",e.iconSize)),Qr.sprintf(this.constants.html.paginationItem," page-pre",e.formatSRPaginationPreText(),e.paginationPreText)),this.totalPages<e.paginationSuccessivelySize?(n=1,o=this.totalPages):o=(n=e.pageNumber-e.paginationPagesBySide)+2*e.paginationPagesBySide,e.pageNumber<e.paginationSuccessivelySize-1&&(o=e.paginationSuccessivelySize),e.paginationSuccessivelySize>this.totalPages-n&&(n=n-(e.paginationSuccessivelySize-(this.totalPages-n))+1),n<1&&(n=1),o>this.totalPages&&(o=this.totalPages);var g=Math.round(e.paginationPagesBySide/2),v=function(i){var n=arguments.length>1&&void 0!==arguments[1]?arguments[1]:"";return Qr.sprintf(t.constants.html.paginationItem,n+(i===e.pageNumber?" ".concat(t.constants.classes.paginationActive):""),e.formatSRPaginationPageText(i),i)};if(n>1){var b=e.paginationPagesBySide;for(b>=n&&(b=n-1),i=1;i<=b;i++)c.push(v(i));n-1===b+1?(i=n-1,c.push(v(i))):n-1>b&&(n-2*e.paginationPagesBySide>e.paginationPagesBySide&&e.paginationUseIntermediate?(i=Math.round((n-g)/2+g),c.push(v(i," page-intermediate"))):c.push(Qr.sprintf(this.constants.html.paginationItem," page-first-separator disabled","","...")))}for(i=n;i<=o;i++)c.push(v(i));if(this.totalPages>o){var y=this.totalPages-(e.paginationPagesBySide-1);for(o>=y&&(y=o+1),o+1===y-1?(i=o+1,c.push(v(i))):y>o+1&&(this.totalPages-o>2*e.paginationPagesBySide&&e.paginationUseIntermediate?(i=Math.round((this.totalPages-g-o)/2+o),c.push(v(i," page-intermediate"))):c.push(Qr.sprintf(this.constants.html.paginationItem," page-last-separator disabled","","..."))),i=y;i<=this.totalPages;i++)c.push(v(i))}c.push(Qr.sprintf(this.constants.html.paginationItem," page-next",e.formatSRPaginationNextText(),e.paginationNextText)),c.push(this.constants.html.pagination[1],"</div>")}this.$pagination.html(c.join(""));var m=["bottom","both"].includes(e.paginationVAlign)?" ".concat(this.constants.classes.dropup):"";this.$pagination.last().find(".page-list > span").addClass(m),e.onlyInfoPagination||(r=this.$pagination.find(".page-list a"),a=this.$pagination.find(".page-pre"),s=this.$pagination.find(".page-next"),l=this.$pagination.find(".page-item").not(".page-next, .page-pre, .page-last-separator, .page-first-separator"),this.totalPages<=1&&this.$pagination.find("div.pagination").hide(),e.smartDisplay&&(d.length<2||e.totalRows<=d[0])&&this.$pagination.find("span.page-list").hide(),this.$pagination[this.getData().length?"show":"hide"](),e.paginationLoop||(1===e.pageNumber&&a.addClass("disabled"),e.pageNumber===this.totalPages&&s.addClass("disabled")),h&&(e.pageSize=e.formatAllRows()),r.off("click").on("click",(function(e){return t.onPageListChange(e)})),a.off("click").on("click",(function(e){return t.onPagePre(e)})),s.off("click").on("click",(function(e){return t.onPageNext(e)})),l.off("click").on("click",(function(e){return t.onPageNumber(e)})))}else this.$pagination.hide()}},{key:"updatePagination",value:function(e){e&&t(e.currentTarget).hasClass("disabled")||(this.options.maintainMetaData||this.resetRows(),this.initPagination(),this.trigger("page-change",this.options.pageNumber,this.options.pageSize),"server"===this.options.sidePagination?this.initServer():this.initBody())}},{key:"onPageListChange",value:function(e){e.preventDefault();var i=t(e.currentTarget);return i.parent().addClass(this.constants.classes.dropdownActive).siblings().removeClass(this.constants.classes.dropdownActive),this.options.pageSize=i.text().toUpperCase()===this.options.formatAllRows().toUpperCase()?this.options.formatAllRows():+i.text(),this.$toolbar.find(".page-size").text(this.options.pageSize),this.updatePagination(e),!1}},{key:"onPagePre",value:function(t){return t.preventDefault(),this.options.pageNumber-1==0?this.options.pageNumber=this.options.totalPages:this.options.pageNumber--,this.updatePagination(t),!1}},{key:"onPageNext",value:function(t){return t.preventDefault(),this.options.pageNumber+1>this.options.totalPages?this.options.pageNumber=1:this.options.pageNumber++,this.updatePagination(t),!1}},{key:"onPageNumber",value:function(e){if(e.preventDefault(),this.options.pageNumber!==+t(e.currentTarget).text())return this.options.pageNumber=+t(e.currentTarget).text(),this.updatePagination(e),!1}},{key:"initRow",value:function(t,e,i,n){var o=this,r=[],a={},s=[],l="",c={},h=[];if(!(Qr.findIndex(this.hiddenRows,t)>-1)){if((a=Qr.calculateObjectValue(this.options,this.options.rowStyle,[t,e],a))&&a.css)for(var u=0,d=Object.entries(a.css);u<d.length;u++){var p=$r(d[u],2),f=p[0],g=p[1];s.push("".concat(f,": ").concat(g))}if(c=Qr.calculateObjectValue(this.options,this.options.rowAttributes,[t,e],c))for(var v=0,b=Object.entries(c);v<b.length;v++){var y=$r(b[v],2),m=y[0],w=y[1];h.push("".concat(m,'="').concat(Qr.escapeHTML(w),'"'))}if(t._data&&!Qr.isEmptyObject(t._data))for(var S=0,x=Object.entries(t._data);S<x.length;S++){var k=$r(x[S],2),O=k[0],C=k[1];if("index"===O)return;l+=" data-".concat(O,"='").concat("object"===Pr(C)?JSON.stringify(C):C,"'")}r.push("<tr",Qr.sprintf(" %s",h.length?h.join(" "):void 0),Qr.sprintf(' id="%s"',Array.isArray(t)?void 0:t._id),Qr.sprintf(' class="%s"',a.classes||(Array.isArray(t)?void 0:t._class)),Qr.sprintf(' style="%s"',Array.isArray(t)?void 0:t._style),' data-index="'.concat(e,'"'),Qr.sprintf(' data-uniqueid="%s"',Qr.getItemField(t,this.options.uniqueId,!1)),Qr.sprintf(' data-has-detail-view="%s"',this.options.detailView&&Qr.calculateObjectValue(null,this.options.detailFilter,[e,t])?"true":void 0),Qr.sprintf("%s",l),">"),this.options.cardView&&r.push('<td colspan="'.concat(this.header.fields.length,'"><div class="card-views">'));var P="";return Qr.hasDetailViewIcon(this.options)&&(P="<td>",Qr.calculateObjectValue(null,this.options.detailFilter,[e,t])&&(P+='\n          <a class="detail-icon" href="#">\n          '.concat(Qr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailOpen),"\n          </a>\n        ")),P+="</td>"),P&&"right"!==this.options.detailViewAlign&&r.push(P),this.header.fields.forEach((function(i,n){var a="",l=Qr.getItemField(t,i,o.options.escape),c="",h="",u={},d="",p=o.header.classes[n],f="",g="",v="",b="",y="",m="",w=o.columns[n];if((!o.fromHtml&&!o.autoMergeCells||void 0!==l||w.checkbox||w.radio)&&w.visible&&(!o.options.cardView||w.cardVisible)){if(w.escape&&(l=Qr.escapeHTML(l)),s.concat([o.header.styles[n]]).length&&(g+="".concat(s.concat([o.header.styles[n]]).join("; "))),t["_".concat(i,"_style")]&&(g+="".concat(t["_".concat(i,"_style")])),g&&(f=' style="'.concat(g,'"')),t["_".concat(i,"_id")]&&(d=Qr.sprintf(' id="%s"',t["_".concat(i,"_id")])),t["_".concat(i,"_class")]&&(p=Qr.sprintf(' class="%s"',t["_".concat(i,"_class")])),t["_".concat(i,"_rowspan")]&&(b=Qr.sprintf(' rowspan="%s"',t["_".concat(i,"_rowspan")])),t["_".concat(i,"_colspan")]&&(y=Qr.sprintf(' colspan="%s"',t["_".concat(i,"_colspan")])),t["_".concat(i,"_title")]&&(m=Qr.sprintf(' title="%s"',t["_".concat(i,"_title")])),(u=Qr.calculateObjectValue(o.header,o.header.cellStyles[n],[l,t,e,i],u)).classes&&(p=' class="'.concat(u.classes,'"')),u.css){for(var S=[],x=0,k=Object.entries(u.css);x<k.length;x++){var O=$r(k[x],2),C=O[0],P=O[1];S.push("".concat(C,": ").concat(P))}f=' style="'.concat(S.concat(o.header.styles[n]).join("; "),'"')}if(c=Qr.calculateObjectValue(w,o.header.formatters[n],[l,t,e,i],l),""!==o.searchText&&o.options.searchHighlight&&(c=Qr.calculateObjectValue(w,w.searchHighlightFormatter,[c,o.searchText],c.replace(new RegExp("("+o.searchText+")","gim"),"<mark>$1</mark>"))),t["_".concat(i,"_data")]&&!Qr.isEmptyObject(t["_".concat(i,"_data")]))for(var T=0,I=Object.entries(t["_".concat(i,"_data")]);T<I.length;T++){var A=$r(I[T],2),$=A[0],E=A[1];if("index"===$)return;v+=" data-".concat($,'="').concat(E,'"')}if(w.checkbox||w.radio){h=w.checkbox?"checkbox":h,h=w.radio?"radio":h;var R=w.class||"",j=Qr.isObject(c)&&c.hasOwnProperty("checked")?c.checked:(!0===c||l)&&!1!==c,N=!w.checkboxEnabled||c&&c.disabled;a=[o.options.cardView?'<div class="card-view '.concat(R,'">'):'<td class="bs-checkbox '.concat(R,'"').concat(p).concat(f,">"),'<label>\n            <input\n            data-index="'.concat(e,'"\n            name="').concat(o.options.selectItemName,'"\n            type="').concat(h,'"\n            ').concat(Qr.sprintf('value="%s"',t[o.options.idField]),"\n            ").concat(Qr.sprintf('checked="%s"',j?"checked":void 0),"\n            ").concat(Qr.sprintf('disabled="%s"',N?"disabled":void 0)," />\n            <span></span>\n            </label>"),o.header.formatters[n]&&"string"==typeof c?c:"",o.options.cardView?"</div>":"</td>"].join(""),t[o.header.stateField]=!0===c||!!l||c&&c.checked}else if(c=null==c?o.options.undefinedText:c,o.options.cardView){var _=o.options.showHeader?'<span class="card-view-title"'.concat(f,">").concat(Qr.getFieldTitle(o.columns,i),"</span>"):"";a='<div class="card-view">'.concat(_,'<span class="card-view-value">').concat(c,"</span></div>"),o.options.smartDisplay&&""===c&&(a='<div class="card-view"></div>')}else a="<td".concat(d).concat(p).concat(f).concat(v).concat(b).concat(y).concat(m,">").concat(c,"</td>");r.push(a)}})),P&&"right"===this.options.detailViewAlign&&r.push(P),this.options.cardView&&r.push("</div></td>"),r.push("</tr>"),r.join("")}}},{key:"initBody",value:function(e){var i=this,n=this.getData();this.trigger("pre-body",n),this.$body=this.$el.find(">tbody"),this.$body.length||(this.$body=t("<tbody></tbody>").appendTo(this.$el)),this.options.pagination&&"server"!==this.options.sidePagination||(this.pageFrom=1,this.pageTo=n.length);var o=[],r=t(document.createDocumentFragment()),a=!1;this.autoMergeCells=Qr.checkAutoMergeCells(n.slice(this.pageFrom-1,this.pageTo));for(var s=this.pageFrom-1;s<this.pageTo;s++){var l=n[s],c=this.initRow(l,s,n,r);a=a||!!c,c&&"string"==typeof c&&(this.options.virtualScroll?o.push(c):r.append(c))}a?this.options.virtualScroll?(this.virtualScroll&&this.virtualScroll.destroy(),this.virtualScroll=new Zr({rows:o,fixedScroll:e,scrollEl:this.$tableBody[0],contentEl:this.$body[0],itemHeight:this.options.virtualScrollItemHeight,callback:function(){i.fitHeader(),i.initBodyEvent()}})):this.$body.html(r):this.$body.html('<tr class="no-records-found">'.concat(Qr.sprintf('<td colspan="%s">%s</td>',this.getVisibleFields().length+Qr.getDetailViewIndexOffset(this.options),this.options.formatNoMatches()),"</tr>")),e||this.scrollTo(0),this.initBodyEvent(),this.updateSelected(),this.initFooter(),this.resetView(),"server"!==this.options.sidePagination&&(this.options.totalRows=n.length),this.trigger("post-body",n)}},{key:"initBodyEvent",value:function(){var e=this;this.$body.find("> tr[data-index] > td").off("click dblclick").on("click dblclick",(function(i){var n=t(i.currentTarget),o=n.parent(),r=t(i.target).parents(".card-views").children(),a=t(i.target).parents(".card-view"),s=o.data("index"),l=e.data[s],c=e.options.cardView?r.index(a):n[0].cellIndex,h=e.getVisibleFields()[c-Qr.getDetailViewIndexOffset(e.options)],u=e.columns[e.fieldsColumnsIndex[h]],d=Qr.getItemField(l,h,e.options.escape);if(!n.find(".detail-icon").length){if(e.trigger("click"===i.type?"click-cell":"dbl-click-cell",h,d,l,n),e.trigger("click"===i.type?"click-row":"dbl-click-row",l,o,h),"click"===i.type&&e.options.clickToSelect&&u.clickToSelect&&!Qr.calculateObjectValue(e.options,e.options.ignoreClickToSelectOn,[i.target])){var p=o.find(Qr.sprintf('[name="%s"]',e.options.selectItemName));p.length&&p[0].click()}"click"===i.type&&e.options.detailViewByClick&&e.toggleDetailView(s,e.header.detailFormatters[e.fieldsColumnsIndex[h]])}})).off("mousedown").on("mousedown",(function(t){e.multipleSelectRowCtrlKey=t.ctrlKey||t.metaKey,e.multipleSelectRowShiftKey=t.shiftKey})),this.$body.find("> tr[data-index] > td > .detail-icon").off("click").on("click",(function(i){return i.preventDefault(),e.toggleDetailView(t(i.currentTarget).parent().parent().data("index")),!1})),this.$selectItem=this.$body.find(Qr.sprintf('[name="%s"]',this.options.selectItemName)),this.$selectItem.off("click").on("click",(function(i){i.stopImmediatePropagation();var n=t(i.currentTarget);e._toggleCheck(n.prop("checked"),n.data("index"))})),this.header.events.forEach((function(i,n){var o=i;if(o){"string"==typeof o&&(o=Qr.calculateObjectValue(null,o));var r=e.header.fields[n],a=e.getVisibleFields().indexOf(r);if(-1!==a){a+=Qr.getDetailViewIndexOffset(e.options);var s=function(i){if(!o.hasOwnProperty(i))return"continue";var n=o[i];e.$body.find(">tr:not(.no-records-found)").each((function(o,s){var l=t(s),c=l.find(e.options.cardView?".card-views>.card-view":">td").eq(a),h=i.indexOf(" "),u=i.substring(0,h),d=i.substring(h+1);c.find(d).off(u).on(u,(function(t){var i=l.data("index"),o=e.data[i],a=o[r];n.apply(e,[t,a,o,i])}))}))};for(var l in o)s(l)}}}))}},{key:"initServer",value:function(e,i,n){var o=this,r={},a=this.header.fields.indexOf(this.options.sortName),s={searchText:this.searchText,sortName:this.options.sortName,sortOrder:this.options.sortOrder};if(this.header.sortNames[a]&&(s.sortName=this.header.sortNames[a]),this.options.pagination&&"server"===this.options.sidePagination&&(s.pageSize=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,s.pageNumber=this.options.pageNumber),n||this.options.url||this.options.ajax){if("limit"===this.options.queryParamsType&&(s={search:s.searchText,sort:s.sortName,order:s.sortOrder},this.options.pagination&&"server"===this.options.sidePagination&&(s.offset=this.options.pageSize===this.options.formatAllRows()?0:this.options.pageSize*(this.options.pageNumber-1),s.limit=this.options.pageSize===this.options.formatAllRows()?this.options.totalRows:this.options.pageSize,0===s.limit&&delete s.limit)),this.options.search&&"server"===this.options.sidePagination&&this.columns.filter((function(t){return!t.searchable})).length){s.searchable=[];var l=!0,c=!1,h=void 0;try{for(var u,d=this.columns[Symbol.iterator]();!(l=(u=d.next()).done);l=!0){var p=u.value;!p.checkbox&&p.searchable&&(this.options.visibleSearch&&p.visible||!this.options.visibleSearch)&&s.searchable.push(p.field)}}catch(t){c=!0,h=t}finally{try{l||null==d.return||d.return()}finally{if(c)throw h}}}if(Qr.isEmptyObject(this.filterColumnsPartial)||(s.filter=JSON.stringify(this.filterColumnsPartial,null)),t.extend(s,i||{}),!1!==(r=Qr.calculateObjectValue(this.options,this.options.queryParams,[s],r))){e||this.showLoading();var f=t.extend({},Qr.calculateObjectValue(null,this.options.ajaxOptions),{type:this.options.method,url:n||this.options.url,data:"application/json"===this.options.contentType&&"post"===this.options.method?JSON.stringify(r):r,cache:this.options.cache,contentType:this.options.contentType,dataType:this.options.dataType,success:function(t,i,n){var r=Qr.calculateObjectValue(o.options,o.options.responseHandler,[t,n],t);o.load(r),o.trigger("load-success",r,n&&n.status,n),e||o.hideLoading(),"server"===o.options.sidePagination&&r[o.options.totalField]>0&&!r[o.options.dataField].length&&o.updatePagination()},error:function(t){var i=[];"server"===o.options.sidePagination&&((i={})[o.options.totalField]=0,i[o.options.dataField]=[]),o.load(i),o.trigger("load-error",t&&t.status,t),e||o.$tableLoading.hide()}});return this.options.ajax?Qr.calculateObjectValue(this,this.options.ajax,[f],null):(this._xhr&&4!==this._xhr.readyState&&this._xhr.abort(),this._xhr=t.ajax(f)),r}}}},{key:"initSearchText",value:function(){if(this.options.search&&(this.searchText="",""!==this.options.searchText)){var t=Qr.getSearchInput(this);t.val(this.options.searchText),this.onSearch({currentTarget:t,firedByInitSearchText:!0})}}},{key:"getCaret",value:function(){var e=this;this.$header.find("th").each((function(i,n){t(n).find(".sortable").removeClass("desc asc").addClass(t(n).data("field")===e.options.sortName?e.options.sortOrder:"both")}))}},{key:"updateSelected",value:function(){var e=this.$selectItem.filter(":enabled").length&&this.$selectItem.filter(":enabled").length===this.$selectItem.filter(":enabled").filter(":checked").length;this.$selectAll.add(this.$selectAll_).prop("checked",e),this.$selectItem.each((function(e,i){t(i).closest("tr")[t(i).prop("checked")?"addClass":"removeClass"]("selected")}))}},{key:"updateRows",value:function(){var e=this;this.$selectItem.each((function(i,n){e.data[t(n).data("index")][e.header.stateField]=t(n).prop("checked")}))}},{key:"resetRows",value:function(){var t=!0,e=!1,i=void 0;try{for(var n,o=this.data[Symbol.iterator]();!(t=(n=o.next()).done);t=!0){var r=n.value;this.$selectAll.prop("checked",!1),this.$selectItem.prop("checked",!1),this.header.stateField&&(r[this.header.stateField]=!1)}}catch(t){e=!0,i=t}finally{try{t||null==o.return||o.return()}finally{if(e)throw i}}this.initHiddenRows()}},{key:"trigger",value:function(i){for(var n,o,r="".concat(i,".bs.table"),a=arguments.length,s=new Array(a>1?a-1:0),l=1;l<a;l++)s[l-1]=arguments[l];(n=this.options)[e.EVENTS[r]].apply(n,[].concat(s,[this])),this.$el.trigger(t.Event(r,{sender:this}),s),(o=this.options).onAll.apply(o,[r].concat([].concat(s,[this]))),this.$el.trigger(t.Event("all.bs.table",{sender:this}),[r,s])}},{key:"resetHeader",value:function(){var t=this;clearTimeout(this.timeoutId_),this.timeoutId_=setTimeout((function(){return t.fitHeader()}),this.$el.is(":hidden")?100:0)}},{key:"fitHeader",value:function(){var e=this;if(this.$el.is(":hidden"))this.timeoutId_=setTimeout((function(){return e.fitHeader()}),100);else{var i=this.$tableBody.get(0),n=i.scrollWidth>i.clientWidth&&i.scrollHeight>i.clientHeight+this.$header.outerHeight()?Qr.getScrollBarWidth():0;this.$el.css("margin-top",-this.$header.outerHeight());var o=t(":focus");if(o.length>0){var r=o.parents("th");if(r.length>0){var a=r.attr("data-field");if(void 0!==a){var s=this.$header.find("[data-field='".concat(a,"']"));s.length>0&&s.find(":input").addClass("focus-temp")}}}this.$header_=this.$header.clone(!0,!0),this.$selectAll_=this.$header_.find('[name="btSelectAll"]'),this.$tableHeader.css("margin-right",n).find("table").css("width",this.$el.outerWidth()).html("").attr("class",this.$el.attr("class")).append(this.$header_),this.$tableLoading.css("width",this.$el.outerWidth());var l=t(".focus-temp:visible:eq(0)");l.length>0&&(l.focus(),this.$header.find(".focus-temp").removeClass("focus-temp")),this.$header.find("th[data-field]").each((function(i,n){e.$header_.find(Qr.sprintf('th[data-field="%s"]',t(n).data("field"))).data(t(n).data())}));for(var c=this.getVisibleFields(),h=this.$header_.find("th"),u=this.$body.find(">tr:not(.no-records-found,.virtual-scroll-top)").eq(0);u.length&&u.find('>td[colspan]:not([colspan="1"])').length;)u=u.next();var d=u.find("> *").length;u.find("> *").each((function(i,n){var o=t(n);if(Qr.hasDetailViewIcon(e.options)&&(0===i&&"right"!==e.options.detailViewAlign||i===d-1&&"right"===e.options.detailViewAlign)){var r=h.filter(".detail"),a=r.innerWidth()-r.find(".fht-cell").width();r.find(".fht-cell").width(o.innerWidth()-a)}else{var s=i-Qr.getDetailViewIndexOffset(e.options),l=e.$header_.find(Qr.sprintf('th[data-field="%s"]',c[s]));l.length>1&&(l=t(h[o[0].cellIndex]));var u=l.innerWidth()-l.find(".fht-cell").width();l.find(".fht-cell").width(o.innerWidth()-u)}})),this.horizontalScroll(),this.trigger("post-header")}}},{key:"initFooter",value:function(){if(this.options.showFooter&&!this.options.cardView){var t=this.getData(),e=[],i="";Qr.hasDetailViewIcon(this.options)&&(i='<th class="detail"><div class="th-inner"></div><div class="fht-cell"></div></th>'),i&&"right"!==this.options.detailViewAlign&&e.push(i);var n=!0,o=!1,r=void 0;try{for(var a,s=this.columns[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l,c,h=a.value,u=[],d={},p=Qr.sprintf(' class="%s"',h.class);if(!(!h.visible||this.footerData&&this.footerData.length>0&&!(h.field in this.footerData[0]))){if(this.options.cardView&&!h.cardVisible)return;if(l=Qr.sprintf("text-align: %s; ",h.falign?h.falign:h.align),c=Qr.sprintf("vertical-align: %s; ",h.valign),(d=Qr.calculateObjectValue(null,this.options.footerStyle,[h]))&&d.css)for(var f=0,g=Object.entries(d.css);f<g.length;f++){var v=$r(g[f],2),b=v[0],y=v[1];u.push("".concat(b,": ").concat(y))}d&&d.classes&&(p=Qr.sprintf(' class="%s"',h.class?[h.class,d.classes].join(" "):d.classes)),e.push("<th",p,Qr.sprintf(' style="%s"',l+c+u.concat().join("; ")));var m=0;this.footerData&&this.footerData.length>0&&(m=this.footerData[0]["_"+h.field+"_colspan"]||0),m&&e.push(' colspan="'.concat(m,'" ')),e.push(">"),e.push('<div class="th-inner">');var w="";this.footerData&&this.footerData.length>0&&(w=this.footerData[0][h.field]||""),e.push(Qr.calculateObjectValue(h,h.footerFormatter,[t,w],w)),e.push("</div>"),e.push('<div class="fht-cell"></div>'),e.push("</div>"),e.push("</th>")}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}i&&"right"===this.options.detailViewAlign&&e.push(i),this.options.height||this.$tableFooter.length||(this.$el.append("<tfoot><tr></tr></tfoot>"),this.$tableFooter=this.$el.find("tfoot")),this.$tableFooter.find("tr").html(e.join("")),this.trigger("post-footer",this.$tableFooter)}}},{key:"fitFooter",value:function(){var e=this;if(this.$el.is(":hidden"))setTimeout((function(){return e.fitFooter()}),100);else{var i=this.$tableBody.get(0),n=i.scrollWidth>i.clientWidth&&i.scrollHeight>i.clientHeight+this.$header.outerHeight()?Qr.getScrollBarWidth():0;this.$tableFooter.css("margin-right",n).find("table").css("width",this.$el.outerWidth()).attr("class",this.$el.attr("class"));this.getVisibleFields();var o=this.$tableFooter.find("th"),r=this.$body.find(">tr:first-child:not(.no-records-found)");for(o.find(".fht-cell").width("auto");r.length&&r.find('>td[colspan]:not([colspan="1"])').length;)r=r.next();var a=r.find("> *").length;r.find("> *").each((function(i,n){var r=t(n);if(Qr.hasDetailViewIcon(e.options)&&(0===i&&"left"===e.options.detailViewAlign||i===a-1&&"right"===e.options.detailViewAlign)){var s=o.filter(".detail"),l=s.innerWidth()-s.find(".fht-cell").width();s.find(".fht-cell").width(r.innerWidth()-l)}else{var c=o.eq(i),h=c.innerWidth()-c.find(".fht-cell").width();c.find(".fht-cell").width(r.innerWidth()-h)}})),this.horizontalScroll()}}},{key:"horizontalScroll",value:function(){var t=this;this.$tableBody.off("scroll").on("scroll",(function(){var e=t.$tableBody.scrollLeft();t.options.showHeader&&t.options.height&&t.$tableHeader.scrollLeft(e),t.options.showFooter&&!t.options.cardView&&t.$tableFooter.scrollLeft(e),t.trigger("scroll-body",t.$tableBody)}))}},{key:"getVisibleFields",value:function(){var t=[],e=!0,i=!1,n=void 0;try{for(var o,r=this.header.fields[Symbol.iterator]();!(e=(o=r.next()).done);e=!0){var a=o.value,s=this.columns[this.fieldsColumnsIndex[a]];s&&s.visible&&t.push(a)}}catch(t){i=!0,n=t}finally{try{e||null==r.return||r.return()}finally{if(i)throw n}}return t}},{key:"initHiddenRows",value:function(){this.hiddenRows=[]}},{key:"getOptions",value:function(){var e=t.extend({},this.options);return delete e.data,t.extend(!0,{},e)}},{key:"refreshOptions",value:function(e){Qr.compareObjects(this.options,e,!0)||(this.options=t.extend(this.options,e),this.trigger("refresh-options",this.options),this.destroy(),this.init())}},{key:"getData",value:function(t){var e=this,i=this.options.data;if(!this.searchText&&!this.options.customSearch&&void 0===this.options.sortName&&Qr.isEmptyObject(this.filterColumns)&&Qr.isEmptyObject(this.filterColumnsPartial)||t&&t.unfiltered||(i=this.data),t&&t.useCurrentPage&&(i=i.slice(this.pageFrom-1,this.pageTo)),t&&!t.includeHiddenRows){var n=this.getHiddenRows();i=i.filter((function(t){return-1===Qr.findIndex(n,t)}))}return t&&t.formatted&&i.forEach((function(t){for(var i=0,n=Object.entries(t);i<n.length;i++){var o=$r(n[i],2),r=o[0],a=o[1],s=e.columns[e.fieldsColumnsIndex[r]];if(!s)return;t[r]=Qr.calculateObjectValue(s,e.header.formatters[s.fieldIndex],[a,t,t.index,s.field],a)}})),i}},{key:"getSelections",value:function(){var t=this;return this.options.data.filter((function(e){return!0===e[t.header.stateField]}))}},{key:"load",value:function(t){var e,i=t;this.options.pagination&&"server"===this.options.sidePagination&&(this.options.totalRows=i[this.options.totalField],this.options.totalNotFiltered=i[this.options.totalNotFilteredField],this.footerData=i[this.options.footerField]?[i[this.options.footerField]]:void 0),e=i.fixedScroll,i=Array.isArray(i)?i:i[this.options.dataField],this.initData(i),this.initSearch(),this.initPagination(),this.initBody(e)}},{key:"append",value:function(t){this.initData(t,"append"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"prepend",value:function(t){this.initData(t,"prepend"),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"remove",value:function(t){var e,i,n=this.options.data.length;if(t.hasOwnProperty("field")&&t.hasOwnProperty("values")){for(e=n-1;e>=0;e--){((i=this.options.data[e]).hasOwnProperty(t.field)||"$index"===t.field)&&((i.hasOwnProperty(t.field)||"$index"!==t.field?t.values.includes(i[t.field]):t.values.includes(e))&&(this.options.data.splice(e,1),"server"===this.options.sidePagination&&(this.options.totalRows-=1)))}n!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}}},{key:"removeAll",value:function(){this.options.data.length>0&&(this.options.data.splice(0,this.options.data.length),this.initSearch(),this.initPagination(),this.initBody(!0))}},{key:"insertRow",value:function(t){t.hasOwnProperty("index")&&t.hasOwnProperty("row")&&(this.options.data.splice(t.index,0,t.row),this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0))}},{key:"updateRow",value:function(e){var i=Array.isArray(e)?e:[e],n=!0,o=!1,r=void 0;try{for(var a,s=i[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;l.hasOwnProperty("index")&&l.hasOwnProperty("row")&&(l.hasOwnProperty("replace")&&l.replace?this.options.data[l.index]=l.row:t.extend(this.options.data[l.index],l.row))}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"getRowByUniqueId",value:function(t){var e,i,n,o=this.options.uniqueId,r=t,a=null;for(e=this.options.data.length-1;e>=0;e--){if((i=this.options.data[e]).hasOwnProperty(o))n=i[o];else{if(!i._data||!i._data.hasOwnProperty(o))continue;n=i._data[o]}if("string"==typeof n?r=r.toString():"number"==typeof n&&(Number(n)===n&&n%1==0?r=parseInt(r):n===Number(n)&&0!==n&&(r=parseFloat(r))),n===r){a=i;break}}return a}},{key:"updateByUniqueId",value:function(e){var i=Array.isArray(e)?e:[e],n=!0,o=!1,r=void 0;try{for(var a,s=i[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;if(l.hasOwnProperty("id")&&l.hasOwnProperty("row")){var c=this.options.data.indexOf(this.getRowByUniqueId(l.id));-1!==c&&(l.hasOwnProperty("replace")&&l.replace?this.options.data[c]=l.row:t.extend(this.options.data[c],l.row))}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}this.initSearch(),this.initPagination(),this.initSort(),this.initBody(!0)}},{key:"removeByUniqueId",value:function(t){var e=this.options.data.length,i=this.getRowByUniqueId(t);i&&this.options.data.splice(this.options.data.indexOf(i),1),e!==this.options.data.length&&(this.initSearch(),this.initPagination(),this.initBody(!0))}},{key:"updateCell",value:function(t){t.hasOwnProperty("index")&&t.hasOwnProperty("field")&&t.hasOwnProperty("value")&&(this.data[t.index][t.field]=t.value,!1!==t.reinit&&(this.initSort(),this.initBody(!0)))}},{key:"updateCellByUniqueId",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){var i=t.id,n=t.field,o=t.value,r=e.options.data.indexOf(e.getRowByUniqueId(i));-1!==r&&(e.options.data[r][n]=o)})),!1!==t.reinit&&(this.initSort(),this.initBody(!0))}},{key:"showRow",value:function(t){this._toggleRow(t,!0)}},{key:"hideRow",value:function(t){this._toggleRow(t,!1)}},{key:"_toggleRow",value:function(t,e){var i;if(t.hasOwnProperty("index")?i=this.getData()[t.index]:t.hasOwnProperty("uniqueId")&&(i=this.getRowByUniqueId(t.uniqueId)),i){var n=Qr.findIndex(this.hiddenRows,i);e||-1!==n?e&&n>-1&&this.hiddenRows.splice(n,1):this.hiddenRows.push(i),this.initBody(!0),this.initPagination()}}},{key:"getHiddenRows",value:function(t){if(t)return this.initHiddenRows(),this.initBody(!0),void this.initPagination();var e=this.getData(),i=[],n=!0,o=!1,r=void 0;try{for(var a,s=e[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;this.hiddenRows.includes(l)&&i.push(l)}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}return this.hiddenRows=i,i}},{key:"showColumn",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){e._toggleColumn(e.fieldsColumnsIndex[t],!0,!0)}))}},{key:"hideColumn",value:function(t){var e=this;(Array.isArray(t)?t:[t]).forEach((function(t){e._toggleColumn(e.fieldsColumnsIndex[t],!1,!0)}))}},{key:"_toggleColumn",value:function(t,e,i){if(-1!==t&&this.columns[t].visible!==e&&(this.columns[t].visible=e,this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns)){var n=this.$toolbar.find('.keep-open input:not(".toggle-all")').prop("disabled",!1);i&&n.filter(Qr.sprintf('[value="%s"]',t)).prop("checked",e),n.filter(":checked").length<=this.options.minimumCountColumns&&n.filter(":checked").prop("disabled",!0)}}},{key:"getVisibleColumns",value:function(){var t=this;return this.columns.filter((function(e){return e.visible&&!t.isSelectionColumn(e)}))}},{key:"getHiddenColumns",value:function(){return this.columns.filter((function(t){return!t.visible}))}},{key:"isSelectionColumn",value:function(t){return t.radio||t.checkbox}},{key:"showAllColumns",value:function(){this._toggleAllColumns(!0)}},{key:"hideAllColumns",value:function(){this._toggleAllColumns(!1)}},{key:"_toggleAllColumns",value:function(e){var i=this,n=!0,o=!1,r=void 0;try{for(var a,s=this.columns.slice().reverse()[Symbol.iterator]();!(n=(a=s.next()).done);n=!0){var l=a.value;if(l.switchable){if(!e&&this.options.showColumns&&this.getVisibleColumns().length===this.options.minimumCountColumns)continue;l.visible=e}}}catch(t){o=!0,r=t}finally{try{n||null==s.return||s.return()}finally{if(o)throw r}}if(this.initHeader(),this.initSearch(),this.initPagination(),this.initBody(),this.options.showColumns){var c=this.$toolbar.find('.keep-open input[type="checkbox"]:not(".toggle-all")').prop("disabled",!1);e?c.prop("checked",e):c.get().reverse().forEach((function(n){c.filter(":checked").length>i.options.minimumCountColumns&&t(n).prop("checked",e)})),c.filter(":checked").length<=this.options.minimumCountColumns&&c.filter(":checked").prop("disabled",!0)}}},{key:"mergeCells",value:function(t){var e,i,n=t.index,o=this.getVisibleFields().indexOf(t.field),r=t.rowspan||1,a=t.colspan||1,s=this.$body.find(">tr");o+=Qr.getDetailViewIndexOffset(this.options);var l=s.eq(n).find(">td").eq(o);if(!(n<0||o<0||n>=this.data.length)){for(e=n;e<n+r;e++)for(i=o;i<o+a;i++)s.eq(e).find(">td").eq(i).hide();l.attr("rowspan",r).attr("colspan",a).show()}}},{key:"checkAll",value:function(){this._toggleCheckAll(!0)}},{key:"uncheckAll",value:function(){this._toggleCheckAll(!1)}},{key:"_toggleCheckAll",value:function(t){var e=this.getSelections();this.$selectAll.add(this.$selectAll_).prop("checked",t),this.$selectItem.filter(":enabled").prop("checked",t),this.updateRows(),this.updateSelected();var i=this.getSelections();t?this.trigger("check-all",i,e):this.trigger("uncheck-all",i,e)}},{key:"checkInvert",value:function(){var e=this.$selectItem.filter(":enabled"),i=e.filter(":checked");e.each((function(e,i){t(i).prop("checked",!t(i).prop("checked"))})),this.updateRows(),this.updateSelected(),this.trigger("uncheck-some",i),i=this.getSelections(),this.trigger("check-some",i)}},{key:"check",value:function(t){this._toggleCheck(!0,t)}},{key:"uncheck",value:function(t){this._toggleCheck(!1,t)}},{key:"_toggleCheck",value:function(t,e){var i=this.$selectItem.filter('[data-index="'.concat(e,'"]')),n=this.options.data[e];if(i.is(":radio")||this.options.singleSelect||this.options.multipleSelectRow&&!this.multipleSelectRowCtrlKey&&!this.multipleSelectRowShiftKey){var o=!0,r=!1,a=void 0;try{for(var s,l=this.options.data[Symbol.iterator]();!(o=(s=l.next()).done);o=!0){s.value[this.header.stateField]=!1}}catch(t){r=!0,a=t}finally{try{o||null==l.return||l.return()}finally{if(r)throw a}}this.$selectItem.filter(":checked").not(i).prop("checked",!1)}if(n[this.header.stateField]=t,this.options.multipleSelectRow){if(this.multipleSelectRowShiftKey&&this.multipleSelectRowLastSelectedIndex>=0)for(var c=[this.multipleSelectRowLastSelectedIndex,e].sort(),h=c[0]+1;h<c[1];h++)this.data[h][this.header.stateField]=!0,this.$selectItem.filter('[data-index="'.concat(h,'"]')).prop("checked",!0);this.multipleSelectRowCtrlKey=!1,this.multipleSelectRowShiftKey=!1,this.multipleSelectRowLastSelectedIndex=t?e:-1}i.prop("checked",t),this.updateSelected(),this.trigger(t?"check":"uncheck",this.data[e],i)}},{key:"checkBy",value:function(t){this._toggleCheckBy(!0,t)}},{key:"uncheckBy",value:function(t){this._toggleCheckBy(!1,t)}},{key:"_toggleCheckBy",value:function(t,e){var i=this;if(e.hasOwnProperty("field")&&e.hasOwnProperty("values")){var n=[];this.data.forEach((function(o,r){if(!o.hasOwnProperty(e.field))return!1;if(e.values.includes(o[e.field])){var a=i.$selectItem.filter(":enabled").filter(Qr.sprintf('[data-index="%s"]',r));if(!(a=t?a.not(":checked"):a.filter(":checked")).length)return;a.prop("checked",t),o[i.header.stateField]=t,n.push(o),i.trigger(t?"check":"uncheck",o,a)}})),this.updateSelected(),this.trigger(t?"check-some":"uncheck-some",n)}}},{key:"refresh",value:function(t){t&&t.url&&(this.options.url=t.url),t&&t.pageNumber&&(this.options.pageNumber=t.pageNumber),t&&t.pageSize&&(this.options.pageSize=t.pageSize),this.trigger("refresh",this.initServer(t&&t.silent,t&&t.query,t&&t.url))}},{key:"destroy",value:function(){this.$el.insertBefore(this.$container),t(this.options.toolbar).insertBefore(this.$el),this.$container.next().remove(),this.$container.remove(),this.$el.html(this.$el_.html()).css("margin-top","0").attr("class",this.$el_.attr("class")||"")}},{key:"resetView",value:function(t){var e=0;if(t&&t.height&&(this.options.height=t.height),this.$selectAll.prop("checked",this.$selectItem.length>0&&this.$selectItem.length===this.$selectItem.filter(":checked").length),this.$tableContainer.toggleClass("has-card-view",this.options.cardView),!this.options.cardView&&this.options.showHeader&&this.options.height?(this.$tableHeader.show(),this.resetHeader(),e+=this.$header.outerHeight(!0)+1):(this.$tableHeader.hide(),this.trigger("post-header")),!this.options.cardView&&this.options.showFooter&&(this.$tableFooter.show(),this.fitFooter(),this.options.height&&(e+=this.$tableFooter.outerHeight(!0))),this.$container.hasClass("fullscreen"))this.$tableContainer.css("height",""),this.$tableContainer.css("width","");else if(this.options.height){this.$tableBorder&&(this.$tableBorder.css("width",""),this.$tableBorder.css("height",""));var i=this.$toolbar.outerHeight(!0),n=this.$pagination.outerHeight(!0),o=this.options.height-i-n,r=this.$tableBody.find(">table"),a=r.outerHeight();if(this.$tableContainer.css("height","".concat(o,"px")),this.$tableBorder&&r.is(":visible")){var s=o-a-2;this.$tableBody[0].scrollWidth-this.$tableBody.innerWidth()&&(s-=Qr.getScrollBarWidth()),this.$tableBorder.css("width","".concat(r.outerWidth(),"px")),this.$tableBorder.css("height","".concat(s,"px"))}}this.options.cardView?(this.$el.css("margin-top","0"),this.$tableContainer.css("padding-bottom","0"),this.$tableFooter.hide()):(this.getCaret(),this.$tableContainer.css("padding-bottom","".concat(e,"px"))),this.trigger("reset-view")}},{key:"showLoading",value:function(){this.$tableLoading.toggleClass("open",!0);var t=this.options.loadingFontSize;"auto"===this.options.loadingFontSize&&(t=.04*this.$tableLoading.width(),t=Math.max(12,t),t=Math.min(32,t),t="".concat(t,"px")),this.$tableLoading.find(".loading-text").css("font-size",t)}},{key:"hideLoading",value:function(){this.$tableLoading.toggleClass("open",!1)}},{key:"togglePagination",value:function(){this.options.pagination=!this.options.pagination;var t=this.options.showButtonIcons?this.options.pagination?this.options.icons.paginationSwitchDown:this.options.icons.paginationSwitchUp:"",e=this.options.showButtonText?this.options.pagination?this.options.formatPaginationSwitchUp():this.options.formatPaginationSwitchDown():"";this.$toolbar.find('button[name="paginationSwitch"]').html(Qr.sprintf(this.constants.html.icon,this.options.iconsPrefix,t)+" "+e),this.updatePagination()}},{key:"toggleFullscreen",value:function(){this.$el.closest(".bootstrap-table").toggleClass("fullscreen"),this.resetView()}},{key:"toggleView",value:function(){this.options.cardView=!this.options.cardView,this.initHeader();var t=this.options.showButtonIcons?this.options.cardView?this.options.icons.toggleOn:this.options.icons.toggleOff:"",e=this.options.showButtonText?this.options.cardView?this.options.formatToggleOff():this.options.formatToggleOn():"";this.$toolbar.find('button[name="toggle"]').html(Qr.sprintf(this.constants.html.icon,this.options.iconsPrefix,t)+" "+e),this.initBody(),this.trigger("toggle",this.options.cardView)}},{key:"resetSearch",value:function(t){var e=Qr.getSearchInput(this);e.val(t||""),this.onSearch({currentTarget:e})}},{key:"filterBy",value:function(e,i){this.filterOptions=Qr.isEmptyObject(i)?this.options.filterOptions:t.extend(this.options.filterOptions,i),this.filterColumns=Qr.isEmptyObject(e)?{}:e,this.options.pageNumber=1,this.initSearch(),this.updatePagination()}},{key:"scrollTo",value:function(e){var i={unit:"px",value:0};"object"===Pr(e)?i=Object.assign(i,e):"string"==typeof e&&"bottom"===e?i.value=this.$tableBody[0].scrollHeight:"string"!=typeof e&&"number"!=typeof e||(i.value=e);var n=i.value;"rows"===i.unit&&(n=0,this.$body.find("> tr:lt(".concat(i.value,")")).each((function(e,i){n+=t(i).outerHeight(!0)}))),this.$tableBody.scrollTop(n)}},{key:"getScrollPosition",value:function(){return this.$tableBody.scrollTop()}},{key:"selectPage",value:function(t){t>0&&t<=this.options.totalPages&&(this.options.pageNumber=t,this.updatePagination())}},{key:"prevPage",value:function(){this.options.pageNumber>1&&(this.options.pageNumber--,this.updatePagination())}},{key:"nextPage",value:function(){this.options.pageNumber<this.options.totalPages&&(this.options.pageNumber++,this.updatePagination())}},{key:"toggleDetailView",value:function(t,e){this.$body.find(Qr.sprintf('> tr[data-index="%s"]',t)).next().is("tr.detail-view")?this.collapseRow(t):this.expandRow(t,e),this.resetView()}},{key:"expandRow",value:function(t,e){var i=this.data[t],n=this.$body.find(Qr.sprintf('> tr[data-index="%s"][data-has-detail-view]',t));if(!n.next().is("tr.detail-view")){this.options.detailViewIcon&&n.find("a.detail-icon").html(Qr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailClose)),n.after(Qr.sprintf('<tr class="detail-view"><td colspan="%s"></td></tr>',n.children("td").length));var o=n.next().find("td"),r=e||this.options.detailFormatter,a=Qr.calculateObjectValue(this.options,r,[t,i,o],"");1===o.length&&o.append(a),this.trigger("expand-row",t,i,o)}}},{key:"expandRowByUniqueId",value:function(t){var e=this.getRowByUniqueId(t);e&&this.expandRow(this.data.indexOf(e))}},{key:"collapseRow",value:function(t){var e=this.data[t],i=this.$body.find(Qr.sprintf('> tr[data-index="%s"][data-has-detail-view]',t));i.next().is("tr.detail-view")&&(this.options.detailViewIcon&&i.find("a.detail-icon").html(Qr.sprintf(this.constants.html.icon,this.options.iconsPrefix,this.options.icons.detailOpen)),this.trigger("collapse-row",t,e,i.next()),i.next().remove())}},{key:"collapseRowByUniqueId",value:function(t){var e=this.getRowByUniqueId(t);e&&this.collapseRow(this.data.indexOf(e))}},{key:"expandAllRows",value:function(){for(var e=this.$body.find("> tr[data-index][data-has-detail-view]"),i=0;i<e.length;i++)this.expandRow(t(e[i]).data("index"))}},{key:"collapseAllRows",value:function(){for(var e=this.$body.find("> tr[data-index][data-has-detail-view]"),i=0;i<e.length;i++)this.collapseRow(t(e[i]).data("index"))}},{key:"updateColumnTitle",value:function(e){e.hasOwnProperty("field")&&e.hasOwnProperty("title")&&(this.columns[this.fieldsColumnsIndex[e.field]].title=this.options.escape?Qr.escapeHTML(e.title):e.title,this.columns[this.fieldsColumnsIndex[e.field]].visible&&(void 0!==this.options.height?this.$tableHeader:this.$header).find("th[data-field]").each((function(i,n){if(t(n).data("field")===e.field)return t(t(n).find(".th-inner")[0]).text(e.title),!1})))}},{key:"updateFormatText",value:function(t,e){/^format/.test(t)&&this.options[t]&&("string"==typeof e?this.options[t]=function(){return e}:"function"==typeof e&&(this.options[t]=e),this.initToolbar(),this.initPagination(),this.initBody())}}]),e}();return ta.VERSION=Br.VERSION,ta.DEFAULTS=Br.DEFAULTS,ta.LOCALES=Br.LOCALES,ta.COLUMN_DEFAULTS=Br.COLUMN_DEFAULTS,ta.METHODS=Br.METHODS,ta.EVENTS=Br.EVENTS,t.BootstrapTable=ta,t.fn.bootstrapTable=function(e){for(var i=arguments.length,n=new Array(i>1?i-1:0),o=1;o<i;o++)n[o-1]=arguments[o];var r;return this.each((function(i,o){var a=t(o).data("bootstrap.table"),s=t.extend({},ta.DEFAULTS,t(o).data(),"object"===Pr(e)&&e);if("string"==typeof e){var l;if(!Br.METHODS.includes(e))throw new Error("Unknown method: ".concat(e));if(!a)return;r=(l=a)[e].apply(l,n),"destroy"===e&&t(o).removeData("bootstrap.table")}a||(a=new t.BootstrapTable(o,s),t(o).data("bootstrap.table",a),a.init())})),void 0===r?this:r},t.fn.bootstrapTable.Constructor=ta,t.fn.bootstrapTable.theme=Br.THEME,t.fn.bootstrapTable.VERSION=Br.VERSION,t.fn.bootstrapTable.defaults=ta.DEFAULTS,t.fn.bootstrapTable.columnDefaults=ta.COLUMN_DEFAULTS,t.fn.bootstrapTable.events=ta.EVENTS,t.fn.bootstrapTable.locales=ta.LOCALES,t.fn.bootstrapTable.methods=ta.METHODS,t.fn.bootstrapTable.utils=Qr,t((function(){t('[data-toggle="table"]').bootstrapTable()})),ta}));
diff --git a/web/skins/classic/js/skin.js b/web/skins/classic/js/skin.js
index f33007ec2..dc45f32fe 100644
--- a/web/skins/classic/js/skin.js
+++ b/web/skins/classic/js/skin.js
@@ -23,6 +23,22 @@
 //
 var popupOptions = "resizable,scrollbars,status=no,toolbar=yes";
 
+// Globally define the icons used in the bootstrap-table top-right toolbar
+var icons = {
+  paginationSwitchDown: 'fa-caret-square-o-down',
+  paginationSwitchUp: 'fa-caret-square-o-up',
+  export: 'fa-download',
+  refresh: 'fa-retweet',
+  autoRefresh: 'fa-clock-o',
+  advancedSearchIcon: 'fa-chevron-down',
+  toggleOff: 'fa-toggle-off',
+  toggleOn: 'fa-toggle-on',
+  columns: 'fa-th-list',
+  fullscreen: 'fa-arrows-alt',
+  detailOpen: 'fa-plus',
+  detailClose: 'fa-minus'
+};
+
 function checkSize() {
   if ( 0 ) {
     if (window.outerHeight) {
@@ -159,6 +175,22 @@ window.addEventListener("DOMContentLoaded", function onSkinDCL() {
     });
   });
 
+  document.querySelectorAll(".zmlink").forEach(function(el) {
+    el.addEventListener("click", function onClick(evt) {
+      var el = this;
+      var url;
+      if ( el.hasAttribute("href") ) {
+        // <a>
+        url = el.getAttribute("href");
+      } else {
+        // buttons
+        url = el.getAttribute("data-url");
+      }
+      evt.preventDefault();
+      window.location.assign(url);
+    });
+  });
+
   document.querySelectorAll(".pillList a").forEach(function addOnClick(el) {
     el.addEventListener("click", submitTab);
   });
@@ -312,6 +344,10 @@ if ( currentView != 'none' && currentView != 'login' ) {
   $j.ajaxSetup({timeout: AJAX_TIMEOUT}); //sets timeout for all getJSON.
 
   $j(document).ready(function() {
+    // Load the Logout and State modals into the dom
+    getLogoutModal();
+    if ( canEditSystem ) $j('#stateModalBtn').click(getStateModal);
+
     // Trigger autorefresh of the widget bar stats on the navbar
     if ( $j('.navbar').length ) {
       setInterval(getNavBar, navBarRefresh);
@@ -385,13 +421,35 @@ if ( currentView != 'none' && currentView != 'login' ) {
         $j("button.navbar-toggler").click();
       }
     });
+    // Manage the optionhelp links
+    $j(".optionhelp").click(function(evt) {
+      $j.getJSON(thisUrl + '?request=modal&modal=optionhelp&ohndx=' + evt.target.id)
+          .done(optionhelpModal)
+          .fail(logAjaxFail);
+    });
   });
 
+  // Manage the modal html we received after user clicks help link
+  function optionhelpModal(data) {
+    if ( $j('#optionhelp').length ) {
+      $j('#optionhelp').replaceWith(data.html);
+    } else {
+      $j("body").append(data.html);
+    }
+    $j('#optionhelp').modal('show');
+
+    // Manage the CLOSE optionhelp modal button
+    document.getElementById("ohCloseBtn").addEventListener("click", function onOhCloseClick(evt) {
+      $j('#optionhelp').modal('hide');
+    });
+  }
+
   function getNavBar() {
     $j.getJSON(thisUrl + '?view=request&request=status&entity=navBar')
         .done(setNavBar)
         .fail(function(jqxhr, textStatus, error) {
           console.log("Request Failed: " + textStatus + ", " + error);
+          console.log("Response Text: " + jqxhr.responseText.replace(/(<([^>]+)>)/gi, ''));
           if ( textStatus != "timeout" ) {
           // The idea is that this should only fail due to auth, so reload the page
           // which should go to login if it can't stay logged in.
@@ -401,6 +459,10 @@ if ( currentView != 'none' && currentView != 'login' ) {
   }
 
   function setNavBar(data) {
+    if ( !data ) {
+      console.error("No data in setNavBar");
+      return;
+    }
     if ( data.auth ) {
       if ( data.auth != auth_hash ) {
         // Update authentication token.
@@ -687,7 +749,179 @@ function bwClickFunction() {
 function reminderClickFunction() {
   $j("#dropdown_reminder a").click(function() {
     var option = $j(this).data('pdsa-dropdown-val');
-    $j.getJSON(thisUrl + '?view=version&action=version&option=' + option);
-    window.location.reload(true); //Do a full refresh to update ZM_DYN_LAST_VERSION
+    $j.getJSON(thisUrl + '?view=version&action=version&option=' + option)
+        .done(window.location.reload(true)) //Do a full refresh to update ZM_DYN_LAST_VERSION
+        .fail(logAjaxFail);
   });
 }
+
+// Load then show the "You No Permission" error modal
+function enoperm() {
+  $j.getJSON(thisUrl + '?request=modal&modal=enoperm')
+      .done(function(data) {
+        if ( $j('#ENoPerm').length ) {
+          $j('#ENoPerm').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#ENoPerm').modal('show');
+
+        // Manage the CLOSE optionhelp modal button
+        document.getElementById("enpCloseBtn").addEventListener("click", function onENPCloseClick(evt) {
+          $j('#ENoPerm').modal('hide');
+        });
+      })
+      .fail(logAjaxFail);
+}
+
+function getLogoutModal() {
+  $j.getJSON(thisUrl + '?request=modal&modal=logout')
+      .done(function(data) {
+        if ( $j('#modalLogout').length ) {
+          $j('#modalLogout').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+      })
+      .fail(logAjaxFail);
+}
+
+function getStateModal() {
+  $j.getJSON(thisUrl + '?request=modal&modal=state')
+      .done(function(data) {
+        if ( $j('#modalState').length ) {
+          $j('#modalState').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#modalState').modal('show');
+        manageStateModalBtns();
+      })
+      .fail(logAjaxFail);
+}
+
+function manageStateModalBtns() {
+  // Enable or disable the Delete button depending on the selected run state
+  $j("#runState").change(function() {
+    runstate = $j(this).val();
+
+    if ( (runstate == 'stop') || (runstate == 'restart') || (runstate == 'start') || (runstate == 'default') ) {
+      $j("#btnDelete").prop("disabled", true);
+    } else {
+      $j("#btnDelete").prop("disabled", false);
+    }
+  });
+
+  // Enable or disable the Save button when entering a new state
+  $j("#newState").keyup(function() {
+    length = $j(this).val().length;
+    if ( length < 1 ) {
+      $j("#btnSave").prop("disabled", true);
+    } else {
+      $j("#btnSave").prop("disabled", false);
+    }
+  });
+
+
+  // Delete a state
+  $j("#btnDelete").click(function() {
+    stateStuff('delete', $j("#runState").val());
+  });
+
+
+  // Save a new state
+  $j("#btnSave").click(function() {
+    stateStuff('save', undefined, $j("#newState").val());
+  });
+
+  // Change state
+  $j("#btnApply").click(function() {
+    stateStuff('state', $j("#runState").val());
+  });
+}
+
+function stateStuff(action, runState, newState) {
+  // the state action will redirect to console
+  var formData = {
+    'view': 'state',
+    'action': action,
+    'apply': 1,
+    'runState': runState,
+    'newState': newState
+  };
+
+  $j("#pleasewait").toggleClass("hidden");
+
+  $j.ajax({
+    type: 'POST',
+    url: thisUrl,
+    data: formData,
+    dataType: 'html',
+    timeout: 0
+  }).done(function(data) {
+    location.reload();
+  });
+}
+
+function logAjaxFail(jqxhr, textStatus, error) {
+  console.log("Request Failed: " + textStatus + ", " + error);
+  console.log("Response Text: " + jqxhr.responseText.replace(/(<([^>]+)>)/gi, '')); // strip any html from the response
+}
+
+// Load the Modal HTML via Ajax call
+function getModal(id) {
+  $j.getJSON(thisUrl + '?request=modal&modal='+id)
+      .done(function(data) {
+        if ( !data ) {
+          console.error("Get modal returned no data");
+          return;
+        }
+
+        if ( $j('#'+id).length ) {
+          $j('#'+id).replaceWith(data.html);
+        } else {
+          $j('body').append(data.html);
+        }
+        manageModalBtns(id);
+        modal = $j('#'+id+'Modal');
+        if ( ! modal.length ) {
+          console.log('No modal found');
+        }
+        $j('#'+id+'Modal').modal('show');
+      })
+      .fail(logAjaxFail);
+}
+
+function manageModalBtns(id) {
+  // Manage the CANCEL modal button
+  var cancelBtn = document.getElementById(id+"CancelBtn");
+  if ( cancelBtn ) {
+    document.getElementById(id+"CancelBtn").addEventListener('click', function onCancelClick(evt) {
+      $j('#'+id).modal('hide');
+    });
+  }
+  // 'data-on-click-this' calls the global function in the attribute value with the element when a click happens.
+  document.querySelectorAll('#'+id+'Modal button[data-on-click]').forEach(function attachOnClick(el) {
+    var fnName = el.getAttribute('data-on-click');
+    if ( !window[fnName] ) {
+      console.error('Nothing found to bind to ' + fnName + ' on element ' + el.name);
+      return;
+    } else {
+      console.log("Setting onclick for " + el.name);
+    }
+    el.onclick = window[fnName].bind(el, el);
+  });
+}
+
+function human_filesize(size, precision = 2) {
+  var units = Array('B', 'kB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB');
+  var step = 1024;
+  var i = 0;
+  while ((size / step) > 0.9) {
+    size = size / step;
+    i++;
+  }
+  return (Math.round(size*(10^precision))/(10^precision))+units[i];
+}
+
+
diff --git a/web/skins/classic/js/skin.js.php b/web/skins/classic/js/skin.js.php
index 2855b404d..08ed2d57d 100644
--- a/web/skins/classic/js/skin.js.php
+++ b/web/skins/classic/js/skin.js.php
@@ -72,3 +72,4 @@ var imagePrefix = "<?php echo '?view=image&eid=' ?>";
 
 var auth_hash = '<?php echo generateAuthHash(ZM_AUTH_HASH_IPS) ?>';
 var auth_relay = '<?php echo get_auth_relay() ?>';
+var running = <?php echo daemonCheck()?'true':'false' ?>;
diff --git a/web/skins/classic/views/_stats_table.php b/web/skins/classic/views/_stats_table.php
deleted file mode 100644
index bf4bd14a6..000000000
--- a/web/skins/classic/views/_stats_table.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-//
-// ZoneMinder web stats view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canView('Events') ) {
-  $view = 'error';
-  return;
-}
-
-if ( !isset($row) ) $row = '';
-
-$sql = 'SELECT S.*,E.*,Z.Name AS ZoneName,Z.Units,Z.Area,M.Name AS MonitorName FROM Stats AS S LEFT JOIN Events AS E ON S.EventId = E.Id LEFT JOIN Zones AS Z ON S.ZoneId = Z.Id LEFT JOIN Monitors AS M ON E.MonitorId = M.Id WHERE S.EventId = ? AND S.FrameId = ? ORDER BY S.ZoneId';
-$stats = dbFetchAll($sql, NULL, array($eid, $fid));
-
-?>
-<table id="contentStatsTable<?php echo $row ?>"
-  data-toggle="table"
-  data-toolbar="#toolbar"
-  class="table-sm table-borderless contentStatsTable"
-  >
-
-  <caption><?php echo translate('Stats') ?> - <?php echo $eid ?> - <?php echo $fid ?></caption>
-  <thead>
-    <tr>
-      <th class="colZone font-weight-bold" data-align="center"><?php echo translate('Zone') ?></th>
-      <th class="colPixelDiff font-weight-bold" data-align="center"><?php echo translate('PixelDiff') ?></th>
-      <th class="colAlarmPx font-weight-bold" data-align="center"><?php echo translate('AlarmPx') ?></th>
-      <th class="colFilterPx font-weight-bold" data-align="center"><?php echo translate('FilterPx') ?></th>
-      <th class="colBlobPx font-weight-bold" data-align="center"><?php echo translate('BlobPx') ?></th>
-      <th class="colBlobs font-weight-bold" data-align="center"><?php echo translate('Blobs') ?></th>
-      <th class="colBlobSizes font-weight-bold" data-align="center"><?php echo translate('BlobSizes') ?></th>
-      <th class="colAlarmLimits font-weight-bold" data-align="center"><?php echo translate('AlarmLimits') ?></th>
-      <th class="colScore font-weight-bold" data-align="center"><?php echo translate('Score') ?></th>
-    </tr>
-  </thead>
-
-  <tbody>
-<?php
-if ( count($stats) ) {
-    foreach ( $stats as $stat ) {
-?>
-    <tr>
-      <td class="colZone"><?php echo validHtmlStr($stat['ZoneName']) ?></td>
-      <td class="colPixelDiff"><?php echo validHtmlStr($stat['PixelDiff']) ?></td>
-      <td class="colAlarmPx"><?php echo sprintf( "%d (%d%%)", $stat['AlarmPixels'], (100*$stat['AlarmPixels']/$stat['Area']) ) ?></td>
-      <td class="colFilterPx"><?php echo sprintf( "%d (%d%%)", $stat['FilterPixels'], (100*$stat['FilterPixels']/$stat['Area']) ) ?></td>
-      <td class="colBlobPx"><?php echo sprintf( "%d (%d%%)", $stat['BlobPixels'], (100*$stat['BlobPixels']/$stat['Area']) ) ?></td>
-      <td class="colBlobs"><?php echo validHtmlStr($stat['Blobs']) ?></td>
-<?php
-if ( $stat['Blobs'] > 1 ) {
-?>
-      <td class="colBlobSizes"><?php echo sprintf( "%d-%d (%d%%-%d%%)", $stat['MinBlobSize'], $stat['MaxBlobSize'], (100*$stat['MinBlobSize']/$stat['Area']), (100*$stat['MaxBlobSize']/$stat['Area']) ) ?></td>
-<?php
-} else {
-?>
-      <td class="colBlobSizes"><?php echo sprintf( "%d (%d%%)", $stat['MinBlobSize'], 100*$stat['MinBlobSize']/$stat['Area'] ) ?></td>
-<?php
-}
-?>
-      <td class="colAlarmLimits"><?php echo validHtmlStr($stat['MinX'].",".$stat['MinY']."-".$stat['MaxX'].",".$stat['MaxY']) ?></td>
-      <td class="colScore"><?php echo $stat['Score'] ?></td>
-    </tr>
-<?php
-    }
-} else {
-?>
-    <tr>
-      <td class="rowNoStats" colspan="9"><?php echo translate('NoStatisticsRecorded') ?></td>
-    </tr>
-<?php
-}
-?>
-  </tbody>
-</table>
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 43523568c..11c1e12ad 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -372,7 +372,7 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
 <?php
   }
 ?>
-            <td class="colZones"><?php echo makePopupLink('?view=zones&amp;mid='.$monitor['Id'], 'zmZones', array('zones', $monitor['Width'], $monitor['Height']), $monitor['ZoneCount'], canView('Monitors')) ?></td>
+            <td class="colZones"><?php echo makeLink('?view=zones&amp;mid='.$monitor['Id'], $monitor['ZoneCount'], canView('Monitors')) ?></td>
 <?php
   if ( canEdit('Monitors') ) {
 ?>
@@ -437,8 +437,5 @@ for( $monitor_i = 0; $monitor_i < count($displayMonitors); $monitor_i += 1 ) {
     </div>
   </form>
 <?php
-  include('function.php');
-  // Include Donate Modal
-  include('donate.php');
   xhtmlFooter();
 ?>
diff --git a/web/skins/classic/views/controlcap.php b/web/skins/classic/views/controlcap.php
index d7d57b284..164d41bc7 100644
--- a/web/skins/classic/views/controlcap.php
+++ b/web/skins/classic/views/controlcap.php
@@ -145,32 +145,39 @@ if ( isset($_REQUEST['newControl']) ) {
     $newControl = $control;
 }
 
-$focusWindow = true;
-
 xhtmlHeaders(__FILE__, translate('ControlCap').' - '.$newControl['Name']);
 ?>
 <body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('ControlCap') ?> - <?php echo validHtmlStr($newControl['Name']) ?></h2>
-    </div>
-    <div id="content">
-      <ul class="tabList">
+  <?php echo getNavBarHTML() ?>
+  <div id="page" class="container-fluid">
+    <div class="row flex-nowrap">
+    <nav> <!-- BEGIN PILL LIST -->
+      <ul class="nav nav-pills flex-column h-100 pillList" id="pills-tab" role="tab" aria-orientation="vertical">
 <?php
 foreach ( $tabs as $name=>$value ) {
-    if ( $tab == $name ) {
 ?>
-        <li class="active"><?php echo $value ?></li>
+    <li class="nav-item form-control-sm my-1"><a class="nav-link<?php echo $tab == $name ? ' active' : '' ?>" href="#" data-tab-name="<?php echo $name ?>"><?php echo $value ?></a></li>
 <?php
-    } else {
-?>
-        <li><a href="#" data-tab-name="<?php echo $name ?>"><?php echo $value ?></a></li>
-<?php
-    }
 }
 ?>
       </ul>
+      </nav> <!-- END PILL LIST -->
       <div class="clear"></div>
+
+     <div class="d-flex flex-column col-sm-offset-2 container-fluid">
+      <!-- BEGIN MINI HEADER -->
+      <div class="w-100 py-1">
+        <div class="float-left pl-3">
+          <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+          <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+        </div>
+        <div class="w-100 pt-2">
+          <h2><?php echo translate('ControlCap') ?> - <?php echo validHtmlStr($newControl['Name']) ?></h2>
+        </div>
+      </div>
+
+      <!-- BEGIN ITEM LIST -->
+      <div class="d-flex flex-row container-fluid pr-0">
       <form name="contentForm" id="contentForm" method="post" action="?" class="validateFormOnSubmit">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
@@ -320,158 +327,158 @@ switch ( $tab ) {
   case 'main' :
   {
 ?>
-            <tr><th scope="row"><?php echo translate('Name') ?></th><td><input type="text" name="newControl[Name]" value="<?php echo validHtmlStr($newControl['Name']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('Type') ?></th><td><?php 
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('Name') ?></th><td><input type="text" name="newControl[Name]" value="<?php echo validHtmlStr($newControl['Name']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('Type') ?></th><td><?php 
             $types = array( 'Local'=>translate('Local'), 'Remote'=>translate('Remote'), 'Ffmpeg'=>translate('Ffmpeg'), 'Libvlc'=>translate('Libvlc'), 'cURL'=>'cURL');
             echo buildSelect('newControl[Type]', $types); ?></td></tr>
-            <tr><th scope="row"><?php echo translate('Protocol') ?></th><td><input type="text" name="newControl[Protocol]" value="<?php echo validHtmlStr($newControl['Protocol']) ?>" size="24"/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanWake') ?></th><td><input type="checkbox" name="newControl[CanWake]" value="1"<?php if ( !empty($newControl['CanWake']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanSleep') ?></th><td><input type="checkbox" name="newControl[CanSleep]" value="1"<?php if ( !empty($newControl['CanSleep']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanReset') ?></th><td><input type="checkbox" name="newControl[CanReset]" value="1"<?php if ( !empty($newControl['CanReset']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanReboot') ?></th><td><input type="checkbox" name="newControl[CanReboot]" value="1"<?php if ( !empty($newControl['CanReboot']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('Protocol') ?></th><td><input type="text" name="newControl[Protocol]" value="<?php echo validHtmlStr($newControl['Protocol']) ?>" size="24"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanWake') ?></th><td><input type="checkbox" name="newControl[CanWake]" value="1"<?php if ( !empty($newControl['CanWake']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanSleep') ?></th><td><input type="checkbox" name="newControl[CanSleep]" value="1"<?php if ( !empty($newControl['CanSleep']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanReset') ?></th><td><input type="checkbox" name="newControl[CanReset]" value="1"<?php if ( !empty($newControl['CanReset']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanReboot') ?></th><td><input type="checkbox" name="newControl[CanReboot]" value="1"<?php if ( !empty($newControl['CanReboot']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
         break;
     }
     case 'move' :
     {
 ?>
-            <tr><th scope="row"><?php echo translate('CanMove') ?></th><td><input type="checkbox" name="newControl[CanMove]" value="1"<?php if ( !empty($newControl['CanMove']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanMoveDiag') ?></th><td><input type="checkbox" name="newControl[CanMoveDiag]" value="1"<?php if ( !empty($newControl['CanMoveDiag']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanMoveMap') ?></th><td><input type="checkbox" name="newControl[CanMoveMap]" value="1"<?php if ( !empty($newControl['CanMoveMap']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanMoveAbs') ?></th><td><input type="checkbox" name="newControl[CanMoveAbs]" value="1"<?php if ( !empty($newControl['CanMoveAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanMoveRel') ?></th><td><input type="checkbox" name="newControl[CanMoveRel]" value="1"<?php if ( !empty($newControl['CanMoveRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanMoveCon') ?></th><td><input type="checkbox" name="newControl[CanMoveCon]" value="1"<?php if ( !empty($newControl['CanMoveCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanMove') ?></th><td><input type="checkbox" name="newControl[CanMove]" value="1"<?php if ( !empty($newControl['CanMove']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanMoveDiag') ?></th><td><input type="checkbox" name="newControl[CanMoveDiag]" value="1"<?php if ( !empty($newControl['CanMoveDiag']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanMoveMap') ?></th><td><input type="checkbox" name="newControl[CanMoveMap]" value="1"<?php if ( !empty($newControl['CanMoveMap']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanMoveAbs') ?></th><td><input type="checkbox" name="newControl[CanMoveAbs]" value="1"<?php if ( !empty($newControl['CanMoveAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanMoveRel') ?></th><td><input type="checkbox" name="newControl[CanMoveRel]" value="1"<?php if ( !empty($newControl['CanMoveRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanMoveCon') ?></th><td><input type="checkbox" name="newControl[CanMoveCon]" value="1"<?php if ( !empty($newControl['CanMoveCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
         break;
     }
     case 'pan' :
     {
 ?>
-            <tr><th scope="row"><?php echo translate('CanPan') ?></th><td><input type="checkbox" name="newControl[CanPan]" value="1"<?php if ( !empty($newControl['CanPan']) ) { ?> checked="checked"<?php } ?>></td></tr>
-            <tr><th scope="row"><?php echo translate('MinPanRange') ?></th><td><input type="number" name="newControl[MinPanRange]" value="<?php echo validHtmlStr($newControl['MinPanRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxPanRange') ?></th><td><input type="number" name="newControl[MaxPanRange]" value="<?php echo validHtmlStr($newControl['MaxPanRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinPanStep') ?></th><td><input type="number" name="newControl[MinPanStep]" value="<?php echo validHtmlStr($newControl['MinPanStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxPanStep') ?></th><td><input type="number" name="newControl[MaxPanStep]" value="<?php echo validHtmlStr($newControl['MaxPanStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasPanSpeed') ?></th><td><input type="checkbox" name="newControl[HasPanSpeed]" value="1"<?php if ( !empty($newControl['HasPanSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinPanSpeed') ?></th><td><input type="number" name="newControl[MinPanSpeed]" value="<?php echo validHtmlStr($newControl['MinPanSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxPanSpeed') ?></th><td><input type="number" name="newControl[MaxPanSpeed]" value="<?php echo validHtmlStr($newControl['MaxPanSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasTurboPan') ?></th><td><input type="checkbox" name="newControl[HasTurboPan]" value="1"<?php if ( !empty($newControl['HasTurboPan']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('TurboPanSpeed') ?></th><td><input type="number" name="newControl[TurboPanSpeed]" value="<?php echo validHtmlStr($newControl['TurboPanSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanPan') ?></th><td><input type="checkbox" name="newControl[CanPan]" value="1"<?php if ( !empty($newControl['CanPan']) ) { ?> checked="checked"<?php } ?>></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinPanRange') ?></th><td><input type="number" name="newControl[MinPanRange]" value="<?php echo validHtmlStr($newControl['MinPanRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxPanRange') ?></th><td><input type="number" name="newControl[MaxPanRange]" value="<?php echo validHtmlStr($newControl['MaxPanRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinPanStep') ?></th><td><input type="number" name="newControl[MinPanStep]" value="<?php echo validHtmlStr($newControl['MinPanStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxPanStep') ?></th><td><input type="number" name="newControl[MaxPanStep]" value="<?php echo validHtmlStr($newControl['MaxPanStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('HasPanSpeed') ?></th><td><input type="checkbox" name="newControl[HasPanSpeed]" value="1"<?php if ( !empty($newControl['HasPanSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinPanSpeed') ?></th><td><input type="number" name="newControl[MinPanSpeed]" value="<?php echo validHtmlStr($newControl['MinPanSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxPanSpeed') ?></th><td><input type="number" name="newControl[MaxPanSpeed]" value="<?php echo validHtmlStr($newControl['MaxPanSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('HasTurboPan') ?></th><td><input type="checkbox" name="newControl[HasTurboPan]" value="1"<?php if ( !empty($newControl['HasTurboPan']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('TurboPanSpeed') ?></th><td><input type="number" name="newControl[TurboPanSpeed]" value="<?php echo validHtmlStr($newControl['TurboPanSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
     case 'tilt' :
     {
 ?>
-            <tr><th scope="row"><?php echo translate('CanTilt') ?></th><td><input type="checkbox" name="newControl[CanTilt]" value="1"<?php if ( !empty($newControl['CanTilt']) ) { ?> checked="checked"<?php } ?>></td></tr>
-            <tr><th scope="row"><?php echo translate('MinTiltRange') ?></th><td><input type="number" name="newControl[MinTiltRange]" value="<?php echo validHtmlStr($newControl['MinTiltRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxTiltRange') ?></th><td><input type="number" name="newControl[MaxTiltRange]" value="<?php echo validHtmlStr($newControl['MaxTiltRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinTiltStep') ?></th><td><input type="number" name="newControl[MinTiltStep]" value="<?php echo validHtmlStr($newControl['MinTiltStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxTiltStep') ?></th><td><input type="number" name="newControl[MaxTiltStep]" value="<?php echo validHtmlStr($newControl['MaxTiltStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasTiltSpeed') ?></th><td><input type="checkbox" name="newControl[HasTiltSpeed]" value="1"<?php if ( !empty($newControl['HasTiltSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinTiltSpeed') ?></th><td><input type="number" name="newControl[MinTiltSpeed]" value="<?php echo validHtmlStr($newControl['MinTiltSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxTiltSpeed') ?></th><td><input type="number" name="newControl[MaxTiltSpeed]" value="<?php echo validHtmlStr($newControl['MaxTiltSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasTurboTilt') ?></th><td><input type="checkbox" name="newControl[HasTurboTilt]" value="1"<?php if ( !empty($newControl['HasTurboTilt']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('TurboTiltSpeed') ?></th><td><input type="number" name="newControl[TurboTiltSpeed]" value="<?php echo validHtmlStr($newControl['TurboTiltSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanTilt') ?></th><td><input type="checkbox" name="newControl[CanTilt]" value="1"<?php if ( !empty($newControl['CanTilt']) ) { ?> checked="checked"<?php } ?>></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinTiltRange') ?></th><td><input type="number" name="newControl[MinTiltRange]" value="<?php echo validHtmlStr($newControl['MinTiltRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxTiltRange') ?></th><td><input type="number" name="newControl[MaxTiltRange]" value="<?php echo validHtmlStr($newControl['MaxTiltRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinTiltStep') ?></th><td><input type="number" name="newControl[MinTiltStep]" value="<?php echo validHtmlStr($newControl['MinTiltStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxTiltStep') ?></th><td><input type="number" name="newControl[MaxTiltStep]" value="<?php echo validHtmlStr($newControl['MaxTiltStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('HasTiltSpeed') ?></th><td><input type="checkbox" name="newControl[HasTiltSpeed]" value="1"<?php if ( !empty($newControl['HasTiltSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinTiltSpeed') ?></th><td><input type="number" name="newControl[MinTiltSpeed]" value="<?php echo validHtmlStr($newControl['MinTiltSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxTiltSpeed') ?></th><td><input type="number" name="newControl[MaxTiltSpeed]" value="<?php echo validHtmlStr($newControl['MaxTiltSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('HasTurboTilt') ?></th><td><input type="checkbox" name="newControl[HasTurboTilt]" value="1"<?php if ( !empty($newControl['HasTurboTilt']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('TurboTiltSpeed') ?></th><td><input type="number" name="newControl[TurboTiltSpeed]" value="<?php echo validHtmlStr($newControl['TurboTiltSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
     case 'zoom' :
     {
 ?>
-            <tr><th scope="row"><?php echo translate('CanZoom') ?></th><td><input type="checkbox" name="newControl[CanZoom]" value="1"<?php if ( !empty($newControl['CanZoom']) ) { ?> checked="checked"<?php } ?>></td></tr>
-            <tr><th scope="row"><?php echo translate('CanZoomAbs') ?></th><td><input type="checkbox" name="newControl[CanZoomAbs]" value="1"<?php if ( !empty($newControl['CanZoomAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanZoomRel') ?></th><td><input type="checkbox" name="newControl[CanZoomRel]" value="1"<?php if ( !empty($newControl['CanZoomRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanZoomCon') ?></th><td><input type="checkbox" name="newControl[CanZoomCon]" value="1"<?php if ( !empty($newControl['CanZoomCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinZoomRange') ?></th><td><input type="number" name="newControl[MinZoomRange]" value="<?php echo validHtmlStr($newControl['MinZoomRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxZoomRange') ?></th><td><input type="number" name="newControl[MaxZoomRange]" value="<?php echo validHtmlStr($newControl['MaxZoomRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinZoomStep') ?></th><td><input type="number" name="newControl[MinZoomStep]" value="<?php echo validHtmlStr($newControl['MinZoomStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxZoomStep') ?></th><td><input type="number" name="newControl[MaxZoomStep]" value="<?php echo validHtmlStr($newControl['MaxZoomStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasZoomSpeed') ?></th><td><input type="checkbox" name="newControl[HasZoomSpeed]" value="1"<?php if ( !empty($newControl['HasZoomSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinZoomSpeed') ?></th><td><input type="number" name="newControl[MinZoomSpeed]" value="<?php echo validHtmlStr($newControl['MinZoomSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxZoomSpeed') ?></th><td><input type="number" name="newControl[MaxZoomSpeed]" value="<?php echo validHtmlStr($newControl['MaxZoomSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanZoom') ?></th><td><input type="checkbox" name="newControl[CanZoom]" value="1"<?php if ( !empty($newControl['CanZoom']) ) { ?> checked="checked"<?php } ?>></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanZoomAbs') ?></th><td><input type="checkbox" name="newControl[CanZoomAbs]" value="1"<?php if ( !empty($newControl['CanZoomAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanZoomRel') ?></th><td><input type="checkbox" name="newControl[CanZoomRel]" value="1"<?php if ( !empty($newControl['CanZoomRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanZoomCon') ?></th><td><input type="checkbox" name="newControl[CanZoomCon]" value="1"<?php if ( !empty($newControl['CanZoomCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinZoomRange') ?></th><td><input type="number" name="newControl[MinZoomRange]" value="<?php echo validHtmlStr($newControl['MinZoomRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxZoomRange') ?></th><td><input type="number" name="newControl[MaxZoomRange]" value="<?php echo validHtmlStr($newControl['MaxZoomRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinZoomStep') ?></th><td><input type="number" name="newControl[MinZoomStep]" value="<?php echo validHtmlStr($newControl['MinZoomStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxZoomStep') ?></th><td><input type="number" name="newControl[MaxZoomStep]" value="<?php echo validHtmlStr($newControl['MaxZoomStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('HasZoomSpeed') ?></th><td><input type="checkbox" name="newControl[HasZoomSpeed]" value="1"<?php if ( !empty($newControl['HasZoomSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinZoomSpeed') ?></th><td><input type="number" name="newControl[MinZoomSpeed]" value="<?php echo validHtmlStr($newControl['MinZoomSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxZoomSpeed') ?></th><td><input type="number" name="newControl[MaxZoomSpeed]" value="<?php echo validHtmlStr($newControl['MaxZoomSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
     case 'focus' :
     {
 ?>
-            <tr><th scope="row"><?php echo translate('CanFocus') ?></th><td><input type="checkbox" name="newControl[CanFocus]" value="1"<?php if ( !empty($newControl['CanFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanAutoFocus') ?></th><td><input type="checkbox" name="newControl[CanAutoFocus]" value="1"<?php if ( !empty($newControl['CanAutoFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanFocusAbs') ?></th><td><input type="checkbox" name="newControl[CanFocusAbs]" value="1"<?php if ( !empty($newControl['CanFocusAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanFocusRel') ?></th><td><input type="checkbox" name="newControl[CanFocusRel]" value="1"<?php if ( !empty($newControl['CanFocusRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanFocusCon') ?></th><td><input type="checkbox" name="newControl[CanFocusCon]" value="1"<?php if ( !empty($newControl['CanFocusCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinFocusRange') ?></th><td><input type="number" name="newControl[MinFocusRange]" value="<?php echo validHtmlStr($newControl['MinFocusRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxFocusRange') ?></th><td><input type="number" name="newControl[MaxFocusRange]" value="<?php echo validHtmlStr($newControl['MaxFocusRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinFocusStep') ?></th><td><input type="number" name="newControl[MinFocusStep]" value="<?php echo validHtmlStr($newControl['MinFocusStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxFocusStep') ?></th><td><input type="number" name="newControl[MaxFocusStep]" value="<?php echo validHtmlStr($newControl['MaxFocusStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasFocusSpeed') ?></th><td><input type="checkbox" name="newControl[HasFocusSpeed]" value="1"<?php if ( !empty($newControl['HasFocusSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinFocusSpeed') ?></th><td><input type="number" name="newControl[MinFocusSpeed]" value="<?php echo validHtmlStr($newControl['MinFocusSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxFocusSpeed') ?></th><td><input type="number" name="newControl[MaxFocusSpeed]" value="<?php echo validHtmlStr($newControl['MaxFocusSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanFocus') ?></th><td><input type="checkbox" name="newControl[CanFocus]" value="1"<?php if ( !empty($newControl['CanFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanAutoFocus') ?></th><td><input type="checkbox" name="newControl[CanAutoFocus]" value="1"<?php if ( !empty($newControl['CanAutoFocus']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanFocusAbs') ?></th><td><input type="checkbox" name="newControl[CanFocusAbs]" value="1"<?php if ( !empty($newControl['CanFocusAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanFocusRel') ?></th><td><input type="checkbox" name="newControl[CanFocusRel]" value="1"<?php if ( !empty($newControl['CanFocusRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanFocusCon') ?></th><td><input type="checkbox" name="newControl[CanFocusCon]" value="1"<?php if ( !empty($newControl['CanFocusCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinFocusRange') ?></th><td><input type="number" name="newControl[MinFocusRange]" value="<?php echo validHtmlStr($newControl['MinFocusRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxFocusRange') ?></th><td><input type="number" name="newControl[MaxFocusRange]" value="<?php echo validHtmlStr($newControl['MaxFocusRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinFocusStep') ?></th><td><input type="number" name="newControl[MinFocusStep]" value="<?php echo validHtmlStr($newControl['MinFocusStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxFocusStep') ?></th><td><input type="number" name="newControl[MaxFocusStep]" value="<?php echo validHtmlStr($newControl['MaxFocusStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('HasFocusSpeed') ?></th><td><input type="checkbox" name="newControl[HasFocusSpeed]" value="1"<?php if ( !empty($newControl['HasFocusSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinFocusSpeed') ?></th><td><input type="number" name="newControl[MinFocusSpeed]" value="<?php echo validHtmlStr($newControl['MinFocusSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxFocusSpeed') ?></th><td><input type="number" name="newControl[MaxFocusSpeed]" value="<?php echo validHtmlStr($newControl['MaxFocusSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
     case 'iris' :
     {
 ?>
-            <tr><th scope="row"><?php echo translate('CanIris') ?></th><td><input type="checkbox" name="newControl[CanIris]" value="1"<?php if ( !empty($newControl['CanIris']) ) { ?> checked="checked"<?php } ?>></td></tr>
-            <tr><th scope="row"><?php echo translate('CanAutoIris') ?></th><td><input type="checkbox" name="newControl[CanAutoIris]" value="1"<?php if ( !empty($newControl['CanAutoIris']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanIrisAbs') ?></th><td><input type="checkbox" name="newControl[CanIrisAbs]" value="1"<?php if ( !empty($newControl['CanIrisAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanIrisRel') ?></th><td><input type="checkbox" name="newControl[CanIrisRel]" value="1"<?php if ( !empty($newControl['CanIrisRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanIrisCon') ?></th><td><input type="checkbox" name="newControl[CanIrisCon]" value="1"<?php if ( !empty($newControl['CanIrisCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinIrisRange') ?></th><td><input type="number" name="newControl[MinIrisRange]" value="<?php echo validHtmlStr($newControl['MinIrisRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxIrisRange') ?></th><td><input type="number" name="newControl[MaxIrisRange]" value="<?php echo validHtmlStr($newControl['MaxIrisRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinIrisStep') ?></th><td><input type="number" name="newControl[MinIrisStep]" value="<?php echo validHtmlStr($newControl['MinIrisStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxIrisStep') ?></th><td><input type="number" name="newControl[MaxIrisStep]" value="<?php echo validHtmlStr($newControl['MaxIrisStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasIrisSpeed') ?></th><td><input type="checkbox" name="newControl[HasIrisSpeed]" value="1"<?php if ( !empty($newControl['HasIrisSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinIrisSpeed') ?></th><td><input type="number" name="newControl[MinIrisSpeed]" value="<?php echo validHtmlStr($newControl['MinIrisSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxIrisSpeed') ?></th><td><input type="number" name="newControl[MaxIrisSpeed]" value="<?php echo validHtmlStr($newControl['MaxIrisSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanIris') ?></th><td><input type="checkbox" name="newControl[CanIris]" value="1"<?php if ( !empty($newControl['CanIris']) ) { ?> checked="checked"<?php } ?>></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanAutoIris') ?></th><td><input type="checkbox" name="newControl[CanAutoIris]" value="1"<?php if ( !empty($newControl['CanAutoIris']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanIrisAbs') ?></th><td><input type="checkbox" name="newControl[CanIrisAbs]" value="1"<?php if ( !empty($newControl['CanIrisAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanIrisRel') ?></th><td><input type="checkbox" name="newControl[CanIrisRel]" value="1"<?php if ( !empty($newControl['CanIrisRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanIrisCon') ?></th><td><input type="checkbox" name="newControl[CanIrisCon]" value="1"<?php if ( !empty($newControl['CanIrisCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinIrisRange') ?></th><td><input type="number" name="newControl[MinIrisRange]" value="<?php echo validHtmlStr($newControl['MinIrisRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxIrisRange') ?></th><td><input type="number" name="newControl[MaxIrisRange]" value="<?php echo validHtmlStr($newControl['MaxIrisRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinIrisStep') ?></th><td><input type="number" name="newControl[MinIrisStep]" value="<?php echo validHtmlStr($newControl['MinIrisStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxIrisStep') ?></th><td><input type="number" name="newControl[MaxIrisStep]" value="<?php echo validHtmlStr($newControl['MaxIrisStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('HasIrisSpeed') ?></th><td><input type="checkbox" name="newControl[HasIrisSpeed]" value="1"<?php if ( !empty($newControl['HasIrisSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinIrisSpeed') ?></th><td><input type="number" name="newControl[MinIrisSpeed]" value="<?php echo validHtmlStr($newControl['MinIrisSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxIrisSpeed') ?></th><td><input type="number" name="newControl[MaxIrisSpeed]" value="<?php echo validHtmlStr($newControl['MaxIrisSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
     case 'gain' :
     {
 ?>
-            <tr><th scope="row"><?php echo translate('CanGain') ?></th><td><input type="checkbox" name="newControl[CanGain]" value="1"<?php if ( !empty($newControl['CanGain']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanAutoGain') ?></th><td><input type="checkbox" name="newControl[CanAutoGain]" value="1"<?php if ( !empty($newControl['CanAutoGain']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanGainAbs') ?></th><td><input type="checkbox" name="newControl[CanGainAbs]" value="1"<?php if ( !empty($newControl['CanGainAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanGainRel') ?></th><td><input type="checkbox" name="newControl[CanGainRel]" value="1"<?php if ( !empty($newControl['CanGainRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanGainCon') ?></th><td><input type="checkbox" name="newControl[CanGainCon]" value="1"<?php if ( !empty($newControl['CanGainCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinGainRange') ?></th><td><input type="number" name="newControl[MinGainRange]" value="<?php echo validHtmlStr($newControl['MinGainRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxGainRange') ?></th><td><input type="number" name="newControl[MaxGainRange]" value="<?php echo validHtmlStr($newControl['MaxGainRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinGainStep') ?></th><td><input type="number" name="newControl[MinGainStep]" value="<?php echo validHtmlStr($newControl['MinGainStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxGainStep') ?></th><td><input type="number" name="newControl[MaxGainStep]" value="<?php echo validHtmlStr($newControl['MaxGainStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasGainSpeed') ?></th><td><input type="checkbox" name="newControl[HasGainSpeed]" value="1"<?php if ( !empty($newControl['HasGainSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinGainSpeed') ?></th><td><input type="number" name="newControl[MinGainSpeed]" value="<?php echo validHtmlStr($newControl['MinGainSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxGainSpeed') ?></th><td><input type="number" name="newControl[MaxGainSpeed]" value="<?php echo validHtmlStr($newControl['MaxGainSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanGain') ?></th><td><input type="checkbox" name="newControl[CanGain]" value="1"<?php if ( !empty($newControl['CanGain']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanAutoGain') ?></th><td><input type="checkbox" name="newControl[CanAutoGain]" value="1"<?php if ( !empty($newControl['CanAutoGain']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanGainAbs') ?></th><td><input type="checkbox" name="newControl[CanGainAbs]" value="1"<?php if ( !empty($newControl['CanGainAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanGainRel') ?></th><td><input type="checkbox" name="newControl[CanGainRel]" value="1"<?php if ( !empty($newControl['CanGainRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanGainCon') ?></th><td><input type="checkbox" name="newControl[CanGainCon]" value="1"<?php if ( !empty($newControl['CanGainCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinGainRange') ?></th><td><input type="number" name="newControl[MinGainRange]" value="<?php echo validHtmlStr($newControl['MinGainRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxGainRange') ?></th><td><input type="number" name="newControl[MaxGainRange]" value="<?php echo validHtmlStr($newControl['MaxGainRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinGainStep') ?></th><td><input type="number" name="newControl[MinGainStep]" value="<?php echo validHtmlStr($newControl['MinGainStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxGainStep') ?></th><td><input type="number" name="newControl[MaxGainStep]" value="<?php echo validHtmlStr($newControl['MaxGainStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('HasGainSpeed') ?></th><td><input type="checkbox" name="newControl[HasGainSpeed]" value="1"<?php if ( !empty($newControl['HasGainSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinGainSpeed') ?></th><td><input type="number" name="newControl[MinGainSpeed]" value="<?php echo validHtmlStr($newControl['MinGainSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxGainSpeed') ?></th><td><input type="number" name="newControl[MaxGainSpeed]" value="<?php echo validHtmlStr($newControl['MaxGainSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
     case 'white' :
     {
 ?>
-            <tr><th scope="row"><?php echo translate('CanWhite') ?></th><td><input type="checkbox" name="newControl[CanWhite]" value="1"<?php if ( !empty($newControl['CanWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanAutoWhite') ?></th><td><input type="checkbox" name="newControl[CanAutoWhite]" value="1"<?php if ( !empty($newControl['CanAutoWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanWhiteAbs') ?></th><td><input type="checkbox" name="newControl[CanWhiteAbs]" value="1"<?php if ( !empty($newControl['CanWhiteAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanWhiteRel') ?></th><td><input type="checkbox" name="newControl[CanWhiteRel]" value="1"<?php if ( !empty($newControl['CanWhiteRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanWhiteCon') ?></th><td><input type="checkbox" name="newControl[CanWhiteCon]" value="1"<?php if ( !empty($newControl['CanWhiteCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinWhiteRange') ?></th><td><input type="number" name="newControl[MinWhiteRange]" value="<?php echo validHtmlStr($newControl['MinWhiteRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxWhiteRange') ?></th><td><input type="number" name="newControl[MaxWhiteRange]" value="<?php echo validHtmlStr($newControl['MaxWhiteRange']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinWhiteStep') ?></th><td><input type="number" name="newControl[MinWhiteStep]" value="<?php echo validHtmlStr($newControl['MinWhiteStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxWhiteStep') ?></th><td><input type="number" name="newControl[MaxWhiteStep]" value="<?php echo validHtmlStr($newControl['MaxWhiteStep']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasWhiteSpeed') ?></th><td><input type="checkbox" name="newControl[HasWhiteSpeed]" value="1"<?php if ( !empty($newControl['HasWhiteSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('MinWhiteSpeed') ?></th><td><input type="number" name="newControl[MinWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MinWhiteSpeed']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('MaxWhiteSpeed') ?></th><td><input type="number" name="newControl[MaxWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MaxWhiteSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanWhite') ?></th><td><input type="checkbox" name="newControl[CanWhite]" value="1"<?php if ( !empty($newControl['CanWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanAutoWhite') ?></th><td><input type="checkbox" name="newControl[CanAutoWhite]" value="1"<?php if ( !empty($newControl['CanAutoWhite']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanWhiteAbs') ?></th><td><input type="checkbox" name="newControl[CanWhiteAbs]" value="1"<?php if ( !empty($newControl['CanWhiteAbs']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanWhiteRel') ?></th><td><input type="checkbox" name="newControl[CanWhiteRel]" value="1"<?php if ( !empty($newControl['CanWhiteRel']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanWhiteCon') ?></th><td><input type="checkbox" name="newControl[CanWhiteCon]" value="1"<?php if ( !empty($newControl['CanWhiteCon']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinWhiteRange') ?></th><td><input type="number" name="newControl[MinWhiteRange]" value="<?php echo validHtmlStr($newControl['MinWhiteRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxWhiteRange') ?></th><td><input type="number" name="newControl[MaxWhiteRange]" value="<?php echo validHtmlStr($newControl['MaxWhiteRange']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinWhiteStep') ?></th><td><input type="number" name="newControl[MinWhiteStep]" value="<?php echo validHtmlStr($newControl['MinWhiteStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxWhiteStep') ?></th><td><input type="number" name="newControl[MaxWhiteStep]" value="<?php echo validHtmlStr($newControl['MaxWhiteStep']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('HasWhiteSpeed') ?></th><td><input type="checkbox" name="newControl[HasWhiteSpeed]" value="1"<?php if ( !empty($newControl['HasWhiteSpeed']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MinWhiteSpeed') ?></th><td><input type="number" name="newControl[MinWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MinWhiteSpeed']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('MaxWhiteSpeed') ?></th><td><input type="number" name="newControl[MaxWhiteSpeed]" value="<?php echo validHtmlStr($newControl['MaxWhiteSpeed']) ?>"/></td></tr>
 <?php
         break;
     }
     case 'presets' :
     {
 ?>
-            <tr><th scope="row"><?php echo translate('HasPresets') ?></th><td><input type="checkbox" name="newControl[HasPresets]" value="1"<?php if ( !empty($newControl['HasPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('NumPresets') ?></th><td><input type="number" name="newControl[NumPresets]" value="<?php echo validHtmlStr($newControl['NumPresets']) ?>"/></td></tr>
-            <tr><th scope="row"><?php echo translate('HasHomePreset') ?></th><td><input type="checkbox" name="newControl[HasHomePreset]" value="1"<?php if ( !empty($newControl['HasHomePreset']) ) { ?> checked="checked"<?php } ?>/></td></tr>
-            <tr><th scope="row"><?php echo translate('CanSetPresets') ?></th><td><input type="checkbox" name="newControl[CanSetPresets]" value="1"<?php if ( !empty($newControl['CanSetPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('HasPresets') ?></th><td><input type="checkbox" name="newControl[HasPresets]" value="1"<?php if ( !empty($newControl['HasPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('NumPresets') ?></th><td><input type="number" name="newControl[NumPresets]" value="<?php echo validHtmlStr($newControl['NumPresets']) ?>"/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('HasHomePreset') ?></th><td><input type="checkbox" name="newControl[HasHomePreset]" value="1"<?php if ( !empty($newControl['HasHomePreset']) ) { ?> checked="checked"<?php } ?>/></td></tr>
+            <tr><th class="text-right pr-3" scope="row"><?php echo translate('CanSetPresets') ?></th><td><input type="checkbox" name="newControl[CanSetPresets]" value="1"<?php if ( !empty($newControl['CanSetPresets']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
         break;
     }
@@ -481,9 +488,11 @@ switch ( $tab ) {
         </table>
         <div id="contentButtons">
           <button type="submit" value="Save"<?php if ( !canEdit( 'Control' ) ) { ?> disabled="disabled"<?php } ?>><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
+          <button type="button" id="cancelBtn"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
+    </div>
   </div>
+</div>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/controlcaps.php b/web/skins/classic/views/controlcaps.php
index 58bca5dbd..705459afe 100644
--- a/web/skins/classic/views/controlcaps.php
+++ b/web/skins/classic/views/controlcaps.php
@@ -30,30 +30,47 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('ControlCaps'));
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <div id="headerButtons">
-        <a href="#" data-on-click="closeWindow"><?php echo translate('Close') ?></a>
-      </div>
-      <h2><?php echo translate('ControlCaps') ?></h2>
+
+    <!-- Toolbar button placement and styling handled by bootstrap-tables -->
+    <div id="toolbar">
+      <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+      <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      <button id="addNewBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('AddNewControl') ?>" data-on-click-this="addNewControl" data-url="?view=controlcap"><i class="fa fa-plus"></i></button>
+      <button id="editBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('EditControl') ?>" data-on-click-this="editControl" data-url="?view=controlcap&cid=" disabled><i class="fa fa-pencil"></i></button>
+      <button id="deleteBtn" class="btn btn-danger" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Delete') ?>" disabled><i class="fa fa-trash"></i></button>
     </div>
+
     <div id="content">
-      <form name="contentForm" id="contentForm" method="get" action="?" onsubmit="return( confirmDelete( 'Warning, deleting a control will reset all monitors that use it to be uncontrollable.\nAre you sure you wish to delete?' ) );">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="action" value="delete"/>
-        <table id="contentTable" class="major">
+        <table
+          id="controlTable"
+          class="table-sm table-borderless"
+          data-search="true"
+          data-cookie="true"
+          data-cookie-id-table="zmControlTable"
+          data-cookie-expire="2y"
+          data-remember-order="true"
+          data-click-to-select="true"
+          data-maintain-meta-data="true"
+          data-mobile-responsive="true"
+          data-buttons-class="btn btn-normal"
+          data-toolbar="#toolbar"
+          data-show-columns="true"
+        >
           <thead>
             <tr>
-              <th class="colName"><?php echo translate('Name') ?></th>
-              <th class="colType"><?php echo translate('Type') ?></th>
-              <th class="colProtocol"><?php echo translate('Protocol') ?></th>
-              <th class="colCanMove"><?php echo translate('CanMove') ?></th>
-              <th class="colCanZoom"><?php echo translate('CanZoom') ?></th>
-              <th class="colCanFocus"><?php echo translate('CanFocus') ?></th>
-              <th class="colCanIris"><?php echo translate('CanIris') ?></th>
-              <th class="colCanWhiteBal"><?php echo translate('CanWhiteBal') ?></th>
-              <th class="colHasPresets"><?php echo translate('HasPresets') ?></th>
-              <th class="colMark"><?php echo translate('Mark') ?></th>
+              <th data-sortable="false" data-field="toggleCheck" data-checkbox="true"></th>
+              <th class="colId" data-sortable="true" data-field="Id"><?php echo translate('Id') ?></th>
+              <th class="colName" data-sortable="true" data-field="Name"><?php echo translate('Name') ?></th>
+              <th class="colType" data-sortable="true" data-field="Type"><?php echo translate('Type') ?></th>
+              <th class="colProtocol" data-sortable="true" data-field="Protocol"><?php echo translate('Protocol') ?></th>
+              <th class="colCanMove" data-sortable="true" data-field="CanMove"><?php echo translate('CanMove') ?></th>
+              <th class="colCanZoom" data-sortable="true" data-field="CanZoom"><?php echo translate('CanZoom') ?></th>
+              <th class="colCanFocus" data-sortable="true" data-field="CanFocus"><?php echo translate('CanFocus') ?></th>
+              <th class="colCanIris" data-sortable="true" data-field="CanIris"><?php echo translate('CanIris') ?></th>
+              <th class="colCanWhiteBal" data-sortable="true" data-field="CanWhiteBal"><?php echo translate('CanWhiteBal') ?></th>
+              <th class="colHasPresets" data-sortable="true" data-field="HasPresets"><?php echo translate('HasPresets') ?></th>
             </tr>
           </thead>
           <tbody>
@@ -61,7 +78,9 @@ xhtmlHeaders(__FILE__, translate('ControlCaps'));
 foreach( $controls as $control ) {
 ?>
             <tr>
-              <td class="colName"><?php echo makePopupLink( '?view=controlcap&cid='.$control['Id'], 'zmControlCap', 'controlcap', validHtmlStr($control['Name']), canView( 'Control' ) ) ?></td>
+              <td class="colMark" data-checkbox="true"></td>
+              <td class="colId"><?php echo $control['Id'] ?></td>
+              <td class="colName"><?php echo $control['Name'] ?></td>
               <td class="colType"><?php echo $control['Type'] ?></td>
               <td class="colProtocol"><?php echo validHtmlStr($control['Protocol']) ?></td>
               <td class="colCanMove"><?php echo $control['CanMove']?translate('Yes'):translate('No') ?></td>
@@ -70,18 +89,12 @@ foreach( $controls as $control ) {
               <td class="colCanIris"><?php echo $control['CanIris']?translate('Yes'):translate('No') ?></td>
               <td class="colCanWhiteBal"><?php echo $control['CanWhite']?translate('Yes'):translate('No') ?></td>
               <td class="colHasPresets"><?php echo $control['HasHomePreset']?'H':'' ?><?php echo $control['HasPresets']?$control['NumPresets']:'0' ?></td>
-              <td class="colMark"><input type="checkbox" name="markCids[]" value="<?php echo $control['Id'] ?>" data-on-click-this="configureDeleteButton"<?php if ( !canEdit( 'Control' ) ) {?> disabled="disabled"<?php } ?>/></td>
             </tr>
 <?php
 }
 ?>
           </tbody>
         </table>
-        <div id="contentButtons">
-          <?php echo makePopupButton('?view=controlcap', 'zmControlCap', 'controlcap', translate('AddNewControl'), canEdit( 'Control' )); ?>
-          <input type="submit" name="deleteBtn" value="<?php echo translate('Delete') ?>" disabled="disabled"/>
-        </div>
-      </form>
     </div>
   </div>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/cycle.php b/web/skins/classic/views/cycle.php
index 422bf113c..7e974cd4e 100644
--- a/web/skins/classic/views/cycle.php
+++ b/web/skins/classic/views/cycle.php
@@ -147,15 +147,15 @@ xhtmlHeaders(__FILE__, translate('CycleWatch'));
       <div id="sizeControl">
         <span id="widthControl">
           <label><?php echo translate('Width') ?>:</label>
-          <?php echo htmlSelect('width', $widths, $options['width'], array('data-on-change-this'=>'changeSize') ); ?>
+          <?php echo htmlSelect('width', $widths, $options['width'], array('id'=>'width', 'data-on-change-this'=>'changeSize') ); ?>
         </span>
         <span id="heightControl">
           <label><?php echo translate('Height') ?>:</label>
-          <?php echo htmlSelect('height', $heights, $options['height'], array('data-on-change-this'=>'changeSize') ); ?>
+          <?php echo htmlSelect('height', $heights, $options['height'], array('id'=>'height', 'data-on-change-this'=>'changeSize') ); ?>
         </span>
         <span id="scaleControl">
           <label><?php echo translate('Scale') ?>:</label>
-          <?php echo htmlSelect('scale', $scales, $options['scale'], array('data-on-change-this'=>'changeScale') ); ?>
+          <?php echo htmlSelect('scale', $scales, $options['scale'], array('id'=>'scale', 'data-on-change-this'=>'changeScale') ); ?>
         </span>
       </div>
     </div>
diff --git a/web/skins/classic/views/download.php b/web/skins/classic/views/download.php
index 703a22e0e..91ac635fe 100644
--- a/web/skins/classic/views/download.php
+++ b/web/skins/classic/views/download.php
@@ -54,15 +54,8 @@ if ( isset($_REQUEST['exportFormat']) ) {
   }
 }
 
-if ( !empty($_REQUEST['eid']) ) {
-  $Event = new ZM\Event($_REQUEST['eid']);
-  if ( !$Event->Id ) {
-    Error('Invalid event id');
-  }
-}
-
 $focusWindow = true;
-$connkey = isset($_REQUEST['connkey']) ? $_REQUEST['connkey'] : generateConnKey();
+$connkey = isset($_REQUEST['connkey']) ? validInt($_REQUEST['connkey']) : generateConnKey();
 
 xhtmlHeaders(__FILE__, translate('Download'));
 ?>
@@ -75,7 +68,7 @@ xhtmlHeaders(__FILE__, translate('Download'));
       <h2><?php echo translate('Download') ?></h2>
     </div>
     <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
+      <form name="contentForm" id="contentForm" method="post" action="?">
         <input type="hidden" name="connkey" value="<?php echo $connkey; ?>"/>
 <?php
 if ( !empty($_REQUEST['eid']) ) {
@@ -83,7 +76,12 @@ if ( !empty($_REQUEST['eid']) ) {
         <input type="hidden" name="id" value="<?php echo validInt($_REQUEST['eid']) ?>"/>
     <?php
     $Event = new ZM\Event($_REQUEST['eid']);
-    echo 'Downloading event ' . $Event->Id . '. Resulting file should be approximately ' . human_filesize( $Event->DiskSpace() );
+    if ( !$Event->Id() ) {
+      ZM\Error('Invalid event id');
+      echo '<div class="error">Invalid event id</div>';
+    } else {
+      echo 'Downloading event ' . $Event->Id . '. Resulting file should be approximately ' . human_filesize( $Event->DiskSpace() );
+    }
 } else if ( !empty($_REQUEST['eids']) ) {
     $total_size = 0;
     foreach ( $_REQUEST['eids'] as $eid ) {
diff --git a/web/skins/classic/views/error.php b/web/skins/classic/views/error.php
index 545c734ef..2fdc3b6d0 100644
--- a/web/skins/classic/views/error.php
+++ b/web/skins/classic/views/error.php
@@ -23,6 +23,7 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('Error') );
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
     <div id="header">
       <h1>ZoneMinder <?php echo translate('Error') ?></h1>
@@ -34,9 +35,6 @@ xhtmlHeaders(__FILE__, translate('Error') );
       <p>
         <?php echo translate('ContactAdmin') ?>
       </p>
-      <p>
-        <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
-      </p>
     </div>
   </div>
 </body>
diff --git a/web/skins/classic/views/eventdetail.php b/web/skins/classic/views/eventdetail.php
deleted file mode 100644
index e7d032ed2..000000000
--- a/web/skins/classic/views/eventdetail.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-//
-// ZoneMinder web event detail view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canEdit('Events') ) {
-  $view = 'error';
-  return;
-}
-if ( isset($_REQUEST['eid']) ) {
-  $mode = 'single';
-  $eid = validInt($_REQUEST['eid']);
-  $newEvent = dbFetchOne('SELECT E.* FROM Events AS E WHERE E.Id = ?', NULL, array($eid));
-} elseif ( isset($_REQUEST['eids']) ) {
-  $mode = 'multi';
-  $sql = 'SELECT E.* FROM Events AS E WHERE ';
-  $sqlWhere = array();
-  $sqlValues = array();
-  foreach ( $_REQUEST['eids'] as $eid ) {
-    $sqlWhere[] = 'E.Id = ?';
-    $sqlValues[] = validInt($eid);
-  }
-  unset($eid);
-  $sql .= join(' OR ', $sqlWhere);
-  foreach( dbFetchAll( $sql, NULL, $sqlValues ) as $row ) {
-    if ( !isset($newEvent) ) {
-      $newEvent = $row;
-    } else {
-      if ( $newEvent['Cause'] && $newEvent['Cause'] != $row['Cause'] )
-        $newEvent['Cause'] = '';
-      if ( $newEvent['Notes'] && $newEvent['Notes'] != $row['Notes'] )
-        $newEvent['Notes'] = '';
-    }
-  }
-} else {
-  $mode = '';
-}
-
-$focusWindow = true;
-
-if ( $mode == 'single' )
-    xhtmlHeaders(__FILE__, translate('Event').' - '.$eid );
-else
-    xhtmlHeaders(__FILE__, translate('Events') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-<?php
-if ( $mode == 'single' ) {
-?>
-      <h2><?php echo translate('Event') ?> <?php echo $eid ?></h2>
-<?php
-} else {
-?>
-      <h2><?php echo translate('Events') ?></h2>
-<?php
-}
-?>
-    </div>
-    <div id="content">
-      <form name="contentForm" id="contentForm" method="post" action="?">
-        <input type="hidden" name="action" value="eventdetail"/>
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-<?php
-if ( $mode == 'single' ) {
-?>
-        <input type="hidden" name="markEids[]" value="<?php echo validInt($eid) ?>"/>
-<?php
-} else if ( $mode = 'multi' ) {
-?>
-<?php
-    foreach ( $_REQUEST['eids'] as $eid ) {
-?>
-        <input type="hidden" name="markEids[]" value="<?php echo validInt($eid) ?>"/>
-<?php
-    }
-}
-?>
-        <table id="contentTable" class="major">
-          <tbody>
-            <tr>
-              <th scope="row"><?php echo translate('Cause') ?></th>
-              <td><input type="text" name="newEvent[Cause]" value="<?php echo validHtmlStr($newEvent['Cause']) ?>" size="32"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Notes') ?></th>
-              <td><textarea name="newEvent[Notes]" rows="6" cols="50"><?php echo validHtmlStr($newEvent['Notes']) ?></textarea></td>
-            </tr>
-          </tbody>
-        </table>
-        <div id="contentButtons">
-          <button type="submit" value="Save" <?php echo !canEdit('Events') ? ' disabled="disabled"' : '' ?>>
-          <?php echo translate('Save') ?>
-          </button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
-        </div>
-      </form>
-    </div>
-  </div>
-<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php
index 1d0507b4a..d7921ccc3 100644
--- a/web/skins/classic/views/events.php
+++ b/web/skins/classic/views/events.php
@@ -34,16 +34,23 @@ if ( $user['MonitorIds'] ) {
   $eventsSql .= ' 1';
 }
 
+$filter = isset($_REQUEST['filter_id']) ? new ZM\Filter($_REQUEST['filter_id']) : new ZM\Filter();
+if ( isset($_REQUEST['filter'])) {
+  $filter->set($_REQUEST['filter']);
+}
+
 parseSort();
 
-$filter = ZM\Filter::parse($_REQUEST['filter']);
 $filterQuery = $filter->querystring();
-ZM\Logger::Debug("Filter ".print_r($filter, true));
+ZM\Logger::Debug('Filter '.print_r($filter, true));
 
 if ( $filter->sql() ) {
   $eventsSql .= ' AND ('.$filter->sql().')';
+} else {
+  ZM\Warning('No filters');
+  exit;
 }
-$eventsSql .= " ORDER BY $sortColumn $sortOrder";
+$eventsSql .= ' ORDER BY '.$sortColumn.' '.$sortOrder;
 if ( $sortColumn != 'E.Id' ) $eventsSql .= ',E.Id '.$sortOrder;
 
 $page = isset($_REQUEST['page']) ? validInt($_REQUEST['page']) : 0;
@@ -64,6 +71,10 @@ if ( $failed ) {
 $results = $failed ? null : dbQuery($eventsSql);
 
 $nEvents = $results ? $results->rowCount() : 0;
+if ( ! $results ) {
+  global $error_message;
+  $error_message = dbError($eventsSql);
+} 
 ZM\Logger::Debug("Pre conditions succeeded sql return $nEvents events");
 
 if ( !empty($limit) && ($nEvents > $limit) ) {
@@ -84,13 +95,12 @@ if ( !empty($page) ) {
     $limitLeft = $limit - $limitStart;
     $limitAmount = ($limitLeft>ZM_WEB_EVENTS_PER_PAGE)?ZM_WEB_EVENTS_PER_PAGE:$limitLeft;
   }
-  $eventsSql .= " LIMIT $limitStart, $limitAmount";
+  $eventsSql .= ' LIMIT '.$limitStart.', '.$limitAmount;
 } else if ( !empty($limit) ) {
   $eventsSql .= ' LIMIT 0, '.$limit;
 }
 
 $maxShortcuts = 5;
-$pagination = getPagination($pages, $page, $maxShortcuts, $filterQuery.$sortQuery.$limitQuery);
 
 $focusWindow = true;
 
@@ -101,9 +111,9 @@ foreach ( $storage_areas as $S ) {
 }
 
 xhtmlHeaders(__FILE__, translate('Events'));
+getBodyTopHTML();
 
 ?>
-<body>
   <?php echo getNavBarHTML() ?>
   <div id="page" class="container-fluid p-3">
     <!-- Toolbar button placement and styling handled by bootstrap-tables -->
@@ -124,7 +134,6 @@ xhtmlHeaders(__FILE__, translate('Events'));
     <div class="row justify-content-center">
       <table
         id="eventTable"
-        data-toggle="table"
         data-pagination="true"
         data-show-pagination-switch="true"
         data-page-list="[10, 25, 50, 100, 200, All]"
@@ -222,17 +231,15 @@ if ( $results ) {
 
               <td class="text-center"><?php echo ( $event->Archived() ) ? 'Yes' : 'No' ?></td>
               <td class="text-center"><?php echo ( $event->Emailed() ) ? 'Yes' : 'No' ?></td>
-              <td><?php echo makePopupLink( '?view=monitor&amp;mid='.$event->MonitorId(), 'zmMonitor'.$event->MonitorId(), 'monitor', $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
-              <td><?php echo makePopupLink( '?view=eventdetail&amp;eid='.$event->Id(), 'zmEventDetail', 'eventdetail', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="'.htmlspecialchars($event->Notes()).'"' ) ?>
+              <td><?php echo makeLink( '?view=monitor&amp;mid='.$event->MonitorId(), $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
+              <td><?php echo makeLink( '#', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="' .htmlspecialchars($event->Notes()). '" class="eDetailLink" data-eid=' .$event->Id(). '"') ?>
               <?php
               # display notes as small text
               if ( $event->Notes() ) {
                 # if notes include detection objects, then link it to objdetect.jpg
                 if ( strpos($event->Notes(), 'detected:') !== false ) {
                   # make a link
-                  echo makePopupLink( '?view=image&amp;eid='.$event->Id().'&amp;fid=objdetect', 'zmImage',
-                  array('image', reScale($event->Width(), $scale), reScale($event->Height(), $scale)),
-                  '<div class="small text-nowrap text-muted"><u>'.$event->Notes().'</u></div>');
+                  echo makeLink( '?view=image&amp;eid='.$event->Id().'&amp;fid=objdetect', '<div class="small text-nowrap text-muted"><u>'.$event->Notes().'</u></div>');
                 } else if ( $event->Notes() != 'Forced Web: ' ) {
                   echo '<br/><div class="small text-nowrap text-muted">'.$event->Notes().'</div>';
                 }
@@ -247,10 +254,7 @@ if ( $results ) {
               <td><a href="?view=frames&amp;eid=<?php echo $event->Id() ?>"><?php echo $event->AlarmFrames() ?></a></td>
               <td><?php echo $event->TotScore() ?></td>
               <td><?php echo $event->AvgScore() ?></td>
-              <td><?php echo makePopupLink(
-                '?view=frame&amp;eid='.$event->Id().'&amp;fid=0', 'zmImage',
-                array('image', reScale($event->Width(), $scale), reScale($event->Height(), $scale)), $event->MaxScore()
-              ); ?></td>
+              <td><?php echo makeLink('?view=frame&amp;eid='.$event->Id().'&amp;fid=0', $event->MaxScore()); ?></td>
 <?php
   if ( count($storage_areas) > 1 ) { 
 ?>
@@ -322,25 +326,4 @@ if ( $results ) {
         </table>
       </div>       
   </div>
-
-  <!-- Delete Confirmation Modal -->
-  <div id="deleteConfirm" class="modal fade" class="modal" tabindex="-1">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <h5 class="modal-title">Delete Confirmation</h5>
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <span aria-hidden="true">&times;</span>
-          </button>
-        </div>
-        <div class="modal-body">
-          <p><?php echo translate('ConfirmDeleteEvents') ?></p>
-        </div>
-        <div class="modal-footer">
-          <button id="delCancelBtn" type="button" class="btn btn-secondary" data-dismiss="modal"><?php echo translate('Cancel') ?></button>
-          <button id ="delConfirmBtn" type="button" class="btn btn-danger"><?php echo translate('Delete') ?></button>
-        </div>
-      </div>
-    </div>
-  </div>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/export.php b/web/skins/classic/views/export.php
index 5cea4d2c7..90e269a33 100644
--- a/web/skins/classic/views/export.php
+++ b/web/skins/classic/views/export.php
@@ -17,6 +17,7 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 //
+global $sortQuery;
 
 if ( !canView('Events') ) {
   $view = 'error';
@@ -55,17 +56,22 @@ if (isset($_REQUEST['exportFormat'])) {
 }
 
 $focusWindow = true;
-$connkey = isset($_REQUEST['connkey']) ? $_REQUEST['connkey'] : generateConnKey();
+$connkey = isset($_REQUEST['connkey']) ? validInt($_REQUEST['connkey']) : generateConnKey();
 
 xhtmlHeaders(__FILE__, translate('Export'));
 ?>
 <body>
   <div id="page">
     <?php echo getNavBarHTML() ?>
-    <div id="header">
-      <h2><?php echo translate('ExportOptions') ?></h2>
-    </div>
-    <div id="content">
+      <div class="w-100 py-1">
+        <div class="float-left pl-3">
+          <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+          <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+        </div>
+        <div class="w-100 pt-2">
+          <h2><?php echo translate('ExportOptions') ?></h2>
+        </div>
+      </div>    <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="?view=export">
         <input type="hidden" name="connkey" value="<?php echo $connkey; ?>"/>
 <?php
@@ -144,19 +150,17 @@ while ( $event_row = dbFetchNext($results) ) {
                 <a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery ?>&amp;page=1"><?php echo $event->Id().($event->Archived()?'*':'') ?></a>
               </td>
               <td class="colName"><a href="?view=event&amp;eid=<?php echo $event->Id().$filterQuery.$sortQuery ?>&amp;page=1"><?php echo validHtmlStr($event->Name()).($event->Archived()?'*':'') ?></a></td>
-              <td class="colMonitorName"><?php echo makePopupLink( '?view=monitor&amp;mid='.$event->MonitorId(), 'zmMonitor'.$event->MonitorId(), 'monitor', $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
-              <td class="colCause"><?php echo makePopupLink( '?view=eventdetail&amp;eid='.$event->Id(), 'zmEventDetail', 'eventdetail', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="'.htmlspecialchars($event->Notes()).'"' ) ?></td>
+              <td class="colMonitorName"><?php echo makeLink( '?view=monitor&amp;mid='.$event->MonitorId(), $event->MonitorName(), canEdit( 'Monitors' ) ) ?></td>
+              <td class="colCause"><?php echo makeLink( '#', validHtmlStr($event->Cause()), canEdit( 'Events' ), 'title="' .htmlspecialchars($event->Notes()). '" class="eDetailLink" data-eid=' .$event->Id(). '"') ?></td>
               <td class="colTime"><?php echo strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->StartTime())) .
 ( $event->EndTime() ? ' until ' . strftime(STRF_FMT_DATETIME_SHORTER, strtotime($event->EndTime()) ) : '' ) ?>
               </td>
               <td class="colDuration"><?php echo gmdate("H:i:s", $event->Length() ) ?></td>
-              <td class="colFrames"><?php echo makePopupLink( '?view=frames&amp;eid='.$event->Id(), 'zmFrames', 'frames', $event->Frames() ) ?></td>
-              <td class="colAlarmFrames"><?php echo makePopupLink( '?view=frames&amp;eid='.$event->Id(), 'zmFrames', 'frames', $event->AlarmFrames() ) ?></td>
+              <td class="colFrames"><?php echo makeLink( '?view=frames&amp;eid='.$event->Id(), $event->Frames() ) ?></td>
+              <td class="colAlarmFrames"><?php echo makeLink( '?view=frames&amp;eid='.$event->Id(), $event->AlarmFrames() ) ?></td>
               <td class="colTotScore"><?php echo $event->TotScore() ?></td>
               <td class="colAvgScore"><?php echo $event->AvgScore() ?></td>
-              <td class="colMaxScore"><?php echo
- $event->MaxScore();
- #makePopupLink('?view=frame&amp;eid='.$event->Id().'&amp;fid=0', 'zmImage', array('image', reScale($event->Width(), $scale), reScale($event->Height(), $scale)), $event->MaxScore()) ?></td>
+              <td class="colMaxScore"><?php echo $event->MaxScore() ?></td>
 <?php
   if ( ZM_WEB_EVENT_DISK_SPACE ) {
     $disk_space_total += $event->DiskSpace();
diff --git a/web/skins/classic/views/filter.php b/web/skins/classic/views/filter.php
index 7ae58a706..38ad3e88c 100644
--- a/web/skins/classic/views/filter.php
+++ b/web/skins/classic/views/filter.php
@@ -47,11 +47,11 @@ foreach ( ZM\Filter::find(null,array('order'=>'lower(Name)')) as $Filter ) {
 }
 if ( !$filter ) {
   $filter = new ZM\Filter();
-}
 
-if ( isset($_REQUEST['filter']) ) {
-  # Update our filter object with whatever changes we have made before saving
-  #$filter->set($_REQUEST['filter']);
+  if ( isset($_REQUEST['filter']) ) {
+    # Update our filter object with whatever changes we have made before saving
+    $filter->set($_REQUEST['filter']);
+  }
 }
 
 $conjunctionTypes = ZM\getFilterQueryConjunctionTypes();
@@ -80,6 +80,7 @@ $attrTypes = array(
     'DiskBlocks'  => translate('AttrDiskBlocks'),
     'DiskPercent' => translate('AttrDiskPercent'),
     'DiskSpace'   => translate('AttrDiskSpace'),
+    'EventDiskSpace'   => translate('AttrEventDiskSpace'),
     'EndDateTime'    => translate('AttrEndDateTime'),
     'EndDate'        => translate('AttrEndDate'),
     'EndTime'        => translate('AttrEndTime'),
@@ -489,6 +490,7 @@ if ( canEdit('Events') ) {
   }
 }
 ?>
+          <button type="button" value="Debug" data-on-click-this="debugFilter"><?php echo translate('Debug') ?></button>
           <button type="button" value="Reset" data-on-click-this="resetFilter"><?php echo translate('Reset') ?></button>
         </div>
       </form>
diff --git a/web/skins/classic/views/frames.php b/web/skins/classic/views/frames.php
index 7afc96a7d..cdd6bc8b6 100644
--- a/web/skins/classic/views/frames.php
+++ b/web/skins/classic/views/frames.php
@@ -125,7 +125,6 @@ xhtmlHeaders(__FILE__, translate('Frames').' - '.$Event->Id());
     <div class="row justify-content-center">      
       <table
         id="framesTable"
-        data-toggle="table"
         data-pagination="true"
         data-show-pagination-switch="true"
         data-page-list="[10, 25, 50, 100, 200, All]"
@@ -207,15 +206,4 @@ if ( count($frames) ) {
         </table>
       </div>
   </div>
-<!-- Load the statistics for each frame -->
-<!-- This content gets hidden on init and only revailed on detail view -->
-<?php
-$row = 0;
-if ( count($frames) ) foreach ( $frames as $frame ) {
-  $eid = $frame['EventId'];
-  $fid = $frame['FrameId'];
-  include('_stats_table.php');
-  $row++;
-}
-?>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/group.php b/web/skins/classic/views/group.php
deleted file mode 100644
index 4b9ca6152..000000000
--- a/web/skins/classic/views/group.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-//
-// ZoneMinder web group detail view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canEdit('Groups') ) {
-  $view = 'error';
-  return;
-}
-
-if ( !empty($_REQUEST['gid']) ) {
-  $newGroup = new ZM\Group($_REQUEST['gid']);
-} else {
-  $newGroup = new ZM\Group();
-}
-
-xhtmlHeaders(__FILE__, translate('Group').' - '.$newGroup->Name());
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Group') ?> - <?php echo validHtmlStr($newGroup->Name()); ?></h2>
-    </div>
-    <div id="content">
-      <form id="groupForm" name="groupForm" method="post" action="?">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="gid" value="<?php echo $newGroup->Id() ?>"/>
-        <table id="contentTable" class="major">
-          <tbody>
-            <tr>
-              <th scope="row"><?php echo translate('Name') ?></th>
-              <td><input type="text" name="newGroup[Name]" value="<?php echo validHtmlStr($newGroup->Name()) ?>" data-on-input="configureButtons"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('ParentGroup') ?></th>
-              <td>
-<?php
-$Groups = array();
-foreach ( ZM\Group::find() as $Group ) {
-  $Groups[$Group->Id()] = $Group;
-}
-
-# This  array is indexed by parent_id
-$children = array();
-
-foreach ( $Groups as $id=>$Group ) {
-  if ( $Group->ParentId() != null ) {
-    if ( ! isset( $children[$Group->ParentId()] ) )
-      $children[$Group->ParentId()] = array();
-    $children[$Group->ParentId()][] = $Group;
-  }
-}
-
-function get_Id( $G ) {
-  return $G->Id();
-}
-
-function get_children($Group) {
-  global $children;
-
-  $kids = array();
-  if ( isset( $children[$Group->Id()] ) ) {
-    $kids += array_map('get_Id', $children[$Group->Id()]);
-    foreach ( $children[$Group->Id()] as $G ) {
-      foreach ( get_children($G) as $id ) {
-        $kids[] = $id;
-      }
-    }
-  }
-  return $kids;
-}
-
-$kids = get_children($newGroup);
-if ( $newGroup->Id() )
-  $kids[] = $newGroup->Id();
-$sql = 'SELECT Id,Name FROM `Groups`'.(count($kids)?' WHERE Id NOT IN ('.implode(',',array_map(function(){return '?';}, $kids)).')' : '').' ORDER BY Name';
-$options = array(''=>'None');
-foreach ( dbFetchAll($sql, null, $kids) as $option ) {
-  $options[$option['Id']] = str_repeat('&nbsp;&nbsp;', $Groups[$option['Id']]->depth()) . $option['Name'];
-}
-echo htmlSelect('newGroup[ParentId]', $options, $newGroup->ParentId(), array('data-on-change'=>'configureButtons'));
-?>
-              </td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Monitor') ?></th>
-              <td>
-                <select name="newGroup[MonitorIds][]" class="chosen" multiple="multiple" data-on-change="configureButtons">
-<?php
-  $monitors = dbFetchAll('SELECT Id,Name FROM Monitors ORDER BY Sequence ASC');
-  $monitorIds = $newGroup->MonitorIds();
-  foreach ( $monitors as $monitor ) {
-    if ( visibleMonitor($monitor['Id']) ) {
-?>
-                  <option value="<?php echo $monitor['Id'] ?>"<?php if ( in_array( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($monitor['Name']) ?></option>
-<?php
-    }
-  }
-?>
-                </select>
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <div id="contentButtons">
-          <button type="submit" name="action" value="Save"<?php $newGroup->Id() ? '' : ' disabled="disabled"'?>>
-          <?php echo translate('Save') ?>
-          </button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
-        </div>
-      </form>
-    </div>
-  </div>
-  <script nonce="<?php echo $cspNonce;?>">$j('.chosen').chosen();</script>
-<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js
index 47d488d07..47201689d 100644
--- a/web/skins/classic/views/js/console.js
+++ b/web/skins/classic/views/js/console.js
@@ -127,31 +127,12 @@ function reloadWindow() {
   window.location.replace( thisUrl );
 }
 
-function initPage() {
-  reloadWindow.periodical(consoleRefreshTimeout);
-  if ( showVersionPopup ) {
-    window.location.assign('?view=version');
-  }
-  if ( showDonatePopup ) {
-    $j('#donate').modal('show');
-  }
-
-  // Makes table sortable
-  $j( function() {
-    $j( "#consoleTableBody" ).sortable({
-      handle: ".sort",
-      update: applySort,
-      axis: 'Y'} );
-    $j( "#consoleTableBody" ).disableSelection();
-  } );
-
-  // Setup the thumbnail video animation
-  initThumbAnimation();
-
+// Manage the the Function modal and its buttons
+function manageFunctionModal() {
   $j('.functionLnk').click(function(evt) {
     evt.preventDefault();
     if ( !canEditEvents ) {
-      alert('You do not have permission to change monitor function.');
+      enoperm();
       return;
     }
     var mid = evt.currentTarget.getAttribute('data-mid');
@@ -167,12 +148,13 @@ function initPage() {
       return;
     }
     function_form.elements['newFunction'].value = monitor.Function;
-    function_form.elements['newEnabled'].checked = monitor.Enabled;
+    function_form.elements['newEnabled'].checked = monitor.Enabled == '1';
     function_form.elements['mid'].value = mid;
     document.getElementById('function_monitor_name').innerHTML = monitor.Name;
 
     $j('#modalFunction').modal('show');
   });
+
   // Manage the CANCEL modal buttons
   $j('.funcCancelBtn').click(function(evt) {
     evt.preventDefault();
@@ -182,15 +164,59 @@ function initPage() {
   // Manage the SAVE modal buttons
   $j('.funcSaveBtn').click(function(evt) {
     evt.preventDefault();
-    var form = evt.currentTarget.form;
-    var mid = form.elements['mid'].value;
-    var newFunc = $j('#newFunction').val();
-    var newEnabled = $j('#newEnabled').is(':checked') ? 1 : 0;
-    $j.getJSON(thisUrl + '?view=function&action=function&mid='+mid+'&newFunction='+newFunc+'&newEnabled='+newEnabled);
-    window.location.reload(true);
+    $j('#function_form').submit();
   });
 }
 
+function initPage() {
+  reloadWindow.periodical(consoleRefreshTimeout);
+  if ( showVersionPopup ) {
+    window.location.assign('?view=version');
+  }
+  if ( showDonatePopup ) {
+    $j.getJSON(thisUrl + '?request=modal&modal=donate')
+        .done(function(data) {
+          if ( $j('#donate').length ) {
+            $j('#donate').replaceWith(data.html);
+          } else {
+            $j("body").append(data.html);
+          }
+          $j('#donate').modal('show');
+          // Manage the Apply button
+          $j('#donateApplyBtn').click(function(evt) {
+            evt.preventDefault();
+            $j('#donateForm').submit();
+          });
+        })
+        .fail(logAjaxFail);
+  }
+
+  // Makes table sortable
+  $j( function() {
+    $j( "#consoleTableBody" ).sortable({
+      handle: ".sort",
+      update: applySort,
+      axis: 'Y'} );
+    $j( "#consoleTableBody" ).disableSelection();
+  } );
+
+  // Setup the thumbnail video animation
+  initThumbAnimation();
+
+  // Load the Function modal on page load
+  $j.getJSON(thisUrl + '?request=modal&modal=function')
+      .done(function(data) {
+        if ( $j('#modalFunction').length ) {
+          $j('#modalFunction').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        // Manage the Function modal
+        manageFunctionModal();
+      })
+      .fail(logAjaxFail);
+}
+
 function applySort(event, ui) {
   var monitor_ids = $j(this).sortable('toArray');
   var ajax = new Request.JSON( {
diff --git a/web/skins/classic/views/js/controlcap.js b/web/skins/classic/views/js/controlcap.js
index ff21286c2..52c428e28 100644
--- a/web/skins/classic/views/js/controlcap.js
+++ b/web/skins/classic/views/js/controlcap.js
@@ -108,3 +108,29 @@ function validateForm( form ) {
   return true;
 }
 
+function initPage() {
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  // Manage the CANCEL Button
+  document.getElementById("cancelBtn").addEventListener("click", function onCancelClick(evt) {
+    evt.preventDefault();
+    window.location.assign('?view=controlcaps');
+  });
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/controlcaps.js b/web/skins/classic/views/js/controlcaps.js
new file mode 100644
index 000000000..9f5d02059
--- /dev/null
+++ b/web/skins/classic/views/js/controlcaps.js
@@ -0,0 +1,119 @@
+var table = $j('#controlTable');
+var addNewBtn = $j('#addNewBtn');
+var editBtn = $j('#editBtn');
+var deleteBtn = $j('#deleteBtn');
+
+// Manage the Add New Control button
+function AddNewControl(el) {
+  url = el.getAttribute('data-url');
+  window.location.assign(url);
+}
+
+// Manage the Add New Control button
+function addNewControl(el) {
+  url = el.getAttribute('data-url');
+  window.location.assign(url);
+}
+
+// Manage the Edit Control button
+function editControl(el) {
+  var selection = getIdSelections();
+
+  url = el.getAttribute('data-url');
+  window.location.assign(url+selection);
+}
+
+// Returns the event id's of the selected rows
+function getIdSelections() {
+  return $j.map(table.bootstrapTable('getSelections'), function(row) {
+    return row.Id.replace(/(<([^>]+)>)/gi, ''); // strip the html from the element before sending
+  });
+}
+
+// Load the Delete Confirmation Modal HTML via Ajax call
+function getDelConfirmModal(key) {
+  $j.getJSON(thisUrl + '?request=modal&modal=delconfirm&key=' + key)
+      .done(function(data) {
+        if ( $j('#deleteConfirm').length ) {
+          $j('#deleteConfirm').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        manageDelConfirmModalBtns();
+      })
+      .fail(logAjaxFail);
+}
+
+// Manage the DELETE CONFIRMATION modal button
+function manageDelConfirmModalBtns() {
+  document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) {
+    if ( ! canEditControl ) {
+      enoperm();
+      return;
+    }
+
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=controlcaps&action=delete&cids[]='+selections.join('&cids[]='))
+        .done( function(data) {
+          $j('#eventTable').bootstrapTable('refresh');
+          window.location.reload(true);
+        })
+        .fail(logAjaxFail);
+  });
+}
+
+function initPage() {
+  // enable or disable buttons based on current selection and user rights
+  table.on('check.bs.table uncheck.bs.table ' +
+  'check-all.bs.table uncheck-all.bs.table',
+  function() {
+    selections = table.bootstrapTable('getSelections');
+
+    addNewBtn.prop('disabled', (selections.length || !canEditControl));
+    editBtn.prop('disabled', !((selections.length == 1) && canEditControl));
+    deleteBtn.prop('disabled', !(selections.length && canEditControl));
+  });
+
+  // Init the bootstrap-table
+  table.bootstrapTable({icons: icons});
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+
+  // Manage the DELETE button
+  document.getElementById("deleteBtn").addEventListener("click", function onDeleteClick(evt) {
+    if ( ! canEditControl ) {
+      enoperm();
+      return;
+    }
+
+    evt.preventDefault();
+    $j('#deleteConfirm').modal('show');
+  });
+
+  // Load the delete confirmation modal into the DOM
+  getDelConfirmModal('ConfirmDeleteControl');
+
+  // Hide these columns on first run when no cookie is saved
+  if ( !getCookie("zmControlTable.bs.table.columns") ) {
+    table.bootstrapTable('hideColumn', 'Id');
+  }
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/controlcaps.js.php b/web/skins/classic/views/js/controlcaps.js.php
new file mode 100644
index 000000000..6db74d130
--- /dev/null
+++ b/web/skins/classic/views/js/controlcaps.js.php
@@ -0,0 +1 @@
+var canEditControl = <?php echo canEdit('Control')?'true':'false' ?>;
diff --git a/web/skins/classic/views/js/donate.js b/web/skins/classic/views/js/donate.js
deleted file mode 100644
index eb3c25f50..000000000
--- a/web/skins/classic/views/js/donate.js
+++ /dev/null
@@ -1,3 +0,0 @@
-if ( action == 'donate' && option == 'go' ) {
-  zmWindow('/donate/');
-}
diff --git a/web/skins/classic/views/js/donate.js.php b/web/skins/classic/views/js/donate.js.php
deleted file mode 100644
index 4fc36d5bb..000000000
--- a/web/skins/classic/views/js/donate.js.php
+++ /dev/null
@@ -1,2 +0,0 @@
-var action = '<?php echo isset($_REQUEST['action'])?validJsStr($_REQUEST['action']):'' ?>';
-var option = '<?php echo isset($_REQUEST['option'])?validJsStr($_REQUEST['option']):'' ?>';
diff --git a/web/skins/classic/views/js/event.js b/web/skins/classic/views/js/event.js
index 18eefb725..313b8bad1 100644
--- a/web/skins/classic/views/js/event.js
+++ b/web/skins/classic/views/js/event.js
@@ -49,7 +49,8 @@ $j.ajaxSetup({timeout: AJAX_TIMEOUT}); //sets timeout for all getJSON.
 var cueFrames = null; //make cueFrames available even if we don't send another ajax query
 
 function initialAlarmCues(eventId) {
-  $j.getJSON(thisUrl + '?view=request&request=status&entity=frames&id=' + eventId, setAlarmCues); //get frames data for alarmCues and inserts into html
+  $j.getJSON(thisUrl + '?view=request&request=status&entity=frames&id=' + eventId, setAlarmCues) //get frames data for alarmCues and inserts into html
+      .fail(logAjaxFail);
 }
 
 function setAlarmCues(data) {
@@ -949,12 +950,27 @@ function renameEvent() {
   actQuery('rename', {eventName: newName});
 }
 
+// Manage the EDIT button
 function editEvent() {
-  createPopup('?view=eventdetail&eid='+eventData.Id, 'zmEventDetail', 'eventdetail');
+  $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eid='+eventData.Id)
+      .done(function(data) {
+        if ( $j('#eventDetailModal').length ) {
+          $j('#eventDetailModal').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#eventDetailModal').modal('show');
+        // Manage the Save button
+        $j('#eventDetailSaveBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#eventDetailForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
 }
 
 function exportEvent() {
-  createPopup('?view=export&eid='+eventData.Id, 'zmExport', 'export');
+  window.location.assign('?view=export&eid='+eventData.Id);
 }
 
 function archiveEvent() {
@@ -966,7 +982,7 @@ function unarchiveEvent() {
 }
 
 function showEventFrames() {
-  createPopup('?view=frames&eid='+eventData.Id, 'zmFrames', 'frames', WEB_LIST_THUMB_WIDTH, WEB_LIST_THUMB_HEIGHT);
+  window.location.assign('?view=frames&eid='+eventData.Id);
 }
 
 function showStream() {
@@ -1014,7 +1030,7 @@ function showStills() {
 
 function showFrameStats() {
   var fid = $('eventImageNo').get('text');
-  createPopup('?view=stats&eid='+eventData.Id+'&fid='+fid, 'zmStats', 'stats', eventData.Width, eventData.Height);
+  window.location.assign('?view=stats&eid='+eventData.Id+'&fid='+fid);
 }
 
 function videoEvent() {
diff --git a/web/skins/classic/views/js/events.js b/web/skins/classic/views/js/events.js
index 17df864d1..477adb96f 100644
--- a/web/skins/classic/views/js/events.js
+++ b/web/skins/classic/views/js/events.js
@@ -35,6 +35,63 @@ function getArchivedSelections() {
   return selection.includes("Yes");
 }
 
+// Load the Delete Confirmation Modal HTML via Ajax call
+function getDelConfirmModal() {
+  $j.getJSON(thisUrl + '?request=modal&modal=delconfirm')
+      .done(function(data) {
+        if ( $j('#deleteConfirm').length ) {
+          $j('#deleteConfirm').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        manageDelConfirmModalBtns();
+      })
+      .fail(logAjaxFail);
+}
+
+// Manage the DELETE CONFIRMATION modal button
+function manageDelConfirmModalBtns() {
+  document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) {
+    if ( ! canEditEvents ) {
+      enoperm();
+      return;
+    }
+
+    var selections = getIdSelections();
+
+    evt.preventDefault();
+    $j.getJSON(thisUrl + '?request=events&action=delete&eids[]='+selections.join('&eids[]='))
+        .done( function(data) {
+          $j('#eventTable').bootstrapTable('refresh');
+          window.location.reload(true);
+        })
+        .fail(logAjaxFail);
+  });
+
+  // Manage the CANCEL modal button
+  document.getElementById("delCancelBtn").addEventListener("click", function onDelCancelClick(evt) {
+    $j('#deleteConfirm').modal('hide');
+  });
+}
+
+function getEventDetailModal(eid) {
+  $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]=' + eid)
+      .done(function(data) {
+        if ( $j('#eventDetailModal').length ) {
+          $j('#eventDetailModal').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#eventDetailModal').modal('show');
+        // Manage the Save button
+        $j('#eventDetailSaveBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#eventDetailForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
+}
+
 function initPage() {
   var backBtn = $j('#backBtn');
   var viewBtn = $j('#viewBtn');
@@ -46,22 +103,11 @@ function initPage() {
   var deleteBtn = $j('#deleteBtn');
   var table = $j('#eventTable');
 
-  // Define the icons used in the bootstrap-table top-right toolbar
-  var icons = {
-    paginationSwitchDown: 'fa-caret-square-o-down',
-    paginationSwitchUp: 'fa-caret-square-o-up',
-    export: 'fa-download',
-    refresh: 'fa-sync',
-    toggleOff: 'fa-toggle-off',
-    toggleOn: 'fa-toggle-on',
-    columns: 'fa-th-list',
-    fullscreen: 'fa-arrows-alt',
-    detailOpen: 'fa-plus',
-    detailClose: 'fa-minus'
-  };
+  // Load the delete confirmation modal into the DOM
+  getDelConfirmModal();
 
   // Init the bootstrap-table
-  table.bootstrapTable('destroy').bootstrapTable({icons: icons});
+  table.bootstrapTable({icons: icons});
 
   // Hide these columns on first run when no cookie is saved
   if ( !getCookie("zmEventsTable.bs.table.columns") ) {
@@ -125,14 +171,18 @@ function initPage() {
     var selections = getIdSelections();
 
     evt.preventDefault();
-    $j.getJSON(thisUrl + '?view=events&action=archive&eids[]='+selections.join('&eids[]='));
-    window.location.reload(true);
+    $j.getJSON(thisUrl + '?request=events&action=archive&eids[]='+selections.join('&eids[]='))
+        .done( function(data) {
+          $j('#eventTable').bootstrapTable('refresh');
+          window.location.reload(true);
+        })
+        .fail(logAjaxFail);
   });
 
   // Manage the UNARCHIVE button
   document.getElementById("unarchiveBtn").addEventListener("click", function onUnarchiveClick(evt) {
     if ( ! canEditEvents ) {
-      alert("You do not have permission to Unarchive events.");
+      enoperm();
       return;
     }
 
@@ -140,28 +190,41 @@ function initPage() {
     console.log(selections);
 
     evt.preventDefault();
-    $j.getJSON(thisUrl + '?view=events&action=unarchive&eids[]='+selections.join('&eids[]='));
+    $j.getJSON(thisUrl + '?request=events&action=unarchive&eids[]='+selections.join('&eids[]='))
+        .done( function(data) {
+          $j('#eventTable').bootstrapTable('refresh');
+          window.location.reload(true);
+        })
+        .fail(logAjaxFail);
 
-    if ( openFilterWindow ) {
-      //opener.location.reload(true);
-      createPopup( '?view=filter&page='+thisPage+filterQuery, 'zmFilter', 'filter' );
-      location.replace( '?view='+currentView+'&page='+thisPage+filterQuery );
-    } else {
-      window.location.reload(true);
-    }
+    window.location.reload(true);
   });
 
   // Manage the EDIT button
   document.getElementById("editBtn").addEventListener("click", function onEditClick(evt) {
     if ( ! canEditEvents ) {
-      alert("You do not have permission to edit events.");
+      enoperm();
       return;
     }
 
     var selections = getIdSelections();
 
     evt.preventDefault();
-    createPopup('?view=eventdetail&eids[]='+selections.join('&eids[]='), 'zmEventDetail', 'eventdetail');
+    $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]='+selections.join('&eids[]='))
+        .done(function(data) {
+          if ( $j('#eventDetailModal').length ) {
+            $j('#eventDetailModal').replaceWith(data.html);
+          } else {
+            $j("body").append(data.html);
+          }
+          $j('#eventDetailModal').modal('show');
+          // Manage the Save button
+          $j('#eventDetailSaveBtn').click(function(evt) {
+            evt.preventDefault();
+            $j('#eventDetailForm').submit();
+          });
+        })
+        .fail(logAjaxFail);
   });
 
   // Manage the EXPORT button
@@ -183,7 +246,7 @@ function initPage() {
   // Manage the DELETE button
   document.getElementById("deleteBtn").addEventListener("click", function onDeleteClick(evt) {
     if ( ! canEditEvents ) {
-      alert("You do not have permission to delete events.");
+      enoperm();
       return;
     }
 
@@ -191,23 +254,11 @@ function initPage() {
     $j('#deleteConfirm').modal('show');
   });
 
-  // Manage the DELETE CONFIRMATION modal button
-  document.getElementById("delConfirmBtn").addEventListener("click", function onDelConfirmClick(evt) {
-    if ( ! canEditEvents ) {
-      alert("You do not have permission to delete events.");
-      return;
-    }
-
-    var selections = getIdSelections();
-
+  // Manage the eventdetail links in the events list
+  $j(".eDetailLink").click(function(evt) {
     evt.preventDefault();
-    $j.getJSON(thisUrl + '?request=events&action=delete&eids[]='+selections.join('&eids[]='));
-    window.location.reload(true);
-  });
-
-  // Manage the CANCEL modal button
-  document.getElementById("delCancelBtn").addEventListener("click", function onDelCancelClick(evt) {
-    $j('#deleteConfirm').modal('hide');
+    var eid = $j(this).data('eid');
+    getEventDetailModal(eid);
   });
 
   // The table is initially given a hidden style, so now that we are done rendering, show it
diff --git a/web/skins/classic/views/js/events.js.php b/web/skins/classic/views/js/events.js.php
index 0b96f12c5..3a60a97ba 100644
--- a/web/skins/classic/views/js/events.js.php
+++ b/web/skins/classic/views/js/events.js.php
@@ -2,8 +2,6 @@
   global $filterQuery;
   global $sortQuery;
 ?>
-//var openFilterWindow = <?php echo $_REQUEST['filter']?'true':'false' ?>;
-var openFilterWindow = false;
 
 var filterQuery = '<?php echo isset($filterQuery)?validJsStr(htmlspecialchars_decode($filterQuery)):'' ?>';
 var sortQuery = '<?php echo isset($sortQuery)?validJsStr(htmlspecialchars_decode($sortQuery)):'' ?>';
diff --git a/web/skins/classic/views/js/export.js b/web/skins/classic/views/js/export.js
index dd010244e..8c1c63199 100644
--- a/web/skins/classic/views/js/export.js
+++ b/web/skins/classic/views/js/export.js
@@ -80,12 +80,52 @@ function exportEvents( ) {
   exportTimer = exportProgress.periodical( 500 );
 }
 
+function getEventDetailModal(eid) {
+  $j.getJSON(thisUrl + '?request=modal&modal=eventdetail&eids[]=' + eid)
+      .done(function(data) {
+        if ( $j('#eventDetailModal').length ) {
+          $j('#eventDetailModal').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#eventDetailModal').modal('show');
+        // Manage the Save button
+        $j('#eventDetailSaveBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#eventDetailForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
+}
+
 function initPage() {
   configureExportButton( $('exportButton') );
   if ( exportReady ) {
     startDownload.pass(exportFile).delay(1500);
   }
   document.getElementById('exportButton').addEventListener('click', exportEvents);
+
+  // Manage the eventdetail link in the export list
+  $j(".eDetailLink").click(function(evt) {
+    evt.preventDefault();
+    var eid = $j(this).data('eid');
+    getEventDetailModal(eid);
+  });
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
 }
 
 window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/filter.js b/web/skins/classic/views/js/filter.js
index 2080c9937..163a7fdde 100644
--- a/web/skins/classic/views/js/filter.js
+++ b/web/skins/classic/views/js/filter.js
@@ -39,12 +39,19 @@ function validateForm(form) {
   } else if ( form.elements['filter[UpdateDiskSpace]'].checked ) {
     var have_endtime_term = false;
     for ( var i = 0; i < rows.length; i++ ) {
-      if ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'EndDateTime' ) {
+      if (
+        ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'EndDateTime' )
+        ||
+        ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'EndTime' )
+        ||
+        ( form.elements['filter[Query][terms][' + i + '][attr]'].value == 'EndDate' )
+      ) {
         have_endtime_term = true;
+        break;
       }
     }
     if ( ! have_endtime_term ) {
-      return confirm('You don\'t have an EndTime term in your filter.  This will match recordings that are still in progress and so the UpdateDiskSpace action will be a waste of time and resources.  Ideally you should have an EndTime IS NOT NULL term.  Do you want to continue?');
+      return confirm('You don\'t have an End Date/Time term in your filter.  This might match recordings that are still in progress and so the UpdateDiskSpace action will be a waste of time and resources.  Ideally you should have an End Date/Time IS NOT NULL term.  Do you want to continue?');
     }
   } else if ( form.elements['filter[Background]'].checked ) {
     if ( ! (
@@ -388,11 +395,53 @@ function delTerm( element ) {
   parseRows(rows);
 }
 
+function debugFilter() {
+  getModal('filterdebug');
+}
+
+// Load the Delete Confirmation Modal HTML via Ajax call
+function getModal(id) {
+  $j.getJSON(thisUrl + '?request=modal&modal='+id+'&fid='+filterid)
+      .done(function(data) {
+        if ( !data ) {
+          console.error("Get modal returned no data");
+          return;
+        }
+
+        if ( $j('#'+id).length ) {
+          console.log("replacing");
+          $j('#'+id).replaceWith(data.html);
+        } else {
+          console.log("Adding to body"+data.html);
+          $j('body').append(data.html);
+        }
+        manageModalBtns(id);
+        modal = $j('#'+id+'Modal');
+        if ( ! modal.length ) {
+          console.log("No modal found");
+        }
+        $j('#'+id+'Modal').modal('show');
+      })
+      .fail(logAjaxFail);
+}
+
+function manageModalBtns(id) {
+  console.log(id);
+  // Manage the CANCEL modal button
+  var cancelBtn = document.getElementById(id+"CancelBtn");
+  if ( cancelBtn ) {
+    document.getElementById(id+"CancelBtn").addEventListener("click", function onCancelClick(evt) {
+      $j('#'+id).modal('hide');
+    });
+  }
+}
+
 function init() {
   updateButtons( $('executeButton') );
   $j('#Id').chosen();
   $j('#fieldsTable select').not("[name$='br\\]'], [name$='cnj\\]']").chosen({width: '101%'}); //Every select except brackets/and
   $j("#sortTable [name$='sort_field\\]']").chosen();
+  parseRows($j('#fieldsTable tbody').children());
 }
 
 window.addEventListener( 'DOMContentLoaded', init );
diff --git a/web/skins/classic/views/js/filter.js.php b/web/skins/classic/views/js/filter.js.php
index e01daf0da..f7f7547f2 100644
--- a/web/skins/classic/views/js/filter.js.php
+++ b/web/skins/classic/views/js/filter.js.php
@@ -11,7 +11,9 @@
   global $monitors;
   global $zones;
   global $booleanValues;
+  global $filter;
 ?>
+  var filterid = '<?php echo $filter->Id() ?>';
 var filterQuery = '<?php echo isset($filterQuery) ? validJsStr(htmlspecialchars_decode($filterQuery)) : '' ?>';
 var sortQuery = '<?php echo isset($sortQuery) ? validJsStr(htmlspecialchars_decode($sortQuery)) : '' ?>';
 
diff --git a/web/skins/classic/views/js/frame.js b/web/skins/classic/views/js/frame.js
index d40fb10a5..5375bb098 100644
--- a/web/skins/classic/views/js/frame.js
+++ b/web/skins/classic/views/js/frame.js
@@ -37,7 +37,7 @@ if ( !scale ) {
 }
 
 document.addEventListener('DOMContentLoaded', function onDCL() {
-  document.getElementById('scale').addEventListener('change', changeScale);
+  document.getElementById('scaleControl').addEventListener('change', changeScale);
 });
 
 function initPage() {
diff --git a/web/skins/classic/views/js/frames.js b/web/skins/classic/views/js/frames.js
index 8b3ff28ec..57bf8e4b0 100644
--- a/web/skins/classic/views/js/frames.js
+++ b/web/skins/classic/views/js/frames.js
@@ -25,30 +25,21 @@ function processClicks(event, field, value, row, $element) {
   }
 }
 
-function detailFormatter(index, row, element) {
-  return $j(element).html($j('#contentStatsTable'+index).clone(true).show());
+// This function handles when the user clicks a "+" link to retrieve stats for a frame
+function detailFormatter(index, row, $detail) {
+  $detail.html('Please wait. Loading from ajax request...');
+  $j.get(thisUrl + '?request=stats&eid=' + row.EventId + '&fid=' + row.FrameId + '&row=' + index)
+      .done(function(data) {
+        $detail.html(data.html);
+      })
+      .fail(logAjaxFail);
 }
-
 function initPage() {
   var backBtn = $j('#backBtn');
   var table = $j('#framesTable');
 
-  // Define the icons used in the bootstrap-table top-right toolbar
-  var icons = {
-    paginationSwitchDown: 'fa-caret-square-o-down',
-    paginationSwitchUp: 'fa-caret-square-o-up',
-    export: 'fa-download',
-    refresh: 'fa-sync',
-    toggleOff: 'fa-toggle-off',
-    toggleOn: 'fa-toggle-on',
-    columns: 'fa-th-list',
-    fullscreen: 'fa-arrows-alt',
-    detailOpen: 'fa-plus',
-    detailClose: 'fa-minus'
-  };
-
   // Init the bootstrap-table
-  table.bootstrapTable('destroy').bootstrapTable({icons: icons});
+  table.bootstrapTable({icons: icons});
 
   // Hide these columns on first run when no cookie is saved
   if ( !getCookie("zmFramesTable.bs.table.columns") ) {
diff --git a/web/skins/classic/views/js/group.js b/web/skins/classic/views/js/group.js
deleted file mode 100644
index 26aa9cae6..000000000
--- a/web/skins/classic/views/js/group.js
+++ /dev/null
@@ -1,20 +0,0 @@
-function configureButtons() {
-  var form = $j('#groupForm')[0];
-  if ( !form ) {
-    console.log("No groupForm found");
-    return;
-  }
-  if ( !canEditGroups ) {
-    console.log("Cannot edit groups");
-    form.elements['action'].disabled = disabled;
-    return;
-  }
-  var disabled = false;
-
-  if ( form.elements['newGroup[Name]'].value == '' ) {
-    disabled = true;
-  }
-  form.elements['action'].disabled = disabled;
-}
-
-window.focus();
diff --git a/web/skins/classic/views/js/groups.js b/web/skins/classic/views/js/groups.js
index 8ff1b61ff..d6eb306bf 100644
--- a/web/skins/classic/views/js/groups.js
+++ b/web/skins/classic/views/js/groups.js
@@ -1,5 +1,22 @@
+// Manage the NEW Group button
 function newGroup() {
-  createPopup( '?view=group', 'zmGroup', 'group' );
+  $j.getJSON(thisUrl + '?request=modal&modal=group')
+      .done(function(data) {
+        if ( $j('#groupModal').length ) {
+          $j('#groupModal').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#groupModal').modal('show');
+        $j('.chosen').chosen("destroy");
+        $j('.chosen').chosen();
+        // Manage the Save button
+        $j('#grpModalSaveBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#groupForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
 }
 
 function setGroup( element ) {
@@ -13,7 +30,23 @@ function editGroup( element ) {
   if ( !gid ) {
     console.log('No group id found in editGroup');
   } else {
-    createPopup('?view=group&gid='+gid, 'zmGroup'+gid, 'group');
+    $j.getJSON(thisUrl + '?request=modal&modal=group&gid=' + gid)
+        .done(function(data) {
+          if ( $j('#groupModal').length ) {
+            $j('#groupModal').replaceWith(data.html);
+          } else {
+            $j("body").append(data.html);
+          }
+          $j('#groupModal').modal('show');
+          $j('.chosen').chosen("destroy");
+          $j('.chosen').chosen();
+          // Manage the Save button
+          $j('#grpModalSaveBtn').click(function(evt) {
+            evt.preventDefault();
+            $j('#groupForm').submit();
+          });
+        })
+        .fail(logAjaxFail);
   }
 }
 
@@ -33,4 +66,21 @@ function configureButtons( element ) {
   }
 }
 
-window.focus();
+function configModalBtns() {
+  var form = $j('#groupForm')[0];
+  if ( !form ) {
+    console.log("No groupForm found");
+    return;
+  }
+  if ( !canEditGroups ) {
+    console.log("Cannot edit groups");
+    form.elements['action'].disabled = disabled;
+    return;
+  }
+  var disabled = false;
+
+  if ( form.elements['newGroup[Name]'].value == '' ) {
+    disabled = true;
+  }
+  form.elements['action'].disabled = disabled;
+}
diff --git a/web/skins/classic/views/js/log.js b/web/skins/classic/views/js/log.js
index f0aee7c00..53f197eab 100644
--- a/web/skins/classic/views/js/log.js
+++ b/web/skins/classic/views/js/log.js
@@ -210,22 +210,31 @@ function resetLog() {
   refreshLog();
 }
 
-var exportFormValidator;
+var exportFormValidator = null;
 
 function exportLog() {
-  exportFormValidator.reset();
-  $('exportLog').overlayShow();
+  getModal('log_export');
+
+  if ( !exportFormValidator ) {
+    exportFormValidator = new Form.Validator.Inline($('exportForm'), {
+      useTitles: true,
+      warningPrefix: '',
+      errorPrefix: ''
+    });
+  } else {
+    exportFormValidator.reset();
+  }
 }
 
 function exportResponse( response ) {
-  $('exportLog').unspin();
+  $('log_exportModal').unspin();
   if ( response.result == 'Ok' ) {
     window.location.replace( thisUrl+'?view=request&request=log&task=download&key='+response.key+'&format='+response.format );
   }
 }
 
 function exportFail( request ) {
-  $('exportLog').unspin();
+  $('log_exportModal').unspin();
   $('exportErrorText').set('text', request.status+' / '+request.statusText);
   $('exportError').show();
   Error('Export request failed: '+request.status+' / '+request.statusText);
@@ -233,12 +242,18 @@ function exportFail( request ) {
 
 function exportRequest() {
   var form = $('exportForm');
+  console.log(form);
   $('exportErrorText').set('text', '');
   $('exportError').hide();
   if ( form.validate() ) {
     var exportParms = "view=request&request=log&task=export";
     var exportReq = new Request.JSON({url: thisUrl, method: 'post', link: 'cancel', onSuccess: exportResponse, onFailure: exportFail});
-    var selection = form.getElement('input[name=selector]:checked').get('value');
+    var selector = form.querySelectorAll('input[name=selector]:checked');
+    if ( !selector.length ) {
+      alert("Please select how to filter logs");
+      return;
+    }
+    var selection = selector[0].get('value');
     if ( selection == 'filter' || selection == 'current' ) {
       $$('#filters select').each(
           function( select ) {
@@ -257,7 +272,7 @@ function exportRequest() {
       }
     }
     exportReq.send(exportParms+"&"+form.toQueryString());
-    $('exportLog').spin();
+    $('log_exportModal').spin();
   }
 }
 
@@ -294,6 +309,8 @@ function updateFilterSelectors() {
         if ( filter[key] ) {
           selector.set('value', filter[key]);
         }
+        $j(selector).chosen('destroy');
+        $j(selector).chosen();
       }
   );
 }
@@ -331,11 +348,6 @@ function initPage() {
     } // end if loCount > displayLimit
   }
   );
-  exportFormValidator = new Form.Validator.Inline($('exportForm'), {
-    useTitles: true,
-    warningPrefix: '',
-    errorPrefix: ''
-  });
   new Asset.css('css/spinner.css');
   fetchNextLogs();
 }
diff --git a/web/skins/classic/views/js/monitor.js b/web/skins/classic/views/js/monitor.js
index b9f37c090..d612e806e 100644
--- a/web/skins/classic/views/js/monitor.js
+++ b/web/skins/classic/views/js/monitor.js
@@ -137,6 +137,16 @@ function initPage() {
   document.querySelectorAll('input[name="newMonitor[WebColour]"]').forEach(function(el) {
     el.onchange = window['change_WebColour'].bind(el);
   });
+  document.querySelectorAll('select[name="newMonitor[Type]"]').forEach(function(el) {
+    el.onchange = function() {
+      var form = document.getElementById('contentForm');
+      form.tab.value = 'general';
+      form.submit();
+    };
+  });
+  document.querySelectorAll('input[name="newMonitor[ImageBufferCount]"],input[name="newMonitor[Width]"],input[name="newMonitor[Height]"]').forEach(function(el) {
+    el.oninput = window['update_estimated_ram_use'].bind(el);
+  });
 
   $j('.chosen').chosen();
 
@@ -193,6 +203,33 @@ function initPage() {
     evt.preventDefault();
     window.location.assign('?view=console');
   });
+
+  if ( ZM_OPT_USE_GEOLOCATION ) {
+    if ( window.L ) {
+      var form = document.getElementById('contentForm');
+      var latitude = form.elements['newMonitor[Latitude]'].value;
+      var longitude = form.elements['newMonitor[Longitude]'].value;
+      console.log("lat: " + latitude + ', long:'+longitude);
+      map = L.map('LocationMap', {
+        center: L.latLng(latitude, longitude),
+        zoom: 13,
+        onclick: function() {
+          alert('click');
+        }
+      });
+      L.tileLayer(ZM_OPT_GEOLOCATION_TILE_PROVIDER, {
+        attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>, Imagery © <a href="https://www.mapbox.com/">Mapbox</a>',
+        maxZoom: 18,
+        id: 'mapbox/streets-v11',
+        tileSize: 512,
+        zoomOffset: -1,
+        accessToken: ZM_OPT_GEOLOCATION_ACCESS_TOKEN,
+      }).addTo(map);
+      L.marker([latitude, longitude]).addTo(map);
+    } else {
+      console.log('Location turned on but leaflet not installed.');
+    }
+  } // end if ZM_OPT_USE_GEOLOCATION
 } // end function initPage()
 
 function change_WebColour() {
@@ -219,4 +256,32 @@ function random_WebColour() {
   );
 }
 
+function update_estimated_ram_use() {
+  var buffer_count = document.querySelectorAll('input[name="newMonitor[ImageBufferCount]"]')[0].value;
+  console.log(buffer_count);
+  var width = document.querySelectorAll('input[name="newMonitor[Width]"]')[0].value;
+  console.log(width);
+  var height = document.querySelectorAll('input[name="newMonitor[Height]"]')[0].value;
+  console.log(height);
+  var colours = document.querySelectorAll('select[name="newMonitor[Colours]"]')[0].value;
+  console.log(colours);
+
+  document.getElementById('estimated_ram_use').innerHTML = human_filesize(buffer_count * width * height * colours, 0);
+}
+
+function updateLatitudeAndLongitude(latitude, longitude) {
+  var form = document.getElementById('contentForm');
+  form.elements['newMonitor[Latitude]'].value = latitude;
+  form.elements['newMonitor[Longitude]'].value = longitude;
+}
+function getLocation() {
+  if ('geolocation' in navigator) {
+    navigator.geolocation.getCurrentPosition((position) => {
+      updateLatitudeAndLongitude(position.coords.latitude, position.coords.longitude);
+    });
+  } else {
+    console.log("Geolocation not available");
+  }
+}
+
 window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php
index b59049f12..cc61270d0 100644
--- a/web/skins/classic/views/js/monitor.js.php
+++ b/web/skins/classic/views/js/monitor.js.php
@@ -1,3 +1,10 @@
+var ZM_OPT_USE_GEOLOCATION = '<?php echo ZM_OPT_USE_GEOLOCATION ?>';
+<?php
+if ( ZM_OPT_USE_GEOLOCATION ) { 
+  echo 'var ZM_OPT_GEOLOCATION_TILE_PROVIDER=\''.ZM_OPT_GEOLOCATION_TILE_PROVIDER.'\''.PHP_EOL;
+  echo 'var ZM_OPT_GEOLOCATION_ACCESS_TOKEN=\''.ZM_OPT_GEOLOCATION_ACCESS_TOKEN.'\''.PHP_EOL;
+}
+?>
 var optControl = <?php echo ZM_OPT_CONTROL ?>;
 var hasOnvif = <?php echo ZM_HAS_ONVIF ?>;
 var defaultAspectRatio = '<?php echo ZM_DEFAULT_ASPECT_RATIO ?>';
diff --git a/web/skins/classic/views/js/newlog.js b/web/skins/classic/views/js/newlog.js
new file mode 100644
index 000000000..ddaabcfc8
--- /dev/null
+++ b/web/skins/classic/views/js/newlog.js
@@ -0,0 +1,105 @@
+var table = $j('#logTable');
+
+/*
+This is the format of the json object sent by bootstrap-table
+
+var params =
+{
+"type":"get",
+"data":
+  {
+  "search":"some search text",
+  "sort":"DateTime",
+  "order":"asc",
+  "offset":0,
+  "limit":25
+  "filter":
+    {
+    "message":"some advanced search text"
+    "level":"some more advanced search text"
+    }
+  },
+"cache":true,
+"contentType":"application/json",
+"dataType":"json"
+};
+*/
+
+// Called by bootstrap-table to retrieve zm log data
+function ajaxRequest(params) {
+  $j.getJSON(thisUrl + '?view=request&request=newlog&task=query', params.data)
+      .done(function(data) {
+        //console.log('Ajax parameters: ' + JSON.stringify(params));
+        // rearrange the result into what bootstrap-table expects
+        params.success({total: data.total, totalNotFiltered: data.totalNotFiltered, rows: data.rows});
+        updateHeaderStats(data);
+      })
+      .fail(logAjaxFail);
+}
+
+function updateHeaderStats(data) {
+  var pageNum = table.bootstrapTable('getOptions').pageNumber;
+  var pageSize = table.bootstrapTable('getOptions').pageSize;
+  var startRow = ( (pageNum - 1 ) * pageSize ) + 1;
+  var stopRow = pageNum * pageSize;
+  var newClass = (data.logstate == 'ok') ? 'text-success' : (data.logstate == 'alert' ? 'text-warning' : ((data.logstate == 'alarm' ? 'text-danger' : '')));
+
+  $j('#logState').text(data.logstate);
+  $j('#logState').removeClass('text-success');
+  $j('#logState').removeClass('text-warning');
+  $j('#logState').removeClass('text-danger');
+  $j('#logState').addClass(newClass);
+
+  $j('#totalLogs').text(data.total);
+  $j('#availLogs').text(data.totalNotFiltered);
+  $j('#lastUpdate').text(data.updated);
+  $j('#displayLogs').text(startRow + ' to ' + stopRow);
+}
+
+function initPage() {
+  var backBtn = $j('#backBtn');
+
+  // Init the bootstrap-table with custom icons
+  table.bootstrapTable({icons: icons});
+
+  // Assign inf, err, fat, dbg color classes to the rows in the table
+  table.on('post-body.bs.table', function(data) {
+    var lvl_ndx = $j('#logTable tr th').filter(function() {
+      return $j(this).text().trim() == 'Level';
+    }).index();
+
+    $j('#logTable tr').each(function(ndx, row) {
+      var row = $j(row);
+      var level = row.find('td').eq(lvl_ndx).text().trim();
+
+      if (( level == 'FAT' ) || ( level == 'PNC' )) {
+        row.addClass('log-fat');
+      } else if ( level == 'ERR' ) {
+        row.addClass('log-err');
+      } else if ( level == 'WAR' ) {
+        row.addClass('log-war');
+      } else if ( level == 'DBG' ) {
+        row.addClass('log-dbg');
+      }
+    });
+  });
+
+  // Don't enable the back button if there is no previous zm page to go back to
+  backBtn.prop('disabled', !document.referrer.length);
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/options.js b/web/skins/classic/views/js/options.js
new file mode 100644
index 000000000..843225a67
--- /dev/null
+++ b/web/skins/classic/views/js/options.js
@@ -0,0 +1,76 @@
+// Load the Server Modal HTML via Ajax call
+function getServerModal(sid) {
+  $j.getJSON(thisUrl + '?request=modal&modal=server&id=' + sid)
+      .done(function(data) {
+        if ( $j('#ServerModal').length ) {
+          $j('#ServerModal').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#ServerModal').modal('show');
+        // Manage the Save button
+        $j('#serverSubmitBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#serverModalForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
+}
+
+function enableServerModal() {
+  $j(".serverCol").click(function(evt) {
+    evt.preventDefault();
+    var sid = $j(this).data('sid');
+    getServerModal(sid);
+  });
+  $j('#NewServerBtn').click(function(evt) {
+    evt.preventDefault();
+    getServerModal(0);
+  });
+}
+
+// Load the Storage Modal HTML via Ajax call
+function getStorageModal(sid) {
+  $j.getJSON(thisUrl + '?request=modal&modal=storage&id=' + sid)
+      .done(function(data) {
+        if ( $j('#storageModal').length ) {
+          $j('#storageModal').replaceWith(data.html);
+        } else {
+          $j("body").append(data.html);
+        }
+        $j('#storageModal').modal('show');
+        // Manage the Save button
+        $j('#storageSubmitBtn').click(function(evt) {
+          evt.preventDefault();
+          $j('#storageModalForm').submit();
+        });
+      })
+      .fail(logAjaxFail);
+}
+
+function enableStorageModal() {
+  $j(".storageCol").click(function(evt) {
+    evt.preventDefault();
+    var sid = $j(this).data('sid');
+    getStorageModal(sid);
+  });
+  $j('#NewStorageBtn').click(function(evt) {
+    evt.preventDefault();
+    getStorageModal(0);
+  });
+}
+
+function initPage() {
+  var NewStorageBtn = $j('#NewStorageBtn');
+  var NewServerBtn = $j('#NewServerBtn');
+
+  if ( canEditSystem ) enableStorageModal();
+  if ( canEditSystem ) enableServerModal();
+
+  NewStorageBtn.prop('disabled', !canEditSystem);
+  NewServerBtn.prop('disabled', !canEditSystem);
+}
+
+$j(document).ready(function() {
+  initPage();
+});
diff --git a/web/skins/classic/views/js/options.js.php b/web/skins/classic/views/js/options.js.php
index 6947f8da8..5281cde8c 100644
--- a/web/skins/classic/views/js/options.js.php
+++ b/web/skins/classic/views/js/options.js.php
@@ -3,3 +3,5 @@ var restartWarning = <?php echo empty($restartWarning)?'false':'true' ?>;
 if ( restartWarning ) {
   alert( "<?php echo translate('OptionRestartWarning') ?>" );
 }
+
+var canEditSystem = <?php echo canEdit('System') ? 'true' : 'false' ?>;
diff --git a/web/skins/classic/views/js/state.js b/web/skins/classic/views/js/state.js
deleted file mode 100644
index e8b4db36d..000000000
--- a/web/skins/classic/views/js/state.js
+++ /dev/null
@@ -1,62 +0,0 @@
-$j(document).ready(function() {
-  // Enable or disable the Delete button depending on the selected run state
-  $j("#runState").change(function() {
-    runstate = $j(this).val();
-
-    if ( (runstate == 'stop') || (runstate == 'restart') || (runstate == 'start') || (runstate == 'default') ) {
-      $j("#btnDelete").prop("disabled", true);
-    } else {
-      $j("#btnDelete").prop("disabled", false);
-    }
-  });
-
-  // Enable or disable the Save button when entering a new state
-  $j("#newState").keyup(function() {
-    length = $j(this).val().length;
-    if ( length < 1 ) {
-      $j("#btnSave").prop("disabled", true);
-    } else {
-      $j("#btnSave").prop("disabled", false);
-    }
-  });
-
-
-  // Delete a state
-  $j("#btnDelete").click(function() {
-    stateStuff('delete', $j("#runState").val());
-  });
-
-
-  // Save a new state
-  $j("#btnSave").click(function() {
-    stateStuff('save', undefined, $j("#newState").val());
-  });
-
-  // Change state
-  $j("#btnApply").click(function() {
-    stateStuff('state', $j("#runState").val());
-  });
-
-  function stateStuff(action, runState, newState) {
-    // the state action will redirect to console
-    var formData = {
-      'view': 'state',
-      'action': action,
-      'apply': 1,
-      'runState': runState,
-      'newState': newState
-    };
-
-    $j("#pleasewait").toggleClass("hidden");
-
-    $j.ajax({
-      type: 'POST',
-      url: thisUrl,
-      data: formData,
-      dataType: 'html',
-      timeout: 0
-    }).done(function(data) {
-      location.reload();
-    });
-  }
-});
diff --git a/web/skins/classic/views/js/state.js.php b/web/skins/classic/views/js/state.js.php
deleted file mode 100644
index a7c14a0dc..000000000
--- a/web/skins/classic/views/js/state.js.php
+++ /dev/null
@@ -1,2 +0,0 @@
-var running = <?php echo daemonCheck()?'true':'false' ?>;
-var applying = <?php echo !empty($_REQUEST['apply'])?'true':'false' ?>;
diff --git a/web/skins/classic/views/js/user.js b/web/skins/classic/views/js/user.js
index d491514e3..248de8fc5 100644
--- a/web/skins/classic/views/js/user.js
+++ b/web/skins/classic/views/js/user.js
@@ -28,6 +28,21 @@ function initPage() {
       return false;
     };
   });
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
 } // end function initPage
 
 window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index 38c108bb3..22c7689cb 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -560,6 +560,9 @@ function watchdogCheck(type) {
 function watchdogOk(type) {
   watchdogInactive[type] = false;
 }
+function presetSelectorBlur() {
+  this.selectedIndex = 0;
+}
 
 var monitors = new Array();
 
@@ -569,6 +572,7 @@ function initPage() {
   //form.elements['newZone[Name]'].disabled = true;
   //form.elements['newZone[Type]'].disabled = true;
   form.presetSelector.disabled = true;
+  form.presetSelector.onblur = window['presetSelectorBlur'].bind(form.presetSelector, form.presetSelector);
   //form.elements['newZone[Units]'].disabled = true;
   if ( CheckMethod = form.elements['newZone[CheckMethod]'] ) {
     CheckMethod.disabled = true;
@@ -665,6 +669,21 @@ function initPage() {
     el.addEventListener("load", imageLoadEvent, {passive: true});
   });
   window.addEventListener("resize", drawZonePoints, {passive: true});
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
 } // initPage
 
 function imageLoadEvent() {
diff --git a/web/skins/classic/views/js/zones.js b/web/skins/classic/views/js/zones.js
index 634db6843..a0eec294e 100644
--- a/web/skins/classic/views/js/zones.js
+++ b/web/skins/classic/views/js/zones.js
@@ -9,6 +9,12 @@ function streamCmdQuit( ) {
   }
 }
 
+// Manage the Add New Zone button
+function AddNewZone(el) {
+  url = el.getAttribute('data-url');
+  window.location.assign(url);
+}
+
 var monitors = new Array();
 
 function initPage() {
@@ -19,6 +25,21 @@ function initPage() {
     var delay = Math.round( (Math.random()+0.5)*statusRefreshTimeout );
     monitors[i].start(delay);
   }
+
+  // Manage the BACK button
+  document.getElementById("backBtn").addEventListener("click", function onBackClick(evt) {
+    evt.preventDefault();
+    window.history.back();
+  });
+
+  // Disable the back button if there is nothing to go back to
+  $j('#backBtn').prop('disabled', !document.referrer.length);
+
+  // Manage the REFRESH Button
+  document.getElementById("refreshBtn").addEventListener("click", function onRefreshClick(evt) {
+    evt.preventDefault();
+    window.location.reload(true);
+  });
 }
 
 window.addEventListener('DOMContentLoaded', initPage);
diff --git a/web/skins/classic/views/log.php b/web/skins/classic/views/log.php
index aeeeeaabf..8d2e9f293 100644
--- a/web/skins/classic/views/log.php
+++ b/web/skins/classic/views/log.php
@@ -28,6 +28,7 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('SystemLog'));
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
     <div id="header">
       <div id="logSummary" class="text-center">
@@ -37,17 +38,12 @@ xhtmlHeaders(__FILE__, translate('SystemLog'));
       <?php echo translate('Displaying') ?>: <span id="displayLogs"></span>/
       <?php echo translate('Updated') ?>: <span id="lastUpdate"></span>
       </div>
-      <div class="btn-toolbar text-center">
-        <div class="btn-group">
-          <button type="button" data-on-click="expandLog"><?php echo translate('More') ?></button>
-          <button type="button" data-on-click="clearLog"><?php echo translate('Clear') ?></button>
-          <button type="button" data-on-click="refreshLog"><?php echo translate('Refresh') ?></button>
-          <button type="button" data-on-click="exportLog"><?php echo translate('Export') ?></button>
-          <button type="reset" data-on-click="resetLog"><?php echo translate('Reset') ?></button>
-        </div>
-        <div class="btn-group pull-right">
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Close') ?></button>
-        </div>
+      <div class="btn-toolbar justify-content-center py-1">
+        <button type="button" data-on-click="expandLog"><?php echo translate('More') ?></button>
+        <button type="button" data-on-click="clearLog"><?php echo translate('Clear') ?></button>
+        <button type="button" data-on-click="refreshLog"><?php echo translate('Refresh') ?></button>
+        <button type="button" data-on-click="exportLog"><?php echo translate('Export') ?></button>
+        <button type="reset" data-on-click="resetLog"><?php echo translate('Reset') ?></button>
       </div> <!--btn-->
     </div> <!--header-->
     <div id="content">
@@ -100,36 +96,4 @@ xhtmlHeaders(__FILE__, translate('SystemLog'));
       </form>
     </div><!--content-->
   </div><!--page-->
-  <div id="exportLog" class="overlay">
-    <div class="overlayHeader">
-      <div class="overlayTitle"><?php echo translate('ExportLog') ?></div>
-    </div>
-    <div class="overlayBody">
-      <div class="overlayContent">
-        <form id="exportForm" action="" method="post">
-          <fieldset>
-            <legend><?php echo translate('SelectLog') ?></legend>
-            <label for="selectorAll"><?php echo translate('All') ?></label>
-            <input type="radio" id="selectorAll" name="selector" value="all"/>
-            <label for="selectorFilter"><?php echo translate('Filter') ?></label>
-            <input type="radio" id="selectorFilter" name="selector" value="filter"/>
-            <label for="selectorCurrent"><?php echo translate('Current') ?></label>
-            <input type="radio" id="selectorCurrent" name="selector" value="current" title="<?php echo translate('ChooseLogSelection') ?>" data-validators="validate-one-required"/>
-          </fieldset>
-          <fieldset>
-            <legend><?php echo translate('SelectFormat') ?></legend>
-            <label for="formatText">TXT</label><input type="radio" id="formatText" name="format" value="text"/>
-            <label for="formatTSV">TSV</label><input type="radio" id="formatTSV" name="format" value="tsv"/>
-            <label for="formatXML">HTML</label><input type="radio" id="formatHTML" name="format" value="html"/>
-            <label for="formatXML">XML</label><input type="radio" id="formatXML" name="format" value="xml" title="<?php echo translate('ChooseLogFormat') ?>" class="validate-one-required"/>
-          </fieldset>
-          <div id="exportError">
-            <?php echo translate('ExportFailed') ?>: <span id="exportErrorText"></span>
-          </div>
-          <button type="button" id="exportButton" value="Export" data-on-click="exportRequest"><?php echo translate('Export') ?></button>
-          <button type="button" value="Cancel" class="overlayCloser"><?php echo translate('Cancel') ?></button>
-        </form>
-      </div><!--overlayContent-->
-    </div><!--overlaybody-->
-  </div><!-- exportLog-->
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 9cd29da2f..b3cfa4dae 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -389,7 +389,7 @@ echo getNavBarHTML();
 
   <div class="row flex-nowrap">
     <nav>  <!-- BEGIN PILL LIST -->
-    <ul class="pillList nav nav-pills flex-column h-100">
+    <ul class="nav nav-pills flex-column h-100" id="pills-tab" role="tabList" aria-orientation="vertical">
 <?php
 $tabs = array();
 $tabs['general'] = translate('General');
@@ -404,6 +404,7 @@ if ( $monitor->Type() != 'WebSite' ) {
   if ( ZM_OPT_X10 )
     $tabs['x10'] = translate('X10');
   $tabs['misc'] = translate('Misc');
+  $tabs['location'] = translate('Location');
 }
 
 if ( isset($_REQUEST['tab']) )
@@ -413,7 +414,16 @@ else
 
 foreach ( $tabs as $name=>$value ) {
 ?>
-    <li class="nav-item form-control-sm my-1"><a data-toggle="pill" data-tab-name="<?php echo $name ?>" class="nav-link<?php echo $tab == $name ? ' active' : '' ?>" href="#"><?php echo $value ?></a></li>
+    <li class="nav-item form-control-sm my-1">
+      <a 
+        id="<?php echo $name?>-tab"
+        role="tab"
+        data-toggle="pill"
+        class="nav-link<?php echo $tab == $name ? ' active' : '' ?>"
+          href="#pills-<?php echo $name?>"
+        aria-controls="pills-<?php echo $name?>"
+        aria-selected="<?php echo $tab == $name ? 'true':'false'?>"
+      ><?php echo $value ?></a></li>
 <?php
 }
   ?>
@@ -451,171 +461,19 @@ if ( canEdit('Monitors') ) {
 
     <!-- BEGIN ITEM LIST -->
     <div class="d-flex flex-row container-fluid pr-0">
-    <form name="contentForm" id="contentForm" method="post" action="?">
-      <input type="hidden" name="view" value="<?php echo $view ?>"/>
-      <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
-      <input type="hidden" name="action" value="monitor"/>
+    <form name="contentForm" id="contentForm" method="post" action="?view=monitor">
+      <input type="hidden" name="tab" value="<?php echo $tab?>"/>
       <input type="hidden" name="mid" value="<?php echo $monitor->Id()?>"/>
       <input type="hidden" name="origMethod" value="<?php echo ( null !== $monitor->Method())?validHtmlStr($monitor->Method()):'' ?>"/>
+<div class="tab-content" id="pills-tabContent">
 <?php
-if ( $tab != 'general' ) {
+foreach ( $tabs as $name=>$value ) {
+  echo '<div id="pills-'.$name.'" class="tab-pane fade'.($name==$tab ? ' show active' : '').'" role="tabpanel" area-labelledby="'.$name.'-tab">';
 ?>
-      <input type="hidden" name="newMonitor[Name]" value="<?php echo validHtmlStr($monitor->Name()) ?>"/>
-      <input type="hidden" name="newMonitor[Notes]" value="<?php echo validHtmlStr($monitor->Notes()) ?>"/>
-      <input type="hidden" name="newMonitor[ServerId]" value="<?php echo validHtmlStr($monitor->ServerId() ) ?>"/>
-      <input type="hidden" name="newMonitor[LinkedMonitors]" value="<?php echo (null !== $monitor->LinkedMonitors())?validHtmlStr($monitor->LinkedMonitors()):'' ?>"/>
-<?php
-foreach ( $monitor->GroupIds() as $group_id ) {
-echo '<input type="hidden" name="newMonitor[GroupIds][]" value="'.$group_id.'"/>';
-}
-?>
-      <input type="hidden" name="newMonitor[Type]" value="<?php echo validHtmlStr($monitor->Type()) ?>"/>
-      <input type="hidden" name="newMonitor[Function]" value="<?php echo validHtmlStr($monitor->Function()) ?>"/>
-      <input type="hidden" name="newMonitor[Enabled]" value="<?php echo validHtmlStr($monitor->Enabled()) ?>"/>
-      <input type="hidden" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($monitor->RefBlendPerc()) ?>"/>
-      <input type="hidden" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($monitor->AlarmRefBlendPerc()) ?>"/>
-      <input type="hidden" name="newMonitor[AnalysisFPSLimit]" value="<?php echo validHtmlStr($monitor->AnalysisFPSLimit()) ?>"/>
-      <input type="hidden" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($monitor->MaxFPS()) ?>"/>
-      <input type="hidden" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($monitor->AlarmMaxFPS()) ?>"/>
-<?php
-  if ( '' !== $monitor->Triggers() ) {
-    foreach ( explode(',', $monitor->Triggers()) as $newTrigger ) {
-?>
-      <input type="hidden" name="newMonitor[Triggers][]" value="<?php echo validHtmlStr($newTrigger) ?>"/>
-<?php
-    }
-  }
-}
-if ( ZM_HAS_V4L && ($tab != 'source' || $monitor->Type() != 'Local') ) {
-?>
-      <input type="hidden" name="newMonitor[Device]" value="<?php echo validHtmlStr($monitor->Device()) ?>"/>
-      <input type="hidden" name="newMonitor[Channel]" value="<?php echo validHtmlStr($monitor->Channel()) ?>"/>
-      <input type="hidden" name="newMonitor[Format]" value="<?php echo validHtmlStr($monitor->Format()) ?>"/>
-      <input type="hidden" name="newMonitor[Palette]" value="<?php echo validHtmlStr($monitor->Palette()) ?>"/>
-      <input type="hidden" name="newMonitor[V4LMultiBuffer]" value="<?php echo validHtmlStr($monitor->V4LMultiBuffer()) ?>"/>
-      <input type="hidden" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($monitor->V4LCapturesPerFrame()) ?>"/>
-<?php
-}
-if ( $tab != 'onvif' ) {
-?>
-        <input type="hidden" name="newMonitor[ONVIF_URL]" value="<?php echo validHtmlStr($monitor->ONVIF_URL()) ?>"/>
-        <input type="hidden" name="newMonitor[ONVIF_Username]" value="<?php echo validHtmlStr($monitor->ONVIF_Username()) ?>"/>
-        <input type="hidden" name="newMonitor[ONVIF_Password]" value="<?php echo validHtmlStr($monitor->ONVIF_Password()) ?>"/>
-        <input type="hidden" name="newMonitor[ONVIF_Options]" value="<?php echo validHtmlStr($monitor->ONVIF_Options()) ?>"/>
-<?php
-}
-if ( $tab != 'source' || $monitor->Type()!= 'Remote' ) {
-?>
-      <input type="hidden" name="newMonitor[Protocol]" value="<?php echo validHtmlStr($monitor->Protocol()) ?>"/>
-      <input type="hidden" name="newMonitor[Host]" value="<?php echo validHtmlStr($monitor->Host()) ?>"/>
-      <input type="hidden" name="newMonitor[Port]" value="<?php echo validHtmlStr($monitor->Port()) ?>"/>
-<?php
-}
-if ( $tab != 'source' || ($monitor->Type()!= 'Local' && $monitor->Type()!= 'Remote' && $monitor->Type()!= 'Ffmpeg' && $monitor->Type()!= 'Libvlc') ) {
-?>
-      <input type="hidden" name="newMonitor[Method]" value="<?php echo validHtmlStr(null !== $monitor->Method() ? $monitor->Method() : 'rtpRtsp' ) ?>"/>
-<?php
-}
-if ( $tab != 'source' || ($monitor->Type()!= 'Ffmpeg' && $monitor->Type()!= 'Libvlc' )) {
-?>
-      <input type="hidden" name="newMonitor[Options]" value="<?php echo validHtmlStr($monitor->Options()) ?>"/>
-<?php
-}
-if ( $tab != 'source' || ($monitor->Type()!= 'Remote' && $monitor->Type()!= 'File' && $monitor->Type()!= 'Ffmpeg' && $monitor->Type()!= 'Libvlc' && $monitor->Type()!= 'cURL' && $monitor->Type() != 'WebSite') ) {
-?>
-      <input type="hidden" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>"/>
-      <input type="hidden" name="newMonitor[User]" value="<?php echo validHtmlStr($monitor->User()) ?>"/>
-      <input type="hidden" name="newMonitor[Pass]" value="<?php echo validHtmlStr($monitor->Pass()) ?>"/>
-<?php
-}
-if ( $tab != 'source' ) {
-?>
-      <input type="hidden" name="newMonitor[Colours]" value="<?php echo validHtmlStr($monitor->Colours()) ?>"/>
-      <input type="hidden" name="newMonitor[Width]" value="<?php echo validHtmlStr($monitor->Width()) ?>"/>
-      <input type="hidden" name="newMonitor[Height]" value="<?php echo validHtmlStr($monitor->Height()) ?>"/>
-      <input type="hidden" name="newMonitor[Orientation]" value="<?php echo validHtmlStr($monitor->Orientation()) ?>"/>
-      <input type="hidden" name="newMonitor[Deinterlacing]" value="<?php echo validHtmlStr($monitor->Deinterlacing()) ?>"/>
-<?php
-}
-if ( $tab != 'storage' ) {
-?>
-      <input type="hidden" name="newMonitor[StorageId]" value="<?php echo validHtmlStr($monitor->StorageId()) ?>"/>
-      <input type="hidden" name="newMonitor[SaveJPEGs]" value="<?php echo validHtmlStr($monitor->SaveJPEGs()) ?>"/>
-      <input type="hidden" name="newMonitor[VideoWriter]" value="<?php echo validHtmlStr($monitor->VideoWriter()) ?>"/>
-      <input type="hidden" name="newMonitor[EncoderParameters]" value="<?php echo validHtmlStr($monitor->EncoderParameters()) ?>"/>
-      <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo validHtmlStr($monitor->RecordAudio()) ?>"/>
-<?php
-}
-if ( $tab != 'source' || ($monitor->Type() != 'Remote' && $monitor->Protocol()!= 'rtsp') ) {
-?>
-      <input type="hidden" name="newMonitor[RTSPDescribe]" value="<?php echo validHtmlStr($monitor->RTSPDescribe()) ?>"/>
-<?php
-}
-if ( $tab != 'timestamp' ) {
-?>
-      <input type="hidden" name="newMonitor[LabelFormat]" value="<?php echo validHtmlStr($monitor->LabelFormat()) ?>"/>
-      <input type="hidden" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($monitor->LabelX()) ?>"/>
-      <input type="hidden" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($monitor->LabelY()) ?>"/>
-      <input type="hidden" name="newMonitor[LabelSize]" value="<?php echo validHtmlStr($monitor->LabelSize()) ?>"/>
-<?php
-}
-if ( $tab != 'buffers' ) {
-?>
-      <input type="hidden" name="newMonitor[ImageBufferCount]" value="<?php echo validHtmlStr($monitor->ImageBufferCount()) ?>"/>
-      <input type="hidden" name="newMonitor[WarmupCount]" value="<?php echo validHtmlStr($monitor->WarmupCount()) ?>"/>
-      <input type="hidden" name="newMonitor[PreEventCount]" value="<?php echo validHtmlStr($monitor->PreEventCount()) ?>"/>
-      <input type="hidden" name="newMonitor[PostEventCount]" value="<?php echo validHtmlStr($monitor->PostEventCount()) ?>"/>
-      <input type="hidden" name="newMonitor[StreamReplayBuffer]" value="<?php echo validHtmlStr($monitor->StreamReplayBuffer()) ?>"/>
-      <input type="hidden" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($monitor->AlarmFrameCount()) ?>"/>
-<?php
-}
-if ( ZM_OPT_CONTROL && $tab != 'control' ) {
-?>
-      <input type="hidden" name="newMonitor[Controllable]" value="<?php echo validHtmlStr($monitor->Controllable()) ?>"/>
-      <input type="hidden" name="newMonitor[ControlId]" value="<?php echo validHtmlStr($monitor->ControlId()) ?>"/>
-      <input type="hidden" name="newMonitor[ControlDevice]" value="<?php echo validHtmlStr($monitor->ControlDevice()) ?>"/>
-      <input type="hidden" name="newMonitor[ControlAddress]" value="<?php echo validHtmlStr($monitor->ControlAddress()) ?>"/>
-      <input type="hidden" name="newMonitor[AutoStopTimeout]" value="<?php echo validHtmlStr($monitor->AutoStopTimeout()) ?>"/>
-      <input type="hidden" name="newMonitor[TrackMotion]" value="<?php echo validHtmlStr($monitor->TrackMotion()) ?>"/>
-      <input type="hidden" name="newMonitor[TrackDelay]" value="<?php echo validHtmlStr($monitor->TrackDelay()) ?>"/>
-      <input type="hidden" name="newMonitor[ReturnLocation]" value="<?php echo validHtmlStr($monitor->ReturnLocation()) ?>"/>
-      <input type="hidden" name="newMonitor[ReturnDelay]" value="<?php echo validHtmlStr($monitor->ReturnDelay()) ?>"/>
-<?php
-}
-if ( ZM_OPT_X10 && $tab != 'x10' ) {
-?>
-      <input type="hidden" name="newX10Monitor[Activation]" value="<?php echo validHtmlStr($newX10Monitor['Activation']) ?>"/>
-      <input type="hidden" name="newX10Monitor[AlarmInput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmInput']) ?>"/>
-      <input type="hidden" name="newX10Monitor[AlarmOutput]" value="<?php echo validHtmlStr($newX10Monitor['AlarmOutput']) ?>"/>
-<?php
-}
-if ( $tab != 'misc' ) {
-?>
-      <input type="hidden" name="newMonitor[EventPrefix]" value="<?php echo validHtmlStr($monitor->EventPrefix()) ?>"/>
-      <input type="hidden" name="newMonitor[SectionLength]" value="<?php echo validHtmlStr($monitor->SectionLength()) ?>"/>
-      <input type="hidden" name="newMonitor[MinSectionLength]" value="<?php echo validHtmlStr($monitor->MinSectionLength()) ?>"/>
-      <input type="hidden" name="newMonitor[FrameSkip]" value="<?php echo validHtmlStr($monitor->FrameSkip()) ?>"/>
-      <input type="hidden" name="newMonitor[MotionFrameSkip]" value="<?php echo validHtmlStr($monitor->MotionFrameSkip()) ?>"/>
-      <input type="hidden" name="newMonitor[AnalysisUpdateDelay]" value="<?php echo validHtmlStr($monitor->AnalysisUpdateDelay()) ?>"/>
-      <input type="hidden" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($monitor->FPSReportInterval()) ?>"/>
-      <input type="hidden" name="newMonitor[DefaultRate]" value="<?php echo validHtmlStr($monitor->DefaultRate()) ?>"/>
-      <input type="hidden" name="newMonitor[DefaultScale]" value="<?php echo validHtmlStr($monitor->DefaultScale()) ?>"/>
-      <input type="hidden" name="newMonitor[DefaultCodec]" value="<?php echo validHtmlStr($monitor->DefaultCodec()) ?>"/>
-      <input type="hidden" name="newMonitor[WebColour]" value="<?php echo validHtmlStr($monitor->WebColour()) ?>"/>
-      <input type="hidden" name="newMonitor[Exif]" value="<?php echo validHtmlStr($monitor->Exif()) ?>"/>
-<?php
-}
-if ( $tab != 'misc' ) {
-?>
-      <input type="hidden" name="newMonitor[SignalCheckPoints]" value="<?php echo validHtmlStr($monitor->SignalCheckPoints()) ?>"/>
-      <input type="hidden" name="newMonitor[SignalCheckColour]" value="<?php echo validHtmlStr($monitor->SignalCheckColour()) ?>"/>
-<?php
-}
-?>
-      <table id="contentTable" class="major">
+      <table class="major">
         <tbody>
 <?php
-switch ( $tab ) {
+switch ( $name ) {
   case 'general' :
     {
 ?>
@@ -662,7 +520,7 @@ switch ( $tab ) {
       if ( $monitor->Type() != 'WebSite' ) {
 ?>
         <tr>
-          <td class="text-right pr-3"><?php echo translate('LinkedMonitors') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_LINKED_MONITORS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+          <td class="text-right pr-3"><?php echo translate('LinkedMonitors'); echo makeHelpLink('OPTIONS_LINKED_MONITORS') ?></td>
           <td>
 <?php
       $monitors = dbFetchAll('SELECT Id, Name FROM Monitors ORDER BY Sequence ASC');
@@ -696,14 +554,14 @@ switch ( $tab ) {
       if ( $monitor->Type() != 'Local' && $monitor->Type() != 'File' && $monitor->Type() != 'NVSocket' ) {
 ?>
             <tr>
-              <td class="text-right pr-3"><?php echo translate('MaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+              <td class="text-right pr-3"><?php echo translate('MaximumFPS'); echo makeHelpLink('OPTIONS_MAXFPS') ?></td>
               <td>
                 <input type="number" name="newMonitor[MaxFPS]" value="<?php echo validHtmlStr($monitor->MaxFPS()) ?>" min="0" step="any"/>
                 <span id="newMonitor[MaxFPS]" style="color:red;<?php echo $monitor->MaxFPS() ? '' : 'display:none;' ?>">CAUTION: See the help text</span>
               </td>
             </tr>
             <tr>
-              <td class="text-right pr-3"><?php echo translate('AlarmMaximumFPS') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_MAXFPS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+              <td class="text-right pr-3"><?php echo translate('AlarmMaximumFPS'); echo makeHelpLink('OPTIONS_MAXFPS') ?></td>
               <td>
                 <input type="number" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($monitor->AlarmMaxFPS()) ?>" min="0" step="any"/>
                 <span id="newMonitor[AlarmMaxFPS]" style="color:red;<?php echo $monitor->AlarmMaxFPS() ? '' : 'display:none;' ?>">CAUTION: See the help text</span>
@@ -921,14 +779,12 @@ include('_monitor_source_nvsocket.php');
             <td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($monitor->Path()) ?>" /></td>
           </tr>
           <tr>
-            <td class="text-right pr-3"><?php
- echo translate('RemoteMethod');
- echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_RTSPTrans', 'zmOptionHelp', 'optionhelp', '?' );
-?>)</td>
+            <td class="text-right pr-3">
+              <?php echo translate('RemoteMethod'); echo makeHelpLink('OPTIONS_RTSPTrans') ?></td>
             <td><?php echo htmlSelect('newMonitor[Method]', $rtspFFMpegMethods, $monitor->Method()) ?></td>
           </tr>
           <tr class="SourceOptions">
-            <td class="text-right pr-3"><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_'.strtoupper($monitor->Type()), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+            <td class="text-right pr-3"><?php echo translate('Options'); echo makeHelpLink('OPTIONS_'.strtoupper($monitor->Type())) ?></td>
             <td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($monitor->Options()) ?>"/></td>
           </tr>
 <?php
@@ -936,14 +792,14 @@ include('_monitor_source_nvsocket.php');
       if ( $monitor->Type() == 'Ffmpeg' ) {
 ?>
           <tr class="DecoderHWAccelName">
-            <td class="text-right pr-3"><?php echo translate('DecoderHWAccelName') ?>
-                (<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_DECODERHWACCELNAME', 'zmOptionHelp', 'optionhelp', '?') ?>)
+            <td class="text-right pr-3">
+              <?php echo translate('DecoderHWAccelName'); echo makeHelpLink('OPTIONS_DECODERHWACCELNAME') ?>
             </td>
             <td><input type="text" name="newMonitor[DecoderHWAccelName]" value="<?php echo validHtmlStr($monitor->DecoderHWAccelName()) ?>"/></td>
           </tr>
           <tr class="DecoderHWAccelDevice">
             <td class="text-right pr-3"><?php echo translate('DecoderHWAccelDevice') ?>
-                (<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_DECODERHWACCELDEVICE', 'zmOptionHelp', 'optionhelp', '?') ?>)
+                <?php echo makeHelpLink('OPTIONS_DECODERHWACCELDEVICE') ?>
             </td>
             <td><input type="text" name="newMonitor[DecoderHWAccelDevice]" value="<?php echo validHtmlStr($monitor->DecoderHWAccelDevice()) ?>"/></td>
           </tr>
@@ -1014,7 +870,7 @@ include('_monitor_source_nvsocket.php');
         if ( $monitor->Type() == 'Remote' ) {
           ?>
             <tr id="RTSPDescribe"<?php if ( $monitor->Protocol()!= 'rtsp' ) { echo ' style="display:none;"'; } ?>>
-              <td class="text-right pr-3"><?php echo translate('RTSPDescribe') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_RTSPDESCRIBE', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+              <td class="text-right pr-3"><?php echo translate('RTSPDescribe'); echo makeHelpLink('OPTIONS_RTSPDESCRIBE') ?></td>
               <td><input type="checkbox" name="newMonitor[RTSPDescribe]" value="1"<?php if ( $monitor->RTSPDescribe() ) { ?> checked="checked"<?php } ?>/></td>
             </tr>
 <?php
@@ -1066,7 +922,7 @@ include('_monitor_source_nvsocket.php');
 ?>
             </td></tr>
             <tr>
-              <td class="text-right pr-3"><?php echo translate('OptionalEncoderParam') ?>&nbsp;(<?php echo makePopupLink('?view=optionhelp&amp;option=OPTIONS_ENCODER_PARAMETERS', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+              <td class="text-right pr-3"><?php echo translate('OptionalEncoderParam'); echo makeHelpLink('OPTIONS_ENCODER_PARAMETERS') ?></td>
               <td>
               <textarea name="newMonitor[EncoderParameters]" rows="<?php echo count(explode("\n", $monitor->EncoderParameters())); ?>"><?php echo validHtmlStr($monitor->EncoderParameters()) ?></textarea>
               </td>
@@ -1091,11 +947,11 @@ include('_monitor_source_nvsocket.php');
             </tr>
             <tr>
               <td class="text-right pr-3"><?php echo translate('TimestampLabelX') ?></td>
-              <td><input type="number" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($monitor->LabelX()) ?>" min="1"/></td>
+              <td><input type="number" name="newMonitor[LabelX]" value="<?php echo validHtmlStr($monitor->LabelX()) ?>" min="0"/></td>
             </tr>
             <tr>
               <td class="text-right pr-3"><?php echo translate('TimestampLabelY') ?></td>
-              <td><input type="number" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($monitor->LabelY()) ?>" min="1"/></td>
+              <td><input type="number" name="newMonitor[LabelY]" value="<?php echo validHtmlStr($monitor->LabelY()) ?>" min="0"/></td>
             </tr>
             <tr>
               <td class="text-right pr-3"><?php echo translate('TimestampLabelSize') ?></td>
@@ -1131,6 +987,10 @@ include('_monitor_source_nvsocket.php');
               <td class="text-right pr-3"><?php echo translate('AlarmFrameCount') ?></td>
               <td><input type="number" name="newMonitor[AlarmFrameCount]" value="<?php echo validHtmlStr($monitor->AlarmFrameCount()) ?>" min="1"/></td>
             </tr>
+            <tr>
+              <td class="text-right pr-3"><?php echo translate('EstimatedRamUse') ?></td>
+              <td id="estimated_ram_use"><?php echo human_filesize($monitor->ImageBufferCount() * $monitor->Width() * $monitor->Height() * $monitor->Colours(), 0) ?></td>
+            </tr>
 <?php
       break;
     }
@@ -1152,7 +1012,7 @@ include('_monitor_source_nvsocket.php');
 
                   echo htmlSelect('newMonitor[ControlId]', $controlTypes, $monitor->ControlId());
                   if ( canEdit('Control') ) {
-                    echo '&nbsp;'.makePopupLink('?view=controlcaps', 'zmControlCaps', 'controlcaps', translate('Edit'));
+                    echo '&nbsp;'.makeLink('?view=controlcaps', translate('Edit'));
                   }
 ?>
               </td>
@@ -1245,7 +1105,7 @@ echo htmlSelect('newMonitor[ReturnLocation]', $return_options, $monitor->ReturnL
             <?php echo translate('seconds')?>
           </td></tr>
         <tr>
-          <td class="text-right pr-3"<?php echo translate('FPSReportInterval') ?></td>
+          <td class="text-right pr-3"><?php echo translate('FPSReportInterval') ?></td>
           <td>
             <input type="number" name="newMonitor[FPSReportInterval]" value="<?php echo validHtmlStr($monitor->FPSReportInterval()) ?>" min="0"/>
             <?php echo translate('frames')?>
@@ -1286,23 +1146,50 @@ echo htmlSelect('newMonitor[ReturnLocation]', $return_options, $monitor->ReturnL
           </td>
         </tr>
         <tr>
-          <td class="text-right pr-3"><?php echo translate('Exif') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_EXIF', 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td>
+          <td class="text-right pr-3"><?php echo translate('Exif'); echo makeHelpLink('OPTIONS_EXIF') ?></td>
           <td><input type="checkbox" name="newMonitor[Exif]" value="1"<?php if ( $monitor->Exif() ) { ?> checked="checked"<?php } ?>/></td>
         </tr>
 <?php
         break;
     }
+  case 'location':
+?>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('Latitude') ?></td>
+          <td><input type="number" name="newMonitor[Latitude]" step="any" value="<?php echo $monitor->Latitude() ?>" min="-90" max="90"/></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('Longitude') ?></td>
+          <td><input type="number" name="newMonitor[Longitude]" step="any" value="<?php echo $monitor->Longitude() ?>" min="-180" max="180"/></td>
+        </tr>
+        <tr>
+          <td class="text-right pr-3"><?php echo translate('Longitude') ?></td>
+          <td><button type="button" data-on-click="getLocation"><?php echo translate('GetCurrentLocation') ?></button></td>
+        </tr>
+        <tr>
+          <td colspan="2"><div id="LocationMap" style="height: 500px; width: 500px;"></div></td>
+        </tr>
+            
+<?php
+    break;
+  default :
+    ZM\Error("Unknown tab $tab");
 } // end switch tab
 ?>
           </tbody>
         </table>
+</div>
+<?php 
+} # end foreach tab
+?>
+</div><!--tab-content-->
         <div id="contentButtons" class="pr-3">
-          <button type="submit" value="Save"<?php echo canEdit('Monitors') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
+          <button type="submit" name="action" value="save"<?php echo canEdit('Monitors') ? '' : ' disabled="disabled"' ?>><?php echo translate('Save') ?></button>
           <button type="button" id="cancelBtn"><?php echo translate('Cancel') ?></button>
         </div>
       </form>
     </div>
     </div>
     </div>
-    </div>
+  </div>
 <?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/monitorpreset.php b/web/skins/classic/views/monitorpreset.php
index 72419a599..22c960587 100644
--- a/web/skins/classic/views/monitorpreset.php
+++ b/web/skins/classic/views/monitorpreset.php
@@ -36,10 +36,9 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('MonitorPreset') );
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
       <h2><?php echo translate('MonitorPreset') ?></h2>
-    </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="?">
         <input type="hidden" name="view" value="none"/>
diff --git a/web/skins/classic/views/monitorprobe.php b/web/skins/classic/views/monitorprobe.php
index 0b7098351..d670e0fcc 100644
--- a/web/skins/classic/views/monitorprobe.php
+++ b/web/skins/classic/views/monitorprobe.php
@@ -321,10 +321,9 @@ $focusWindow = true;
 xhtmlHeaders(__FILE__, translate('MonitorProbe') );
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <h2><?php echo translate('MonitorProbe') ?></h2>
-    </div>
+    <h2><?php echo translate('MonitorProbe') ?></h2>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="?">
         <input type="hidden" name="view" value="none"/>
diff --git a/web/skins/classic/views/newlog.php b/web/skins/classic/views/newlog.php
new file mode 100644
index 000000000..d706365c3
--- /dev/null
+++ b/web/skins/classic/views/newlog.php
@@ -0,0 +1,91 @@
+<?php
+//
+// ZoneMinder web log view file, $Date: 2010-02-23 09:10:36 +0000 (Tue, 23 Feb 2010) $, $Revision: 3030 $
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+
+if ( !canView('System') ) {
+  $view = 'error';
+  return;
+}
+
+xhtmlHeaders(__FILE__, translate('SystemLog'));
+?>
+<body>
+  <?php echo getNavBarHTML() ?>
+  <div id="page" class="px-3">
+
+    <div id="logSummary" class="text-center">
+      <?php echo translate('State') ?>:&nbsp;<span id="logState"></span>&nbsp;-&nbsp;
+      <?php echo translate('Total') ?>:&nbsp;<span id="totalLogs"></span>&nbsp;-&nbsp;
+      <?php echo translate('Available') ?>:&nbsp;<span id="availLogs"></span>&nbsp;-&nbsp;
+      <?php echo translate('Displaying') ?>:&nbsp;<span id="displayLogs"></span>&nbsp;-&nbsp;
+      <?php echo translate('Updated') ?>:&nbsp;<span id="lastUpdate"></span>
+    </div>
+
+    <div id="toolbar">
+      <button id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+      <button id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+    </div>
+
+    <table
+      id="logTable"
+      class="table-sm table-borderless"
+      data-side-pagination="server"
+      data-ajax="ajaxRequest"
+      data-pagination="true"
+      data-page-list="[10, 25, 50, 100, 200, 300, 400, 500]"
+      data-search="true"
+      data-advanced-search="true"
+      data-id-table="advancedTable"
+      data-cookie="true"
+      data-cookie-id-table="zmLogsTable"
+      data-cookie-expire="2y"
+      data-remember-order="true"
+      data-show-columns="true"
+      data-show-export="true"
+      data-toolbar="#toolbar"
+      data-show-fullscreen="true"
+      data-maintain-meta-data="true"
+      data-mobile-responsive="true"
+      data-buttons-class="btn btn-normal"
+      data-show-jump-to="true"
+      data-auto-refresh="true"
+      data-auto-refresh-silent="true"
+      data-show-refresh="true"
+      data-auto-refresh-interval="5"
+    >
+      <thead class="thead-highlight">
+        <tr>
+          <th data-sortable="true" data-field="DateTime"><?php echo translate('DateTime') ?></th>
+          <th data-sortable="true" data-field="Component"><?php echo translate('Component') ?></th>
+          <th data-sortable="false" data-field="Server"><?php echo translate('Server') ?></th>
+          <th data-sortable="true" data-field="Pid"><?php echo translate('Pid') ?></th>
+          <th data-sortable="true" data-field="Code"><?php echo translate('Level') ?></th>
+          <th data-sortable="true" data-field="Message"><?php echo translate('Message') ?></th>
+          <th data-sortable="true" data-field="File"><?php echo translate('File') ?></th>
+          <th data-sortable="true" data-field="Line"><?php echo translate('Line') ?></th>
+        </tr>
+      </thead>
+
+      <tbody>
+      <!-- Row data populated via Ajax -->
+      </tbody>
+
+    </table>
+  </div><!--page-->
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/onvifprobe.php b/web/skins/classic/views/onvifprobe.php
index a5c7ac330..900313e46 100644
--- a/web/skins/classic/views/onvifprobe.php
+++ b/web/skins/classic/views/onvifprobe.php
@@ -161,10 +161,9 @@ if ( !isset($_REQUEST['step']) || ($_REQUEST['step'] == '1') ) {
     $cameras[0] = translate('NoDetectedCameras');
 
 ?>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <h2><?php echo translate('MonitorProbe') ?></h2>
-    </div>
+    <h2><?php echo translate('MonitorProbe') ?></h2>
     <div id="content">
       <form name="contentForm" id="contentForm" method="post" action="?">
         <input type="hidden" name="view" value="none"/>
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index acceff327..01bda7165 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -43,6 +43,7 @@ $tabs['highband'] = translate('HighBW');
 $tabs['medband'] = translate('MediumBW');
 $tabs['lowband'] = translate('LowBW');
 $tabs['users'] = translate('Users');
+$tabs['control'] = translate('Control');
 
 if ( isset($_REQUEST['tab']) )
   $tab = validHtmlStr($_REQUEST['tab']);
@@ -56,9 +57,9 @@ xhtmlHeaders(__FILE__, translate('Options'));
 ?>
 <body>
   <?php echo getNavBarHTML(); ?>
-  <div class="container-fluid h-100">
-    <div class="row flex-nowrap h-100">
-      <nav id="sidebar" class="h-100">
+  <div class="container-fluid">
+    <div class="row flex-nowrap">
+      <nav id="sidebar">
         <ul class="nav nav-pills flex-column h-100">
 <?php
 foreach ( $tabs as $name=>$value ) {
@@ -181,8 +182,17 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
           <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
         </div>
       </form>
-<?php
-} else if ( $tab == 'servers' ) { ?>
+      <?php
+} else if ( $tab == 'control' ) {
+      if ( canView('Control') ) {
+        $redirect = '?view=controlcaps';
+      } else {
+        $redirect = '?view=error';
+      }
+      // Have to do this 
+      header('Location: '.$redirect);
+} else if ( $tab == 'servers' ) {
+      ?>
       <form name="serversForm" method="post" action="?">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
@@ -209,47 +219,42 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
 			</tr>
           </thead>
           <tbody>
-<?php
-  $monitor_counts = dbFetchAssoc('SELECT Id,(SELECT COUNT(Id) FROM Monitors WHERE ServerId=Servers.Id) AS MonitorCount FROM Servers', 'Id', 'MonitorCount');
-  foreach ( ZM\Server::find() as $Server ) {
-?>
+          <?php
+          $monitor_counts = dbFetchAssoc('SELECT Id,(SELECT COUNT(Id) FROM Monitors WHERE ServerId=Servers.Id) AS MonitorCount FROM Servers', 'Id', 'MonitorCount');
+          foreach ( ZM\Server::find() as $Server ) {
+            $svr_opt = 'class="serverCol" data-sid="'.$Server->Id().'"';
+            ?>
             <tr>
-              <td class="colName"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->Name()), $canEdit) ?></td>
-              <td class="colUrl"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->Url()), $canEdit) ?></td>
-              <td class="colPathToIndex"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->PathToIndex()), $canEdit) ?></td>
-              <td class="colPathToZMS"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->PathToZMS()), $canEdit) ?></td>
-              <td class="colPathToApi"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->PathToApi()), $canEdit) ?></td>
+              <td class="colName"><?php echo makeLink('#', validHtmlStr($Server->Name()), $canEdit, $svr_opt ) ?></td>
+              <td class="colUrl"><?php echo makeLink('#', validHtmlStr($Server->Url()), $canEdit, $svr_opt ) ?></td>
+              <td class="colPathToIndex"><?php echo makeLink('#', validHtmlStr($Server->PathToIndex()), $canEdit, $svr_opt ) ?></td>
+              <td class="colPathToZMS"><?php echo makeLink('#', validHtmlStr($Server->PathToZMS()), $canEdit, $svr_opt ) ?></td>
               <td class="colStatus <?php if ( $Server->Status() == 'NotRunning' ) { echo 'danger'; } ?>">
-                  <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($Server->Status()), $canEdit) ?></td>
-              <td class="colMonitorCount">
-                  <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', validHtmlStr($monitor_counts[$Server->Id()]), $canEdit) ?>
-              </td>
-              <td class="colCpuLoad <?php if ( $Server->CpuLoad() > 5 ) { echo 'danger'; } ?>">
-                  <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server',$Server->CpuLoad(), $canEdit) ?>
-              </td>
+                  <?php echo makeLink('#', validHtmlStr($Server->Status()), $canEdit, $svr_opt) ?></td>
+              <td class="colMonitorCount"><?php echo makeLink('#', validHtmlStr($monitor_counts[$Server->Id()]), $canEdit, $svr_opt) ?></td>
+              <td class="colCpuLoad <?php if ( $Server->CpuLoad() > 5 ) { echo 'danger'; } ?>"><?php echo makeLink('#', $Server->CpuLoad(), $canEdit, $svr_opt) ?></td>
               <td class="colMemory <?php if ( (!$Server->TotalMem()) or ($Server->FreeMem()/$Server->TotalMem() < .1) ) { echo 'danger'; } ?>">
-                  <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', human_filesize($Server->FreeMem()) . ' / ' . human_filesize($Server->TotalMem()), $canEdit) ?>
-              </td>
+                  <?php echo makeLink('#', human_filesize($Server->FreeMem()) . ' / ' . human_filesize($Server->TotalMem()), $canEdit, $svr_opt) ?></td>
               <td class="colSwap <?php if ( (!$Server->TotalSwap()) or ($Server->FreeSwap()/$Server->TotalSwap() < .1) ) { echo 'danger'; } ?>">
-                <?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', human_filesize($Server->FreeSwap()) . ' / ' . human_filesize($Server->TotalSwap()) , $canEdit) ?>
-              </td>
-              <td class="colStats"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmstats() ? 'yes' : 'no', $canEdit) ?></td>
-              <td class="colAudit"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmaudit() ? 'yes' : 'no', $canEdit) ?></td>
-              <td class="colTrigger"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmtrigger() ? 'yes' : 'no', $canEdit) ?></td>
-              <td class="colEventNotification"><?php echo makePopupLink('?view=server&amp;id='.$Server->Id(), 'zmServer', 'server', $Server->zmeventnotification() ? 'yes' : 'no', $canEdit) ?></td>
+                  <?php echo makeLink('#', human_filesize($Server->FreeSwap()) . ' / ' . human_filesize($Server->TotalSwap()) , $canEdit, $svr_opt) ?></td>
+              <td class="colStats"><?php echo makeLink('#', $Server->zmstats() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
+              <td class="colAudit"><?php echo makeLink('#', $Server->zmaudit() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
+              <td class="colTrigger"><?php echo makeLink('#', $Server->zmtrigger() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
+              <td class="colEventNotification"><?php echo makeLink('#', $Server->zmeventnotification() ? 'yes' : 'no', $canEdit, $svr_opt) ?></td>
 
               <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Server->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( !$canEdit ) { ?> disabled="disabled"<?php } ?>/></td>
-			</tr>
+            </tr>
 <?php } #end foreach Server ?>
           </tbody>
         </table>
         <div id="contentButtons">
-        <?php echo makePopupButton('?view=server&id=0', 'zmServer', 'server', translate('AddNewServer'), canEdit('System')); ?>
+          <button type="button" id="NewServerBtn" value="<?php echo translate('AddNewServer') ?>" disabled="disabled"><?php echo translate('AddNewServer') ?></button>
           <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
         </div>
       </form>
-<?php
-} else if ( $tab == 'storage' ) { ?>
+      <?php
+} else if ( $tab == 'storage' ) { 
+      ?>
       <form name="storageForm" method="post" action="?">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="tab" value="<?php echo $tab ?>"/>
@@ -270,14 +275,17 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
             </tr>
           </thead>
           <tbody>
-<?php foreach( ZM\Storage::find( null, array('order'=>'lower(Name)') ) as $Storage ) { ?>
+          <?php
+          foreach( ZM\Storage::find( null, array('order'=>'lower(Name)') ) as $Storage ) { 
+            $str_opt = 'class="storageCol" data-sid="'.$Storage->Id().'"';
+            ?>
             <tr>
-              <td class="colId"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Id()), $canEdit ) ?></td>
-              <td class="colName"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Name()), $canEdit ) ?></td>
-              <td class="colPath"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Path()), $canEdit ) ?></td>
-              <td class="colType"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Type()), $canEdit ) ?></td>
-              <td class="colScheme"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Scheme()), $canEdit ) ?></td>
-              <td class="colServer"><?php echo makePopupLink('?view=storage&amp;id='.$Storage->Id(), 'zmStorage', 'storage', validHtmlStr($Storage->Server()->Name()), $canEdit ) ?></td>
+              <td class="colId"><?php echo makeLink('#', validHtmlStr($Storage->Id()), $canEdit, $str_opt ) ?></td>
+              <td class="colName"><?php echo makeLink('#', validHtmlStr($Storage->Name()), $canEdit, $str_opt ) ?></td>
+              <td class="colPath"><?php echo makeLink('#', validHtmlStr($Storage->Path()), $canEdit, $str_opt ) ?></td>
+              <td class="colType"><?php echo makeLink('#', validHtmlStr($Storage->Type()), $canEdit, $str_opt ) ?></td>
+              <td class="colScheme"><?php echo makeLink('#', validHtmlStr($Storage->Scheme()), $canEdit, $str_opt ) ?></td>
+              <td class="colServer"><?php echo makeLink('#', validHtmlStr($Storage->Server()->Name()), $canEdit, $str_opt ) ?></td>
               <td class="colDiskSpace"><?php echo human_filesize($Storage->disk_used_space()) . ' of ' . human_filesize($Storage->disk_total_space()) ?></td>
               <td class="ColEvents"><?php echo $Storage->EventCount().' using '.human_filesize($Storage->event_disk_space()) ?></td>
               <td class="colMark"><input type="checkbox" name="markIds[]" value="<?php echo $Storage->Id() ?>" data-on-click-this="configureDeleteButton"<?php if ( $Storage->EventCount() or !$canEdit ) { ?> disabled="disabled"<?php } ?><?php echo $Storage->EventCount() ? ' title="Can\'t delete as long as there are events stored here."' : ''?>/></td>
@@ -286,7 +294,7 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
           </tbody>
         </table>
         <div id="contentButtons">
-          <?php echo makePopupButton('?view=storage&id=0', 'zmStorage', 'storage', translate('AddNewStorage'), canEdit('System')); ?>
+          <button type="button" id="NewStorageBtn" value="<?php echo translate('AddNewStorage') ?>" disabled="disabled"><?php echo translate('AddNewStorage') ?></button>
           <button type="submit" class="btn-danger" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
         </div>
       </form>
@@ -512,7 +520,7 @@ foreach ( array_map('basename', glob('skins/'.$skin.'/css/*', GLOB_ONLYDIR)) as
 <?php
         }
 ?>
-              <span class="form-text form-control-sm"><?php echo validHtmlStr($optionPromptText) ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option='.$name, 'zmOptionHelp', 'optionhelp', '?' ) ?>)</span>
+              <span class="form-text form-control-sm"><?php echo validHtmlStr($optionPromptText); echo makeHelpLink($name) ?></span>
 	    </div><!-- End .col-sm-9 -->
             </div><!-- End .form-group -->
 <?php
diff --git a/web/skins/classic/views/stats.php b/web/skins/classic/views/stats.php
index f6373151c..2cd5c69e4 100644
--- a/web/skins/classic/views/stats.php
+++ b/web/skins/classic/views/stats.php
@@ -44,9 +44,10 @@ xhtmlHeaders(__FILE__, translate('Stats')." - ".$eid." - ".$fid );
     <div id="content" class="row justify-content-center">
       <form name="contentForm" id="contentForm" method="get" action="?">
         <input type="hidden" name="view" value="none"/>
-        <?php include('_stats_table.php'); ?>
+        <?php echo getStatsTableHTML($eid, $fid) ?>
       </form>
     </div>
   </div>
 </body>
 </html>
+<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/storage.php b/web/skins/classic/views/storage.php
deleted file mode 100644
index b25d12a21..000000000
--- a/web/skins/classic/views/storage.php
+++ /dev/null
@@ -1,114 +0,0 @@
-<?php
-//
-// ZoneMinder web user view file
-// Copyright (C) 2020 ZoneMinder LLC
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-//
-
-if ( !canEdit('System') ) {
-  $view = 'error';
-  return;
-}
-
-require_once('includes/Server.php');
-require_once('includes/Storage.php');
-
-if ( $_REQUEST['id'] ) {
-  if ( !($newStorage = ZM\Storage::find_one(array('Id'=>$_REQUEST['id'])) ) ) {
-    $view = 'error';
-    return;
-  }
-} else {
-  $newStorage = new ZM\Storage();
-  $newStorage->Name(translate('NewStorage'));
-}
-
-$type_options = array( 'local' => translate('Local'), 's3fs' => translate('s3fs') );
-$scheme_options = array(
-  'Deep' => translate('Deep'),
-  'Medium' => translate('Medium'),
-  'Shallow' => translate('Shallow'),
-);
-
-$servers = ZM\Server::find( null, array('order'=>'lower(Name)') );
-$ServersById = array();
-foreach ( $servers as $S ) {
-  $ServersById[$S->Id()] = $S;
-}
-$focusWindow = true;
-
-xhtmlHeaders(__FILE__, translate('Storage').' - '.$newStorage->Name());
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Storage').' - '.$newStorage->Name() ?></h2>
-    </div>
-    <div id="content">
-      <form name="contentForm" method="post" action="?" class="validateFormOnSubmit">
-        <input type="hidden" name="view" value="<?php echo $view ?>"/>
-        <input type="hidden" name="object" value="storage"/>
-        <input type="hidden" name="id" value="<?php echo validHtmlStr($_REQUEST['id']) ?>"/>
-        <table id="contentTable" class="major">
-          <tbody>
-            <tr>
-              <th scope="row"><?php echo translate('Name') ?></th>
-              <td><input type="text" name="newStorage[Name]" value="<?php echo $newStorage->Name() ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Path') ?></th>
-              <td><input type="text" name="newStorage[Path]" value="<?php echo $newStorage->Path() ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Url') ?></th>
-              <td><input type="text" name="newStorage[Url]" value="<?php echo $newStorage->Url() ?>"/></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Server') ?></th>
-              <td><?php echo htmlSelect('newStorage[ServerId]', array(''=>'Remote / No Specific Server') + $ServersById, $newStorage->ServerId()); ?></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Type') ?></th>
-              <td><?php echo htmlSelect('newStorage[Type]', $type_options, $newStorage->Type()); ?></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('StorageScheme') ?></th>
-              <td><?php echo htmlSelect('newStorage[Scheme]', $scheme_options, $newStorage->Scheme()); ?></td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('StorageDoDelete') ?></th>
-              <td>
-              <input type="radio" name="newStorage[DoDelete]" value="1"<?php echo $newStorage->DoDelete() ? 'checked="checked"' : '' ?>/>Yes
-              <input type="radio" name="newStorage[DoDelete]" value="0"<?php echo $newStorage->DoDelete() ? '' : 'checked="checked"' ?>/>No
-              </td>
-            </tr>
-            <tr>
-              <th scope="row"><?php echo translate('Enabled') ?></th>
-              <td>
-              <input type="radio" name="newStorage[Enabled]" value="1"<?php echo $newStorage->Enabled() ? 'checked="checked"' : '' ?>/>Yes
-              <input type="radio" name="newStorage[Enabled]" value="0"<?php echo $newStorage->Enabled() ? '' : 'checked="checked"' ?>/>No
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <div id="contentButtons">
-          <button name="action" type="submit" value="Save"><?php echo translate('Save') ?></button>
-          <button type="button" data-on-click="closeWindow"><?php echo translate('Cancel') ?></button>
-        </div>
-      </form>
-    </div>
-  </div>
-<?php xhtmlFooter() ?>
diff --git a/web/skins/classic/views/timeline.php b/web/skins/classic/views/timeline.php
index 98361907c..d0d17d721 100644
--- a/web/skins/classic/views/timeline.php
+++ b/web/skins/classic/views/timeline.php
@@ -142,8 +142,11 @@ if ( !empty($user['MonitorIds']) ) {
 }
 
 $tree = false;
-if ( isset($_REQUEST['filter']) )
-  $tree = parseFilterToTree($_REQUEST['filter']['Query']);
+if ( isset($_REQUEST['filter']) ) {
+  $filter =  ZM\Filter::parse($_REQUEST['filter']);
+  $tree = $filter->tree();
+  ZM\Warning("Parse tree: " . print_r($tree,true));
+}
 
 if ( isset($_REQUEST['range']) )
   $range = validHtmlStr($_REQUEST['range']);
diff --git a/web/skins/classic/views/user.php b/web/skins/classic/views/user.php
index f8b000ebb..d7fc3311b 100644
--- a/web/skins/classic/views/user.php
+++ b/web/skins/classic/views/user.php
@@ -60,7 +60,15 @@ xhtmlHeaders(__FILE__, translate('User').' - '.$newUser->Username());
 <body>
 <?php echo getNavBarHTML() ?>
   <div id="page">
-      <h2><?php echo translate('User').' - '.validHtmlStr($newUser->Username()); ?></h2>
+    <div class="w-100">
+      <div class="float-left pl-3 pt-1">
+        <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      </div>
+      <div class="w-100 pt-2">
+        <h2><?php echo translate('User').' - '.validHtmlStr($newUser->Username()); ?></h2>
+      </div>
+    </div>
     <div id="content" class="row justify-content-center">
       <form id="contentForm" name="contentForm" method="post" action="?view=user">
         <input type="hidden" name="uid" value="<?php echo validHtmlStr($_REQUEST['uid']) ?>"/>
diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index a824ce8b0..cf03104c7 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -118,12 +118,19 @@ $StreamHTML = getStreamHTML($monitor, array('mode'=>'single'));
 xhtmlHeaders(__FILE__, translate('Zone'));
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Monitor').' '.$monitor->Name().' - '.translate('Zone').' '.$newZone['Name'] ?></h2>
+    <div class="w-100">
+      <div class="float-left pl-3 pt-1">
+        <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      </div>
+      <div class="w-100 pt-2">
+        <h2><?php echo translate('Monitor').' '.$monitor->Name().' - '.translate('Zone').' '.$newZone['Name'] ?></h2>
+      </div>
     </div>
     <div id="content">
-      <form name="zoneForm" id="zoneForm" method="post" action="?" onkeypress="return event.keyCode != 13;">
+      <form name="zoneForm" id="zoneForm" method="post" action="?">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="action" value="zone"/>
         <input type="hidden" name="mid" value="<?php echo $mid ?>"/>
@@ -180,14 +187,14 @@ if ( count($other_zones) ) {
 								<tr>
 									<th scope="row"><?php echo translate('Type') ?></th>
 									<td colspan="2"><?php echo htmlSelect('newZone[Type]', $optTypes, $newZone['Type'],
-											array('data-on-change'=>'applyZoneType')); ?></td>
+											array('data-on-change'=>'applyZoneType', 'id'=>'newZone[Type]')); ?></td>
 								</tr>
 								<tr>
 									<th scope="row"><?php echo translate('Preset') ?></th>
 									<td colspan="2">
 										<?php echo htmlSelect('presetSelector', $presetNames,
 												( isset($_REQUEST['presetSelector']) ? $_REQUEST['presetSelector'] : null),
-												array('data-on-change'=>'applyPreset', 'onblur'=>'this.selectedIndex=0') )
+												array('data-on-change'=>'applyPreset', 'id'=>'presetSelector') )
 										?></td>
 								</tr>
 								<tr>
@@ -195,7 +202,7 @@ if ( count($other_zones) ) {
                   <td colspan="2">
 <?php
                         echo htmlSelect('newZone[Units]', $optUnits, $newZone['Units'],
-                        array('data-on-change'=>'applyZoneUnits')
+                        array('data-on-change'=>'applyZoneUnits', 'id'=>'newZone[Units]')
                         );
                         # Used later for number inputs
                         $step = $newZone['Units'] == 'Percent' ? ' step="0.01" max="100"' : '';
diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php
index 138672a42..dee405023 100644
--- a/web/skins/classic/views/zones.php
+++ b/web/skins/classic/views/zones.php
@@ -37,10 +37,16 @@ $monitors = ZM\ZM_Object::Objects_Indexed_By_Id('ZM\Monitor', array('Id'=>$mids)
 xhtmlHeaders(__FILE__, translate('Zones'));
 ?>
 <body>
+  <?php echo getNavBarHTML() ?>
   <div id="page">
-    <div id="header">
-      <div id="headerButtons"><a href="#" data-on-click="closeWindow"><?php echo translate('Close') ?></a></div>
-      <h2><?php echo translate('Zones') ?></h2>
+    <div class="w-100 py-1">
+      <div class="float-left pl-3">
+        <button type="button" id="backBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Back') ?>" disabled><i class="fa fa-arrow-left"></i></button>
+        <button type="button" id="refreshBtn" class="btn btn-normal" data-toggle="tooltip" data-placement="top" title="<?php echo translate('Refresh') ?>" ><i class="fa fa-refresh"></i></button>
+      </div>
+      <div class="w-100 pt-2">
+        <h2><?php echo translate('Zones') ?></h2>
+      </div>
     </div>
     <div id="content">
       <form name="contentForm" id="contentForm" method="get" action="?">
@@ -76,13 +82,11 @@ xhtmlHeaders(__FILE__, translate('Zones'));
 <?php
       foreach( array_reverse($zones) as $zone ) {
 ?>
-            <polygon points="<?php echo $zone['AreaCoords'] ?>" class="popup-link <?php echo $zone['Type']?>" data-on-click-true="streamCmdQuit"
-                   data-url="?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>"
-                   data-window-name="zmZone<?php echo $zone['Id'] ?>"
-                   data-window-tag="zone"
-                   data-window-width="<?php echo $monitor->ViewWidth() ?>"
-                   data-window-height="<?php echo $monitor->ViewHeight() ?>"
-									 />
+            <polygon points="<?php echo $zone['AreaCoords'] ?>"
+                     class="zmlink <?php echo $zone['Type']?>"
+                     data-on-click-true="streamCmdQuit"
+                     data-url="?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>"
+            />
 <?php
       } // end foreach zone
 ?>
@@ -104,7 +108,7 @@ xhtmlHeaders(__FILE__, translate('Zones'));
 	foreach( $zones as $zone ) {
 	?>
 							<tr>
-								<td class="colName"><?php echo makePopupLink('?view=zone&mid='.$mid.'&zid='.$zone['Id'], 'zmZone', array('zone', $monitor->ViewWidth(), $monitor->ViewHeight()), validHtmlStr($zone['Name']), true, 'data-on-click-true="streamCmdQuit"'); ?></td>
+								<td class="colName"><?php echo makeLink('?view=zone&mid='.$mid.'&zid='.$zone['Id'], validHtmlStr($zone['Name']), true, 'data-on-click-true="streamCmdQuit"'); ?></td>
 								<td class="colType"><?php echo validHtmlStr($zone['Type']) ?></td>
 								<td class="colUnits"><?php echo $zone['Area'] ?>&nbsp;/&nbsp;<?php echo sprintf('%.2f', ($zone['Area']*100)/($monitor->ViewWidth()*$monitor->ViewHeight()) ) ?></td>
 								<td class="colMark"><input type="checkbox" name="markZids[]" value="<?php echo $zone['Id'] ?>" data-on-click-this="configureDeleteButton"<?php if ( !canEdit('Monitors') ) { ?> disabled="disabled"<?php } ?>/></td>
@@ -114,10 +118,10 @@ xhtmlHeaders(__FILE__, translate('Zones'));
 	?>
 						</tbody>
 					</table>
-					<div id="contentButtons">
-						<?php echo makePopupButton('?view=zone&mid='.$mid.'&zid=0', 'zmZone', array('zone', $monitor->ViewWidth(), $monitor->ViewHeight()), translate('AddNewZone'), canEdit('Monitors')); ?>
-            <button type="submit" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
-					</div>
+                                     <div id="contentButtons">
+                                       <?php echo makeButton('?view=zone&mid='.$mid.'&zid=0', 'AddNewZone', canEdit('Monitors')); ?>
+                                       <button type="submit" name="deleteBtn" value="Delete" disabled="disabled"><?php echo translate('Delete') ?></button>
+                                     </div>
 				</div><!--zones-->
 <br class="clear"/>
       </div><!--Monitor-->
diff --git a/web/views/no_database_connection.php b/web/views/no_database_connection.php
new file mode 100644
index 000000000..c9b5d9a54
--- /dev/null
+++ b/web/views/no_database_connection.php
@@ -0,0 +1,65 @@
+<?php
+//
+// ZoneMinder web error view file, $Date$, $Revision$
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+//
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+</head>
+<body>
+  <div id="page">
+    <div id="header">
+      <h1>ZoneMinder Error</h1>
+    </div>
+    <div id="content">
+      <p class="error">
+<?php 
+global $error_message;
+echo $error_message;
+?>
+      </p>
+      <p>ZoneMinder will retry connection in <span id="countdown">30</span> seconds.</p>
+      <p>
+        <button id="reloadButton" type="button">Reload</button>
+      </p>
+    </div>
+  </div>
+  <script>
+    document.getElementById('reloadButton').addEventListener("click", function() {
+      location.reload();
+    });
+
+    var countdown = 30; // seconds
+    function timerCountdown() {
+      console.log('hello');
+      document.getElementById('countdown').innerHTML=countdown;
+      countdown --;
+      if ( countdown <= 0 ) {
+        location.reload();
+      } else {
+        setTimeout(timerCountdown, 1000);
+      }
+    }
+    setTimeout(timerCountdown, 1000);
+  </script>
+</body>
+</html>