deb1cf653a
fix dimensions of ptz box
2017-05-05 16:47:21 -04:00
df7161a4ea
merge some stuff I did in vueip
2017-04-28 10:54:20 -04:00
5a2ef571ef
fix scaling, zones now work. Add a Show/Hide Zones at the top
2017-04-24 14:47:30 -04:00
ef6c675c6a
work in progress, rough in adding the svg zones to montage
2017-04-24 11:11:44 -04:00
dd4550406f
remove styles from montagereview and stick them in a view-specific css
2017-03-30 13:03:46 -04:00
4df12ae370
Merge branch 'montage_width_height' of github.com:ConnorTechnology/ZoneMinder into montage_width_height
2017-03-06 17:30:00 -05:00
aeedfe8d74
fix some whitespacing
2017-02-14 09:11:54 -05:00
e3edbf40cf
make url full width
2017-02-02 12:16:40 -05:00
d8c79cb750
fixup header and sidebar layout
2017-02-02 11:31:16 -05:00
7d451e1e41
float the scale control right, add css for other skins
2017-01-31 11:13:16 -05:00
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
6f6eacaa72
fixup classic and dark skins
2017-01-30 21:45:48 -05:00
f3378207c0
make navbar static instead of fixed, sync up dark theme, and improve storage editing styles
2017-01-30 21:16:21 -05:00
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
5ae34a7561
Merge branch 'master' into storageareas
2017-01-02 09:39:10 -05:00
254fcbcef7
update gpl 2 mailing address in source files
2016-12-26 09:23:16 -06:00
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
2bd080a6a6
Merge branch 'master' into storageareas
2016-11-15 08:41:00 -05:00
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
227b196a2e
Move inline Login css to css file
2016-11-10 21:48:42 -07:00
340b172dc4
Merge branch 'add_scale_to_frame_view' into storageareas
2016-10-26 14:46:50 -04:00
42783b68f9
float the scale control right, add css for other skins
2016-10-26 14:43:23 -04:00
4defad1352
Merge branch 'add_scale_to_frame_view' into storageareas
2016-10-26 14:04:43 -04:00
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
ba7d935a85
fix border size of text below the image in montage when alerted.
2016-10-12 12:19:04 -04:00
6a0c6cd4f2
Merge branch 'show_other_zones' into storageareas
2016-08-02 13:54:01 -04:00
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
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
e28cb5b412
fix body padding
2016-05-16 13:29:13 -04:00
1ce2e597cf
fix body top padding
2016-05-12 20:00:37 -04:00
2144cb7de6
fix body padding only for console and options
2016-05-12 10:45:13 -04:00
e9d8b7925a
Merge branch 'db_reconnect' into storageareas
2016-05-10 11:13:09 -04:00
e4171855bb
add padding for nabar to body
2016-05-07 18:12:31 -04:00
dcdefac48a
fix styles in header, move footer back into header
2016-05-06 16:08:32 -04:00
2ccefdb23c
Merge branch 'iconnor-updated-console' into storageareas
2016-05-06 15:30:25 -04:00
f4df9e053d
port sidebar css over from classic to flat
2016-05-06 15:30:10 -04:00
4defe92911
Merge branch 'master' into updated-console
2016-05-03 14:22:37 -04:00
516bacdfd3
Merge branch 'updated-console' into storageareas
2016-05-03 13:38:57 -04:00
b4d8bc6a52
Change sidebar to lighter colors
2016-04-24 13:51:48 -04:00
479ea17ed5
fix event menubars
2016-04-16 15:13:18 -04:00
2b05815bfa
remove set height on the menu bars, fixing flow issues
2016-04-15 15:44:35 -04:00
498bceae0a
remove styles for svg circles
2016-04-08 13:44:20 -04:00
22f207602b
add css for the svg zones
2016-04-08 13:43:00 -04:00
11981efad2
add this back
2016-04-08 13:20:26 -04:00
34bfbb4708
blah
2016-04-08 13:18:13 -04:00
60642c1fff
Merge branch 'iconnor_video' into storageareas
2016-04-05 12:32:33 -04:00
238a25a302
Merge branch 'master' into iconnor_video
2016-04-05 09:38:59 -04:00
564f189416
Merge branch 'always_show_ptz' into storageareas
2016-04-04 16:45:54 -04:00
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
197ae67313
Merge branch 'always_show_ptz' into storageareas
2016-04-04 11:47:29 -04:00
3e20e5f21c
fix ptz control box size
2016-04-04 11:40:01 -04:00
f59ed9cf0d
clean up options a bit more
2016-04-01 14:39:15 -04:00
92e0552f8e
Add side tab list to options page, and style it.
2016-04-01 14:02:19 -04:00
c9a1a9020d
Merge h264
2016-03-31 11:03:36 -04:00
e5a36c02bd
Merge remote-tracking branch 'origin/master' into video_remote
2016-03-30 16:55:24 -04:00
6f409f0bf4
Make the ZM logo in header stand out
2016-03-15 23:53:29 -04:00
897a0a995c
Convert options layout to side-tabs, and improve readability
2016-03-15 15:21:28 -04:00
87932002cf
Push the options page down a bit to make tab look better
2016-03-15 14:45:40 -04:00
183f58ad17
Restyle options view with horizontal form layout
2016-03-15 14:43:22 -04:00
8acfe1b0d8
Update options styling
2016-03-12 22:44:11 -05:00
d202760d82
Additional footer padding
2016-03-12 20:37:07 -05:00
a2c2101c48
Remove extra #footer styling
2016-03-12 20:28:16 -05:00
f80cbf52df
Bump up the default font size
2016-03-12 20:27:51 -05:00
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
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
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
54a11175ff
Reduce default size of body font in Flat skin
2016-01-22 13:56:41 -06:00
1ca9ace84d
Fixed missing semicolons
2016-01-22 13:31:02 -06:00
53bd342f85
remove Google open Sans external import
2016-01-08 09:46:14 -05:00
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
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
333e7ec67b
header typo corrections
2015-09-19 17:39:54 +10:00
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
a6f296d84e
Grey color for disabled buttons
2015-08-25 12:29:40 -04:00
e390200824
Small dark CSS fixes in frames and timeline view
2015-08-17 14:39:41 +02:00
37e01b504b
Implemented #989 (highlight current row in tables) for dark CSS
2015-08-05 14:36:07 +02:00
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
651cffd3b5
Small color corrections in tabList
2015-07-27 10:07:01 +02:00
5588406570
Add dark CSS for classic view
2015-07-27 09:53:59 +02:00
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
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
e9384d445a
fix .upBtn and .downBtn also for "flat" css
2015-02-25 18:10:40 +02:00
8616fdb33d
fix import path
2015-02-25 18:09:23 +02:00
6233432559
fix import path
2015-02-25 18:08:41 +02:00
48950f3f1c
Update control.css
...
Update paths for .upBtn and .downBtn too
2015-02-25 09:24:19 +02:00
c3f96ad8ca
fix path to the zone point gif
2015-02-19 11:11:01 -05:00
79c82ea880
Merge remote-tracking branch 'upstream/master' into Video-Highlander-Branch
2015-02-17 23:16:42 +11:00
ada53bbb28
Testing videojs for video playback
2015-02-16 19:43:13 +11:00
2328ae8792
remove 50% width so that header auto-fits
2015-01-28 14:05:29 -05:00
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
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
2c1e4a9965
fix the paths so that the ptzControls are visible
2014-12-08 10:34:25 -05:00
e87e69fa57
Ran script to replace all Short open tags
2014-12-05 10:44:23 +11:00
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
f57f903aa6
Add views subdir
2014-12-01 16:10:01 -05:00
fed12291be
add flat to the subdirs
2014-12-01 15:57:44 -05:00
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
ebe602616b
needs this one too
2014-11-26 14:30:53 -05:00
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
bf3ec7b490
Since the css files are in subdirectories now, thise just needs to reference them
2014-11-26 11:24:55 -05:00
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
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
a468baf9eb
cleanup
2013-05-10 13:55:45 -04:00
2c04d0774f
Reverting my web changes in develop - keeping them in modern
2013-05-02 10:20:06 -04:00
1ed6462354
Removed all of the old web files
2013-05-01 06:52:43 -04:00
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
Andy Bauer
Kyle Johnson
root
SteveGilvarry
Brandon Odegard
SteveGilvarry
Dmitry Smirnov
Pliable Pixels
Robin Daermann
ljack
nagyrobi
stan