Commit Graph

1066 Commits

Author SHA1 Message Date
Isaac Connor 4fe6b6f8b7 set a min width so that small images or fps updates don't cause a reflow 2016-11-21 11:39:31 -05:00
Isaac Connor c360e27b02 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-11-17 13:13:47 -05:00
Kyle Johnson 4eb5ff7aff Fix Undefined index: loginFailed. Resolves #1684 2016-11-16 19:42:04 -07:00
Isaac Connor 2bd080a6a6 Merge branch 'master' into storageareas 2016-11-15 08:41:00 -05:00
Isaac Connor 8f71971209 Show error message upon unsuccessful login. Fixes #1648 (#1680)
* Add additional post-cmake files to .gitignore

* Add bootstrap 3.3.7

* Load bootstrap css

* Restyle login page, move recaptcha js to <head>

The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.

* Update doctype to HTML5, add meta tags for mobile browsers

* Move inline Login css to css file

* Remove extra php tag in functions.php

* Show error message upon unsuccessful login.  Fixes #1648

 * Includes bootstrap glyphicons as they're used in the error message.
 * Failure check is done via a simple test in login.js.php and login.js.
   The 'view' param will only be set (to 'postlogin') if the login page
   has refreshed due to a failed login.  Otherwise you're directed to
   the console view.

* Only load bootstrap css in specific views.

Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.

* Test for invalid login via session variable.

The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login

* Fix a few typos in login inputs

* Add new fonts directory to web CMakeLists
2016-11-14 21:24:43 -05:00
Isaac Connor 3b7723ee8f Merge branch 'master' into storageareas 2016-11-11 22:40:00 -05:00
Andrew Bauer 49d8e35e56 Show available PATH_MAP percent on console (#1675)
* Add PATH_SWAP percent to console

* add changes to console.php

* use ZM_PATH_MAP instead of ZM_PATH_SWAP

* show the folder name PATH_MAP points to

* use a dash as the delimiter instead of fwd slash
2016-11-11 08:47:08 -05:00
Kyle Johnson 65fe07e7aa Fix a few typos in login inputs 2016-11-10 23:36:28 -07:00
Kyle Johnson 95d00f70a3 Test for invalid login via session variable.
The previous method had cases where the error messsage was displayed
when it shouldn't have been, such as when specifying ?view=login
2016-11-10 23:29:12 -07:00
Kyle Johnson 3916b02a74 Only load bootstrap css in specific views.
Bootstrap was causing some styling conflicts with the legacy css.
As such only load bootstrap.css on pages which we have specifically
allowed, which would be pages that have been restyled and verified.
2016-11-10 23:07:52 -07:00
Kyle Johnson 0800a69a57 Show error message upon unsuccessful login. Fixes #1648
* Includes bootstrap glyphicons as they're used in the error message.
 * Failure check is done via a simple test in login.js.php and login.js.
   The 'view' param will only be set (to 'postlogin') if the login page
   has refreshed due to a failed login.  Otherwise you're directed to
   the console view.
2016-11-10 22:51:32 -07:00
Kyle Johnson 97fb53e95c Remove extra php tag in functions.php 2016-11-10 21:49:57 -07:00
Kyle Johnson 227b196a2e Move inline Login css to css file 2016-11-10 21:48:42 -07:00
Kyle Johnson 3e3956f45d Update doctype to HTML5, add meta tags for mobile browsers 2016-11-10 21:47:53 -07:00
Kyle Johnson eacf6cd415 Restyle login page, move recaptcha js to <head>
The way it was handled previously resulted in
invalid html, with an extra <head> tag being
inserteed inside the <body>.
2016-11-10 21:46:55 -07:00
Kyle Johnson 1607ae1210 Load bootstrap css 2016-11-10 21:45:46 -07:00
Andrew Bauer 9f43825b92 prevent the end user from slecting an invalid configuration on the PT… (#1676)
* prevent the end user from slecting an invalid configuration on the PTZ control configuraion "Move" tab

* change to console.php should not be in this pr
2016-11-08 22:10:51 -05:00
Kyle Johnson 8c41781a9f Fix event.stop error in watch.js See #1672 (#1678) 2016-11-08 18:53:06 -05:00
Isaac Connor 4b3ac63a68 merge master, deprecate qqq() 2016-11-08 11:30:44 -05:00
Kyle Johnson 735d2df3c9 event is redefined before being passed to deleteEvent. Fixes #1671 2016-11-04 23:23:40 -06:00
Isaac Connor 5c62c654ce fix WatchScale -> EventScale 2016-11-03 16:47:22 -04:00
Isaac Connor 53166fabf5 Merge branch 'master' into storageareas 2016-11-03 14:59:06 -04:00
Isaac Connor cb69d1a693 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2016-11-03 14:57:29 -04:00
Kyle Johnson bd47439056 Merge pull request #1639 from connortechnology/cookie_scale
store the scale value for watch and event views in a cookie, differen…
2016-11-03 12:35:15 -06:00
Isaac Connor 099cca210b fix monitorId to MonitorId 2016-11-03 14:34:17 -04:00
Isaac Connor 0ea8461192 remove extra s 2016-11-03 09:43:38 -04:00
Isaac Connor 2f22eb5a8c fix error when only 1 monitor is listed 2016-11-03 09:41:54 -04:00
Isaac Connor ca69a79bed fix video.js not being included when we are viewing an event without an h264 file, and when buttons do not exist. 2016-10-27 17:05:33 -04:00
Isaac Connor a7c1231b46 fix WatchScale -> EventScale 2016-10-26 14:53:24 -04:00
Isaac Connor 340b172dc4 Merge branch 'add_scale_to_frame_view' into storageareas 2016-10-26 14:46:50 -04:00
Isaac Connor 42783b68f9 float the scale control right, add css for other skins 2016-10-26 14:43:23 -04:00
Isaac Connor 4defad1352 Merge branch 'add_scale_to_frame_view' into storageareas 2016-10-26 14:04:43 -04:00
Isaac Connor d9a31f7fb6 Merge branch 'master' into storageareas 2016-10-26 13:39:31 -04:00
Isaac Connor c74cc54ac0 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2016-10-26 13:34:30 -04:00
Isaac Connor 98cde11e86 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2016-10-26 13:34:28 -04:00
Isaac Connor 7b1395a4ea set default for StorageId to '0' since it can't be NULL anymore 2016-10-20 14:06:09 -04:00
Isaac Connor f153e9b8fb MontageReview should only be visisble to people who can view events. Fix running state 2016-10-20 13:38:12 -04:00
Isaac Connor 67e14bd12f move States loading code into state view where it belongs. Move runnign check into specific places where it is needed. These changes reduce events list load time by about 4 seconds for me. 2016-10-20 13:16:50 -04:00
Steve Gilvarry 0409ae5582 Merge pull request #1652 from connortechnology/fix_popup
handle when window.open fails
2016-10-20 05:17:44 +11:00
Isaac Connor 4bb9709cb2 use object methods of Event 2016-10-12 15:39:53 -04:00
Isaac Connor dcf6a39bf6 split Event and Monitor into objects and use properties from appropriate object 2016-10-12 15:39:32 -04:00
Isaac Connor ba7d935a85 fix border size of text below the image in montage when alerted. 2016-10-12 12:19:04 -04:00
Isaac Connor 5b8b9c5345 merge update 2016-10-12 09:24:10 -04:00
Isaac Connor b4f065eb75 Convert event view to use Objects 2016-10-12 09:17:57 -04:00
Isaac Connor b00588b6ff add back montagereview 2016-10-11 17:35:41 -04:00
Isaac Connor 0903ef294f quick for to make MontageReview work 2016-10-11 17:35:28 -04:00
Isaac Connor 7c8b99af23 fix bracket problems 2016-10-11 12:43:13 -04:00
Isaac Connor 0358476ac0 Merge branch 'fix_popup' into storageareas 2016-10-11 12:19:38 -04:00
Isaac Connor 743e8c59f9 google code style and double to single quotes 2016-10-11 12:11:59 -04:00
Isaac Connor ded1e0ea73 handle when window.open fails 2016-10-11 11:48:29 -04:00