Compare revisions

20ff1015 · 20ff1015 · 20ff1015 · 20ff1015 · d8a3c36b · d8a3c36b
--- a/themes/bbmri/default/post.php
+++ b/themes/bbmri/default/post.php
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="content-type" content="text/html; charset=utf-8" />
-	<title>POST data</title>
-</head>
-<body onload="document.getElementsByTagName('input')[0].click();">
-	<noscript>
-		<p><strong><?php echo $this->t('{bbmri:bbmri:note}'); ?></strong><?php echo $this->t('{bbmri:bbmri:browser_not_support_javascript}'); ?></p>
-	</noscript> 
-	<form method="post" action="<?php echo htmlspecialchars($this->data['destination']); ?>">
-	<!-- Need to add this element and call click method, because calling submit()
-	on the form causes failed submission if the form has another element with name or id of submit.
-	See: https://developer.mozilla.org/en/DOM/form.submit#Specification -->
-	<input type="submit" style="display:none;" />
 <?php
-if (array_key_exists('post', $this->data)) {
-	$post = $this->data['post'];
-} else {
-	// For backwards compatibility
-	assert('array_key_exists("response", $this->data)');
-	assert('array_key_exists("RelayStateName", $this->data)');
-	assert('array_key_exists("RelayState", $this->data)');
-	$post = array(
-		'SAMLResponse' => $this->data['response'],
-		$this->data['RelayStateName'] => $this->data['RelayState'],
-	);
-}
-/**
- * Write out one or more INPUT elements for the given name-value pair.
- *
- * If the value is a string, this function will write a single INPUT element.
- * If the value is an array, it will write multiple INPUT elements to
- * recreate the array.
- *
- * @param string $name  The name of the element.
- * @param string|array $value  The value of the element.
- */
-function printItem($name, $value) {
-	assert('is_string($name)');
-	assert('is_string($value) || is_array($value)');
-	if (is_string($value)) {
-		echo '<input type="hidden" name="' . htmlspecialchars($name) . '" value="' . htmlspecialchars($value) . '" />';
-		return;
-	}
-	// This is an array...
-	foreach ($value as $index => $item) {
-		printItem($name . '[' . $index . ']', $item);
-	}
-}
-foreach ($post as $name => $value) {
-	printItem($name, $value);
-}
-?>
-		<noscript>
+declare(strict_types=1);
-			<button type="submit" class="btn">Submit</button>
-		</noscript>
-	</form>
-</body>
+include \SimpleSAML\Module::getModuleDir('perun') . '/themes/perun/default/post.php';
-</html>
\ No newline at end of file
--- a/themes/bbmri/perun/disco-tpl.php
+++ b/themes/bbmri/perun/disco-tpl.php
 <?php
-/**
+declare(strict_types=1);
- * This is simple example of template for perun Discovery service
- *
- * Allow type hinting in IDE
- * @var sspmod_perun_DiscoTemplate $this
- */
-$this->data['jquery'] = array('core' => TRUE, 'ui' => TRUE, 'css' => TRUE);
-$this->data['head'] = '<link rel="stylesheet" media="screen" type="text/css" href="' . SimpleSAML\Module::getModuleUrl('discopower/style.css')  . '" />';
-$this->data['head'] .= '<link rel="stylesheet" media="screen" type="text/css" href="' . SimpleSAML\Module::getModuleUrl('bbmri/res/css/disco.css')  . '" />';
-$this->data['head'] .= '<script type="text/javascript" src="' . SimpleSAML\Module::getModuleUrl('discopower/js/jquery.livesearch.js')  . '"></script>';
-$this->data['head'] .= '<script type="text/javascript" src="' . SimpleSAML\Module::getModuleUrl('discopower/js/suggest.js')  . '"></script>';
-$this->data['head'] .= searchScript();
-const WARNING_CONFIG_FILE_NAME = 'config-warning.php';
-const WARNING_IS_ON = 'isOn';
-const WARNING_USER_CAN_CONTINUE = 'userCanContinue';
-const WARNING_TITLE = 'title';
-const WARNING_TEXT = 'text';
-$warningIsOn = false;
-$warningUserCanContinue = null;
-$warningTitle = null;
-$warningText = null;
-$config = null;
-try {
-	$config = SimpleSAML_Configuration::getConfig(WARNING_CONFIG_FILE_NAME);
-} catch (Exception $ex) {
-	SimpleSAML\Logger::warning("bbmri:disco-tpl: missing or invalid config-warning file");
-}
-if ($config != null) {
-	try {
-		$warningIsOn = $config->getBoolean(WARNING_IS_ON);
-	} catch (Exception $ex) {
-		SimpleSAML\Logger::warning("bbmri:disco-tpl: missing or invalid isOn parameter in config-warning file");
-		$warningIsOn = false;
-	}
-}
-if ($warningIsOn) {
-	try {
-		$warningUserCanContinue = $config->getBoolean(WARNING_USER_CAN_CONTINUE);
-	} catch (Exception $ex) {
-		SimpleSAML\Logger::warning("bbmri:disco-tpl: missing or invalid userCanContinue parameter in config-warning file");
-		$warningUserCanContinue = true;
-	}
-	try {
-		$warningTitle = $config->getString(WARNING_TITLE);
-		$warningText = $config->getString(WARNING_TEXT);
-		if (empty($warningTitle) || empty($warningText)) {
-			throw new Exception();
-		}
-	} catch (Exception $ex) {
-		SimpleSAML\Logger::warning("bbmri:disco-tpl: missing or invalid title or text in config-warning file");
-		$warningIsOn = false;
-	}
-}
-# Do not show social IdPs when using addInstitutionApp, show just header Add Institution
-if ($this->isAddInstitutionApp()) {
-	// Translate title in header
-	$this->data['header'] = $this->t('{bbmri:bbmri:add_institution}');
-	$this->includeAtTemplateBase('includes/header.php');
-} else {
-	if ($warningIsOn && !$warningUserCanContinue) {
-		$this->data['header'] = $this->t('{bbmri:bbmri:warning}');
-	}
-	$this->includeAtTemplateBase('includes/header.php');
-	if ($warningIsOn) {
-		if ($warningUserCanContinue) {
-			echo '<div class="alert alert-warning">';
-		} else {
-			echo '<div class="alert alert-danger">';
-		}
-		echo '<h4> <strong>' . $warningTitle . '</strong> </h4>';
-		echo $warningText;
-		echo '</div>';
-	}
-	if (!$warningIsOn || $warningUserCanContinue) {
-		if (!empty($this->getPreferredIdp())) {
-			echo '<p class="descriptionp">' . $this->t('{bbmri:bbmri:previous_selection}') . '</p>';
-			echo '<div class="metalist list-group">';
-			echo showEntry($this, $this->getPreferredIdp(), true);
-			echo '</div>';
-			echo getOr();
-		}
-		echo '<div class="row">';
-		foreach ($this->getIdps('social') AS $idpentry) {
-			echo '<div class="col-md-4">';
-			echo '<div class="metalist list-group">';
-			echo showEntry($this, $idpentry, false);
-			echo '</div>';
-			echo '</div>';
-		}
-		echo '</div>';
-		echo getOr();
-		echo '<p class="descriptionp">';
-		echo $this->t('{bbmri:bbmri:institutional_account}');
-		echo '</p>';
-	}
-}
-if (!$warningIsOn || $warningUserCanContinue) {
-    echo '<div class="inlinesearch">';
-    echo '	<form id="idpselectform" action="?" method="get">
-			<input class="inlinesearchf form-control input-lg" placeholder="' . $this->t('{bbmri:bbmri:type_name_institution}') . '" 
-			type="text" value="" name="query" id="query" autofocus oninput="document.getElementById(\'list\').style.display=\'block\';"/>
-		</form>';
-    echo '</div>';
-    echo '<div class="metalist list-group" id="list">';
-    foreach ($this->getIdps() AS $idpentry) {
-        echo showEntry($this, $idpentry, false);
-    }
-    echo '</div>';
-    echo '<br>';
-    echo '<br>';
-    echo '<div class="no-idp-found alert alert-info">';
-    if ($this->isAddInstitutionApp()) {
-        echo $this->t('{bbmri:bbmri:cannot_find_institution}') . '<a href="mailto:aai-infrastructure@lists.bbmri-eric.eu?subject=Request%20for%20adding%20new%20IdP">aai-infrastructure@lists.bbmri-eric.eu</a>';
-        echo '<div class="metalist list-group">';
-        echo '<a class="btn btn-block social" href="https://adm.hostel.eduid.cz/registrace/k1" style="background: #43554a">';
-        echo '<img src="data:image/png;base64,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">';
-        echo '<strong>' . $this->t('{bbmri:bbmri:create_account_hostel}') . '</strong>';
-        echo '</a>';
-	    echo '<a class="btn btn-block social" href="https://perun.bbmri-eric.eu/non/registrar/?vo=lifescience_hostel&targetnew=https://perun.bbmri-eric.eu/non/registrar/?vo=bbmri&targetexisting=https://perun.bbmri-eric.eu/non/registrar/?vo=bbmri&targetextended=https://perun.bbmri-eric.eu/non/registrar/?vo=bbmri" style="background: #95CC67">';
-	    echo '<img src="data:image/jpeg;base64,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">';
-	    echo '<strong>' . $this->t('{bbmri:bbmri:create_account_lifeScienceHostel}') . '</strong>';
-	    echo '</a>';
-	    echo '</div>';
-    } else {
-        echo $this->t('{bbmri:bbmri:cannot_find_institution_extended}') . '<a class="btn btn-primary" href="https://login.bbmri-eric.eu/add-institution/">' . $this->t('{bbmri:bbmri:add_institution}') . '</a>';
-    }
-    echo '</div>';
-}
-$this->includeAtTemplateBase('includes/footer.php');
-function searchScript() {
-	$script = '<script type="text/javascript">
-	$(document).ready(function() { 
-		$("#query").liveUpdate("#list");
-	});
-	</script>';
-	return $script;
-}
-/**
- * @param sspmod_perun_DiscoTemplate $t
- * @param array $metadata
- * @param bool $favourite
- * @return string html
- */
-function showEntry($t, $metadata, $favourite = false) {
-	if (isset($metadata['tags']) && in_array('social', $metadata['tags'])) {
-		return showEntrySocial($t, $metadata);
-	}
-	$extra = ($favourite ? ' favourite' : '');
-	$html = '<a class="metaentry' . $extra . ' list-group-item" href="' . $t->getContinueUrl($metadata['entityid']) . '">';
-	$html .= '<strong>' . $t->getTranslatedEntityName($metadata) . '</strong>';
-	$html .= showIcon($metadata);
-	$html .= '</a>';
-	return $html;
-}
-/**
- * @param sspmod_perun_DiscoTemplate $t
- * @param array $metadata
- * @return string html
- */
-function showEntrySocial($t, $metadata) {
-	$bck = 'white';
-	if (!empty($metadata['color'])) {
-		$bck = $metadata['color'];
-	}
-	$html = '<a class="btn btn-block social" href="' . $t->getContinueUrl($metadata['entityid'])  . '" style="background: '. $bck .'">';
-	$html .= '<img src="' . $metadata['icon'] . '">';
-	$html .= '<strong>Sign in with ' . $t->getTranslatedEntityName($metadata) . '</strong>';
-	$html .= '</a>';
-	return $html;
-}
-function showIcon($metadata) {
-	$html = '';
-	// Logos are turned off, because they are loaded via URL from IdP. Some IdPs have bad configuration, so it breaks the WAYF.
-	/*if (isset($metadata['UIInfo']['Logo'][0]['url'])) {
-		$html .= '<img src="' . htmlspecialchars(\SimpleSAML\Utils\HTTP::resolveURL($metadata['UIInfo']['Logo'][0]['url'])) . '" class="idp-logo">';
-	} else if (isset($metadata['icon'])) {
-		$html .= '<img src="' . htmlspecialchars(\SimpleSAML\Utils\HTTP::resolveURL($metadata['icon'])) . '" class="idp-logo">';
-	}*/
-	return $html;
-}
-function getOr() {
-	$or  = '<div class="hrline">';
-	$or .= '	<span>or</span>';
-	$or .= '</div>';
-	return $or;
-}
+include \SimpleSAML\Module::getModuleDir('perun') . '/themes/perun/perun/disco-tpl.php';
--- a/www/res/bootstrap/js/npm.js
+++ b/www/res/bootstrap/js/npm.js
 // This file is autogenerated via the `commonjs` Grunt task. You can require() this file in a CommonJS environment.
-require('../../js/transition.js')
+require("../../js/transition.js");
-require('../../js/alert.js')
+require("../../js/alert.js");
-require('../../js/button.js')
+require("../../js/button.js");
-require('../../js/carousel.js')
+require("../../js/carousel.js");
-require('../../js/collapse.js')
+require("../../js/collapse.js");
-require('../../js/dropdown.js')
+require("../../js/dropdown.js");
-require('../../js/modal.js')
+require("../../js/modal.js");
-require('../../js/tooltip.js')
+require("../../js/tooltip.js");
-require('../../js/popover.js')
+require("../../js/popover.js");
-require('../../js/scrollspy.js')
+require("../../js/scrollspy.js");
-require('../../js/tab.js')
+require("../../js/tab.js");
-require('../../js/affix.js')
+require("../../js/affix.js");
\ No newline at end of file
--- a/www/res/css/bbmri.css
+++ b/www/res/css/bbmri.css
 body {
 }
 .ui-widget-content {
-	border: 0px solid #ddd;
+  border: 0px solid #ddd;
 }
 #header {
-	background: transparent;
+  background: transparent;
 }
 #header h1 {
-	line-height: 32px;
+  line-height: 32px;
-	font-size: 28px;
+  font-size: 28px;
-	color: #222;
+  color: #222;
 }
 #header img {
-	/* width: 170px; */
+  /* width: 170px; */
-	/* margin: -16px auto 0 auto; */
+  /* margin: -16px auto 0 auto; */
-	margin: 0 auto 0 auto;
+  margin: 0 auto 0 auto;
 }
 #wrap {
-        margin: 2em auto;
+  margin: 2em auto;
-        max-width: 720px;
+  max-width: 720px;
 }
 #content {
-	margin-top: 0px;
+  margin-top: 0px;
 }
 .btn:hover {
-	background-image: none;
+  background-image: none;
 }
 .ui-widget-header {
-	border-width: 0px;
+  border-width: 0px;
-	border-bottom: 1px solid #ddd;
+  border-bottom: 1px solid #ddd;
-	background: transparent;
+  background: transparent;
 }
 .ui-widget-header .ui-state-default {
-	border: 0px;
+  border: 0px;
-	background: #fff;
+  background: #fff;
-	color: #337ab7;
+  color: #337ab7;
 }
 .ui-widget-header .ui-state-default:hover {
-        background: #eee;
+  background: #eee;
-        color: #23527c;
+  color: #23527c;
 }
 .ui-widget-header .ui-state-active {
-        border: 1px solid #ddd;
+  border: 1px solid #ddd;
 }
 .ui-widget-header .ui-state-active:hover {
-        background: #fff;
+  background: #fff;
 }
 hr {
-	border-top: 1px solid #ddd;
+  border-top: 1px solid #ddd;
 }
 #footer {
-	margin-top: 64px;
+  margin-top: 64px;
-	border-top: 1px solid #ddd;
+  border-top: 1px solid #ddd;
-	text-align: left;
+  text-align: left;
-	padding: 16px;
+  padding: 16px;
 }
 #footer img {
-	margin: 0px 16px;
+  margin: 0px 16px;
 }
--- a/www/res/css/consent.css
+++ b/www/res/css/consent.css
-h3#attributeheader {
-	margin: 0em 0em 0.5em 0em;
-}
-.btn:hover {
-	background-image: none;
-}
-table.attributes {
-	border: inherit;
-	margin-bottom: 20px;
-}
-table.attributes tr td {
-	border-bottom: inherit;
-}
-table#table_with_attributes .attrvalue {
-	padding-left: 2em;
-	margin: 0.2em 0 0.1em 0;
-}
-.table>tbody>tr>td, .table>tbody>tr>th, .table>tfoot>tr>td, .table>tfoot>tr>th, .table>thead>tr>td, .table>thead>tr>th {
-	border-top: none;
-	border-bottom: 1px solid #ddd;
-}
-.btn-no {
-	margin-top: 40px;
-}
-.checkbox input[type=checkbox], .checkbox-inline input[type=checkbox], .radio input[type=radio], .radio-inline input[type=radio] {
-	position: absolute;
-	margin-left: -20px;
-}
-.checkbox-tight label.form-check-label {
-	font-weight: 500;
-}
-#table_with_attributes {
-	border: none;
-}
--- a/www/res/css/disco.css
+++ b/www/res/css/disco.css
-div.metalist {
-	margin: 10px 0px;
-}
-a.metaentry {
-	padding: 10px 15px 10px 35px;
-}
-a.social {
-	padding: 10px;
-	text-align: left;
-	color: white;
-	border: 1px solid rgba(0,0,0,0.2);
-}
-a.social:hover,
-a.social:focus {
-	color: white;
-	background: rgba(0,0,0,0.2);
-	border: 1px solid rgba(0,0,0,0.3);
-	box-shadow: 0px 0px 10px 30px rgba(0,0,0,0.1) inset;
-}
-a.social img {
-	display: inline-block;
-	height: 40px;
-	max-height: 40px;
-	width: 40px;
-	max-width: 40px;
-	padding: 6px;
-	margin: -12px 10px -10px -10px;
-	border-right: 1px solid rgba(0,0,0,0.2);
-}
-a.social:hover img {
-	border-right: 1px solid rgba(0,0,0,0.3);
-}
-a.metaentry.favourite {
-	background-image: url(../../../../resources/icons/silk/star.png);
-	background-position: 10px center;
-}
-a.metaentry:hover {
-	background-position: 10px center;
-}
-a.metaentry .idp-logo {
-	float: right;
-	height: 20px;
-	max-width: 120px;
-}
-a.metaentryrow .idp-logo {
-	max-height: 40px;
-	max-width: 200px;
-	padding: 3px;
-}
-.no-idp-found a.btn {
-	text-decoration: none;
-	color: white;
-	border-bottom: none;
-}
-#misc .container-fluid .col-xs-12:last-child img {
-	max-height: 42px;
-	margin-top: -1px;
-}
-@media screen and (max-width: 950px) {
-	a.metaentryrow .idp-logo {
-		margin-bottom: 10px;
-	}
-	#misc .container-fluid .col-xs-12:last-child img {
-		width: 193px;
-	}
-}
-.inlinesearch {
-	padding: 0px;
-	margin: 10px 0px 20px 0px;
-	float: none;
-}
-form#idpselectform input {
-	width: 100%;
-	background-position: 10px center;
-	padding: 10px 15px 10px 35px;
-	height: 46px;
-}
-.search-box {
-	margin-bottom: 16px;
-}
-.idp-list {
-	margin-bottom: 16px;
-}
-.metarowtable {
-	margin-left: auto;
-	margin-right: auto;
-	width: 500px;;
-	border: 0px;
-	text-align: center;
-}
-.metarowtable td img{
-	display: block;
-	margin-left: auto;
-	margin-right: auto;
-}
-.descriptionp {
-	text-align: center;
-	margin-bottom: 20px;
-}
-.hrline {
-	width: 100%;
-	height: 10px;
-	border-bottom: 1px solid #F0F0F0;
-	text-align: center;
-	margin-top: 20px;
-	margin-bottom: 30px;
-}
-.hrline	span {
-	background-color: #ffffff;
-	padding: 0 20px;
-}
--- a/www/res/img/BBMRI-ERIC-gateway-for-health.svg
+++ b/www/res/img/BBMRI-ERIC-gateway-for-health.svg
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<svg
-	 width="160.41px" height="89.25px" viewBox="0 0 160.41 89.25" enable-background="new 0 0 160.41 89.25" xml:space="preserve">
+   version="1.1"
-<g>
+   id="Ebene_1"
-	<g>
+   x="0px"
+   y="0px"
-			<rect x="23.127" y="57.485" transform="matrix(-0.308 0.9514 -0.9514 -0.308 92.6491 48.0163)" fill="#004481" width="11.47" height="0.438"/>
+   width="160.41px"
-	</g>
+   height="89.25px"
-	<g>
+   viewBox="0 0 160.41 89.25"
-		<polygon fill="#004481" points="30.834,52.178 27.544,42.525 27.262,42.801 38.473,46.885 38.672,46.957 38.751,46.761 
+   enable-background="new 0 0 160.41 89.25"
-			42.137,38.375 41.729,38.211 38.344,46.597 38.623,46.473 27.412,42.391 26.981,42.232 27.13,42.666 30.419,52.318 		"/>
+   xml:space="preserve"
-	</g>
+   xmlns="http://www.w3.org/2000/svg"
-	<g>
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs2783" />
-			<rect x="36.197" y="50.231" transform="matrix(0.4403 0.8978 -0.8978 0.4403 67.9062 -8.0344)" fill="#004481" width="8.401" height="0.439"/>
+<g
-	</g>
+   id="g2598">
-	<g>
+	<g
-		<polygon fill="#004481" points="17.241,49.133 27.453,42.782 27.509,42.747 27.537,42.688 32.601,31.661 32.202,31.479 
+   id="g2580">
-			27.138,42.504 27.221,42.41 17.01,48.761 		"/>
-	</g>
+			<rect
-	<g>
+   x="23.127"
+   y="57.485"
-			<rect x="16.169" y="40.16" transform="matrix(0.9243 0.3818 -0.3818 0.9243 17.0807 -5.3301)" fill="#004481" width="11.608" height="0.439"/>
+   transform="matrix(-0.308 0.9514 -0.9514 -0.308 92.6491 48.0163)"
-	</g>
+   fill="#004481"
-</g>
+   width="11.47"
-<g>
+   height="0.438"
-	<g>
+   id="rect2578" />
-		<circle fill="#004481" cx="27.096" cy="63.161" r="1.367"/>
+	</g>
-		<circle fill="#004481" cx="41.932" cy="38.293" r="3.098"/>
+	<g
-		<circle fill="#004481" cx="42.248" cy="54.223" r="1.294"/>
+   id="g2584">
-		<circle fill="#004481" cx="17.125" cy="48.948" r="1.866"/>
+		<polygon
-		<circle fill="#004481" cx="16.608" cy="38.164" r="2.422"/>
+   fill="#004481"
-	</g>
+   points="30.834,52.178 27.544,42.525 27.262,42.801 38.473,46.885 38.672,46.957 38.751,46.761     42.137,38.375 41.729,38.211 38.344,46.597 38.623,46.473 27.412,42.391 26.981,42.232 27.13,42.666 30.419,52.318   "
-	<g>
+   id="polygon2582" />
-		<rect x="29.781" y="28.949" fill="#EB690B" width="5.241" height="5.24"/>
+	</g>
-		<rect x="37.3" y="45.432" fill="#EB690B" width="2.496" height="2.494"/>
+	<g
-		<rect x="28.213" y="49.833" fill="#EB690B" width="4.828" height="4.829"/>
+   id="g2588">
-		<rect x="25.707" y="40.966" fill="#EB690B" width="3.261" height="3.261"/>
-	</g>
+			<rect
-</g>
+   x="36.197"
-<g>
+   y="50.231"
-	<path fill="#4B4B4D" d="M53.679,49.178c-0.012,0.24-0.024,0.508-0.024,0.913v1.93c0,0.762-0.137,1.229-0.428,1.517
+   transform="matrix(0.4403 0.8978 -0.8978 0.4403 67.9062 -8.0344)"
-		c-0.291,0.302-0.712,0.398-1.09,0.398c-0.359,0-0.756-0.096-0.998-0.274l0.137-0.46c0.198,0.138,0.508,0.261,0.88,0.261
+   fill="#004481"
-		c0.558,0,0.966-0.323,0.966-1.161v-0.371h-0.012c-0.167,0.309-0.489,0.556-0.954,0.556c-0.743,0-1.276-0.7-1.276-1.621
+   width="8.401"
-		c0-1.126,0.663-1.765,1.351-1.765c0.521,0,0.806,0.302,0.936,0.577h0.013l0.024-0.501H53.679z M53.115,50.489
+   height="0.439"
-		c0-0.103-0.006-0.192-0.031-0.275c-0.099-0.35-0.365-0.639-0.762-0.639c-0.521,0-0.892,0.488-0.892,1.257
+   id="rect2586" />
-		c0,0.652,0.297,1.195,0.886,1.195c0.334,0,0.638-0.233,0.756-0.618c0.03-0.103,0.043-0.22,0.043-0.323V50.489z"/>
+	</g>
-	<path fill="#4B4B4D" d="M56.137,52.501l-0.043-0.419h-0.019c-0.167,0.261-0.489,0.495-0.917,0.495
+	<g
-		c-0.607,0-0.917-0.474-0.917-0.955c0-0.803,0.645-1.243,1.803-1.236v-0.069c0-0.274-0.068-0.769-0.682-0.769
+   id="g2592">
-		c-0.278,0-0.569,0.096-0.78,0.247l-0.124-0.398c0.248-0.179,0.607-0.295,0.985-0.295c0.917,0,1.14,0.693,1.14,1.359v1.243
+		<polygon
-		c0,0.288,0.013,0.57,0.05,0.796H56.137z M56.057,50.805c-0.595-0.014-1.271,0.103-1.271,0.748c0,0.392,0.235,0.577,0.515,0.577
+   fill="#004481"
-		c0.39,0,0.638-0.275,0.725-0.556c0.019-0.062,0.031-0.131,0.031-0.192V50.805z"/>
+   points="17.241,49.133 27.453,42.782 27.509,42.747 27.537,42.688 32.601,31.661 32.202,31.479     27.138,42.504 27.221,42.41 17.01,48.761   "
-	<path fill="#4B4B4D" d="M58.012,48.223v0.955h0.78v0.46h-0.78v1.792c0,0.412,0.104,0.646,0.408,0.646
+   id="polygon2590" />
-		c0.143,0,0.248-0.021,0.316-0.041l0.024,0.453c-0.105,0.048-0.272,0.083-0.483,0.083c-0.254,0-0.458-0.089-0.588-0.254
+	</g>
-		c-0.155-0.178-0.211-0.474-0.211-0.865v-1.812h-0.465v-0.46h0.465v-0.797L58.012,48.223z"/>
+	<g
-	<path fill="#4B4B4D" d="M59.587,50.949c0.013,0.817,0.483,1.153,1.028,1.153c0.391,0,0.626-0.075,0.83-0.171l0.093,0.433
+   id="g2596">
-		c-0.191,0.096-0.521,0.206-0.997,0.206c-0.923,0-1.475-0.673-1.475-1.676c0-1.002,0.533-1.792,1.406-1.792
-		c0.979,0,1.239,0.954,1.239,1.565c0,0.124-0.013,0.22-0.018,0.282H59.587z M61.186,50.517c0.006-0.385-0.143-0.982-0.756-0.982
+			<rect
-		c-0.552,0-0.793,0.563-0.837,0.982H61.186z"/>
+   x="16.169"
-	<path fill="#4B4B4D" d="M62.521,49.178l0.396,1.689c0.087,0.371,0.167,0.714,0.224,1.058h0.019
+   y="40.16"
-		c0.067-0.336,0.167-0.694,0.266-1.051l0.489-1.696h0.459l0.465,1.662c0.111,0.398,0.198,0.748,0.266,1.085h0.02
+   transform="matrix(0.9243 0.3818 -0.3818 0.9243 17.0807 -5.3301)"
-		c0.049-0.336,0.13-0.687,0.229-1.078l0.428-1.668h0.539l-0.967,3.323h-0.495l-0.459-1.586c-0.105-0.371-0.191-0.701-0.267-1.092
+   fill="#004481"
-		h-0.012c-0.074,0.398-0.167,0.741-0.272,1.099l-0.483,1.579h-0.496l-0.904-3.323H62.521z"/>
+   width="11.608"
-	<path fill="#4B4B4D" d="M68.417,52.501l-0.043-0.419h-0.019c-0.168,0.261-0.489,0.495-0.917,0.495
+   height="0.439"
-		c-0.607,0-0.917-0.474-0.917-0.955c0-0.803,0.645-1.243,1.803-1.236v-0.069c0-0.274-0.068-0.769-0.682-0.769
+   id="rect2594" />
-		c-0.278,0-0.569,0.096-0.78,0.247l-0.124-0.398c0.248-0.179,0.607-0.295,0.985-0.295c0.917,0,1.14,0.693,1.14,1.359v1.243
+	</g>
-		c0,0.288,0.013,0.57,0.05,0.796H68.417z M68.337,50.805c-0.595-0.014-1.271,0.103-1.271,0.748c0,0.392,0.235,0.577,0.515,0.577
+</g>
-		c0.39,0,0.638-0.275,0.725-0.556c0.019-0.062,0.031-0.131,0.031-0.192V50.805z"/>
+<g
-	<path fill="#4B4B4D" d="M69.809,49.178l0.657,1.964c0.067,0.22,0.142,0.48,0.191,0.68h0.013c0.056-0.199,0.117-0.453,0.192-0.693
+   id="g2622">
-		l0.595-1.95h0.576l-0.818,2.369c-0.391,1.14-0.656,1.724-1.028,2.081c-0.267,0.261-0.532,0.364-0.669,0.392l-0.137-0.508
+	<g
-		c0.137-0.048,0.316-0.144,0.478-0.295c0.148-0.13,0.334-0.364,0.458-0.673c0.025-0.062,0.044-0.11,0.044-0.144
+   id="g2610">
-		c0-0.034-0.013-0.083-0.037-0.158l-1.109-3.062H69.809z"/>
+		<circle
-	<path fill="#4B4B4D" d="M73.729,52.501v-2.863h-0.421v-0.46h0.421V49.02c0-0.467,0.093-0.893,0.347-1.16
+   fill="#004481"
-		c0.205-0.22,0.477-0.309,0.731-0.309c0.192,0,0.359,0.048,0.465,0.096l-0.074,0.467c-0.081-0.041-0.192-0.076-0.348-0.076
+   cx="27.096"
-		c-0.464,0-0.582,0.454-0.582,0.961v0.179h0.725v0.46h-0.725v2.863H73.729z"/>
+   cy="63.161"
-	<path fill="#4B4B4D" d="M78.03,50.812c0,1.229-0.769,1.765-1.493,1.765c-0.812,0-1.438-0.659-1.438-1.71
+   r="1.367"
-		c0-1.112,0.656-1.765,1.487-1.765C77.447,49.102,78.03,49.795,78.03,50.812z M75.651,50.846c0,0.728,0.378,1.277,0.91,1.277
+   id="circle2600" />
-		c0.521,0,0.911-0.542,0.911-1.291c0-0.563-0.254-1.277-0.898-1.277C75.93,49.555,75.651,50.214,75.651,50.846z"/>
+		<circle
-	<path fill="#4B4B4D" d="M78.635,50.214c0-0.391-0.006-0.728-0.024-1.037h0.477l0.019,0.652h0.025
+   fill="#004481"
-		c0.136-0.446,0.464-0.728,0.83-0.728c0.062,0,0.105,0.007,0.154,0.021v0.57c-0.056-0.014-0.111-0.021-0.185-0.021
+   cx="41.932"
-		c-0.384,0-0.656,0.323-0.732,0.776c-0.012,0.083-0.024,0.179-0.024,0.282v1.771h-0.539V50.214z"/>
+   cy="38.293"
-	<path fill="#4B4B4D" d="M81.805,47.626h0.545v2.073h0.013c0.087-0.171,0.223-0.322,0.391-0.425
+   r="3.098"
-		c0.161-0.103,0.353-0.172,0.558-0.172c0.402,0,1.047,0.275,1.047,1.421v1.978h-0.546v-1.909c0-0.536-0.179-0.989-0.693-0.989
+   id="circle2602" />
-		c-0.354,0-0.632,0.274-0.731,0.604c-0.03,0.083-0.037,0.172-0.037,0.289v2.005h-0.545V47.626z"/>
+		<circle
-	<path fill="#4B4B4D" d="M85.464,50.949c0.013,0.817,0.483,1.153,1.028,1.153c0.391,0,0.626-0.075,0.83-0.171l0.093,0.433
+   fill="#004481"
-		c-0.191,0.096-0.521,0.206-0.997,0.206c-0.923,0-1.475-0.673-1.475-1.676c0-1.002,0.533-1.792,1.406-1.792
+   cx="42.248"
-		c0.979,0,1.239,0.954,1.239,1.565c0,0.124-0.013,0.22-0.019,0.282H85.464z M87.062,50.517c0.006-0.385-0.143-0.982-0.756-0.982
+   cy="54.223"
-		c-0.552,0-0.793,0.563-0.837,0.982H87.062z"/>
+   r="1.294"
-	<path fill="#4B4B4D" d="M89.841,52.501l-0.043-0.419h-0.019c-0.168,0.261-0.489,0.495-0.917,0.495
+   id="circle2604" />
-		c-0.607,0-0.917-0.474-0.917-0.955c0-0.803,0.645-1.243,1.803-1.236v-0.069c0-0.274-0.068-0.769-0.682-0.769
+		<circle
-		c-0.278,0-0.569,0.096-0.78,0.247l-0.124-0.398c0.248-0.179,0.607-0.295,0.985-0.295c0.917,0,1.14,0.693,1.14,1.359v1.243
+   fill="#004481"
-		c0,0.288,0.013,0.57,0.05,0.796H89.841z M89.761,50.805c-0.595-0.014-1.271,0.103-1.271,0.748c0,0.392,0.235,0.577,0.515,0.577
+   cx="17.125"
-		c0.39,0,0.638-0.275,0.725-0.556c0.019-0.062,0.031-0.131,0.031-0.192V50.805z"/>
+   cy="48.948"
-	<path fill="#4B4B4D" d="M91.084,47.626h0.545v4.875h-0.545V47.626z"/>
+   r="1.866"
-	<path fill="#4B4B4D" d="M93.117,48.223v0.955h0.78v0.46h-0.78v1.792c0,0.412,0.104,0.646,0.408,0.646
+   id="circle2606" />
-		c0.143,0,0.248-0.021,0.316-0.041l0.024,0.453c-0.106,0.048-0.272,0.083-0.483,0.083c-0.254,0-0.458-0.089-0.588-0.254
+		<circle
-		c-0.155-0.178-0.211-0.474-0.211-0.865v-1.812h-0.465v-0.46h0.465v-0.797L93.117,48.223z"/>
+   fill="#004481"
-	<path fill="#4B4B4D" d="M94.427,47.626h0.545v2.073h0.013c0.087-0.171,0.223-0.322,0.391-0.425
+   cx="16.608"
-		c0.161-0.103,0.353-0.172,0.558-0.172c0.402,0,1.047,0.275,1.047,1.421v1.978h-0.546v-1.909c0-0.536-0.18-0.989-0.693-0.989
+   cy="38.164"
-		c-0.353,0-0.632,0.274-0.731,0.604c-0.03,0.083-0.037,0.172-0.037,0.289v2.005h-0.545V47.626z"/>
+   r="2.422"
-</g>
+   id="circle2608" />
-<g>
+	</g>
-	<g>
+	<g
+   id="g2620">
-			<rect x="23.148" y="57.485" transform="matrix(-0.308 0.9514 -0.9514 -0.308 92.6766 47.9963)" fill="#004481" width="11.47" height="0.438"/>
+		<rect
-	</g>
+   x="29.781"
-	<g>
+   y="28.949"
-		<polygon fill="#004481" points="30.855,52.177 27.565,42.525 27.283,42.801 38.494,46.884 38.693,46.957 38.772,46.761 
+   fill="#EB690B"
-			42.158,38.374 41.75,38.211 38.365,46.597 38.644,46.472 27.433,42.39 27.002,42.233 27.151,42.667 30.44,52.318 		"/>
+   width="5.241"
-	</g>
+   height="5.24"
-	<g>
+   id="rect2612" />
+		<rect
-			<rect x="36.217" y="50.231" transform="matrix(0.4403 0.8979 -0.8979 0.4403 67.921 -8.0518)" fill="#004481" width="8.402" height="0.439"/>
+   x="37.3"
-	</g>
+   y="45.432"
-	<g>
+   fill="#EB690B"
-		<polygon fill="#004481" points="17.262,49.134 27.474,42.782 27.53,42.747 27.558,42.687 32.622,31.661 32.223,31.478 
+   width="2.496"
-			27.159,42.505 27.242,42.409 17.031,48.761 		"/>
+   height="2.494"
-	</g>
+   id="rect2614" />
-	<g>
+		<rect
+   x="28.213"
-			<rect x="16.19" y="40.16" transform="matrix(0.9242 0.3819 -0.3819 0.9242 17.0856 -5.3385)" fill="#004481" width="11.608" height="0.44"/>
+   y="49.833"
-	</g>
+   fill="#EB690B"
-</g>
+   width="4.828"
-<g>
+   height="4.829"
-	<g>
+   id="rect2616" />
-		<circle fill="#004481" cx="27.117" cy="63.161" r="1.367"/>
+		<rect
-		<path fill="#004481" d="M38.855,38.292c0,1.713,1.388,3.1,3.099,3.1c1.711,0,3.098-1.387,3.098-3.1
+   x="25.707"
-			c0-1.709-1.387-3.096-3.098-3.096C40.243,35.196,38.855,36.583,38.855,38.292z"/>
+   y="40.966"
-		<circle fill="#004481" cx="42.269" cy="54.222" r="1.294"/>
+   fill="#EB690B"
-		<circle fill="#004481" cx="17.146" cy="48.948" r="1.866"/>
+   width="3.261"
-		<circle fill="#004481" cx="16.629" cy="38.163" r="2.422"/>
+   height="3.261"
-	</g>
+   id="rect2618" />
-	<g>
+	</g>
-		<rect x="29.802" y="28.95" fill="#EB690B" width="5.241" height="5.239"/>
+</g>
-		<rect x="37.321" y="45.431" fill="#EB690B" width="2.496" height="2.495"/>
-		<rect x="28.234" y="49.833" fill="#EB690B" width="4.828" height="4.828"/>
+<g
-		<rect x="25.728" y="40.966" fill="#EB690B" width="3.261" height="3.26"/>
+   id="g2678">
-	</g>
+	<g
-</g>
+   id="g2660">
-<g>
-	<g>
+			<rect
+   x="23.148"
-			<rect x="23.194" y="57.485" transform="matrix(-0.308 0.9514 -0.9514 -0.308 92.7379 47.9517)" fill="#004481" width="11.47" height="0.438"/>
+   y="57.485"
-	</g>
+   transform="matrix(-0.308 0.9514 -0.9514 -0.308 92.6766 47.9963)"
-	<g>
+   fill="#004481"
-		<polygon fill="#004481" points="30.902,52.177 27.612,42.525 27.33,42.801 38.541,46.884 38.74,46.957 38.819,46.761 
+   width="11.47"
-			42.205,38.374 41.797,38.211 38.412,46.597 38.691,46.472 27.48,42.39 27.049,42.233 27.198,42.667 30.487,52.318 		"/>
+   height="0.438"
-	</g>
+   id="rect2658" />
-	<g>
+	</g>
+	<g
-			<rect x="36.264" y="50.231" transform="matrix(0.4403 0.8979 -0.8979 0.4403 67.9473 -8.0939)" fill="#004481" width="8.402" height="0.439"/>
+   id="g2664">
-	</g>
+		<polygon
-	<g>
+   fill="#004481"
-		<polygon fill="#004481" points="17.309,49.134 27.521,42.782 27.577,42.747 27.605,42.687 32.668,31.661 32.27,31.478 
+   points="30.855,52.177 27.565,42.525 27.283,42.801 38.494,46.884 38.693,46.957 38.772,46.761     42.158,38.374 41.75,38.211 38.365,46.597 38.644,46.472 27.433,42.39 27.002,42.233 27.151,42.667 30.44,52.318   "
-			27.206,42.505 27.289,42.409 17.078,48.761 		"/>
+   id="polygon2662" />
 	</g>
-	<g>
+	<g
+   id="g2668">
-			<rect x="16.236" y="40.16" transform="matrix(0.9242 0.3819 -0.3819 0.9242 17.0892 -5.3564)" fill="#004481" width="11.608" height="0.44"/>
-	</g>
+			<rect
-</g>
+   x="36.217"
-<g>
+   y="50.231"
-	<g>
+   transform="matrix(0.4403 0.8979 -0.8979 0.4403 67.921 -8.0518)"
-		<circle fill="#004481" cx="27.164" cy="63.161" r="1.367"/>
+   fill="#004481"
-		<path fill="#004481" d="M38.902,38.292c0,1.713,1.388,3.1,3.099,3.1s3.098-1.387,3.098-3.1c0-1.709-1.387-3.096-3.098-3.096
+   width="8.402"
-			S38.902,36.583,38.902,38.292z"/>
+   height="0.439"
-		<circle fill="#004481" cx="42.316" cy="54.222" r="1.294"/>
+   id="rect2666" />
-		<circle fill="#004481" cx="17.193" cy="48.948" r="1.866"/>
+	</g>
-		<circle fill="#004481" cx="16.676" cy="38.163" r="2.422"/>
+	<g
-	</g>
+   id="g2672">
-	<g>
+		<polygon
-		<rect x="29.849" y="28.95" fill="#EB690B" width="5.241" height="5.239"/>
+   fill="#004481"
-		<rect x="37.368" y="45.431" fill="#EB690B" width="2.496" height="2.495"/>
+   points="17.262,49.134 27.474,42.782 27.53,42.747 27.558,42.687 32.622,31.661 32.223,31.478     27.159,42.505 27.242,42.409 17.031,48.761   "
-		<rect x="28.281" y="49.833" fill="#EB690B" width="4.828" height="4.828"/>
+   id="polygon2670" />
-		<rect x="25.775" y="40.966" fill="#EB690B" width="3.261" height="3.26"/>
+	</g>
-	</g>
+	<g
-</g>
+   id="g2676">
-<g>
-	<g>
+			<rect
-		<g>
+   x="16.19"
-			<path fill="#4B4B4D" d="M58.721,41.548c-0.327,0.489-0.742,0.863-1.247,1.122c-0.505,0.258-1.056,0.428-1.653,0.509
+   y="40.16"
-				c-0.598,0.081-1.173,0.121-1.728,0.121h-3.88V31.259h4.102c0.616,0,1.182,0.06,1.7,0.181c0.517,0.121,0.963,0.302,1.339,0.543
+   transform="matrix(0.9242 0.3819 -0.3819 0.9242 17.0856 -5.3385)"
-				c0.375,0.242,0.668,0.549,0.877,0.923c0.209,0.374,0.314,0.808,0.314,1.303c0,0.586-0.142,1.095-0.425,1.526
+   fill="#004481"
-				c-0.283,0.432-0.72,0.756-1.311,0.975c0.727,0.173,1.309,0.518,1.746,1.035c0.437,0.518,0.656,1.133,0.656,1.846
+   width="11.608"
-				C59.21,40.407,59.047,41.06,58.721,41.548z M55.423,33.449c-0.358-0.23-0.868-0.345-1.533-0.345h-1.09v3.019h1.053
+   height="0.44"
-				c0.702,0,1.229-0.135,1.58-0.405c0.351-0.27,0.526-0.664,0.526-1.182C55.958,34.042,55.78,33.68,55.423,33.449z M56.014,38.392
+   id="rect2674" />
-				c-0.407-0.316-0.979-0.475-1.718-0.475h-1.497v3.502h1.497c0.764,0,1.342-0.158,1.737-0.474c0.394-0.316,0.591-0.745,0.591-1.285
+	</g>
-				C56.624,39.131,56.42,38.708,56.014,38.392z"/>
+</g>
-			<path fill="#4B4B4D" d="M68.808,41.548c-0.327,0.489-0.742,0.863-1.247,1.122c-0.505,0.258-1.056,0.428-1.653,0.509
+<g
-				c-0.598,0.081-1.173,0.121-1.728,0.121H60.3V31.259h4.102c0.616,0,1.182,0.06,1.7,0.181c0.517,0.121,0.963,0.302,1.339,0.543
+   id="g2702">
-				c0.376,0.242,0.668,0.549,0.878,0.923c0.209,0.374,0.314,0.808,0.314,1.303c0,0.586-0.142,1.095-0.425,1.526
+	<g
-				c-0.283,0.432-0.72,0.756-1.312,0.975c0.727,0.173,1.309,0.518,1.746,1.035c0.437,0.518,0.656,1.133,0.656,1.846
+   id="g2690">
-				C69.297,40.407,69.134,41.06,68.808,41.548z M65.51,33.449c-0.358-0.23-0.868-0.345-1.533-0.345h-1.09v3.019h1.053
+		<circle
-				c0.702,0,1.229-0.135,1.579-0.405c0.351-0.27,0.526-0.664,0.526-1.182C66.045,34.042,65.867,33.68,65.51,33.449z M66.101,38.392
+   fill="#004481"
-				c-0.407-0.316-0.979-0.475-1.718-0.475h-1.497v3.502h1.497c0.764,0,1.342-0.158,1.737-0.474c0.394-0.316,0.591-0.745,0.591-1.285
+   cx="27.117"
-				C66.71,39.131,66.507,38.708,66.101,38.392z"/>
+   cy="63.161"
-			<path fill="#4B4B4D" d="M82.618,43.299c-0.012-1.61-0.055-3.226-0.129-4.847c-0.074-1.621-0.154-3.168-0.24-4.641h-0.019
+   r="1.367"
-				l-3.307,9.488h-2.55l-3.344-9.488h-0.019c-0.074,1.449-0.142,2.987-0.203,4.615c-0.062,1.627-0.099,3.251-0.111,4.873h-2.31
+   id="circle2680" />
-				c0.025-2.001,0.093-4.002,0.204-6.003c0.111-2.001,0.265-4.014,0.461-6.038h3.621l3.085,9.125h0.037l3.011-9.125h3.603
+		<path
-				c0.197,2.035,0.354,4.06,0.471,6.072c0.117,2.013,0.188,4.002,0.212,5.969H82.618z"/>
+   fill="#004481"
-			<path fill="#4B4B4D" d="M93.314,43.299l-2.974-5.02h-1.201v5.02h-2.587V31.259h4.434c0.665,0,1.269,0.069,1.811,0.207
+   d="M38.855,38.292c0,1.713,1.388,3.1,3.099,3.1c1.711,0,3.098-1.387,3.098-3.1    c0-1.709-1.387-3.096-3.098-3.096C40.243,35.196,38.855,36.583,38.855,38.292z"
-				c0.542,0.138,1.007,0.342,1.395,0.612c0.388,0.27,0.689,0.607,0.905,1.009c0.215,0.403,0.323,0.875,0.323,1.415
+   id="path2682" />
-				c0,0.817-0.234,1.504-0.702,2.062c-0.468,0.558-1.146,0.958-2.032,1.199l3.51,5.538H93.314z M92.233,33.579
+		<circle
-				c-0.327-0.282-0.822-0.422-1.487-0.422h-1.607v3.226h1.33c0.727,0,1.284-0.158,1.672-0.474c0.388-0.316,0.582-0.733,0.582-1.251
+   fill="#004481"
-				C92.723,34.22,92.56,33.861,92.233,33.579z"/>
+   cx="42.269"
-			<path fill="#4B4B4D" d="M97.193,43.299V31.259h2.586v12.041H97.193z"/>
+   cy="54.222"
-			<path fill="#4B4B4D" d="M101.055,39.608V37.71h4.859v1.897H101.055z"/>
+   r="1.294"
-			<path fill="#4B4B4D" d="M107.188,43.299V31.259h7.593v1.897h-5.007v2.967h4.323v1.897h-4.323v3.381h5.081v1.897H107.188z"/>
+   id="circle2684" />
-			<path fill="#4B4B4D" d="M123.408,43.299l-2.974-5.02h-1.201v5.02h-2.586V31.259h4.434c0.665,0,1.269,0.069,1.811,0.207
+		<circle
-				c0.542,0.138,1.007,0.342,1.395,0.612c0.388,0.27,0.689,0.607,0.905,1.009c0.215,0.403,0.323,0.875,0.323,1.415
+   fill="#004481"
-				c0,0.817-0.234,1.504-0.702,2.062c-0.468,0.558-1.146,0.958-2.032,1.199l3.51,5.538H123.408z M122.328,33.579
+   cx="17.146"
-				c-0.327-0.282-0.822-0.422-1.487-0.422h-1.607v3.226h1.331c0.727,0,1.284-0.158,1.672-0.474c0.388-0.316,0.582-0.733,0.582-1.251
+   cy="48.948"
-				C122.817,34.22,122.654,33.861,122.328,33.579z"/>
+   r="1.866"
-			<path fill="#4B4B4D" d="M127.288,43.299V31.259h2.586v12.041H127.288z"/>
+   id="circle2686" />
-			<path fill="#4B4B4D" d="M139.518,43.342c-0.628,0.109-1.244,0.164-1.847,0.164c-2.106,0-3.71-0.52-4.813-1.561
+		<circle
-				c-1.102-1.041-1.653-2.539-1.653-4.494c0-1.012,0.157-1.917,0.471-2.717c0.314-0.799,0.764-1.469,1.349-2.009
+   fill="#004481"
-				c0.585-0.541,1.287-0.955,2.106-1.242c0.819-0.288,1.733-0.431,2.744-0.431c0.554,0,1.111,0.055,1.672,0.163
+   cx="16.629"
-				c0.561,0.109,1.1,0.274,1.617,0.492l-0.61,1.863c-0.418-0.196-0.862-0.348-1.33-0.458c-0.468-0.109-0.936-0.164-1.404-0.164
+   cy="38.163"
-				c-0.641,0-1.204,0.109-1.69,0.328c-0.487,0.219-0.896,0.521-1.229,0.906c-0.333,0.385-0.581,0.839-0.748,1.363
+   r="2.422"
-				c-0.166,0.523-0.249,1.095-0.249,1.716c0,1.357,0.342,2.421,1.025,3.191c0.684,0.771,1.678,1.156,2.984,1.156
+   id="circle2688" />
-				c0.456,0,0.924-0.046,1.404-0.138c0.48-0.092,0.942-0.224,1.386-0.396l0.48,1.846C140.701,43.092,140.146,43.233,139.518,43.342z
+	</g>
-				"/>
+	<g
-		</g>
+   id="g2700">
-	</g>
+		<rect
-	<g>
+   x="29.802"
-		<path fill="#4B4B4D" d="M148.421,32.192c0,1.209-1.016,2.158-2.338,2.158c-1.308,0-2.352-0.949-2.352-2.158
+   y="28.95"
-			c0-1.183,1.043-2.132,2.352-2.132C147.406,30.06,148.421,31.009,148.421,32.192z M144.316,32.192c0,0.949,0.752,1.703,1.781,1.703
+   fill="#EB690B"
-			c1.002,0,1.74-0.754,1.74-1.69c0-0.949-0.738-1.716-1.753-1.716S144.316,31.256,144.316,32.192z M145.722,33.311h-0.529v-2.132
+   width="5.241"
-			c0.209-0.039,0.501-0.065,0.877-0.065c0.431,0,0.626,0.065,0.793,0.156c0.125,0.091,0.223,0.26,0.223,0.468
+   height="5.239"
-			c0,0.234-0.195,0.416-0.473,0.494v0.026c0.223,0.078,0.348,0.234,0.418,0.521c0.069,0.325,0.111,0.455,0.167,0.533h-0.57
+   id="rect2692" />
-			c-0.07-0.078-0.111-0.273-0.181-0.52c-0.042-0.234-0.181-0.338-0.473-0.338h-0.251V33.311z M145.736,32.102h0.25
+		<rect
-			c0.292,0,0.529-0.091,0.529-0.312c0-0.195-0.153-0.325-0.487-0.325c-0.139,0-0.236,0.013-0.292,0.026V32.102z"/>
+   x="37.321"
-	</g>
+   y="45.431"
-</g>
+   fill="#EB690B"
-</svg>
+   width="2.496"
+   height="2.495"
+   id="rect2694" />
+		<rect
+   x="28.234"
+   y="49.833"
+   fill="#EB690B"
+   width="4.828"
+   height="4.828"
+   id="rect2696" />
+		<rect
+   x="25.728"
+   y="40.966"
+   fill="#EB690B"
+   width="3.261"
+   height="3.26"
+   id="rect2698" />
+	</g>
+</g>
+<g
+   id="g2724">
+	<g
+   id="g2706">
+			<rect
+   x="23.194"
+   y="57.485"
+   transform="matrix(-0.308 0.9514 -0.9514 -0.308 92.7379 47.9517)"
+   fill="#004481"
+   width="11.47"
+   height="0.438"
+   id="rect2704" />
+	</g>
+	<g
+   id="g2710">
+		<polygon
+   fill="#004481"
+   points="30.902,52.177 27.612,42.525 27.33,42.801 38.541,46.884 38.74,46.957 38.819,46.761     42.205,38.374 41.797,38.211 38.412,46.597 38.691,46.472 27.48,42.39 27.049,42.233 27.198,42.667 30.487,52.318   "
+   id="polygon2708" />
+	</g>
+	<g
+   id="g2714">
+			<rect
+   x="36.264"
+   y="50.231"
+   transform="matrix(0.4403 0.8979 -0.8979 0.4403 67.9473 -8.0939)"
+   fill="#004481"
+   width="8.402"
+   height="0.439"
+   id="rect2712" />
+	</g>
+	<g
+   id="g2718">
+		<polygon
+   fill="#004481"
+   points="17.309,49.134 27.521,42.782 27.577,42.747 27.605,42.687 32.668,31.661 32.27,31.478     27.206,42.505 27.289,42.409 17.078,48.761   "
+   id="polygon2716" />
+	</g>
+	<g
+   id="g2722">
+			<rect
+   x="16.236"
+   y="40.16"
+   transform="matrix(0.9242 0.3819 -0.3819 0.9242 17.0892 -5.3564)"
+   fill="#004481"
+   width="11.608"
+   height="0.44"
+   id="rect2720" />
+	</g>
+</g>
+<g
+   id="g2748">
+	<g
+   id="g2736">
+		<circle
+   fill="#004481"
+   cx="27.164"
+   cy="63.161"
+   r="1.367"
+   id="circle2726" />
+		<path
+   fill="#004481"
+   d="M38.902,38.292c0,1.713,1.388,3.1,3.099,3.1s3.098-1.387,3.098-3.1c0-1.709-1.387-3.096-3.098-3.096    S38.902,36.583,38.902,38.292z"
+   id="path2728" />
+		<circle
+   fill="#004481"
+   cx="42.316"
+   cy="54.222"
+   r="1.294"
+   id="circle2730" />
+		<circle
+   fill="#004481"
+   cx="17.193"
+   cy="48.948"
+   r="1.866"
+   id="circle2732" />
+		<circle
+   fill="#004481"
+   cx="16.676"
+   cy="38.163"
+   r="2.422"
+   id="circle2734" />
+	</g>
+	<g
+   id="g2746">
+		<rect
+   x="29.849"
+   y="28.95"
+   fill="#EB690B"
+   width="5.241"
+   height="5.239"
+   id="rect2738" />
+		<rect
+   x="37.368"
+   y="45.431"
+   fill="#EB690B"
+   width="2.496"
+   height="2.495"
+   id="rect2740" />
+		<rect
+   x="28.281"
+   y="49.833"
+   fill="#EB690B"
+   width="4.828"
+   height="4.828"
+   id="rect2742" />
+		<rect
+   x="25.775"
+   y="40.966"
+   fill="#EB690B"
+   width="3.261"
+   height="3.26"
+   id="rect2744" />
+	</g>
+</g>
+<g
+   id="g2778">
+	<g
+   id="g2772">
+		<g
+   id="g2770">
+			<path
+   fill="#4B4B4D"
+   d="M58.721,41.548c-0.327,0.489-0.742,0.863-1.247,1.122c-0.505,0.258-1.056,0.428-1.653,0.509     c-0.598,0.081-1.173,0.121-1.728,0.121h-3.88V31.259h4.102c0.616,0,1.182,0.06,1.7,0.181c0.517,0.121,0.963,0.302,1.339,0.543     c0.375,0.242,0.668,0.549,0.877,0.923c0.209,0.374,0.314,0.808,0.314,1.303c0,0.586-0.142,1.095-0.425,1.526     c-0.283,0.432-0.72,0.756-1.311,0.975c0.727,0.173,1.309,0.518,1.746,1.035c0.437,0.518,0.656,1.133,0.656,1.846     C59.21,40.407,59.047,41.06,58.721,41.548z M55.423,33.449c-0.358-0.23-0.868-0.345-1.533-0.345h-1.09v3.019h1.053     c0.702,0,1.229-0.135,1.58-0.405c0.351-0.27,0.526-0.664,0.526-1.182C55.958,34.042,55.78,33.68,55.423,33.449z M56.014,38.392     c-0.407-0.316-0.979-0.475-1.718-0.475h-1.497v3.502h1.497c0.764,0,1.342-0.158,1.737-0.474c0.394-0.316,0.591-0.745,0.591-1.285     C56.624,39.131,56.42,38.708,56.014,38.392z"
+   id="path2750" />
+			<path
+   fill="#4B4B4D"
+   d="M68.808,41.548c-0.327,0.489-0.742,0.863-1.247,1.122c-0.505,0.258-1.056,0.428-1.653,0.509     c-0.598,0.081-1.173,0.121-1.728,0.121H60.3V31.259h4.102c0.616,0,1.182,0.06,1.7,0.181c0.517,0.121,0.963,0.302,1.339,0.543     c0.376,0.242,0.668,0.549,0.878,0.923c0.209,0.374,0.314,0.808,0.314,1.303c0,0.586-0.142,1.095-0.425,1.526     c-0.283,0.432-0.72,0.756-1.312,0.975c0.727,0.173,1.309,0.518,1.746,1.035c0.437,0.518,0.656,1.133,0.656,1.846     C69.297,40.407,69.134,41.06,68.808,41.548z M65.51,33.449c-0.358-0.23-0.868-0.345-1.533-0.345h-1.09v3.019h1.053     c0.702,0,1.229-0.135,1.579-0.405c0.351-0.27,0.526-0.664,0.526-1.182C66.045,34.042,65.867,33.68,65.51,33.449z M66.101,38.392     c-0.407-0.316-0.979-0.475-1.718-0.475h-1.497v3.502h1.497c0.764,0,1.342-0.158,1.737-0.474c0.394-0.316,0.591-0.745,0.591-1.285     C66.71,39.131,66.507,38.708,66.101,38.392z"
+   id="path2752" />
+			<path
+   fill="#4B4B4D"
+   d="M82.618,43.299c-0.012-1.61-0.055-3.226-0.129-4.847c-0.074-1.621-0.154-3.168-0.24-4.641h-0.019     l-3.307,9.488h-2.55l-3.344-9.488h-0.019c-0.074,1.449-0.142,2.987-0.203,4.615c-0.062,1.627-0.099,3.251-0.111,4.873h-2.31     c0.025-2.001,0.093-4.002,0.204-6.003c0.111-2.001,0.265-4.014,0.461-6.038h3.621l3.085,9.125h0.037l3.011-9.125h3.603     c0.197,2.035,0.354,4.06,0.471,6.072c0.117,2.013,0.188,4.002,0.212,5.969H82.618z"
+   id="path2754" />
+			<path
+   fill="#4B4B4D"
+   d="M93.314,43.299l-2.974-5.02h-1.201v5.02h-2.587V31.259h4.434c0.665,0,1.269,0.069,1.811,0.207     c0.542,0.138,1.007,0.342,1.395,0.612c0.388,0.27,0.689,0.607,0.905,1.009c0.215,0.403,0.323,0.875,0.323,1.415     c0,0.817-0.234,1.504-0.702,2.062c-0.468,0.558-1.146,0.958-2.032,1.199l3.51,5.538H93.314z M92.233,33.579     c-0.327-0.282-0.822-0.422-1.487-0.422h-1.607v3.226h1.33c0.727,0,1.284-0.158,1.672-0.474c0.388-0.316,0.582-0.733,0.582-1.251     C92.723,34.22,92.56,33.861,92.233,33.579z"
+   id="path2756" />
+			<path
+   fill="#4B4B4D"
+   d="M97.193,43.299V31.259h2.586v12.041H97.193z"
+   id="path2758" />
+			<path
+   fill="#4B4B4D"
+   d="M101.055,39.608V37.71h4.859v1.897H101.055z"
+   id="path2760" />
+			<path
+   fill="#4B4B4D"
+   d="M107.188,43.299V31.259h7.593v1.897h-5.007v2.967h4.323v1.897h-4.323v3.381h5.081v1.897H107.188z"
+   id="path2762" />
+			<path
+   fill="#4B4B4D"
+   d="M123.408,43.299l-2.974-5.02h-1.201v5.02h-2.586V31.259h4.434c0.665,0,1.269,0.069,1.811,0.207     c0.542,0.138,1.007,0.342,1.395,0.612c0.388,0.27,0.689,0.607,0.905,1.009c0.215,0.403,0.323,0.875,0.323,1.415     c0,0.817-0.234,1.504-0.702,2.062c-0.468,0.558-1.146,0.958-2.032,1.199l3.51,5.538H123.408z M122.328,33.579     c-0.327-0.282-0.822-0.422-1.487-0.422h-1.607v3.226h1.331c0.727,0,1.284-0.158,1.672-0.474c0.388-0.316,0.582-0.733,0.582-1.251     C122.817,34.22,122.654,33.861,122.328,33.579z"
+   id="path2764" />
+			<path
+   fill="#4B4B4D"
+   d="M127.288,43.299V31.259h2.586v12.041H127.288z"
+   id="path2766" />
+			<path
+   fill="#4B4B4D"
+   d="M139.518,43.342c-0.628,0.109-1.244,0.164-1.847,0.164c-2.106,0-3.71-0.52-4.813-1.561     c-1.102-1.041-1.653-2.539-1.653-4.494c0-1.012,0.157-1.917,0.471-2.717c0.314-0.799,0.764-1.469,1.349-2.009     c0.585-0.541,1.287-0.955,2.106-1.242c0.819-0.288,1.733-0.431,2.744-0.431c0.554,0,1.111,0.055,1.672,0.163     c0.561,0.109,1.1,0.274,1.617,0.492l-0.61,1.863c-0.418-0.196-0.862-0.348-1.33-0.458c-0.468-0.109-0.936-0.164-1.404-0.164     c-0.641,0-1.204,0.109-1.69,0.328c-0.487,0.219-0.896,0.521-1.229,0.906c-0.333,0.385-0.581,0.839-0.748,1.363     c-0.166,0.523-0.249,1.095-0.249,1.716c0,1.357,0.342,2.421,1.025,3.191c0.684,0.771,1.678,1.156,2.984,1.156     c0.456,0,0.924-0.046,1.404-0.138c0.48-0.092,0.942-0.224,1.386-0.396l0.48,1.846C140.701,43.092,140.146,43.233,139.518,43.342z     "
+   id="path2768" />
+		</g>
+	</g>
+	<g
+   id="g2776">
+		<path
+   fill="#4B4B4D"
+   d="M148.421,32.192c0,1.209-1.016,2.158-2.338,2.158c-1.308,0-2.352-0.949-2.352-2.158    c0-1.183,1.043-2.132,2.352-2.132C147.406,30.06,148.421,31.009,148.421,32.192z M144.316,32.192c0,0.949,0.752,1.703,1.781,1.703    c1.002,0,1.74-0.754,1.74-1.69c0-0.949-0.738-1.716-1.753-1.716S144.316,31.256,144.316,32.192z M145.722,33.311h-0.529v-2.132    c0.209-0.039,0.501-0.065,0.877-0.065c0.431,0,0.626,0.065,0.793,0.156c0.125,0.091,0.223,0.26,0.223,0.468    c0,0.234-0.195,0.416-0.473,0.494v0.026c0.223,0.078,0.348,0.234,0.418,0.521c0.069,0.325,0.111,0.455,0.167,0.533h-0.57    c-0.07-0.078-0.111-0.273-0.181-0.52c-0.042-0.234-0.181-0.338-0.473-0.338h-0.251V33.311z M145.736,32.102h0.25    c0.292,0,0.529-0.091,0.529-0.312c0-0.195-0.153-0.325-0.487-0.325c-0.139,0-0.236,0.013-0.292,0.026V32.102z"
+   id="path2774" />
+	</g>
+</g>
+</svg>
--- a/www/res/img/BBMRI-ERIC-gateway-for-health_216.png
+++ b/www/res/img/BBMRI-ERIC-gateway-for-health_216.png
--- a/www/res/img/BBMRI-ERIC-gateway-for-health_430.png
+++ b/www/res/img/BBMRI-ERIC-gateway-for-health_430.png
--- a/www/res/img/BBMRI-ERIC-gateway-for-health_860.png
+++ b/www/res/img/BBMRI-ERIC-gateway-for-health_860.png
No results found