Kyle Johnson
22a73a3255
Added one of the hard coded options from the original config.php file
2013-05-30 22:03:20 -04:00
Kyle Johnson
f4d2df3941
Function to determine the path to an event in the filesystem.
2013-05-30 20:30:09 -04:00
Kyle Johnson
c2e2079818
Function to rescale dimenions of events.
2013-05-30 20:25:18 -04:00
Kyle Johnson
e107e34164
Associated the Event Model with the Frame Model
2013-05-30 19:47:32 -04:00
Kyle Johnson
fb97233869
Initial commit of Frame Model
2013-05-30 19:47:07 -04:00
Kyle Johnson
26f99bf76b
Adding jQuery UI
2013-05-29 17:46:07 -04:00
Kyle Johnson
633aa7a9ad
Initial support for filtering events.
...
First I tell extractNamedParams() which params I care about (ignore the rest),
then I loop through the returned results and build my query via named params.
Finally I pass the named params into the $conditions array for paginate to use.
2013-05-29 07:54:06 -04:00
Kyle Johnson
cc4af23115
Removed the Config model from the Events controller.
...
Not needed since commit c408575075
2013-05-29 07:52:34 -04:00
Kyle Johnson
fdb5fd5b57
An AJAX loading / spinner gif
2013-05-29 07:50:49 -04:00
Kyle Johnson
870298082e
Minor styling to selected rows in the Events view.
2013-05-29 07:50:23 -04:00
Kyle Johnson
984035dde3
Initial commit of events.js file; added it to all pages.
...
events.js should eventually be loaded in only the events view. This commit
creates #15 .
2013-05-29 07:47:27 -04:00
Kyle Johnson
47af648803
Minor HTML updates so that I can better select elements with jQuery later on.
...
Wrapped the Events table in a div, and gave the id #Events to that div.
2013-05-29 07:45:47 -04:00
Kyle Johnson
d5e60e8b78
Minor indenting, and added an empty placeholder $conditions array.
2013-05-29 07:44:30 -04:00
Kyle Johnson
545826b55c
A method to make named parameters strongly defined.
...
Added a method that processes named parameters and ensures all mandatory ones
exist and substitutes missing optional ones with default values. This makes
named parameters strongly defined and easier to read.
Thanks to http://developinginthedark.com/posts/cakephp-tip-1-named-parameters
for the idea.
2013-05-29 07:37:00 -04:00
Kyle Johnson
c408575075
Grab ZM_WEB_EVENTS_PER_PAGE from Configure instead of the database
2013-05-25 12:30:34 -04:00
Kyle Johnson
6d2f7baf5d
Re-added the jQuery javascript engine
2013-05-25 12:22:23 -04:00
Kyle Johnson
1795633b71
Added names to the tables and td for sorting the events list via js
2013-05-25 11:55:52 -04:00
Kyle Johnson
60b67a1703
Removed the jquery helper. Going to keep my js code in seperate files for now
2013-05-25 11:54:34 -04:00
Kyle Johnson
07ac7aaeb4
Use the jQuery javascript engine
2013-05-25 11:44:53 -04:00
Kyle Johnson
13b7c4b04a
Write cached scripts
2013-05-25 11:43:22 -04:00
Kyle Johnson
aa72855b28
Added jQuery 2.0.1 file
2013-05-25 11:39:24 -04:00
Kyle Johnson
05c8ddf153
Reworked to allow displaying of monitors from many views with less code.
...
* Moved getStreamSrc from Monitors Controller to Monitors Model
* Minor indenting of code
* Removed some old code
* Changed how I lookup ZM_MPEG_LIVE_FORMAT from within getStreamSrc
* Changed Monitors View view to use divs instead of tables
2013-05-24 20:13:14 -04:00
Kyle Johnson
7b98b62c16
Fixed some indenting
2013-05-22 21:19:10 -04:00
Kyle Johnson
57c553e05f
Added LiveStream helper
2013-05-22 21:18:43 -04:00
Kyle Johnson
155ec308a0
Replaced HTML image tag with LiveStream helper
2013-05-22 21:18:01 -04:00
Kyle Johnson
f05c23b104
Created a helper for live video streams
2013-05-18 18:22:39 -04:00
Kyle Johnson
c28a35ca31
Added a daemon status message to the footer of every page (whether or not ZM is running)
2013-05-17 09:03:30 -04:00
Kyle Johnson
ae5a3d716c
Made zm.conf options available site-side
2013-05-17 09:02:34 -04:00
Kyle Johnson
9628aff358
Load AppModel to AppController
2013-05-17 09:01:54 -04:00
Kyle Johnson
195b5deac1
Added a function to check the status of the ZoneMinder daemons
2013-05-17 08:57:24 -04:00
Kyle Johnson
f1a590c805
Made the options in the Config table available site-wide.
2013-05-17 08:42:32 -04:00
Kyle Johnson
17c8b98a41
Moved all of the Events table stuff in the Monitors index view to the Events index view
2013-05-15 17:53:07 -04:00
Kyle Johnson
869fb3f626
Changed the way that I am looking up monitors
2013-05-15 17:52:30 -04:00
Kyle Johnson
0d004fb588
Changed some minor indents
2013-05-15 17:51:53 -04:00
Kyle Johnson
343fd4c3b6
Removed the host field from the monitors query
2013-05-15 17:51:14 -04:00
Kyle Johnson
176064343d
Moved the events table code frmo the Monitors controller to the Events controller
2013-05-15 17:50:46 -04:00
Kyle Johnson
4022695961
Reworked the events paginate function, it now grabs only the needed fields, sorts properly, and limits based on the configured ZM_WEB_EVENTS_PER_PAGE option.
2013-05-15 17:46:11 -04:00
Kyle Johnson
c47f450e41
Added the Monitor and Config model to the Events controller
2013-05-15 17:42:42 -04:00
Kyle Johnson
2a3b649341
Forgot to pull out the Monitors schema before committing...
2013-05-15 08:42:39 -04:00
Kyle Johnson
7913fbb49f
Added a link to the add monitors page
2013-05-15 08:36:05 -04:00
Kyle Johnson
a1aed0ec03
First pass at ability to add monitors. Field names do not match database columns so not all values are saved
2013-05-15 08:35:49 -04:00
Kyle Johnson
39e15b48a1
Replaced use of querybuilder functionality via find() with prebuilt queries via query(). This fixes #1 .
2013-05-14 22:52:47 -04:00
Kyle Johnson
1307ba41c8
Changed the event count lookups to use find() instead of custom functions
2013-05-08 09:37:56 -04:00
Kyle Johnson
08f57b6b47
Made the footer link legible
2013-05-08 08:03:58 -04:00
Kyle Johnson
0e8a96141e
Lack of newlines makes me cry
2013-05-08 07:56:11 -04:00
Kyle Johnson
74008dcb8b
Moved some of the logic for determining video streaming options from the controller to the model
2013-05-07 11:15:06 -04:00
Kyle Johnson
b5e15a1708
First pass of the Monitors view page with code to determine stream type (mpeg, jpeg), bitrate, fps, etc
2013-05-07 10:29:34 -04:00
Kyle Johnson
a6bcd78e6e
Added a link to change the bandwidth
2013-05-06 19:53:38 -04:00
Kyle Johnson
29784fa3d3
Set the zmBandwidth variable app-wide
2013-05-06 19:53:25 -04:00
Kyle Johnson
82c14790c5
Added the live stream with hardcoded values
2013-05-06 19:38:22 -04:00