Skip to content

Views engine #383

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
matthieucan wants to merge 33 commits into from
Closed

Views engine #383

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
f4afe35
Add: views engine
matthieucan Jun 2, 2014
7669956
Add: javascript libraries
matthieucan Jun 2, 2014
721d712
Add: template for custom views: pie chart
matthieucan Jun 2, 2014
5c49ebd
Add: template "maps" for custom views
matthieucan Jun 2, 2014
9f95c37
Add: filter default form: "regex" and "negate" options
matthieucan Jun 2, 2014
db1b0db
add: auto-reload of form when a filter column is modified
matthieucan Jun 2, 2014
d093549
fix: binding events to <select>s when they are dynamically added
matthieucan Jun 2, 2014
75f429f
fix: CSS conflict between bootstrap and openlayers
matthieucan Jun 2, 2014
3b3b4fc
profiling import in init, should fix travis-ci
tomas-edwardsson Jun 3, 2014
382d35b
fix: travis installation of python packages
matthieucan Jun 3, 2014
9100073
Add: views engine
matthieucan Jun 2, 2014
f0542d3
Add: javascript libraries
matthieucan Jun 2, 2014
3c8340c
Add: template for custom views: pie chart
matthieucan Jun 2, 2014
2c130ce
Add: template "maps" for custom views
matthieucan Jun 2, 2014
480a5e6
Add: filter default form: "regex" and "negate" options
matthieucan Jun 2, 2014
2c19787
add: auto-reload of form when a filter column is modified
matthieucan Jun 2, 2014
263587f
fix: binding events to <select>s when they are dynamically added
matthieucan Jun 2, 2014
4fff1ef
fix: CSS conflict between bootstrap and openlayers
matthieucan Jun 2, 2014
d5585b9
fix: travis installation of python packages
matthieucan Jun 3, 2014
1c1d1ea
Merge branch 'feature-view-engine' of github.com:matthieucan/adagios …
matthieucan Jun 3, 2014
ec196ff
status/custom_view: Fix broken livestatus query
Jun 28, 2014
dcf7226
status/custom_view now more testable
Jun 28, 2014
34a775c
remove openlayers.js and geolocalisation functions
matthieucan Jul 2, 2014
6d2f087
remove style=color: black fro html code
matthieucan Jul 2, 2014
dbc4fcd
move style from html to css
matthieucan Jul 2, 2014
6e4be83
Add: ability to have customised views rendered full screen
matthieucan Jun 3, 2014
68b930a
Add: 'edit' icons next to view names in the left menu
matthieucan Jun 3, 2014
146e853
Add: search box on table.html template, which filters data
matthieucan Jun 3, 2014
783c36b
fix: small bug in 'state' widget, datasource->data_source
matthieucan Jun 3, 2014
58b7cbe
fix: error when no backend is working
matthieucan Jun 5, 2014
3793f7a
move css from html to css (again)
matthieucan Jul 2, 2014
8dd2cdd
move Custom views submenu in to Experimental
matthieucan Jul 2, 2014
8894b01
replace elif by else/if, to stay compatible with django 1.3
matthieucan Jul 2, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 2 additions & 0 deletions adagios/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,3 +71,5 @@ def add_plugin(name="myplugin", modulepath=None):
except Exception:
pass

import adagios.profiling

9 changes: 9 additions & 0 deletions adagios/context_processors.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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);
191 changes: 191 additions & 0 deletions adagios/media/external/datatable/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,191 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction, and
distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by the copyright
owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all other entities
that control, are controlled by, or are under common control with that entity.
For the purposes of this definition, "control" means (i) the power, direct or
indirect, to cause the direction or management of such entity, whether by
contract or otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity exercising
permissions granted by this License.

"Source" form shall mean the preferred form for making modifications, including
but not limited to software source code, documentation source, and configuration
files.

"Object" form shall mean any form resulting from mechanical transformation or
translation of a Source form, including but not limited to compiled object code,
generated documentation, and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or Object form, made
available under the License, as indicated by a copyright notice that is included
in or attached to the work (an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object form, that
is based on (or derived from) the Work and for which the editorial revisions,
annotations, elaborations, or other modifications represent, as a whole, an
original work of authorship. For the purposes of this License, Derivative Works
shall not include works that remain separable from, or merely link (or bind by
name) to the interfaces of, the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including the original version
of the Work and any modifications or additions to that Work or Derivative Works
thereof, that is intentionally submitted to Licensor for inclusion in the Work
by the copyright owner or by an individual or Legal Entity authorized to submit
on behalf of the copyright owner. For the purposes of this definition,
"submitted" means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems, and
issue tracking systems that are managed by, or on behalf of, the Licensor for
the purpose of discussing and improving the Work, but excluding communication
that is conspicuously marked or otherwise designated in writing by the copyright
owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity on behalf
of whom a Contribution has been received by Licensor and subsequently
incorporated within the Work.

2. Grant of Copyright License.

Subject to the terms and conditions of this License, each Contributor hereby
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the Work and such
Derivative Works in Source or Object form.

3. Grant of Patent License.

Subject to the terms and conditions of this License, each Contributor hereby
grants to You a perpetual, worldwide, non-exclusive, no-charge, royalty-free,
irrevocable (except as stated in this section) patent license to make, have
made, use, offer to sell, sell, import, and otherwise transfer the Work, where
such license applies only to those patent claims licensable by such Contributor
that are necessarily infringed by their Contribution(s) alone or by combination
of their Contribution(s) with the Work to which such Contribution(s) was
submitted. If You institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work or a
Contribution incorporated within the Work constitutes direct or contributory
patent infringement, then any patent licenses granted to You under this License
for that Work shall terminate as of the date such litigation is filed.

4. Redistribution.

You may reproduce and distribute copies of the Work or Derivative Works thereof
in any medium, with or without modifications, and in Source or Object form,
provided that You meet the following conditions:

You must give any other recipients of the Work or Derivative Works a copy of
this License; and
You must cause any modified files to carry prominent notices stating that You
changed the files; and
You must retain, in the Source form of any Derivative Works that You distribute,
all copyright, patent, trademark, and attribution notices from the Source form
of the Work, excluding those notices that do not pertain to any part of the
Derivative Works; and
If the Work includes a "NOTICE" text file as part of its distribution, then any
Derivative Works that You distribute must include a readable copy of the
attribution notices contained within such NOTICE file, excluding those notices
that do not pertain to any part of the Derivative Works, in at least one of the
following places: within a NOTICE text file distributed as part of the
Derivative Works; within the Source form or documentation, if provided along
with the Derivative Works; or, within a display generated by the Derivative
Works, if and wherever such third-party notices normally appear. The contents of
the NOTICE file are for informational purposes only and do not modify the
License. You may add Your own attribution notices within Derivative Works that
You distribute, alongside or as an addendum to the NOTICE text from the Work,
provided that such additional attribution notices cannot be construed as
modifying the License.
You may add Your own copyright statement to Your modifications and may provide
additional or different license terms and conditions for use, reproduction, or
distribution of Your modifications, or for any such Derivative Works as a whole,
provided Your use, reproduction, and distribution of the Work otherwise complies
with the conditions stated in this License.

5. Submission of Contributions.

Unless You explicitly state otherwise, any Contribution intentionally submitted
for inclusion in the Work by You to the Licensor shall be under the terms and
conditions of this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify the terms of
any separate license agreement you may have executed with Licensor regarding
such Contributions.

6. Trademarks.

This License does not grant permission to use the trade names, trademarks,
service marks, or product names of the Licensor, except as required for
reasonable and customary use in describing the origin of the Work and
reproducing the content of the NOTICE file.

7. Disclaimer of Warranty.

Unless required by applicable law or agreed to in writing, Licensor provides the
Work (and each Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied,
including, without limitation, any warranties or conditions of TITLE,
NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE. You are
solely responsible for determining the appropriateness of using or
redistributing the Work and assume any risks associated with Your exercise of
permissions under this License.

8. Limitation of Liability.

In no event and under no legal theory, whether in tort (including negligence),
contract, or otherwise, unless required by applicable law (such as deliberate
and grossly negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special, incidental,
or consequential damages of any character arising as a result of this License or
out of the use or inability to use the Work (including but not limited to
damages for loss of goodwill, work stoppage, computer failure or malfunction, or
any and all other commercial damages or losses), even if such Contributor has
been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability.

While redistributing the Work or Derivative Works thereof, You may choose to
offer, and charge a fee for, acceptance of support, warranty, indemnity, or
other liability obligations and/or rights consistent with this License. However,
in accepting such obligations, You may act only on Your own behalf and on Your
sole responsibility, not on behalf of any other Contributor, and only if You
agree to indemnify, defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason of your
accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work

To apply the Apache License to your work, attach the following boilerplate
notice, with the fields enclosed by brackets "[]" replaced with your own
identifying information. (Don't include the brackets!) The text should be
enclosed in the appropriate comment syntax for the file format. We also
recommend that a file or class name and description of purpose be included on
the same "printed page" as the copyright notice for easier identification within
third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License 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.
45 changes: 45 additions & 0 deletions adagios/media/external/datatable/README.md
View file
Open in desktop
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.
17 changes: 17 additions & 0 deletions adagios/media/external/datatable/css/datatable-bootstrap.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
.sorting {
cursor: pointer ;
background: url("../img/sort_both.png") no-repeat center right ;
}

.sorting-desc {
background-image: url("../img/sort_desc.png") ;
}

.sorting-asc {
background-image: url("../img/sort_asc.png") ;
}

.datatable-load-bar {
width: 100% ;
margin: 8px 0 ;
}
1 change: 1 addition & 0 deletions adagios/media/external/datatable/css/datatable-bootstrap.min.css
View file
Open in desktop

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

Loading