Commit Graph

4128 Commits

Author SHA1 Message Date
Isaac Connor
bc5ae78e79 Merge pull request #877 from pliablepixels/799-api-improvements
799 api improvements
2015-06-11 09:06:31 -04:00
Pliable Pixels
8677e600a4 Reset bootstrap to use config/version variables 2015-06-10 15:53:21 +00:00
Pliable Pixels
6aa722d5a9 removed MYMETA.json, its a post build generated file 2015-06-10 15:51:38 +00:00
Pliable Pixels
1f7cd3111b Added CRUD plugin 2015-06-10 15:42:48 +00:00
Pliable Pixels
812efdb14c Removed hasmany relationship from Control - it should not be mapped into any other controller 2015-06-09 12:22:28 +00:00
Pliable Pixels
30aefe1097 Addnew route for new control API. Ref: https://github.com/ZoneMinder/ZoneM^Cder/issues/799#issuecomment-105233112 2015-06-08 17:51:59 +00:00
Pliable Pixels
f723fc58b2 New Control API to retrieve PTZ controls definitions. Refer https://github.com/ZoneMinder/ZoneMinder/issues/799#issuecomment-105233112 2015-06-08 17:50:36 +00:00
Pliable Pixels
444477d8a5 New Control API to retrieve PTZ controls definitions. Refer https://github.com/ZoneMinder/ZoneMinder/issues/799#issuecomment-105233112 2015-06-08 17:49:51 +00:00
Isaac Connor
45c3651ebb Merge pull request #876 from pliablepixels/799-api-improvements
Fixed daemonStatus API to return string returned by ZMC in addition t…
2015-06-08 11:02:54 -04:00
Pliable Pixels
aa8f7da7e2 Fixed daemonStatus API to return string returned by ZMC in addition to true/false so we can handle pending status of a monitor 2015-06-08 14:35:45 +00:00
Kyle Johnson
d88a1cfb8b Remove PHP from events_search template 2015-03-05 08:19:31 -05:00
Kyle Johnson
e7472a126f Rework the Options / Config page (again)
We're now grabbing only the json from the api, passing it through
the Crud plugin so that ints stay as ints, and then assigning the
json to the scope via app.js resolve.

 * Saving Config is not tested here.
 * This commit may deprecate the ConfigParserComponent
 * Options must be saved before changing the tab, lest they are lost.
 * That'll be fixed in another commit.
2015-03-05 08:03:15 -05:00
Kyle Johnson
db0ce1f5c6 Resolve configData in options state before load
This commit will pass in a $scope.configData array to the 'options'
state before the page loads.  This ensures that the config data
is in scope before the page loads.
2015-03-03 09:37:57 -05:00
Kyle Johnson
46d1400577 Add 'get' function to Config factory in angular 2015-03-03 09:36:23 -05:00
Kyle Johnson
683c4eed4b API: Config Index action call find('hash') 2015-03-03 09:34:11 -05:00
Kyle Johnson
a395f9a9f7 Add find method for returning hash of Config table 2015-03-03 09:25:02 -05:00
Kyle Johnson
a4c5f83c8c Migrate Log view to ui-router 2015-03-03 08:00:24 -05:00
Kyle Johnson
2ea43492bb Migrate Host view to ui-router 2015-03-03 07:56:30 -05:00
Kyle Johnson
8c8ae6ae6f Replace configs/keyvalue functionality with CRUD 2015-02-27 11:20:45 -05:00
Kyle Johnson
a228a5077c Change primaryKey and displayField for Config 2015-02-27 11:17:30 -05:00
Kyle Johnson
84e7f463fa Add styling for vertical (stacked) tabs.
This commits adds some styling for the stacked tabs in the Options
and Monitors views.
2015-02-27 09:32:27 -05:00
Kyle Johnson
99eaec391d Add class="form-control" to <select> in monitor.list 2015-02-26 13:06:51 -05:00
Kyle Johnson
f48ef4b81f Set class="active" for active state in header 2015-02-26 13:05:10 -05:00
Kyle Johnson
7ef16014c8 Set class="active" for active state in options 2015-02-26 13:02:15 -05:00
Kyle Johnson
790e69b345 Change body background color 2015-02-26 13:01:49 -05:00
Kyle Johnson
763f5de895 Total revamp of Options view.
* Add routes for each individual options tab
 * Add options files for each category
 * Use ui-router with ui-view for tab functionality

Previously the options tabs were dynamically generated from the
API, and returned as HTML-formed json.  These were then dynamically
inserted into the page.

From there, tab functionality was added with bootstrap + jquery.
ui-router broke that tab functionality.
2015-02-26 12:46:40 -05:00
Kyle Johnson
7a401eb2e9 Make the header fixed to top, with dark background 2015-02-26 10:45:48 -05:00
Kyle Johnson
a08e24db57 Remove legacy CSS from skin.css 2015-02-26 10:45:20 -05:00
Kyle Johnson
54e6448337 Wrap the zones list in a responsive table 2015-02-25 10:49:11 -05:00
Kyle Johnson
8af8ecb6f1 API: Zones use Crud for Index and View actions 2015-02-25 10:33:55 -05:00
Kyle Johnson
80b1a61a12 Add CakePHP Crud plugin to the API
I wish I knew about this plugin months ago.

By default PDO and CakePHP cast int as string.  This prevents me
from using `<input type="number">`, as the modle that the input
is bound to is actually a string, not an int.

Crud by default casts int back to int via ApiTransformationListener

It also has a bunch of other features which makes the life of a
REST / CRUD developer easier.
2015-02-25 10:28:24 -05:00
Kyle Johnson
21fdd5d453 Add ZonePresets to the API 2015-02-24 14:08:10 -05:00
Kyle Johnson
1c87dd00fd Add zone view / edit functionality to new ui
You should now be able to see a monitor's zones by clicking on the
respective 'Edit' link.  From there, you'll see a list view of that
monitor's Zones.

From there, you can click on the Zone name, which will bring up the
details for that zone.

You can not yet save zones, and not all of the values for that zone
are displayed.
2015-02-24 11:18:01 -05:00
Kyle Johnson
43728aa6f8 Add web/images to .gitignore 2015-02-24 11:15:18 -05:00
Kyle Johnson
3c9b05d2ea Make the new UI not scalable on mobile 2015-02-24 11:14:42 -05:00
Kyle Johnson
ad69c02c9f Add API function: Create a monitor's zone snapshot 2015-02-24 11:13:46 -05:00
Kyle Johnson
d56e0762f4 Add API function: return a monitor's zones 2015-02-24 11:13:10 -05:00
Kyle Johnson
b655883345 Update bootstrap from 3.3.0 to 3.3.2 2015-02-19 10:54:51 -05:00
Kyle Johnson
036231b5d2 Fix bug: 'mid' was not properly set
Since migrating to ui-router, the monitor's ID was not properly set
when trying to edit an existing monitor.  This caused existing
monitors to not load properly when in the edit / detail page.

Now, the monitor id (mid) is set as a state parameter, and is
accessed from $state.params.mid
2015-02-18 12:11:55 -05:00
Kyle Johnson
29bcbb2af9 Set html5Mode to false until refreshing page works
If with html5Mode true, freshing a page fails because state is not
preserved.
2015-02-18 11:39:43 -05:00
Kyle Johnson
5a2e6cef81 Fix bug: Both monitor views show in certain cases
If you switched to monitor list view, clicked on 'Add New Monitor'
and then clicked on 'Monitors' again, both the grid and list views
(montage and table) would show, instead of one or the other.
2015-02-18 11:36:51 -05:00
Kyle Johnson
c4af30049e Don't load the bootstrap.css.map file 2015-02-18 11:32:06 -05:00
Kyle Johnson
bf66c20179 Remove missed php tags in monitor template files 2015-02-17 21:36:27 -05:00
Kyle Johnson
cbaec2e17a Fix header to display properly on mobile devices.
* Update some of the classes to reflect newer version of bootstrap.
 * Use a collapseable header / nav button on mobile devices.
 * Align the on / off button with the rest of the nav items.
2015-02-17 21:29:16 -05:00
Kyle Johnson
62d445a61d Major frontend reavmp to properly use ui-router.
The core of the work here involved two things:
 * Making the default view / home page 'monitor' instead of 'console'
 * Replacing monitor tab functionality with ui-router's nested views

There are now a few bugs which need to be worked out:
 * Haven't tested saving a monitor
 * Loading an existing monitor's data doesn't work (edit)
 * active tab isn't set
 * who knows what else?
2015-02-17 14:35:08 -05:00
Kyle Johnson
99aac2a372 Remove all PHP from the tab-monitor files.
This means some features aren't there and will need to be fixed /
added later
2015-02-13 16:00:33 -05:00
Kyle Johnson
9ce1f4c159 Add a route to monitor 2015-02-11 19:40:42 -05:00
Kyle Johnson
9cbaa7ed8b Fix: load tab html files not php files 2015-02-11 19:38:35 -05:00
Kyle Johnson
032741552e Move monitor.php to monitor.html 2015-02-11 19:33:06 -05:00
Kyle Johnson
8416669fac Remove php from monitor.php 2015-02-11 19:32:54 -05:00