Commit Graph

108 Commits

Author SHA1 Message Date
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 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 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
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 9e782ed407 Adding the colorbox css and js to the default template 2013-09-19 11:30:25 -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
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 bf8f799c4c Moved delete button to the sidebar 2013-09-18 16:46:44 -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 6dfdba7023 Added ability to reorder monitors on the dashboard 2013-09-18 12:22:14 -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 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
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 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 180d879894 Display the ZM version in the footer of all pages. 2013-09-13 08:43:11 -04: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 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 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 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