Commit Graph

1601 Commits

Author SHA1 Message Date
Andrew Bauer 1a565a47f2 fix skin path in export_functions 2017-04-26 12:17:01 -05:00
Isaac Connor 5a2ef571ef fix scaling, zones now work. Add a Show/Hide Zones at the top 2017-04-24 14:47:30 -04:00
Isaac Connor 83ba74ad66 work in progress, rough in adding the svg zones to montage 2017-04-24 11:11:54 -04:00
Isaac Connor ef6c675c6a work in progress, rough in adding the svg zones to montage 2017-04-24 11:11:44 -04:00
Isaac Connor c8855c03fc don't use a submodule for video.js 2017-04-20 10:50:42 -04:00
Isaac Connor 035b464b97 Revert "don't use external hosted video.js or moment.js"
This reverts commit fb2f8022a7.
2017-04-20 10:45:51 -04:00
Isaac Connor dd4b93f130 add submodule video.js, using release tag v5.18.4 2017-04-20 10:35:32 -04:00
Isaac Connor fb2f8022a7 don't use external hosted video.js or moment.js 2017-04-20 10:12:47 -04:00
Isaac Connor 3db38eb474 limit points to the limits of the monitor 2017-04-19 16:12:12 -04:00
Isaac Connor dd4ea635e8 remove rotate, as the video file itself has the rotate set 2017-04-19 13:12:15 -04:00
Isaac Connor 71a9763c32 add a comment 2017-04-19 10:02:31 -04:00
Isaac Connor f1f54205fb Merge branch 'remove_BOM' into storageareas 2017-04-16 09:28:35 -04:00
Isaac Connor 5e0012569f use dos2unix to remove BOM 2017-04-16 09:22:37 -04:00
Isaac Connor f97e074393 braces fixes 2017-04-12 16:16:56 -04:00
Isaac Connor d039227f79 Merge branch 'master' into storageareas 2017-04-12 13:51:10 -04:00
Isaac Connor 92a2d6f4f2 hide the video, let's stick with jpeg's, which will be auto-generated 2017-04-07 13:20:28 -04:00
Isaac Connor 8f51331472 fix timeline view by using view=image instead of direct path 2017-04-07 13:20:04 -04:00
Isaac Connor 2b9a0f96d3 remove   and break over multiple lines 2017-04-05 16:10:06 -04:00
Isaac Connor d611840750 whitespace, handle NaN in limitArea 2017-04-05 16:09:40 -04:00
Isaac Connor c5ff45922f fix zone edit height 2017-04-05 16:09:06 -04:00
Andrew Bauer a10d52a3e1 Merge pull request #1844 from connortechnology/fix_1812
fix Monitors filtering SQL
2017-04-03 20:06:39 -05:00
Isaac Connor 58d119d9ed Merge branch 'fix_1762' into storageareas 2017-03-31 13:38:59 -04:00
Isaac Connor 514c83d3e9 whitespace and add a test for ->Triggers being an array 2017-03-31 12:01:37 -04:00
Isaac Connor d3f6ab3d29 fix Monitors filtering SQL 2017-03-30 13:06:54 -04:00
Isaac Connor 56476a7774 uppercase SQL 2017-03-30 13:05:10 -04:00
Isaac Connor 4f2dcdacb4 update, remove styles and fix the sql for limiting monitors 2017-03-30 13:04:16 -04:00
Isaac Connor dd4550406f remove styles from montagereview and stick them in a view-specific css 2017-03-30 13:03:46 -04:00
Isaac Connor 7e3b27a130 Test for Controllable as well as ControlId 2017-03-30 10:49:02 -04:00
Isaac Connor 5ea77f0781 Make zones a link to zones_overview 2017-03-30 10:45:55 -04:00
Isaac Connor 4d2fb6b7f8 don't need to reload when deleting. The row will no longer be in there 2017-03-27 13:13:48 -04:00
Isaac Connor 7b63461517 attempt to support redirecting to the given url instead of just refreshing 2017-03-27 13:13:08 -04:00
Isaac Connor 8ef7a708bd updates in filters, try to get the new filter loaded when saving with a new name 2017-03-27 13:12:37 -04:00
Isaac Connor 7360619941 Merge branch 'master' into storageareas 2017-03-24 11:53:45 -04:00
Isaac Connor eaca58bb7c Merge pull request #1815 from mnoorenberghe/postlogin
Properly escape postLoginQuery. Fixes #1797
2017-03-21 10:27:13 -04:00
Isaac Connor badbf1c74c Merge pull request #1816 from mnoorenberghe/flat_window_sizes
Increase default window sizes for the flat theme. Fixes #1059
2017-03-20 13:10:13 -04:00
Isaac Connor 70246ce55a whitespace corrections and ensure that options[width] and options[height] are defined 2017-03-20 12:10:28 -04:00
Andrew Bauer 2dcd95bc7f Merge pull request #1504 from ZoneMinder/improve_filter
Improve filter
2017-03-18 21:12:58 -05:00
SteveGilvarry a16ea554a3 Swap to PNG 2017-03-18 22:34:13 +11:00
Matthew Noorenberghe c7955cd1b6 Add eslint configuration files extending Google's rules 2017-03-18 00:02:17 -07:00
Matthew Noorenberghe 91ad6afffb Increase default window sizes for the flat theme. Fixes #1059
Used the computed height of <html> and rounded up the nearest multiple of 5.
2017-03-17 22:24:42 -07:00
Matthew Noorenberghe ea5342abd2 Properly escape postLoginQuery. Fixes #1797 2017-03-17 21:05:28 -07:00
Isaac Connor 8834109812 code style and whitespace changes 2017-03-17 09:59:23 -04:00
Isaac Connor d9c665b021 Merge branch 'fix_crash_with_invalid_zones' into storageareas 2017-03-17 09:35:11 -04:00
Andrew Bauer 9681a444b4 Merge pull request #1765 from SteveGilvarry/ffmpeg_url
Align Method description to what it is actually doing
2017-03-16 09:32:30 -05:00
Isaac Connor 5bccd92b68 fix scoping of scale var 2017-03-16 09:53:53 -04:00
Isaac Connor 9f99d34807 fix calls to getStreamHTML 2017-03-13 14:22:33 -04:00
Isaac Connor 14c4a156c6 set img.src='' first so that Chrome closes the old stream. 2017-03-06 20:21:12 -05:00
Isaac Connor 4df12ae370 Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height 2017-03-06 17:30:00 -05:00
Isaac Connor d3f7451736 Merge branch 'storageareas' into montage_width_height 2017-03-06 16:56:18 -05:00
Isaac Connor 4fc0aead70 wip 2017-03-01 15:26:40 -05:00
Isaac Connor c3a52272d8 implement changeWidth, changeHeight and alter getStreamHTML to take an array of options 2017-02-27 20:56:14 -05:00
Isaac Connor a0dd36d869 add width and height scale dropdowns 2017-02-27 16:40:40 -05:00
Isaac Connor 186e5ba866 Merge branch 'master' into storageareas 2017-02-21 09:48:00 -05:00
Manojav Sridhar 11b90e6011 fix usage of wrong key 2017-02-17 12:37:58 -05:00
Isaac Connor 980b088d57 google style and add label tags around Scale 2017-02-17 09:19:54 -05:00
Isaac Connor aeedfe8d74 fix some whitespacing 2017-02-14 09:11:54 -05:00
SteveGilvarry 9716c4ef89 Add Option help 2017-02-05 18:43:47 +11:00
SteveGilvarry c72704bf0b Change descriptions for ffmpeg methods and put TCP first. 2017-02-05 15:34:06 +11:00
Isaac Connor e3edbf40cf make url full width 2017-02-02 12:16:40 -05:00
Isaac Connor 7b73eb350f update to current. 2017-02-02 12:15:16 -05:00
Isaac Connor d8c79cb750 fixup header and sidebar layout 2017-02-02 11:31:16 -05:00
Isaac Connor 7d451e1e41 float the scale control right, add css for other skins 2017-01-31 11:13:16 -05:00
Isaac Connor 4a4f62f0a7 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2017-01-31 11:13:16 -05:00
Isaac Connor 568160e5aa add a scale element to the frame view. Include some bits from StorageAreas to make it work 2017-01-31 11:13:15 -05:00
Isaac Connor 6f6eacaa72 fixup classic and dark skins 2017-01-30 21:45:48 -05:00
Isaac Connor 89022fff0c Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-01-30 21:16:26 -05:00
Isaac Connor f3378207c0 make navbar static instead of fixed, sync up dark theme, and improve storage editing styles 2017-01-30 21:16:21 -05:00
Isaac Connor ad2e00166a use isset 2017-01-30 19:53:08 -05:00
Isaac Connor 4543b3e1b1 include jquery-ui instead of using a cdn version 2017-01-30 19:17:14 -05:00
Isaac Connor 19aed3f860 dont check ZM_DIR_EVENTS if it already exists in storageareas 2017-01-30 17:29:15 -05:00
Isaac Connor 129acb5b8e only show mark column if you have the Monitor Edit ability 2017-01-24 09:30:56 -05:00
Isaac Connor 7cd2f6c69e use glyphicon for sort 2017-01-23 21:51:17 -05:00
Isaac Connor fdd71a826a implement dragndrop sorting 2017-01-23 10:12:57 -05:00
Isaac Connor 35148008b6 make img an inline-block so that it continues having space, even when is a broken link 2017-01-18 21:14:15 -05:00
Isaac Connor 9c8b229c74 Fix cutnpaste error 2017-01-14 17:08:13 -05:00
Isaac Connor 899b1b82b9 Merge branch 'filter_by_runstate' into storageareas 2017-01-14 17:07:20 -05:00
Isaac Connor 242e5a56d8 rough in the ability to filter on RunState 2017-01-14 16:55:28 -05:00
Isaac Connor 2436e40f5d Merge branch 'master' into storageareas 2017-01-11 10:34:27 -05:00
Andy Bauer 7ef7a36f39 fix conditional logic in controlcap.js 2017-01-10 17:53:05 -06:00
Isaac Connor fea5fa1b59 fix xtell should be -1 for move left 2017-01-10 12:35:02 -05:00
Isaac Connor 7ef0c2c9d3 fix deleting filters. We don't need to set fid anymore 2017-01-09 14:58:55 -05:00
Isaac Connor cc724a5542 add a question mark to delete confirmation 2017-01-09 14:53:13 -05:00
Isaac Connor 84183c819c Merge branch 'master' into storageareas 2017-01-03 09:53:09 -05:00
Isaac Connor b4bddee337 Merge branch 'master' into improve_filter 2017-01-03 08:49:56 -05:00
Isaac Connor 0a90dbac9f require Event.php and clean up use of object vs db row array. Use newer way of using views/image.php by passing eid and frameid instead of a path. 2017-01-02 10:35:51 -05:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 2dda2d9e1e remove unneeded, empty files 2016-12-26 09:49:14 -06:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 0f4b78b180 increase height of bandwidth popup 2016-12-21 10:46:42 -05:00
Isaac Connor f92edc3456 refresh stream url when changing scale 2016-12-21 10:40:47 -05:00
Isaac Connor 02a2fdf58f Merge branch 'remove_emptys' into storageareas 2016-12-20 16:40:42 -05:00
Isaac Connor 38c0cedecc remove the use of empty which on php < 5.5 only supports variables. 2016-12-20 16:37:42 -05:00
Isaac Connor 752f0eb40b Merge branch 'master' into improve_filter 2016-12-20 11:43:02 -05:00
Isaac Connor 708f52beda Merge branch 'disk_space_in_events' into storageareas 2016-12-13 13:36:18 -05:00
Isaac Connor a9548d3f6b Add a config entry to turn event disk space on/off 2016-12-13 13:34:56 -05:00
Isaac Connor 30ec67d4c3 Merge branch 'master' into disk_space_in_events 2016-12-13 13:28:32 -05:00
Isaac Connor 857b4e8345 Merge branch 'master' into improve_filter 2016-12-06 11:58:41 -05:00
Isaac Connor 2adb17ad90 fix type 2016-11-29 15:25:24 -05:00
Isaac Connor 9312eed17f Merge branch 'master' into disk_space_in_events 2016-11-22 10:58:24 -05:00
Isaac Connor 02cd3e8cba Merge branch 'master' into small_fixes 2016-11-22 10:52:07 -05:00
Isaac Connor 6bf921a858 Add thumbnanils to the frames view. Also add a content-disposition header and some url mangling to help browsers give a useful filename when doing Save Image As 2016-11-21 12:28:15 -05:00
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
Isaac Connor bb6b0c2d49 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into improve_filter 2016-11-17 12:16:49 -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 1e233c0ce5 Merge branch 'master' into improve_filter 2016-11-04 15:20:43 -04: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 b385ba7bf4 Merge branch 'master' into improve_filter 2016-10-18 09:59:45 -04: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
Jeff Vogt 3801d9e43e Disabled autocorrect, autocapitalize, spellcheck on username field for login form 2016-10-10 11:27:36 -07:00
Isaac Connor 96b5af9021 Merge branch 'fix_onvif' into storageareas 2016-10-04 15:00:28 -04:00
Isaac Connor ac24865647 add NoDetectProfiles instead of reusing NoDetectedCameras 2016-10-04 14:33:51 -04:00
Isaac Connor 09c5e3012a username and password don't actually have to be specified 2016-10-04 14:09:32 -04:00
Isaac Connor 21a94a6200 better error message 2016-10-04 10:29:37 -04:00
Isaac Connor cf9fa78ca3 work on fixing event view 2016-09-29 09:28:48 -04:00
Isaac Connor 09f7c9ddf9 Merge pull request #1633 from bhaal2/storageareas
Storageareas
2016-09-28 09:43:00 -04:00
Isaac Connor 994f1d566e fix [ 2016-09-28 09:09:01 -04:00
Isaac Connor 02a196d98b add missing ] 2016-09-28 08:30:22 -04:00
Isaac Connor 6840031ee3 fix auth timeout and user session[username] when checking auth hash for speedup 2016-09-27 11:51:55 -04:00
Isaac Connor e04266600e Merge branch 'fix_auth_timeout' into storageareas 2016-09-27 11:04:12 -04:00
Isaac Connor 4ce531099c add an auth field to request=stream results to give the client a new auth hash to use 2016-09-27 11:03:12 -04:00
Isaac Connor 167214cb01 Merge branch 'cookie_scale' into storageareas 2016-09-27 10:05:16 -04:00
Isaac Connor 6c3a3d3d50 store the scale value for watch and event views in a cookie, differentiated by monitorId. 2016-09-27 09:46:04 -04:00
Isaac Connor 0580ef0c88 whitespace changes 2016-09-26 20:09:09 -04:00
bhaal2 b9b1dd144c @connortechnology changed the selectName back to Id from filterId in filter.php, this had a flowon effect in filtersave.php as well. 2016-09-21 21:41:22 +10:00
Isaac Connor 33ab9d3098 instead of filterId, use Id so that the object in is properly filled out. Add object=filter to hidden fields 2016-09-20 12:19:44 -04:00
Isaac Connor 5ce2e95fb7 replace getDiskPercent call with code to show percent for all storageareas 2016-09-20 12:18:50 -04:00
bhaal2 c74af40ffb Had file open with old stuff. Fixed now. 2016-09-17 02:20:17 +10:00
bhaal2 aee6ae956d Moved '%' to getDiskPercent() where it should have been. 2016-09-17 02:13:33 +10:00
Isaac Connor 5f46b8f942 Merge pull request #1621 from connortechnology/fix_1620
ptzControl expects a monitor object instead of a dbrow array.
2016-09-15 10:18:26 -04:00
Isaac Connor 2c21fe80e7 Merge pull request #1626 from bhaal2/storageareas
Storageareas
2016-09-15 10:18:11 -04:00
bhaal2 76beaf281a Changed "Disk" to "Storage" which looked better when showing disk space for all storage areas. 2016-09-15 19:44:13 +10:00
Isaac Connor 37c559ba3d Merge branch 'storageareas' of github.com:ZoneMinder/ZoneMinder into storageareas 2016-09-14 12:49:55 -04:00
Isaac Connor cf45feea66 quiet the logs on initial view load 2016-09-14 12:49:47 -04:00
Isaac Connor fb8b2f2490 Merge pull request #1625 from bhaal2/storageareas
Storageareas
2016-09-14 12:08:55 -04:00
bhaal2 17555bf623 Added extra argument 'id' to deleteFilter function to send to delete action for deleting a filter. 2016-09-15 01:57:31 +10:00
bhaal2 67f2ddc404 Changed filter list order back to Name
Added extra argument 'Id' to delete button onClick call
2016-09-15 01:55:58 +10:00
bhaal2 cd626a54ee Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters. 2016-09-15 01:29:44 +10:00
bhaal2 99a212803a Converted filter action to use table Id's instead of filterName's when editing existings and creating new filters. 2016-09-15 01:29:35 +10:00
Isaac Connor a0eaea00a5 fix relative paths to jquery and bootstrap fixes #1618 2016-09-14 10:06:15 -04:00
bhaal2 cd0e6ba285 StorageId now defaults to 0 and database column now set to NOT NULL. Changed default Id in php to match 2016-09-14 23:56:05 +10:00
bhaal2 33fc47c4b1 StorageId now defaults to 0 (NOT NULL) in the Monitors table, updates to filter.php set the default Id for the default storage area to 0 2016-09-14 23:53:52 +10:00
Isaac Connor 0bc50810de only add the development h3 if it has contents, otherwise it pushes the header size down 2016-09-13 10:25:49 -04:00
Isaac Connor 2b4bad86cb Merge branch 'master' into storageareas 2016-09-13 10:21:10 -04:00
Isaac Connor a80881bb98 Merge branch 'fix_1620' into storageareas 2016-09-13 10:03:02 -04:00
Isaac Connor 54db9f2e3a ptzControl expects a monitor object instead of a dbrow array. 2016-09-12 21:36:03 -04:00
Steve Gilvarry 563f4a9d46 Merge pull request #1505 from ZoneMinder/fix_filter_actions
Confirmed check box status is now retained after save and changing filters.
2016-09-11 14:13:51 +10:00
corax 070051d06a Merge commit '6fab2e97b1f45115107c4f5138424408f42dc3e9'
For easy pull-requesting
2016-09-09 14:20:03 +02:00
corax b10c79b4f7 Add translation for 'Montage Review' 2016-09-09 13:26:19 +02:00
corax 6b18184e4a Remove confusing link to web console 2016-09-09 12:38:30 +02:00
corax 4dc6fc03b3 Add a missing translate()-call 2016-09-09 12:35:34 +02:00
Isaac Connor 10abe98e91 merge from packet queue. add monitorId to livestream div lookup 2016-09-01 10:15:12 -04:00
Isaac Connor 5f07911a63 fix spacing 2016-08-31 10:09:42 -04:00
Isaac Connor 09ebcfb7f8 only put in the development h3 tag if the value has been set 2016-08-22 11:42:44 -04:00
Andrew Bauer ea34f3d69a Merge pull request #1576 from ZoneMinder/show_other_zones
include polygons for the other zones.
2016-08-15 20:36:16 -05:00
Isaac Connor 19d46c2d09 Merge branch 'master' into storageareas 2016-08-15 10:45:50 -04:00
Isaac Connor a0bc30d3fe fix the order of analyse/capture being passed 2016-08-12 15:40:47 -04:00
Isaac Connor 9106675842 pass capture or analyse to getImageSrc 2016-08-12 15:17:13 -04:00
Isaac Connor bc4923b555 use instead of for the frame object and pass to getImageSrc which expects an array 2016-08-12 13:50:18 -04:00
Isaac Connor cc06a84a0e increase size of onvifprobe popup 2016-08-09 13:09:47 -04:00
Isaac Connor 2451768295 Merge branch 'master' into storageareas 2016-08-08 18:08:46 -04:00
Andrew Bauer 24d471f452 Merge pull request #1503 from ZoneMinder/id_on_console
add option to show monitor ID on console
2016-08-06 10:59:03 -05:00
Isaac Connor 6a0c6cd4f2 Merge branch 'show_other_zones' into storageareas 2016-08-02 13:54:01 -04:00
Isaac Connor 8093470a2e make only the editing polygon have a border. Set default for Type when creating a new zone 2016-08-02 12:19:55 -04:00
Isaac Connor b522371080 include polygons for the other zones. 2016-08-02 12:02:07 -04:00
Isaac Connor 4c1c95e3a5 only include the state if canEdit(system) otherwise it gives an auth error 2016-07-22 16:04:42 -04:00
Isaac Connor 32f9b2755e add more height to the logout popup 2016-07-22 16:04:18 -04:00
Isaac Connor 9262d9d14e remove debug messages on css changing 2016-07-22 16:02:55 -04:00
Isaac Connor 3504c1d8f5 Add Id to the title for each monitor 2016-07-21 15:02:01 -04:00
Isaac Connor 8c8461a88e Update to use Event object and object based createListThumbnail function 2016-07-20 15:20:51 -04:00
Isaac Connor bce7369984 Merge branch 'disk_space_in_events' into storageareas 2016-07-19 17:36:15 -04:00
Isaac Connor cd43d1fa7a Rough in Event disk space reporting 2016-07-19 17:34:01 -04:00
Isaac Connor 4caa20821a fix 2016-07-14 11:57:06 -04:00
Isaac Connor eb0ddc4e32 update and use Monitor object to generate the stream html. Also introduce a mode parameter to getStreamHTML to specify stills 2016-07-14 11:55:27 -04:00
Isaac Connor b6c02b563b turn off host validation 2016-07-14 10:22:09 -04:00
Isaac Connor 410e154b7f code style 2016-07-12 10:29:40 -04:00
Andy Bauer 19265b631a custom banner text on web console 2016-07-09 13:11:30 -05:00
Isaac Connor 6ab2b33e95 fix merge 2016-06-27 09:10:35 -04:00
Isaac Connor 6e4c8fa224 need to set the Id when duping 2016-06-24 10:31:15 -04:00
Isaac Connor d732d9a49a fix merge 2016-06-24 10:02:20 -04:00
Isaac Connor e29a0ebe71 Merge branch 'feature-h264-videostorage' into storageareas 2016-06-21 13:48:32 -04:00
Isaac Connor 6a8db582ff whitespacing updates 2016-06-21 12:21:18 -04:00
Isaac Connor 31a5252afa apply btn and btn-primary styles to remaining buttons on console 2016-06-21 09:22:32 -04:00
Isaac Connor 1d1cedce95 use rand mofification like when re-establishing the stream instead of an Time(). Drop use of a tempImage as it doesn't seem to be used anywhere. Cleanup use of streamSrc. Introduce a function getStreamMode 2016-06-20 12:40:33 -04:00
Isaac Connor 26bba58c56 Merge branch 'master' into feature-h264-videostorage 2016-06-17 11:09:47 -04:00
Isaac Connor 3914e0b394 :Merge branch 'fix_zone_edit' into storageareas 2016-06-16 12:04:18 -04:00
Isaac Connor 0c82e82ae2 Don't update x in updateY and don't update y in updateX as they are not defined. 2016-06-16 12:00:00 -04:00
Isaac Connor 8e7665d397 use getStreamHTML instead of duplicated code 2016-06-14 12:40:18 -04:00
Isaac Connor d5d48bef8a clean out unused variables and don't scale the popup window. The contents of it won't be scaled. 2016-06-14 12:39:51 -04:00
Isaac Connor bfa46e26ee Use monitor Id instead of the array index. Id is unique, so just use it. 2016-06-14 12:39:15 -04:00
Isaac Connor abad7cbf9f Merge branch 'fix_zone_edit' into storageareas 2016-06-13 09:43:03 -04:00
Isaac Connor 83ac4cd061 change the input handler from onchange to oninput. Disable form submit when hitting enter 2016-06-13 09:40:04 -04:00
Isaac Connor 632ec38d7d Put back in neccessary callt o updateArea 2016-06-12 16:10:24 -04:00
Isaac Connor 4f2e0edb44 remove unnecssary updateAreas
remove unnecessary updateZoneImage
2016-06-07 21:23:30 -04:00
Isaac Connor c3043c1487 cleanups, remove unneccessary updateArea calls 2016-06-07 21:22:22 -04:00
Isaac Connor b2dfdea66e Merge branch 'fix_zone_edit' into storageareas 2016-06-07 11:45:50 -04:00
Isaac Connor 593fe2b0c5 update area when points move 2016-06-07 11:40:53 -04:00
Isaac Connor bb6adc3012 fix missing space 2016-06-07 09:37:05 -04:00
Isaac Connor f0ec2a65ee Merge branch 'fix_errors_when_event_not_found' into storageareas 2016-06-03 10:47:47 -04:00
Isaac Connor 380b86614f put quotes around integer values that will be empty strings if the event is not found 2016-06-03 10:46:21 -04:00
Isaac Connor b8c406f969 Merge branch 'master' into storageareas 2016-06-03 09:32:55 -04:00
Isaac Connor 060988c05c set margin and padding on montage.alert and imageFeed.alert because bootstrap declares a generic .alert style with large margins and padding 2016-05-31 16:02:37 -04:00
Andrew Bauer a57a3d3186 Merge pull request #1501 from ZoneMinder/fix_zone_edit
Fix zone edit
2016-05-31 10:33:31 -05:00
Isaac Connor 1add5a954a Merge branch 'fix_filter_actions' into storageareas 2016-05-29 11:37:08 -04:00
Isaac Connor 9f6f5100fe also copy Name from the request on update and only show delete button if it has a name 2016-05-29 11:32:18 -04:00
Isaac Connor 7725109917 Merge branch 'fix_filter_actions' into storageareas 2016-05-27 12:47:32 -04:00
Isaac Connor 101c93d422 When the filter is not being loaded, copy the auto fields in the request params into the dbFilter object 2016-05-27 12:45:36 -04:00
Isaac Connor c4e5299943 sync up auto to Auto 2016-05-27 12:45:04 -04:00
Isaac Connor c25b680799 Merge branch 'fix_filter_actions' into storageareas 2016-05-27 11:12:18 -04:00
Isaac Connor 65e33d6c19 synchronize on capitalizing the word Auto. This should fix the losing of the checkboxes when you change a filter 2016-05-27 11:11:30 -04:00
Isaac Connor 7277283659 rename AttrServerId to AttrServer, because that is the text that is returned 2016-05-27 10:12:46 -04:00
Isaac Connor d52a6f9a95 Merge branch 'improve_filter' into storageareas 2016-05-27 09:57:05 -04:00
Isaac Connor 3058dd9463 Merge branch 'id_on_console' into storageareas 2016-05-26 12:19:33 -04:00
Isaac Connor f461bc1e80 get rid of extra ) 2016-05-26 12:18:58 -04:00
Isaac Connor 05709f3084 Merge branch 'id_on_console' into storageareas 2016-05-26 11:17:41 -04:00
Isaac Connor f969186abb add the ZM_WEB_ID_ON_CONSOLE option and use it to show the ID column on the console 2016-05-26 11:15:13 -04:00
Andrew Bauer 730abc9789 make zones unclickable when zm is not running 2016-05-26 09:35:36 -05:00
Andrew Bauer 1972c4116b Merge pull request #1486 from connortechnology/update_image_view
Update image view
2016-05-26 09:05:14 -05:00
Isaac Connor 7a08d4620f Merge branch 'master' into storageareas 2016-05-25 10:17:46 -04:00
Andrew Bauer 575f8ec265 Merge pull request #1488 from ZoneMinder/hide_rtspdescribe
Hide rtspdescribe
2016-05-25 08:44:17 -05:00
Isaac Connor 8f1596d683 use setStyle('display','table-row') since mootools suck and .show() will use display:block on a tr 2016-05-25 09:08:28 -04:00
Isaac Connor 7cfa2a5eaa Replace the server attribute with a server entry, populated with a dropdown.Makes things more friendly and less error-prone 2016-05-24 16:46:34 -04:00
Isaac Connor 8fabeb78d3 Merge branch 'fix_zone_edit' into storageareas 2016-05-24 15:55:49 -04:00
Isaac Connor a8e407172a split out versus get functionality in includes/functions. Fix positioning of svg over image stream 2016-05-24 15:50:22 -04:00
Isaac Connor 89f58daf89 Merge branch 'master' into fix_zone_edit 2016-05-24 15:30:56 -04:00
Andrew Bauer 0052bb080c unlink only if file exists 2016-05-24 12:13:17 -05:00
Isaac Connor 00abd36af8 fix the other case of the wrong case of rtsp 2016-05-24 12:19:31 -04:00
Isaac Connor 056eed6df9 fix to show RTSP describe option when switching back to rtsp 2016-05-24 12:15:59 -04:00
Isaac Connor bc49aa6aa6 add missing ; and remove extra ) 2016-05-24 09:34:36 -04:00
Isaac Connor 5eac0559e2 Merge branch 'master' into hide_rtspdescribe 2016-05-24 09:32:41 -04:00
Isaac Connor fff54e4086 update export to use event object, which automatically fixes storage path issues. Include mp4's in the list of video files to include 2016-05-18 09:02:14 -04:00
Isaac Connor 20c4d07a00 Merge branch 'master' into hide_rtspdescribe 2016-05-16 14:40:04 -04:00
Isaac Connor 5e419e85d7 move logger down, as thisURL gets set in the skin.js and comment out overlay.js 2016-05-16 14:37:35 -04:00
Isaac Connor e28cb5b412 fix body padding 2016-05-16 13:29:13 -04:00
Isaac Connor 9601b30972 Add Width, Height and alt to frame 2016-05-16 13:26:44 -04:00
Isaac Connor e4566f2e8e Merge branch 'update_image_view' into storageareas 2016-05-16 12:23:19 -04:00
Isaac Connor df8964c1f9 use eid= & fid= instead of path to frame image. The use of view=image also provides more security. 2016-05-16 10:33:21 -04:00
Isaac Connor 9a1b0b79b9 don't use a dropdown for montage, etc 2016-05-13 11:43:38 -04:00
Isaac Connor a61dade6df Merge branch 'fix_montage_server_refs' into storageareas 2016-05-13 11:11:27 -04:00
Isaac Connor 3ed6014f61 Merge branch 'iconnor-updated-console' into storageareas 2016-05-13 11:11:19 -04:00
Isaac Connor 8cb2692bbb pass in the server url into the monitor object to use instead of the portal url 2016-05-13 11:09:12 -04:00
Isaac Connor e301eaf6e4 use instead of $ to reference jquery 2016-05-13 11:08:04 -04:00
Isaac Connor 85f950d80a put jquery into no conflict mode so it doesn't overwite mootools use of $ 2016-05-13 09:45:24 -04:00
Isaac Connor 1ce2e597cf fix body top padding 2016-05-12 20:00:37 -04:00
Isaac Connor 2144cb7de6 fix body padding only for console and options 2016-05-12 10:45:13 -04:00
Isaac Connor e9d8b7925a Merge branch 'db_reconnect' into storageareas 2016-05-10 11:13:09 -04:00
Isaac Connor 2af96237b3 increase filter save popup height 2016-05-10 10:02:07 -04:00
Isaac Connor e4171855bb add padding for nabar to body 2016-05-07 18:12:31 -04:00
Isaac Connor ae40dc8b1b revert to fixed navbar 2016-05-07 18:11:58 -04:00
Isaac Connor 51e6372362 remove extra hidden fields 2016-05-06 18:20:05 -04:00
Isaac Connor dcdefac48a fix styles in header, move footer back into header 2016-05-06 16:08:32 -04:00
Isaac Connor 7219e0624b Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:56:07 -04:00
Isaac Connor 9756f59a2c still trying to fix eventcounts 2016-05-06 15:56:01 -04:00
Isaac Connor 97a1d5a648 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:53:48 -04:00
Isaac Connor 52b4e98e5a fixes 2016-05-06 15:53:19 -04:00
Isaac Connor fc191dfaa5 fixes 2016-05-06 15:52:07 -04:00
Isaac Connor 38877f802c Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:47:48 -04:00
Isaac Connor 905b69a394 fix too many { 2016-05-06 15:47:29 -04:00
Isaac Connor 7c3a7a6fda fix i to monitor_i in for loop 2016-05-06 15:46:47 -04:00
Isaac Connor 38e02db9cf Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:46:00 -04:00
Isaac Connor daf10c1b84 make displayMonitors global 2016-05-06 15:44:35 -04:00
Isaac Connor f8d7f9906d fixup merging of Event data into the monitor array 2016-05-06 15:44:23 -04:00
Isaac Connor 2ccefdb23c Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:30:25 -04:00
Isaac Connor f4df9e053d port sidebar css over from classic to flat 2016-05-06 15:30:10 -04:00
Isaac Connor fb1b8000ec fix the use of when specifying a skin 2016-05-06 15:24:20 -04:00
Isaac Connor 02b5cd6b6c Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:17:10 -04:00
Isaac Connor 5d8eeb5b56 deprecate header, just the getNavBarHTML function 2016-05-06 15:16:48 -04:00
Isaac Connor da97dfd9cf Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:59:10 -04:00
Isaac Connor ed5cb2f3ed fix global language problems 2016-05-06 14:58:41 -04:00
Isaac Connor 99d9f98244 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:40:08 -04:00
Isaac Connor 956b971719 put back maxWidtha nd maxHeight 2016-05-06 14:39:48 -04:00
Isaac Connor b3b63ec1d9 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:38:17 -04:00
Isaac Connor 829202b42a move more eventcounting stuff to console.php. 2016-05-06 14:38:08 -04:00
Isaac Connor b67ea65fcb Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:34:02 -04:00
Isaac Connor 297f27af8c fix missing { 2016-05-06 14:33:56 -04:00
Isaac Connor f1e22f9265 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:32:57 -04:00
Isaac Connor 7acf6cb694 fix colon to semi colon 2016-05-06 14:32:52 -04:00
Isaac Connor 01397b6695 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 14:31:27 -04:00
Isaac Connor 1d673a0b8c move header into a function in functions.php. Move event population into console.php 2016-05-06 14:30:32 -04:00
Isaac Connor 7df2685223 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 12:51:40 -04:00
Isaac Connor e87a35b04d Merge branch 'always_show_ptz' into storageareas 2016-05-06 12:51:15 -04:00
Isaac Connor c9f1614e32 If the camera has no centering control, don't make it look like it does. This also removes a logged error 2016-05-06 12:51:03 -04:00
Isaac Connor d5f1519829 Can't externally reference .js.php, they have to be inline js 2016-05-06 12:40:23 -04:00
Isaac Connor b333b8ebee Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 12:06:47 -04:00
Isaac Connor ee015ee674 whitespace/codestyle. Also remove duplicate form iput runState which I think is left over from it being a popup 2016-05-06 12:06:13 -04:00
Isaac Connor 44e5b566b8 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 11:56:24 -04:00
Isaac Connor 8405db4750 Move running=daemonCheck from header to index.php so that it is defined early and can be used everywhere 2016-05-06 11:56:03 -04:00
Isaac Connor b3b9eaa7d5 better code for deprecate sequpdownarrays 2016-05-06 11:44:13 -04:00
Isaac Connor be4f155160 Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 11:42:46 -04:00
Isaac Connor 4784f8b630 deprecate the seqUp and seqDown arrays 2016-05-06 11:36:11 -04:00
Isaac Connor 4b838dc66c deprecate minSequence and maxSequence 2016-05-06 11:29:49 -04:00
Isaac Connor b0e977f8ed Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 11:26:53 -04:00
Isaac Connor 55567b66e9 deprecate minSequence and maxSequence use 2016-05-06 11:04:35 -04:00
Isaac Connor b0a057724a document minSequence use 2016-05-06 11:04:22 -04:00
Isaac Connor 49dc917b2e Merge isaac:ZoneMinder.p1 into storageareas 2016-05-05 15:24:14 -04:00
Isaac Connor 27b928839c deprecate view=image-ffmpeg 2016-05-05 15:04:11 -04:00
Isaac Connor d342b11e64 remove servers references from header, they go in console 2016-05-04 09:07:29 -04:00
Isaac Connor 36f94dddec cleanup merge problems 2016-05-03 14:46:22 -04:00
Isaac Connor d25e75f485 Merge branch 'updated-console' of github.com:ZoneMinder/ZoneMinder into updated-console 2016-05-03 14:39:59 -04:00
Isaac Connor c3628a8dfd Merge branch 'updated-console' into storageareas 2016-05-03 14:34:58 -04:00
Isaac Connor 4defe92911 Merge branch 'master' into updated-console 2016-05-03 14:22:37 -04:00
Kyle Johnson 36da4aed88 Push monitor view back to before I messed with it 2016-05-03 13:55:38 -04:00
Kyle Johnson b92c9f9be4 Add state modal to options view 2016-05-03 13:55:38 -04:00
Kyle Johnson 3271d17a3a Remove header from log view 2016-05-03 13:55:38 -04:00
Kyle Johnson bfda50b693 Also don't load additional JS to Log view
Another issue with mootools & jquery conflicts
2016-05-03 13:55:38 -04:00
Kyle Johnson dcd6449a9b Don't include extra js libraries for monitor view.
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
2016-05-03 13:55:38 -04:00
Kyle Johnson 464db86c53 Revert "Add sidebar and top nav to Monitors popup view"
This reverts commit 315fb3e857.
2016-05-03 13:55:38 -04:00
Kyle Johnson 237f1c3a9c Change sidebar to lighter colors 2016-05-03 13:53:30 -04:00
Kyle Johnson 6a48b9041a Revert "Include Chart.js"
This reverts commit 33d6d311b0.

Didn't mean to add this code in yet.  For a future feature.
2016-05-03 13:53:30 -04:00
Kyle Johnson 44fbbee152 Major rewrite of states view. Now a modal on every page.
Read: No longer an HTML popup window.

 * State html is now included toward the bottom of every page
 * The states.js has been rewritten in jquery
 * Applying, deleting or saving a state reloads the page after the POST is done
2016-05-03 13:53:30 -04:00
Kyle Johnson 800378b095 Add state view's js and php to all pages as it is now part of header 2016-05-03 13:53:30 -04:00
Kyle Johnson 2e2cc3d9ab Change 'marked' row style to bootstrap 'danger' and find it with jquery 2016-05-03 13:53:30 -04:00
Kyle Johnson 62fc4dff7e Change class of delete button to be red 2016-05-03 13:53:30 -04:00
Kyle Johnson 0f5089bbf8 Fix button alignment on console page, and add button styling 2016-05-03 13:53:30 -04:00
Kyle Johnson f305a6ffc8 Replace console table css with styles from bootstrap 2016-05-03 13:53:30 -04:00
Kyle Johnson 8b5693129b Include Chart.js 2016-05-03 13:53:30 -04:00
Kyle Johnson 0bb08a6256 clean up options a bit more 2016-05-03 13:51:54 -04:00
Kyle Johnson 291179d3b1 Add side tab list to options page, and style it. 2016-05-03 13:51:54 -04:00
Kyle Johnson cf6f36b0e5 Add header to log view 2016-05-03 13:51:54 -04:00
Isaac Connor 3e51429fb0 Move skin and css changing up above the include of header.php so that the set cookie call will work 2016-05-03 13:51:54 -04:00
Isaac Connor e435b3ebed remove duplication 2016-05-03 13:51:54 -04:00
Kyle Johnson d698f2af14 Restyle the header. Full width, dark background, collapseable. 2016-05-03 13:51:54 -04:00
Kyle Johnson 6c1f53cbdc Load jquery and bootstrap js in classic skin 2016-05-03 13:51:54 -04:00
Kyle Johnson 27c9d06aee Add local copy of bootstrap.js 3.3.6 2016-05-03 13:51:54 -04:00
Kyle Johnson eb443e371f Update doctype to html5, and add additional meta tags 2016-05-03 13:51:54 -04:00
Kyle Johnson ff15fdb6d9 Make the ZM logo in header stand out 2016-05-03 13:51:54 -04:00
Kyle Johnson 7a6dae69f0 Convert options layout to side-tabs, and improve readability 2016-05-03 13:51:54 -04:00
Kyle Johnson d95cf8dae5 Push the options page down a bit to make tab look better 2016-05-03 13:51:54 -04:00
Kyle Johnson d12fc95ad1 Restyle options view with horizontal form layout 2016-05-03 13:51:54 -04:00
Kyle Johnson 2214cb6389 Add styling to delete / save / add buttons in options.php 2016-05-03 13:51:54 -04:00
Kyle Johnson b317797a6c Remove cancel button from options as it no longer makes sense. 2016-05-03 13:51:54 -04:00
Kyle Johnson 2a9b10e80e Update options.php to use bootstrap container 2016-05-03 13:51:54 -04:00
Kyle Johnson be8385535d Oops. Move Console view outside of canView(system) restriction 2016-05-03 13:51:54 -04:00
Kyle Johnson 858845e3a1 Add a link back to console in header 2016-05-03 13:51:54 -04:00
Kyle Johnson a8c7ec250d Make the Options link a standard href (not a popup). 2016-05-03 13:51:54 -04:00
Kyle Johnson 25c9328187 Move console php code to header as that code is now needed in additional views. 2016-05-03 13:51:54 -04:00
Kyle Johnson cd8e8d9685 Move the header into its own file, and include it in options view. 2016-05-03 13:51:34 -04:00
Kyle Johnson a4e07e9a73 Update options styling 2016-05-03 13:51:34 -04:00
Kyle Johnson 2fff9a6a8b Fix state link to do popup like before 2016-05-03 13:51:34 -04:00
Kyle Johnson 3e59aca739 Additional footer padding 2016-05-03 13:51:34 -04:00
Kyle Johnson d6b0b637ea Add styles to additional console buttons 2016-05-03 13:51:34 -04:00
Kyle Johnson daef9eb40b Remove extra #footer styling 2016-05-03 13:51:34 -04:00
Kyle Johnson ea0c61d482 Bump up the default font size 2016-05-03 13:51:34 -04:00
Kyle Johnson c3cc5d46bd Wrap footer in container-fluid 2016-05-03 13:51:34 -04:00
Kyle Johnson d7f471f41f Restyle of Login page. 2016-05-03 13:51:34 -04:00
Kyle Johnson 03c188db89 Move recaptcha javascript to actual <head> tag
The way it was handled previously resulted in invalid html, with an
extra <head> tag being inserteed inside the <body>.
2016-05-03 13:51:34 -04:00
Kyle Johnson aa3c99fc68 Initial major restyle of classic skin. 2016-05-03 13:51:34 -04:00
Kyle Johnson c4c9b6c494 Local copy of bootstrap 3.3.6, included in classic skin. 2016-05-03 13:51:06 -04:00
Isaac Connor 516bacdfd3 Merge branch 'updated-console' into storageareas 2016-05-03 13:38:57 -04:00
Kyle Johnson a1b4869ee6 Add state modal to options view 2016-05-03 13:33:22 -04:00
Kyle Johnson 0a77da8a2f Remove header from log view 2016-05-03 13:33:08 -04:00
Kyle Johnson c2fd3dd84a Also don't load additional JS to Log view
Another issue with mootools & jquery conflicts
2016-05-03 13:25:39 -04:00
Kyle Johnson 6768fe5554 Don't include extra js libraries for monitor view.
This is a workaround for an issue where you couldn't change tabs
whlie in the monitor view, but probably makes sense anyway.
2016-05-03 13:06:28 -04:00
Isaac Connor e53bd1292e increase events list width to accomodate thumbnails 2016-05-02 14:30:54 -04:00
Isaac Connor 550fdc9295 change thumbnail path to specify eid and fid instead of path to the jpg. 2016-05-02 13:42:15 -04:00