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
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
Isaac Connor
Isaac Connor
Andy Bauer
Isaac Connor
Kyle Johnson
Isaac Connor
root