prometheus

Commit Graph

Author	SHA1	Message	Date
jritchieBAE	b8f0a41745	Update to Bootstrap 4.1.3 (#5192 ) * web: updated bootstrap3-typeahead file to work with bootstrap 4.0.0 Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: Replaced bootstrap-3.3.1 with bootstrap 4.0.0 Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: Added bootstrap4-glyphicons as 4.0.0 doesnt include bootstrap3 glyphicons Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated js jquery to 3.3.1 Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated _base.html to import new bootstrap 4.0.0, jquery3.3.1 and bootstrap class tags to be 4.0 compatible Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: _base.html missed word out in title tag (Server). Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated alerts.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated config.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated flags.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated service-discovery.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated status.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated targets.html class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: updated graph_template.handlebar class names and tags to be bootstrap 4 compatible. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: alerts.css fix for button color inheritance on alerts page. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: graph.css fix for color inheritance. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: prometheus.css updated to fix nav bar. Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * web: previous merge conflict not fixed correctly on _base.html Signed-off-by: Andrew Chiu <andrew.chiu2@baesystems.com> * menu.lib and prom.lib imports updated Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * bootstrap 4.1.3 imported Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Bootstrap 4.1.3 imported into _base.html Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * bootstrap 4.1.3 imported into prom.lib Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * menu.lib style adjusted to view sidebar Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Alert colour uplifted to bootstrap 4.1.3 Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Alerts display code reformatted similarly to config Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Consoles pages adjusted to account for new navbar Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * LHS Menu fixed in console pages Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Minor changes to prom_console to adjust lhs nav Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Prom.lib and some css updated to fix console graph controls Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Bootstrap 4.0.0 files removed Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Consoles configured so that the graph fits with the new side bar, css files also adjusted Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Import popper.min.js for dropdowns Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Popper.min.js imported locally Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Re-added #4764 and fixed css Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Removed .DS_Store Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Rebuilt assets Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * Spaces between buttons and inputs on graph page removed Signed-off-by: ksherryBAE <kieran.sherry@baesystems.com> * fixed spacing in buttons on /targets Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com> * Updated vfsdata.go Signed-off-by: Pritam Bhudia <pritam.bhudia@baesystems.com> * fixed typeahead issue Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com> * added css for dropdown Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com> * changed order of css imports Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com> * tinkered with CSS changes to make keyboard select and mouseover match Signed-off-by: James Ritchie <james.g.ritchie@baesystems.com>	6 years ago
James Turnbull	4486ef013b	Make show annotations checkbox match query history checkbox (#3936 ) After removing the checkbox in #3913 the only remaining element that looked like it was the new Show Annotations checkbox on the Alerts page. Which in turn didn't look like the Enable query history checkout on the graph page. So: 1. This takes the Enable query history button as canonical. 2. Updates the show annotations button code to match it. 3. Simplifies the JS for the checkbox.	7 years ago
Julien Pivotto	155faab7a2	Display annotations on Alerts page (#3900 ) Fixes #1219 Signed-off-by: Julien Pivotto <roidelapluie@inuits.eu>	7 years ago
Fabian Reinartz	57ca7108aa	Enable debug generation of go-bindata, rename blob/ to ui/	9 years ago

4 Commits (2c49860f6954b84acecf5afb6cc5811ad55b4108)