Fixed theme
This commit is contained in:
Marc
parent
fc35859052
commit
1cd3092673
|
|
@ -13,6 +13,7 @@ def collectionlink(**kwargs):
|
||||||
"""
|
"""
|
||||||
Used to mark a method on a ViewSet collection that should be routed for GET requests.
|
Used to mark a method on a ViewSet collection that should be routed for GET requests.
|
||||||
"""
|
"""
|
||||||
|
# TODO deprecate in favour of DRF2.0 own method
|
||||||
def decorator(func):
|
def decorator(func):
|
||||||
func.collection_bind_to_methods = ['get']
|
func.collection_bind_to_methods = ['get']
|
||||||
func.kwargs = kwargs
|
func.kwargs = kwargs
|
||||||
|
|
@ -89,10 +90,10 @@ class LinkHeaderRouter(DefaultRouter):
|
||||||
insert_links(viewset, base_name)
|
insert_links(viewset, base_name)
|
||||||
self.registry.append((prefix, viewset, base_name))
|
self.registry.append((prefix, viewset, base_name))
|
||||||
|
|
||||||
def insert(self, prefix, name, field, **kwargs):
|
def insert(self, prefix_or_model, name, field, **kwargs):
|
||||||
""" Dynamically add new fields to an existing serializer """
|
""" Dynamically add new fields to an existing serializer """
|
||||||
for _prefix, viewset, basename in self.registry:
|
for _prefix, viewset, basename in self.registry:
|
||||||
if _prefix == prefix:
|
if _prefix == prefix_or_model or viewset.model == prefix_or_model:
|
||||||
if viewset.serializer_class is None:
|
if viewset.serializer_class is None:
|
||||||
viewset.serializer_class = viewset().get_serializer_class()
|
viewset.serializer_class = viewset().get_serializer_class()
|
||||||
viewset.serializer_class.Meta.fields += (name,)
|
viewset.serializer_class.Meta.fields += (name,)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1 @@
|
||||||
|
default_app_config = 'orchestra.apps.resources.apps.ResourcesConfig'
|
||||||
|
|
@ -0,0 +1,15 @@
|
||||||
|
from django.apps import AppConfig
|
||||||
|
from django.contrib.contenttypes import generic
|
||||||
|
|
||||||
|
|
||||||
|
class ResourcesConfig(AppConfig):
|
||||||
|
name = 'orchestra.apps.resources'
|
||||||
|
verbose_name = 'Resources'
|
||||||
|
|
||||||
|
def ready(self):
|
||||||
|
from .models import Resource
|
||||||
|
# TODO execute on Resource.save()
|
||||||
|
relation = generic.GenericRelation('resources.ResourceAllocation')
|
||||||
|
for resources in Resource.group_by_content_type():
|
||||||
|
model = resources[0].content_type.model_class()
|
||||||
|
model.add_to_class('allocations', relation)
|
||||||
|
|
@ -103,10 +103,3 @@ class MonitorData(models.Model):
|
||||||
|
|
||||||
def __unicode__(self):
|
def __unicode__(self):
|
||||||
return str(self.monitor)
|
return str(self.monitor)
|
||||||
|
|
||||||
|
|
||||||
#for resources in Resource.group_by_content_type():
|
|
||||||
# model = resources[0].content_type.model_class()
|
|
||||||
# print resources[0].content_type.model_class()
|
|
||||||
# model.add_to_class('allocations', generic.GenericRelation('resources.ResourceAllocation'))
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,27 @@
|
||||||
|
from rest_framework import serializers
|
||||||
|
|
||||||
|
from orchestra.api import router
|
||||||
|
|
||||||
|
from .models import Resource, ResourceAllocation
|
||||||
|
|
||||||
|
|
||||||
|
class ResourceSerializer(serializers.ModelSerializer):
|
||||||
|
name = serializers.SerializerMethodField('get_name')
|
||||||
|
current = serializers.SerializerMethodField('get_current')
|
||||||
|
allocation = serializers.IntegerField(source='value')
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
model = ResourceAllocation
|
||||||
|
fields = ('name', 'current', 'allocation')
|
||||||
|
|
||||||
|
def get_name(self, instance):
|
||||||
|
return instance.resource.name
|
||||||
|
|
||||||
|
def get_current(self, instance):
|
||||||
|
return instance.resource.get_current()
|
||||||
|
|
||||||
|
|
||||||
|
for resources in Resource.group_by_content_type():
|
||||||
|
model = resources[0].content_type.model_class()
|
||||||
|
router.insert(model, 'resources', ResourceSerializer, required=False,
|
||||||
|
source='allocations')
|
||||||
|
|
@ -1,7 +1,8 @@
|
||||||
body {
|
body {
|
||||||
background:#FBFAF9 url(/static/orchestra/images/page-gradient.png)top left repeat-x;
|
background: #FBFAF9 url(/static/orchestra/images/page-gradient.png) top left repeat-x;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#header #branding h1 {
|
#header #branding h1 {
|
||||||
margin: 0;
|
margin: 0;
|
||||||
padding: 5px 10px;
|
padding: 5px 10px;
|
||||||
|
|
@ -9,12 +10,16 @@ body {
|
||||||
text-indent: 0;
|
text-indent: 0;
|
||||||
height: 31px;
|
height: 31px;
|
||||||
font-size: 18px;
|
font-size: 18px;
|
||||||
color: whitesmoke;
|
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
padding-left: 50px;
|
padding-left: 50px;
|
||||||
line-height: 30px;
|
line-height: 30px;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#branding h1, #branding h1 a:link, #branding h1 a:visited {
|
||||||
|
color: #707070;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
.version:before {
|
.version:before {
|
||||||
content: "v";
|
content: "v";
|
||||||
opacity: 0.6;
|
opacity: 0.6;
|
||||||
|
|
@ -27,69 +32,6 @@ body {
|
||||||
|
|
||||||
#header #branding:hover a {
|
#header #branding:hover a {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
color: azure;
|
color: #9B9B9B;
|
||||||
}
|
|
||||||
|
|
||||||
#header-branding {
|
|
||||||
background-image: url(/static/admin_tools/images/admin-tools.png);
|
|
||||||
width: 100%;
|
|
||||||
z-index: -1;
|
|
||||||
height: 41px;
|
|
||||||
position: absolute;
|
|
||||||
}
|
|
||||||
|
|
||||||
#header-menu {
|
|
||||||
background: url(/static/admin_tools/images/admin-tools.png) 0 295px;
|
|
||||||
width: 100%;
|
|
||||||
z-index: -1;
|
|
||||||
margin-top: 41px;
|
|
||||||
height: 41px;
|
|
||||||
position: absolute;
|
|
||||||
}
|
|
||||||
|
|
||||||
#header-breadcrumb {
|
|
||||||
width: 100%;
|
|
||||||
z-index: -1;
|
|
||||||
margin-top: 76px;
|
|
||||||
height: 69px;
|
|
||||||
position: absolute;
|
|
||||||
background-attachment: scroll; background-clip: border-box;
|
|
||||||
background-color: rgb(255, 255, 255);
|
|
||||||
background-image: url(/static/admin/img/nav-bg-reverse.gif);
|
|
||||||
background-origin: padding-box;
|
|
||||||
background-position: 0px -8px;
|
|
||||||
background-size: auto;
|
|
||||||
border-bottom-color: rgb(237, 237, 237);
|
|
||||||
border-bottom-style: solid;
|
|
||||||
border-bottom-width: 1px;
|
|
||||||
border-left-color: rgb(153, 153, 153);
|
|
||||||
border-left-style: none;
|
|
||||||
border-left-width: 0px;
|
|
||||||
border-right-color: rgb(153, 153, 153);
|
|
||||||
border-right-style: none;
|
|
||||||
border-right-width: 0px;
|
|
||||||
border-top-color: rgb(153, 153, 153);
|
|
||||||
border-top-style: none;
|
|
||||||
border-top-width: 0px;
|
|
||||||
color: white;
|
|
||||||
height: 13px;
|
|
||||||
padding-bottom: 10px;
|
|
||||||
padding-top: 10px;
|
|
||||||
background-repeat: repeat-x;
|
|
||||||
padding-left: 0;
|
|
||||||
padding-right: 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
#container {
|
|
||||||
max-width:1150px;
|
|
||||||
margin:0 auto;
|
|
||||||
}
|
|
||||||
|
|
||||||
#header {
|
|
||||||
background:none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.dashboard-module {
|
|
||||||
background-color: white;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,8 +18,8 @@
|
||||||
sodipodi:docname="Utilities-system-monitor.svg"
|
sodipodi:docname="Utilities-system-monitor.svg"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:export-filename="/home/glic3rinu/orchestra/django-orchestra/orchestra/static/orchestra/icons/Utilities-system-monitor.png"
|
inkscape:export-filename="/home/glic3rinu/orchestra/django-orchestra/orchestra/static/orchestra/icons/Utilities-system-monitor.png"
|
||||||
inkscape:export-xdpi="60"
|
inkscape:export-xdpi="90"
|
||||||
inkscape:export-ydpi="60">
|
inkscape:export-ydpi="90">
|
||||||
<defs
|
<defs
|
||||||
id="defs1308">
|
id="defs1308">
|
||||||
<linearGradient
|
<linearGradient
|
||||||
|
|
@ -133,7 +133,7 @@
|
||||||
x2="18.300278"
|
x2="18.300278"
|
||||||
y2="19.567596"
|
y2="19.567596"
|
||||||
gradientUnits="userSpaceOnUse"
|
gradientUnits="userSpaceOnUse"
|
||||||
gradientTransform="matrix(0.952387,0.000000,0.000000,1.018339,1.142599,-1.941627)" />
|
gradientTransform="matrix(0.91076155,0,0,0.97383102,2.1416091,-0.80704338)" />
|
||||||
<linearGradient
|
<linearGradient
|
||||||
inkscape:collect="always"
|
inkscape:collect="always"
|
||||||
xlink:href="#linearGradient2214"
|
xlink:href="#linearGradient2214"
|
||||||
|
|
@ -143,7 +143,7 @@
|
||||||
x2="47.998765"
|
x2="47.998765"
|
||||||
y2="24.012266"
|
y2="24.012266"
|
||||||
gradientUnits="userSpaceOnUse"
|
gradientUnits="userSpaceOnUse"
|
||||||
gradientTransform="matrix(0.952387,0.000000,0.000000,1.018339,1.142599,-1.941627)" />
|
gradientTransform="matrix(0.91076155,0,0,0.97383102,2.1416091,-0.80704338)" />
|
||||||
<radialGradient
|
<radialGradient
|
||||||
inkscape:collect="always"
|
inkscape:collect="always"
|
||||||
xlink:href="#linearGradient2224"
|
xlink:href="#linearGradient2224"
|
||||||
|
|
@ -153,7 +153,7 @@
|
||||||
fx="24.041630"
|
fx="24.041630"
|
||||||
fy="42.242130"
|
fy="42.242130"
|
||||||
r="17.576654"
|
r="17.576654"
|
||||||
gradientTransform="matrix(1.000000,0.000000,0.000000,0.304598,-5.757924e-16,29.37527)"
|
gradientTransform="matrix(1,0,0,0.304598,0,29.37527)"
|
||||||
gradientUnits="userSpaceOnUse" />
|
gradientUnits="userSpaceOnUse" />
|
||||||
<linearGradient
|
<linearGradient
|
||||||
inkscape:collect="always"
|
inkscape:collect="always"
|
||||||
|
|
@ -164,13 +164,13 @@
|
||||||
x2="46.092255"
|
x2="46.092255"
|
||||||
y2="39.708324"
|
y2="39.708324"
|
||||||
gradientUnits="userSpaceOnUse"
|
gradientUnits="userSpaceOnUse"
|
||||||
gradientTransform="matrix(0.952387,0.000000,0.000000,1.015657,1.142599,-0.876325)" />
|
gradientTransform="matrix(0.91076155,0,0,0.97126624,2.1416091,0.21169805)" />
|
||||||
<linearGradient
|
<linearGradient
|
||||||
inkscape:collect="always"
|
inkscape:collect="always"
|
||||||
xlink:href="#linearGradient2180"
|
xlink:href="#linearGradient2180"
|
||||||
id="linearGradient1340"
|
id="linearGradient1340"
|
||||||
gradientUnits="userSpaceOnUse"
|
gradientUnits="userSpaceOnUse"
|
||||||
gradientTransform="matrix(3.809547,0.000000,0.000000,1.750325,-16.00036,-15.78719)"
|
gradientTransform="matrix(3.6430452,0,0,1.6738245,-14.252092,-14.047466)"
|
||||||
x1="8.8207808"
|
x1="8.8207808"
|
||||||
y1="12.53757"
|
y1="12.53757"
|
||||||
x2="12.499243"
|
x2="12.499243"
|
||||||
|
|
@ -184,7 +184,7 @@
|
||||||
fx="23.994133"
|
fx="23.994133"
|
||||||
fy="32.266911"
|
fy="32.266911"
|
||||||
r="19.088932"
|
r="19.088932"
|
||||||
gradientTransform="matrix(1.768625,-1.961257e-23,1.552064e-23,1.387102,-18.44248,-15.29268)"
|
gradientTransform="matrix(1.6913247,0,0,1.3264767,-16.587476,-13.574569)"
|
||||||
gradientUnits="userSpaceOnUse" />
|
gradientUnits="userSpaceOnUse" />
|
||||||
<linearGradient
|
<linearGradient
|
||||||
inkscape:collect="always"
|
inkscape:collect="always"
|
||||||
|
|
@ -194,7 +194,8 @@
|
||||||
y1="37.333858"
|
y1="37.333858"
|
||||||
x2="15.044075"
|
x2="15.044075"
|
||||||
y2="5.9588566"
|
y2="5.9588566"
|
||||||
gradientUnits="userSpaceOnUse" />
|
gradientUnits="userSpaceOnUse"
|
||||||
|
gradientTransform="matrix(0.95629355,0,0,0.95629355,1.048949,1.049722)" />
|
||||||
</defs>
|
</defs>
|
||||||
<sodipodi:namedview
|
<sodipodi:namedview
|
||||||
id="base"
|
id="base"
|
||||||
|
|
@ -270,99 +271,108 @@
|
||||||
inkscape:groupmode="layer">
|
inkscape:groupmode="layer">
|
||||||
<path
|
<path
|
||||||
sodipodi:type="arc"
|
sodipodi:type="arc"
|
||||||
style="opacity:1;fill:url(#radialGradient2230);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.07686412;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
style="fill:url(#radialGradient2230);fill-opacity:1;fill-rule:evenodd;stroke:none"
|
||||||
id="path2222"
|
id="path2222"
|
||||||
sodipodi:cx="24.04163"
|
sodipodi:cx="24.04163"
|
||||||
sodipodi:cy="42.24213"
|
sodipodi:cy="42.24213"
|
||||||
sodipodi:rx="17.576654"
|
sodipodi:rx="17.576654"
|
||||||
sodipodi:ry="5.3538084"
|
sodipodi:ry="5.3538084"
|
||||||
d="M 41.618284 42.24213 A 17.576654 5.3538084 0 1 1 6.4649754,42.24213 A 17.576654 5.3538084 0 1 1 41.618284 42.24213 z"
|
d="m 41.618284,42.24213 a 17.576654,5.3538084 0 1 1 -35.1533086,0 17.576654,5.3538084 0 1 1 35.1533086,0 z"
|
||||||
transform="matrix(1.126713,0.000000,0.000000,1.002108,-2.891865,-0.821244)" />
|
transform="matrix(1.0774684,0,0,0.95830942,-1.7165229,0.26437162)" />
|
||||||
<rect
|
<rect
|
||||||
style="opacity:1;fill:url(#linearGradient2212);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2220);stroke-width:0.9999997;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
style="fill:url(#linearGradient2212);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2220);stroke-width:0.95629328;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||||
id="rect1316"
|
id="rect1316"
|
||||||
width="44.759838"
|
width="42.803543"
|
||||||
height="41.701817"
|
height="39.879177"
|
||||||
x="1.6199486"
|
x="2.5980954"
|
||||||
y="1.6600797"
|
y="2.6372454"
|
||||||
rx="4.5659914"
|
rx="4.3664279"
|
||||||
ry="4.5659928" />
|
ry="4.3664293" />
|
||||||
<rect
|
<rect
|
||||||
style="opacity:1;fill:url(#radialGradient2229);fill-opacity:1;fill-rule:evenodd;stroke:#173562;stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
style="fill:url(#radialGradient2229);fill-opacity:1;fill-rule:evenodd;stroke:#173562;stroke-width:0.9562934;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||||
id="rect1314"
|
id="rect1314"
|
||||||
width="37.177864"
|
width="35.552952"
|
||||||
height="28.954594"
|
height="27.689091"
|
||||||
x="5.4052019"
|
x="6.2179089"
|
||||||
y="5.4815545"
|
y="6.291697"
|
||||||
rx="1.6946707"
|
rx="1.6206026"
|
||||||
ry="1.694671" />
|
ry="1.620603" />
|
||||||
<path
|
<path
|
||||||
style="opacity:1;fill:#ecffd9;fill-opacity:1;fill-rule:evenodd;stroke:#c3ea9b;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-dasharray:none;stroke-opacity:0.41618497"
|
style="fill:#ecffd9;fill-opacity:1;fill-rule:evenodd;stroke:#c3ea9b;stroke-width:0.95629352;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:0.41618497;stroke-dasharray:none"
|
||||||
d="M 12.390689,20.935247 L 6.3688614,20.935247 L 6.3688614,22.152253 L 14.087646,22.152253 L 15.493568,16.239132 L 18.956082,29.936652 L 22.164804,19.116952 L 25.059348,25.028755 L 28.946308,21.516786 L 41.654736,21.516786 L 41.654736,19.457141 L 28.505235,19.457141 L 25.335019,22.596741 L 22.059557,15.937588 L 19.049723,24.112486 L 15.78119,11.248712 L 12.390689,20.935247 z "
|
d="m 12.898085,21.069964 -5.7586349,0 0,1.163815 7.3814239,0 1.344474,-5.65468 3.31118,13.09885 3.06848,-10.346809 2.768034,5.653419 3.717075,-3.358473 12.152987,0 0,-1.969626 -12.574783,0 -3.031657,3.00238 -3.132303,-6.368105 -2.878285,7.817602 -3.125677,-12.301544 -3.242314,9.263171 z"
|
||||||
id="path2188"
|
id="path2188"
|
||||||
sodipodi:nodetypes="ccccccccccccccccc" />
|
sodipodi:nodetypes="ccccccccccccccccc"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
<rect
|
<rect
|
||||||
style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2244);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
style="fill:none;stroke:url(#linearGradient2244);stroke-width:0.9562934;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
|
||||||
id="rect2232"
|
id="rect2232"
|
||||||
width="42.894741"
|
width="41.019966"
|
||||||
height="39.646549"
|
height="37.913738"
|
||||||
x="2.553669"
|
x="3.4910061"
|
||||||
y="2.6544337"
|
y="3.5881398"
|
||||||
rx="4.1303334"
|
rx="3.9498112"
|
||||||
ry="4.1303344" />
|
ry="3.9498122" />
|
||||||
<path
|
<path
|
||||||
sodipodi:nodetypes="ccccccccccccccccc"
|
sodipodi:nodetypes="ccccccccccccccccc"
|
||||||
id="path3088"
|
id="path3088"
|
||||||
d="M 11.515689,20.012278 L 6.3688614,20.012278 L 6.3688614,23.061029 L 14.962646,22.936029 L 15.618568,19.893387 L 18.963229,32.601726 L 22.539804,21.135091 L 25.059348,26.551191 L 29.321308,22.442609 L 41.654736,22.317609 L 40.904736,18.408071 L 28.505235,18.283071 L 25.460019,21.456026 L 22.059557,13.665616 L 19.424723,20.604266 L 15.90619,8.333659 L 11.515689,20.012278 z "
|
d="m 12.061328,20.187334 -4.9218779,0 0,2.915501 8.2181809,-0.119536 0.627254,-2.909659 3.198478,12.152902 3.420255,-10.965469 2.409424,5.179382 4.075685,-3.929011 11.794377,-0.119536 -0.71722,-3.738666 -11.857563,-0.119537 -2.91212,3.034276 -3.25184,-7.449919 -2.519675,6.635387 -3.36475,-11.7343027 -4.198608,11.1681877 z"
|
||||||
style="opacity:0.38068183;fill:#ecffd9;fill-opacity:1;fill-rule:evenodd;stroke:#c3ea9b;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0.41618497" />
|
style="opacity:0.38068183;fill:#ecffd9;fill-opacity:1;fill-rule:evenodd;stroke:#c3ea9b;stroke-width:0.95629388;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.41618497;stroke-dasharray:none"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
<path
|
<path
|
||||||
style="opacity:0.43181817;fill:url(#linearGradient1340);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
|
style="opacity:0.43181817;fill:url(#linearGradient1340);fill-opacity:1;fill-rule:evenodd;stroke:none"
|
||||||
d="M 6.84375,6.96875 L 6.84375,15.795073 C 10.513653,16.483179 14.582567,16.875 18.875,16.875 C 27.810295,16.875 35.812258,15.21019 41.15625,12.596829 L 41.15625,6.96875 L 6.84375,6.96875 z "
|
d="m 7.593583,7.7138926 0,8.4405554 c 3.509505,0.658032 7.400581,1.032728 11.505407,1.032728 8.544765,0 16.19699,-1.592047 21.307415,-4.091188 l 0,-5.3820954 -32.812822,0 z"
|
||||||
id="rect2178"
|
id="rect2178"
|
||||||
sodipodi:nodetypes="ccsccc" />
|
sodipodi:nodetypes="ccsccc"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
<g
|
<g
|
||||||
id="g3126"
|
id="g3126"
|
||||||
style="opacity:0.07954544;fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
|
style="opacity:0.07954544;fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1"
|
||||||
transform="translate(0.187500,0.687500)">
|
transform="matrix(0.95629355,0,0,0.95629355,1.228254,1.7071738)">
|
||||||
<path
|
<path
|
||||||
style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
|
style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
|
||||||
d="M 39.125,37.8125 L 38.0625,37.34375 C 37.805688,37.204184 37.500156,37.125 37.1875,37.125 C 36.187,37.125 35.375,37.937 35.375,38.9375 C 35.375,39.938 36.187,40.75 37.1875,40.75 C 38.156734,40.75 38.951426,39.988481 39,39.03125 C 39.000392,39.02353 38.999705,39.007745 39,39 L 39.125,37.8125 z "
|
d="M 39.125,37.8125 38.0625,37.34375 C 37.805688,37.204184 37.500156,37.125 37.1875,37.125 c -1.0005,0 -1.8125,0.812 -1.8125,1.8125 0,1.0005 0.812,1.8125 1.8125,1.8125 0.969234,0 1.763926,-0.761519 1.8125,-1.71875 3.92e-4,-0.0077 -2.95e-4,-0.02351 0,-0.03125 l 0.125,-1.1875 z"
|
||||||
id="path3120"
|
id="path3120"
|
||||||
sodipodi:nodetypes="ccsssscc" />
|
sodipodi:nodetypes="ccsssscc"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
<path
|
<path
|
||||||
sodipodi:nodetypes="ccsssscc"
|
sodipodi:nodetypes="ccsssscc"
|
||||||
id="path3122"
|
id="path3122"
|
||||||
d="M 28.992526,37.544659 L 28.893139,38.709836 C 28.855813,38.999729 28.892396,39.313228 29.005385,39.604754 C 29.366952,40.537636 30.417519,41.001313 31.350402,40.639747 C 32.283284,40.27818 32.746961,39.227613 32.385394,38.29473 C 32.035127,37.391001 31.037884,36.925219 30.127792,37.225858 C 30.120452,37.228282 30.105982,37.234627 30.098654,37.237151 L 28.992526,37.544659 z "
|
d="m 28.992526,37.544659 -0.09939,1.165177 c -0.03733,0.289893 -7.43e-4,0.603392 0.112246,0.894918 0.361567,0.932882 1.412134,1.396559 2.345017,1.034993 0.932882,-0.361567 1.396559,-1.412134 1.034992,-2.345017 -0.350267,-0.903729 -1.34751,-1.369511 -2.257602,-1.068872 -0.0073,0.0024 -0.02181,0.0088 -0.02914,0.01129 l -1.106128,0.307508 z"
|
||||||
style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
|
style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
<path
|
<path
|
||||||
style="opacity:1;color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
|
style="color:#000000;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
|
||||||
d="M 25.5,37.8125 L 24.5625,37.34375 C 24.305688,37.204184 24.000156,37.125 23.6875,37.125 C 22.687,37.125 21.875,37.937 21.875,38.9375 C 21.875,39.938 22.687,40.75 23.6875,40.75 C 24.656734,40.75 25.451426,39.988481 25.5,39.03125 C 25.500392,39.02353 25.499705,39.007745 25.5,39 L 25.5,37.8125 z "
|
d="M 25.5,37.8125 24.5625,37.34375 C 24.305688,37.204184 24.000156,37.125 23.6875,37.125 c -1.0005,0 -1.8125,0.812 -1.8125,1.8125 0,1.0005 0.812,1.8125 1.8125,1.8125 0.969234,0 1.763926,-0.761519 1.8125,-1.71875 3.92e-4,-0.0077 -2.95e-4,-0.02351 0,-0.03125 l 0,-1.1875 z"
|
||||||
id="path3124"
|
id="path3124"
|
||||||
sodipodi:nodetypes="ccsssscc" />
|
sodipodi:nodetypes="ccsssscc"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
</g>
|
</g>
|
||||||
<path
|
<path
|
||||||
style="opacity:1;color:#000000;fill:#e0e2df;fill-opacity:1;fill-rule:nonzero;stroke:#9b9d99;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
|
style="color:#000000;fill:#e0e2df;fill-opacity:1;fill-rule:nonzero;stroke:#9b9d99;stroke-width:0.95629352;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
|
||||||
d="M 39.125,37.8125 L 38.0625,37.34375 C 37.805688,37.204184 37.500156,37.125 37.1875,37.125 C 36.187,37.125 35.375,37.937 35.375,38.9375 C 35.375,39.938 36.187,40.75 37.1875,40.75 C 38.156734,40.75 38.951426,39.988481 39,39.03125 C 39.000392,39.02353 38.999705,39.007745 39,39 L 39.125,37.8125 z "
|
d="m 38.463934,37.209572 -1.016062,-0.448263 c -0.245587,-0.133466 -0.537766,-0.209189 -0.836757,-0.209189 -0.956771,0 -1.733282,0.77651 -1.733282,1.733282 0,0.956772 0.776511,1.733282 1.733282,1.733282 0.926873,0 1.686831,-0.728236 1.733282,-1.643629 3.75e-4,-0.0074 -2.82e-4,-0.02248 0,-0.02989 l 0.119537,-1.135598 z"
|
||||||
id="path3111"
|
id="path3111"
|
||||||
sodipodi:nodetypes="ccsssscc" />
|
sodipodi:nodetypes="ccsssscc"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
<path
|
<path
|
||||||
sodipodi:nodetypes="ccsssscc"
|
sodipodi:nodetypes="ccsssscc"
|
||||||
id="path3116"
|
id="path3116"
|
||||||
d="M 28.992526,37.544659 L 28.893139,38.709836 C 28.855813,38.999729 28.892396,39.313228 29.005385,39.604754 C 29.366952,40.537636 30.417519,41.001313 31.350402,40.639747 C 32.283284,40.27818 32.746961,39.227613 32.385394,38.29473 C 32.035127,37.391001 31.037884,36.925219 30.127792,37.225858 C 30.120452,37.228282 30.105982,37.234627 30.098654,37.237151 L 28.992526,37.544659 z "
|
d="m 28.774315,36.953437 -0.09504,1.114252 c -0.03569,0.277222 -7.1e-4,0.577019 0.107341,0.855804 0.345764,0.892109 1.350414,1.33552 2.242524,0.989757 0.892109,-0.345764 1.335521,-1.350415 0.989756,-2.242525 -0.334958,-0.86423 -1.288615,-1.309654 -2.15893,-1.022155 -0.007,0.0023 -0.02086,0.0084 -0.02786,0.0108 l -1.057783,0.294068 z"
|
||||||
style="opacity:1;color:#000000;fill:#e0e2df;fill-opacity:1;fill-rule:nonzero;stroke:#9b9d99;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
|
style="color:#000000;fill:#e0e2df;fill-opacity:1;fill-rule:nonzero;stroke:#9b9d99;stroke-width:0.95629352;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
<path
|
<path
|
||||||
style="opacity:1;color:#000000;fill:#e0e2df;fill-opacity:1;fill-rule:nonzero;stroke:#9b9d99;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
|
style="color:#000000;fill:#e0e2df;fill-opacity:1;fill-rule:nonzero;stroke:#9b9d99;stroke-width:0.95629352;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
|
||||||
d="M 25.5,37.8125 L 24.5625,37.34375 C 24.305688,37.204184 24.000156,37.125 23.6875,37.125 C 22.687,37.125 21.875,37.937 21.875,38.9375 C 21.875,39.938 22.687,40.75 23.6875,40.75 C 24.656734,40.75 25.451426,39.988481 25.5,39.03125 C 25.500392,39.02353 25.499705,39.007745 25.5,39 L 25.5,37.8125 z "
|
d="m 25.434435,37.209572 -0.896526,-0.448263 c -0.245587,-0.133466 -0.537766,-0.209189 -0.836757,-0.209189 -0.956771,0 -1.733282,0.77651 -1.733282,1.733282 0,0.956772 0.776511,1.733282 1.733282,1.733282 0.926873,0 1.686832,-0.728236 1.733283,-1.643629 3.74e-4,-0.0074 -2.83e-4,-0.02248 0,-0.02989 l 0,-1.135598 z"
|
||||||
id="path3118"
|
id="path3118"
|
||||||
sodipodi:nodetypes="ccsssscc" />
|
sodipodi:nodetypes="ccsssscc"
|
||||||
|
inkscape:connector-curvature="0" />
|
||||||
<rect
|
<rect
|
||||||
ry="2.5696716"
|
ry="2.4573605"
|
||||||
rx="2.5696716"
|
rx="2.4573605"
|
||||||
y="4.635767"
|
y="5.4828758"
|
||||||
x="4.3192058"
|
x="5.1793776"
|
||||||
height="30.646179"
|
height="29.306744"
|
||||||
width="39.349869"
|
width="37.630024"
|
||||||
id="rect2221"
|
id="rect2221"
|
||||||
style="opacity:0.57386364;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2231);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
|
style="opacity:0.57386361;fill:none;stroke:url(#linearGradient2231);stroke-width:0.95629352;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 16 KiB |
|
|
@ -10,8 +10,8 @@
|
||||||
xmlns:xlink="http://www.w3.org/1999/xlink"
|
xmlns:xlink="http://www.w3.org/1999/xlink"
|
||||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||||
width="32"
|
width="48"
|
||||||
height="32"
|
height="48"
|
||||||
id="svg2"
|
id="svg2"
|
||||||
version="1.1"
|
version="1.1"
|
||||||
inkscape:version="0.48.3.1 r9886"
|
inkscape:version="0.48.3.1 r9886"
|
||||||
|
|
@ -55,10 +55,10 @@
|
||||||
inkscape:label="Layer 1"
|
inkscape:label="Layer 1"
|
||||||
inkscape:groupmode="layer"
|
inkscape:groupmode="layer"
|
||||||
id="layer1"
|
id="layer1"
|
||||||
transform="translate(0,-1020.3622)">
|
transform="translate(0,-1004.3622)">
|
||||||
<image
|
<image
|
||||||
y="1014.6645"
|
y="994.07819"
|
||||||
x="-5.8903012"
|
x="-10.061619"
|
||||||
id="image2993"
|
id="image2993"
|
||||||
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABHNCSVQICAgIfAhkiAAAIABJREFU
|
xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAYAAAD0eNT6AAAABHNCSVQICAgIfAhkiAAAIABJREFU
|
||||||
eJzsvWmUZNtV3/nf55w7xJCRc2ZlVtWreqongd5DsqSHJQEGSdCYwQyiLWHE0ExyL7vpbhvcLC/3
|
eJzsvWmUZNtV3/nf55w7xJCRc2ZlVtWreqongd5DsqSHJQEGSdCYwQyiLWHE0ExyL7vpbhvcLC/3
|
||||||
|
|
@ -951,7 +951,7 @@ EgBCCCFEDZEAEEIIIWqIBIAQQghRQyQAhBBCiBoiASCEEELUEAkAIYQQooZIAAghhBA1RAJACCGE
|
||||||
qCESAEIIIUQNkQAQQgghaogEgBBCCFFDJACEEEKIGiIBIIQQQtQQCQAhhBCihkgACCGEEDVEAkAI
|
qCESAEIIIUQNkQAQQgghaogEgBBCCFFDJACEEEKIGiIBIIQQQtQQCQAhhBCihkgACCGEEDVEAkAI
|
||||||
IYSoIf8fL4wfsLphpR0AAAAASUVORK5CYII=
|
IYSoIf8fL4wfsLphpR0AAAAASUVORK5CYII=
|
||||||
"
|
"
|
||||||
height="43.714287"
|
height="67.714287"
|
||||||
width="43.714287" />
|
width="67.714287" />
|
||||||
</g>
|
</g>
|
||||||
</svg>
|
</svg>
|
||||||
|
|
|
||||||
|
Before Width: | Height: | Size: 69 KiB After Width: | Height: | Size: 69 KiB |
Loading…
Reference in New Issue