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
e0423570bd
Added classes to take care of smaller and larger displays
2013-09-17 08:50:46 -04:00
dc316b0aee
Add static image when the monitor/system is not enabled/running
2013-09-16 22:00:27 +12:00
6c60813a6f
Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern
2013-09-16 13:13:07 +12:00
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
c6d1715948
Removed an unneeded div in the Events view.
2013-09-14 22:10:49 -04:00
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
bf2e46f512
Added a function to delete events.
...
Currently this only allows single events to be deleted.
2013-09-14 22:05:08 -04:00
0b5a215dca
Use the HtmlHelper::tableHeaders helper to display the table headers
2013-09-14 21:03:31 -04:00
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
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
b2ab1cea09
Initial commit of Version Controller and View
2013-09-13 08:55:46 -04:00
2f99274c0a
Initial commit of Version model
2013-09-13 08:44:21 -04:00
180d879894
Display the ZM version in the footer of all pages.
2013-09-13 08:43:11 -04:00
0437e6e5b6
Pass the zmVersion variable to all views
2013-09-13 08:42:55 -04:00
f0231a7d5f
Added some styling to the logs table
2013-09-12 20:10:51 -04:00
34b4ec0b94
Display elements properly for bootstrap. Also fixed element id's
2013-09-12 20:03:41 -04:00
d32bab4248
Use the Html, Form and Paginator helpers from BoostCake
2013-09-12 20:02:33 -04:00
e42afcd76a
Load all available CakePHP plugins
2013-09-12 20:01:31 -04:00
e1ce213f04
Adding the BoostCake plugin
2013-09-12 20:00:57 -04:00
75acaea36e
Open the monitor edit general tab by default
2013-09-11 15:29:18 -04:00
6dbd10621d
Reworked to use Bootstrap tabs
2013-09-11 15:24:51 -04:00
e27a065039
Add the necessary class to allow these elements to display in tabs
2013-09-11 15:24:28 -04:00
cbf48a1d8f
Use bootstrap tabs instead of jquery tabs
2013-09-11 15:09:43 -04:00
b18b38c486
Apply bootstrap theme to the events table
2013-09-11 15:08:41 -04:00
9dfa3eb5af
Rework the config index view to use bootstrap tabs
2013-09-11 15:08:07 -04:00
d33f32f6ce
Moved the config indev view form to not enclose the tab list
2013-09-11 15:07:03 -04:00
c03c21895c
Display a red or green alert, depending on daemon status
2013-09-11 10:37:18 -04:00
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
dfa2d37c4d
Moved the daemonStatus to the header, from the footer
2013-09-11 10:17:10 -04:00
735f85a255
Renamed the thumb_width variable to be width as that is what my helper expects
2013-09-11 10:14:04 -04:00
6a65bef736
Display the system load and free disk space in the nav bar
2013-09-11 09:23:55 -04:00
dbba80fcbf
Added a function in AppModel to check the free disk space in the events directory
2013-09-11 09:23:13 -04:00
646b511cd4
Added a function in AppModel to check the System Load
2013-09-11 09:22:53 -04:00
c41810bbf1
Reworked the paginator number display to play nice with Bootstrap
2013-09-10 20:27:30 -04:00
fa3725d377
Put the sidebar into the Bootstrap sidebar
2013-09-10 20:19:03 -04:00
d9b6140bf8
Convert the Logs index view to use a bootstrap sidebar
2013-09-10 20:18:25 -04:00
09a3b9e353
Convert the default layout to use Bootstrap
2013-09-10 20:17:44 -04:00
88b8534efb
Adding bootstrap CSS and JS files
2013-09-10 19:06:10 -04:00
2a0613a370
Bunch of updates to css
2013-09-06 15:39:37 -04:00
5c857029ce
Merged the JS from config.js and events.js into main.js
2013-09-06 15:07:08 -04:00
9b22dae624
Adding the loading AJAX image to the header
2013-09-06 15:02:43 -04:00
c4283ad72e
Adding some base HTML to make the ajax view work
2013-09-06 15:01:59 -04:00
48d162d432
Adding a function to control the daemons (start, stop, etc)
2013-09-06 15:01:05 -04:00
6a9ce02870
Moving some of the monitor options to the controller
2013-09-06 15:00:01 -04:00
c5196407a9
Moved all of the Monitors HTML to elements
2013-09-01 17:50:26 -04:00
f1d9de75b0
Point root to the Monitors index action
2013-07-19 09:30:08 -04:00
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
ad0aaa6e93
Initial commit of Zone MVC
2013-07-18 08:08:07 -04:00
6ba1d8f041
Added the Js helper and RequestHandler component to AppController to be available app-wide.
2013-07-16 08:33:53 -04:00
e4ccd359cd
Allow setting of width with the live stream helper
2013-07-15 07:35:39 -04:00
4265e8b45f
Sort with newest at top, not bottom.
2013-07-11 12:09:45 -04:00
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
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
80ebaad07b
Initial commit of the Log model
2013-07-10 10:00:49 -04:00
64fba81f6a
Moved the navigation items to an ordered list
2013-06-25 12:21:21 -04:00
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
12537a7860
Added jquery-ui images and updated jquery-ui css to point to them.
2013-06-22 21:50:22 -04:00
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
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
fe5df3eb8c
Also grab the Hint column from the Config table
2013-06-22 11:59:03 -04:00
5635b24897
Make the tab's first character uppercase
2013-06-21 22:22:54 -04:00
567c0c5c20
Switching on the category type to determine which type of input to display.
2013-06-21 22:20:16 -04:00
6faa248248
Sorting the Config results by Type (boolean, string, etc)
2013-06-21 22:19:27 -04:00
819f1b48d6
Filtering out the "hidden" category
2013-06-21 22:18:44 -04:00
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
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
f50bf834d9
Forgot to change $event to $value, and to move a <td> or two.
2013-05-30 23:00:09 -04:00
Kyle Johnson
Kevin Crider
Chris Wiggins