735f85a255
Renamed the thumb_width variable to be width as that is what my helper expects
2013-09-11 10:14:04 -04:00
6a65bef736
Display the system load and free disk space in the nav bar
2013-09-11 09:23:55 -04:00
dbba80fcbf
Added a function in AppModel to check the free disk space in the events directory
2013-09-11 09:23:13 -04:00
646b511cd4
Added a function in AppModel to check the System Load
2013-09-11 09:22:53 -04:00
c41810bbf1
Reworked the paginator number display to play nice with Bootstrap
2013-09-10 20:27:30 -04:00
fa3725d377
Put the sidebar into the Bootstrap sidebar
2013-09-10 20:19:03 -04:00
d9b6140bf8
Convert the Logs index view to use a bootstrap sidebar
2013-09-10 20:18:25 -04:00
09a3b9e353
Convert the default layout to use Bootstrap
2013-09-10 20:17:44 -04:00
88b8534efb
Adding bootstrap CSS and JS files
2013-09-10 19:06:10 -04:00
2a0613a370
Bunch of updates to css
2013-09-06 15:39:37 -04:00
5c857029ce
Merged the JS from config.js and events.js into main.js
2013-09-06 15:07:08 -04:00
9b22dae624
Adding the loading AJAX image to the header
2013-09-06 15:02:43 -04:00
c4283ad72e
Adding some base HTML to make the ajax view work
2013-09-06 15:01:59 -04:00
48d162d432
Adding a function to control the daemons (start, stop, etc)
2013-09-06 15:01:05 -04:00
6a9ce02870
Moving some of the monitor options to the controller
2013-09-06 15:00:01 -04:00
c5196407a9
Moved all of the Monitors HTML to elements
2013-09-01 17:50:26 -04:00
f1d9de75b0
Point root to the Monitors index action
2013-07-19 09:30:08 -04:00
46deb93f74
Events index view is now at a semi-usable state, similar to the original skin.
...
In the interest of releasing something, I am not going to use ajax here
for now. Goal is to have this view behave similar to the original Events
view in the original skin. Currently you can:
* Paginate events
* Filter events using the sidebar
Bug: Filter elements are unset when paginating.
2013-07-19 07:30:13 -04:00
ad0aaa6e93
Initial commit of Zone MVC
2013-07-18 08:08:07 -04:00
6ba1d8f041
Added the Js helper and RequestHandler component to AppController to be available app-wide.
2013-07-16 08:33:53 -04:00
e4ccd359cd
Allow setting of width with the live stream helper
2013-07-15 07:35:39 -04:00
4265e8b45f
Sort with newest at top, not bottom.
2013-07-11 12:09:45 -04:00
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
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
80ebaad07b
Initial commit of the Log model
2013-07-10 10:00:49 -04:00
64fba81f6a
Moved the navigation items to an ordered list
2013-06-25 12:21:21 -04:00
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
12537a7860
Added jquery-ui images and updated jquery-ui css to point to them.
2013-06-22 21:50:22 -04:00
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
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
fe5df3eb8c
Also grab the Hint column from the Config table
2013-06-22 11:59:03 -04:00
5635b24897
Make the tab's first character uppercase
2013-06-21 22:22:54 -04:00
567c0c5c20
Switching on the category type to determine which type of input to display.
2013-06-21 22:20:16 -04:00
6faa248248
Sorting the Config results by Type (boolean, string, etc)
2013-06-21 22:19:27 -04:00
819f1b48d6
Filtering out the "hidden" category
2013-06-21 22:18:44 -04:00
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
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
f50bf834d9
Forgot to change $event to $value, and to move a <td> or two.
2013-05-30 23:00:09 -04:00
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
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
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
e80bd5ffd0
Updated the CSS for jquery-ui-selected elements
2013-05-30 22:36:51 -04:00
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
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
22a73a3255
Added one of the hard coded options from the original config.php file
2013-05-30 22:03:20 -04:00
f4d2df3941
Function to determine the path to an event in the filesystem.
2013-05-30 20:30:09 -04:00
c2e2079818
Function to rescale dimenions of events.
2013-05-30 20:25:18 -04:00
e107e34164
Associated the Event Model with the Frame Model
2013-05-30 19:47:32 -04:00
fb97233869
Initial commit of Frame Model
2013-05-30 19:47:07 -04:00
26f99bf76b
Adding jQuery UI
2013-05-29 17:46:07 -04:00
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
cc4af23115
Removed the Config model from the Events controller.
...
Not needed since commit c408575075
2013-05-29 07:52:34 -04:00
fdb5fd5b57
An AJAX loading / spinner gif
2013-05-29 07:50:49 -04:00
870298082e
Minor styling to selected rows in the Events view.
2013-05-29 07:50:23 -04:00
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
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
d5e60e8b78
Minor indenting, and added an empty placeholder $conditions array.
2013-05-29 07:44:30 -04:00
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
c408575075
Grab ZM_WEB_EVENTS_PER_PAGE from Configure instead of the database
2013-05-25 12:30:34 -04:00
6d2f7baf5d
Re-added the jQuery javascript engine
2013-05-25 12:22:23 -04:00
1795633b71
Added names to the tables and td for sorting the events list via js
2013-05-25 11:55:52 -04:00
60b67a1703
Removed the jquery helper. Going to keep my js code in seperate files for now
2013-05-25 11:54:34 -04:00
07ac7aaeb4
Use the jQuery javascript engine
2013-05-25 11:44:53 -04:00
13b7c4b04a
Write cached scripts
2013-05-25 11:43:22 -04:00
aa72855b28
Added jQuery 2.0.1 file
2013-05-25 11:39:24 -04:00
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
7b98b62c16
Fixed some indenting
2013-05-22 21:19:10 -04:00
57c553e05f
Added LiveStream helper
2013-05-22 21:18:43 -04:00
155ec308a0
Replaced HTML image tag with LiveStream helper
2013-05-22 21:18:01 -04:00
f05c23b104
Created a helper for live video streams
2013-05-18 18:22:39 -04:00
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
ae5a3d716c
Made zm.conf options available site-side
2013-05-17 09:02:34 -04:00
9628aff358
Load AppModel to AppController
2013-05-17 09:01:54 -04:00
195b5deac1
Added a function to check the status of the ZoneMinder daemons
2013-05-17 08:57:24 -04:00
f1a590c805
Made the options in the Config table available site-wide.
2013-05-17 08:42:32 -04:00
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
869fb3f626
Changed the way that I am looking up monitors
2013-05-15 17:52:30 -04:00
0d004fb588
Changed some minor indents
2013-05-15 17:51:53 -04:00
343fd4c3b6
Removed the host field from the monitors query
2013-05-15 17:51:14 -04:00
176064343d
Moved the events table code frmo the Monitors controller to the Events controller
2013-05-15 17:50:46 -04:00
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
c47f450e41
Added the Monitor and Config model to the Events controller
2013-05-15 17:42:42 -04:00
2a3b649341
Forgot to pull out the Monitors schema before committing...
2013-05-15 08:42:39 -04:00
7913fbb49f
Added a link to the add monitors page
2013-05-15 08:36:05 -04:00
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
39e15b48a1
Replaced use of querybuilder functionality via find() with prebuilt queries via query(). This fixes #1 .
2013-05-14 22:52:47 -04:00
1307ba41c8
Changed the event count lookups to use find() instead of custom functions
2013-05-08 09:37:56 -04:00
08f57b6b47
Made the footer link legible
2013-05-08 08:03:58 -04:00
0e8a96141e
Lack of newlines makes me cry
2013-05-08 07:56:11 -04:00
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
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
a6bcd78e6e
Added a link to change the bandwidth
2013-05-06 19:53:38 -04:00
29784fa3d3
Set the zmBandwidth variable app-wide
2013-05-06 19:53:25 -04:00
82c14790c5
Added the live stream with hardcoded values
2013-05-06 19:38:22 -04:00
49a01a9c28
Initial commit of Bandwidth Model, View and Controller.
2013-05-06 19:37:22 -04:00
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
9052b7fda5
Added a style to make the header legible
2013-05-06 11:34:48 -04:00
69f9f446a8
Added Monitors, Events and Options index view to the header
2013-05-06 11:34:17 -04:00
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
869b84732d
Changed the primaryKey to the actual primary key of the Config table
2013-05-06 11:05:33 -04:00
5f7e4a3471
Overriding the primaryKey for the Events and Monitors models
2013-05-06 10:36:47 -04:00
03a9915138
Added the Config model
2013-05-06 08:42:05 -04:00
b6bf96b701
Added the list of distinct monitors to the monitors variable for later use with filtering
2013-05-06 08:40:25 -04:00
d4b0d05366
Added number of archived events per monitor to Monitors index view
2013-05-04 22:45:59 -04:00
3af0600917
Limited the number of fields returned when searching for associated events and zones
2013-05-04 22:41:27 -04:00
d681654e56
Moved events queries from the Monitors controller to the Monitors model
2013-05-04 19:42:37 -04:00
a56ae4ed42
Display last events per hour, day, week, month per monitor
2013-05-04 19:22:48 -04:00
20b024ef02
Added queries for last events per hour, day, week and month
2013-05-04 19:22:09 -04:00
c42ae4a91d
Moved the Html and Form helpers to the common AppController
2013-05-03 07:34:45 -04:00
cff58441fc
Fixed some indents
2013-05-02 21:31:05 -04:00
2cc0620edc
Added zone count to monitor index
2013-05-02 21:27:55 -04:00
b7d993839b
Added Zone model, as well as Monitor and Zone model association
2013-05-02 09:01:27 -04:00
12642e6c45
Added additional table columns as well as total event count per monitor
2013-05-02 08:56:51 -04:00
e782fbe38d
Defined associations between the Monitor and Event models
2013-05-02 08:55:59 -04:00
e2751c0597
Initial ability to edit limited options of existing monitors
2013-05-01 21:03:25 -04:00
6bc6610542
Added Monitors view view
2013-05-01 20:57:10 -04:00
1be91f67e3
Added Function and Source columns
2013-05-01 18:46:01 -04:00
055d8f8d0b
Initial commit of MVC for Monitors
2013-05-01 18:41:59 -04:00
a5e2f29a4b
Specified the specific table name for the Event model
2013-05-01 18:21:46 -04:00
a16054b33f
Removed an HTML comment and changed the heading from 1 to 2.
2013-05-01 08:24:42 -03:00
31902af09a
Update README.md
2013-05-01 08:04:57 -03:00
9d5243ccab
Initial commit of Event Model, View and Controller with basic support for drilling into an event
2013-05-01 07:02:12 -04:00
8322dc390f
Initial commit of CakePHP 2.3.4
2013-05-01 06:58:31 -04:00
1ed6462354
Removed all of the old web files
2013-05-01 06:52:43 -04:00
4996dd0a51
Recreated generated files.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:46:18 +00:00
be97b244b4
Increased size of options window and changed to use debug functions instead of console ones.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3659 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 08:58:19 +00:00
2c47a15f9b
Use event dimensions instead of monitor ones as they may have changed.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3520 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-10 22:53:29 +00:00
8b86c9af58
Removed permissions check when creating new log entries. Instead check that request is 'post'ed and moved some other requests to be 'post' only.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3509 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 10:50:50 +00:00
e695dfd4dd
Allow for level as a minimum when selecting availability criteria for other fields.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3501 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-24 13:15:58 +00:00
b64c506659
Added SFTP upload option.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 14:10:20 +00:00
194d8350b4
Fixed distribution and install lists
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3497 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-05 11:24:24 +00:00
62df1ba8de
Tidier detainting.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3494 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-03 17:33:58 +00:00
aa0ee13afa
Detaint further dodgy path varieties.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3488 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-03 11:08:40 +00:00
63589ddee7
Don't include postprocessed config.php
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3487 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-28 21:26:20 +00:00
3a399378b2
Fixed problem with link to overlay css file
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3485 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-27 16:09:09 +00:00
6035ed211a
Detaint some user inputs to avoid malicious file inclusion
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3483 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-22 08:37:01 +00:00
a3ef933f2d
Check for json_last_error function existence before invoking.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3482 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-22 08:34:35 +00:00
b40669dc75
Updated Spanish translation
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3476 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-07-07 08:30:12 +00:00
07fca2ad9a
Fixed environment fetching when in cli mode and logfile error message.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3471 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-27 16:15:59 +00:00
7e55373b87
Fixed incorrect scaling of timeout on select call
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3470 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-27 16:15:16 +00:00
bf90ab8158
Added error trapping to log file exports.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3463 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-23 22:33:07 +00:00
1ce54fb0db
Enabled alternate selections when a filter has been chosen. Improved
...
styles for debug entries in log.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3462 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-23 21:53:45 +00:00
6ff385e407
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-21 09:19:10 +00:00
96249db582
eyeZm Plugin: Patched functions.php to check for ffmpeg codec support via -formats as well as -codecs
...
Signed-off-by: Jai Dhar <jdhar@eyezm.com>
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3399 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-08 22:37:19 +00:00
b3d8279dfc
Fixed problem with transparency
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3373 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-27 10:41:43 +00:00
a6011b4f93
Fixed down/right PTZ image
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3372 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-27 08:39:22 +00:00
d2f5e9623c
Added checks for mismatches between system and database versions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3364 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 09:15:14 +00:00
a20180aded
Updated to process other sections on top of SLANG
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3362 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-25 09:13:47 +00:00
7b43ac2645
Use JSON encoding for language independent serialisation (filters and control commands) rather than PHP serialisation. Removes dependency on rare PHP::Serialization perl module.
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3357 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 16:18:18 +00:00
87124001ba
Added error checking to builtin JSON functions
...
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3351 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 15:15:37 +00:00
Kyle Johnson
stan
jaidhar