MISP
/
misp-dashboard
mirror of https://github.com/MISP/misp-dashboard
2
0
Fork 0
Code Issues Releases Wiki Activity

Added support of honorBadge + Added text related to global ranking requirements

pull/3/head
Sami Mokaddem 2017-11-08 11:29:07 +01:00
parent a337ee1a85
commit 90a518cc07
11 changed files with 713 additions and 258 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
contributor_helper.py
View File

@ -10,16 +10,32 @@ class Contributor_helper:
self.serv_redis_db = serv_redis_db
self.cfg = cfg
self.cfg_org_rank = configparser.ConfigParser()
self.cfg_org_rank.read(os.path.join(os.environ['DASH_CONFIG'], 'rankTitle.cfg'))
self.cfg_org_rank.read(os.path.join(os.environ['DASH_CONFIG'], 'ranking.cfg'))
#honorBadge
self.org_honor_badge_title = {}
for badgeNum in range(1, len(self.cfg_org_rank.options('HonorBadge'))+1): #get Num of honorBadge
self.org_honor_badge_title[badgeNum] = self.cfg_org_rank.get('HonorBadge', str(badgeNum))
#GLOBAL RANKING
self.org_rank_maxLevel = self.cfg_org_rank.getint('rankTitle', 'maxLevel')
self.org_rank = {}
for rank in range(1, self.org_rank_maxLevel+1):
self.org_rank[rank] = self.cfg_org_rank.get('rankTitle', str(rank))
self.org_rank_requirement_pnts = {}
for rank in range(1, self.org_rank_maxLevel+1):
self.org_rank_requirement_pnts[rank] = self.cfg_org_rank.getint('rankRequirementsPnts', str(rank))
self.org_rank_requirement_text = {}
for rank in range(1, self.org_rank_maxLevel+1):
self.org_rank_requirement_text[rank] = self.cfg_org_rank.get('rankRequirementsText', str(rank))
self.org_rank_additional_info = json.loads(self.cfg_org_rank.get('additionalInfo', 'textsArray'))
#WEB STUFF
self.misp_web_url = cfg.get('RedisGlobal', 'misp_web_url')
self.MAX_NUMBER_OF_LAST_CONTRIBUTOR = cfg.getint('CONTRIB', 'max_number_of_last_contributor')
self.categories_in_datatable = json.loads(cfg.get('CONTRIB', 'categories_in_datatable'))
#MONTHLY RANKING
self.default_pnts_per_contribution = json.loads(cfg.get('CONTRIB', 'default_pnts_per_contribution'))
temp = json.loads(cfg.get('CONTRIB', 'pnts_per_contribution'))
self.DICO_PNTS_REWARD = {}
@ -196,6 +212,7 @@ class Contributor_helper:
dic = {}
dic['rank'] = random.randint(1,self.levelMax)
dic['orgRank'] = random.randint(1,self.levelMax),
dic['honorBadge'] = [random.randint(1,2)],
dic['logo_path'] = 'logo'
dic['org'] = 'Org'+str(d)
dic['pnts'] = random.randint(1,2**self.levelMax)
@ -216,6 +233,7 @@ class Contributor_helper:
{
'rank': random.randint(1,self.levelMax),
'orgRank': random.randint(1,self.levelMax),
'honorBadge': [1,2],
'logo_path': self.getOrgLogoFromRedis('MISP'),
'org': 'MISP',
'pnts': random.randint(1,2**self.levelMax)
@ -223,6 +241,7 @@ class Contributor_helper:
{
'rank': random.randint(1,self.levelMax),
'orgRank': random.randint(1,self.levelMax),
'honorBadge': [1],
'logo_path': 'logo1',
'org': 'CIRCL',
'pnts': random.randint(1,2**self.levelMax)
@ -230,6 +249,7 @@ class Contributor_helper:
{
'rank': random.randint(1,self.levelMax),
'orgRank': random.randint(1,self.levelMax),
'honorBadge': [2],
'logo_path': 'logo2',
'org': 'CASES',
'pnts': random.randint(1,2**self.levelMax)
@ -237,6 +257,7 @@ class Contributor_helper:
{
'rank': random.randint(1,self.levelMax),
'orgRank': random.randint(1,self.levelMax),
'honorBadge': [],
'logo_path': 'logo3',
'org': 'SMILE',
'pnts': random.randint(1,2**self.levelMax)
@ -244,6 +265,7 @@ class Contributor_helper:
{
'rank': random.randint(1,self.levelMax),
'orgRank': random.randint(1,self.levelMax),
'honorBadge': [],
'logo_path': 'logo4',
'org': 'ORG4',
'pnts': random.randint(1,2**self.levelMax)
@ -251,6 +273,7 @@ class Contributor_helper:
{
'rank': random.randint(1,self.levelMax),
'orgRank': random.randint(1,self.levelMax),
'honorBadge': [],
'logo_path': 'logo5',
'org': 'ORG5',
'pnts': random.randint(1,2**self.levelMax)
@ -264,6 +287,7 @@ class Contributor_helper:
{
'rank': random.randint(1,self.levelMax),
'orgRank': random.randint(1,self.levelMax),
'honorBadge': [1,2],
'logo_path': self.getOrgLogoFromRedis('MISP'),
'org': 'MISP',
'pnts': random.randint(1,2**self.levelMax),
@ -272,6 +296,7 @@ class Contributor_helper:
{
'rank': random.randint(1,self.levelMax),
'orgRank': random.randint(1,self.levelMax),
'honorBadge': [1],
'logo_path': 'logo1',
'org': 'CIRCL',
'pnts': random.randint(1,2**self.levelMax),
@ -280,6 +305,7 @@ class Contributor_helper:
{
'rank': random.randint(1,self.levelMax),
'orgRank': random.randint(1,self.levelMax),
'honorBadge': [2],
'logo_path': 'logo2',
'org': 'CASES',
'pnts': random.randint(1,2**self.levelMax),
@ -288,6 +314,7 @@ class Contributor_helper:
{
'rank': random.randint(1,self.levelMax),
'orgRank': random.randint(1,self.levelMax),
'honorBadge': [],
'logo_path': 'logo3',
'org': 'SMILE',
'pnts': random.randint(1,2**self.levelMax),
@ -296,6 +323,7 @@ class Contributor_helper:
{
'rank': random.randint(1,self.levelMax),
'orgRank': random.randint(1,self.levelMax),
'honorBadge': [],
'logo_path': 'logo4',
'org': 'ORG4',
'pnts': random.randint(1,2**self.levelMax),
@ -304,6 +332,7 @@ class Contributor_helper:
{
'rank': random.randint(1,self.levelMax),
'orgRank': random.randint(1,self.levelMax),
'honorBadge': [],
'logo_path': 'logo5',
'org': 'ORG5',
'pnts': random.randint(1,2**self.levelMax),

13
server.py
View File

@ -151,9 +151,17 @@ def contrib():
categ_list = contributor_helper.categories_in_datatable
categ_list_str = [ s[0].upper() + s[1:].replace('_', ' ') for s in contributor_helper.categories_in_datatable]
categ_list_points = [contributor_helper.DICO_PNTS_REWARD[categ] for categ in categ_list]
org_rank = contributor_helper.org_rank
org_rank_list = [[rank, title] for rank, title in org_rank.items()]
org_rank_requirement_pnts = contributor_helper.org_rank_requirement_pnts
org_rank_requirement_text = contributor_helper.org_rank_requirement_text
org_rank_list = [[rank, title, org_rank_requirement_pnts[rank], org_rank_requirement_text[rank]] for rank, title in org_rank.items()]
org_rank_list.sort(key=lambda x: x[0])
org_rank_additional_text = contributor_helper.org_rank_additional_info
org_honor_badge_title = contributor_helper.org_honor_badge_title
org_honor_badge_title_list = [ [num, text] for num, text in contributor_helper.org_honor_badge_title.items()]
org_honor_badge_title_list.sort(key=lambda x: x[0])
currOrg = request.args.get('org')
if currOrg is None:
@ -168,6 +176,9 @@ def contrib():
categ_list_points=categ_list_points,
org_rank_json=json.dumps(org_rank),
org_rank_list=org_rank_list,
org_rank_additional_text=org_rank_additional_text,
org_honor_badge_title=json.dumps(org_honor_badge_title),
org_honor_badge_title_list=org_honor_badge_title_list,
min_between_reload=cfg.getint('CONTRIB', 'min_between_reload')
)

13
static/css/ranking.css
View File

@ -3,6 +3,15 @@
height: auto;
}
.circleBadge {
width: 80px;
height: 80px;
text-align: center;
border-radius: 65px;
background-color: #e1e1e1;
border: 1px solid #caccce;
}
.questionBadgeText {
left: -15%;
position: relative;
@ -27,8 +36,8 @@
left: 1%;
}
.infoBlue {
background-color: #d1d1d1 !important;
.selectedOrgInTable {
background-color: #fff6c2 !important;
color: black;
}

43
static/js/contrib.js
View File

@ -51,7 +51,8 @@ var optionDatatable_light = {
"info": false,
"columnDefs": [
{ className: "centerCellPicOrgRank", "targets": [ 2 ] },
{ className: "centerCellPicOrgLogo", "targets": [ 3 ] }
{ className: "centerCellPicOrgLogo", "targets": [ 3 ] },
{ className: "centerCellPicOrgLogo", "targets": [ 4 ] }
]
};
var optionDatatable_top = jQuery.extend({}, optionDatatable_light)
@ -59,9 +60,10 @@ var optionDatatable_last = jQuery.extend({}, optionDatatable_light)
optionDatatable_last.columnDefs = [
{ className: "centerCellPicOrgRank", "targets": [ 2 ] },
{ className: "centerCellPicOrgLogo", "targets": [ 3 ] },
{ 'orderData':[5], 'targets': [0] },
{ className: "centerCellPicOrgLogo", "targets": [ 4 ] },
{ 'orderData':[6], 'targets': [0] },
{
'targets': [5],
'targets': [6],
'visible': false,
'searchable': false
},
@ -79,7 +81,8 @@ var optionDatatable_Categ = {
"info": false,
"columnDefs": [
{ className: "centerCellPicOrgRank", "targets": [ 2 ] },
{ className: "centerCellPicOrgLogo", "targets": [ 3 ], 'searchable': false, 'sortable': false }
{ className: "centerCellPicOrgLogo", "targets": [ 3 ], 'searchable': false, 'sortable': false },
{ className: "centerCellPicOrgLogo", "targets": [ 4 ]}
]
};
@ -144,16 +147,30 @@ function getOrgRankIcon(rank, size) {
return obj.outerHTML;
}
function createImg(source, size, return_obj) {
function createImg(source, size) {
var obj = document.createElement('object');
obj.height = size;
obj.width = size;
obj.style.margin = 'auto';
obj.data = source;
obj.type = "image/png"
return obj.outerHTML;
}
function createHonorImg(array, size) {
size = 32;
var div = document.createElement('div');
for (badgeNum of array) {
var obj = document.createElement('img');
obj.height = size;
obj.width = size;
obj.style.margin = 'auto';
obj.title = org_honor_badge_title[badgeNum];
obj.src = url_baseHonorLogo+badgeNum+'.svg';
div.appendChild(obj);
}
return div.outerHTML;
}
function generateRankingSheet(rank, rankDec, stepPnt, pnt, Rpnt) {
var Cpnt = pnt - stepPnt;
var Tpnt = Cpnt + Rpnt;
@ -241,7 +258,6 @@ function generateRankingSheet(rank, rankDec, stepPnt, pnt, Rpnt) {
function addToTableFromJson(datatable, url) {
$.getJSON( url, function( data ) {
console.log(data);
for (i in data) {
var row = data[i];
i = parseInt(i);
@ -249,6 +265,7 @@ function addToTableFromJson(datatable, url) {
row.pnts,
getMonthlyRankIcon(row.rank),
getOrgRankIcon(row.orgRank, 60),
createHonorImg(row.honorBadge, 20),
createImg(row.logo_path, 32),
row.org
];
@ -274,6 +291,7 @@ function addLastContributor(datatable, data, update) {
data.pnts,
getMonthlyRankIcon(data.rank),
getOrgRankIcon(data.orgRank, 60),
createHonorImg(data.honorBadge, 20),
createImg(data.logo_path, 32),
data.org,
data.epoch
@ -309,19 +327,19 @@ function updateProgressHeader(org) {
// update color in other dataTables
datatableTop.rows().every( function() {
var row = this.node();
if(this.data()[3] == data.org) { row.classList.add('infoBlue'); } else { row.classList.remove('infoBlue'); }
if(this.data()[5] == data.org) { row.classList.add('selectedOrgInTable'); } else { row.classList.remove('selectedOrgInTable'); }
});
datatableFame.rows().every( function() {
var row = this.node();
if(this.data()[3] == data.org) { row.classList.add('infoBlue'); } else { row.classList.remove('infoBlue'); }
if(this.data()[5] == data.org) { row.classList.add('selectedOrgInTable'); } else { row.classList.remove('selectedOrgInTable'); }
});
datatableCateg.rows().every( function() {
var row = this.node();
if(this.data()[3] == data.org) { row.classList.add('infoBlue'); } else { row.classList.remove('infoBlue'); }
if(this.data()[5] == data.org) { row.classList.add('selectedOrgInTable'); } else { row.classList.remove('selectedOrgInTable'); }
});
datatableLast.rows().every( function() {
var row = this.node();
if(this.data()[3] == data.org) { row.classList.add('infoBlue'); } else { row.classList.remove('infoBlue'); }
if(this.data()[5] == data.org) { row.classList.add('selectedOrgInTable'); } else { row.classList.remove('selectedOrgInTable'); }
});
});
}
@ -381,7 +399,8 @@ $(document).ready(function() {
row.pnts,
getMonthlyRankIcon(row.rank),
getOrgRankIcon(row.orgRank, 44),
row.logo_path,
createHonorImg(row.honorBadge, 20),
createImg(row.logo_path, 32),
row.org,
];
for (categ of categ_list) {

178
static/pics/MISPHonorableIcons/1.svg Normal file
View File

@ -0,0 +1,178 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
sodipodi:docname="MISP_codeContributor.svg"
inkscape:version="0.92.1 r15371"
id="svg9131"
version="1.1"
viewBox="0 0 123.17497 114.51722"
height="114.51722mm"
width="123.17497mm">
<defs
id="defs9125">
<clipPath
id="clipPath312"
clipPathUnits="userSpaceOnUse">
<path
id="path314"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath1086"
clipPathUnits="userSpaceOnUse">
<path
id="path1088"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath844"
clipPathUnits="userSpaceOnUse">
<path
id="path846"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath820"
clipPathUnits="userSpaceOnUse">
<path
id="path822"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath536"
clipPathUnits="userSpaceOnUse">
<path
id="path538"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath516"
clipPathUnits="userSpaceOnUse">
<path
id="path518"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath1064"
clipPathUnits="userSpaceOnUse">
<path
id="path1066"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath312-3"
clipPathUnits="userSpaceOnUse">
<path
id="path314-8"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath312-3-6"
clipPathUnits="userSpaceOnUse">
<path
id="path314-8-6"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath312-7"
clipPathUnits="userSpaceOnUse">
<path
id="path314-0"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath312-3-3"
clipPathUnits="userSpaceOnUse">
<path
id="path314-8-67"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
</defs>
<sodipodi:namedview
inkscape:window-maximized="1"
inkscape:window-y="24"
inkscape:window-x="65"
inkscape:window-height="1056"
inkscape:window-width="1855"
inkscape:pagecheckerboard="true"
showgrid="false"
inkscape:current-layer="layer1"
inkscape:document-units="mm"
inkscape:cy="340.85829"
inkscape:cx="-15.709017"
inkscape:zoom="0.98994949"
inkscape:pageshadow="2"
inkscape:pageopacity="0.0"
borderopacity="1.0"
bordercolor="#666666"
pagecolor="#ffffff"
id="base" />
<metadata
id="metadata9128">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-41.489305,-34.182609)">
<path
id="path4519"
d="m 141.77694,120.43026 c 0,0 0,-36.407008 0,-47.828812 0,-11.421803 -11.4218,-22.843611 -22.84361,-22.843611 -7.61451,0 -7.61451,0 -7.61451,0 V 34.528771 L 88.475209,57.372379 111.31882,80.215982 V 64.98691 c 0,0 3.80725,0 7.61451,0 3.80728,0 7.61455,3.807269 7.61455,7.614538 0,3.807266 0,47.828812 0,47.828812 -4.52114,2.6175 -7.61455,7.49556 -7.61455,13.08747 0,8.44738 6.7817,15.22908 15.22908,15.22908 8.44737,0 15.22907,-6.7817 15.22907,-15.22908 0,-5.59191 -3.0934,-10.46997 -7.61454,-13.08747 z m -7.61453,20.70201 c -4.1642,0 -7.61453,-3.45034 -7.61453,-7.61454 0,-4.16418 3.45033,-7.61454 7.61453,-7.61454 4.16421,0 7.61453,3.45036 7.61453,7.61454 0,4.1642 -3.45032,7.61454 -7.61453,7.61454 z M 73.24614,42.143304 c -8.447376,0 -15.229073,6.781699 -15.229073,15.229075 0,5.591924 3.093405,10.46998 7.614535,13.087482 v 49.851409 c -4.52113,2.61751 -7.614535,7.49557 -7.614535,13.0875 0,8.44738 6.781697,15.22906 15.229073,15.22906 8.447373,0 15.229069,-6.78168 15.229069,-15.22906 0,-5.59193 -3.093406,-10.46999 -7.614534,-13.0875 V 70.459861 c 4.521128,-2.617502 7.614534,-7.495558 7.614534,-13.087482 0,-8.447376 -6.781696,-15.229075 -15.229069,-15.229075 z m 0,98.988966 c -4.1642,0 -7.614538,-3.45034 -7.614538,-7.61454 0,-4.16418 3.450338,-7.61454 7.614538,-7.61454 4.164197,0 7.614535,3.45036 7.614535,7.61454 0,4.1642 -3.450338,7.61454 -7.614535,7.61454 z m 0,-76.14536 c -4.1642,0 -7.614538,-3.450332 -7.614538,-7.614531 0,-4.1642 3.450338,-7.614542 7.614538,-7.614542 4.164197,0 7.614535,3.450342 7.614535,7.614542 0,4.164199 -3.450338,7.614531 -7.614535,7.614531 z"
inkscape:connector-curvature="0"
style="opacity:1;fill:#5f6062;fill-opacity:1;stroke-width:0.1189771" />
<g
style="fill:#2fa1db;fill-opacity:1"
clip-path="url(#clipPath312-3-3)"
id="g310-6-5"
transform="matrix(0.19487456,0,0,-0.19487456,43.704489,196.77524)">
<g
style="fill:#2fa1db;fill-opacity:1"
transform="translate(385.579,529.5928)"
id="g316-3-3">
<path
inkscape:connector-curvature="0"
id="path318-4-5"
style="fill:#2fa1db;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 0,0 h -5.184 v -56.985 c 0,-8.879 -5.16,-16.902 -15.523,-16.902 h -101.465 v -2.709 c 0,-7.851 8.922,-15.763 18.084,-15.763 h 77.581 l 29.678,-17.449 -4.31,17.449 H 0 c 9.156,0 13.287,7.906 13.287,15.763 v 63.068 C 13.287,-5.683 9.156,0 0,0" />
</g>
<g
style="fill:#2fa1db;fill-opacity:1"
transform="translate(349.7253,569.1839)"
id="g320-9-6">
<path
inkscape:connector-curvature="0"
id="path322-7-2"
style="fill:#2fa1db;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 0,0 h -117.85 c -10.369,0 -22.301,-9.211 -22.301,-18.09 v -71.424 c 0,-8.177 10.11,-14.082 19.807,-14.987 l -6.311,-23.958 40.441,23.786 H 0 c 10.363,0 19.937,6.286 19.937,15.159 v 57.786 13.638 C 19.937,-9.211 10.363,0 0,0 m -99.871,-60.292 c -5.88,0 -10.645,4.766 -10.645,10.646 0,5.88 4.765,10.646 10.645,10.646 5.874,0 10.646,-4.766 10.646,-10.646 0,-5.88 -4.772,-10.646 -10.646,-10.646 m 39.764,0 c -5.88,0 -10.646,4.766 -10.646,10.646 0,5.88 4.766,10.646 10.646,10.646 5.88,0 10.646,-4.766 10.646,-10.646 0,-5.88 -4.766,-10.646 -10.646,-10.646 m 39.77,0 c -5.881,0 -10.652,4.766 -10.652,10.646 0,5.88 4.771,10.646 10.652,10.646 5.868,0 10.645,-4.766 10.645,-10.646 0,-5.88 -4.777,-10.646 -10.645,-10.646" />
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

185
static/pics/MISPHonorableIcons/2.svg Normal file
View File

@ -0,0 +1,185 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="123.17497mm"
height="114.51722mm"
viewBox="0 0 123.17497 114.51722"
version="1.1"
id="svg9131"
inkscape:version="0.92.1 r15371"
sodipodi:docname="MISP_donator.svg">
<defs
id="defs9125">
<clipPath
id="clipPath312"
clipPathUnits="userSpaceOnUse">
<path
id="path314"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath1086"
clipPathUnits="userSpaceOnUse">
<path
id="path1088"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath844"
clipPathUnits="userSpaceOnUse">
<path
id="path846"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath820"
clipPathUnits="userSpaceOnUse">
<path
id="path822"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath536"
clipPathUnits="userSpaceOnUse">
<path
id="path538"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath516"
clipPathUnits="userSpaceOnUse">
<path
id="path518"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath1064"
clipPathUnits="userSpaceOnUse">
<path
id="path1066"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath312-3"
clipPathUnits="userSpaceOnUse">
<path
id="path314-8"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath312-3-6"
clipPathUnits="userSpaceOnUse">
<path
id="path314-8-6"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
<clipPath
id="clipPath312-7"
clipPathUnits="userSpaceOnUse">
<path
id="path314-0"
d="M 0,0 H 595.276 V 841.89 H 0 Z"
inkscape:connector-curvature="0" />
</clipPath>
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.98994949"
inkscape:cx="155.51184"
inkscape:cy="300.45219"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
inkscape:pagecheckerboard="true"
inkscape:window-width="1855"
inkscape:window-height="1056"
inkscape:window-x="65"
inkscape:window-y="1104"
inkscape:window-maximized="1" />
<metadata
id="metadata9128">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<g
inkscape:label="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(-41.489305,-34.182609)">
<path
style="fill:#5f6062;stroke:#5f6062;stroke-width:0.265;fill-opacity:1;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="m 83.077572,54.224268 c 0.169068,10.00204 -9.883511,15.00214 -9.464411,25.3611 v 0 0 c -7.663921,-6.98024 -17.974469,-2.48444 -25.527794,-9.04319 -4.99401,-4.33785 -5.389298,-11.20008 -0.703262,-16.32214 4.147608,-4.535757 9.053248,-4.386268 14.2621,-0.28417 0.205052,-6.627016 3.243527,-10.478291 9.38239,-10.741816 6.936581,-0.297392 11.938793,4.415896 12.050977,11.030216 z"
id="path9839"
inkscape:connector-curvature="0" />
<path
style="fill:#5f6062;stroke:#5f6062;stroke-width:0.26458332;fill-opacity:1;stroke-opacity:1"
d="m 164.41658,127.69985 c -0.003,-0.0103 -0.003,-0.0198 -0.007,-0.0307 -0.0177,-0.10927 -0.0402,-0.21722 -0.0651,-0.32623 -0.007,-0.0318 -0.0167,-0.0635 -0.0222,-0.095 -0.0209,-0.0863 -0.0439,-0.17357 -0.0667,-0.25876 -0.0143,-0.05 -0.0288,-0.0992 -0.0458,-0.1487 -0.0198,-0.0685 -0.0408,-0.13705 -0.064,-0.20611 -0.0201,-0.0598 -0.0421,-0.11932 -0.0632,-0.18018 -0.0167,-0.0442 -0.0291,-0.0894 -0.0484,-0.13361 L 148.44157,85.698828 c -1.10781,-2.88184 -3.87509,-4.78393 -6.95987,-4.78393 h -1.44039 -1.63989 -15.39611 v 0 c -6.03488,0 -12.24623,0 -15.98771,0 -17.380477,0 -28.007997,16.89047 -28.007997,16.89047 H 112.0304 l 5.82956,5.829572 0.0828,28.83403 22.09959,-8.8392 v -13.843 l 6.9514,15.12358 -23.80483,9.24983 c -3.8391,1.49093 -5.74093,5.81131 -4.24974,9.64989 1.14644,2.95037 3.96478,4.75747 6.9514,4.75747 0.89667,0 1.80975,-0.16351 2.69796,-0.50879 l 31.1883,-12.11739 c 1.22449,-0.47625 2.25239,-1.24195 3.03635,-2.18864 0.007,-0.0109 0.0167,-0.0204 0.0236,-0.0302 0.0696,-0.0839 0.13653,-0.16801 0.1995,-0.2532 0.0177,-0.023 0.0325,-0.0458 0.0495,-0.0693 0.0558,-0.0736 0.10715,-0.1487 0.16034,-0.22596 0.0217,-0.0315 0.0426,-0.0656 0.0654,-0.0984 0.0429,-0.0677 0.0868,-0.13573 0.12886,-0.20505 0.0241,-0.041 0.0495,-0.0831 0.0743,-0.12276 0.037,-0.063 0.0728,-0.127 0.10609,-0.1913 0.0267,-0.0463 0.0505,-0.0942 0.0759,-0.14102 0.0315,-0.0619 0.0617,-0.12356 0.0921,-0.18547 0.0243,-0.0508 0.0495,-0.10028 0.0712,-0.15161 0.0299,-0.0611 0.0553,-0.12435 0.0804,-0.18812 0.0164,-0.0336 0.031,-0.0667 0.0471,-0.10054 0.004,-0.0177 0.0114,-0.0349 0.0188,-0.0534 0.0265,-0.0659 0.0505,-0.13282 0.0741,-0.20055 0.0185,-0.0479 0.0352,-0.0958 0.0529,-0.14367 0.0257,-0.0778 0.0497,-0.15611 0.0749,-0.23522 0.0106,-0.0378 0.022,-0.0743 0.0336,-0.11377 0.0304,-0.10292 0.0558,-0.20611 0.0825,-0.31088 0.003,-0.0146 0.007,-0.0275 0.0101,-0.0415 0.22755,-0.96388 0.26301,-1.98015 0.0833,-2.99085 z"
id="path9813"
inkscape:connector-curvature="0" />
<path
style="fill:#5f6062;stroke:#5f6062;stroke-width:0.265;fill-opacity:1;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="m 51.580778,111.56344 c -5.4991,0 -9.959181,4.45982 -9.959181,9.95865 0,5.50043 4.459816,9.95892 9.959181,9.95892 5.500423,0 9.958123,-4.45849 9.958123,-9.95892 -2.65e-4,-5.49857 -4.4577,-9.95865 -9.958123,-9.95865 z"
id="path9811"
inkscape:connector-curvature="0" />
<path
style="fill:#5f6062;stroke:#5f6062;stroke-width:0.265;fill-opacity:1;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none"
d="m 119.39957,34.314901 c -11.28924,0 -20.441967,9.15273 -20.441967,20.443027 0,11.29162 9.152727,20.44568 20.441967,20.44568 11.29189,0 20.44462,-9.15406 20.44462,-20.44568 -2.6e-4,-11.290297 -9.15273,-20.443027 -20.44462,-20.443027 z"
id="path593"
inkscape:connector-curvature="0" />
<g
style="fill:#2fa1db;fill-opacity:1"
clip-path="url(#clipPath312-3)"
id="g310-6"
transform="matrix(0.27125139,0,0,-0.27125139,7.5574611,254.83572)">
<g
style="fill:#2fa1db;fill-opacity:1"
transform="translate(385.579,529.5928)"
id="g316-3">
<path
inkscape:connector-curvature="0"
id="path318-4"
style="fill:#2fa1db;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 0,0 h -5.184 v -56.985 c 0,-8.879 -5.16,-16.902 -15.523,-16.902 h -101.465 v -2.709 c 0,-7.851 8.922,-15.763 18.084,-15.763 h 77.581 l 29.678,-17.449 -4.31,17.449 H 0 c 9.156,0 13.287,7.906 13.287,15.763 v 63.068 C 13.287,-5.683 9.156,0 0,0" />
</g>
<g
style="fill:#2fa1db;fill-opacity:1"
transform="translate(349.7253,569.1839)"
id="g320-9">
<path
inkscape:connector-curvature="0"
id="path322-7"
style="fill:#2fa1db;fill-opacity:1;fill-rule:nonzero;stroke:none"
d="m 0,0 h -117.85 c -10.369,0 -22.301,-9.211 -22.301,-18.09 v -71.424 c 0,-8.177 10.11,-14.082 19.807,-14.987 l -6.311,-23.958 40.441,23.786 H 0 c 10.363,0 19.937,6.286 19.937,15.159 v 57.786 13.638 C 19.937,-9.211 10.363,0 0,0 m -99.871,-60.292 c -5.88,0 -10.645,4.766 -10.645,10.646 0,5.88 4.765,10.646 10.645,10.646 5.874,0 10.646,-4.766 10.646,-10.646 0,-5.88 -4.772,-10.646 -10.646,-10.646 m 39.764,0 c -5.88,0 -10.646,4.766 -10.646,10.646 0,5.88 4.766,10.646 10.646,10.646 5.88,0 10.646,-4.766 10.646,-10.646 0,-5.88 -4.766,-10.646 -10.646,-10.646 m 39.77,0 c -5.881,0 -10.652,4.766 -10.652,10.646 0,5.88 4.771,10.646 10.652,10.646 5.868,0 10.645,-4.766 10.645,-10.646 0,-5.88 -4.777,-10.646 -10.645,-10.646" />
</g>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 9.0 KiB

86
static/pics/rankingMISPOrg/14.svg
View File

@ -15,7 +15,7 @@
version="1.1"
id="svg8"
inkscape:version="0.92.1 r15371"
sodipodi:docname="14-General.svg">
sodipodi:docname="14.svg">
<defs
id="defs2" />
<sodipodi:namedview
@ -25,9 +25,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="-84.285714"
inkscape:cy="560"
inkscape:zoom="3.959798"
inkscape:cx="107.05485"
inkscape:cy="38.661822"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@ -55,48 +55,40 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-263.13332)">
<g
transform="matrix(0.26458333,0,0,0.26458333,0.12035921,247.49161)"
inkscape:label="Layer 1"
id="layer1-1">
<g
id="g5478">
<path
inkscape:connector-curvature="0"
id="path5482"
d="M 4.3655218,146.68142 C 4.2166368,146.29338 4.1609914,135.07386 4.2418652,121.74916 L 4.3889086,97.522435 127.92291,97.380318 l 123.534,-0.142116 -0.14672,24.932258 -0.14671,24.93225 -123.26363,0.14212 C 29.58578,147.35818 4.5814298,147.24416 4.3655218,146.68142 Z M 44.539934,122.66153 c 0.106868,-13.1064 -0.03351,-18.46326 -0.498508,-19.02355 -0.529525,-0.63804 -3.631174,-0.75276 -17.051123,-0.63067 l -16.403859,0.14925 -0.148358,19.02343 -0.148357,19.02344 17.050725,-0.14913 17.050726,-0.14912 z m 40.002201,-0.31087 c 0.115945,-14.46905 -0.0081,-18.65404 -0.563412,-19.00653 -0.822351,-0.52201 -31.442049,-0.64091 -32.780516,-0.12729 -0.787535,0.3022 -0.891199,2.48672 -0.891199,18.7804 0,10.14114 0.172726,18.61115 0.383835,18.82226 0.21111,0.21111 7.880561,0.31675 17.043222,0.23476 l 16.659385,-0.14908 z m 40.001935,-0.17894 -0.14835,-19.01516 H 107.77506 91.154398 l -0.148347,19.01516 -0.148346,19.01516 h 16.917355 16.91735 z m 40.56577,0.0126 0.14843,-18.72082 -1.27526,-0.31154 c -0.70139,-0.17134 -8.37425,-0.24041 -17.0508,-0.15349 l -15.77554,0.15805 -0.14884,18.30632 c -0.0819,10.06847 -0.025,18.62908 0.1264,19.02357 0.21611,0.56318 3.87865,0.68519 17.0512,0.56799 l 16.77597,-0.14926 z m 40.00218,-0.0126 -0.14834,-19.01516 -16.27067,-0.14962 c -11.53446,-0.10606 -16.49556,0.037 -17.04323,0.49155 -0.6252,0.51887 -0.77255,4.1026 -0.77255,18.78917 0,9.9814 0.16903,18.31703 0.37561,18.52361 0.20658,0.20659 7.94279,0.37561 17.19157,0.37561 h 16.81596 z m 40.5661,0.48981 c 0.10686,-13.1064 -0.0335,-18.46326 -0.49852,-19.02355 -0.52952,-0.63804 -3.63117,-0.75276 -17.05112,-0.63067 l -16.40386,0.14925 -0.14883,18.30632 c -0.0819,10.06847 -0.025,18.62908 0.12639,19.02357 0.21612,0.56318 3.87866,0.68519 17.05121,0.56799 l 16.77597,-0.14926 z"
style="fill:#a6a3a3;stroke-width:0.56341225" />
<path
inkscape:connector-curvature="0"
id="path5496"
d="m 10.438086,122.17999 0.148358,-19.02343 16.403859,-0.14925 c 13.419949,-0.12209 16.521598,-0.007 17.051123,0.63067 0.465,0.56029 0.605376,5.91715 0.498508,19.02355 l -0.148754,18.24365 -17.050726,0.14912 -17.050725,0.14913 z"
style="fill:#f80909;stroke-width:0.56341225" />
<path
inkscape:connector-curvature="0"
id="path5494"
d="m 50.690843,140.8195 c -0.211109,-0.21111 -0.383835,-8.68112 -0.383835,-18.82226 0,-16.29368 0.103664,-18.4782 0.891199,-18.7804 1.338467,-0.51362 31.958165,-0.39472 32.780516,0.12729 0.555299,0.35249 0.679357,4.53748 0.563412,19.00653 l -0.148685,18.55452 -16.659385,0.14908 c -9.162661,0.082 -16.832112,-0.0237 -17.043222,-0.23476 z"
style="fill:#f80909;fill-opacity:1;stroke-width:0.56341225" />
<path
inkscape:connector-curvature="0"
id="path5492"
d="m 91.006051,122.17172 0.148347,-19.01516 h 16.620662 16.62066 l 0.14835,19.01516 0.14834,19.01516 H 107.77506 90.857705 Z"
style="fill:#f80909;fill-opacity:1;stroke-width:0.56341225" />
<path
inkscape:connector-curvature="0"
id="path5490"
d="m 131.13423,140.48645 c -0.15138,-0.39449 -0.20826,-8.9551 -0.1264,-19.02357 l 0.14884,-18.30632 15.77554,-0.15805 c 8.67655,-0.0869 16.34941,-0.0178 17.0508,0.15349 l 1.27526,0.31154 -0.14843,18.72082 -0.14844,18.72082 -16.77597,0.14926 c -13.17255,0.1172 -16.83509,-0.005 -17.0512,-0.56799 z"
style="fill:#f80909;fill-opacity:1;stroke-width:0.56341225" />
<path
inkscape:connector-curvature="0"
id="path5488"
d="m 171.25284,140.81127 c -0.20658,-0.20658 -0.37561,-8.54221 -0.37561,-18.52361 0,-14.68657 0.14735,-18.2703 0.77255,-18.78917 0.54767,-0.45452 5.50877,-0.59761 17.04323,-0.49155 l 16.27067,0.14962 0.14834,19.01516 0.14835,19.01516 h -16.81596 c -9.24878,0 -16.98499,-0.16902 -17.19157,-0.37561 z"
style="fill:#f80909;fill-opacity:1;stroke-width:0.56341225" />
<path
inkscape:connector-curvature="0"
id="path5480"
d="m 211.70218,140.48645 c -0.15138,-0.39449 -0.20826,-8.9551 -0.12639,-19.02357 l 0.14883,-18.30632 16.40386,-0.14925 c 13.41995,-0.12209 16.5216,-0.007 17.05112,0.63067 0.465,0.56029 0.60538,5.91715 0.49852,19.02355 l -0.14876,18.24365 -16.77597,0.14926 c -13.17255,0.1172 -16.83509,-0.005 -17.05121,-0.56799 z"
style="fill:#f80909;fill-opacity:1;stroke-width:0.56341225" />
</g>
</g>
<path
inkscape:connector-curvature="0"
id="path5480"
d="m 56.133227,284.66198 c -0.04005,-0.10437 -0.0551,-2.36937 -0.03344,-5.03332 l 0.03938,-4.84354 4.340188,-0.0395 c 3.550695,-0.0323 4.37134,-0.002 4.511442,0.16686 0.123031,0.14825 0.160174,1.56558 0.1319,5.03332 l -0.03936,4.82696 -4.438642,0.0395 c -3.485237,0.031 -4.454284,-10e-4 -4.511466,-0.15028 z"
style="fill:#f80909;fill-opacity:1;stroke-width:0.14906949" />
<path
inkscape:connector-curvature="0"
id="path5488"
d="m 45.431006,284.74792 c -0.05466,-0.0547 -0.09938,-2.26012 -0.09938,-4.90103 0,-3.88583 0.03899,-4.83402 0.204404,-4.9713 0.144904,-0.12026 1.457528,-0.15812 4.509354,-0.13006 l 4.304948,0.0396 0.03925,5.03109 0.03925,5.03109 H 49.97961 c -2.447073,0 -4.493945,-0.0447 -4.548603,-0.0994 z"
style="fill:#f80909;fill-opacity:1;stroke-width:0.14906949" />
<path
inkscape:connector-curvature="0"
id="path5492"
d="m 24.199043,279.81621 0.03925,-5.03109 h 4.39755 4.39755 l 0.03925,5.03109 0.03925,5.03109 h -4.476049 -4.47605 z"
style="fill:#f80909;fill-opacity:1;stroke-width:0.14906949" />
<path
inkscape:connector-curvature="0"
id="path5490"
d="m 34.81629,284.66198 c -0.04005,-0.10437 -0.0551,-2.36937 -0.03344,-5.03332 l 0.03938,-4.84354 4.173945,-0.0418 c 2.29567,-0.023 4.325781,-0.005 4.511357,0.0406 l 0.337413,0.0824 -0.03927,4.95321 -0.03927,4.95322 -4.438642,0.0395 c -3.485237,0.031 -4.454284,-0.001 -4.511464,-0.15028 z"
style="fill:#f80909;fill-opacity:1;stroke-width:0.14906949" />
<path
inkscape:connector-curvature="0"
id="path5494"
d="m 13.532311,284.7501 c -0.05586,-0.0558 -0.101556,-2.29688 -0.101556,-4.98005 0,-4.31104 0.02743,-4.88903 0.235796,-4.96898 0.354136,-0.1359 8.455598,-0.10444 8.673178,0.0337 0.146923,0.0933 0.179747,1.20055 0.14907,5.02882 l -0.03934,4.90921 -4.407795,0.0395 c -2.424288,0.0217 -4.453497,-0.006 -4.509353,-0.0621 z"
style="fill:#f80909;fill-opacity:1;stroke-width:0.14906949" />
<path
inkscape:connector-curvature="0"
id="path5496"
d="m 2.8821028,279.8184 0.039253,-5.03328 4.3401877,-0.0395 c 3.5506945,-0.0323 4.3713395,-0.002 4.5114425,0.16686 0.123032,0.14825 0.160173,1.56558 0.131897,5.03332 l -0.03936,4.82696 -4.5113374,0.0395 -4.5113376,0.0394 z"
style="fill:#f80909;stroke-width:0.14906949" />
<path
inkscape:connector-curvature="0"
id="path5482"
d="M 1.2754035,286.30107 C 1.236011,286.1984 1.2212882,283.2299 1.242686,279.70441 l 0.038905,-6.40999 32.685038,-0.0376 32.685037,-0.0376 -0.03882,6.59666 -0.03882,6.59665 -32.613502,0.0376 c -26.0122639,0.03 -32.6279981,-1.8e-4 -32.6851238,-0.14907 z m 10.6294795,-6.35526 c 0.02828,-3.46774 -0.0089,-4.88507 -0.131897,-5.03332 -0.140103,-0.16881 -0.960748,-0.19917 -4.5114425,-0.16686 l -4.3401877,0.0395 -0.039253,5.03328 -0.039253,5.03328 4.5113376,-0.0394 4.5113376,-0.0395 z m 10.583916,-0.0822 c 0.03068,-3.82827 -0.0021,-4.93555 -0.14907,-5.02882 -0.21758,-0.13811 -8.319042,-0.16957 -8.673178,-0.0337 -0.208368,0.0799 -0.235796,0.65794 -0.235796,4.96898 0,2.68317 0.0457,4.9242 0.101556,4.98005 0.05586,0.0559 2.085065,0.0838 4.509353,0.0621 l 4.407795,-0.0395 z m 10.583845,-0.0473 -0.03925,-5.03109 h -4.39755 -4.39755 l -0.03925,5.03109 -0.03925,5.03109 h 4.47605 4.476049 z m 10.733026,0.003 0.03927,-4.95321 -0.337413,-0.0824 c -0.185576,-0.0453 -2.215687,-0.0636 -4.511357,-0.0406 l -4.173945,0.0418 -0.03938,4.84354 c -0.02167,2.66395 -0.0066,4.92895 0.03344,5.03332 0.05718,0.14901 1.026227,0.18129 4.511464,0.15028 l 4.438642,-0.0395 z m 10.58391,-0.003 -0.03925,-5.03109 -4.304948,-0.0396 c -3.051826,-0.0281 -4.36445,0.01 -4.509354,0.13006 -0.165418,0.13728 -0.204404,1.08547 -0.204404,4.9713 0,2.64091 0.04472,4.84638 0.09938,4.90103 0.05466,0.0547 2.10153,0.0994 4.548603,0.0994 h 4.449222 z m 10.733114,0.1296 c 0.02827,-3.46774 -0.0089,-4.88507 -0.1319,-5.03332 -0.140102,-0.16881 -0.960747,-0.19917 -4.511442,-0.16686 l -4.340188,0.0395 -0.03938,4.84354 c -0.02167,2.66395 -0.0066,4.92895 0.03344,5.03332 0.05718,0.14901 1.026229,0.18129 4.511466,0.15028 l 4.438642,-0.0395 z"
style="fill:#a6a3a3;stroke-width:0.14906949" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.2 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

218
static/pics/rankingMISPOrg/15.svg
View File

@ -15,7 +15,7 @@
version="1.1"
id="svg8"
inkscape:version="0.92.1 r15371"
sodipodi:docname="15-Marshal.svg">
sodipodi:docname="15.svg">
<defs
id="defs2" />
<sodipodi:namedview
@ -25,9 +25,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="-84.285714"
inkscape:cy="560"
inkscape:zoom="1.979899"
inkscape:cx="-16.871229"
inkscape:cy="75.427991"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
showgrid="false"
@ -55,150 +55,70 @@
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-263.13332)">
<g
transform="matrix(0.26458333,0,0,0.26458333,0.47693593,249.0448)"
inkscape:label="Layer 1"
id="layer1-5">
<path
style="fill:#a4a2a1;stroke-width:0.57450134"
d="m 7.9803632,163.76207 c -0.2113938,-0.2114 -0.3843524,-20.10938 -0.3843524,-44.21775 0,-42.748803 0.027495,-43.848097 1.1112341,-44.428096 C 10.46673,74.174576 245.48823,74.29641 246.77143,75.239636 c 0.90714,0.666796 0.96632,3.859571 0.82793,44.667474 l -0.14904,43.94935 -119.5428,0.14498 c -65.748543,0.0797 -119.7157629,-0.028 -119.9271568,-0.23937 z"
id="path3768-3"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path4811"
d="m 14.05082,158.49447 c -0.565796,-0.35914 -0.692852,-4.45475 -0.574502,-18.51887 l 0.151957,-18.05773 16.046403,-0.1529 c 12.454663,-0.11867 16.14975,0.01 16.508116,0.5745 0.253943,0.40007 0.465673,8.40007 0.470511,17.77778 0.0076,14.74219 -0.113417,17.17259 -0.893991,17.95316 -0.775209,0.77521 -3.02812,0.90155 -15.942412,0.894 -8.271793,-0.005 -15.366531,-0.21632 -15.766082,-0.46994 z"
style="fill:#f7b634;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4809"
d="M 53.116911,158.49447 C 52.551116,158.13533 52.42406,154.03972 52.54241,139.9756 l 0.151957,-18.05773 16.046402,-0.1529 c 12.454661,-0.11867 16.14975,0.01 16.508118,0.5745 0.253942,0.40007 0.465674,8.5387 0.470511,18.08585 0.0084,16.57863 -0.04113,17.38517 -1.102439,17.95317 -1.320583,0.70675 -30.400682,0.81383 -31.500048,0.11598 z"
style="fill:#f7b634;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4807"
d="m 92.109646,158.18608 c -0.464393,-0.55956 -0.609305,-5.91613 -0.501224,-18.52767 l 0.152036,-17.74054 16.046402,-0.1529 c 12.45466,-0.11867 16.14975,0.01 16.50812,0.5745 0.25394,0.40007 0.46567,8.5387 0.47051,18.08585 0.008,16.57863 -0.0411,17.38517 -1.10244,17.95317 -0.68409,0.36611 -6.84032,0.59471 -16.01569,0.59471 -11.919518,0 -15.035291,-0.15764 -15.557714,-0.78712 z"
style="fill:#f7b634;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4805"
d="m 131.2491,158.49447 c -0.5658,-0.35914 -0.69286,-4.45475 -0.57451,-18.51887 l 0.15196,-18.05773 h 16.37329 16.37329 l 0.15203,17.74054 c 0.10808,12.61154 -0.0368,17.96811 -0.50122,18.52767 -0.52356,0.63085 -3.69028,0.78537 -15.95082,0.77833 -8.41366,-0.005 -15.62448,-0.21632 -16.02402,-0.46994 z"
style="fill:#f7b634;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4803"
d="m 170.31519,158.49447 c -0.5658,-0.35914 -0.69286,-4.45475 -0.5745,-18.51887 l 0.15195,-18.05773 h 16.37329 16.37329 l 0.15203,17.74054 c 0.10809,12.61154 -0.0368,17.96811 -0.50122,18.52767 -0.52356,0.63085 -3.69027,0.78537 -15.95082,0.77833 -8.41366,-0.005 -15.62447,-0.21632 -16.02402,-0.46994 z"
style="fill:#f7b634;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4801"
d="m 209.30792,158.18608 c -0.46439,-0.55956 -0.6093,-5.91613 -0.50122,-18.52767 l 0.15203,-17.74054 h 16.37329 16.37329 l 0.15196,18.05773 c 0.11835,14.06412 -0.009,18.15973 -0.57451,18.51887 -0.39954,0.25362 -7.61036,0.4651 -16.02402,0.46994 -12.26054,0.007 -15.42726,-0.14748 -15.95082,-0.77833 z"
style="fill:#f7b634;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4799"
d="m 14.059151,115.50512 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.10821,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109282,-0.391845 31.301105,0.245999 1.059107,0.566817 1.111234,1.369912 1.111234,17.120139 0,12.087104 -0.185156,16.710584 -0.689401,17.214824 -0.503953,0.50395 -4.792445,0.6772 -15.942413,0.64405 -8.389156,-0.025 -15.576167,-0.17575 -15.971137,-0.33513 z"
style="fill:#f7b634;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4797"
d="m 53.125243,115.50512 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.108209,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109284,-0.391845 31.301104,0.245999 1.05911,0.566817 1.111235,1.369912 1.111235,17.120139 0,12.087104 -0.185156,16.710584 -0.689402,17.214824 -0.503952,0.50395 -4.792444,0.6772 -15.942412,0.64405 -8.389156,-0.025 -15.576168,-0.17575 -15.971137,-0.33513 z"
style="fill:#f7b634;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4795"
d="m 92.191334,115.50512 c -1.014213,-0.40924 -1.041755,-33.536167 -0.02872,-34.549196 0.895527,-0.895528 29.861466,-0.982541 31.520436,-0.09469 1.05912,0.566817 1.11124,1.369912 1.11124,17.120139 0,12.087107 -0.18516,16.710587 -0.68941,17.214827 -0.50395,0.50395 -4.79244,0.6772 -15.9424,0.64405 -8.389159,-0.025 -15.576171,-0.17575 -15.971141,-0.33513 z"
style="fill:#f7b634;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4793"
d="m 131.25743,115.50512 c -1.01422,-0.40924 -1.04176,-33.536167 -0.0287,-34.549196 0.98228,-0.982279 30.96,-0.982279 31.94228,0 0.98397,0.983976 0.98397,33.256296 0,34.240276 -0.50396,0.50395 -4.79245,0.6772 -15.94242,0.64405 -8.38915,-0.025 -15.57616,-0.17575 -15.97113,-0.33513 z"
style="fill:#f60c0c;fill-opacity:1;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4791"
d="m 170.29479,115.1962 c -0.98397,-0.98398 -0.98397,-33.2563 0,-34.240276 0.98228,-0.982279 30.96,-0.982279 31.94228,0 0.98397,0.983976 0.98397,33.256296 0,34.240276 -0.98228,0.98228 -30.96,0.98228 -31.94228,0 z"
style="fill:#f60c0c;fill-opacity:1;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path3766-5"
d="m 209.36088,115.1962 c -0.98397,-0.98398 -0.98397,-33.2563 0,-34.240276 0.98228,-0.982279 30.96,-0.982279 31.94228,0 0.98398,0.983976 0.98398,33.256296 0,34.240276 -0.98228,0.98228 -30.96,0.98228 -31.94228,0 z"
style="fill:#f60c0c;fill-opacity:1;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4785"
d="m 14.05082,158.49447 c -0.565796,-0.35914 -0.692852,-4.45475 -0.574502,-18.51887 l 0.151957,-18.05773 16.046403,-0.1529 c 12.454663,-0.11867 16.14975,0.01 16.508116,0.5745 0.253943,0.40007 0.465673,8.40007 0.470511,17.77778 0.0076,14.74219 -0.113417,17.17259 -0.893991,17.95316 -0.775209,0.77521 -3.02812,0.90155 -15.942412,0.894 -8.271793,-0.005 -15.366531,-0.21632 -15.766082,-0.46994 z"
style="fill:#f60c0c;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4783"
d="M 53.116911,158.49447 C 52.551116,158.13533 52.42406,154.03972 52.54241,139.9756 l 0.151957,-18.05773 16.046402,-0.1529 c 12.454661,-0.11867 16.14975,0.01 16.508118,0.5745 0.253942,0.40007 0.465674,8.5387 0.470511,18.08585 0.0084,16.57863 -0.04113,17.38517 -1.102439,17.95317 -1.320583,0.70675 -30.400682,0.81383 -31.500048,0.11598 z"
style="fill:#f60c0c;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4781"
d="m 92.109646,158.18608 c -0.464393,-0.55956 -0.609305,-5.91613 -0.501224,-18.52767 l 0.152036,-17.74054 16.046402,-0.1529 c 12.45466,-0.11867 16.14975,0.01 16.50812,0.5745 0.25394,0.40007 0.46567,8.5387 0.47051,18.08585 0.008,16.57863 -0.0411,17.38517 -1.10244,17.95317 -0.68409,0.36611 -6.84032,0.59471 -16.01569,0.59471 -11.919518,0 -15.035291,-0.15764 -15.557714,-0.78712 z"
style="fill:#f60c0c;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4779"
d="m 131.17574,158.18608 c -0.4644,-0.55956 -0.60931,-5.91613 -0.50123,-18.52767 l 0.15204,-17.74054 h 16.37329 16.37329 l 0.15266,17.80954 c 0.13914,16.23327 0.0659,17.87309 -0.82793,18.52766 -1.48725,1.08917 -30.81387,1.02539 -31.72212,-0.069 z"
style="fill:#062e5f;fill-opacity:1;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4777"
d="m 170.56791,158.25508 c -0.8938,-0.65457 -0.96708,-2.29439 -0.82793,-18.52766 l 0.15266,-17.80954 h 16.37329 16.37329 l 0.15266,17.80954 c 0.13914,16.23327 0.0659,17.87309 -0.82793,18.52766 -0.72411,0.5303 -4.83006,0.71813 -15.69802,0.71813 -10.86796,0 -14.97391,-0.18783 -15.69802,-0.71813 z"
style="fill:#062e5f;fill-opacity:1;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4775"
d="m 209.634,158.25508 c -0.8938,-0.65457 -0.96707,-2.29439 -0.82793,-18.52766 l 0.15266,-17.80954 h 16.37329 16.37329 l 0.15266,17.80954 c 0.13915,16.23327 0.0659,17.87309 -0.82793,18.52766 -0.72411,0.5303 -4.83006,0.71813 -15.69802,0.71813 -10.86796,0 -14.97391,-0.18783 -15.69802,-0.71813 z"
style="fill:#062e5f;fill-opacity:1;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4773"
d="m 14.059151,115.50512 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.10821,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109282,-0.391845 31.301105,0.245999 1.059107,0.566817 1.111234,1.369912 1.111234,17.120139 0,12.087104 -0.185156,16.710584 -0.689401,17.214824 -0.503953,0.50395 -4.792445,0.6772 -15.942413,0.64405 -8.389156,-0.025 -15.576167,-0.17575 -15.971137,-0.33513 z"
style="fill:#f60c0c;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4771"
d="m 53.125243,115.50512 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.108209,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109284,-0.391845 31.301104,0.245999 1.05911,0.566817 1.111235,1.369912 1.111235,17.120139 0,12.087104 -0.185156,16.710584 -0.689402,17.214824 -0.503952,0.50395 -4.792444,0.6772 -15.942412,0.64405 -8.389156,-0.025 -15.576168,-0.17575 -15.971137,-0.33513 z"
style="fill:#f60c0c;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path3764-6"
d="m 92.191334,115.50512 c -1.014213,-0.40924 -1.041755,-33.536167 -0.02872,-34.549196 0.895527,-0.895528 29.861466,-0.982541 31.520436,-0.09469 1.05912,0.566817 1.11124,1.369912 1.11124,17.120139 0,12.087107 -0.18516,16.710587 -0.68941,17.214827 -0.50395,0.50395 -4.79244,0.6772 -15.9424,0.64405 -8.389159,-0.025 -15.576171,-0.17575 -15.971141,-0.33513 z"
style="fill:#f60c0c;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4825"
d="m 14.05082,158.49447 c -0.565796,-0.35914 -0.692852,-4.45475 -0.574502,-18.51887 l 0.151957,-18.05773 16.046403,-0.1529 c 12.454663,-0.11867 16.14975,0.01 16.508116,0.5745 0.253943,0.40007 0.465673,8.40007 0.470511,17.77778 0.0076,14.74219 -0.113417,17.17259 -0.893991,17.95316 -0.775209,0.77521 -3.02812,0.90155 -15.942412,0.894 -8.271793,-0.005 -15.366531,-0.21632 -15.766082,-0.46994 z"
style="fill:#062e5f;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4823"
d="M 53.116911,158.49447 C 52.551116,158.13533 52.42406,154.03972 52.54241,139.9756 l 0.151957,-18.05773 16.046402,-0.1529 c 12.454661,-0.11867 16.14975,0.01 16.508118,0.5745 0.253942,0.40007 0.465674,8.5387 0.470511,18.08585 0.0084,16.57863 -0.04113,17.38517 -1.102439,17.95317 -1.320583,0.70675 -30.400682,0.81383 -31.500048,0.11598 z"
style="fill:#062e5f;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4821"
d="m 92.109646,158.18608 c -0.464393,-0.55956 -0.609305,-5.91613 -0.501224,-18.52767 l 0.152036,-17.74054 16.046402,-0.1529 c 12.45466,-0.11867 16.14975,0.01 16.50812,0.5745 0.25394,0.40007 0.46567,8.5387 0.47051,18.08585 0.008,16.57863 -0.0411,17.38517 -1.10244,17.95317 -0.68409,0.36611 -6.84032,0.59471 -16.01569,0.59471 -11.919518,0 -15.035291,-0.15764 -15.557714,-0.78712 z"
style="fill:#062e5f;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4819"
d="m 14.059151,115.50512 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.10821,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109282,-0.391845 31.301105,0.245999 1.059107,0.566817 1.111234,1.369912 1.111234,17.120139 0,12.087104 -0.185156,16.710584 -0.689401,17.214824 -0.503953,0.50395 -4.792445,0.6772 -15.942413,0.64405 -8.389156,-0.025 -15.576167,-0.17575 -15.971137,-0.33513 z"
style="fill:#f60c0c;fill-opacity:1;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path4817"
d="m 53.125243,115.50512 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.108209,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109284,-0.391845 31.301104,0.245999 1.05911,0.566817 1.111235,1.369912 1.111235,17.120139 0,12.087104 -0.185156,16.710584 -0.689402,17.214824 -0.503952,0.50395 -4.792444,0.6772 -15.942412,0.64405 -8.389156,-0.025 -15.576168,-0.17575 -15.971137,-0.33513 z"
style="fill:#f60c0c;fill-opacity:1;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path3762-2"
d="m 92.191334,115.50512 c -1.014213,-0.40924 -1.041755,-33.536167 -0.02872,-34.549196 0.895527,-0.895528 29.861466,-0.982541 31.520436,-0.09469 1.05912,0.566817 1.11124,1.369912 1.11124,17.120139 0,12.087107 -0.18516,16.710587 -0.68941,17.214827 -0.50395,0.50395 -4.79244,0.6772 -15.9424,0.64405 -8.389159,-0.025 -15.576171,-0.17575 -15.971141,-0.33513 z"
style="fill:#f60c0c;fill-opacity:1;stroke-width:0.57450134" />
</g>
<path
inkscape:connector-curvature="0"
id="path3768-3"
d="m 2.588407,292.37351 c -0.055931,-0.0559 -0.1016932,-5.3206 -0.1016932,-11.69928 0,-11.31062 0.00727,-11.60147 0.294014,-11.75493 0.4655304,-0.24914 62.6483012,-0.21691 62.9878152,0.0326 0.240014,0.17643 0.255672,1.02118 0.219056,11.81827 l -0.03943,11.62827 -31.629032,0.0384 c -17.395969,0.0211 -31.6747957,-0.007 -31.730727,-0.0633 z"
style="fill:#a4a2a1;stroke-width:0.15200348" />
<path
style="fill:#f60c0c;fill-opacity:1;stroke-width:0.15200348"
d="m 45.534099,279.52379 c -0.260343,-0.26034 -0.260343,-8.79906 0,-9.0594 0.259894,-0.2599 8.191499,-0.2599 8.451394,0 0.260342,0.26034 0.260342,8.79906 0,9.0594 -0.259895,0.2599 -8.1915,0.2599 -8.451394,0 z"
id="path4791"
inkscape:connector-curvature="0" />
<path
style="fill:#f60c0c;fill-opacity:1;stroke-width:0.15200348"
d="m 55.870335,279.52379 c -0.260342,-0.26034 -0.260342,-8.79906 0,-9.0594 0.259895,-0.2599 8.1915,-0.2599 8.451395,0 0.260344,0.26034 0.260344,8.79906 0,9.0594 -0.259895,0.2599 -8.1915,0.2599 -8.451395,0 z"
id="path3766-5"
inkscape:connector-curvature="0" />
<path
style="fill:#062e5f;stroke-width:0.15200348"
d="m 4.1945487,290.97979 c -0.1497002,-0.095 -0.1833171,-1.17865 -0.1520037,-4.89978 l 0.040205,-4.77777 4.2456108,-0.0405 c 3.2952962,-0.0314 4.2729552,0.003 4.3677722,0.152 0.06719,0.10586 0.12321,2.22252 0.12449,4.70371 0.002,3.90054 -0.03001,4.54358 -0.236535,4.75011 -0.205108,0.2051 -0.80119,0.23853 -4.2180971,0.23653 -2.1885786,-10e-4 -4.065728,-0.0572 -4.1714425,-0.12434 z"
id="path4825"
inkscape:connector-curvature="0" />
<path
style="fill:#062e5f;stroke-width:0.15200348"
d="m 14.530785,290.97979 c -0.1497,-0.095 -0.183317,-1.17865 -0.152003,-4.89978 l 0.04021,-4.77777 4.24561,-0.0405 c 3.295296,-0.0314 4.272955,0.003 4.367773,0.152 0.06719,0.10586 0.12321,2.2592 0.12449,4.78522 0.0022,4.38643 -0.01088,4.59982 -0.291687,4.75011 -0.349405,0.18699 -8.043514,0.21532 -8.334388,0.0307 z"
id="path4823"
inkscape:connector-curvature="0" />
<path
style="fill:#062e5f;stroke-width:0.15200348"
d="m 24.847613,290.8982 c -0.122871,-0.14805 -0.161212,-1.56531 -0.132616,-4.90211 l 0.04023,-4.69385 4.245611,-0.0405 c 3.295295,-0.0314 4.272955,0.003 4.367773,0.152 0.06719,0.10586 0.123209,2.2592 0.124489,4.78522 0.0021,4.38643 -0.01087,4.59982 -0.291687,4.75011 -0.180999,0.0969 -1.809834,0.15735 -4.237484,0.15735 -3.153706,0 -3.978088,-0.0417 -4.116312,-0.20826 z"
id="path4821"
inkscape:connector-curvature="0" />
<path
style="fill:#062e5f;fill-opacity:1;stroke-width:0.15200348"
d="m 35.18385,290.8982 c -0.122872,-0.14805 -0.161213,-1.56531 -0.132617,-4.90211 l 0.04023,-4.69385 h 4.3321 4.332099 l 0.04039,4.7121 c 0.03681,4.29506 0.01744,4.72893 -0.219057,4.90211 -0.393501,0.28818 -8.152836,0.2713 -8.393144,-0.0183 z"
id="path4779"
inkscape:connector-curvature="0" />
<path
style="fill:#062e5f;fill-opacity:1;stroke-width:0.15200348"
d="m 45.606362,290.91646 c -0.236485,-0.17319 -0.255874,-0.60706 -0.219057,-4.90211 l 0.04039,-4.71211 h 4.3321 4.3321 l 0.04039,4.71211 c 0.03681,4.29505 0.01744,4.72892 -0.219057,4.90211 -0.191587,0.1403 -1.277953,0.19 -4.153434,0.19 -2.875481,0 -3.961847,-0.0497 -4.153434,-0.19 z"
id="path4777"
inkscape:connector-curvature="0" />
<path
style="fill:#062e5f;fill-opacity:1;stroke-width:0.15200348"
d="m 55.942598,290.91646 c -0.236485,-0.17319 -0.255871,-0.60706 -0.219057,-4.90211 l 0.04039,-4.71211 h 4.332099 4.3321 l 0.04039,4.71211 c 0.03682,4.29505 0.01744,4.72892 -0.219056,4.90211 -0.191588,0.1403 -1.277954,0.19 -4.153435,0.19 -2.875481,0 -3.961847,-0.0497 -4.153434,-0.19 z"
id="path4775"
inkscape:connector-curvature="0" />
<path
style="fill:#f60c0c;fill-opacity:1;stroke-width:0.15200348"
d="m 4.1967529,279.60553 c -0.1460397,-0.0589 -0.1900044,-1.12513 -0.1900044,-4.60784 0,-3.99162 0.028631,-4.54216 0.2404372,-4.62344 0.4246343,-0.16295 7.9664143,-0.10368 8.2817503,0.0651 0.280222,0.14997 0.294014,0.36245 0.294014,4.5297 0,3.19804 -0.04899,4.42134 -0.182404,4.55475 -0.133337,0.13334 -1.268001,0.17918 -4.2180965,0.17041 -2.2196308,-0.007 -4.1211941,-0.0465 -4.2256966,-0.0887 z"
id="path4819"
inkscape:connector-curvature="0" />
<path
style="fill:#f60c0c;fill-opacity:1;stroke-width:0.15200348"
d="m 14.53299,279.60553 c -0.14604,-0.0589 -0.190005,-1.12513 -0.190005,-4.60784 0,-3.99162 0.02863,-4.54216 0.240437,-4.62344 0.424635,-0.16295 7.966415,-0.10368 8.281751,0.0651 0.280223,0.14997 0.294014,0.36245 0.294014,4.5297 0,3.19804 -0.04899,4.42134 -0.182404,4.55475 -0.133338,0.13334 -1.268001,0.17918 -4.218097,0.17041 -2.219631,-0.007 -4.121194,-0.0465 -4.225696,-0.0887 z"
id="path4817"
inkscape:connector-curvature="0" />
<path
style="fill:#f60c0c;fill-opacity:1;stroke-width:0.15200348"
d="m 24.869226,279.60553 c -0.268344,-0.10828 -0.275631,-8.87311 -0.0076,-9.14114 0.236942,-0.23694 7.900846,-0.25997 8.339782,-0.0251 0.280226,0.14997 0.294016,0.36246 0.294016,4.52971 0,3.19804 -0.04899,4.42134 -0.182407,4.55475 -0.133336,0.13334 -1.267999,0.17918 -4.218093,0.17041 -2.219632,-0.007 -4.121195,-0.0465 -4.225698,-0.0887 z"
id="path3762-2"
inkscape:connector-curvature="0" />
<path
style="fill:#f60c0c;fill-opacity:1;stroke-width:0.15200348"
d="m 35.205464,279.60553 c -0.268346,-0.10828 -0.275632,-8.87311 -0.0076,-9.14114 0.259895,-0.2599 8.1915,-0.2599 8.451395,0 0.260342,0.26034 0.260342,8.79906 0,9.0594 -0.133339,0.13334 -1.268002,0.17918 -4.218098,0.17041 -2.21963,-0.007 -4.121193,-0.0465 -4.225695,-0.0887 z"
id="path4793"
inkscape:connector-curvature="0" />
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

91
static/pics/rankingMISPOrg/16.svg
View File

@ -15,7 +15,7 @@
version="1.1"
id="svg8"
inkscape:version="0.92.1 r15371"
sodipodi:docname="16-Grand General.svg">
sodipodi:docname="16.svg">
<defs
id="defs2" />
<sodipodi:namedview
@ -25,11 +25,11 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.35"
inkscape:cx="-84.285714"
inkscape:cy="560"
inkscape:zoom="3.959798"
inkscape:cx="149.5279"
inkscape:cy="32.999857"
inkscape:document-units="mm"
inkscape:current-layer="layer1"
inkscape:current-layer="g3760"
showgrid="false"
units="px"
inkscape:pagecheckerboard="true"
@ -56,32 +56,61 @@
id="layer1"
transform="translate(0,-263.13332)">
<g
transform="matrix(0.26458333,0,0,0.26458333,0.25014905,248.81803)"
inkscape:label="Layer 1"
id="layer1-6">
<g
id="g3760">
<path
inkscape:connector-curvature="0"
id="path3768"
d="m 7.9803632,163.76207 c -0.2113938,-0.2114 -0.3843524,-20.10938 -0.3843524,-44.21775 0,-42.748803 0.027495,-43.848097 1.1112341,-44.428096 C 10.46673,74.174576 245.48823,74.29641 246.77143,75.239636 c 0.90714,0.666796 0.96632,3.859571 0.82793,44.667474 l -0.14904,43.94935 -119.5428,0.14498 c -65.748543,0.0797 -119.7157629,-0.028 -119.9271568,-0.23937 z"
style="fill:#a4a2a1;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path3766"
d="m 14.05082,158.49447 c -0.565796,-0.35914 -0.692852,-4.45475 -0.574502,-18.51887 l 0.151957,-18.05773 16.046403,-0.1529 c 12.454663,-0.11867 16.14975,0.01 16.508116,0.5745 0.253943,0.40007 0.465673,8.40007 0.470511,17.77778 0.0076,14.74219 -0.113417,17.17259 -0.893991,17.95316 -0.775209,0.77521 -3.02812,0.90155 -15.942412,0.894 -8.271793,-0.005 -15.366531,-0.21632 -15.766082,-0.46994 z m 39.066091,0 C 52.551116,158.13533 52.42406,154.03972 52.54241,139.9756 l 0.151957,-18.05773 16.046402,-0.1529 c 12.454661,-0.11867 16.14975,0.01 16.508118,0.5745 0.253942,0.40007 0.465674,8.5387 0.470511,18.08585 0.0084,16.57863 -0.04113,17.38517 -1.102439,17.95317 -1.320583,0.70675 -30.400682,0.81383 -31.500048,0.11598 z m 38.992735,-0.30839 c -0.464393,-0.55956 -0.609305,-5.91613 -0.501224,-18.52767 l 0.152036,-17.74054 16.046402,-0.1529 c 12.45466,-0.11867 16.14975,0.01 16.50812,0.5745 0.25394,0.40007 0.46567,8.5387 0.47051,18.08585 0.008,16.57863 -0.0411,17.38517 -1.10244,17.95317 -0.68409,0.36611 -6.84032,0.59471 -16.01569,0.59471 -11.919518,0 -15.035291,-0.15764 -15.557714,-0.78712 z m 39.139454,0.30839 c -0.5658,-0.35914 -0.69286,-4.45475 -0.57451,-18.51887 l 0.15196,-18.05773 h 16.37329 16.37329 l 0.15203,17.74054 c 0.10808,12.61154 -0.0368,17.96811 -0.50122,18.52767 -0.52356,0.63085 -3.69028,0.78537 -15.95082,0.77833 -8.41366,-0.005 -15.62448,-0.21632 -16.02402,-0.46994 z m 39.06609,0 c -0.5658,-0.35914 -0.69286,-4.45475 -0.5745,-18.51887 l 0.15195,-18.05773 h 16.37329 16.37329 l 0.15203,17.74054 c 0.10809,12.61154 -0.0368,17.96811 -0.50122,18.52767 -0.52356,0.63085 -3.69027,0.78537 -15.95082,0.77833 -8.41366,-0.005 -15.62447,-0.21632 -16.02402,-0.46994 z m 38.99273,-0.30839 c -0.46439,-0.55956 -0.6093,-5.91613 -0.50122,-18.52767 l 0.15203,-17.74054 h 16.37329 16.37329 l 0.15196,18.05773 c 0.11835,14.06412 -0.009,18.15973 -0.57451,18.51887 -0.39954,0.25362 -7.61036,0.4651 -16.02402,0.46994 -12.26054,0.007 -15.42726,-0.14748 -15.95082,-0.77833 z M 14.059151,115.50512 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.10821,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109282,-0.391845 31.301105,0.245999 1.059107,0.566817 1.111234,1.369912 1.111234,17.120139 0,12.087104 -0.185156,16.710584 -0.689401,17.214824 -0.503953,0.50395 -4.792445,0.6772 -15.942413,0.64405 -8.389156,-0.025 -15.576167,-0.17575 -15.971137,-0.33513 z m 39.066092,0 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.108209,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109284,-0.391845 31.301104,0.245999 1.05911,0.566817 1.111235,1.369912 1.111235,17.120139 0,12.087104 -0.185156,16.710584 -0.689402,17.214824 -0.503952,0.50395 -4.792444,0.6772 -15.942412,0.64405 -8.389156,-0.025 -15.576168,-0.17575 -15.971137,-0.33513 z m 39.066091,0 c -1.014213,-0.40924 -1.041755,-33.536167 -0.02872,-34.549196 0.895527,-0.895528 29.861466,-0.982541 31.520436,-0.09469 1.05912,0.566817 1.11124,1.369912 1.11124,17.120139 0,12.087107 -0.18516,16.710587 -0.68941,17.214827 -0.50395,0.50395 -4.79244,0.6772 -15.9424,0.64405 -8.389159,-0.025 -15.576171,-0.17575 -15.971141,-0.33513 z m 39.066096,0 c -1.01422,-0.40924 -1.04176,-33.536167 -0.0287,-34.549196 0.98228,-0.982279 30.96,-0.982279 31.94228,0 0.98397,0.983976 0.98397,33.256296 0,34.240276 -0.50396,0.50395 -4.79245,0.6772 -15.94242,0.64405 -8.38915,-0.025 -15.57616,-0.17575 -15.97113,-0.33513 z m 39.03736,-0.30892 c -0.98397,-0.98398 -0.98397,-33.2563 0,-34.240276 0.98228,-0.982279 30.96,-0.982279 31.94228,0 0.98397,0.983976 0.98397,33.256296 0,34.240276 -0.98228,0.98228 -30.96,0.98228 -31.94228,0 z m 39.06609,0 c -0.98397,-0.98398 -0.98397,-33.2563 0,-34.240276 0.98228,-0.982279 30.96,-0.982279 31.94228,0 0.98398,0.983976 0.98398,33.256296 0,34.240276 -0.98228,0.98228 -30.96,0.98228 -31.94228,0 z"
style="fill:#f7b634;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path3764"
d="m 14.05082,158.49447 c -0.565796,-0.35914 -0.692852,-4.45475 -0.574502,-18.51887 l 0.151957,-18.05773 16.046403,-0.1529 c 12.454663,-0.11867 16.14975,0.01 16.508116,0.5745 0.253943,0.40007 0.465673,8.40007 0.470511,17.77778 0.0076,14.74219 -0.113417,17.17259 -0.893991,17.95316 -0.775209,0.77521 -3.02812,0.90155 -15.942412,0.894 -8.271793,-0.005 -15.366531,-0.21632 -15.766082,-0.46994 z m 39.066091,0 C 52.551116,158.13533 52.42406,154.03972 52.54241,139.9756 l 0.151957,-18.05773 16.046402,-0.1529 c 12.454661,-0.11867 16.14975,0.01 16.508118,0.5745 0.253942,0.40007 0.465674,8.5387 0.470511,18.08585 0.0084,16.57863 -0.04113,17.38517 -1.102439,17.95317 -1.320583,0.70675 -30.400682,0.81383 -31.500048,0.11598 z m 38.992735,-0.30839 c -0.464393,-0.55956 -0.609305,-5.91613 -0.501224,-18.52767 l 0.152036,-17.74054 16.046402,-0.1529 c 12.45466,-0.11867 16.14975,0.01 16.50812,0.5745 0.25394,0.40007 0.46567,8.5387 0.47051,18.08585 0.008,16.57863 -0.0411,17.38517 -1.10244,17.95317 -0.68409,0.36611 -6.84032,0.59471 -16.01569,0.59471 -11.919518,0 -15.035291,-0.15764 -15.557714,-0.78712 z m 39.066094,0 c -0.4644,-0.55956 -0.60931,-5.91613 -0.50123,-18.52767 l 0.15204,-17.74054 h 16.37329 16.37329 l 0.15266,17.80954 c 0.13914,16.23327 0.0659,17.87309 -0.82793,18.52766 -1.48725,1.08917 -30.81387,1.02539 -31.72212,-0.069 z m 39.39217,0.069 c -0.8938,-0.65457 -0.96708,-2.29439 -0.82793,-18.52766 l 0.15266,-17.80954 h 16.37329 16.37329 l 0.15266,17.80954 c 0.13914,16.23327 0.0659,17.87309 -0.82793,18.52766 -0.72411,0.5303 -4.83006,0.71813 -15.69802,0.71813 -10.86796,0 -14.97391,-0.18783 -15.69802,-0.71813 z m 39.06609,0 c -0.8938,-0.65457 -0.96707,-2.29439 -0.82793,-18.52766 l 0.15266,-17.80954 h 16.37329 16.37329 l 0.15266,17.80954 c 0.13915,16.23327 0.0659,17.87309 -0.82793,18.52766 -0.72411,0.5303 -4.83006,0.71813 -15.69802,0.71813 -10.86796,0 -14.97391,-0.18783 -15.69802,-0.71813 z M 14.059151,115.50512 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.10821,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109282,-0.391845 31.301105,0.245999 1.059107,0.566817 1.111234,1.369912 1.111234,17.120139 0,12.087104 -0.185156,16.710584 -0.689401,17.214824 -0.503953,0.50395 -4.792445,0.6772 -15.942413,0.64405 -8.389156,-0.025 -15.576167,-0.17575 -15.971137,-0.33513 z m 39.066092,0 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.108209,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109284,-0.391845 31.301104,0.245999 1.05911,0.566817 1.111235,1.369912 1.111235,17.120139 0,12.087104 -0.185156,16.710584 -0.689402,17.214824 -0.503952,0.50395 -4.792444,0.6772 -15.942412,0.64405 -8.389156,-0.025 -15.576168,-0.17575 -15.971137,-0.33513 z m 39.066091,0 c -1.014213,-0.40924 -1.041755,-33.536167 -0.02872,-34.549196 0.895527,-0.895528 29.861466,-0.982541 31.520436,-0.09469 1.05912,0.566817 1.11124,1.369912 1.11124,17.120139 0,12.087107 -0.18516,16.710587 -0.68941,17.214827 -0.50395,0.50395 -4.79244,0.6772 -15.9424,0.64405 -8.389159,-0.025 -15.576171,-0.17575 -15.971141,-0.33513 z"
style="fill:#f60c0c;stroke-width:0.57450134" />
<path
inkscape:connector-curvature="0"
id="path3762"
d="m 14.05082,158.49447 c -0.565796,-0.35914 -0.692852,-4.45475 -0.574502,-18.51887 l 0.151957,-18.05773 16.046403,-0.1529 c 12.454663,-0.11867 16.14975,0.01 16.508116,0.5745 0.253943,0.40007 0.465673,8.40007 0.470511,17.77778 0.0076,14.74219 -0.113417,17.17259 -0.893991,17.95316 -0.775209,0.77521 -3.02812,0.90155 -15.942412,0.894 -8.271793,-0.005 -15.366531,-0.21632 -15.766082,-0.46994 z m 39.066091,0 C 52.551116,158.13533 52.42406,154.03972 52.54241,139.9756 l 0.151957,-18.05773 16.046402,-0.1529 c 12.454661,-0.11867 16.14975,0.01 16.508118,0.5745 0.253942,0.40007 0.465674,8.5387 0.470511,18.08585 0.0084,16.57863 -0.04113,17.38517 -1.102439,17.95317 -1.320583,0.70675 -30.400682,0.81383 -31.500048,0.11598 z m 38.992735,-0.30839 c -0.464393,-0.55956 -0.609305,-5.91613 -0.501224,-18.52767 l 0.152036,-17.74054 16.046402,-0.1529 c 12.45466,-0.11867 16.14975,0.01 16.50812,0.5745 0.25394,0.40007 0.46567,8.5387 0.47051,18.08585 0.008,16.57863 -0.0411,17.38517 -1.10244,17.95317 -0.68409,0.36611 -6.84032,0.59471 -16.01569,0.59471 -11.919518,0 -15.035291,-0.15764 -15.557714,-0.78712 z M 14.059151,115.50512 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.10821,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109282,-0.391845 31.301105,0.245999 1.059107,0.566817 1.111234,1.369912 1.111234,17.120139 0,12.087104 -0.185156,16.710584 -0.689401,17.214824 -0.503953,0.50395 -4.792445,0.6772 -15.942413,0.64405 -8.389156,-0.025 -15.576167,-0.17575 -15.971137,-0.33513 z m 39.066092,0 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.108209,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109284,-0.391845 31.301104,0.245999 1.05911,0.566817 1.111235,1.369912 1.111235,17.120139 0,12.087104 -0.185156,16.710584 -0.689402,17.214824 -0.503952,0.50395 -4.792444,0.6772 -15.942412,0.64405 -8.389156,-0.025 -15.576168,-0.17575 -15.971137,-0.33513 z m 39.066091,0 c -1.014213,-0.40924 -1.041755,-33.536167 -0.02872,-34.549196 0.895527,-0.895528 29.861466,-0.982541 31.520436,-0.09469 1.05912,0.566817 1.11124,1.369912 1.11124,17.120139 0,12.087107 -0.18516,16.710587 -0.68941,17.214827 -0.50395,0.50395 -4.79244,0.6772 -15.9424,0.64405 -8.389159,-0.025 -15.576171,-0.17575 -15.971141,-0.33513 z"
style="fill:#062e5f;stroke-width:0.57450134" />
</g>
id="g3760"
transform="matrix(0.26458333,0,0,0.26458333,0.25014905,248.81803)">
<path
style="fill:#a4a2a1;stroke-width:0.57450134"
d="m 7.9803632,163.76207 c -0.2113938,-0.2114 -0.3843524,-20.10938 -0.3843524,-44.21775 0,-42.748803 0.027495,-43.848097 1.1112341,-44.428096 C 10.46673,74.174576 245.48823,74.29641 246.77143,75.239636 c 0.90714,0.666796 0.96632,3.859571 0.82793,44.667474 l -0.14904,43.94935 -119.5428,0.14498 c -65.748543,0.0797 -119.7157629,-0.028 -119.9271568,-0.23937 z"
id="path3768"
inkscape:connector-curvature="0" />
<path
style="fill:#062e5f;stroke-width:0.57450134"
d="m 14.05082,158.49447 c -0.565796,-0.35914 -0.692852,-4.45475 -0.574502,-18.51887 l 0.151957,-18.05773 16.046403,-0.1529 c 12.454663,-0.11867 16.14975,0.01 16.508116,0.5745 0.253943,0.40007 0.465673,8.40007 0.470511,17.77778 0.0076,14.74219 -0.113417,17.17259 -0.893991,17.95316 -0.775209,0.77521 -3.02812,0.90155 -15.942412,0.894 -8.271793,-0.005 -15.366531,-0.21632 -15.766082,-0.46994 z"
id="path4545" />
<path
style="fill:#062e5f;stroke-width:0.57450134"
d="M 53.116911,158.49447 C 52.551116,158.13533 52.42406,154.03972 52.54241,139.9756 l 0.151957,-18.05773 16.046402,-0.1529 c 12.454661,-0.11867 16.14975,0.01 16.508118,0.5745 0.253942,0.40007 0.465674,8.5387 0.470511,18.08585 0.0084,16.57863 -0.04113,17.38517 -1.102439,17.95317 -1.320583,0.70675 -30.400682,0.81383 -31.500048,0.11598 z"
id="path4543" />
<path
style="fill:#062e5f;stroke-width:0.57450134"
d="m 92.109646,158.18608 c -0.464393,-0.55956 -0.609305,-5.91613 -0.501224,-18.52767 l 0.152036,-17.74054 16.046402,-0.1529 c 12.45466,-0.11867 16.14975,0.01 16.50812,0.5745 0.25394,0.40007 0.46567,8.5387 0.47051,18.08585 0.008,16.57863 -0.0411,17.38517 -1.10244,17.95317 -0.68409,0.36611 -6.84032,0.59471 -16.01569,0.59471 -11.919518,0 -15.035291,-0.15764 -15.557714,-0.78712 z"
id="path4541" />
<path
style="fill:#062e5f;stroke-width:0.57450134"
d="m 53.125243,115.50512 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.108209,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109284,-0.391845 31.301104,0.245999 1.05911,0.566817 1.111235,1.369912 1.111235,17.120139 0,12.087104 -0.185156,16.710584 -0.689402,17.214824 -0.503952,0.50395 -4.792444,0.6772 -15.942412,0.64405 -8.389156,-0.025 -15.576168,-0.17575 -15.971137,-0.33513 z"
id="path4537" />
<path
style="fill:#062e5f;stroke-width:0.57450134"
d="m 14.059151,115.50512 c -0.551961,-0.22272 -0.718127,-4.25245 -0.718127,-17.415468 0,-15.086425 0.10821,-17.167222 0.908739,-17.474414 1.604917,-0.615864 30.109282,-0.391845 31.301105,0.245999 1.059107,0.566817 1.111234,1.369912 1.111234,17.120139 0,12.087104 -0.185156,16.710584 -0.689401,17.214824 -0.503953,0.50395 -4.792445,0.6772 -15.942413,0.64405 -8.389156,-0.025 -15.576167,-0.17575 -15.971137,-0.33513 z"
id="path4539" />
<path
style="fill:#062e5f;stroke-width:0.57450134"
d="m 92.191334,115.50512 c -1.014213,-0.40924 -1.041755,-33.536167 -0.02872,-34.549196 0.895527,-0.895528 29.861466,-0.982541 31.520436,-0.09469 1.05912,0.566817 1.11124,1.369912 1.11124,17.120139 0,12.087107 -0.18516,16.710587 -0.68941,17.214827 -0.50395,0.50395 -4.79244,0.6772 -15.9424,0.64405 -8.389159,-0.025 -15.576171,-0.17575 -15.971141,-0.33513 z"
id="path3762" />
<path
style="fill:#f7b634;stroke-width:0.57450134"
d="m 131.25743,115.50512 c -1.01422,-0.40924 -1.04176,-33.536167 -0.0287,-34.549196 0.98228,-0.982279 30.96,-0.982279 31.94228,0 0.98397,0.983976 0.98397,33.256296 0,34.240276 -0.50396,0.50395 -4.79245,0.6772 -15.94242,0.64405 -8.38915,-0.025 -15.57616,-0.17575 -15.97113,-0.33513 z"
id="path4515" />
<path
style="fill:#f7b634;stroke-width:0.57450134"
d="m 209.36088,115.1962 c -0.98397,-0.98398 -0.98397,-33.2563 0,-34.240276 0.98228,-0.982279 30.96,-0.982279 31.94228,0 0.98398,0.983976 0.98398,33.256296 0,34.240276 -0.98228,0.98228 -30.96,0.98228 -31.94228,0 z"
id="path3766" />
<path
style="fill:#f60c0c;stroke-width:0.57450134"
d="m 131.17574,158.18608 c -0.4644,-0.55956 -0.60931,-5.91613 -0.50123,-18.52767 l 0.15204,-17.74054 h 16.37329 16.37329 l 0.15266,17.80954 c 0.13914,16.23327 0.0659,17.87309 -0.82793,18.52766 -1.48725,1.08917 -30.81387,1.02539 -31.72212,-0.069 z"
id="path4503" />
<path
style="fill:#f60c0c;stroke-width:0.57450134"
d="m 170.56791,158.25508 c -0.8938,-0.65457 -0.96708,-2.29439 -0.82793,-18.52766 l 0.15266,-17.80954 h 16.37329 16.37329 l 0.15266,17.80954 c 0.13914,16.23327 0.0659,17.87309 -0.82793,18.52766 -0.72411,0.5303 -4.83006,0.71813 -15.69802,0.71813 -10.86796,0 -14.97391,-0.18783 -15.69802,-0.71813 z"
id="path4501" />
<path
style="fill:#f60c0c;stroke-width:0.57450134"
d="m 209.634,158.25508 c -0.8938,-0.65457 -0.96707,-2.29439 -0.82793,-18.52766 l 0.15266,-17.80954 h 16.37329 16.37329 l 0.15266,17.80954 c 0.13915,16.23327 0.0659,17.87309 -0.82793,18.52766 -0.72411,0.5303 -4.83006,0.71813 -15.69802,0.71813 -10.86796,0 -14.97391,-0.18783 -15.69802,-0.71813 z"
id="path4499" />
<path
style="fill:#f7b634;stroke-width:0.57450134"
d="m 170.29479,115.1962 c -0.98397,-0.98398 -0.98397,-33.2563 0,-34.240276 0.98228,-0.982279 30.96,-0.982279 31.94228,0 0.98397,0.983976 0.98397,33.256296 0,34.240276 -0.98228,0.98228 -30.96,0.98228 -31.94228,0 z"
id="path4513" />
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

63
templates/contrib.html
View File

@ -46,23 +46,24 @@
<body>
<!-- Modal -->
<div id="myModal" class="modal fade" role="dialog">
<div class="modal-dialog modal-lg" style="width: 1300px;">
<div class="modal-dialog modal-lg" style="width: 1500px;">
<!-- Modal content-->
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal">&times;</button>
<h4 class="modal-title">Ranks and Point per contribution</h4>
<h4 class="modal-title">Organisation ranking</h4>
</div>
<div class="modal-body">
<p>Ranks are generated by the formula: <pre>Rank = floor(Log(<it>points</it>, {{ rankMultiplier }}))</pre></p>
<ul>
{% for text in additional_help_text %}
<li>{{ text }}</li>
{% endfor %}
</ul>
<div class="row">
<div class="col-lg-6">
<div class="col-lg-4">
<h4>Monthly rank generation:</h4>
<p>Monthly ranks are generated by the formula: <pre>Rank = floor(Log(<it>points</it>, {{ rankMultiplier }}))</pre></p>
<ul>
{% for text in additional_help_text %}
<li>{{ text }}</li>
{% endfor %}
</ul>
<h4>Points awarded by category:</h4>
<div class="table-responsive">
<table class="table table-striped table-bordered">
@ -83,26 +84,53 @@
</table>
</div>
</div>
<div class="col-lg-6">
<h4>Organisation rank title:</h4>
<div class="col-lg-8">
<h4>Global organisation ranking:</h4>
<div class="table-responsive">
<table class="table table-striped table-bordered">
<thead>
<tr>
<th>Org. rank</th>
<th>Title</th>
<th>Points requirement</th>
<th>Contribution requirement</th>
</tr>
</thead>
<tbody>
{% for item in org_rank_list %}
<tr>
<td style='padding: 0px; text-align: right;'><img height='32px' width='64px' style="margin-right: 20px;" src="{{ url_for('static', filename='pics/rankingMISPOrg/1.svg')[:-5]}}{{ item[0] }}.svg" type='image/svg' style="margin: auto;"</img></td>
<td style='padding: 0px; text-align: right;'><img height='35px' width='70px' style="margin-right: 20px;" src="{{ url_for('static', filename='pics/rankingMISPOrg/1.svg')[:-5]}}{{ item[0] }}.svg" type='image/svg' style="margin: auto;"</img></td>
<td>{{ item[1] }}</td>
<td>{{ item[2] }}</td>
<td>{{ item[3] }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
<div class="col-lg-6">
<ul>
{% for text in org_rank_additional_text %}
<li>{{ text }}</li>
{% endfor %}
</ul>
</div>
<div class="col-lg-6">
<table>
<tbody>
{% for item in org_honor_badge_title_list %}
<tr style="height: 85px">
<td>
<div class="circleBadge">
<img height='64px' width='64px' style="margin-top: 5px;" src="{{ url_for('static', filename='pics/MISPHonorableIcons/1.svg')[:-5]}}{{ item[0] }}.svg" type='image/svg' style="margin: auto;"</img>
</div>
</td>
<td style="padding-left: 10px;">{{ item[1] }}</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
</div>
</div>
</div>
@ -166,7 +194,7 @@
<div style="height: 10px;"></div>
<div class="col-lg-8">
<div class="col-lg-8">
<div class="col-lg-6">
<div class="panel panel-default" style="height: 100%;">
<div class="panel-heading bg-info" style="font-weight: bold;">
<i class="fa fa-asterisk " style="margin-right: 5px; color: #f0ad4e;"></i><b>Contributor Ranking</b>
@ -181,6 +209,7 @@
<th>Cur. rank</th>
<th>Org. rank</th>
<th></th>
<th></th>
<th>Organisation</th>
</tr>
</thead>
@ -194,7 +223,7 @@
</div><!-- /.panel -->
</div>
<div class="col-lg-4">
<div class="col-lg-6">
<div class="panel panel-default" style="height: 100%;">
<div class="panel-heading bg-info" style="font-weight: bold;">
<i class="glyphicon glyphicon-fire " style="margin-right: 5px; color: #d9534f;"></i><b>Last contributors</b>
@ -209,6 +238,7 @@
<th>Cur. rank</th>
<th>Org. rank</th>
<th></th>
<th></th>
<th>Organisation</th>
<th>epoch</th>
</tr>
@ -237,6 +267,7 @@
<th>Cur. rank</th>
<th>Org. rank</th>
<th></th>
<th></th>
<th>Organisation</th>
{% for categ in categ_list_str %}
<th>{{ categ }}</th>
@ -273,6 +304,7 @@
<th>Prev. rank</th>
<th>Org. rank</th>
<th></th>
<th></th>
<th>Organisation</th>
</tr>
</thead>
@ -323,6 +355,8 @@
url_baseRankMonthlyLogo = url_baseRankMonthlyLogo.substring(0, url_baseRankMonthlyLogo.length-5);
var url_baseOrgRankLogo = "{{ url_for('static', filename='pics/rankingMISPOrg/1.svg') }}";
url_baseOrgRankLogo = url_baseOrgRankLogo.substring(0, url_baseOrgRankLogo.length-5);
var url_baseHonorLogo = "{{ url_for('static', filename='pics/MISPHonorableIcons/1.svg') }}";
url_baseHonorLogo = url_baseHonorLogo.substring(0, url_baseHonorLogo.length-5);
/* DATA FROM CONF */
var currOrg = "{{ currOrg }}";
@ -330,6 +364,7 @@
var rankMultiplier = {{ rankMultiplier }};
var categ_list = JSON.parse('{{ categ_list|safe }}');
var org_rank_obj = JSON.parse('{{ org_rank_json|safe }}');
var org_honor_badge_title = JSON.parse('{{ org_honor_badge_title|safe }}');
</script>
<script src="{{ url_for('static', filename='js/contrib.js') }}"></script>

50
zmq_subscriber.py
View File

@ -18,6 +18,7 @@ configfile = os.path.join(os.environ['DASH_CONFIG'], 'config.cfg')
cfg = configparser.ConfigParser()
cfg.read(configfile)
ONE_DAY = 60*60*24
ZMQ_URL = cfg.get('RedisGlobal', 'zmq_url')
CHANNEL = cfg.get('RedisLog', 'channel')
CHANNEL_LASTCONTRIB = cfg.get('RedisLog', 'channelLastContributor')
@ -142,10 +143,57 @@ def handleContribution(zmq_name, org, categ, action, pntMultiplier=1):
now = datetime.datetime.now()
nowSec = int(time.time())
serv_redis_db.zadd('CONTRIB_LAST:'+getDateStrFormat(now), nowSec, org)
serv_redis_db.expire('CONTRIB_LAST:'+getDateStrFormat(now), 60*60*24) #expire after 1 day
serv_redis_db.expire('CONTRIB_LAST:'+getDateStrFormat(now), ONE_DAY) #expire after 1 day
updateOrgRank(org, pnts_to_add, eventTime, eventClassification)
publish_log(zmq_name, 'CONTRIBUTION', {'org': org, 'categ': categ, 'action': action, 'epoch': nowSec }, channel=CHANNEL_LASTCONTRIB)
def updateOrgRank(orgName, pnts_to_add, contribType, eventTime, isClassified):
keyname = 'CONTRIB_ORG:{org}:{orgCateg}'
#update total points
serv_redis_db.set(keyname.format(org=orgName, orgCateg='points'), pnts_to_add)
#update contribution Requirement
heavilyCount = 10
recentDays = 31
regularlyDays = 7
isRecent = True if (datetime.datetime.now() - eventTime).days > recentDays
contrib = [] #[[contrib_level, contrib_ttl], [], ...]
if contribType == 'sighting':
#[contrib_level, contrib_ttl]
contrib.append([1, ONE_DAY*365]])
if contribType == 'attribute' or contribType == 'object':
contrib.append([2, ONE_DAY*365])
if contribType == 'proposal' or contribType == 'discussion':
contrib.append([3, ONE_DAY*365])
if contribType == 'sighting' and isRecent:
contrib.append([4, ONE_DAY*recentDays])
if contribType == 'proposal' and isRecent:
contrib.append([5, ONE_DAY*recentDays])
if contribType == 'event':
contrib.append([6, ONE_DAY*365])
if contribType == 'event':
contrib.append([7, ONE_DAY*recentDays])
if contribType == 'event':
contrib.append([8, ONE_DAY*regularlyDays])
if contribType == 'event' and isClassified:
contrib.append([9, ONE_DAY*regularlyDays])
if contribType == 'sighting' and sightingWeekCount>heavilyCount:
contrib.append([10, ONE_DAY*regularlyDays])
if (contribType == 'attribute' or contribType == 'object') and attributeWeekCount>heavilyCount:
contrib.append([11, ONE_DAY*regularlyDays])
if contribType == 'proposal' and proposalWeekCount>heavilyCount:
contrib.append([12, ONE_DAY*regularlyDays])
if contribType == 'event' and eventWeekCount>heavilyCount:
contrib.append([13, ONE_DAY*regularlyDays])
if contribType == 'event' and eventWeekCount>heavilyCount and isClassified:
contrib.append([14, ONE_DAY*regularlyDays])
for rankReq, ttl:
serv_redis_db.set(keyname.format(org=orgName, orgCateg='CONTRIB_REQ_'+str(rankReq)), 1)
serv_redis_db.expire(keyname.format(org=orgName, orgCateg='CONTRIB_REQ_'+str(i)), ttl)
##############
## HANDLERS ##
##############