8b7733cd37
Remove mootools, overlay and logger from bootstrap
...
Everything these files do is being replaced by AngularJS
2014-11-28 16:55:12 +00:00
e56248ab88
Remove copywrite from console view header
2014-11-28 00:27:55 +00:00
cdcf29964b
Remove rest of unused php from console view.
2014-11-28 00:27:04 +00:00
ff65a701eb
Display stills of each monitor, set per-monitor alerts
...
This commit displays a still of each monitor at page load time.
The panel surrounding the monitor is context sensitive - if zmc or
zma is not running, the panel is red (well, pink).
Also if either zmc or zma are not running, we add an icon in the
panel's header, explaining what is wrong.
2014-11-28 00:25:15 +00:00
addc985656
Load ui.bootstrap angular module
2014-11-28 00:20:04 +00:00
1d7d53d166
Add ui-bootstrap 0.12
2014-11-27 14:50:31 +00:00
b3d1811c43
Add getMonitors factory to angular
2014-11-27 14:35:00 +00:00
d9e65e37f9
Add daemonStatus factory to angular.
...
Used to query the status of daemons (zmc, zma, etc)
2014-11-27 14:34:08 +00:00
348564de64
Remove a bunch of unused php in Console view
2014-11-25 17:56:54 +00:00
50b1a53369
Put mid into the liveStream ID in console view
2014-11-25 17:45:47 +00:00
929d332ce7
Remove group querystring from Host link
2014-11-25 16:31:40 +00:00
f854bf4dcb
Move getDiskPercent from Footer to Host factory
2014-11-25 16:30:27 +00:00
9b636c89bc
Show disk usage as a chart on the Host view
2014-11-25 16:27:38 +00:00
f32cb32da9
Move getLoad to Host factory, and display via chartjs
2014-11-25 16:25:10 +00:00
d6a921810c
Load the tc chartjs angular module
2014-11-25 15:25:34 +00:00
7dff223aa6
Include Chart.js and tc-angular-chartjs in bootstrap skin
2014-11-25 15:23:06 +00:00
7faace32b9
Initial commit of empty HostController
2014-11-25 15:21:30 +00:00
840ead467b
Remove Load and Disk Usage from Footer
2014-11-25 15:19:45 +00:00
3e10ab10ac
Added Chart.js v 1.0.1 beta-4
2014-11-24 20:09:22 +00:00
c8ab231cef
Add Host view to header
2014-11-24 20:03:06 +00:00
fe87ca7bd7
Initial commit of Host view
2014-11-24 20:02:59 +00:00
941bf3535f
Display version in footer via api / angular
2014-11-24 00:56:20 +00:00
7ba971806f
Removed a console.log()
2014-11-21 22:17:01 +00:00
1f74d1cd60
Get the diskPercent from angular, via the API
2014-11-21 22:16:19 +00:00
e541976b77
Grab system load from API and set with angular
2014-11-21 20:06:59 +00:00
9dd1a2261f
Output a real snapshot of the camera in console view
2014-11-20 13:47:41 +00:00
4364c73143
Remake Options view with angular. Uses API.
2014-11-20 04:11:33 +00:00
ad65fa1820
Make Config table options available to angular
2014-11-20 04:10:01 +00:00
92bfac0aad
Add angular directive allowing elements to bind to html
2014-11-20 04:05:22 +00:00
4298d4a498
Fix <form> location in state.php
2014-11-20 03:40:15 +00:00
c8a3cb9df9
Initial refactor of console view to use api & angular
...
* Move eventCounts to the API and bind with angular
* Display the console as a grid, rather than a table
* Show only information we want to see
2014-11-19 15:53:07 +00:00
64122b3b98
Set the logState in header via angular
2014-11-16 00:35:10 +00:00
f1a70076d0
Convert some of event view to angularjs
2014-11-15 23:51:31 +00:00
5b4dfce34a
Add Event controller and factory
2014-11-15 23:50:46 +00:00
519a5e1612
Setup html5mode to enabled
2014-11-15 23:50:04 +00:00
47770bffe4
Add <base> element to <head> so I can use $location.search
2014-11-15 23:49:18 +00:00
1fc26c01ac
Merge remote-tracking branch 'origin/master' into bootstrap-skin
2014-11-15 21:47:01 +00:00
2db5d66134
Include state js and php in all pages.
...
As we can now start / stop the software from any page, via a modal,
we need the state's php and js files to do so.
2014-11-15 19:48:04 +00:00
f38a9c9f06
Add jquery
2014-11-15 19:46:34 +00:00
36ebaaff33
Add HeaderController to the header nav
2014-11-15 19:45:18 +00:00
4c0e2dc743
Include initial angularjs files
2014-11-15 19:34:00 +00:00
b04d970132
Add charset and other meta tags to head
2014-11-15 17:34:51 +00:00
6911b99271
Move groups link to the console sidebar
2014-11-15 16:51:39 +00:00
a6027ccdca
Make the ZoneMinder text a link to the console
2014-11-15 16:49:44 +00:00
e359a1cf97
Move 'state' to header, as on/off btn, in a modal
2014-11-15 16:47:42 +00:00
08d2cf801e
Move header outside of form in console
2014-11-15 16:34:45 +00:00
9c30b806f2
don't require SystemView to view/select groups.
...
Change the way the groups ine is displayed to give people some idea that it might have something to do with grouping
use _POST instead of _REQUEST
2014-11-13 10:38:20 -05:00
7b4effc3ed
Remove Chart.js
2014-11-11 16:49:56 +00:00
7f83eeafbf
Do not text-align center everything
2014-11-11 14:56:45 +00:00
942c65f1e2
Remove the existing #header from timeline
2014-11-11 14:34:34 +00:00
1c046a7afd
Added header to the timeline view
2014-11-11 14:33:35 +00:00
09282045c6
Align the Events control buttons vertically
2014-11-11 14:31:43 +00:00
487cd20b18
Fix typo in class name
2014-11-11 14:23:21 +00:00
02cc5d0a6c
Move Events controls to sidebar
2014-11-11 14:21:13 +00:00
1e04e341e4
Link to paginated Events in Header
2014-11-11 14:20:03 +00:00
ea782d46b2
Move timeline link from Events to Header
2014-11-11 14:19:15 +00:00
26c9a77590
Update skin.js
...
Fix issue caused by a previous merge
2014-11-10 12:12:54 -06:00
dfc3d70584
Remove Filters from the header
2014-11-03 13:49:48 +00:00
e8b93f0a20
Revert "Remove Filters from the header"
...
This reverts commit 4b6cf9ca04
2014-11-03 13:49:36 +00:00
4b6cf9ca04
Remove Filters from the header
2014-11-03 13:49:06 +00:00
28a4de809b
Show log state color in header
2014-11-02 14:54:08 +00:00
ee2e0a5aec
Add Events to main nav
2014-11-02 12:42:40 +00:00
f847ad548a
Added ZoneMinder logo to header
2014-11-02 12:41:40 +00:00
91af0992bd
Remove unused elements from the sidebar
2014-11-02 00:51:56 +00:00
dfa246bbf6
Add header to log and rearrange filter elements
2014-11-02 00:51:24 +00:00
1f8d2d3b77
Add header to monitor view
2014-11-02 00:48:21 +00:00
23b367614b
Use <a> elements intead of makePopupLink() in header
2014-11-02 00:47:32 +00:00
1436414ddc
Add header to main views
2014-11-02 00:47:14 +00:00
79e41dbb1b
Fix bug where on / off icon didn't have class if not console view
2014-11-02 00:40:26 +00:00
6435fe24c0
Add console link to header
2014-11-01 16:04:15 +00:00
c892e72ae8
Display cycle and montage as <a> element, only if running
2014-11-01 16:01:30 +00:00
bcbd73fe44
Split nav / header out into own file
2014-11-01 15:39:11 +00:00
1a83b3053e
More work on cosole - split into sep. files, create sidebar
2014-11-01 15:26:19 +00:00
8ec86ae255
Convert most of console to bootstrap theme
2014-10-31 20:55:19 +00:00
1c400f0966
Remove font-size:10px from <body>
2014-10-31 20:32:50 +00:00
a4fbde9e3f
Add Chart.js to bootstrap skin
2014-10-31 20:24:25 +00:00
896b258ad0
Use bootstrap .container-fluid instead of #page
2014-10-31 18:55:32 +00:00
c11f4eb0bb
Use HTML5 doctype
2014-10-31 18:53:15 +00:00
c066d9bdbc
Load the bootstrap css and js files
2014-10-31 18:50:07 +00:00
7e89df842c
Check in of bootstrap 3.3.0 files to bootstrap skin
2014-10-31 18:47:46 +00:00
bb465f0250
Initial commit of bootstrap-based skin
2014-10-31 18:46:37 +00:00
2f32c3895b
Merge branch 'release-1.28'
...
Conflicts:
web/skins/flat/js/skin.js
2014-10-22 15:10:19 -04:00
c5a1d9ffa9
fix console refresh in this skin too
2014-10-22 10:58:06 -04:00
23ebbf3887
Update skin.js
...
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-21 17:22:33 -05:00
8d225566b1
Move this line down to mitigate the problem where the console doesn't refresh.
2014-10-20 15:32:30 -04:00
7ea003441d
Merge pull request #371 from m-bene/resizeWindows
...
Reduce window size to exclude task bar area
2014-10-09 14:46:46 -05:00
2018228daf
fix V inputs
2014-08-21 11:58:51 -04:00
6564c4359b
adjust monitor popup height
2014-08-21 11:15:35 -04:00
707f2e84db
increase monitor popup height to fit v4l settings in
2014-08-21 11:14:48 -04:00
f93a28f2be
fixup multibuffering so it can have a null value which makes it fall back to config table
2014-08-21 11:13:38 -04:00
0834e1b61d
I see no reason for these to be posts. They retrieve info, that's it.
2014-07-29 16:15:31 -04:00
96322dd59c
remove v4l tab that I never used
2014-07-29 14:45:02 -04:00
b2f1c2fe68
Merge branch 'v4l_to_monitor'
2014-07-24 14:35:23 -04:00
b3f078eaa5
add the word disabled after function if the monitor is not enabled.
2014-07-23 15:46:37 -04:00
edd794a993
ensure captures_per_frame >0
...
add missing lang entries for MultiBuffer and CapturesPerFrame
2014-07-14 14:07:28 -04:00
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
8f88e2a6c0
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2014-07-08 10:54:16 -04:00
2be38d7f32
fix problem editing users, a semi-colon screwed up the if statement.
...
Also change behaviour so that if a user is specified, and doesn't load, generate an error.
This also removes a search for empty user id in the db
2014-07-08 10:52:55 -04:00
371c1bae3d
Merge pull request #359 from knnniggett/eyezm
...
fix eyezm authentication issue
2014-07-07 17:57:48 -05:00
5c8c00c1ab
Fix double login issue with eyezm
2014-07-07 17:48:33 -05:00
Kyle Johnson
Isaac Connor
Andrew Bauer
Andrew Bauer