Chris Wiggins
d4654f63ae
merge modern into feature-h264-videostorage
2013-10-04 10:52:53 +13: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
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
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
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
Kevin Crider
a852dee7bb
Initial commit of expanding and collapsing error log messages
2013-09-27 19:58:01 -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
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
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
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
87fe605435
Updated masonry from 3.0.0 to 3.1.2
2013-09-24 10:58:23 -04: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
0223aeb3ab
Set all event links to be colorboxes
2013-09-19 11:31:05 -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
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
bcaa0ac36c
Added missing jquery-2.0.1.min.map file
2013-09-18 13:16:10 -04:00
Kyle Johnson
f716fbb237
Open the Config Option tab by default
2013-09-17 12:48:38 -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
34b4ec0b94
Display elements properly for bootstrap. Also fixed element id's
2013-09-12 20:03:41 -04:00
Kyle Johnson
cbf48a1d8f
Use bootstrap tabs instead of jquery tabs
2013-09-11 15:09:43 -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
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
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
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
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
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
e80bd5ffd0
Updated the CSS for jquery-ui-selected elements
2013-05-30 22:36:51 -04:00
Kyle Johnson
26f99bf76b
Adding jQuery UI
2013-05-29 17:46:07 -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
Kyle Johnson
984035dde3
Initial commit of events.js file; added it to all pages.
...
events.js should eventually be loaded in only the events view. This commit
creates #15 .
2013-05-29 07:47:27 -04:00