f22f3e9262
use a scaled svg and replace inline js
2020-07-13 14:51:07 -04:00
2db65d3821
Merge branch 'release-1.34'
2020-07-04 09:09:24 -04:00
697f117ecd
Make width of content 100% instead of 96%.
2020-07-02 17:22:34 -04:00
346fe63ef0
Add styles for inputs on monitor view
2020-06-30 19:19:17 -04:00
042086b565
Extend width of ControlDevice and Address to full width
2020-04-23 15:38:40 -04:00
571ff260cc
Merge branch 'release-1.34'
2020-04-04 16:35:09 -04:00
4547332fad
Move more styles into export.css. Remove content from dark/export.css and classic/export.css as it is duplicated.
2020-04-03 15:32:22 -04:00
b389f9660d
Merge branch 'fix_class_PTZ_presets_almost_invisible'
2020-02-24 13:17:09 -05:00
d0a8d241d2
Don't include controls.css twice if css is base. Don't use special styles for ptz buttons, so that they look like all the other buttons. Fixes #2849
2020-02-24 13:13:54 -05:00
d51fdafbc0
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-02-21 09:37:45 -05:00
7645196bdc
Extend width of ControlDevice and Address to full width
2020-02-21 09:30:31 -05:00
fc8f94c315
Merge branch 'master' into improve_filter_emails
2020-02-17 16:42:44 -05:00
42b3bb6a53
increase width of google sitekey and secret key inputs to 100%
2020-02-04 16:40:52 -05:00
f4b5f5f399
style the new Email content fields
2020-01-22 14:04:23 -05:00
158e26bb25
split long lines
2020-01-03 15:58:02 -05:00
c4aaa33bea
add widths for number inputs on controlcap view
2020-01-03 15:57:51 -05:00
34354f5871
Add Notes field to monitors to store random info in. Bump version to 1.33.16. use htmlSElect for savejpegs. Move storage area under Storage tab.
2019-12-18 12:13:00 -05:00
9f49e4f367
make Mark column text-align left so that checkboxes line up
2019-12-02 15:07:35 -05:00
2713565c84
using bootstrap layout instead of a table, so text-align: right
2019-12-02 13:34:53 -05:00
80d0d037b5
add a style for inline form not supported by bootstrap 3
2019-12-02 13:34:11 -05:00
18c13c4bad
Make chosen dropdowns 100% width on monitor edit
2019-11-01 13:40:55 -04:00
daf71aa492
improvements to layout on zones and zone
2019-10-29 18:06:03 -04:00
417123019c
fix crumbs
2019-10-23 09:52:36 -04:00
77118d55b2
add 4CIF aspect ratio padding. Fixes #2738
2019-10-23 09:50:49 -04:00
a6a61b75b9
update ptz css in classic
2019-10-18 13:52:34 -04:00
c15e8eebb2
Make PTZ presets fill the entire window width and fix other visual problems with the buttons
2019-10-08 18:48:37 -04:00
f3f972359b
increase width of Zoom, White, Iris controls to fit wider button
2019-10-08 18:28:02 -04:00
7271151eb0
add some more aspect ratios
2019-09-28 15:16:25 -04:00
393f0a369c
Revamp timeline. Make it handle being full browser width. remove onclicks.
2019-09-28 14:23:23 -04:00
d4435368bc
fix spacing between presets and home/set
2019-09-19 14:57:48 -04:00
14e625b775
Set width of dimensions
2019-09-19 14:56:55 -04:00
cd883e23b8
Extend inputs to full width on storage popup
2019-08-26 20:45:20 -04:00
239c68dd7f
add .. to fix #2686
2019-08-19 08:58:52 -04:00
d972ab6006
add min_section_length test to alarmed events that go unalarmed
2019-06-27 21:50:12 -04:00
d5b29923a4
add a.disabled css style
2019-05-24 14:51:39 -04:00
923f798e69
css classess for text that disappear
2019-05-17 09:32:23 -04:00
164a2d4d70
Fix image path ( #2576 )
...
Change the path of the "center.png" image from skins/classic/graphics/graphics/center.png to skins/classic/graphics/center.png.
Note that the `graphics/` directory was previously duplicated.
2019-04-14 15:41:58 -04:00
0a7667f2d0
Use buttons instead of divs and inputs ( #2522 )
2019-02-22 09:23:06 -05:00
b2a97ee190
frame.php: Fix multiple XSS from 'show' and 'scale' parameters and enforce CSP.
...
Fixes #2448 , fixes #2449 , and fixes #2447 .
2019-02-09 15:10:45 -08:00
c1e4fbac6a
extend input path and options to the full width of the popup
2019-01-09 12:37:42 -05:00
ffa37d8c10
Fix margins on replayControl
2019-01-08 13:12:35 -05:00
fe5cb4bfdc
Merge pull request #2283 from connortechnology/warn_colour_when_disabled
...
Use a warning colour when motion detection is disabled.
2018-12-11 09:36:07 -06:00
9ffd77428a
fix paths to jquery-ui-theme components, thereby upgrading them to the proper version. This fixes the datetime filters not being shown on skins that don't specify a custom theme for jquery-ui
2018-12-05 09:05:10 -05:00
94d8e043ce
Fix unreadable input text when OS theme dark ( #2324 )
...
* Update skin.css
* Update skin.css
2018-11-27 18:25:05 -05:00
f95379742b
Use a warning colour when motion detection is disabled.
2018-10-30 12:04:05 -04:00
23fd5db5c8
fix #2265 extra graphics in url
2018-10-19 10:06:51 -04:00
8f0fb0843a
Add Privacy Statement ( #2194 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* create and load default.php
* fix typos
* fix erroneous copy/paste
2018-08-30 13:25:02 -04:00
15a6eb7e78
Revert "Add Privacy Statement ( #2176 )" ( #2179 )
...
This reverts commit 56f4d768c2
2018-08-13 15:33:43 -04:00
56f4d768c2
Add Privacy Statement ( #2176 )
...
* initial implementation of privacy popup
* split the privacy text and run it through translate
* change style of toggle button, validate the form
* fix copy/paste error
* fix typos
* display privacy view inline rather than popup
* display privacy inline if show_privacy flag set
* redirect to console after selection is made
* typo
* css formatting
* update privacy verbiage
* push privacy text to all language files
2018-08-13 15:23:44 -04:00
fd5cf07bfb
Make server name and hostname full width.
2018-07-09 10:48:14 -04:00
aa055c147b
classic skin - fix dvr control buttons
...
The buttons were being drawn too small which cropped the symbols inside the buttons. Deleting the classic-skin-specific override of the css file allows the default css to apply which looks good to me.
2018-06-07 14:32:36 -05:00
4e7bf6efe7
remove duplicated css for watch view in dark skin
2018-05-02 11:39:16 -04:00
2aa689a14a
Use a class instead of an id for consoleTable
2018-04-19 14:20:02 -04:00
10a191ae5b
add event_disk_space to storage to differentiate between real used space versus event used disk space. Use this in the navbar to show actual disk use and also event disk use
2018-04-17 14:14:40 -07:00
489f11bd07
empty contents of zone.css because it is no different from base.
2018-04-03 21:18:29 -04:00
6a8084652e
add min width to Status Filter
2018-04-03 12:31:12 -07:00
1f29fc601e
add Function Filter min width
2018-04-03 10:38:22 -07:00
f790306990
added account icon
2018-03-25 16:18:50 -04:00
980684a2f0
adjusted h1 size
2018-03-25 16:09:31 -04:00
cc2f285408
log view tweaks, cleaned up header issues
2018-03-25 16:01:04 -04:00
1179b6ddc4
rounded top for tables and highlights
2018-03-25 11:43:34 -04:00
bf57b65ebb
reduced 2nd row of navbar text
2018-03-25 09:56:41 -04:00
14f638e009
replaced ionic fonts with material design icons
2018-03-25 09:28:00 -04:00
acdc076b84
padding to navbutton
2018-03-24 18:36:10 -04:00
0b31cc4d3d
2nd level header tweak
2018-03-24 17:34:46 -04:00
140217bef6
icons, muted colors, text tightening
2018-03-24 09:59:39 -04:00
7abe7d6fe3
fix centering in buttons
2018-02-11 14:18:26 -05:00
08c359fdbc
add some margin to minTime and maxtime
2018-02-09 07:31:30 -08:00
6ee133bf6b
give some left margin on labels
2018-02-09 07:30:43 -08:00
c454d5355d
adjust column width on console
2018-02-09 07:30:32 -08:00
f987bde6df
fix styles on montagereview. Mostly remove borders and make timelineDiv 100%
2018-02-08 09:28:52 -08:00
f6bb3017ef
Use absolute patch to point-g.png. Makes the assumption that /zm always works.
2018-02-08 07:49:52 -05:00
515af57c56
Fix some styles on filter edit
2018-02-02 13:24:01 -05:00
c04fcfb239
Need a few more pixels of width to fit all preset buttons
2018-01-22 15:50:18 +01:00
b013da6b95
Fix ptz controls. Something has changed in the way the Event object works, but we don't actually need it.
2018-01-11 13:14:11 -05:00
6a36db0b6d
move flat skin to base.
2018-01-11 12:24:53 -05:00
148e21d707
fugro
2017-12-21 21:46:21 -05:00
a6b136ed40
dark theme fixes
...
Overrides bootstrap input colors for dark theme and more chosen
2017-12-18 09:50:08 -05:00
de6ebfc341
Remove chosen from some filter dropdowns and restyle to match
2017-12-17 22:04:10 -05:00
6ffa96dea3
Add chosen to filters
2017-12-16 23:10:20 -05:00
a091153929
Use seperate structure and theme jquery ui
2017-12-16 20:04:12 -05:00
2e56210007
Fix row highlighting
2017-12-15 22:56:49 -05:00
f8da9a1c1b
Cleanup filter appearance
...
Tighten up fields and reduce jumping when adding terms.
2017-12-15 08:47:01 -05:00
1e412af902
Fix float overlap
...
Avoid explicitly setting some heights, add clear float
2017-12-10 09:37:16 -05:00
6974c847e5
Fix controlcss
...
Missing viewCssFileExtra
2017-12-10 09:37:16 -05:00
ef1af9cc15
disable FilterComponent as it doesn't actually do anything. Add Groups join when needed
2017-12-09 14:03:42 -05:00
bd73e7c2e2
Merge branch 'robots' into storageareas
2017-12-07 10:31:25 -05:00
11a5a47826
Fix missing popups and styles
2017-12-06 09:42:58 -05:00
b8660e95c9
Dark theme options menu fixes
...
Override bootstrap to match dark theme
2017-12-05 21:01:17 -05:00
f47f1a89ea
Fix btn-primary css to match current themes
2017-12-05 21:01:16 -05:00
f8d3c07586
Add h264 event view functionality and new feature alarmCues ( #2012 )
...
* Fix nearEventsQuery
Removed dbEscape from getNearEvents previous event because it only returns 0. Now matches next. Changed getEventDefaultVideoPath function to return a web path rather than the absolute path based on ic0ns branch. Also added start times to allow for videoJS replaymode.
* Unescape filters
Filters need to be unescaped
* Add initial values to page load
* Add replay modes to videojs
* rough in figuring out a frame in between bulk frames
* Add alarmCues
Add a graphical indication of where alarm frames happened in an event. Similar to what zmNinja shows.
* Add remaining buttons to videojs
Functionality for all buttons on videojs streams. FF/RW buttons show as active when they are active.
* Whitespace and fix Bulkframe calcs
* Fix zms events trying to generate with mp4 code
ZMS events would attempt to generate frames as though they were an mp4/passthrough type because the full eventpath wasn't passed
* ZMS scrub bar
Move zms scrub bar to bottom of image feed. Make it simpler and more like videojs style.
* Wrap event feeds properly
* Fix dvrControls on watch view
* Add scaleToFit
Add a scaleToFit option to event view
* Add navigation for videoJS streams
Disables nav buttons at beginning and end of events. Handles switching from zms to videojs. If zms crashes changes next event function to reload page instead of ajax.
* Add scaleToFit to watch and frame view
Adds scaleToFit to watch view. Since frame view uses the watch cookie this required changes to frame view
* Add transition to zoom
* Change stills view to match stream
Move stills slider bar to match scrub bar on streams. Allow it to resize, make it larger. Add alarmcues.
* Add Stills for every event
Add stills for every event. Match size to stream size
* Progressbox transitions
2017-12-04 21:26:59 -05:00
03ad4898d9
Fix montage monitors jumping on alert ( #2013 )
...
The alert class from bootstrap was not overriden on monitors in montage.
2017-12-04 21:25:56 -05:00
9ca19b003f
Add download button to montagereview
2017-12-03 14:42:09 -05:00
66d6e1a4a4
Add header to watch
2017-12-02 12:28:06 -05:00
539172b769
remove top margin from header
2017-12-02 12:28:06 -05:00
898c9e7473
Add bottom border to dark and classic header
2017-12-02 12:28:06 -05:00
58159963fa
Fix back on timeline view
2017-12-02 12:28:05 -05:00
064ce99eac
Scalecontrol in wrong place
2017-12-02 12:28:05 -05:00
bf5c928e38
Event view compress header
...
Combine all three lines of event view to 2.
2017-12-02 12:28:05 -05:00
50d5a8991d
Events header
...
Moved all non-event links to the header
2017-12-02 12:28:05 -05:00
Isaac Connor
Pliable Pixels
andornaut
Isaac Connor
Matthew Noorenberghe
Andrew Bauer
Elmar Pruesse
Isaac Connor
Isaac Connor
Isaac
digital-gnome