Commit Graph

3050 Commits

Author SHA1 Message Date
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 b2ab1cea09 Initial commit of Version Controller and View 2013-09-13 08:55:46 -04:00
Kyle Johnson 2f99274c0a Initial commit of Version model 2013-09-13 08:44:21 -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 0437e6e5b6 Pass the zmVersion variable to all views 2013-09-13 08:42:55 -04:00
Kyle Johnson f0231a7d5f Added some styling to the logs table 2013-09-12 20:10:51 -04:00
Kyle Johnson 34b4ec0b94 Display elements properly for bootstrap. Also fixed element id's 2013-09-12 20:03:41 -04:00
Kyle Johnson d32bab4248 Use the Html, Form and Paginator helpers from BoostCake 2013-09-12 20:02:33 -04:00
Kyle Johnson e42afcd76a Load all available CakePHP plugins 2013-09-12 20:01:31 -04:00
Kyle Johnson e1ce213f04 Adding the BoostCake plugin 2013-09-12 20:00:57 -04:00
Richard Kojedzinszky 0f5c90bbe4 Rewritten the query to allow mysql to use indexes
On a system with heavy logging, without this the login procedure took
too long.
2013-09-12 22:46:26 +02:00
Kyle Johnson 75acaea36e Open the monitor edit general tab by default 2013-09-11 15:29:18 -04:00
Kyle Johnson 6dbd10621d Reworked to use Bootstrap tabs 2013-09-11 15:24:51 -04:00
Kyle Johnson e27a065039 Add the necessary class to allow these elements to display in tabs 2013-09-11 15:24:28 -04:00
Kyle Johnson cbf48a1d8f Use bootstrap tabs instead of jquery tabs 2013-09-11 15:09:43 -04:00
Kyle Johnson b18b38c486 Apply bootstrap theme to the events table 2013-09-11 15:08:41 -04:00
Kyle Johnson 9dfa3eb5af Rework the config index view to use bootstrap tabs 2013-09-11 15:08:07 -04:00
Kyle Johnson d33f32f6ce Moved the config indev view form to not enclose the tab list 2013-09-11 15:07:03 -04:00
Kyle Johnson c03c21895c Display a red or green alert, depending on daemon status 2013-09-11 10:37:18 -04:00
Kyle Johnson 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
Kyle Johnson dfa2d37c4d Moved the daemonStatus to the header, from the footer 2013-09-11 10:17:10 -04:00
Kyle Johnson 735f85a255 Renamed the thumb_width variable to be width as that is what my helper expects 2013-09-11 10:14:04 -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 dbba80fcbf Added a function in AppModel to check the free disk space in the events directory 2013-09-11 09:23:13 -04:00
Kyle Johnson 646b511cd4 Added a function in AppModel to check the System Load 2013-09-11 09:22:53 -04:00
Kyle Johnson c41810bbf1 Reworked the paginator number display to play nice with Bootstrap 2013-09-10 20:27:30 -04:00
Kyle Johnson fa3725d377 Put the sidebar into the Bootstrap sidebar 2013-09-10 20:19:03 -04:00
Kyle Johnson d9b6140bf8 Convert the Logs index view to use a bootstrap sidebar 2013-09-10 20:18:25 -04:00
Kyle Johnson 09a3b9e353 Convert the default layout to use Bootstrap 2013-09-10 20:17:44 -04:00
Kyle Johnson 88b8534efb Adding bootstrap CSS and JS files 2013-09-10 19:06:10 -04:00
Andy Bauer 0dd98ccdd1 Merge pull request #119 from knnniggett/zmupdate_zm.1.26.3
Update zmupdate.pl.in for 1.26.3 release
2013-09-10 11:16:10 -07:00
Andy Bauer 1d664f22ac exclude zm_update-1.26.3.sql since it has already been added 2013-09-10 13:14:16 -05:00
Andy Bauer 0bf9aacab2 Update zmupdate.pl.in for 1.26.3 release 2013-09-10 12:46:33 -05:00
Kyle Johnson 57ce1bed8d Adding the db/zm_update file so that the upgrade script works 2013-09-10 13:42:56 -04:00
mastertheknife a44bc63d29 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder into mybranch 2013-09-10 19:23:04 +03:00
Kyle Johnson 219f21a904 Bumping the version numbers. 2013-09-10 11:50:39 -04:00
mastertheknife 2b568906e5 Fixed greyscale four field deinterlacing not processing last line, broken ssse3 color->greyscale conversion and improved error handling when reading\decoding jpegs 2013-09-10 18:37:56 +03:00
Isaac Connor f8c4897031 put this back so we can get on with life 2013-09-10 08:52:59 -04:00
Kyle Johnson 64ec75b7a5 Updated AUTHORS to reflect recent changes to the project 2013-09-09 10:06:36 -04:00
mastertheknife c9cf31b271 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2013-09-09 17:04:02 +03:00
Kyle Johnson 45c32951b7 Point to the GitHub issues page for the list of current bugs 2013-09-09 09:45:29 -04:00
mastertheknife caa73f608b Merge remote-tracking branch 'origin/develop' 2013-09-09 16:44:58 +03:00
Isaac Connor 1b2b21d1bb rough in a quick script to help people generate the build files 2013-09-08 15:15:58 -04:00
Kyle Johnson 6c134f9b4b Merge pull request #116 from knnniggett/zmupdate_newrelease
Add 1.26.1 and 1.26.2 releases to zmupdate
2013-09-07 19:07:37 -07:00
Knniggett 0268389907 initial upload of files used to build rpm 2013-09-07 16:51:54 -05:00
Knniggett 8f3d95fd38 modify zmupdate.pl.in 2013-09-07 15:11:57 -05:00
Knniggett d4179035de Modify zmupdate for 1.26.1 and 1.26.2 releases 2013-09-07 15:08:09 -05: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