Commit Graph

3024 Commits

Author SHA1 Message Date
Kyle Johnson ad0aaa6e93 Initial commit of Zone MVC 2013-07-18 08:08:07 -04:00
Kyle Johnson 6ba1d8f041 Added the Js helper and RequestHandler component to AppController to be available app-wide. 2013-07-16 08:33:53 -04:00
Kyle Johnson e4ccd359cd Allow setting of width with the live stream helper 2013-07-15 07:35:39 -04:00
Kyle Johnson 4265e8b45f Sort with newest at top, not bottom. 2013-07-11 12:09:45 -04:00
Kyle Johnson 67ad15fdc5 Initial commit of the Logs Controller and View.
The log functionality is similar to that of the classic skin, though
with fewer options.  Initial filtering support is for only component type.
Also displays a fixed last 100 log events, sorted by TimeKey ascending.
2013-07-11 12:06:12 -04:00
Kyle Johnson 2ea43105ec Merged config.js and events.js into main.js.
This should fix #15 as I'm keeping all JS in a single file, instead of
a file per page.
2013-07-11 12:00:01 -04:00
Kyle Johnson 80ebaad07b Initial commit of the Log model 2013-07-10 10:00:49 -04:00
Kyle Johnson 64fba81f6a Moved the navigation items to an ordered list 2013-06-25 12:21:21 -04:00
Kyle Johnson cdbb3d126e Added Masonry from http://masonry.desandro.com/
Masonry is a JavaScript grid layout library, and it is going to make my
life easier on the Events page.
2013-06-22 21:53:53 -04:00
Kyle Johnson 12537a7860 Added jquery-ui images and updated jquery-ui css to point to them. 2013-06-22 21:50:22 -04:00
Kyle Johnson e9e99261d9 Better styling of the Config page.
Added row highlighting, positioned all of the labels and inputs
appropriately, and added the description of the option.
2013-06-22 21:40:29 -04:00
Kyle Johnson bffe78904f Display the correct input type for the config option.
I am keying the input type off of the 'Hint' and 'Type' columns
in the Config table.  It would be easier if I just added an 'inputtype'
column to the Config table, and I might do that later, but I don't want to
mess with the database right now.
2013-06-22 11:59:46 -04:00
Kyle Johnson fe5df3eb8c Also grab the Hint column from the Config table 2013-06-22 11:59:03 -04:00
Kyle Johnson 5635b24897 Make the tab's first character uppercase 2013-06-21 22:22:54 -04:00
Kyle Johnson 567c0c5c20 Switching on the category type to determine which type of input to display. 2013-06-21 22:20:16 -04:00
Kyle Johnson 6faa248248 Sorting the Config results by Type (boolean, string, etc) 2013-06-21 22:19:27 -04:00
Kyle Johnson 819f1b48d6 Filtering out the "hidden" category 2013-06-21 22:18:44 -04:00
Kyle Johnson d64a09576f Split the config / options page into tabs based on Category.
Still a lot of work to do such as displaying the proper input
type based on option, however basic tabbing and saving works,
as does the on-hover tooltip (I think I put that in this commit).
2013-06-21 12:52:30 -04:00
Kyle Johnson bb19e80fa8 Support for control when monitor source is ffmpeg. This should fix #16.
Some IP cameras need the source set to ffmpeg even though they are remote
cameras.  These cameras do have a remote PTZ interface, but previously
when the monitor source was set to ffmpeg, the only control type
available was 'none'.
2013-06-15 19:50:19 -04:00
Kyle Johnson 964e1919bc Initial commit of Filters MVC.
The filters will be split from the events in this interface, where
in the classic interface, they were combined.
2013-06-04 13:23:00 -04:00
Kyle Johnson f50bf834d9 Forgot to change $event to $value, and to move a <td> or two. 2013-05-30 23:00:09 -04:00
Kyle Johnson 50085d48b5 Reworked the Events index view to display thumbnails by default.
The EventsController calls createListThumbnail() to build a list
of thumbnail data which is then passed to the view to be looped though.

Also had to change how I loop through $events so that I can match up the
indexes in $events with the indexes in $thumbData
2013-05-30 22:54:51 -04:00
Kyle Johnson 3505f35a6d Replaced my function for selecting and filtering events based on monitors
The new way of doing it leverages jquery-ui functions.
2013-05-30 22:46:27 -04:00
Kyle Johnson 59a1740dca Re-worked the Events index view to display the monitors as a list
This will allow me to use the jquery-ui selectabled on the list.
2013-05-30 22:43:48 -04:00
Kyle Johnson e80bd5ffd0 Updated the CSS for jquery-ui-selected elements 2013-05-30 22:36:51 -04:00
Kyle Johnson 26c1110e3f Function to return info necessary to create an HTML img tag for a given event.
This function determines the scaled width and height of the image for the
thumbnail, as well as other information relating to the frame with the
highest score in this event.
2013-05-30 22:31:55 -04:00
Kyle Johnson 1ae5cdd291 Function to return components necessary to build src to an event thumbnail.
A lot of this code was re-worked from the original includes/functions.php
file found in the classic zoneminder skin to work with CakePHP.
Function seems to work, but looks like it could use some serious re-factoring.
2013-05-30 22:22:48 -04:00
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