Commit Graph

1647 Commits

Author SHA1 Message Date
Kyle Johnson d1c19036ec Moved writing of configure options from Controller to Model. Fixes #191. 2013-10-02 08:25:48 -04:00
Kyle Johnson 19e5aec9ba Use the global zmBandwidth variable from Configure::read in the layout 2013-10-02 08:18:17 -04:00
Kyle Johnson e3db6e0edc Moved the zmBandwidth option from a cookie to global Configure:: option
In addition I'm no longer passing this option around, instead calling it
where needed.  This _might_ fix #175 as the variable is being set very early on
in bootstrap.php
2013-10-02 08:09:30 -04:00
Kevin Crider b0b0d8a521 Merge pull request #185 from kylejohnson/modern
Moved the Config tabs to the sidebar
2013-10-01 06:42:12 -07:00
Kyle Johnson 38944fb994 Merge pull request #179 from WDKevin/modern
Added datetime picker support and implemented on events sidebar
2013-10-01 06:28:29 -07:00
Kyle Johnson 83c744c7b7 Removed tooltips from jQuery UI 2013-10-01 08:39:16 -04:00
Kyle Johnson e61fbc4ba8 Bumped jQuery from 2.0.1 to 2.0.3 2013-10-01 08:39:02 -04:00
Kyle Johnson d3c221135d Moved the Config tabs to the sidebar 2013-09-30 10:28:45 -04:00
Kevin Crider 84cd245462 Fixed full screen toggle so it stays in place when the page is scrolled 2013-09-29 14:08:58 -04:00
Kevin Crider 348399d61b Tweaked the appearence of the filter by monitor panel on the Events page 2013-09-29 14:05:25 -04:00
Kevin Crider de99655196 Fixed select all bug after performing a search 2013-09-29 13:59:19 -04:00
Kevin Crider f8ea2a777c Improved the loading animation 2013-09-29 12:51:59 -04:00
Kevin Crider 33c0dff8a4 Fixed the search by date functionality 2013-09-29 11:36:23 -04:00
Chris Wiggins 76c8190e8b Update web frontend to correctly display video events 2013-09-29 12:23:28 +13:00
Kevin Crider 7e90d0f373 Added datetime picker support and implemented on events sidebar 2013-09-28 18:52:25 -04:00
mastertheknife 48f11a8064 Add cmake to zoneminder 2013-09-28 12:59:50 +03:00
Kyle Johnson 366a7c2541 Use a layout without a sidebar for the Config page 2013-09-27 20:51:34 -04:00
Kyle Johnson 983aece616 Consolidate the sidebar for Monitors and Events index. 2013-09-27 20:45:25 -04:00
Kevin Crider a852dee7bb Initial commit of expanding and collapsing error log messages 2013-09-27 19:58:01 -04:00
Kevin Crider 0630478404 Cleaned up date and time formatting on events page 2013-09-27 18:52:26 -04:00
Kevin Crider ef66285fa5 Added universal support for select all checkboxes and added one to the events page 2013-09-27 18:32:00 -04:00
Kevin Crider 516733a50e Fixes a small bug with a second border on each monitor panel 2013-09-27 17:50:24 -04:00
Kevin Crider a37e2fc168 Adds fullscreen button to hide and show header, sidebar and footer 2013-09-27 17:45:52 -04:00
Kevin Crider 73d9cfd3d9 Removed fullscreen CSS to be recomitted later 2013-09-27 17:39:24 -04:00
Kevin Crider 01b2617dd8 Fixes the fixed width bootstrap bug for containers 2013-09-27 17:37:48 -04:00
Kyle Johnson 1f02255413 Put the sidebar into a panel 2013-09-27 09:17:54 -04:00
Kyle Johnson 1887987841 Make the monitors index sidebar a little more terse 2013-09-27 08:42:46 -04:00
Kyle Johnson e4a05f0ae0 Don't load the masonry JS 2013-09-27 08:42:06 -04:00
Kyle Johnson 8dc161d47a Use css float, width and margin to position the monitors in the index view. 2013-09-27 08:40:52 -04:00
Kyle Johnson 6e06a35982 Added bootstrap glyphicons 2013-09-27 08:21:19 -04:00
Kyle Johnson 9566bfd31a Display the monitors as "panels" 2013-09-26 13:46:58 -04:00
Kyle Johnson 6b4e703388 Added help text to the Monitors General tab 2013-09-25 10:09:36 -04:00
Kyle Johnson 5ae657d6b0 Added help text to the Monitors Buffers tab 2013-09-25 10:09:14 -04:00
Kyle Johnson 47336fee15 Don't apply default classes to the Monitors edit and add checkboxes 2013-09-24 21:40:21 -04:00
Kyle Johnson 7c32525c9a Don't put the default div around the Monitors form close button 2013-09-24 21:35:47 -04:00
Kyle Johnson 8fc599240e Set the class of the default divs to form-group 2013-09-24 21:32:38 -04:00
Kyle Johnson ae895ad8b7 Set the width of the tab-content to 400px 2013-09-24 21:32:07 -04:00
Kyle Johnson 11983ab039 Don't add a fieldset to the timestamp tab 2013-09-24 21:26:31 -04:00
Kyle Johnson 3994378dd9 Don't use a horizontal form for Monitors add and edit views 2013-09-24 21:23:35 -04:00
Kyle Johnson 29abee74ad Included the create element instead of the end element 2013-09-24 21:16:44 -04:00
Kyle Johnson d8108fc6cd Moved common Monitors add and edit form code to elements. 2013-09-24 21:14:56 -04:00
Kyle Johnson f3c235544d Moved the common Monitors add and edit nav code to an element. 2013-09-24 20:43:48 -04:00
Kyle Johnson 186f763a4c Moved vars for Monitors edit and add views to appropriate elements.
This saves a bunch of redundant code, while putting the code in the
'right place'.
2013-09-24 20:34:36 -04:00
Kyle Johnson f385db2d80 Moved the scaling of streams from JS to PHP
The Monitor model is now smart enough to change the stream's scale.
It also has the option of not scaling at all (in the case of the
single monitor view).
2013-09-24 12:54:37 -04:00
Kyle Johnson 5f103b35a4 Load masonry on all pages 2013-09-24 11:21:27 -04:00
Kyle Johnson 87fe605435 Updated masonry from 3.0.0 to 3.1.2 2013-09-24 10:58:23 -04:00
Kyle Johnson 88dbd8db1d Removed the LiveStreamHelper completely.
No longer needed as of 2fa0d3a284
2013-09-24 09:18:01 -04:00
Kyle Johnson 9ccf5c72ce Forgot to remove debug() from a view 2013-09-24 09:12:42 -04:00
Kyle Johnson 2fa0d3a284 Rewrote the way that monitor streams are created.
No longer need LiveStreamHelper, and the logic of which image to
display (live or placeholder) has been moved to the Moniors model.
This way should be much easier to understand and support.  This also
fixes my 'ugly hack' in commit eed6c81287
2013-09-24 08:56:04 -04:00
Kyle Johnson 22f9ba5c38 Write the daemon status to Configure 2013-09-24 08:55:46 -04:00
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
Kyle Johnson 172d7a52d1 Revert "Wrapping the main content in a container to fix #169"
This reverts commit 8a9f9a8ab5.
2013-09-23 15:22:07 -04:00
Kyle Johnson 3f70f6714f Removed an old </table> tag 2013-09-23 15:09:58 -04:00
Kyle Johnson 8a9f9a8ab5 Wrapping the main content in a container to fix #169 2013-09-23 15:04:23 -04:00
Isaac Connor 7e91053761 increase the hegiht of the window a bit, the contents are larger 2013-09-23 10:03:33 -04:00
Knniggett 6d00540b5d Improve Chrome browser support & log streaming events 2013-09-21 14:52:41 -05:00
Kevin Crider 2e8e3d55ad Removed green version label and changed to red when a new version is available 2013-09-20 10:49:12 -04:00
Kevin Crider 0de88e7d68 Fixed small bug left over from testing 2013-09-20 10:49:12 -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 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 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
Chris Wiggins a49e66889d Move JS to main.js 2013-09-19 21:10:41 +12: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 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
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
Isaac Connor b08a8252c4 Merge branch 'dukess-master' into v1.26.4-beta
Conflicts:
	scripts/zmupdate.pl.in
2013-09-18 13:03:54 -04:00
Isaac Connor c9ad6e661a Merge branch 'master' of https://github.com/dukess/ZoneMinder into dukess-master 2013-09-18 12:57:26 -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
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 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 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
Serguei S. Dukachev ed9f647dd7 Update actions.php
SQL-ERR 'Incorrect integer value: '' for column 'Enabled' at row 1', statement was 'update Monitors set Function = 'Monitor', Enabled = '' where Id = '2''
2013-09-13 03:48:01 -07:00
Kyle Johnson f0231a7d5f Added some styling to the logs table 2013-09-12 20:10:51 -04:00
Kyle Johnson 34b4ec0b94 Display elements properly for bootstrap. Also fixed element id's 2013-09-12 20:03:41 -04:00
Kyle Johnson d32bab4248 Use the Html, Form and Paginator helpers from BoostCake 2013-09-12 20:02:33 -04:00
Kyle Johnson e42afcd76a Load all available CakePHP plugins 2013-09-12 20:01:31 -04:00
Kyle Johnson e1ce213f04 Adding the BoostCake plugin 2013-09-12 20:00:57 -04:00
Richard Kojedzinszky 0f5c90bbe4 Rewritten the query to allow mysql to use indexes
On a system with heavy logging, without this the login procedure took
too long.
2013-09-12 22:46:26 +02:00
Isaac Connor ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
Isaac Connor fcf7e5b188 Redo the patch that added the <0 test. Since it isn't an actual error there won't be an error message set so I've made it another case entirely. 2013-09-12 13:54:03 -04:00
Kyle Johnson 75acaea36e Open the monitor edit general tab by default 2013-09-11 15:29:18 -04:00
Kyle Johnson 6dbd10621d Reworked to use Bootstrap tabs 2013-09-11 15:24:51 -04:00
Kyle Johnson e27a065039 Add the necessary class to allow these elements to display in tabs 2013-09-11 15:24:28 -04:00
Kyle Johnson cbf48a1d8f Use bootstrap tabs instead of jquery tabs 2013-09-11 15:09:43 -04:00
Kyle Johnson b18b38c486 Apply bootstrap theme to the events table 2013-09-11 15:08:41 -04:00
Kyle Johnson 9dfa3eb5af Rework the config index view to use bootstrap tabs 2013-09-11 15:08:07 -04:00
Kyle Johnson d33f32f6ce Moved the config indev view form to not enclose the tab list 2013-09-11 15:07:03 -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 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
Kyle Johnson dfa2d37c4d Moved the daemonStatus to the header, from the footer 2013-09-11 10:17:10 -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 dbba80fcbf Added a function in AppModel to check the free disk space in the events directory 2013-09-11 09:23:13 -04:00
Kyle Johnson 646b511cd4 Added a function in AppModel to check the System Load 2013-09-11 09:22:53 -04:00
Kyle Johnson c41810bbf1 Reworked the paginator number display to play nice with Bootstrap 2013-09-10 20:27:30 -04:00
Kyle Johnson fa3725d377 Put the sidebar into the Bootstrap sidebar 2013-09-10 20:19:03 -04:00
Kyle Johnson d9b6140bf8 Convert the Logs index view to use a bootstrap sidebar 2013-09-10 20:18:25 -04:00
Kyle Johnson 09a3b9e353 Convert the default layout to use Bootstrap 2013-09-10 20:17:44 -04:00
Kyle Johnson 88b8534efb Adding bootstrap CSS and JS files 2013-09-10 19:06:10 -04:00
Kyle Johnson 2a0613a370 Bunch of updates to css 2013-09-06 15:39:37 -04:00
Kyle Johnson 5c857029ce Merged the JS from config.js and events.js into main.js 2013-09-06 15:07:08 -04:00
Kyle Johnson 9b22dae624 Adding the loading AJAX image to the header 2013-09-06 15:02:43 -04:00
Kyle Johnson c4283ad72e Adding some base HTML to make the ajax view work 2013-09-06 15:01:59 -04:00
Kyle Johnson 48d162d432 Adding a function to control the daemons (start, stop, etc) 2013-09-06 15:01:05 -04:00
Kyle Johnson 6a9ce02870 Moving some of the monitor options to the controller 2013-09-06 15:00:01 -04:00
Isaac Connor 0a9e63ca2c remove autogenerated files 2013-09-06 14:40:55 -04:00
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Kyle Johnson c02d496d23 More CakePHP cleanup - missed it in 2c04d0774f 2013-09-05 10:52:55 -04:00
Kyle Johnson d47aaec775 Merge pull request #92 from knnniggett/patch-9
Update getBrowser() to match IE10
2013-09-03 06:38:13 -07:00
Kyle Johnson c5196407a9 Moved all of the Monitors HTML to elements 2013-09-01 17:50:26 -04:00
Kyle Johnson 2f92689d7e Resolving CVE-2013-0232 - this should fix #93. 2013-08-30 21:53:19 -04:00
Andy de51926434 Update getBrowser() to match IE10
Updates the preg_match expression to match Internet Explorer 10. The previous pattern would not detect IE10, and hence zoneminder would not attempt to stream via Cambozola, which leaves IE10 users looking at a broken link.

NOTE: There is another file in the zoneminder source tree, AssetDispatcher.php, that also uses the same pattern match expression.  It is part of the Cake folder, which I am not familiar with.  Please advise if we should edit that file as well.
2013-08-29 17:41:20 -05:00
nagyrobi 9f1268df38 Update hu_hu.php
This one contains updates related to all the earlier pull requests.
Had to change the entire file due to charset encoding reasons.
2013-08-16 15:40:50 +02:00
nagyrobi bd4aae4c1e Update console.php
Fix the bandwidth status sentence on the top of the console window, the last word is different than the universal 'bandwidth' word in many other languages.
2013-08-16 14:08:38 +02:00
nagyrobi 8a3850ac11 Update en_gb.php
Enable localization of the monitor function names in the console, function window and monitor settings window.

Fix the bandwidth status sentence on the top of the console window, the last word is different than the universal 'bandwidth' word in many other languages.
2013-08-16 14:06:40 +02:00
nagyrobi a186981278 Update monitor.php
Enable localization of the monitor function names in the monitor settings window.
2013-08-16 13:48:25 +02:00
nagyrobi 0c098e2b0f Update function.php
Enable localization of the monitor function names in the function window.
2013-08-16 13:41:33 +02:00
nagyrobi ff9cbeff6b Update console.php
Enable localization of the monitor function names in the console.
2013-08-16 13:39:42 +02:00
nagyrobi 60ea6a387d Update lang.php
Add the ability to set up the Date and time formats by the language files, according to that language's regionals.
The patch allows to set up a global default, in case the language file doesn't contain the date and time definitions.

Here we look if the constants are already defined or not, if they are not, define them to the original defaults.
2013-08-16 12:05:33 +02:00
nagyrobi bc18a27072 Update skin.js
Increased popup window sizes just a little bit, to prevent the longer foreign language translated strings to break window layouts.

Fine-tuned again, I hope that's the final one :-)
2013-08-16 10:13:35 +02:00
nagyrobi 9c7653ca68 Update timeline.php
Enable localization of the usage instructions in the Timeline window.
2013-08-15 18:58:08 +02:00
nagyrobi 8ce4d302dd Update montage.php
Enable localization of the dropdown box items in the montage window.
2013-08-15 18:56:01 +02:00
nagyrobi 150cf5ae80 Update en_gb.php
Added a couple of localized strings.
These need to be added to each language file too!
2013-08-15 18:52:14 +02:00
Kyle Johnson 4d6b9f7276 More updates to the Hungarian translation. #Fixes #45 2013-08-15 09:39:45 -04:00
nagyrobi 2b0647a52c Update skin.css
Increased table width just a little bit, to prevent the longer foreign language translated strings to break window layouts.
2013-08-15 12:48:04 +02:00
nagyrobi 1fa04cc104 Update hu_hu.php 2013-08-14 22:38:37 +02:00
Kyle Johnson ee251b3c02 Removing lingering references to UsedPl 2013-08-13 12:34:59 -04:00
Isaac Connor 266b67d0bd Support for control when monitor source is ffmpeg. This should fix #16. 2013-08-13 08:34:37 -04:00
Isaac Connor 3a305522c4 Merge branch 'develop' of github.com:ZoneMinder/ZoneMinder into develop 2013-07-25 11:50:24 -04:00
Isaac Connor cdac403fb1 Merge ../zum into develop
Conflicts:
	AUTHORS
	configure.ac
	db/zm_create.sql.in
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/zmupdate.pl.in
	src/Makefile.am
	src/zm_buffer.cpp
	src/zm_config_defines.h
	src/zm_event.cpp
	src/zm_ffmpeg.h
	src/zm_ffmpeg_camera.cpp
	src/zm_image.cpp
	src/zm_jpeg.h
	src/zm_local_camera.cpp
	src/zm_logger.cpp
	src/zm_mem_utils.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_mpeg.cpp
	src/zm_remote_camera_http.cpp
	src/zm_remote_camera_rtsp.cpp
	src/zm_rtsp.cpp
	src/zm_sdp.cpp
	src/zm_sdp.h
	src/zm_stream.cpp
	src/zm_thread.cpp
	src/zm_thread.h
	src/zm_threaddata.cpp
	src/zm_user.cpp
	src/zm_user.h
	src/zm_utils.cpp
	src/zm_zone.cpp
	src/zm_zone.h
	web/includes/actions.php
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/js/monitor.js.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
Kyle Johnson f1d9de75b0 Point root to the Monitors index action 2013-07-19 09:30:08 -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 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