Commit Graph

47 Commits

Author SHA1 Message Date
Kyle Johnson 60bebadecf Merge pull request #190 from kylejohnson/modern
Moved zmBandwidth option from cookie to Configure:: option.  Might fix #175
2013-10-02 05:28:33 -07:00
Kyle Johnson 19e5aec9ba Use the global zmBandwidth variable from Configure::read in the layout 2013-10-02 08:18:17 -04: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 38944fb994 Merge pull request #179 from WDKevin/modern
Added datetime picker support and implemented on events sidebar
2013-10-01 06:28:29 -07:00
Kyle Johnson e61fbc4ba8 Bumped jQuery from 2.0.1 to 2.0.3 2013-10-01 08:39:02 -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 7e90d0f373 Added datetime picker support and implemented on events sidebar 2013-09-28 18:52:25 -04:00
Kyle Johnson 366a7c2541 Use a layout without a sidebar for the Config page 2013-09-27 20:51:34 -04:00
Kyle Johnson 983aece616 Consolidate the sidebar for Monitors and Events index. 2013-09-27 20:45: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 a37e2fc168 Adds fullscreen button to hide and show header, sidebar and footer 2013-09-27 17:45:52 -04:00
Kevin Crider 01b2617dd8 Fixes the fixed width bootstrap bug for containers 2013-09-27 17:37:48 -04:00
Kyle Johnson 1f02255413 Put the sidebar into a panel 2013-09-27 09:17:54 -04:00
Kyle Johnson e4a05f0ae0 Don't load the masonry JS 2013-09-27 08:42:06 -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 5f103b35a4 Load masonry on all pages 2013-09-24 11:21:27 -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 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
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 17b60bf25f Merge branch 'modern' of github.com:ZoneMinder/ZoneMinder into modern 2013-09-17 09:13:03 -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 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 180d879894 Display the ZM version in the footer of all pages. 2013-09-13 08:43:11 -04:00
Kyle Johnson 75acaea36e Open the monitor edit general tab by default 2013-09-11 15:29:18 -04:00
Kyle Johnson dfa2d37c4d Moved the daemonStatus to the header, from the footer 2013-09-11 10:17:10 -04:00
Kyle Johnson 6a65bef736 Display the system load and free disk space in the nav bar 2013-09-11 09:23:55 -04:00
Kyle Johnson 09a3b9e353 Convert the default layout to use Bootstrap 2013-09-10 20:17:44 -04:00
Kyle Johnson 9b22dae624 Adding the loading AJAX image to the header 2013-09-06 15:02:43 -04:00
Kyle Johnson c4283ad72e Adding some base HTML to make the ajax view work 2013-09-06 15:01:59 -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 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 26f99bf76b Adding jQuery UI 2013-05-29 17:46:07 -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
Kyle Johnson 13b7c4b04a Write cached scripts 2013-05-25 11:43:22 -04:00
Kyle Johnson aa72855b28 Added jQuery 2.0.1 file 2013-05-25 11:39:24 -04:00
Kyle Johnson c28a35ca31 Added a daemon status message to the footer of every page (whether or not ZM is running) 2013-05-17 09:03:30 -04:00
Kyle Johnson a6bcd78e6e Added a link to change the bandwidth 2013-05-06 19:53:38 -04:00
Kyle Johnson 69f9f446a8 Added Monitors, Events and Options index view to the header 2013-05-06 11:34:17 -04:00
Kyle Johnson 8322dc390f Initial commit of CakePHP 2.3.4 2013-05-01 06:58:31 -04:00