dc316b0aee
Add static image when the monitor/system is not enabled/running
2013-09-16 22:00:27 +12:00
6c60813a6f
Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern
2013-09-16 13:13:07 +12:00
7f1589a74e
Search for a different string in zmdc.pl to correctly determine if ZM is running or not
2013-09-16 13:11:01 +12:00
c6d1715948
Removed an unneeded div in the Events view.
2013-09-14 22:10:49 -04:00
3738c3866d
Added a link to each event row to delete that event.
...
This fixes #126 however that issue was not specific enough. This
commit allows a user to delete individual events. There is currently
no way to delete multiple events.
2013-09-14 22:09:28 -04:00
bf2e46f512
Added a function to delete events.
...
Currently this only allows single events to be deleted.
2013-09-14 22:05:08 -04:00
0b5a215dca
Use the HtmlHelper::tableHeaders helper to display the table headers
2013-09-14 21:03:31 -04:00
9ccf5c4ee8
Added a horizontal rule to the footer to help it stand out.
...
This isn't ideal (the footer should have css to make it stand out,
instead of an extra element).
2013-09-13 09:13:07 -04:00
16994dbdb2
Add some styling to the version number in the footer.
...
If there is an upgrade available, the label-info (blue) class is
applied.
If there is not an upgrade avaiable, the label-success (green)
class is applied.
2013-09-13 09:07:19 -04:00
b2ab1cea09
Initial commit of Version Controller and View
2013-09-13 08:55:46 -04:00
2f99274c0a
Initial commit of Version model
2013-09-13 08:44:21 -04:00
180d879894
Display the ZM version in the footer of all pages.
2013-09-13 08:43:11 -04:00
0437e6e5b6
Pass the zmVersion variable to all views
2013-09-13 08:42:55 -04:00
f0231a7d5f
Added some styling to the logs table
2013-09-12 20:10:51 -04:00
34b4ec0b94
Display elements properly for bootstrap. Also fixed element id's
2013-09-12 20:03:41 -04:00
d32bab4248
Use the Html, Form and Paginator helpers from BoostCake
2013-09-12 20:02:33 -04:00
e42afcd76a
Load all available CakePHP plugins
2013-09-12 20:01:31 -04:00
e1ce213f04
Adding the BoostCake plugin
2013-09-12 20:00:57 -04:00
75acaea36e
Open the monitor edit general tab by default
2013-09-11 15:29:18 -04:00
6dbd10621d
Reworked to use Bootstrap tabs
2013-09-11 15:24:51 -04:00
e27a065039
Add the necessary class to allow these elements to display in tabs
2013-09-11 15:24:28 -04:00
cbf48a1d8f
Use bootstrap tabs instead of jquery tabs
2013-09-11 15:09:43 -04:00
b18b38c486
Apply bootstrap theme to the events table
2013-09-11 15:08:41 -04:00
9dfa3eb5af
Rework the config index view to use bootstrap tabs
2013-09-11 15:08:07 -04:00
d33f32f6ce
Moved the config indev view form to not enclose the tab list
2013-09-11 15:07:03 -04:00
c03c21895c
Display a red or green alert, depending on daemon status
2013-09-11 10:37:18 -04:00
62679e3ff1
Display monitors as bootstrap thumbnails in a grid view
...
This will need to be reworked to dynamically determine the number
of rows
2013-09-11 10:17:47 -04:00
dfa2d37c4d
Moved the daemonStatus to the header, from the footer
2013-09-11 10:17:10 -04:00
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
Chris Wiggins
Kyle Johnson