8fc599240e
Set the class of the default divs to form-group
2013-09-24 21:32:38 -04:00
ae895ad8b7
Set the width of the tab-content to 400px
2013-09-24 21:32:07 -04:00
11983ab039
Don't add a fieldset to the timestamp tab
2013-09-24 21:26:31 -04:00
3994378dd9
Don't use a horizontal form for Monitors add and edit views
2013-09-24 21:23:35 -04:00
29abee74ad
Included the create element instead of the end element
2013-09-24 21:16:44 -04:00
d8108fc6cd
Moved common Monitors add and edit form code to elements.
2013-09-24 21:14:56 -04:00
f3c235544d
Moved the common Monitors add and edit nav code to an element.
2013-09-24 20:43:48 -04:00
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
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
5f103b35a4
Load masonry on all pages
2013-09-24 11:21:27 -04:00
87fe605435
Updated masonry from 3.0.0 to 3.1.2
2013-09-24 10:58:23 -04:00
88dbd8db1d
Removed the LiveStreamHelper completely.
...
No longer needed as of 2fa0d3a284
2013-09-24 09:18:01 -04:00
9ccf5c72ce
Forgot to remove debug() from a view
2013-09-24 09:12:42 -04:00
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
22f9ba5c38
Write the daemon status to Configure
2013-09-24 08:55:46 -04:00
eed6c81287
An ugly hack to make the liveStreams display in both index and view views.
2013-09-23 21:51:02 -04:00
172d7a52d1
Revert "Wrapping the main content in a container to fix #169"
...
This reverts commit 8a9f9a8ab5
2013-09-23 15:22:07 -04:00
3f70f6714f
Removed an old </table> tag
2013-09-23 15:09:58 -04:00
8a9f9a8ab5
Wrapping the main content in a container to fix #169
2013-09-23 15:04:23 -04:00
2e8e3d55ad
Removed green version label and changed to red when a new version is available
2013-09-20 10:49:12 -04:00
0de88e7d68
Fixed small bug left over from testing
2013-09-20 10:49:12 -04:00
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
99bae6386e
Merge branch 'monitorSize' of git://github.com/chriswiggins/ZoneMinder into modern
2013-09-20 17:49:04 +12:00
f8db56b308
Have the Events view view (not index) use the popup layout
2013-09-19 11:31:54 -04:00
0223aeb3ab
Set all event links to be colorboxes
2013-09-19 11:31:05 -04:00
9e782ed407
Adding the colorbox css and js to the default template
2013-09-19 11:30:25 -04:00
e0a7418d24
Adding the colorbot js
2013-09-19 11:29:42 -04:00
afa281a750
Adding the colorbox css
2013-09-19 11:29:29 -04:00
e936df0f0d
A minimum layout file for use with popups
2013-09-19 11:29:12 -04:00
ca8cc028ef
Display an HTML5 <video> for each event
2013-09-19 09:12:05 -04:00
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
5844a1cc89
Added a function which creates videos from event jpgs
2013-09-19 08:57:54 -04:00
a49e66889d
Move JS to main.js
2013-09-19 21:10:41 +12:00
133b061179
Add code for dynamically scaling monitor images on home screen. Add new no-image image
2013-09-19 20:56:09 +12:00
5178d4fa37
Added "Function" column to the $monitors array to fix issue 140
2013-09-18 17:24:52 -04:00
d7fd5566a7
Fixes issue 129 - Bandwidth is now updated in the UI after changing it
2013-09-18 17:10:17 -04:00
bf8f799c4c
Moved delete button to the sidebar
2013-09-18 16:46:44 -04:00
0cf11adb99
Removed logging line from deleteSelected function
2013-09-18 15:55:50 -04:00
c6bbdac0d7
Added ability to delete multiple events at once
2013-09-18 15:53:35 -04:00
0f25bec1d6
Fixes to monitor sorting and reordering
2013-09-18 13:23:16 -04:00
bcaa0ac36c
Added missing jquery-2.0.1.min.map file
2013-09-18 13:16:10 -04:00
4430399b1e
Removed logging of post data
2013-09-18 12:37:01 -04:00
6dfdba7023
Added ability to reorder monitors on the dashboard
2013-09-18 12:22:14 -04:00
f716fbb237
Open the Config Option tab by default
2013-09-17 12:48:38 -04:00
f7b7a49616
shoNoImage was always being called as the $mon variable was incorrect
2013-09-17 09:43:48 -04:00
ddec9a0dd8
Fixes 147 - there were unescaped quotes
2013-09-17 09:28:42 -04:00
17b60bf25f
Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern
2013-09-17 09:13:03 -04:00
e694616702
Reworked the Config view to display options in rows using bootstrap.
...
This commit fixes #134
2013-09-17 09:07:35 -04:00
064b86c95f
Added my events dir to the gitignore list
2013-09-17 08:54:53 -04:00
e0423570bd
Added classes to take care of smaller and larger displays
2013-09-17 08:50:46 -04:00
Kyle Johnson
Kevin Crider
Chris Wiggins