Commit Graph

388 Commits

Author SHA1 Message Date
Isaac Connor 4b92a788f7 fix filter execute 2017-11-24 15:37:50 -05:00
Isaac Connor 7e3328fbb8 add styles to the html5 button element 2017-11-24 09:36:45 -05:00
Isaac Connor 8b49a475d4 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2017-11-21 19:55:48 -05:00
Isaac Connor 489d3ba6ed Merge ../ZoneMinder.master into storageareas 2017-11-21 12:23:17 -05:00
digital-gnome e14c21fdbe Fix dark theme archive highlight
Another bad copy
2017-11-21 10:37:09 -05:00
digital-gnome 5f0d1b4720 Fix bad copy 2017-11-21 10:28:27 -05:00
digital-gnome ff7e104f1b
Merge fix
This editor is fun!
2017-11-20 20:42:28 -05:00
Isaac Connor 6eb542f0e2
Merge branch 'storageareas' into LookandFeel 2017-11-20 20:19:27 -05:00
Isaac Connor 12b47cbfe4
Merge pull request #51 from digital-gnome/storageareasFixes
Minor UI fixes
2017-11-20 20:15:32 -05:00
digital-gnome b58efe6a36 Fix classic/dark dvr buttons centering 2017-11-20 09:45:14 -05:00
digital-gnome 73d6b0e198 Fix sidebar in dark theme
Sidebar in dark theme had a scrollbar when main content was shorter than menu content
2017-11-19 09:14:19 -05:00
digital-gnome 84403f18a0 Revert dvrControls to class
Since dvrControls only occurs once now we can leave it as id.
2017-11-17 12:46:08 -05:00
Isaac Connor 1686584908 more cppcheck fixes 2017-11-16 09:19:27 -05:00
digital-gnome 1b6992ea6b Fix stills
Event stills fits on the page without a phantom scroll.  Still image is scaled to fit the window instead of being full event size.
2017-11-11 14:49:43 -05:00
digital-gnome 0c59c5ba88 Fix databar jumping
dataBar items would jump around when navigating between events dues to automatic spacing and different string lengths.  This locks them in place and should allow for most reasonable event sizes.
2017-11-11 14:49:42 -05:00
digital-gnome 1007add771 add row highlighting
Both other css sets have this
2017-11-11 14:49:42 -05:00
digital-gnome ab87848899 Add visual cue to archived events
The asterisk didn't do it for me.  Added a faint cast to the row.
2017-11-11 14:49:42 -05:00
Isaac Connor 57a53f6fdd spacing and fixes 2017-11-09 15:03:23 -05:00
Isaac Connor 445fbb06d6 clearFix so that #monitors actually has a height 2017-11-01 11:52:59 -04:00
digital-gnome f2f2aa8720 Replay improvement and overlays 2017-10-21 22:14:46 -04:00
Isaac Connor 92ff3d9606 Tidy up 2017-10-17 11:50:47 -04:00
digital-gnome 3a4a7ada41 progressBar conversion
Convert progressBar to jquery and imporove granularity and performance
2017-10-15 16:46:57 -04:00
digital-gnome 590639039a height 100 causing phantom scroll
Fixes phantom scrollbar in flat skin
2017-10-13 09:01:13 -04:00
digital-gnome 067f8a8089 replayAll fixes
replayAll now handles end of events gracefully.  Fixed bug where back to back continuous events or events that overlap would cause it to try to countdown all of epoch time.
2017-10-11 20:24:39 -04:00
Andrew Bauer e825e5d61e initial commit to change color of web console systemstats (#1981)
* initial commit to change color of web console systemstats

* use css classes
2017-10-07 18:42:39 -04:00
Isaac Connor d4cf84f7e6 Merge pull request #24 from digital-gnome/storageareas-featureAlarmCues
Storageareas feature alarm cues
2017-10-07 12:50:37 -04:00
digital-gnome ea4b9486aa alarmCues CSS
also function.php to load new vjs override file
2017-10-04 11:09:22 -04:00
Isaac Connor c46769495b Merge pull request #22 from digital-gnome/storageareas-navigation
Storageareas navigation
2017-10-03 10:18:44 -04:00
digital-gnome 33a3e04f43 Fix class selector 2017-10-02 15:40:18 -04:00
Isaac Connor 15ba7d2a35 fixes 2017-10-02 11:25:51 -04:00
digital-gnome e339b9e12a Merge branch 'storageareas-Navigationfix' into storageareas-navigation 2017-09-30 15:09:32 -04:00
Isaac Connor 4be133ed09 remove btn styles from buttons. make groups, cycle, montage, montage review non-popups. Add datetime filters to montagereview. Fix dark skin 2017-09-30 14:19:32 -04:00
digital-gnome 5f42bf4fe5 Change CSS to class, add class to php
I needed the styling for the video.js buttons.  The fallback mjpeg player used ids.
2017-09-29 21:47:52 -04:00
Isaac Connor 676c4b7ddc Merge branch 'master' into storageareas 2017-08-22 09:52:14 -04:00
peruchi d71b30aff3 Images Gif to PNG (#1969)
* Images Gif to PNG

Extension change to PNG

* Images Gif to PNG

Extension change to PNG

* Images Gif to PNG

Extension change to PNG
2017-08-16 14:51:20 -04:00
Isaac Connor 0e54d4e69a imposing a height on the textpanel causes the text to overflow 2017-07-14 09:26:56 -04:00
Isaac Connor 148d7066f9 Merge branch 'master' into storageareas 2017-07-11 16:15:02 -04:00
Isaac Connor 90882edc31 make montage images be display: block; This makes the layout not jump around when a camera feed dies 2017-07-07 10:05:20 -04:00
Isaac Connor 2dd8b5df1f in dark and flat, the buttons use a larger font. The fixed size is not appropriate 2017-07-07 09:59:41 -04:00
Isaac Connor 39745e49d4 I think we switch to border-box model or something, anyways, the box that the pantilt buttons go in needs to be 100px not 96px 2017-07-07 09:51:51 -04:00
Isaac Connor 75c11431e6 deprecate filtersavepopup 2017-06-16 11:10:25 -04:00
Isaac Connor 9f301e3c51 Merge branch 'log_no_truncate' into storageareas 2017-06-14 10:18:27 -04:00
Isaac Connor ce6a6a41a8 fix gif->png and the path for arrow-s-u and arrow-s-d 2017-06-14 09:34:03 -04:00
Isaac Connor b4bdc1fd6b Merge branch 'master' into dragndrop_monitor_sorting 2017-06-06 20:39:58 -04:00
Isaac Connor 04aa01ba0c add login css files 2017-06-05 21:41:39 -04:00
Isaac Connor c71a4fd690 fix spacing 2017-06-05 15:36:37 -04:00
Isaac Connor 2a45cd02ca sync some missing styles from classic 2017-06-05 12:49:39 -04:00
Isaac Connor 0e643f0f93 Merge branch 'master' into storageareas 2017-05-30 11:58:38 -04:00
Isaac Connor a75488e0f3 flat and dark skins add some padding to the header, which makes it extend beyond 99%. These lines are not needed 2017-05-30 11:52:04 -04:00
Isaac Connor 7cfa0b12ec Merge branch 'dragndrop_monitor_sorting' into storageareas 2017-05-25 15:26:04 -04:00
Isaac Connor 09c0b47568 remove no longer used styles, and increase the width of the Mark Column to accomodate the up/down arrows 2017-05-25 15:02:30 -04:00
Isaac Connor f4008e2c6a Merge branch 'master' into storageareas 2017-05-19 11:20:33 -04:00
Isaac Connor 75ca52dba5 fix width of plus and minus buttons in filters 2017-05-19 10:18:52 -04:00
Isaac Connor 96051a0071 we switched to .png instead of .gif 2017-05-18 13:50:46 -04:00
Isaac Connor e15fdf9ac3 We switched to png's now 2017-05-18 13:18:07 -04:00
Isaac Connor c859f7291c Feature h264 videostorage (#1882)
* Moved writing of configure options from Controller to Model.  Fixes #191.

* Initial commit for saving events as videos :)

* Add zm_video.cpp to autotools

* Add zm_video.h to autotools

* Search for MP4V2 header file 3 times: mp4v2/mp4v2.h, mp4v2.h, mp4.h

* Fix serve memory leak

* Few minor code improvements

* Added the ability to override preset, tune, profile and few other improvements

* Correctly write SPS & PPS from x264 encoder headers

* Remove unnessecary SPS & PPS writing code

* Imported missing files from master to feature-h264-videostorage

* Audio support including fixes for dts/pts, split on keyframe and update to mkv extension to prevent ffmpeg problems writing rtsp audio to mp4 containter (header problem)

* Updates to make gcc happy

* Add html5 video control to timeline and event to support mkv playback

* Add zm_videostore.cpp to CMakeLists.txt

* Remove Modern Branch for now

* Fix minor bug

* Option handled added in master, removing duplicate declaration

* Add CaptureandRecord from zm_camera.h

* Putting placeholder in for CaptureAndRecord function

* Removed duplicate code and brackets

* add digest auth file for cmake

Conflicts:
	src/CMakeLists.txt

* Add web dir back into Makefile.am
Revert "Removed web from SUBDIRS in Makefile.am"

This reverts commit d9bbcdf3a9.

* Add CaptureAndRecord to vlc, still need to make it record

* Resolve SegFault on videostore

* Swap to mp4 container

* mp4 changes

* spaces to tabs, hide video stuff if video writer is turned off

* Make timeline open event.mp4 instead of mkv

* Missed mkv in timeline.js

* Fix some issues from the merge conflict

* Resolve post merge build issues with braces

* Fix whitespace

* Update Jpeg and Video options for passthrough options

* Whitespace fix zm_camera.h

* Fix array mkssing comma

* Add support for Jpeg save options for h264 branch snapshot. Might remove altogether if snapshots not needed

* Update VideoStoreData memory size comment

* Change from config.use_mkv_storage to per monitor option VideoWriter from video branch

* Fix bracket issues post merge

* Clean up comments and add av_free_packet

* Convert from event_directory to event file as per Video branch

* Testing videojs for video playback

* Fixed a missing bracket post merge and also SQL_values now used for EventID and Monitors

* bring recent improvements in ffmpeg capture function into captureandrecord

* Remove pict from writeAudioFramePacket as not used

* Add translate options for h264 Storage options in Monitor and update en_gb file

* Cherry-Pick from iconnor - make it compile on ubuntu 15.04.  Which is libav 56.1.0

Conflicts:
	src/zm_ffmpeg.cpp
	src/zm_remote_camera_rtsp.cpp

Conflicts:
	distros/ubuntu1204/changelog

* Clean up videostore code and remove lots of unused code

* proof of concept for dynamic/automatic video rotation using video-js plugin zoomrotate

Conflicts:
	web/skins/classic/views/event.php

* removed redundant field in sql query

Conflicts:
	web/skins/classic/views/event.php

* local storage of video js plugin

* Beautify!

Make the code somewhat readable.

* added missing videojs.zoomrotate.js file

added missing videojs.zoomrotate.js file

* Typo

added missing "

* Added missing brackets

* fix to display thumbnails when only storing snapshot.jpg

* added control for video playback rate

Conflicts:
	web/skins/classic/views/event.php

* dynamically create jpegs from video file for viewing in browser

* fix timeline view for SaveJPEGs monitors (without enabled VideoWriter)

* only expose monitor info which are being used in client

* fix segmentation fault in zma with ubuntu 14.04 and ffmpeg 2.5.8 (gcc 4.8)

when libx264 is not installed

* better way of detecting showing image or video in timeline and event view

instead of Monitor.VideoWriter, Event.DefaultVideo is used, so even if
VideoWriter/SaveJPEG option is changed, a valid image or video will always be
displayed for historical events in both timeline and event view

this also fixes loading videos in timeline view

* Fixes problem of crashing zmc when bad packet arrives causing av_interleaved_write_frame() to return non-zero (-22).  Prefilters common packet issues. Add metadata title to generated video file

* Remove syslog.h

* fixed SaveJPEGs are not working

which is caused in errors introduced when merging with master

* Update README.md

* Fix build warnings specific to h264 branch, unused FrameImg, unused ret and int64_t snprintf issues

* Fix PRId64 issue in travis, builds locally fine, but I can see a gcc version issue here

* Fix PRId64 issue in travis, another try

* Try "STDC_FORMAT_MACROS" to see if that helps Travis on gcc 4.6.3

* Revert space removal around PRId64

* video branch ffmpeg 2.9 fixes

ffmpeg 2.9 patched removed SSE2 CPU

* Add FFMPEGInit back

* use webvvt to overlay timestamp (honoring Monitor.LabelFormat) to videos in timeline and event

also fixed bug which prevented seeking in timeline video preview

* ffmpeg 3.0 API build failure fixes

* Update README.md

* merge all the commits from the messed up iconnor_video branch

* fix whitespace

* revert

* whitespace fixes

* spelling fix

* put back some text

* add these back

* fix spelling mistake

* Steal some packet dumping routines from ffmpeg. Convert them to use our logging routines

* add a test and error message if the codec is not h264

* these have been removed in master

* add a view to check auth and just send the video

* add some comments, and dump filename and AVFormatContext on failure to write header

* add the toggle for RecordAudio so that the checkbox works to turn off Audio

* Must init videoStore in constuctor

* more debug and comments, return checking

* Fix dropped part of sql query.

* fix extra else and some whitespace

* Fix missing } from merge that was preventing building.

* fix tabs

* get rid of use of separator, just use \n

* Restore lost fixes for deprecation

* Why are these failing

* Respect record_audio flag when setting up video file so dont try and initiliase mp4 with unsupported audio

* Forgot that I was trying to solve case of stream is true and record_audio
is false.

* Pass swscale_ctx back in to getCachedContext or it will create new
context every frame and leak memory like a mofo.

* Add libx264-dev and libmp4v2-dev to build requires to save hassle of
ensuring they are installed before build.

* Merge my Rotation/Orientation work and fixes for bad h264 streams

* need arpa/inet for reverse lookups

* pull in the new byte range code for viewing videos

* Move our recording flag deeper into closeevent

* add braces and only call closeEvent if there is an event

* deprecate the z_frame_rate stuff which is deprecated in ffmpeg

* remark out some debugging

* fix for video on stream 1

* fix audio_stream to audio_st

* Ignore bad decodes

* fix problems with content-length causing viewing to not work in chrome/android

* change logic of sending file contents to handle an off by one and be more readable

* Some fixes pointed out by Maxim Romanov.  Also simply the loading of events to not join the Monitors table

* fix to sql for timeline

* added RecordAudio to sql in README

* Use sub queries instead of joins to fix errors when using new mysql defaults.

* fix sql queries

* Dockerfile to build feature-h264-videostorage

* Must cast codec

* add php-acpu as a dependency

* require php5-acpu

* fix typo

* remove extra /

* Add a line for out-of-tree builds to do api/lib/Cake/bootstrap.php

* delete merge conflict files

* delete merge conflict files
2017-05-15 22:02:48 -04:00
Isaac Connor deb1cf653a fix dimensions of ptz box 2017-05-05 16:47:21 -04:00
Isaac Connor df7161a4ea merge some stuff I did in vueip 2017-04-28 10:54:20 -04:00
Isaac Connor 5a2ef571ef fix scaling, zones now work. Add a Show/Hide Zones at the top 2017-04-24 14:47:30 -04:00
Isaac Connor ef6c675c6a work in progress, rough in adding the svg zones to montage 2017-04-24 11:11:44 -04:00
Isaac Connor dd4550406f remove styles from montagereview and stick them in a view-specific css 2017-03-30 13:03:46 -04:00
Isaac Connor 4df12ae370 Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height 2017-03-06 17:30:00 -05:00
Isaac Connor aeedfe8d74 fix some whitespacing 2017-02-14 09:11:54 -05:00
Isaac Connor e3edbf40cf make url full width 2017-02-02 12:16:40 -05:00
Isaac Connor d8c79cb750 fixup header and sidebar layout 2017-02-02 11:31:16 -05:00
Isaac Connor 7d451e1e41 float the scale control right, add css for other skins 2017-01-31 11:13:16 -05:00
Isaac Connor 4a4f62f0a7 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2017-01-31 11:13:16 -05:00
Isaac Connor 6f6eacaa72 fixup classic and dark skins 2017-01-30 21:45:48 -05:00
Isaac Connor f3378207c0 make navbar static instead of fixed, sync up dark theme, and improve storage editing styles 2017-01-30 21:16:21 -05:00
Isaac Connor 35148008b6 make img an inline-block so that it continues having space, even when is a broken link 2017-01-18 21:14:15 -05:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 4fe6b6f8b7 set a min width so that small images or fps updates don't cause a reflow 2016-11-21 11:39:31 -05:00
Isaac Connor 2bd080a6a6 Merge branch 'master' into storageareas 2016-11-15 08:41:00 -05:00
Kyle Johnson 0800a69a57 Show error message upon unsuccessful login. Fixes #1648
* Includes bootstrap glyphicons as they're used in the error message.
 * Failure check is done via a simple test in login.js.php and login.js.
   The 'view' param will only be set (to 'postlogin') if the login page
   has refreshed due to a failed login.  Otherwise you're directed to
   the console view.
2016-11-10 22:51:32 -07:00
Kyle Johnson 227b196a2e Move inline Login css to css file 2016-11-10 21:48:42 -07:00
Isaac Connor 340b172dc4 Merge branch 'add_scale_to_frame_view' into storageareas 2016-10-26 14:46:50 -04:00
Isaac Connor 42783b68f9 float the scale control right, add css for other skins 2016-10-26 14:43:23 -04:00
Isaac Connor 4defad1352 Merge branch 'add_scale_to_frame_view' into storageareas 2016-10-26 14:04:43 -04:00
Isaac Connor c74cc54ac0 add a scale element to the frame view. Include some bits from StorageAreas to make it work 2016-10-26 13:34:30 -04:00
Isaac Connor ba7d935a85 fix border size of text below the image in montage when alerted. 2016-10-12 12:19:04 -04:00
Isaac Connor 6a0c6cd4f2 Merge branch 'show_other_zones' into storageareas 2016-08-02 13:54:01 -04:00
Isaac Connor 8093470a2e make only the editing polygon have a border. Set default for Type when creating a new zone 2016-08-02 12:19:55 -04:00
Isaac Connor 060988c05c set margin and padding on montage.alert and imageFeed.alert because bootstrap declares a generic .alert style with large margins and padding 2016-05-31 16:02:37 -04:00
Isaac Connor e28cb5b412 fix body padding 2016-05-16 13:29:13 -04:00
Isaac Connor 1ce2e597cf fix body top padding 2016-05-12 20:00:37 -04:00
Isaac Connor 2144cb7de6 fix body padding only for console and options 2016-05-12 10:45:13 -04:00
Isaac Connor e9d8b7925a Merge branch 'db_reconnect' into storageareas 2016-05-10 11:13:09 -04:00
Isaac Connor e4171855bb add padding for nabar to body 2016-05-07 18:12:31 -04:00
Isaac Connor dcdefac48a fix styles in header, move footer back into header 2016-05-06 16:08:32 -04:00
Isaac Connor 2ccefdb23c Merge branch 'iconnor-updated-console' into storageareas 2016-05-06 15:30:25 -04:00
Isaac Connor f4df9e053d port sidebar css over from classic to flat 2016-05-06 15:30:10 -04:00
Isaac Connor 4defe92911 Merge branch 'master' into updated-console 2016-05-03 14:22:37 -04:00
Isaac Connor 516bacdfd3 Merge branch 'updated-console' into storageareas 2016-05-03 13:38:57 -04:00
Kyle Johnson b4d8bc6a52 Change sidebar to lighter colors 2016-04-24 13:51:48 -04:00
root 479ea17ed5 fix event menubars 2016-04-16 15:13:18 -04:00
Isaac Connor 2b05815bfa remove set height on the menu bars, fixing flow issues 2016-04-15 15:44:35 -04:00
Isaac Connor 498bceae0a remove styles for svg circles 2016-04-08 13:44:20 -04:00
Isaac Connor 22f207602b add css for the svg zones 2016-04-08 13:43:00 -04:00
Isaac Connor 11981efad2 add this back 2016-04-08 13:20:26 -04:00
Isaac Connor 34bfbb4708 blah 2016-04-08 13:18:13 -04:00
Isaac Connor 60642c1fff Merge branch 'iconnor_video' into storageareas 2016-04-05 12:32:33 -04:00
Isaac Connor 238a25a302 Merge branch 'master' into iconnor_video 2016-04-05 09:38:59 -04:00
Isaac Connor 564f189416 Merge branch 'always_show_ptz' into storageareas 2016-04-04 16:45:54 -04:00
Isaac Connor f91ff4503a rework the ptz controls to take up less vertical space, also don't set width of buttons 2016-04-04 13:20:04 -04:00
Isaac Connor 197ae67313 Merge branch 'always_show_ptz' into storageareas 2016-04-04 11:47:29 -04:00
Isaac Connor 3e20e5f21c fix ptz control box size 2016-04-04 11:40:01 -04:00
Kyle Johnson f59ed9cf0d clean up options a bit more 2016-04-01 14:39:15 -04:00
Kyle Johnson 92e0552f8e Add side tab list to options page, and style it. 2016-04-01 14:02:19 -04:00
Isaac Connor c9a1a9020d Merge h264 2016-03-31 11:03:36 -04:00
Isaac Connor e5a36c02bd Merge remote-tracking branch 'origin/master' into video_remote 2016-03-30 16:55:24 -04:00
Kyle Johnson 6f409f0bf4 Make the ZM logo in header stand out 2016-03-15 23:53:29 -04:00
Kyle Johnson 897a0a995c Convert options layout to side-tabs, and improve readability 2016-03-15 15:21:28 -04:00
Kyle Johnson 87932002cf Push the options page down a bit to make tab look better 2016-03-15 14:45:40 -04:00
Kyle Johnson 183f58ad17 Restyle options view with horizontal form layout 2016-03-15 14:43:22 -04:00
Kyle Johnson 8acfe1b0d8 Update options styling 2016-03-12 22:44:11 -05:00
Kyle Johnson d202760d82 Additional footer padding 2016-03-12 20:37:07 -05:00
Kyle Johnson a2c2101c48 Remove extra #footer styling 2016-03-12 20:28:16 -05:00
Kyle Johnson f80cbf52df Bump up the default font size 2016-03-12 20:27:51 -05:00
SteveGilvarry 5ff427d9e9 Removed Autotools Makefile.am
Conflicts:
	Makefile.am
	misc/Makefile.am
	src/Makefile.am
	web/includes/Makefile.am
	web/js/Makefile.am
	web/skins/classic/css/classic/views/Makefile.am
	web/skins/classic/css/flat/views/Makefile.am
	web/skins/classic/views/Makefile.am
	web/skins/classic/views/js/Makefile.am
2016-02-26 22:19:02 +11:00
Isaac Connor d3755611c5 Merge pull request #1247 from bodegard/master
Corrected DB update version comments, fixed typos, and skin font modification
2016-02-04 11:54:02 -05:00
SteveGilvarry 7301e803ed Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
2016-01-30 15:45:08 +11:00
Brandon Odegard 54a11175ff Reduce default size of body font in Flat skin 2016-01-22 13:56:41 -06:00
Brandon Odegard 1ca9ace84d Fixed missing semicolons 2016-01-22 13:31:02 -06:00
Isaac Connor 53bd342f85 remove Google open Sans external import 2016-01-08 09:46:14 -05:00
SteveGilvarry d8494aba2d Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
Conflicts:
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_remote_camera_rtsp.h
	web/skins/classic/views/monitor.php
2015-10-23 22:07:22 +11:00
Isaac Connor cf5473836e set default border on live streams so that when they alarm they don't jump around 2015-10-02 10:04:56 -04:00
Dmitry Smirnov 333e7ec67b header typo corrections 2015-09-19 17:39:54 +10:00
Isaac Connor c60d1cbeca Merge pull request #1037 from pliablepixels/1036-flat-skin-grey-out-disabled-buttons
Grey color for disabled buttons
2015-08-25 12:50:50 -04:00
Pliable Pixels a6f296d84e Grey color for disabled buttons 2015-08-25 12:29:40 -04:00
Robin Daermann e390200824 Small dark CSS fixes in frames and timeline view 2015-08-17 14:39:41 +02:00
Robin Daermann 37e01b504b Implemented #989 (highlight current row in tables) for dark CSS 2015-08-05 14:36:07 +02:00
Dmitry Smirnov c4f78d634c CSS[skins/classic]: highlight current row in tables.
Signed-off-by: Dmitry Smirnov <onlyjob@member.fsf.org>
2015-08-05 10:43:02 +10:00
Robin Daermann 651cffd3b5 Small color corrections in tabList 2015-07-27 10:07:01 +02:00
Robin Daermann 5588406570 Add dark CSS for classic view 2015-07-27 09:53:59 +02:00
SteveGilvarry b3313edde0 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
Conflicts:
	web/skins/classic/views/event.php
2015-03-21 23:49:56 +11:00
Isaac Connor 1a17c820f2 Merge pull request #730 from ljack/master
Fix image and css import paths for style/skin named "flat"
2015-02-25 11:51:42 -05:00
ljack e9384d445a fix .upBtn and .downBtn also for "flat" css 2015-02-25 18:10:40 +02:00
ljack 8616fdb33d fix import path 2015-02-25 18:09:23 +02:00
ljack 6233432559 fix import path 2015-02-25 18:08:41 +02:00
ljack 48950f3f1c Update control.css
Update paths for .upBtn and .downBtn too
2015-02-25 09:24:19 +02:00
Isaac Connor c3f96ad8ca fix path to the zone point gif 2015-02-19 11:11:01 -05:00
SteveGilvarry 79c82ea880 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch 2015-02-17 23:16:42 +11:00
SteveGilvarry ada53bbb28 Testing videojs for video playback 2015-02-16 19:43:13 +11:00
Isaac Connor 2328ae8792 remove 50% width so that header auto-fits 2015-01-28 14:05:29 -05:00
SteveGilvarry b79c2c1604 Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
Conflicts:
	web/skins/classic/views/event.php
	web/skins/classic/views/timeline.php

Also reapplied required PHP Short Tags fix to a event.php and monitor.php that got impacted in merge.
2014-12-25 08:24:48 +10:00
Isaac Connor 5abc58ea14 Merge pull request #620 from SteveGilvarry/11-php-short-tags
Replace PHP Short Open Tags - Fixes #11

Works for me too.
2014-12-08 14:39:24 -05:00
Isaac Connor 2c1e4a9965 fix the paths so that the ptzControls are visible 2014-12-08 10:34:25 -05:00
SteveGilvarry e87e69fa57 Ran script to replace all Short open tags 2014-12-05 10:44:23 +11:00
SteveGilvarry bf33eab17c Merge branch 'video' into feature-h264-videostorage
Conflicts:
	src/CMakeLists.txt
	src/Makefile.am
	src/zm_event.cpp
	web/skins/classic/views/js/event.js
2014-12-02 20:58:35 +11:00
Isaac Connor f57f903aa6 Add views subdir 2014-12-01 16:10:01 -05:00
Isaac Connor fed12291be add flat to the subdirs 2014-12-01 15:57:44 -05:00
Isaac Connor 82c01479c6 move flat css files into the classic skin.
remove autotools references to the flat skin, add the classic/flat css dirs
remove the flat skin
2014-12-01 15:44:01 -05:00
Isaac Connor ebe602616b needs this one too 2014-11-26 14:30:53 -05:00
Isaac Connor a412799003 Move the skins/classic/views/css dir under skins/classic/css/classic/views and update Makefile.am's to match 2014-11-26 11:29:04 -05:00
Isaac Connor bf3ec7b490 Since the css files are in subdirectories now, thise just needs to reference them 2014-11-26 11:24:55 -05:00
Isaac Connor ebb31f12d2 Add lines to parse url ?css= commands and set a global variable to be used to determine which set of css files to use. 2014-11-26 11:23:06 -05:00
nagyrobi 2b0647a52c Update skin.css
Increased table width just a little bit, to prevent the longer foreign language translated strings to break window layouts.
2013-08-15 12:48:04 +02:00
Isaac Connor a468baf9eb cleanup 2013-05-10 13:55:45 -04:00
Kyle Johnson 2c04d0774f Reverting my web changes in develop - keeping them in modern 2013-05-02 10:20:06 -04:00
Kyle Johnson 1ed6462354 Removed all of the old web files 2013-05-01 06:52:43 -04:00
stan 4996dd0a51 Recreated generated files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3662 e3e1d417-86f3-4887-817a-d78f3d33393f
2012-07-04 09:46:18 +00:00
stan 1ce54fb0db Enabled alternate selections when a filter has been chosen. Improved
styles for debug entries in log.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3462 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-06-23 21:53:45 +00:00
stan 6ff385e407 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3459 e3e1d417-86f3-4887-817a-d78f3d33393f 2011-06-21 09:19:10 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 21:59:06 +00:00
stan 5203205680 Improved formatting of options and help.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3229 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-20 18:38:24 +00:00
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
stan dc9e2755b0 Added sample apache config file.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3218 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-03 23:27:58 +00:00
stan 70aee2ad56 Regenerated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3160 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:50:41 +00:00
stan 8cad0dbd6a Updated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2933 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-24 10:27:28 +00:00
stan 11a1cc2d41 Now supports custom perl install path
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2908 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-08 09:11:56 +00:00
stan 75c654e654 Downgraded to support autoconf 2.59
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2812 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-23 21:59:13 +00:00
stan 3069dc2402 Final timestamp update
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2802 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:45:32 +00:00
stan 429884741a Updated for timestamps
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2801 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-09 12:32:04 +00:00
stan e14efbd493 Updated generated files.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2726 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:24:01 +00:00
stan d43d2289ed Changes from updated build tools.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2714 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 14:54:50 +00:00
stan 549aa39cbb Updated autoconf/make files
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2710 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-06 00:05:56 +00:00
stan 7d96edeacd Added .in files to svn
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2681 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 12:14:50 +00:00
stan 106882c161 Updated copyright notices
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2612 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:48:16 +00:00
stan b1c61a9eac Made all but base point size proportional
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2590 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-22 16:23:49 +00:00
stan 03c66f87ef Fixed up tabs
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2574 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-18 14:53:44 +00:00
stan b78f172803 Removed further redundant classes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2562 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:42:50 +00:00
stan 1041bbc036 Eliminated bighead and smallhead classes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2561 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:32:37 +00:00
stan 37562208b6 Removed some redundant css definitions
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2556 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:17:26 +00:00
stan 336ce62c15 Reorganised PTZ controls and layout somewhat
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2553 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 13:15:28 +00:00
stan 5e4a953dcd Adjusted layout
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2540 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-16 08:41:37 +00:00
stan 95ac7dadb3 Fixed headerControl div positioning
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2523 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:04:45 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00