diff --git a/server.py b/server.py
index 72d57a7..0b5bb5c 100755
--- a/server.py
+++ b/server.py
@@ -246,6 +246,11 @@ def getCategPerContrib():
]
return jsonify(data*2)
+@app.route("/_getAllOrg")
+def getAllOrg():
+ data = ['CIRCL', 'CASES', 'SMILE' ,'ORG4' ,'ORG5']
+ return jsonify(data)
+
@app.route("/_getTopCoord")
def getTopCoord():
try:
diff --git a/templates/contrib.html b/templates/contrib.html
index 64acf1a..dfdf332 100644
--- a/templates/contrib.html
+++ b/templates/contrib.html
@@ -26,6 +26,7 @@
+
@@ -112,6 +113,11 @@ small {
MISP Geolocalisation
MISP Contributors
+
+
+
@@ -278,39 +284,18 @@ small {
return img.outerHTML;
}
- function create_stars_dom(n) {
- var n = 4-n; //1 is best -> 3 stars
- var div = document.createElement('DIV');
- div.classList.add('ranking');
- for(var i=1; i<=n; i++) {
- var span = document.createElement('span');
- span.classList.add("glyphicon");
- span.classList.add("glyphicon-star");
- span.classList.add("star"+n+"-"+i);
- div.appendChild(span);
+ var allOrg = [];
+ var typeaheadOption = {
+ source: function (query, process) {
+ if (allOrg.length == 0) { // caching
+ return $.getJSON("{{ url_for('getAllOrg') }}", function (data) {
+ allOrg = data;
+ return process(data);
+ });
+ } else {
+ return process(allOrg);
+ }
}
- return div.outerHTML;
- }
-
- var datatableIndex = 1;
- function getIndexRank() {
- var to_return;
- switch (datatableIndex) {
- case 1:
- to_return = create_stars_dom(1);
- break;
- case 2:
- to_return = create_stars_dom(2);
- break;
- case 3:
- to_return = create_stars_dom(3);
- break;
-
- default:
- to_return = datatableIndex;
- }
- datatableIndex++;
- return to_return;
}
var datatableTop;
@@ -367,6 +352,7 @@ small {
};
$(document).ready(function() {
+ $('#orgName').typeahead(typeaheadOption);
datatableTop = $('#topContribTable').DataTable(optionDatatable_top);
datatableFame = $('#fameTable').DataTable(optionDatatable_fame);
datatableCateg = $('#categTable').DataTable(optionDatatable_Categ);
@@ -389,7 +375,6 @@ small {
// hall of fame
$.getJSON( "{{ url_for('getTopContributor') }}", function( data ) {
- datatableIndex = 1;
for (i in data) {
var row = data[i];
i = parseInt(i);
diff --git a/templates/geo.html b/templates/geo.html
index 50302b2..2dfbfde 100644
--- a/templates/geo.html
+++ b/templates/geo.html
@@ -58,7 +58,7 @@
}
.textTopHeader {
- height: 50px;
+ height: 50px;
text-align: center;
margin-left: 8px;
float: left;
@@ -90,6 +90,7 @@ small {
@@ -184,7 +185,7 @@ small {
-
+
@@ -198,7 +199,7 @@ small {