1
0
Fork 0
Commit Graph

354 Commits

Author SHA1 Message Date
Michael Hackstein dd28af0d3a Fixed style of new dashboard in cluster overview on click
Conflicts:
	js/apps/system/aardvark/frontend/scss/cluster.css
	js/apps/system/aardvark/frontend/scss/generated.css
2014-05-25 23:25:51 +02:00
Michael Hackstein b57192aee3 Fixed position of enlarge button, and added option to show it for other charts, all enabled now because of missing history 2014-05-25 23:14:36 +02:00
Michael Hackstein 73c27fcd36 Moved the enlarge icon of dashboard-charts to top right corner
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
2014-05-25 23:12:42 +02:00
Frank Celler d097755324 cleanup of statistics, new css, merge css, view and template, added long/short history, exclude all statistics collections, added clusterId
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/_resizing.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/statistics.js
2014-05-25 23:10:10 +02:00
Max Kerp 8dd3babebd fixed scss-lint 2014-05-20 14:53:05 +02:00
Max Kerp 9ca0447b69 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-20 11:39:18 +02:00
Max Kerp a1feb3e19e implemented a form-validation for text-inputs, now
prohibiting the user to save custom AQl queries containing special html
characters.
2014-05-20 11:36:18 +02:00
Heiko Kernbach 8aa7120dbb jslint 2014-05-16 20:01:07 +02:00
Heiko Kernbach 9d3b292183 new scss file for hotkeys modal 2014-05-16 19:36:23 +02:00
scottashton 00a4c8b27e fixed scss bug 2014-05-12 12:55:11 +02:00
scottashton 5b644570d9 fixed scsslint errors 2014-05-12 11:51:26 +02:00
Frank Celler 9127ed2ac5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
2014-05-12 00:07:46 +02:00
Claudius Weinberger 109c6d6304 redesign dashboard 2014-05-11 23:45:36 +02:00
Claudius Weinberger 1e32c7a2d2 redesign dashboard 2014-05-11 23:22:41 +02:00
Claudius Weinberger 14256b504e redesign dashboard 2014-05-11 22:42:49 +02:00
Claudius Weinberger cb28bb478a design Dashboard 2014-05-11 20:58:28 +02:00
Claudius Weinberger 71c50b9942 redesign dashbaord 2014-05-11 15:12:27 +02:00
Claudius Weinberger ea487051c4 redesign dashboard 2014-05-11 00:41:36 +02:00
Claudius Weinberger 9252bb8629 redesign dashboard 2014-05-10 22:31:17 +02:00
Claudius Weinberger 67672b8492 redesign Dashboard 2014-05-10 21:35:19 +02:00
Claudius Weinberger 7844755d8e redesign Dashboard 2014-05-09 21:37:19 +02:00
Heiko Kernbach 39a620e6d5 scss lint 2014-05-09 20:33:38 +02:00
Heiko Kernbach fac8fccef2 scss lint 2014-05-09 20:23:16 +02:00
Heiko Kernbach 22a9043f32 query view 2014-05-09 20:02:36 +02:00
Heiko Kernbach f3665a1943 query view, table css fix, added delete button for custom query 2014-05-09 18:46:41 +02:00
Michael Hackstein 92f02fbce3 Fixed design bugs in graph viewer 2014-05-08 19:09:17 +02:00
Michael Hackstein 8fe265d434 Fixed SCSS-Lint 2014-05-05 10:52:14 +02:00
Claudius Weinberger 50cb3f5600 Dashboard redesign 2014-05-05 08:26:36 +02:00
Claudius Weinberger bfeff84705 Dashboard redesign 2014-05-04 23:37:31 +02:00
Claudius Weinberger 87c54c6163 Dashboard redesign 2014-05-04 18:49:01 +02:00
Claudius Weinberger ce4cd13669 Dashboard redesign 2014-05-04 14:10:44 +02:00
Claudius Weinberger 73f512e548 Dashboard redesign
Conflicts:
	js/apps/system/aardvark/frontend/js/templates/dashboardView.ejs
	js/apps/system/aardvark/frontend/js/views/dashboardView.js
	js/apps/system/aardvark/frontend/scss/_constants.scss
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/generated.css
2014-05-04 00:33:21 +02:00
Claudius Weinberger da6d3a2e7d shboard redesign 2014-05-04 00:25:02 +02:00
Michael Hackstein 9596b7d9c0 Resized the legend of graphs based on screen-width 2014-05-03 21:05:46 +02:00
Heiko Kernbach 3434db8de1 #821 - added icon indicator for server status (footer) 2014-05-02 19:32:25 +02:00
Max Kerp 6db9934d86 changed the padding of the dropdown-header 2014-05-02 19:02:49 +02:00
Max Kerp 65f6bf2a3f Added a divider in the databse dropdown menu and changed color of
corneredBadge to be consistent with the overall design
2014-05-02 14:36:10 +02:00
scottashton 4bbf9970a9 minor bugfixes and resizing of detailcharts 2014-04-23 16:46:44 +02:00
scottashton 7b5e25bc32 fixed detail modal view from cluster server 2014-04-22 14:15:22 +02:00
scottashton 0e96bcde17 SCSS HELL 2014-04-17 17:27:05 +02:00
gschwab ed2a5fbb6b fixed scsslint 2014-04-17 14:57:34 +02:00
scottashton e4d5dfd7f2 clusterdashboard refactoring, backbone events are now passed into modalview 2014-04-17 14:12:13 +02:00
scottashton f1bf4e427b scss-linted files and started clusterserver dashboard ng 2014-04-16 17:03:24 +02:00
scottashton 1da96a0826 dahsboard refactoring 2014-04-15 17:34:14 +02:00
Michael Hackstein dc164ec6d2 Fixed scss-lint warnings 2014-04-15 08:53:34 +02:00
scottashton 4ac4dd7268 dashboard refactoring 2014-04-14 17:36:40 +02:00
scottashton a07b4b107b started d3 charts 2014-04-14 14:56:14 +02:00
gschwab 9ceacd2827 fixed scsslint 2014-04-11 15:31:00 +02:00
gschwab 2a3ab21398 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-11 15:13:01 +02:00
gschwab 552566fa28 fixed css for cluster# 2014-04-11 15:12:55 +02:00
scottashton ed6bc4f6a2 dashboard refactoring 2014-04-11 12:31:05 +02:00
scottashton f5a664e93b added missing stats to statistics app and did further dashboard fefactoring 2014-04-11 12:30:09 +02:00
gschwab 432220e661 added focus to buttons for keyboard navigation support 2014-04-11 11:43:12 +02:00
gschwab dd1ce6b79b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-11 11:10:53 +02:00
gschwab 92da0f254d refactored collection info modal 2014-04-11 11:10:49 +02:00
Michael Hackstein 5bcc334c45 Further improvements of dashboard style 2014-04-11 10:31:09 +02:00
Michael Hackstein a89ab0d76d Applied scss fixes to new dashboard 2014-04-11 08:54:51 +02:00
scottashton c4b3b3293b dashboard refactoring 2014-04-10 17:32:01 +02:00
gschwab 9b3f22e2da Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-10 09:50:41 +02:00
gschwab 7bde55b23a added caret to show if advanced button in modal view is collapsed or not 2014-04-10 09:49:17 +02:00
Michael Hackstein d39e306d38 First version of newest dashboard design 2014-04-09 16:06:43 +02:00
gschwab 0cbec72e9e fixed some css for modals (info icon) 2014-04-08 14:11:34 +02:00
gschwab acf585df22 fixed modal layout 2014-04-08 13:06:57 +02:00
Heiko Kernbach b2eaf848cb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-07 13:30:18 +02:00
Heiko Kernbach 446a2baaa2 css logs 2014-04-07 13:29:56 +02:00
gschwab 2f56c946fa refactored modalDialogs for adding collections 2014-04-07 11:22:00 +02:00
Heiko Kernbach 33e3fa7267 scss 2014-04-04 19:28:51 +02:00
Heiko Kernbach be8c91c603 scss + lint 2014-04-04 19:27:53 +02:00
gschwab 98636cf1df first try with modals: some small bugs fixed 2014-04-03 10:53:04 +02:00
gschwab 1af661d13f some scss refactoring for modals 2014-04-03 09:57:44 +02:00
gschwab 4cebb1a752 added confirmation div 2014-04-03 09:46:17 +02:00
gschwab 9dc313c61b css refactoring: refactored screenSizes.css 2014-03-24 09:29:59 +01:00
gschwab cb95204e61 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-24 09:19:58 +01:00
gschwab 527d88747b added connection check for multi machine cluster 2014-03-24 09:19:50 +01:00
Heiko Kernbach 71ca2fee1f new icons for pagination (scss) 2014-03-21 17:05:39 +01:00
Heiko Kernbach 085d3de302 snippet css to scss 2014-03-21 15:50:47 +01:00
Heiko Kernbach a2d80c2b9e dataTables scss lint 2014-03-21 15:48:53 +01:00
scottashton 149d90e78b merged 2014-03-21 15:33:08 +01:00
scottashton 0e3da446d1 kill modal.css 2014-03-21 15:32:24 +01:00
Heiko Kernbach a409acd013 dataTables scss lint 2014-03-21 15:17:25 +01:00
Heiko Kernbach 4aef4877a5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 15:09:28 +01:00
Heiko Kernbach 31a69dba67 dataTables css -> scss 2014-03-21 15:09:18 +01:00
scottashton 355c1100eb _collection.scss 2014-03-21 14:16:53 +01:00
scottashton 690a2afe81 fixed merge bug 2014-03-21 14:00:33 +01:00
scottashton d61f1e4e0c merged 2014-03-21 13:47:58 +01:00
scottashton 51c1072b42 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 13:24:22 +01:00
Michael Hackstein 0b266d1dd5 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-03-21 11:13:36 +01:00
Michael Hackstein 1c4d9f14e5 Fixed SCSS-Lint warnings for graphViewer.scss 2014-03-21 11:13:33 +01:00
Michael Hackstein 55f0c0357c Finished moving graphViewer.css to scss, will now cleanup scss-lint 2014-03-21 11:07:51 +01:00
Heiko Kernbach 7ee66c908c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 11:06:07 +01:00
scottashton f5ff718ed0 merged 2014-03-21 10:58:11 +01:00
Heiko Kernbach 576a173b9f scss lint 2014-03-21 10:54:04 +01:00
Heiko Kernbach 8f486d1abb removed old unused font 2014-03-21 10:52:48 +01:00
Michael Hackstein 9b7034e3c0 Continued moving the graphViewer from css to scss 2014-03-21 10:41:08 +01:00
Michael Hackstein 4607522e8d Solved merge conflict 2014-03-21 10:39:26 +01:00
scottashton aa2a4ba800 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-03-21 08:39:00 +01:00
scottashton 411f91f8ca merged 2014-03-21 08:38:39 +01:00
Heiko Kernbach 44bfa51f5d scss lint 2014-03-20 19:03:08 +01:00
Heiko Kernbach 66deff7d73 merge conflict 2014-03-20 17:33:23 +01:00
Heiko Kernbach f77a28f632 transfer documentView.css to scss 2014-03-20 17:31:59 +01:00