Commit Graph

339 Commits

Author SHA1 Message Date
Andrew Bauer b626e0de1c eslint nanny strikes again 2020-08-08 11:19:29 -05:00
Andrew Bauer 96bd6397c6 eslint nanny 2020-08-08 10:38:58 -05:00
Isaac Connor 82357a0675 reapply click function to bandwidth dropdown entries after getNavBar 2020-08-08 11:17:26 -04:00
Andrew Bauer 3792043707 implement bw widget as dropdown 2020-08-08 10:07:26 -05:00
Andrew Bauer c1f37192b9 implement storage widget as dropdown 2020-08-03 10:43:24 -05:00
Andrew Bauer 3351a4de56
fix eslint 2020-08-02 15:33:10 -05:00
Andrew Bauer d6999f5628
iterate through keys in data 2020-08-02 13:33:25 -05:00
Andrew Bauer 2b29a7983a clean up navbar background refresh 2020-08-02 13:01:20 -05:00
Isaac Connor 0139d06fcd Fix data-on-input-this using onchange instead of oninput 2020-07-29 16:41:27 -04:00
Isaac Connor 1508b82754 Fix data-on-input-this using onchange instead of oninput 2020-07-29 16:40:57 -04:00
Isaac Connor 5d883d696b give a better error message when submitThisForm fails 2020-07-27 12:40:25 -04:00
Andrew Bauer eaed5abcd3 add missing bootstrap.bundle.js.map 2020-07-25 16:56:17 -05:00
Andrew Bauer c48fa83c6d upgrade to bootstrap 4.5 2020-07-25 13:18:09 -05:00
Isaac Connor e29c426f04 Pass event object to data-on-click events 2020-05-01 13:04:55 -04:00
Isaac Connor 89245e0d46 Add auth relay information when auth_relay is something other than hashed. 2020-05-01 13:04:37 -04:00
Isaac Connor 9ec89f20d3 Add auth relay information when auth_relay is something other than hashed. 2020-04-29 16:33:41 -04:00
Isaac Connor 5e88181380 Pass event object to data-on-click events 2020-04-29 16:32:55 -04:00
Isaac Connor 91b1d7bbeb alter setButtonState to take either an id or an element so that we can log the missing element 2020-04-23 15:43:36 -04:00
Isaac Connor a6f5ae2601 fix cyclePlay button not working. Move SetButtonState into skin.js 2020-04-23 15:42:30 -04:00
Isaac Connor 055c20c3cc fix eslint 2020-04-23 10:23:46 -04:00
Isaac Connor ac017a5c72 Add support for strftimes' %r when converting to moment.js formatting 2020-04-18 17:51:34 -04:00
Isaac Connor 3700b9fcbe fix eslint 2020-04-17 11:04:07 -04:00
Isaac Connor b74d8d7487 Add support for strftimes' %r when converting to moment.js formatting 2020-04-17 09:44:07 -04:00
Isaac Connor 9f696186a8 Increase height of storage popup for Enabled 2020-03-04 10:48:02 -05:00
Isaac Connor 967e5ad30f alter setButtonState to take either an id or an element so that we can log the missing element 2020-03-02 11:52:32 -05:00
Isaac Connor dce4d17b51 fix cyclePlay button not working. Move SetButtonState into skin.js 2020-02-25 13:17:02 -05:00
Isaac Connor d7f8f201be Fix zoneminder.com url getting undefined being added to it 2020-02-22 10:51:26 -05:00
Isaac Connor 63a3f2e453 Fix zoneminder.com url getting undefined being added to it 2020-02-22 10:50:00 -05:00
Isaac Connor 7535769e4b controlcap needs to be larger 2020-01-05 17:34:40 -05:00
Andrew Bauer 98f7fb63b9 fix eslint errors 2019-12-31 19:24:51 -06:00
Isaac Connor 6a39893c1d include i elements in data-on-click 2019-12-31 19:11:14 -05:00
Isaac Connor ed417a49b4 increase logspopup width to eliminate scrollbars 2019-12-08 11:21:38 -05:00
Isaac Connor caefcc2f7a increase size of export popup 2019-12-02 12:17:33 -05:00
Isaac Connor 03d7bcdd11 better debug logging when on-click-this function isn't defined 2019-12-02 12:17:18 -05:00
Isaac Connor 207e5918c8 fix lint, remove debug 2019-11-19 11:37:45 -05:00
Isaac Connor 5b02bc76f4 Fix donate now functionality. Improve zmWindow to take an optional sub path so that we can target /donate directly 2019-11-05 10:07:42 -05:00
Isaac Connor 9a3bee28d2 add logging and handling of oninput and oninput-this 2019-11-01 13:38:09 -04:00
Isaac Connor 80e3922165 add backWindow function to handle back buttons 2019-09-28 12:57:43 -04:00
Isaac Connor df0aef89af gracefully handle when window[fnName] doesn't exist 2019-07-23 10:03:28 -04:00
Isaac Connor 256a0aa679 google code style 2019-07-04 09:04:43 -04:00
Isaac Connor 86ad96b788 increase height of donate popup to hold all content 2019-06-04 12:08:08 -04:00
Isaac Connor 36336d67be set width and height of shutdown window 2019-04-12 13:09:25 -04:00
Isaac Connor 677b9cfbed Make controlcap popup wider 2019-03-24 09:59:04 -04:00
Isaac Connor e59eb510e3 update and fix the donate popup 2019-03-05 13:10:04 -05:00
Isaac Connor d93924bd89 increase width of controls popup. 2019-02-20 15:39:26 -05:00
Matthew Noorenberghe cdbd59f054 bandwidth.php: Submit to the 'bandwidth' view but render the 'none' view. Fixes #2493 2019-02-10 13:22:08 -08:00
Matthew Noorenberghe a97711de89 Replace or sanitize remaining uses of PHP_SELF. Fixes #2446 2019-02-09 22:12:36 -08:00
Matthew Noorenberghe e36ac1b872 Add a polyfill for NodeList.prototype.forEach 2019-02-08 21:54:23 -08:00
Isaac Connor dca9a81cfd implement data-on-click-true 2019-02-05 16:45:05 -05:00
Isaac Connor a2e04c307d update buttons. reduce duplicated code. Make it so that users with System=View can at least see if there is an update. 2019-01-31 09:40:19 -05:00
Isaac Connor b9584bb5d2 Increase width of user popup 2019-01-23 11:18:46 -05:00
Isaac Connor e712cedbde spacing and quotes 2019-01-22 09:14:44 -05:00
Matt N e7e45b2d95 Remove jQuery use from top-level event listeners in skin.js since view=none doesn't have $j (#2433) 2019-01-22 08:00:39 -05:00
Isaac Connor 785c208ecf Fixes #2426. Ca should have been endTime 2019-01-21 12:01:46 -05:00
Matt N 19c272061a Replace MooTools usage for adding window event listeners (#2429) 2019-01-21 11:14:32 -05:00
Matt N 27bcf3f994 Upgrade jQuery version (#2430)
* Upgrade jQuery to 1.12.4

* Upgrade jQuery to 2.2.4; Stop support for IE8

* 2.2.4 is compatible with 1.12.4
* This fixes a CSP violation on every page load due to jQuery testing of focusin support with a hidden element.
2019-01-21 11:13:40 -05:00
Matt N d7ebc85d81 Replace remaining `console` inline event handlers (#2432)
* Use a hidden submit button in _monitor_filters rather than onkeydown

* events/console: Convert checkbox header toggle inline event listeners
2019-01-21 11:11:40 -05:00
Matt N a1a42345e3 More eslint fixes; eslint in php; add eslint to travis (#2419)
* Add eslint to travis.yml

* Update eslint package versions and apply new indent rules

* Enable the brace-style and block-style eslint rules

* Enable the 'curly' eslint rule

* Enable the 'keyword-spacing' eslint rule

* Enable the 'key-spacing' eslint rule

* Enable the 'object-curly-spacing' eslint rule

* Enable the 'no-new-object' eslint rule

* Only disable the no-caller eslint rule in the one affected file

* Enable the 'no-unused-vars' eslint rule for local variables

* Add linting of JS in .php files
2019-01-19 10:32:40 -05:00
Matt N d3f8037e58 Replace onclick='submitTab(...' with a click listener (#2424) 2019-01-19 09:42:12 -05:00
Matt N 4e48939660 Add a validateForm event listener and enforce CSP on some views (#2425)
* Add a validateForm event listener and enforce CSP on the controlcap view

* filter.php: Use .validateFormOnSubmit

* server.php: Use .validateFormOnSubmit and fix makePopupButton condition check

* Use .validateFormOnSubmit and enforce CSP on the storage view
2019-01-19 09:41:53 -05:00
Matt N deaf651aad Fix eslint violations (#2416)
* Add more JS libraries to eslintignore

* eslint . --fix

Automatic fixes only

* frame.js: eslint fixes

* events.js: manual eslint fixes

* skin.js: manual eslint fixes

* watch.js: manual eslint fixes

* Remove some tabs used for indentation in JS

* state.js: Fix new-cap eslint violation

* Disable guard-for-in eslint rule to get everything passing
2019-01-18 10:00:55 -05:00
Matt N 6bb5aa1b87 More inline JS / nonce conversions (#2415)
* monitor.php: Add nonce and move <script> inside </body>

* export_functions.php: Untested: Add @nonce to <script>

* blank.php: Add @nonce to <script> and add to CSP enforced views

* Enforce CSP on login and privacy views

* group.php: Add nonce and move <script> inside </body>

* filter.php: Add @nonce to <script>

* Fix updateButtons argument on the filter page upon change and page load

* events.php: Add @nonce to <script>
2019-01-18 09:51:06 -05:00
Isaac Connor a7db6f08f5 single vs double quotes 2019-01-16 13:47:50 -05:00
Matt N d33fec9c3f Add a CSP script-src policy with nonce-source and convert more inline event handlers (#2413)
* Add Content-Security-Policy-Report-Only: script-src 'self' 'nonce-' policy

* Use @data-on-click-this to attach inline click event handlers which expect being called with 'this'

Only handle ones that don't return a value.

* Use @data-on-click to attach inline click event handlers with no args and no return value

* Use @data-on-click-true to attach inline click event handlers with 'true' as the only argument

* Enforce a script-src CSP on views without inline JS

* Convert some onchange attributes to data-on-change
2019-01-16 09:59:58 -05:00
Matt N 083f284599 Replace onclick inline event handlers for createPopup (#2410)
* Move <script> before </body>

* Change makePopupLink to not use onclick

* Change makePopupButton to not use onclick

* Use .popup-link in control_functions.php

* Use makePopupButton in controlcaps.php

* Prevent double-encoding in makePopup*

* Use makePopupButton in devices.php

* Use makePopupButton in logout.php

* Use makePopupLink in monitor.php

* Use makePopupLink and .popup-link in montage.php

* Use makePopupButton in options.php

* Use makePopupButton, makePopupLink, and .popup-link in zones.php
2019-01-15 09:01:58 -05:00
Isaac Connor 0cce0a642b Update chosen library to 1.8.7 2018-12-24 09:37:49 -05:00
Isaac Connor 18ce7c9ea0 Old browsers, specifically Safari on IOS9 doesn't support let. Need to use var instead. 2018-12-03 15:17:16 -05:00
Isaac Connor c5f7fb7b18 Merge branch 'master' into server_path_prefix 2018-11-22 10:04:33 -05:00
Isaac Connor 3be31020b7 Automatically add width to frames view when thumbnails are turned on. 2018-11-14 15:54:01 -05:00
Isaac Connor 86b0e4ea18 fix auth_hash. Should use generateAuthHash instead of accessing session directly 2018-10-22 18:32:39 -04:00
Isaac Connor d1bef49d0b Don't reload on a timeout when refreshing the navbar 2018-10-11 11:30:30 -04:00
Isaac Connor 592f55a550 do a location.reload instead of trying to guess what the current url is. Should solve permission denied problem when watching live view and auth times out. 2018-10-01 10:39:00 -04:00
Isaac Connor 6e5472d305 Merge branch 'master' into server_path_prefix 2018-08-22 12:57:16 -04:00
Isaac Connor 40cd27e68a when refreshing because ajax failed, reload the current view, not just index.php 2018-08-15 17:21:54 -04:00
Isaac Connor 2ff47e04da the updated video-js.css puts the fonts into a font dir. 2018-07-25 17:04:42 -04:00
Isaac Connor 00bdfdcb16 increase height of function popup so that dropdown options fit in it 2018-07-25 09:39:24 -04:00
Isaac Connor dc57a3c91c fix spacing/quotes/google code style 2018-07-24 16:41:09 -04:00
Isaac Connor 2767e7cca3 remove unneeded packaging files from chosen. 2018-07-12 11:35:02 -04:00
Dmitry Smirnov 7db1fabbe1 Removed "chosen" web site; "prism.js" is not distributable. (#2154) 2018-07-11 15:46:43 -04:00
Isaac Connor 77fbfccee0 fix #2149 2018-07-10 10:31:43 -04:00
Isaac Connor c2c7b75956 check for ZM_SERVER_ID being defined 2018-07-09 15:30:15 -04:00
Isaac Connor 45f6eaf530 Add the current serverId to the available javascript variables 2018-07-09 14:28:21 -04:00
Isaac Connor 87aa146d84 remove debug output from updating navbar 2018-07-09 14:10:36 -04:00
Dmitry Smirnov b5ca671103 Misc JS hygiene (#2150)
* fixed "jquery-ui.js" symlink.

* Bootstrap source, matching minified version.

Also origin URL.

* moment.js: added missing source and URL of origin.

* video-js: replaced bad case of source-less minified binary.

 Original file was not identical to https://github.com/videojs/video.js/blob/v4.11.4/dist/video-js/video-js.min.css
 i.e. it was modified in unknown way without sources. Very bad.

* jQuery: renamed URL file for consistency

* mootools-core-compat.js: replaced original with unknown modifications; renamed; added origin URL.

* mootools-more: rename file to properly reflect version.

 This is a default build without any options.

* prism.js.FIXME: note about outdated source-less file.
2018-07-07 10:30:16 -04:00
Isaac Connor 55f2e7c6a2 Fix #2124. Always allow selection of checkboxes, include canEdit(Events) in button disabling. 2018-06-15 15:21:10 -04:00
Isaac Connor 37badbfb17 fix #2123 2018-06-12 08:58:19 -04:00
Isaac Connor 405b1f92ed add a .fail to log the errors given when a navbar ajax call fails 2018-05-31 10:25:53 -04:00
Isaac Connor 780cb693c2 google code style 2018-05-16 11:14:11 -04:00
Isaac Connor 7d4652e37b make group and function popups bigger 2018-03-21 11:33:10 -07:00
Isaac Connor 4c1abf93ba fixup navbarreloader wrt auth_hash 2018-02-14 13:16:14 -05:00
Isaac Connor 4df8cdc685 add auth_hash updating to the navbar reload. 2018-02-14 10:44:48 -05:00
Isaac Connor 1ed8af8aac upgrade jquery-ui to 1.12.1 2018-02-08 13:19:16 -05:00
Isaac Connor d857c2c98a increase download popup height 2018-02-08 09:29:54 -08:00
Isaac Connor 6a36db0b6d move flat skin to base. 2018-01-11 12:24:53 -05:00
Isaac Connor 3ba6760f1b increase logout popup size 2018-01-11 10:58:06 -05:00
digital-gnome c8cfb47f9f More bootstrap in datepicker 2017-12-16 23:10:19 -05:00
digital-gnome 9d87f7fe18 Use bootstrap icons in datepicker 2017-12-16 20:10:02 -05:00
digital-gnome a091153929 Use seperate structure and theme jquery ui 2017-12-16 20:04:12 -05:00
digital-gnome d7532b0340 Add dateTime picker to filter 2017-12-15 22:57:42 -05:00
Isaac Connor abad266c5b introduce chosen to use it to make the filtering dropdowns awesome 2017-12-13 16:15:03 -05:00
Isaac Connor 7108e306cb add popup sizes for server and storage. Increase height of user edit popup 2017-12-11 12:50:30 -05:00
digital-gnome 11a5a47826 Fix missing popups and styles 2017-12-06 09:42:58 -05:00
digital-gnome 34b708bace Handle popups that should remain popups 2017-12-05 09:40:03 -05:00
digital-gnome c72b1f3acf Fix refreshParent on some popups
Some popups wouldn't refresh the parent because after submit the none view page does not include jquery.  This angers javascript and prevents the close function from working.  Only fire header refresh code if there is a view.
2017-12-04 17:04:53 -05:00
digital-gnome 3e7c573da5 Add download video option to events view
Creates a new popup window for downloading event video files with no directory structure in the archive
2017-12-03 14:42:07 -05:00
Isaac Connor 9d5447aa6a
Merge pull request #55 from digital-gnome/storageareas-updateNavbar
Add navbar refresh to all pages that use it
2017-12-02 10:44:01 -05:00
digital-gnome 53f886edc4 Make navbar refresh not change header links 2017-12-01 22:15:29 -05:00
digital-gnome 0a995aea78 Add navbar refresh to all pages that use it 2017-11-30 16:33:46 -05:00
digital-gnome b01fed111a Add zoom transition 2017-11-26 19:08:06 -05:00
digital-gnome 55699a9b9b Change scaleToFit to choose what to fit
Adds 4th input to choose what element is the last thing to fit.
2017-11-26 19:08:06 -05:00
digital-gnome 3920420aa9 Convert scaleToFit to shared function 2017-11-26 19:08:06 -05:00
Isaac Connor 9dd0f29e88 Merge branch 'storageareas' into tesla 2017-11-22 11:41:11 -08:00
Isaac Connor cd1d2e1721 lots more debugging. re-add status update command on failure 2017-11-22 01:18:07 -05:00
digital-gnome 91c3e3573c ZMS controls for videojs
Add ZMS style controls to videojs page.  Zoom, fast forward, fast reverse, frame skip, play/pause.  Some cleanup of old videojs code
2017-11-11 14:49:43 -05:00
digital-gnome 5e9aacfc09 Stills path fix 2017-11-11 14:49:42 -05:00
Isaac Connor 57a53f6fdd spacing and fixes 2017-11-09 15:03:23 -05:00
Isaac Connor 57cb6bb3f2 increase height of monitor 2017-11-06 12:03:24 -08:00
Isaac Connor ea669b4750 increase size of group edit popup 2017-10-24 16:09:12 -07:00
Isaac Connor 729fdb4fdd add a popup size for monitors 2017-10-23 17:02:21 -07:00
digital-gnome ecb980c66f Navigation
Videojs navigation now uses ajax.  Feels and is faster.  Some improvements, namely if zms ever crashes we can still navigate.  Both zms and videojs update the address bar so refreshing a page doesn't return you to the first event.
2017-10-21 22:14:46 -04:00
digital-gnome ff8d067639 alarmCues improvements
Consolidate selectors and improve edge cases where skew could cause overflow
2017-10-21 22:14:46 -04:00
Isaac Connor c281467e69 Store server and storage filters in session. Add storage and server filters to console. WIP 2017-10-18 13:24:41 -04:00
Isaac Connor 340b39ad54 Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas 2017-10-16 12:21:26 -07:00
Isaac Connor 87d9108290 increase width of events 2017-10-16 12:19:22 -07:00
Isaac Connor f81bac530d increase function popup height 2017-10-16 15:16:54 -04:00
Isaac Connor ac1830a40f increase height of bandwidth popup 2017-10-12 08:54:29 -07:00
Isaac Connor 798b4838bd increase group popup height 2017-10-10 16:03:02 -04:00
Isaac Connor c1ada1742b increase function popup height 2017-10-10 10:40:40 -07:00
Isaac Connor d4cf84f7e6 Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
Isaac Connor c768e6ed88 add some more utility functions that should be available everywhere 2017-10-05 16:11:21 -04:00
Isaac Connor 87a49ad009 work on infinite depths of groups 2017-10-04 16:40:09 -04:00
digital-gnome ea4b9486aa alarmCues CSS
also function.php to load new vjs override file
2017-10-04 11:09:22 -04:00
Isaac Connor 462ea72ef5 properly test for existence of popupSizes 2017-10-02 12:43:52 -04:00
Isaac Connor d831f98dfb remove debug 2017-10-02 12:31:38 -04:00
Isaac Connor d8c69ab514 error gracefully when popupSizes not defined 2017-10-02 12:30:30 -04:00
Isaac Connor 4be133ed09 remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin 2017-09-30 14:19:32 -04:00
Isaac Connor 6fe4b892ef always define auth_hash 2017-09-11 17:05:46 -04:00
Isaac Connor 0df6ac2895 Merge branch 'master' into storageareas 2017-07-13 11:04:51 -04:00
Isaac Connor cb88952a77 braces and spacing 2017-07-13 10:25:14 -04:00
Isaac Connor 5f03faa77e view=frame needs more vertical space 2017-07-06 10:48:52 -04:00
Isaac Connor 3233105d2c implement a way to tell a popup to close 2017-07-06 10:48:06 -04:00
Isaac Connor 1d9e0b7d69 fix saving filters 2017-06-19 10:18:44 -04:00
Isaac Connor 75c11431e6 deprecate filtersavepopup 2017-06-16 11:10:25 -04:00
Isaac Connor 3225891843 update/fix filter behaviour 2017-06-15 15:45:43 -04:00
Isaac Connor 085d239a6e Merge branch 'master' into storageareas 2017-06-13 18:02:28 -04:00
Isaac Connor 175e6921f9 use version-generic urls to jquery and jquery-ui 2017-06-07 14:13:03 -04:00
Isaac Connor 46f23efa01 increaes height of eventdetail popup 2017-06-05 19:52:32 -04:00
Isaac Connor 08d505360d spacing 2017-06-05 15:22:32 -04:00
Isaac Connor 5500d7bbc0 merge localized versions of js files 2017-05-18 15:05:57 -04:00
Isaac Connor bf3db69cbe merge localized versions of js files 2017-05-18 15:05:10 -04:00