Commit Graph

74 Commits

Author SHA1 Message Date
Kyle Johnson eed6c81287 An ugly hack to make the liveStreams display in both index and view views. 2013-09-23 21:51:02 -04:00
Kevin Crider d78315de50 Polls the update check every 5 minutes and if an update is available it adds a message beside the version number in the footer. This should fix issue #130 2013-09-20 10:49:11 -04:00
Chris Wiggins 99bae6386e Merge branch 'monitorSize' of git://github.com/chriswiggins/ZoneMinder into modern 2013-09-20 17:49:04 +12:00
Kyle Johnson f8db56b308 Have the Events view view (not index) use the popup layout 2013-09-19 11:31:54 -04:00
Kyle Johnson 8aec78258b Create a video for each event view.
This determines the appropriate video format based on the user agent,
creates the video, and then returns the video path to the view.
2013-09-19 09:10:57 -04:00
Chris Wiggins 133b061179 Add code for dynamically scaling monitor images on home screen. Add new no-image image 2013-09-19 20:56:09 +12:00
Kevin Crider 5178d4fa37 Added "Function" column to the $monitors array to fix issue 140 2013-09-18 17:24:52 -04:00
Kevin Crider d7fd5566a7 Fixes issue 129 - Bandwidth is now updated in the UI after changing it 2013-09-18 17:10:17 -04:00
Kevin Crider 0cf11adb99 Removed logging line from deleteSelected function 2013-09-18 15:55:50 -04:00
Kevin Crider c6bbdac0d7 Added ability to delete multiple events at once 2013-09-18 15:53:35 -04:00
Kevin Crider 0f25bec1d6 Fixes to monitor sorting and reordering 2013-09-18 13:23:16 -04:00
Kevin Crider 4430399b1e Removed logging of post data 2013-09-18 12:37:01 -04:00
Kevin Crider 6dfdba7023 Added ability to reorder monitors on the dashboard 2013-09-18 12:22:14 -04:00
Chris Wiggins dc316b0aee Add static image when the monitor/system is not enabled/running 2013-09-16 22:00:27 +12:00
Kyle Johnson bf2e46f512 Added a function to delete events.
Currently this only allows single events to be deleted.
2013-09-14 22:05:08 -04:00
Kyle Johnson 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
Kyle Johnson b2ab1cea09 Initial commit of Version Controller and View 2013-09-13 08:55:46 -04:00
Kyle Johnson 0437e6e5b6 Pass the zmVersion variable to all views 2013-09-13 08:42:55 -04:00
Kyle Johnson d32bab4248 Use the Html, Form and Paginator helpers from BoostCake 2013-09-12 20:02:33 -04:00
Kyle Johnson c03c21895c Display a red or green alert, depending on daemon status 2013-09-11 10:37:18 -04:00
Kyle Johnson 735f85a255 Renamed the thumb_width variable to be width as that is what my helper expects 2013-09-11 10:14:04 -04:00
Kyle Johnson 6a65bef736 Display the system load and free disk space in the nav bar 2013-09-11 09:23:55 -04:00
Kyle Johnson 6a9ce02870 Moving some of the monitor options to the controller 2013-09-06 15:00:01 -04:00
Kyle Johnson 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
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 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 fe5df3eb8c Also grab the Hint column from the Config table 2013-06-22 11:59:03 -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 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 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 22a73a3255 Added one of the hard coded options from the original config.php file 2013-05-30 22:03:20 -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 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 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 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 57c553e05f Added LiveStream helper 2013-05-22 21:18:43 -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 f1a590c805 Made the options in the Config table available site-wide. 2013-05-17 08:42:32 -04:00
Kyle Johnson 869fb3f626 Changed the way that I am looking up monitors 2013-05-15 17:52:30 -04:00