Andrew Bauer
1c558b66e7
add font-awesome stylesheet
2020-08-15 15:44:54 -05:00
Andrew Bauer
45fde13535
rough in new events view
2020-08-15 15:27:58 -05:00
Isaac Connor
c674cb7b55
Move the dropdown id's to the a element where they should be. Remove duplicated id on storage_dropdown.
2020-08-13 12:39:51 -04:00
Andrew Bauer
15005a2f17
fix typo
2020-08-09 14:25:11 -05:00
Andrew Bauer
d0e7443a3c
rough in update reminder dropdown
2020-08-09 14:18:44 -05:00
Andrew Bauer
b22f12dadb
rough in new zmversion widget
2020-08-09 12:20:11 -05:00
Andrew Bauer
fd4b9ba4f4
move jquery in functions.php to skin.js
2020-08-08 12:06:57 -05:00
Andrew Bauer
96bd6397c6
eslint nanny
2020-08-08 10:38:58 -05:00
Andrew Bauer
3792043707
implement bw widget as dropdown
2020-08-08 10:07:26 -05:00
Isaac Connor
97096d87f9
Add mx-2 classes to be consistent
2020-08-04 18:06:49 -04:00
Isaac Connor
5b8ff10a34
style the storage dropdown better using css. rename it from dropdown01 to dropdown_storage. Put the text-warning class on the a content in the dropdown instead of the dropdown nav-item so that it takes effect. Rename Stor to Storage
2020-08-04 17:53:39 -04:00
Isaac Connor
79c9671ef2
Use & instead of & in urls
2020-08-04 17:05:33 -04:00
Isaac Connor
82542c569c
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-08-04 10:47:41 -04:00
Isaac Connor
6e9559df53
Put xhtmlHeaders in an ob_start ob_get_clean section so that calls to open session in view js php files don't cause a problem. Basically delay output. Fixes problems with logging in redirect. Also need to global cspNonce since we use it.
2020-08-04 10:47:37 -04:00
Andrew Bauer
a575b16278
set a target to about menu items
2020-08-03 15:45:27 -05:00
Andrew Bauer
9d88f8ee73
implement zm about menu
2020-08-03 15:22:46 -05:00
Isaac Connor
283d8557e6
remove the extra(globals). There are a LOT of globals. WE don't seem to actually use any in this function.
2020-08-03 12:50:36 -04:00
Andrew Bauer
a3e6fe5522
make the eslint nanny happy
2020-08-03 11:47:31 -05:00
Andrew Bauer
ce810320a2
bump right margin on storage widget
2020-08-03 11:02:30 -05:00
Andrew Bauer
8a711245f6
fix previous corrupted commit
2020-08-03 10:49:45 -05:00
Andrew Bauer
c1f37192b9
implement storage widget as dropdown
2020-08-03 10:43:24 -05:00
Isaac Connor
ece625e376
Remove the code that cleans the log on each page request. it was moved to zm_stats.pl. Accessing the log is kinda heavy, so should be done in background tasks, not interactively
2020-08-03 11:16:01 -04:00
Isaac Connor
a2958fe288
Spacing, and don't output mootools for postlogin. Don't use mootools in postlogin
2020-08-03 10:57:08 -04:00
Andrew Bauer
0ecb1621ce
add colorized log icon to widget bar
2020-08-02 14:49:19 -05:00
Andrew Bauer
a937e14899
put the optional banner in its own navbar
2020-08-02 13:48:15 -05:00
Andrew Bauer
2b29a7983a
clean up navbar background refresh
2020-08-02 13:01:20 -05:00
Andrew Bauer
b746cf6a56
add id and output html string rather than echo
...
This sets up all the items on the navbar as reconfigurable, via javascript replaceWith
2020-08-02 11:31:36 -05:00
Isaac Connor
037b696be0
Fix duplicate class attributes on navbar links
2020-08-02 12:05:52 -04:00
Andrew Bauer
e768beaef2
fix whitespace
2020-08-01 16:20:51 -05:00
Andrew Bauer
ad3b5a5aa3
call ob_start and ob_get_clean correctly
2020-08-01 16:16:23 -05:00
Andrew Bauer
b746901ee7
close the dropmenu on any click
2020-08-01 10:57:13 -05:00
Andrew Bauer
8b3917d707
reapply navbar reload logic
2020-08-01 09:07:21 -05:00
Andrew Bauer
b6c0274b2c
implement collapsed navbar
2020-07-31 16:03:37 -05:00
Andrew Bauer
cd96994a56
update getZMVersionHTML
2020-07-31 07:31:40 -05:00
Andrew Bauer
2699fa0313
force menubar to the top of the navbar
2020-07-30 16:56:38 -05:00
Andrew Bauer
8bb30bb6d4
add framework for new navbar selection
2020-07-30 16:44:58 -05:00
Andrew Bauer
561c44ece2
add runtimeStatus function
2020-07-30 16:14:41 -05:00
Andrew Bauer
23596b142d
fix how we finish up getNavBarHTML
2020-07-30 11:55:54 -05:00
Andrew Bauer
4bf7093ff1
align account circle with status button
2020-07-29 15:47:46 -05:00
Andrew Bauer
1119923c38
Update functions.php
2020-07-29 15:26:07 -05:00
Andrew Bauer
695da2221f
Update functions.php
2020-07-29 15:20:44 -05:00
Andrew Bauer
4c242ef973
what a difference a single space makes
2020-07-29 15:09:47 -05:00
Andrew Bauer
9f1901e413
fix typo
2020-07-29 14:42:06 -05:00
Andrew Bauer
853a5728f8
align navbar logo and run status vertically
2020-07-28 12:20:18 -05:00
Andrew Bauer
85dec6194d
when maxmimize, rebuild jqeury chosen fields
2020-07-28 08:38:06 -05:00
Andrew Bauer
47b35e97fb
implement minimize chevron for filterbar
2020-07-27 16:14:15 -05:00
Isaac Connor
ca07602414
fix html structure when not logged in. Move version class down to where we use it. add parenthesis to quiet php deprecation errors
2020-07-27 12:15:37 -04:00
Andrew Bauer
cec5d7ea06
w-100 class not needed
2020-07-27 10:22:23 -05:00
Andrew Bauer
ffa3415318
when collapsed, force the menu button to the right
2020-07-27 10:13:02 -05:00
Andrew Bauer
bc19ae604a
fix alignment of top navbar
2020-07-27 09:18:02 -05:00
Andrew Bauer
941c074a8e
add carriage returns to generated html for readability
2020-07-26 10:50:32 -05:00
Andrew Bauer
6486f59383
fix colorization of navbar widgets
2020-07-26 10:41:05 -05:00
Isaac Connor
3ec7952c31
apply cache_busting to bootstrap, overlay anda reset
2020-07-25 15:05:12 -04:00
Isaac Connor
4af343e833
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-07-25 14:28:32 -04:00
Isaac Connor
e3b339e72e
add missing globals
2020-07-25 14:28:26 -04:00
Andrew Bauer
c48fa83c6d
upgrade to bootstrap 4.5
2020-07-25 13:18:09 -05:00
Andrew Bauer
bda7e1a2b7
minor cleanup of getNavBarHTML
2020-07-23 12:52:21 -05:00
Andrew Bauer
e9323f96a5
additional cleanup of getNavBarHTML
2020-07-23 10:52:12 -05:00
Andrew Bauer
062ae675c8
partial cleanup of getNavBarHTML
2020-07-22 13:12:59 -05:00
Isaac Connor
23900cbf01
fix
2020-05-21 13:34:09 -04:00
Isaac Connor
59c08410c1
Put the size of SHM in the title of the shm space used element
2020-05-21 13:32:33 -04:00
Isaac Connor
cf3785aebf
Don't include mootools on login view. It isn't needed and apparently breaks google recaptcha
2020-04-24 12:23:48 -04:00
Isaac Connor
e770be2e13
Merge branch 'release-1.34'
2020-04-23 10:26:16 -04:00
Isaac Connor
543628d0ee
cleanup, and add missing </ul> in the navbar when not logged in which seems to be causing the recaptcha render to fail
2020-04-21 09:20:04 -04:00
Isaac Connor
3e8de7dd6c
Move the script include for recaptcha into the view instead of the xhtmlHeaders function. Fixes #2918
2020-04-21 08:30:42 -04:00
Isaac Connor
ac00ca0ad8
Only list enabled Storage Areas
2020-03-04 10:46:59 -05:00
Isaac Connor
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
Isaac Connor
137bdb1f24
Make shm have error or warning class if full
2020-02-10 14:20:46 -05:00
Isaac Connor
6c7f003198
revert bogus change not including skin.js
2020-01-18 16:08:55 -05:00
Isaac Connor
5b8e5eb349
don't output duplicated js when css=base
2020-01-17 14:51:02 -05:00
Isaac Connor
2f1b725ee4
quote SQL for mysql8
2020-01-07 11:01:02 -05:00
Isaac Connor
18ed90d147
remove second hit to db to load storage areas with no serverid
2019-12-13 17:47:51 -05:00
Isaac Connor
d39193cb6b
convert flip to material icons
2019-12-02 12:33:13 -05:00
Isaac Connor
393f0a369c
Revamp timeline. Make it handle being full browser width. remove onclicks.
2019-09-28 14:23:23 -04:00
Isaac Connor
38a09bbd18
Don't auto-add default storage area to header. If someone wants to see it's space in the header they can add it to storage areas
2019-08-08 15:34:07 -04:00
Isaac Connor
46032385fe
fix viewport on mobile. Fix duplicated css when selected css is base
2019-06-22 14:10:55 -04:00
Isaac Connor
1749a7a4f9
fix extra closing button tag in shutdown button. Add a newline after each Storage group to make the code easier to read
2019-06-10 15:57:53 -04:00
Isaac Connor
7445f5588f
show storage when there are 4 areas. Used to only do it for < 4
2019-05-31 11:01:09 -04:00
Isaac Connor
07d4310466
Can't cache-bust jquery-ui-theme.css as it loads sprites by relative path
2019-05-29 08:40:48 -04:00
Isaac Connor
e464888811
Merge branch 'runstate_in_state' into storageareas
2019-05-13 10:32:21 -04:00
Isaac Connor
7f704263d8
If running a custom run state, show the state instead of Running. Also select the running state in the state change popup.
2019-05-13 10:30:41 -04:00
Isaac Connor
626342f00e
Merge branch 'master' into storageareas
2019-04-26 10:44:00 -04:00
Isaac Connor
6a250d61e3
cache_bust logger.js and overlay.js
2019-04-26 10:25:32 -04:00
Isaac Connor
7b98dcbb94
but the shutdown icon in a navbar-txt
2019-04-12 13:08:58 -04:00
Isaac Connor
d7747b3385
add a shutdown power button to the navbar
2019-04-12 09:37:14 -04:00
Isaac Connor
780f4f9b9a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-04-06 09:27:44 -04:00
Isaac Connor
c7e09e03d3
add cache busting to base.js
2019-03-25 16:24:46 -04:00
Isaac Connor
ad059f985e
spacing
2019-03-20 14:27:23 -04:00
Isaac Connor
fa124eb29a
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2019-03-05 14:35:15 -05:00
Isaac Connor
7b7a58b2f1
remove old xhtml-isms
2019-03-05 14:33:03 -05:00
Isaac Connor
ff8c5c5db8
remove debug
2019-03-01 17:28:00 -05:00
Isaac Connor
2d75ab50af
Implement deleting from Logs based on line count instead of interval
2019-02-28 16:12:34 -05:00
Isaac Connor
a1f1c19c0f
fix missing ZM namepsace
2019-02-27 11:07:52 -05:00
Isaac Connor
8dd8888975
Php namespace ( #2537 )
...
* experiment with namespaces on the Server class
* experiment with namespaces on the Server class
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
* Implement the ZM namespace on objects
2019-02-22 09:19:07 -05:00
Isaac Connor
34873d5636
We must leave ZM_HOME_CONTENT unescaped so that we can insert actual html like image tags
2019-02-16 11:50:09 -05:00
Isaac Connor
b6a0e704d2
whitespace, remove xhtml cruft
2019-02-12 16:41:08 -05:00
Isaac Connor
2f301cf5fe
Merge branch 'master' of github.com:ZoneMinder/ZoneMinder
2019-02-12 13:18:08 -05:00
Isaac Connor
5b9bb93703
fix navbar auth
2019-02-12 13:17:55 -05:00
timwsuqld
f95e9c0363
Fix comment about hiding navbar ( #2521 )
...
Fixes #2520
2019-02-11 17:14:33 -05:00
Isaac Connor
40e0019267
fix all the nav missing when a users Monitors Permission is None
2019-02-11 14:15:24 -05:00