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 |
Isaac Connor
|
118e607839
|
clean
|
2013-05-10 14:03:17 -04:00 |
|
Isaac Connor
|
3a8481a591
|
cleanup
|
2013-05-10 14:02:22 -04:00 |
|
Isaac Connor
|
a468baf9eb
|
cleanup
|
2013-05-10 13:55:45 -04:00 |
|
Isaac Connor
|
2cd0237863
|
add some lines to create /var/run/zm. These day /run is a tmpfs, so the zm dir needs to be created on each boot
|
2013-05-10 13:42:09 -04:00 |
|
Isaac Connor
|
9d89fb3bcb
|
Merge branch 'kfir-proper' into develop
|
2013-05-10 12:23:58 -04:00 |
|
Isaac Connor
|
0a3ffb5e2e
|
fix control types dropdown for a new monitor
|
2013-05-09 14:11:20 -04:00 |
|
Isaac Connor
|
0da26d4f75
|
add a Controls preset for Airlink SkyIPCam 7xx cameras
|
2013-05-09 09:14:01 -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 |
|
Kyle Johnson
|
49a01a9c28
|
Initial commit of Bandwidth Model, View and Controller.
|
2013-05-06 19:37:22 -04:00 |
|
Kyle Johnson
|
ac93b8318e
|
Added Cookie and Session components to the entire app, also set the zmBandwidth cookie to low by default
|
2013-05-06 19:36:34 -04:00 |
|
Kyle Johnson
|
9052b7fda5
|
Added a style to make the header legible
|
2013-05-06 11:34:48 -04:00 |
|
Kyle Johnson
|
69f9f446a8
|
Added Monitors, Events and Options index view to the header
|
2013-05-06 11:34:17 -04:00 |
|
Kyle Johnson
|
f35e7cbe73
|
Initial commit of Config Controller and View.
* Allows basic updating of config options
* No validation yet
* All options are rendered as text boxes. Some need to be dropdown, etc.
|
2013-05-06 11:06:58 -04:00 |
|
Kyle Johnson
|
869b84732d
|
Changed the primaryKey to the actual primary key of the Config table
|
2013-05-06 11:05:33 -04:00 |
|
Kyle Johnson
|
5f7e4a3471
|
Overriding the primaryKey for the Events and Monitors models
|
2013-05-06 10:36:47 -04:00 |
|
Kyle Johnson
|
03a9915138
|
Added the Config model
|
2013-05-06 08:42:05 -04:00 |
|
Kyle Johnson
|
b6bf96b701
|
Added the list of distinct monitors to the monitors variable for later use with filtering
|
2013-05-06 08:40:25 -04:00 |
|
Kyle Johnson
|
d4b0d05366
|
Added number of archived events per monitor to Monitors index view
|
2013-05-04 22:45:59 -04:00 |
|
Kyle Johnson
|
3af0600917
|
Limited the number of fields returned when searching for associated events and zones
|
2013-05-04 22:41:27 -04:00 |
|
Kyle Johnson
|
d681654e56
|
Moved events queries from the Monitors controller to the Monitors model
|
2013-05-04 19:42:37 -04:00 |
|
Kyle Johnson
|
a56ae4ed42
|
Display last events per hour, day, week, month per monitor
|
2013-05-04 19:22:48 -04:00 |
|
Kyle Johnson
|
20b024ef02
|
Added queries for last events per hour, day, week and month
|
2013-05-04 19:22:09 -04:00 |
|
Kyle Johnson
|
c42ae4a91d
|
Moved the Html and Form helpers to the common AppController
|
2013-05-03 07:34:45 -04:00 |
|
Kyle Johnson
|
cff58441fc
|
Fixed some indents
|
2013-05-02 21:31:05 -04:00 |