Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
a8b49c5
Add: views engine
matthieucan Jun 2, 2014
5a77a91
Add: javascript libraries
matthieucan Jun 2, 2014
b168326
Add: template for custom views: pie chart
matthieucan Jun 2, 2014
8330ff1
Add: template "maps" for custom views
matthieucan Jun 2, 2014
0f8b188
Add: filter default form: "regex" and "negate" options
matthieucan Jun 2, 2014
05db7d0
add: auto-reload of form when a filter column is modified
matthieucan Jun 2, 2014
e15a95a
fix: binding events to <select>s when they are dynamically added
matthieucan Jun 2, 2014
878c8eb
fix: CSS conflict between bootstrap and openlayers
matthieucan Jun 2, 2014
f0df4a2
fix: travis installation of python packages
matthieucan Jun 3, 2014
35038fc
status/custom_view: Fix broken livestatus query
Jun 28, 2014
6742a1a
status/custom_view now more testable
Jun 28, 2014
eef0519
remove openlayers.js and geolocalisation functions
matthieucan Jul 2, 2014
f213c65
remove style=color: black fro html code
matthieucan Jul 2, 2014
baa61e4
move style from html to css
matthieucan Jul 2, 2014
71eab42
Add: ability to have customised views rendered full screen
matthieucan Jun 3, 2014
600e96e
Add: 'edit' icons next to view names in the left menu
matthieucan Jun 3, 2014
a9b1131
Add: search box on table.html template, which filters data
matthieucan Jun 3, 2014
ff46028
fix: small bug in 'state' widget, datasource->data_source
matthieucan Jun 3, 2014
11e792a
fix: error when no backend is working
matthieucan Jun 5, 2014
9513dd0
move css from html to css (again)
matthieucan Jul 2, 2014
64a2d88
move Custom views submenu in to Experimental
matthieucan Jul 2, 2014
cbff314
replace elif by else/if, to stay compatible with django 1.3
matthieucan Jul 2, 2014
de82aab
fix: typo
matthieucan Jul 2, 2014
e49d0e6
remove jquery-ui files, keep .min.js only
matthieucan Jul 2, 2014
3882b42
remove jqplots docs/ and examples/
matthieucan Jul 2, 2014
6090066
remove useless jqplot files
matthieucan Jul 2, 2014
bdeae29
remove not minified datatable files
matthieucan Jul 2, 2014
4512fa6
remove license, the readme is explicit enough
matthieucan Jul 2, 2014
a2f4449
reput jqplot's readme
matthieucan Jul 2, 2014
583accf
status.views: move specific code into custom_utils.py
matthieucan Jul 25, 2014
e4a3ea6
status.views.custom_edit: move specific code into custom_forms.py
matthieucan Jul 25, 2014
ae546a8
Merge remote-tracking branch 'origin/master' into mcanneil
titilambert Oct 21, 2014
98bdc93
Fix link_host widget
titilambert Oct 21, 2014
de69951
Fix django 1.4 support
titilambert Oct 22, 2014
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions adagios/context_processors.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
import datetime
from adagios import __version__
from adagios import userdata
from adagios.status import custom_columns

from django.utils.translation import ugettext as _

Expand Down Expand Up @@ -82,6 +83,8 @@ def on_page_load(request):
results[k] = v
for k, v in get_all_nonworking_backends(request).items():
results[k] = v
for k, v in get_livestatus_datasources(request).items():
results[k] = v
return results


Expand Down Expand Up @@ -375,5 +378,11 @@ def get_all_nonworking_backends(request):
if not Livestatus(x).test(raise_error=False)]
return {'nonworking_backends': b}

def get_livestatus_datasources(request):
result = {}
result['livestatus_datasources'] = sorted(custom_columns.all_columns.keys())
return result


if __name__ == '__main__':
on_page_load(request=None)
27 changes: 23 additions & 4 deletions adagios/media/css/adagios-common.css
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,28 @@ button.close.notification {
margin-top: 20px;
}

#left_sidebar a {
font-weight: normal;
}

#left_sidebar .nav-header {
color: black;
}

#left_sidebar hr {
margin: 2px;
}

#left_sidebar .custom-view-link {
display: inline-block;
width: 70%;
}

#left_sidebar .custom-view-edit {
display: inline;
width: 10%;
}

.well {
background: url('../img/bak.jpg')
}
Expand Down Expand Up @@ -475,10 +497,6 @@ button.close.notification {
background-color: lightblue;
}


#left_sidebar a {
font-weight: normal;
}
.small{
width: 1px;
}
Expand Down Expand Up @@ -545,3 +563,4 @@ div#glyphicons-attribution,
div#glyphicons-attribution a {
color: #666;
}

1 change: 1 addition & 0 deletions adagios/media/css/import_contrib.css
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
@import url(../external/datatables/DT_bootstrap.css);
@import url(../external/select2/select2.css);
@import url(../external/datepicker/css/datepicker.css);
@import url(../external/datatable/css/datatable-bootstrap.css);
45 changes: 45 additions & 0 deletions adagios/media/external/datatable/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
Datatable v1.0.3
=========

Datatable is a jQuery plugin for dynamic datatables with pagination, filtering and ajax loading.

How to use?
===========

Datatable is quite simple to use. Just add the CSS and Js file to your page (do not forget jquery):
`<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>`
`<script type="text/javascript" src="js/datatable.js"></script>`

And run:
`$('#MyTable').datatable() ;`

If you use bootstrap CSS, you can use datatable-boostrap.css instead of datatable.css (which is just the datatable-bootstrap.css with some additional style).

For more information, check out http://holt59.github.io/datatable

How to modify CSS?
==================

The datatable plugin come with small CSS files, one for non-bootstrap theme and others for bootstrap theme. These CSS files does not modify tables skin, they just:

1. Add background-img to sorting header
2. Add margin to ajax load bar
3. Create skin for pagination div (non-boostrap only)
4. Create skin for ajax loading bar (non-boostrap only)

Bootstrap CSS files use bootstrap pagination div and loading bar.

<strong>Warning: </strong> If you use bootstrap 3, you need to manually set the <code>pagingListClass</code> and <code>pagingDivClass</code> options to match bootstrap 3 pagination classes.

If you want to add a theme, do not hesitate to send me a mail! If you need more information on how to customize table CSS, do not hesitate to contact me.

Copyright and license
=====================

Copyright 2013 Mikaël Capelle.

Licensed under the Apache License, Version 2.0 (the "License"); you may not use this work except in compliance with the License. You may obtain a copy of the License in the LICENSE file, or at:

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions adagios/media/external/datatable/css/datatable.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added adagios/media/external/datatable/img/sort_asc.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
39 changes: 39 additions & 0 deletions adagios/media/external/datatable/jdatatable.jquery.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"name": "jdatatable",
"version": "1.0.3",
"title": "Datatable - A jQuery plugin for smart Data Tables",
"author": {
"name": "Mikaël Capelle (Holt59)",
"email": "capelle.mikael@gmail.com",
"url": "http://mikael-capelle.fr"
},
"licenses": [
{
"type": "Apache-2.0",
"url": "http://www.apache.org/licenses/LICENSE-2.0"
}
],
"description": "Datatable is a smart plugin for jQuery allowing you to easily create dynamic 'datatables' (with pagination, filtering and sorting) for better management of big quantity of data.",
"keywords": [
"datatable",
"pagination",
"ajax",
"data",
"jquery",
"filtering",
"sorting"
],
"homepage": "http://holt59.github.io/datatable/",
"docs": "http://holt59.github.io/datatable/",
"demo": "http://holt59.github.io/datatable/",
"maintainers": [
{
"name": "Mikaël Capelle (Holt59)",
"email": "capelle.mikael@gmail.com",
"url": "http://mikael-capelle.fr"
}
],
"dependencies": {
"jquery": ">=1.9"
}
}
1 change: 1 addition & 0 deletions adagios/media/external/datatable/js/datatable.min.js

Large diffs are not rendered by default.

56 changes: 56 additions & 0 deletions adagios/media/external/jqplot/copyright.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
/**
* jqPlot
* Pure JavaScript plotting plugin using jQuery
*
* Version: @VERSION
*
* Copyright (c) 2009-2013 Chris Leonello
* jqPlot is currently available for use in all personal or commercial projects
* under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
* version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can
* choose the license that best suits your project and use it accordingly.
*
* Although not required, the author would appreciate an email letting him
* know of any substantial use of jqPlot. You can reach the author at:
* chris at jqplot dot com or see http://www.jqplot.com/info.php .
*
* If you are feeling kind and generous, consider supporting the project by
* making a donation at: http://www.jqplot.com/donate.php .
*
* sprintf functions contained in jqplot.sprintf.js by Ash Searle:
*
* version 2007.04.27
* author Ash Searle
* http://hexmen.com/blog/2007/03/printf-sprintf/
* http://hexmen.com/js/sprintf.js
* The author (Ash Searle) has placed this code in the public domain:
* "This code is unrestricted: you are free to use it however you like."
*
* included jsDate library by Chris Leonello:
*
* Copyright (c) 2010-2013 Chris Leonello
*
* jsDate is currently available for use in all personal or commercial projects
* under both the MIT and GPL version 2.0 licenses. This means that you can
* choose the license that best suits your project and use it accordingly.
*
* jsDate borrows many concepts and ideas from the Date Instance
* Methods by Ken Snyder along with some parts of Ken's actual code.
*
* Ken's origianl Date Instance Methods and copyright notice:
*
* Ken Snyder (ken d snyder at gmail dot com)
* 2008-09-10
* version 2.0.2 (http://kendsnyder.com/sandbox/date/)
* Creative Commons Attribution License 3.0 (http://creativecommons.org/licenses/by/3.0/)
*
* jqplotToImage function based on Larry Siden's export-jqplot-to-png.js.
* Larry has generously given permission to adapt his code for inclusion
* into jqPlot.
*
* Larry's original code can be found here:
*
* https://github.com/lsiden/export-jqplot-to-png
*
*
*/
3 changes: 3 additions & 0 deletions adagios/media/external/jqplot/excanvas.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions adagios/media/external/jqplot/jquery.jqplot.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions adagios/media/external/jqplot/jquery.jqplot.min.js

Large diffs are not rendered by default.

Loading