Commit Graph

2837 Commits

Author SHA1 Message Date
Kyle Johnson f8db56b308 Have the Events view view (not index) use the popup layout 2013-09-19 11:31:54 -04:00
Kyle Johnson 0223aeb3ab Set all event links to be colorboxes 2013-09-19 11:31:05 -04:00
Kyle Johnson 9e782ed407 Adding the colorbox css and js to the default template 2013-09-19 11:30:25 -04:00
Kyle Johnson e0a7418d24 Adding the colorbot js 2013-09-19 11:29:42 -04:00
Kyle Johnson afa281a750 Adding the colorbox css 2013-09-19 11:29:29 -04:00
Kyle Johnson e936df0f0d A minimum layout file for use with popups 2013-09-19 11:29:12 -04:00
Kyle Johnson 5f4ff5c7cf Return the full path to the generated video 2013-09-19 09:53:20 -04:00
Kyle Johnson ca8cc028ef Display an HTML5 <video> for each event 2013-09-19 09:12:05 -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
Kyle Johnson 5844a1cc89 Added a function which creates videos from event jpgs 2013-09-19 08:57:54 -04:00
Kyle Johnson bd7cefcfda Merge pull request #156 from WDKevin/modern
Delete multiple events at once
2013-09-18 16:46:02 -07: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 bf8f799c4c Moved delete button to the sidebar 2013-09-18 16:46:44 -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
Kyle Johnson d0a8d86e3c Merge pull request #155 from WDKevin/modern
Added missing jquery-2.0.1.min.map file and fix monitor sorting
2013-09-18 10:58:00 -07:00
Kevin Crider 0f25bec1d6 Fixes to monitor sorting and reordering 2013-09-18 13:23:16 -04:00
Kevin Crider bcaa0ac36c Added missing jquery-2.0.1.min.map file 2013-09-18 13:16:10 -04:00
Kyle Johnson 08e224f2af Merge pull request #154 from WDKevin/modern
Add support to change order of monitors
2013-09-18 09:43:08 -07:00
Kevin Crider 4430399b1e Removed logging of post data 2013-09-18 12:37:01 -04:00
Kevin Crider b0c5732620 Merge branch 'modern' of https://github.com/WDKevin/ZoneMinder into modern 2013-09-18 12:25:04 -04:00
Kevin Crider 6dfdba7023 Added ability to reorder monitors on the dashboard 2013-09-18 12:22:14 -04:00
Kevin Crider 20def177ef Added ability to reorder monitors on the dashboard 2013-09-18 12:14:15 -04:00
Kyle Johnson f716fbb237 Open the Config Option tab by default 2013-09-17 12:48:38 -04:00
Kyle Johnson f7b7a49616 shoNoImage was always being called as the $mon variable was incorrect 2013-09-17 09:43:48 -04:00
Kyle Johnson ddec9a0dd8 Fixes 147 - there were unescaped quotes 2013-09-17 09:28:42 -04:00
Kyle Johnson 17b60bf25f Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern 2013-09-17 09:13:03 -04:00
Kyle Johnson e694616702 Reworked the Config view to display options in rows using bootstrap.
This commit fixes #134
2013-09-17 09:07:35 -04:00
Kyle Johnson 064b86c95f Added my events dir to the gitignore list 2013-09-17 08:54:53 -04:00
Kyle Johnson e0423570bd Added classes to take care of smaller and larger displays 2013-09-17 08:50:46 -04:00
Chris Wiggins dc316b0aee Add static image when the monitor/system is not enabled/running 2013-09-16 22:00:27 +12:00
Chris Wiggins 6c60813a6f Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern 2013-09-16 13:13:07 +12:00
Chris Wiggins 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
Kyle Johnson 021b775f4a Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern 2013-09-14 22:11:35 -04:00
Kyle Johnson c6d1715948 Removed an unneeded div in the Events view. 2013-09-14 22:10:49 -04:00
Kyle Johnson 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
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 0b5a215dca Use the HtmlHelper::tableHeaders helper to display the table headers 2013-09-14 21:03:31 -04:00
Kyle Johnson 4cb89e7883 Moved these over to github issues 2013-09-13 15:20:49 -04:00
Kyle Johnson 79d408f028 Update STATUS.md 2013-09-13 15:17:17 -04:00
Kyle Johnson 7b0e4e0a3f Fix formatting 2013-09-13 15:12:37 -04:00
Kyle Johnson 54d25513ff Add basic acceptance criteria for release of this UI. 2013-09-13 15:11:40 -04:00
Kyle Johnson 7496d3e932 Create STATUS.md 2013-09-13 14:59:26 -04:00
Kyle Johnson 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
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 2f99274c0a Initial commit of Version model 2013-09-13 08:44:21 -04:00
Kyle Johnson 180d879894 Display the ZM version in the footer of all pages. 2013-09-13 08:43:11 -04:00
Kyle Johnson 0437e6e5b6 Pass the zmVersion variable to all views 2013-09-13 08:42:55 -04:00