Commit 43962cc5 authored by Flavio TARSETTI's avatar Flavio TARSETTI

Merge branch 'cleanup_ui' into 'django3_migration'

Cleanup ui

See merge request !368
parents dcdeb845 97020b42
Pipeline #42702 passed with stage
in 15 minutes and 9 seconds
...@@ -32,10 +32,12 @@ ...@@ -32,10 +32,12 @@
from django import forms from django import forms
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
from .widgets import CodeMirrorFileWidget, CodeMirrorTextarea
from ..common.models import Contribution from ..common.models import Contribution
from ..common.utils import validate_restructuredtext from ..common.utils import validate_restructuredtext
from .widgets import CodeMirrorFileWidget
from .widgets import CodeMirrorTextarea
class NameField(forms.CharField): class NameField(forms.CharField):
"""A specialization of the CharField that runs algo name validation""" """A specialization of the CharField that runs algo name validation"""
...@@ -46,11 +48,11 @@ class NameField(forms.CharField): ...@@ -46,11 +48,11 @@ class NameField(forms.CharField):
def to_python(self, value): def to_python(self, value):
"""Converts the name to a valid python value""" """Converts the name to a valid python value"""
if not value: if not value:
raise forms.ValidationError(u'A non-blank name is required.') raise forms.ValidationError(u"A non-blank name is required.")
return Contribution.sanitize_name(value) return Contribution.sanitize_name(value)
#----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
class CodeMirrorCharField(forms.CharField): class CodeMirrorCharField(forms.CharField):
...@@ -61,57 +63,62 @@ class CodeMirrorCharField(forms.CharField): ...@@ -61,57 +63,62 @@ class CodeMirrorCharField(forms.CharField):
codemirror_kwargs = dict(codemirror_kwargs) codemirror_kwargs = dict(codemirror_kwargs)
# handles the readonly attribute gracefully # handles the readonly attribute gracefully
if 'readonly' in kwargs: if "readonly" in kwargs:
if kwargs['readonly']: if kwargs["readonly"]:
config = codemirror_kwargs.get('config', {}) config = codemirror_kwargs.get("config", {})
config['readOnly'] = True config["readOnly"] = True
codemirror_kwargs['config'] = config codemirror_kwargs["config"] = config
del kwargs['readonly'] del kwargs["readonly"]
kwargs.update({'widget': CodeMirrorTextarea(**codemirror_kwargs)}) kwargs.update({"widget": CodeMirrorTextarea(**codemirror_kwargs)})
super(CodeMirrorCharField, self).__init__(*args, **kwargs) super(CodeMirrorCharField, self).__init__(*args, **kwargs)
def to_python(self, data): def to_python(self, data):
clean_data = data.replace('\r', '') if data else '' clean_data = data.replace("\r", "") if data else ""
return super(CodeMirrorCharField, self).to_python(clean_data) return super(CodeMirrorCharField, self).to_python(clean_data)
class CodeMirrorRSTCharField(CodeMirrorCharField): class CodeMirrorRSTCharField(CodeMirrorCharField):
"""Allows editing a text field with a source code editor""" """Allows editing a text field with a source code editor"""
def __init__(self, codemirror_kwargs={}, *args, **kwargs): def __init__(self, codemirror_kwargs={}, *args, **kwargs):
codemirror_kwargs = dict(codemirror_kwargs) codemirror_kwargs = dict(codemirror_kwargs)
addon_js = list(codemirror_kwargs.get('addon_js', [])) addon_js = list(codemirror_kwargs.get("addon_js", []))
addon_js += [ addon_js += [
"display/rulers", "display/rulers",
] ]
codemirror_kwargs['addon_js'] = addon_js codemirror_kwargs["addon_js"] = addon_js
codemirror_kwargs['mode'] = 'rst' codemirror_kwargs["mode"] = "rst"
config = codemirror_kwargs.get('config', {}) config = codemirror_kwargs.get("config", {})
config['foldGutter'] = False config["foldGutter"] = False
config['gutters'] = ["CodeMirror-linenumbers"] config["gutters"] = ["CodeMirror-linenumbers"]
codemirror_kwargs['config'] = config codemirror_kwargs["config"] = config
super(CodeMirrorRSTCharField, self).__init__(codemirror_kwargs, *args, **kwargs) super(CodeMirrorRSTCharField, self).__init__(codemirror_kwargs, *args, **kwargs)
def to_python(self, data): def to_python(self, data):
validate_restructuredtext(data) validate_restructuredtext(data)
return super(CodeMirrorRSTCharField, self).to_python(data) return super(CodeMirrorRSTCharField, self).to_python(data)
class CodeMirrorPythonCharField(CodeMirrorCharField): class CodeMirrorPythonCharField(CodeMirrorCharField):
"""Allows editing a file instead of a plain content""" """Allows editing a file instead of a plain content"""
def __init__(self, codemirror_kwargs={}, *args, **kwargs): def __init__(self, codemirror_kwargs={}, *args, **kwargs):
codemirror_kwargs = dict(codemirror_kwargs) codemirror_kwargs = dict(codemirror_kwargs)
addon_js = list(codemirror_kwargs.get('addon_js', [])) addon_js = list(codemirror_kwargs.get("addon_js", []))
addon_js += [ addon_js += [
"fold/indent-fold", "fold/indent-fold",
"display/rulers", "display/rulers",
] ]
codemirror_kwargs['addon_js'] = addon_js codemirror_kwargs["addon_js"] = addon_js
codemirror_kwargs["mode"] = "python"
super(CodeMirrorPythonCharField, self).__init__(
codemirror_kwargs, *args, **kwargs
)
codemirror_kwargs['mode'] = 'python'
super(CodeMirrorPythonCharField, self).__init__(codemirror_kwargs, *args, **kwargs)
class CodeMirrorJSONCharField(CodeMirrorCharField): class CodeMirrorJSONCharField(CodeMirrorCharField):
"""Allows editing a file instead of a plain content""" """Allows editing a file instead of a plain content"""
...@@ -119,19 +126,21 @@ class CodeMirrorJSONCharField(CodeMirrorCharField): ...@@ -119,19 +126,21 @@ class CodeMirrorJSONCharField(CodeMirrorCharField):
def __init__(self, codemirror_kwargs={}, *args, **kwargs): def __init__(self, codemirror_kwargs={}, *args, **kwargs):
codemirror_kwargs = dict(codemirror_kwargs) codemirror_kwargs = dict(codemirror_kwargs)
addon_js = list(codemirror_kwargs.get('addon_js', [])) addon_js = list(codemirror_kwargs.get("addon_js", []))
addon_js += [ addon_js += [
"fold/brace-fold", "fold/brace-fold",
"display/rulers", "display/rulers",
] ]
codemirror_kwargs['addon_js'] = addon_js codemirror_kwargs["addon_js"] = addon_js
codemirror_kwargs['mode'] = {'name': 'javascript', 'json': True} codemirror_kwargs["mode"] = {"name": "javascript", "json": True}
super(CodeMirrorJSONCharField, self).__init__(codemirror_kwargs, *args, **kwargs) super(CodeMirrorJSONCharField, self).__init__(
codemirror_kwargs, *args, **kwargs
)
#----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
class CodeMirrorFileField(forms.FileField): class CodeMirrorFileField(forms.FileField):
...@@ -141,59 +150,64 @@ class CodeMirrorFileField(forms.FileField): ...@@ -141,59 +150,64 @@ class CodeMirrorFileField(forms.FileField):
codemirror_kwargs = dict(codemirror_kwargs) codemirror_kwargs = dict(codemirror_kwargs)
# handles the readonly attribute gracefully # handles the readonly attribute gracefully
if 'readonly' in kwargs: if "readonly" in kwargs:
if kwargs['readonly']: if kwargs["readonly"]:
config = codemirror_kwargs.get('config', {}) config = codemirror_kwargs.get("config", {})
config['readOnly'] = True config["readOnly"] = True
codemirror_kwargs['config'] = config codemirror_kwargs["config"] = config
del kwargs['readonly'] del kwargs["readonly"]
kwargs.update({'widget': CodeMirrorFileWidget(**codemirror_kwargs)}) kwargs.update({"widget": CodeMirrorFileWidget(**codemirror_kwargs)})
super(CodeMirrorFileField, self).__init__(*args, **kwargs) super(CodeMirrorFileField, self).__init__(*args, **kwargs)
def to_python(self, data): def to_python(self, data):
data = ContentFile(data.replace('\r','')) data = ContentFile(data.replace("\r", ""))
data.name = '__ignore__' data.name = "__ignore__"
return super(CodeMirrorFileField, self).to_python(data) return super(CodeMirrorFileField, self).to_python(data)
class CodeMirrorRSTFileField(CodeMirrorFileField): class CodeMirrorRSTFileField(CodeMirrorFileField):
"""Allows editing a text field with a source code editor""" """Allows editing a text field with a source code editor"""
def __init__(self, codemirror_kwargs={}, *args, **kwargs): def __init__(self, codemirror_kwargs={}, *args, **kwargs):
codemirror_kwargs = dict(codemirror_kwargs) codemirror_kwargs = dict(codemirror_kwargs)
addon_js = list(codemirror_kwargs.get('addon_js', [])) addon_js = list(codemirror_kwargs.get("addon_js", []))
addon_js += [ addon_js += [
"display/rulers", "display/rulers",
] ]
codemirror_kwargs['addon_js'] = addon_js codemirror_kwargs["addon_js"] = addon_js
codemirror_kwargs['mode'] = 'rst' codemirror_kwargs["mode"] = "rst"
config = codemirror_kwargs.get('config', {}) config = codemirror_kwargs.get("config", {})
config['foldGutter'] = False config["foldGutter"] = False
config['gutters'] = ["CodeMirror-linenumbers"] config["gutters"] = ["CodeMirror-linenumbers"]
codemirror_kwargs['config'] = config codemirror_kwargs["config"] = config
super(CodeMirrorRSTFileField, self).__init__(codemirror_kwargs, *args, **kwargs) super(CodeMirrorRSTFileField, self).__init__(codemirror_kwargs, *args, **kwargs)
def to_python(self, data): def to_python(self, data):
validate_restructuredtext(data) validate_restructuredtext(data)
return super(CodeMirrorRSTFileField, self).to_python(data) return super(CodeMirrorRSTFileField, self).to_python(data)
class CodeMirrorPythonFileField(CodeMirrorFileField): class CodeMirrorPythonFileField(CodeMirrorFileField):
"""Allows editing a file instead of a plain content""" """Allows editing a file instead of a plain content"""
def __init__(self, codemirror_kwargs={}, *args, **kwargs): def __init__(self, codemirror_kwargs={}, *args, **kwargs):
codemirror_kwargs = dict(codemirror_kwargs) codemirror_kwargs = dict(codemirror_kwargs)
addon_js = list(codemirror_kwargs.get('addon_js', [])) addon_js = list(codemirror_kwargs.get("addon_js", []))
addon_js += [ addon_js += [
"fold/indent-fold", "fold/indent-fold",
"display/rulers", "display/rulers",
] ]
codemirror_kwargs['addon_js'] = addon_js codemirror_kwargs["addon_js"] = addon_js
codemirror_kwargs["mode"] = "python"
super(CodeMirrorPythonFileField, self).__init__(
codemirror_kwargs, *args, **kwargs
)
codemirror_kwargs['mode'] = 'python'
super(CodeMirrorPythonFileField, self).__init__(codemirror_kwargs, *args, **kwargs)
class CodeMirrorJSONFileField(CodeMirrorFileField): class CodeMirrorJSONFileField(CodeMirrorFileField):
"""Allows editing a file instead of a plain content""" """Allows editing a file instead of a plain content"""
...@@ -201,13 +215,15 @@ class CodeMirrorJSONFileField(CodeMirrorFileField): ...@@ -201,13 +215,15 @@ class CodeMirrorJSONFileField(CodeMirrorFileField):
def __init__(self, codemirror_kwargs={}, *args, **kwargs): def __init__(self, codemirror_kwargs={}, *args, **kwargs):
codemirror_kwargs = dict(codemirror_kwargs) codemirror_kwargs = dict(codemirror_kwargs)
addon_js = list(codemirror_kwargs.get('addon_js', [])) addon_js = list(codemirror_kwargs.get("addon_js", []))
addon_js += [ addon_js += [
"fold/brace-fold", "fold/brace-fold",
"display/rulers", "display/rulers",
] ]
codemirror_kwargs['addon_js'] = addon_js codemirror_kwargs["addon_js"] = addon_js
codemirror_kwargs['mode'] = {'name': 'javascript', 'json': True} codemirror_kwargs["mode"] = {"name": "javascript", "json": True}
super(CodeMirrorJSONFileField, self).__init__(codemirror_kwargs, *args, **kwargs) super(CodeMirrorJSONFileField, self).__init__(
codemirror_kwargs, *args, **kwargs
)
{% comment %} {% comment %}
* Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/ * Copyright (c) 2016 Idiap Research Institute, http://www.idiap.ch/
* Contact: beat.support@idiap.ch * Contact: beat.support@idiap.ch
* *
* This file is part of the beat.web module of the BEAT platform. * This file is part of the beat.web module of the BEAT platform.
* *
* Commercial License Usage * Commercial License Usage
* Licensees holding valid commercial BEAT licenses may use this file in * Licensees holding valid commercial BEAT licenses may use this file in
* accordance with the terms contained in a written agreement between you * accordance with the terms contained in a written agreement between you
* and Idiap. For further information contact tto@idiap.ch * and Idiap. For further information contact tto@idiap.ch
* *
* Alternatively, this file may be used under the terms of the GNU Affero * Alternatively, this file may be used under the terms of the GNU Affero
* Public License version 3 as published by the Free Software and appearing * Public License version 3 as published by the Free Software and appearing
* in the file LICENSE.AGPL included in the packaging of this file. * in the file LICENSE.AGPL included in the packaging of this file.
* The BEAT platform is distributed in the hope that it will be useful, but * The BEAT platform is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. * or FITNESS FOR A PARTICULAR PURPOSE.
* *
* You should have received a copy of the GNU Affero Public License along * You should have received a copy of the GNU Affero Public License along
* with the BEAT platform. If not, see http://www.gnu.org/licenses/. * with the BEAT platform. If not, see http://www.gnu.org/licenses/.
{% endcomment %} {% endcomment %}
......
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type 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><defs rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs332"> id="defs332">
<linearGradient <linearGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#SVGID_1_" xlink:href="#SVGID_1_"
...@@ -571,7 +571,7 @@ ...@@ -571,7 +571,7 @@
style="filter:url(#filter3862)"><g style="filter:url(#filter3862)"><g
transform="translate(13.781297,-189.67799)" transform="translate(13.781297,-189.67799)"
id="Layer_11"> id="Layer_11">
<linearGradient <linearGradient
gradientTransform="matrix(0.9922,-0.1247,0.1247,0.9922,-16.5306,7.9338)" gradientTransform="matrix(0.9922,-0.1247,0.1247,0.9922,-16.5306,7.9338)"
y2="133.873" y2="133.873"
...@@ -601,7 +601,7 @@ ...@@ -601,7 +601,7 @@
style="fill:url(#linearGradient3456);stroke:#034ea2" style="fill:url(#linearGradient3456);stroke:#034ea2"
id="polygon247" id="polygon247"
points="71.29,74.757 103.454,85.165 69.831,189.073 59.334,166.857 37.667,178.667 " /> points="71.29,74.757 103.454,85.165 69.831,189.073 59.334,166.857 37.667,178.667 " />
<linearGradient <linearGradient
gradientTransform="matrix(1.0646,0.0028,-0.2704,1.2386,-35.58,12.2392)" gradientTransform="matrix(1.0646,0.0028,-0.2704,1.2386,-35.58,12.2392)"
y2="98.911102" y2="98.911102"
...@@ -773,4 +773,4 @@ ...@@ -773,4 +773,4 @@
style="fill:#ffde00" /> style="fill:#ffde00" />
</g></g> </g></g>
</svg> </svg>
\ No newline at end of file
...@@ -25,12 +25,12 @@ ...@@ -25,12 +25,12 @@
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type 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><defs rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
id="defs332"> id="defs332">
<linearGradient <linearGradient
inkscape:collect="always" inkscape:collect="always"
xlink:href="#SVGID_1_" xlink:href="#SVGID_1_"
...@@ -558,7 +558,7 @@ ...@@ -558,7 +558,7 @@
transform="matrix(0.07906754,0,0,0.07906754,-0.24182197,14.734151)"><g transform="matrix(0.07906754,0,0,0.07906754,-0.24182197,14.734151)"><g
transform="translate(13.781297,-189.67799)" transform="translate(13.781297,-189.67799)"
id="Layer_11"> id="Layer_11">
<linearGradient <linearGradient
gradientTransform="matrix(0.9922,-0.1247,0.1247,0.9922,-16.5306,7.9338)" gradientTransform="matrix(0.9922,-0.1247,0.1247,0.9922,-16.5306,7.9338)"
y2="133.873" y2="133.873"
...@@ -588,7 +588,7 @@ ...@@ -588,7 +588,7 @@
style="fill:url(#linearGradient3456);stroke:#034ea2" style="fill:url(#linearGradient3456);stroke:#034ea2"
id="polygon247" id="polygon247"
points="71.29,74.757 103.454,85.165 69.831,189.073 59.334,166.857 37.667,178.667 " /> points="71.29,74.757 103.454,85.165 69.831,189.073 59.334,166.857 37.667,178.667 " />
<linearGradient <linearGradient
gradientTransform="matrix(1.0646,0.0028,-0.2704,1.2386,-35.58,12.2392)" gradientTransform="matrix(1.0646,0.0028,-0.2704,1.2386,-35.58,12.2392)"
y2="98.911102" y2="98.911102"
...@@ -760,4 +760,4 @@ ...@@ -760,4 +760,4 @@
style="fill:#ffde00" /> style="fill:#ffde00" />
</g></g> </g></g>
</svg> </svg>
\ No newline at end of file
...@@ -51,4 +51,4 @@ ...@@ -51,4 +51,4 @@
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path7" id="path7"
d="m 7.2024442,3.0327386 10e-8,4.1648685 -4.1648697,0 c -0.4598015,0 -0.8329739,0.3731723 -0.8329739,0.832974 0,0.4598018 0.3731724,0.8329743 0.832974,0.8329742 l 4.1648696,0 2e-7,4.1648697 c 0,0.459802 0.3731721,0.832974 0.832974,0.832974 0.4598017,0 0.8329741,-0.373172 0.8329739,-0.832974 l 1e-7,-4.1648697 4.1648685,5e-7 c 0.459803,-7e-7 0.832975,-0.3731727 0.832975,-0.8329746 0,-0.4598018 -0.373172,-0.8329739 -0.832975,-0.8329746 l -4.1648686,5e-7 -2e-7,-4.1648683 c 0,-0.4598019 -0.3731718,-0.8329765 -0.8329735,-0.8329764 -0.4598019,-10e-8 -0.8329744,0.373173 -0.8329745,0.8329762 z" d="m 7.2024442,3.0327386 10e-8,4.1648685 -4.1648697,0 c -0.4598015,0 -0.8329739,0.3731723 -0.8329739,0.832974 0,0.4598018 0.3731724,0.8329743 0.832974,0.8329742 l 4.1648696,0 2e-7,4.1648697 c 0,0.459802 0.3731721,0.832974 0.832974,0.832974 0.4598017,0 0.8329741,-0.373172 0.8329739,-0.832974 l 1e-7,-4.1648697 4.1648685,5e-7 c 0.459803,-7e-7 0.832975,-0.3731727 0.832975,-0.8329746 0,-0.4598018 -0.373172,-0.8329739 -0.832975,-0.8329746 l -4.1648686,5e-7 -2e-7,-4.1648683 c 0,-0.4598019 -0.3731718,-0.8329765 -0.8329735,-0.8329764 -0.4598019,-10e-8 -0.8329744,0.373173 -0.8329745,0.8329762 z"
style="fill:#ffffff" /></svg> style="fill:#ffffff" /></svg>
\ No newline at end of file
...@@ -80,4 +80,4 @@ ...@@ -80,4 +80,4 @@
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path3873" id="path3873"
d="m 0.54206264,95.70971 109.87166736,0 c 0,0 15.3961,4.95198 15.3961,19.81079 0,14.86169 -17.49557,20.63948 -17.49557,20.63948 l -107.77219736,0 z" d="m 0.54206264,95.70971 109.87166736,0 c 0,0 15.3961,4.95198 15.3961,19.81079 0,14.86169 -17.49557,20.63948 -17.49557,20.63948 l -107.77219736,0 z"
style="fill:#f6f810;fill-opacity:1;stroke:#000000;stroke-width:0.92072475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.9000001;stroke-opacity:1;stroke-dasharray:none" /></svg> style="fill:#f6f810;fill-opacity:1;stroke:#000000;stroke-width:0.92072475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.9000001;stroke-opacity:1;stroke-dasharray:none" /></svg>
\ No newline at end of file
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
d="m 8,-0.00847457 c -4.4228135,0 -8.00847458,3.58566107 -8.00847458,8.00847457 10e-9,4.423882 3.58566108,8.008475 8.00847458,8.008475 4.423882,0 8.008475,-3.584593 8.008475,-8.008475 0,-4.4228135 -3.584593,-8.00847457 -8.008475,-8.00847457 z m 3.588865,7.43186447 -3.2621192,4.1174241 -0.011746,0.02242 c -0.1815254,0.232779 -0.4773051,0.232779 -0.6588305,0 L 4.3887119,7.4233899 c -0.1815254,-0.2317119 -0.1815254,-0.6075763 0,-0.8392882 l 0.00214,0.00214 C 4.4752034,6.4719831 4.5937288,6.3983051 4.7272034,6.3983051 h 6.5242376 c 0.131339,0 0.247729,0.069407 0.333153,0.1804576 l 0.0043,0.00427 c 0.183661,0.2327797 0.183661,0.6086441 0,0.840356 z" d="m 8,-0.00847457 c -4.4228135,0 -8.00847458,3.58566107 -8.00847458,8.00847457 10e-9,4.423882 3.58566108,8.008475 8.00847458,8.008475 4.423882,0 8.008475,-3.584593 8.008475,-8.008475 0,-4.4228135 -3.584593,-8.00847457 -8.008475,-8.00847457 z m 3.588865,7.43186447 -3.2621192,4.1174241 -0.011746,0.02242 c -0.1815254,0.232779 -0.4773051,0.232779 -0.6588305,0 L 4.3887119,7.4233899 c -0.1815254,-0.2317119 -0.1815254,-0.6075763 0,-0.8392882 l 0.00214,0.00214 C 4.4752034,6.4719831 4.5937288,6.3983051 4.7272034,6.3983051 h 6.5242376 c 0.131339,0 0.247729,0.069407 0.333153,0.1804576 l 0.0043,0.00427 c 0.183661,0.2327797 0.183661,0.6086441 0,0.840356 z"
id="path3" id="path3"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
</svg> </svg>
\ No newline at end of file
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
d="M 8,-0.00847458 C 3.5771865,-0.00847458 -0.00847458,3.5771865 -0.00847458,8 -0.00847457,12.423882 3.5771865,16.008475 8,16.008475 12.423882,16.008475 16.008475,12.423882 16.008475,8 16.008475,3.5771865 12.423882,-0.00847458 8,-0.00847458 z M 9.6016949,11.251441 c 0,0.131339 -0.068339,0.247729 -0.1804576,0.333153 l -0.00427,0.0043 c -0.2327796,0.182593 -0.6075762,0.182593 -0.8392881,0 L 4.4581187,8.3299492 4.4367627,8.3171356 c -0.2317118,-0.1815254 -0.2317118,-0.4773051 0,-0.6588305 L 8.5766102,4.3887119 c 0.2317119,-0.1815254 0.6075763,-0.1815254 0.8392881,0 l -0.00214,0.00214 c 0.1153221,0.084356 0.1879322,0.2028813 0.1879322,0.3363559 v 6.5242372 z" d="M 8,-0.00847458 C 3.5771865,-0.00847458 -0.00847458,3.5771865 -0.00847458,8 -0.00847457,12.423882 3.5771865,16.008475 8,16.008475 12.423882,16.008475 16.008475,12.423882 16.008475,8 16.008475,3.5771865 12.423882,-0.00847458 8,-0.00847458 z M 9.6016949,11.251441 c 0,0.131339 -0.068339,0.247729 -0.1804576,0.333153 l -0.00427,0.0043 c -0.2327796,0.182593 -0.6075762,0.182593 -0.8392881,0 L 4.4581187,8.3299492 4.4367627,8.3171356 c -0.2317118,-0.1815254 -0.2317118,-0.4773051 0,-0.6588305 L 8.5766102,4.3887119 c 0.2317119,-0.1815254 0.6075763,-0.1815254 0.8392881,0 l -0.00214,0.00214 c 0.1153221,0.084356 0.1879322,0.2028813 0.1879322,0.3363559 v 6.5242372 z"
id="path3" id="path3"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
</svg> </svg>
\ No newline at end of file
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
d="M 8,-0.00847458 C 3.5771865,-0.00847458 -0.00847458,3.5771865 -0.00847458,8 -0.00847457,12.423882 3.5771865,16.008475 8,16.008475 12.423882,16.008475 16.008475,12.423882 16.008475,8 16.008475,3.5771865 12.423882,-0.00847458 8,-0.00847458 z M 11.563238,8.320339 7.4233899,11.588865 c -0.2317119,0.182593 -0.6075763,0.182593 -0.8392882,0 l 0.00214,-0.0021 C 6.4719831,11.503441 6.3983051,11.384916 6.3983051,11.251441 V 4.7272034 c 0,-0.131339 0.069407,-0.2487966 0.1804576,-0.3331525 l 0.00534,-0.00534 c 0.2317119,-0.1815254 0.6075763,-0.1815254 0.8392882,0 l 4.1174241,3.2621186 0.02242,0.011746 c 0.232779,0.1815254 0.232779,0.4762373 0,0.6577627 z" d="M 8,-0.00847458 C 3.5771865,-0.00847458 -0.00847458,3.5771865 -0.00847458,8 -0.00847457,12.423882 3.5771865,16.008475 8,16.008475 12.423882,16.008475 16.008475,12.423882 16.008475,8 16.008475,3.5771865 12.423882,-0.00847458 8,-0.00847458 z M 11.563238,8.320339 7.4233899,11.588865 c -0.2317119,0.182593 -0.6075763,0.182593 -0.8392882,0 l 0.00214,-0.0021 C 6.4719831,11.503441 6.3983051,11.384916 6.3983051,11.251441 V 4.7272034 c 0,-0.131339 0.069407,-0.2487966 0.1804576,-0.3331525 l 0.00534,-0.00534 c 0.2317119,-0.1815254 0.6075763,-0.1815254 0.8392882,0 l 4.1174241,3.2621186 0.02242,0.011746 c 0.232779,0.1815254 0.232779,0.4762373 0,0.6577627 z"
id="path3" id="path3"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
</svg> </svg>
\ No newline at end of file
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
d="m 7.9915254,-0.01694915 c -4.4228135,0 -8.00847455,3.58566105 -8.00847455,8.00847455 C -0.01694915,12.415407 3.5687119,16 7.9915254,16 12.415407,16 16,12.415407 16,7.9915254 16,3.5687119 12.415407,-0.01694915 7.9915254,-0.01694915 z m 3.5888646,9.42437285 -0.0021,-0.00214 c -0.08329,0.1153221 -0.201813,0.1879322 -0.335288,0.1879322 H 4.7187288 c -0.131339,0 -0.2487966,-0.068339 -0.3331525,-0.1804576 l -0.00534,-0.00534 c -0.1815254,-0.2317118 -0.1815254,-0.6075762 0,-0.8392881 l 3.2621186,-4.1184915 0.011746,-0.021356 c 0.1815254,-0.2317118 0.4773051,-0.2317118 0.6588305,0 l 3.2695928,4.1398475 c 0.181526,0.2317119 0.181526,0.6075763 -0.0021,0.8392881 z" d="m 7.9915254,-0.01694915 c -4.4228135,0 -8.00847455,3.58566105 -8.00847455,8.00847455 C -0.01694915,12.415407 3.5687119,16 7.9915254,16 12.415407,16 16,12.415407 16,7.9915254 16,3.5687119 12.415407,-0.01694915 7.9915254,-0.01694915 z m 3.5888646,9.42437285 -0.0021,-0.00214 c -0.08329,0.1153221 -0.201813,0.1879322 -0.335288,0.1879322 H 4.7187288 c -0.131339,0 -0.2487966,-0.068339 -0.3331525,-0.1804576 l -0.00534,-0.00534 c -0.1815254,-0.2317118 -0.1815254,-0.6075762 0,-0.8392881 l 3.2621186,-4.1184915 0.011746,-0.021356 c 0.1815254,-0.2317118 0.4773051,-0.2317118 0.6588305,0 l 3.2695928,4.1398475 c 0.181526,0.2317119 0.181526,0.6075763 -0.0021,0.8392881 z"
id="path3" id="path3"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
</svg> </svg>
\ No newline at end of file
...@@ -85,4 +85,4 @@ ...@@ -85,4 +85,4 @@
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
id="path3873" id="path3873"
d="m 0.54206264,95.70971 109.87166736,0 c 0,0 15.3961,4.95198 15.3961,19.81079 0,14.86169 -17.49557,20.63948 -17.49557,20.63948 l -107.77219736,0 z" d="m 0.54206264,95.70971 109.87166736,0 c 0,0 15.3961,4.95198 15.3961,19.81079 0,14.86169 -17.49557,20.63948 -17.49557,20.63948 l -107.77219736,0 z"
style="fill:#f6f810;fill-opacity:1;stroke:#000000;stroke-width:0.92072475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.9000001;stroke-opacity:1;stroke-dasharray:none" /></svg> style="fill:#f6f810;fill-opacity:1;stroke:#000000;stroke-width:0.92072475;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:3.9000001;stroke-opacity:1;stroke-dasharray:none" /></svg>
\ No newline at end of file
...@@ -84,4 +84,4 @@ ...@@ -84,4 +84,4 @@
sodipodi:cx="6.6800618" sodipodi:cx="6.6800618"
id="path3768" id="path3768"
style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none" style="fill:#ffff00;fill-opacity:1;fill-rule:nonzero;stroke:none"
sodipodi:type="arc" /></g></svg> sodipodi:type="arc" /></g></svg>
\ No newline at end of file
...@@ -59,4 +59,4 @@ ...@@ -59,4 +59,4 @@
d="M 6.0166245,12.622245 4.7414308,12.830013 C 4.3841567,12.884979 4.0378758,12.799233 3.7564537,12.592564 3.4761309,12.390292 3.2848518,12.073692 3.2320852,11.727411 L 3.119956,10.983182 0.9059561,13.19938 c -0.10992982,0.109939 -0.15060482,0.272628 -0.10553333,0.422133 0.0472706,0.150609 0.17259078,0.259437 0.32429503,0.290216 l 1.4071103,0.262734 0.2638331,1.406011 c 0.028582,0.154996 0.139611,0.279224 0.2891171,0.326494 0.1484057,0.04507 0.3111033,0.0055 0.4210338,-0.105533 l 2.8922712,-2.89337 -0.2110666,-0.213266 c -0.046171,-0.04728 -0.1077325,-0.07255 -0.1703917,-0.07255 z" d="M 6.0166245,12.622245 4.7414308,12.830013 C 4.3841567,12.884979 4.0378758,12.799233 3.7564537,12.592564 3.4761309,12.390292 3.2848518,12.073692 3.2320852,11.727411 L 3.119956,10.983182 0.9059561,13.19938 c -0.10992982,0.109939 -0.15060482,0.272628 -0.10553333,0.422133 0.0472706,0.150609 0.17259078,0.259437 0.32429503,0.290216 l 1.4071103,0.262734 0.2638331,1.406011 c 0.028582,0.154996 0.139611,0.279224 0.2891171,0.326494 0.1484057,0.04507 0.3111033,0.0055 0.4210338,-0.105533 l 2.8922712,-2.89337 -0.2110666,-0.213266 c -0.046171,-0.04728 -0.1077325,-0.07255 -0.1703917,-0.07255 z"
id="path11" id="path11"
inkscape:connector-curvature="0" inkscape:connector-curvature="0"
style="fill:#ff0000" /></g></svg> style="fill:#ff0000" /></g></svg>
\ No newline at end of file
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
d="M 8,-0.00847457 C 3.5771865,-0.00847457 -0.00847458,3.5771865 -0.00847458,8 -0.00847457,12.423882 3.5771865,16.008475 8,16.008475 12.423882,16.008475 16.008475,12.423882 16.008475,8 16.008475,3.5771865 12.423882,-0.00847457 8,-0.00847457 z M 11.710594,5.044339 8.7346441,8.021356 11.368899,10.955661 c 0.20822,0.208221 0.20822,0.546712 0,0.754933 -0.208221,0.20822 -0.546712,0.20822 -0.754932,0 L 7.9797119,8.7762882 5.044339,11.710594 c -0.2082203,0.20822 -0.5467119,0.20822 -0.7549322,0 -0.2082203,-0.208221 -0.2082203,-0.546712 0,-0.754933 L 7.265356,7.9797119 4.6321695,5.044339 c -0.2082203,-0.2082203 -0.2082203,-0.5467119 0,-0.7549322 0.2082204,-0.2082203 0.5467119,-0.2082203 0.7549322,0 L 8.021356,7.2247797 10.955661,4.2894068 c 0.208221,-0.2082203 0.546712,-0.2082203 0.754933,0 0.20822,0.2082203 0.20822,0.5467119 0,0.7549322 z" d="M 8,-0.00847457 C 3.5771865,-0.00847457 -0.00847458,3.5771865 -0.00847458,8 -0.00847457,12.423882 3.5771865,16.008475 8,16.008475 12.423882,16.008475 16.008475,12.423882 16.008475,8 16.008475,3.5771865 12.423882,-0.00847457 8,-0.00847457 z M 11.710594,5.044339 8.7346441,8.021356 11.368899,10.955661 c 0.20822,0.208221 0.20822,0.546712 0,0.754933 -0.208221,0.20822 -0.546712,0.20822 -0.754932,0 L 7.9797119,8.7762882 5.044339,11.710594 c -0.2082203,0.20822 -0.5467119,0.20822 -0.7549322,0 -0.2082203,-0.208221 -0.2082203,-0.546712 0,-0.754933 L 7.265356,7.9797119 4.6321695,5.044339 c -0.2082203,-0.2082203 -0.2082203,-0.5467119 0,-0.7549322 0.2082204,-0.2082203 0.5467119,-0.2082203 0.7549322,0 L 8.021356,7.2247797 10.955661,4.2894068 c 0.208221,-0.2082203 0.546712,-0.2082203 0.754933,0 0.20822,0.2082203 0.20822,0.5467119 0,0.7549322 z"
id="path3" id="path3"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
</svg> </svg>
\ No newline at end of file
...@@ -133,4 +133,4 @@ ...@@ -133,4 +133,4 @@
x="131.65625" x="131.65625"
y="98.643433" y="98.643433"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold">dataset</tspan></text> style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold">dataset</tspan></text>
</svg> </svg>
\ No newline at end of file
...@@ -75,4 +75,4 @@ ...@@ -75,4 +75,4 @@
x="77.656242" x="77.656242"
y="42.672577" y="42.672577"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold">dataset</tspan></text> style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold">dataset</tspan></text>
</svg> </svg>
\ No newline at end of file
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
d="m 8,-0.00887288 c -4.4235709,0 -8.0094092,3.58583838 -8.0094092,8.00940918 0,4.4235707 3.586911,8.0083367 8.0094092,8.0083367 4.422498,0 8.009409,-3.585838 8.009409,-8.0094093 0,-4.4235709 -3.585838,-8.00833658 -8.009409,-8.00833658 z M 11.921575,8.9240801 8.3325187,12.098024 c -0.1072641,0.107265 -0.2467074,0.157679 -0.388296,0.156606 -0.140516,0 -0.2810319,-0.05041 -0.388296,-0.156606 L 3.9679431,8.9240801 c -0.2102377,-0.2102376 -0.2102377,-0.5534827 0,-0.7626476 0.2102376,-0.2113103 0.55241,-0.2113103 0.7626476,0 l 3.213632,2.8414255 3.2136313,-2.8414255 c 0.210238,-0.2113103 0.553483,-0.2113103 0.762648,0 0.210238,0.2091649 0.213456,0.5502647 0.0011,0.7626476 z m 0,-3.8475627 -3.5879837,3.1750169 c -0.1072641,0.1072641 -0.2467074,0.1576782 -0.388296,0.1566056 -0.1415886,0 -0.2821045,-0.050414 -0.3893686,-0.1566056 L 3.9679431,5.0765174 c -0.2102377,-0.2102376 -0.2102377,-0.55241 0,-0.7626477 0.2102376,-0.2113102 0.55241,-0.2113102 0.7626476,-0.00107 L 7.9442227,7.155298 11.157854,4.3127997 c 0.210238,-0.2102376 0.553483,-0.2102376 0.762648,0 0.210238,0.2102376 0.213456,0.55241 0.0011,0.7637203 z" d="m 8,-0.00887288 c -4.4235709,0 -8.0094092,3.58583838 -8.0094092,8.00940918 0,4.4235707 3.586911,8.0083367 8.0094092,8.0083367 4.422498,0 8.009409,-3.585838 8.009409,-8.0094093 0,-4.4235709 -3.585838,-8.00833658 -8.009409,-8.00833658 z M 11.921575,8.9240801 8.3325187,12.098024 c -0.1072641,0.107265 -0.2467074,0.157679 -0.388296,0.156606 -0.140516,0 -0.2810319,-0.05041 -0.388296,-0.156606 L 3.9679431,8.9240801 c -0.2102377,-0.2102376 -0.2102377,-0.5534827 0,-0.7626476 0.2102376,-0.2113103 0.55241,-0.2113103 0.7626476,0 l 3.213632,2.8414255 3.2136313,-2.8414255 c 0.210238,-0.2113103 0.553483,-0.2113103 0.762648,0 0.210238,0.2091649 0.213456,0.5502647 0.0011,0.7626476 z m 0,-3.8475627 -3.5879837,3.1750169 c -0.1072641,0.1072641 -0.2467074,0.1576782 -0.388296,0.1566056 -0.1415886,0 -0.2821045,-0.050414 -0.3893686,-0.1566056 L 3.9679431,5.0765174 c -0.2102377,-0.2102376 -0.2102377,-0.55241 0,-0.7626477 0.2102376,-0.2113102 0.55241,-0.2113102 0.7626476,-0.00107 L 7.9442227,7.155298 11.157854,4.3127997 c 0.210238,-0.2102376 0.553483,-0.2102376 0.762648,0 0.210238,0.2102376 0.213456,0.55241 0.0011,0.7637203 z"
id="path3" id="path3"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
</svg> </svg>
\ No newline at end of file
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
d="m 8.0000001,-0.00687288 c -4.4215057,0 -8.00633653,3.58483078 -8.00633653,8.00633658 -0.00107266,4.4225783 3.58375813,8.0074093 8.00633653,8.0074093 4.4215059,0 8.0063369,-3.584831 8.0063369,-8.0063367 0,-4.4225784 -3.584831,-8.00740918 -8.0063369,-8.00740918 z M 7.7661602,11.918965 c -0.2102414,0.209168 -0.5524201,0.209168 -0.7626615,0 L 3.8284242,8.3298431 C 3.7211582,8.222577 3.6696705,8.0809859 3.6718158,7.9404674 3.6707431,7.8010215 3.7211582,7.660503 3.8284242,7.553237 L 7.0024261,3.9651883 c 0.2102414,-0.2102415 0.55242,-0.2102415 0.7626614,0 0.2113141,0.2102414 0.2113141,0.55242 0,0.7626614 L 4.9225377,7.94154 7.7650875,11.15523 c 0.2113141,0.211315 0.2113141,0.553493 0.00107,0.763735 z m 3.8465598,0 c -0.210241,0.209168 -0.553492,0.209168 -0.762661,0 L 7.6749841,8.3298431 C 7.567718,8.222577 7.5162303,8.0809859 7.5183757,7.9404674 7.517303,7.8010215 7.567718,7.660503 7.6749841,7.553237 L 10.847914,3.9651883 c 0.211314,-0.2102415 0.553492,-0.2102415 0.762661,0 0.211314,0.2102414 0.211314,0.55242 0,0.7626614 L 8.7690976,7.94154 11.61272,11.157376 c 0.210242,0.209169 0.210242,0.551347 0,0.761589 z" d="m 8.0000001,-0.00687288 c -4.4215057,0 -8.00633653,3.58483078 -8.00633653,8.00633658 -0.00107266,4.4225783 3.58375813,8.0074093 8.00633653,8.0074093 4.4215059,0 8.0063369,-3.584831 8.0063369,-8.0063367 0,-4.4225784 -3.584831,-8.00740918 -8.0063369,-8.00740918 z M 7.7661602,11.918965 c -0.2102414,0.209168 -0.5524201,0.209168 -0.7626615,0 L 3.8284242,8.3298431 C 3.7211582,8.222577 3.6696705,8.0809859 3.6718158,7.9404674 3.6707431,7.8010215 3.7211582,7.660503 3.8284242,7.553237 L 7.0024261,3.9651883 c 0.2102414,-0.2102415 0.55242,-0.2102415 0.7626614,0 0.2113141,0.2102414 0.2113141,0.55242 0,0.7626614 L 4.9225377,7.94154 7.7650875,11.15523 c 0.2113141,0.211315 0.2113141,0.553493 0.00107,0.763735 z m 3.8465598,0 c -0.210241,0.209168 -0.553492,0.209168 -0.762661,0 L 7.6749841,8.3298431 C 7.567718,8.222577 7.5162303,8.0809859 7.5183757,7.9404674 7.517303,7.8010215 7.567718,7.660503 7.6749841,7.553237 L 10.847914,3.9651883 c 0.211314,-0.2102415 0.553492,-0.2102415 0.762661,0 0.211314,0.2102414 0.211314,0.55242 0,0.7626614 L 8.7690976,7.94154 11.61272,11.157376 c 0.210242,0.209169 0.210242,0.551347 0,0.761589 z"
id="path3" id="path3"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
</svg> </svg>
\ No newline at end of file
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
d="m 8,-0.00637288 c -4.4215258,0 -8.00637288,3.58484708 -8.00637288,8.00637288 0,4.421526 3.58484708,8.006373 8.00637288,8.006373 4.421526,0 8.006373,-3.584847 8.006373,-8.006373 0,-4.4215258 -3.584847,-8.00637288 -8.006373,-8.00637288 z M 4.3100318,11.959207 c -0.2102424,-0.211315 -0.2102424,-0.553495 0,-0.762665 L 7.1525945,7.9828374 4.3100318,4.7680598 c -0.2102424,-0.211315 -0.2102424,-0.5534952 0,-0.7637376 0.2102424,-0.2102423 0.5524226,-0.2102423 0.762665,0 L 8.2456403,7.5923873 C 8.3539795,7.6996538 8.4043948,7.8401729 8.4022495,7.9796194 8.4065401,8.1222838 8.3550522,8.262803 8.2488583,8.3700695 L 5.0748421,11.959207 c -0.2123877,0.210243 -0.5534953,0.210243 -0.7648103,0 z M 12.095436,8.3700695 8.9214194,11.959207 c -0.2102424,0.20917 -0.5534952,0.20917 -0.7626649,0 -0.2113151,-0.211315 -0.2113151,-0.553495 0,-0.762665 L 11.000245,7.9828374 8.1587545,4.7680598 c -0.2113151,-0.2102423 -0.2113151,-0.5524225 0,-0.7626649 0.2091697,-0.2102424 0.5524225,-0.2102424 0.7626649,0 l 3.1740166,3.588065 c 0.107266,0.1072665 0.157682,0.2477857 0.156609,0.3883048 0,0.1405191 -0.05042,0.2810383 -0.156609,0.3883048 z" d="m 8,-0.00637288 c -4.4215258,0 -8.00637288,3.58484708 -8.00637288,8.00637288 0,4.421526 3.58484708,8.006373 8.00637288,8.006373 4.421526,0 8.006373,-3.584847 8.006373,-8.006373 0,-4.4215258 -3.584847,-8.00637288 -8.006373,-8.00637288 z M 4.3100318,11.959207 c -0.2102424,-0.211315 -0.2102424,-0.553495 0,-0.762665 L 7.1525945,7.9828374 4.3100318,4.7680598 c -0.2102424,-0.211315 -0.2102424,-0.5534952 0,-0.7637376 0.2102424,-0.2102423 0.5524226,-0.2102423 0.762665,0 L 8.2456403,7.5923873 C 8.3539795,7.6996538 8.4043948,7.8401729 8.4022495,7.9796194 8.4065401,8.1222838 8.3550522,8.262803 8.2488583,8.3700695 L 5.0748421,11.959207 c -0.2123877,0.210243 -0.5534953,0.210243 -0.7648103,0 z M 12.095436,8.3700695 8.9214194,11.959207 c -0.2102424,0.20917 -0.5534952,0.20917 -0.7626649,0 -0.2113151,-0.211315 -0.2113151,-0.553495 0,-0.762665 L 11.000245,7.9828374 8.1587545,4.7680598 c -0.2113151,-0.2102423 -0.2113151,-0.5524225 0,-0.7626649 0.2091697,-0.2102424 0.5524225,-0.2102424 0.7626649,0 l 3.1740166,3.588065 c 0.107266,0.1072665 0.157682,0.2477857 0.156609,0.3883048 0,0.1405191 -0.05042,0.2810383 -0.156609,0.3883048 z"
id="path3" id="path3"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
</svg> </svg>
\ No newline at end of file
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
d="M 8,-0.00847458 C 3.5771865,-0.00847458 -0.00847458,3.5771865 -0.00847458,8 -0.00847457,12.423882 3.5771865,16.008475 8,16.008475 12.423882,16.008475 16.008475,12.423882 16.008475,8 16.008475,3.5771865 12.423882,-0.00847458 8,-0.00847458 z M 11.979678,11.63478 c -0.210356,0.20822 -0.550983,0.20822 -0.759203,0 L 8.021356,8.8051187 4.8211695,11.63478 c -0.2092881,0.20822 -0.5499152,0.20822 -0.7592034,0 -0.2092881,-0.209288 -0.2092881,-0.550983 0,-0.759203 L 7.6337458,7.7159661 c 0.1067796,-0.1067796 0.246661,-0.1580339 0.3865424,-0.1558983 0.1398813,-0.0032 0.2797627,0.048051 0.3865423,0.1548305 l 3.5728475,3.1585427 c 0.209289,0.211424 0.209289,0.550983 0,0.761339 z m 0,-3.829119 c -0.210356,0.2092882 -0.550983,0.2092882 -0.759203,0 L 8.0192204,4.9749322 4.8201017,7.805661 c -0.2092881,0.2092882 -0.5499152,0.2092882 -0.7592034,0 -0.2092881,-0.2092881 -0.2092881,-0.5499152 0,-0.7592033 L 7.632678,3.8868475 C 7.7394577,3.7800678 7.879339,3.7288136 8.0181526,3.7309492 c 0.1420169,-0.0032 0.2818983,0.048051 0.3886779,0.1548305 l 3.5728475,3.1596102 c 0.209289,0.2103559 0.209289,0.5499152 0,0.7602711 z" d="M 8,-0.00847458 C 3.5771865,-0.00847458 -0.00847458,3.5771865 -0.00847458,8 -0.00847457,12.423882 3.5771865,16.008475 8,16.008475 12.423882,16.008475 16.008475,12.423882 16.008475,8 16.008475,3.5771865 12.423882,-0.00847458 8,-0.00847458 z M 11.979678,11.63478 c -0.210356,0.20822 -0.550983,0.20822 -0.759203,0 L 8.021356,8.8051187 4.8211695,11.63478 c -0.2092881,0.20822 -0.5499152,0.20822 -0.7592034,0 -0.2092881,-0.209288 -0.2092881,-0.550983 0,-0.759203 L 7.6337458,7.7159661 c 0.1067796,-0.1067796 0.246661,-0.1580339 0.3865424,-0.1558983 0.1398813,-0.0032 0.2797627,0.048051 0.3865423,0.1548305 l 3.5728475,3.1585427 c 0.209289,0.211424 0.209289,0.550983 0,0.761339 z m 0,-3.829119 c -0.210356,0.2092882 -0.550983,0.2092882 -0.759203,0 L 8.0192204,4.9749322 4.8201017,7.805661 c -0.2092881,0.2092882 -0.5499152,0.2092882 -0.7592034,0 -0.2092881,-0.2092881 -0.2092881,-0.5499152 0,-0.7592033 L 7.632678,3.8868475 C 7.7394577,3.7800678 7.879339,3.7288136 8.0181526,3.7309492 c 0.1420169,-0.0032 0.2818983,0.048051 0.3886779,0.1548305 l 3.5728475,3.1596102 c 0.209289,0.2103559 0.209289,0.5499152 0,0.7602711 z"
id="path3" id="path3"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
</svg> </svg>
\ No newline at end of file
...@@ -47,4 +47,4 @@ ...@@ -47,4 +47,4 @@
d="m 13.968174,7.9999999 c 0,-0.3729972 -0.03885,-0.7353021 -0.103946,-1.0888724 L 15.885598,5.7445472 13.896279,2.2982074 11.874912,3.4657822 C 11.324152,2.9956191 10.685984,2.6255435 9.9895363,2.3788058 V 0.04272347 H 6.0108981 V 2.3788058 C 5.3139526,2.6255435 4.6762515,2.9956191 4.1255211,3.4657511 L 2.1036579,2.2982074 0.11433875,5.7445472 2.136202,6.9120911 C 2.070648,7.2646978 2.0322607,7.6270027 2.0322607,7.9999999 c 0,0.3720339 0.038357,0.7343389 0.1039413,1.0879089 L 0.11433875,10.255485 2.1036579,13.701823 4.1260183,12.534249 c 0.5507616,0.471095 1.1879653,0.840208 1.8849109,1.086947 v 2.336081 h 3.9786379 v -2.336081 c 0.6964479,-0.246739 1.3346469,-0.615852 1.8844139,-1.086947 l 2.02236,1.167574 1.98932,-3.446338 -2.021365,-1.1665815 c 0.06502,-0.3536009 0.103883,-0.7168697 0.103883,-1.0889036 z M 8.0002175,10.983978 c -1.6483686,0 -2.9839789,-1.335609 -2.9839789,-2.9839781 0,-1.6483684 1.3356103,-2.9839786 2.9839789,-2.9839786 1.6483679,0 2.9839785,1.3356102 2.9839785,2.9839786 0,1.6483691 -1.3356106,2.9839781 -2.9839785,2.9839781 z" d="m 13.968174,7.9999999 c 0,-0.3729972 -0.03885,-0.7353021 -0.103946,-1.0888724 L 15.885598,5.7445472 13.896279,2.2982074 11.874912,3.4657822 C 11.324152,2.9956191 10.685984,2.6255435 9.9895363,2.3788058 V 0.04272347 H 6.0108981 V 2.3788058 C 5.3139526,2.6255435 4.6762515,2.9956191 4.1255211,3.4657511 L 2.1036579,2.2982074 0.11433875,5.7445472 2.136202,6.9120911 C 2.070648,7.2646978 2.0322607,7.6270027 2.0322607,7.9999999 c 0,0.3720339 0.038357,0.7343389 0.1039413,1.0879089 L 0.11433875,10.255485 2.1036579,13.701823 4.1260183,12.534249 c 0.5507616,0.471095 1.1879653,0.840208 1.8849109,1.086947 v 2.336081 h 3.9786379 v -2.336081 c 0.6964479,-0.246739 1.3346469,-0.615852 1.8844139,-1.086947 l 2.02236,1.167574 1.98932,-3.446338 -2.021365,-1.1665815 c 0.06502,-0.3536009 0.103883,-0.7168697 0.103883,-1.0889036 z M 8.0002175,10.983978 c -1.6483686,0 -2.9839789,-1.335609 -2.9839789,-2.9839781 0,-1.6483684 1.3356103,-2.9839786 2.9839789,-2.9839786 1.6483679,0 2.9839785,1.3356102 2.9839785,2.9839786 0,1.6483691 -1.3356106,2.9839781 -2.9839785,2.9839781 z"
id="path3" id="path3"
inkscape:connector-curvature="0" /> inkscape:connector-curvature="0" />
</svg> </svg>
\ No newline at end of file
...@@ -51,4 +51,4 @@ ...@@ -51,4 +51,4 @@
d="M 8.633,5.227 C 8.45,5.076 8.225,5 8,5 7.775,5 7.55,5.076 7.366,5.227 l -5,4.099 C 2.134,9.516 2,9.799 2,10.1 V 15 c 0,0.552 0.448,1 1,1 h 3 v -5 h 4 v 5 h 3 c 0.551,0 1,-0.448 1,-1 V 10.1 C 14,9.799 13.865,9.516 13.633,9.327 l -5,-4.1 z" d="M 8.633,5.227 C 8.45,5.076 8.225,5 8,5 7.775,5 7.55,5.076 7.366,5.227 l -5,4.099 C 2.134,9.516 2,9.799 2,10.1 V 15 c 0,0.552 0.448,1 1,1 h 3 v -5 h 4 v 5 h 3 c 0.551,0 1,-0.448 1,-1 V 10.1 C 14,9.799 13.865,9.516 13.633,9.327 l -5,-4.1 z"
id="path7" id="path7"
style="fill:#0000ff" style="fill:#0000ff"
inkscape:connector-curvature="0" /></g></svg> inkscape:connector-curvature="0" /></g></svg>
\ No newline at end of file
...@@ -46,4 +46,4 @@ ...@@ -46,4 +46,4 @@
d="M 14,6 H 13.077 V 5.077 C 13.077,2.273 10.805,0 8,0 5.196,0 2.923,2.273 2.923,5.077 V 6 H 2 C 1.448,6 1,6.448 1,7 v 8 c 0,0.552 0.448,1 1,1 h 12 c 0.552,0 1,-0.448 1,-1 V 7 C 15,6.448 14.552,6 14,6 z M 8,13 C 6.895,13 6,12.105 6,11 6,9.895 6.895,9 8,9 c 1.105,0 2,0.895 2,2 0,1.105 -0.895,2 -2,2 z M 11.077,6 H 4.923 V 5.077 C 4.923,3.38 6.303,2 8,2 9.697,2 11.077,3.38 11.077,5.077 V 6 z" d="M 14,6 H 13.077 V 5.077 C 13.077,2.273 10.805,0 8,0 5.196,0 2.923,2.273 2.923,5.077 V 6 H 2 C 1.448,6 1,6.448 1,7 v 8 c 0,0.552 0.448,1 1,1 h 12 c 0.552,0 1,-0.448 1,-1 V 7 C 15,6.448 14.552,6 14,6 z M 8,13 C 6.895,13 6,12.105 6,11 6,9.895 6.895,9 8,9 c 1.105,0 2,0.895 2,2 0,1.105 -0.895,2 -2,2 z M 11.077,6 H 4.923 V 5.077 C 4.923,3.38 6.303,2 8,2 9.697,2 11.077,3.38 11.077,5.077 V 6 z"
id="path3" id="path3"
style="fill:#d4aa00" style="fill:#d4aa00"
inkscape:connector-curvature="0" /></svg> inkscape:connector-curvature="0" /></svg>
\ No newline at end of file
...@@ -144,4 +144,4 @@ ...@@ -144,4 +144,4 @@
sodipodi:cx="7.6271186" sodipodi:cx="7.6271186"
id="path3019-8-6-97" id="path3019-8-6-97"
style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#0000ff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" style="fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#0000ff;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
sodipodi:type="arc" /></g></svg> sodipodi:type="arc" /></g></svg>
\ No newline at end of file