diff --git a/aleksis/core/apps.py b/aleksis/core/apps.py index dd3c9b3a8cafb9a6a0ae77fa7253f9a58ab76395..4f243858d97bb458b59c03ddb99ba67fd771a0c2 100644 --- a/aleksis/core/apps.py +++ b/aleksis/core/apps.py @@ -2,6 +2,7 @@ from typing import Any, List, Optional, Tuple import django.apps from django.http import HttpRequest +from django.core.files.uploadedfile import TemporaryUploadedFile from dynamic_preferences.registries import preference_models @@ -59,10 +60,15 @@ class CoreConfig(AppConfig): elif name in ("favicon", "pwa_icon"): from favicon.models import Favicon # noqa - Favicon.on_site.update_or_create( - title=name, - defaults={"isFavicon": name == "favicon", "faviconImage": new_value,}, - ) + is_favicon = name == "favicon" + + if new_value: + Favicon.on_site.update_or_create( + title=name, + defaults={"isFavicon": name == "favicon", "faviconImage": new_value, }, + ) + else: + Favicon.on_site.filter(title=name, isFavicon=is_favicon).delete() def post_migrate( self, diff --git a/aleksis/core/models.py b/aleksis/core/models.py index 1225d924998db27f21a109e8b9a6d4a57f239c91..6f4fff67654ff11857a56c25c6cb89fbedf0833c 100644 --- a/aleksis/core/models.py +++ b/aleksis/core/models.py @@ -141,11 +141,11 @@ class Person(ExtensibleModel): return f"{self.last_name}, {self.first_name}" @property - def adressing_name(self) -> str: + def addressing_name(self) -> str: """Full name of person in format configured for addressing.""" - if get_site_preferences()["notification__addressing_name_format"] == "last_first": + if self.preferences["notification__addressing_name_format"] == "last_first": return f"{self.last_name}, {self.first_name}" - elif get_site_preferences()["notification__addressing_name_format"] == "first_last": + elif self.preferences["notification__addressing_name_format"] == "first_last": return f"{self.first_name} {self.last_name}" @property diff --git a/aleksis/core/static/img/aleksis-banner.svg b/aleksis/core/static/img/aleksis-banner.svg new file mode 100644 index 0000000000000000000000000000000000000000..8c1b026d9e6198c0a4261625e0bc83187315f0ab --- /dev/null +++ b/aleksis/core/static/img/aleksis-banner.svg @@ -0,0 +1,453 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<svg + xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="300mm" + height="260mm" + viewBox="0 0 300 260" + version="1.1" + id="svg8" + inkscape:version="0.92.4 (5da689c313, 2019-01-14)" + sodipodi:docname="aleksis-banner-shirt.svg"> + <defs + id="defs2"> + <linearGradient + id="linearGradient2292" + osb:paint="solid"> + <stop + style="stop-color:#000000;stop-opacity:1;" + offset="0" + id="stop2290" /> + </linearGradient> + <linearGradient + id="shadow-gradient" + x1="-19.530001" + x2="165.39999" + y1="-19.530001" + y2="165.39999" + gradientUnits="userSpaceOnUse"> + <stop + id="stop9444" + offset="0" /> + <stop + id="stop9446" + stop-opacity="0" + offset="1" /> + </linearGradient> + <filter + style="color-interpolation-filters:sRGB" + inkscape:label="Drop Shadow" + id="filter1689"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood1679" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1681" /> + <feGaussianBlur + in="composite1" + stdDeviation="1" + result="blur" + id="feGaussianBlur1683" /> + <feOffset + dx="3" + dy="3" + result="offset" + id="feOffset1685" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite1687" /> + </filter> + <filter + style="color-interpolation-filters:sRGB" + inkscape:label="Drop Shadow" + id="filter1701"> + <feFlood + flood-opacity="0.498039" + flood-color="rgb(0,0,0)" + result="flood" + id="feFlood1691" /> + <feComposite + in="flood" + in2="SourceGraphic" + operator="in" + result="composite1" + id="feComposite1693" /> + <feGaussianBlur + in="composite1" + stdDeviation="1" + result="blur" + id="feGaussianBlur1695" /> + <feOffset + dx="3" + dy="3" + result="offset" + id="feOffset1697" /> + <feComposite + in="SourceGraphic" + in2="offset" + operator="over" + result="composite2" + id="feComposite1699" /> + </filter> + <linearGradient + id="shadow-gradient-9" + x1="-19.530001" + x2="165.39999" + y1="-19.530001" + y2="165.39999" + gradientUnits="userSpaceOnUse"> + <stop + id="stop9444-0" + offset="0" /> + <stop + id="stop9446-0" + stop-opacity="0" + offset="1" /> + </linearGradient> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="0.69999999" + inkscape:cx="292.89994" + inkscape:cy="535.58084" + inkscape:document-units="mm" + inkscape:current-layer="layer1" + showgrid="false" + inkscape:window-width="1920" + inkscape:window-height="1016" + inkscape:window-x="1920" + inkscape:window-y="27" + inkscape:window-maximized="1" + showguides="true" + inkscape:guide-bbox="true"> + <sodipodi:guide + position="235.19718,210.07385" + orientation="1,0" + id="guide2367" + inkscape:locked="false" /> + <sodipodi:guide + position="44.63401,153.94725" + orientation="1,0" + id="guide2369" + inkscape:locked="false" /> + <sodipodi:guide + position="115.86134,243.34891" + orientation="0,1" + id="guide2405" + inkscape:locked="false" /> + <sodipodi:guide + position="109.44687,196.97765" + orientation="0,1" + id="guide2407" + inkscape:locked="false" /> + <sodipodi:guide + position="90.943818,196.97766" + orientation="1,0" + id="guide2691" + inkscape:locked="false" /> + </sodipodi:namedview> + <metadata + id="metadata5"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + <dc:title></dc:title> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:label="Layer 1" + inkscape:groupmode="layer" + id="layer1" + transform="translate(0,-37)"> + <g + id="g938" + transform="matrix(1.5379515,0,0,1.5379515,-65.338762,-42.304096)"> + <g + inkscape:export-ydpi="93" + inkscape:export-xdpi="93" + inkscape:export-filename="/tmp/aleksis-layout.png" + transform="matrix(0.68664702,0,0,0.68664702,219.7793,11.427418)" + id="g1522"> + <g + transform="matrix(1.0000492,0,0,1.0000492,-255.36319,61.292102)" + id="background-with-glow"> + <rect + style="fill:#0d5eaf;stroke-width:0.4104" + x="0" + id="background" + y="-3.357e-06" + width="67.730003" + height="67.730003" + rx="3.3069999" + ry="3.3069999" /> + <path + style="opacity:0.2;fill:#ffffff;stroke-width:1.551" + inkscape:connector-curvature="0" + id="glow" + transform="scale(0.2646)" + d="M 9.959,0.2578 C 4.261,1.4258 0,6.4468 0,12.4978 v 52.31 a 234.1,86.8 0 0 0 188.9,35.71 234.1,86.8 0 0 0 67.09,-3.715 v -84.3 c 0,-4.319 -2.17,-8.112 -5.482,-10.36 -0.0155,-0.01049 -0.0313,-0.02083 -0.0469,-0.03125 -0.2971,-0.1993 -0.6034,-0.3849 -0.918,-0.5586 -0.0521,-0.02867 -0.1037,-0.05799 -0.1562,-0.08594 -0.2939,-0.1568 -0.5968,-0.3001 -0.9043,-0.4336 -0.0565,-0.02442 -0.111,-0.05257 -0.168,-0.07617 -0.3308,-0.1378 -0.6709,-0.2577 -1.016,-0.3672 -0.035,-0.01105 -0.0684,-0.02636 -0.1035,-0.03711 -0.3806,-0.1172 -0.7687,-0.2158 -1.164,-0.2969 h -236.1 z" /> + </g> + <g + transform="matrix(1.0000492,0,0,1.0000492,-255.36319,61.292102)" + id="widgets-with-shadow"> + <path + style="fill:url(#shadow-gradient);stroke-width:1.551" + inkscape:connector-curvature="0" + id="shadow" + transform="scale(0.2646)" + d="m 188.2,20.16 c -11.17,0.2955 -4.441,16.25 -17.54,12.56 -17.31,4.576 -18.64,24.39 -17.21,39.1 1.565,6.747 -1.9,1.315 -3.715,-0.1367 -5.666,-3.203 -12.24,3.777 -8.709,9.107 1.178,1.172 2.354,2.349 3.529,3.525 -1.648,-0.1733 -2.722,0.18 -3.406,0.8867 -20.9,-20.89 -41.81,-41.78 -62.73,-62.66 -1.667,-1.362 -3.817,-2.142 -5.979,-2.131 -9.823,2.627 -15.3,12.67 -22.91,19 -8.327,8.601 -17.24,16.68 -25.2,25.61 -4.688,8.603 4.095,13.55 8.873,18.91 1.473,2.302 7.219,4.605 2.852,6.906 -7.332,4.874 -9.54,15.75 -2.365,21.36 15.49,15.49 30.97,30.98 46.46,46.46 -0.4584,0.6368 -1.044,1.194 -1.809,1.637 -3.106,4.526 -4.08,-0.9818 -6.254,-1.748 -5.859,-6.192 -12.02,-12.08 -17.95,-18.21 h -22.08 c -12.43,0.005 -12.65,13.69 -12,22.8 0.3378,21.38 -0.6904,42.86 0.541,64.18 3.053,6.838 9.872,10.98 14.65,16.58 4.034,4.029 8.064,8.062 12.1,12.09 h 196.1 c 6.925,0 12.5,-5.575 12.5,-12.5 v -162.7 c -13.85,-14.24 -27.68,-28.5 -41.44,-42.83 -4.585,-4.531 -11.77,-4.442 -15.49,-9.955 -3.38,-2.915 -5.87,-7.7 -10.88,-7.838 z" /> + <g + style="fill:#ffffff" + id="widgets"> + <path + style="stroke-width:0.05441" + inkscape:connector-curvature="0" + id="schoolbag" + d="m 44.52,19.7 h 10.45 a 0.4353,0.4353 0 0 1 0.4353,0.4353 v 3.917 A 0.4353,0.4353 0 0 1 54.97,24.4876 H 44.52 a 0.4353,0.4353 0 0 1 -0.4353,-0.4353 v -3.917 A 0.4353,0.4353 0 0 1 44.52,19.7 Z M 55.4,18.394 v -0.8705 a 0.4353,0.4353 0 0 0 -0.4353,-0.4353 h -10.45 a 0.4353,0.4353 0 0 0 -0.4353,0.4353 v 0.8705 a 0.4353,0.4353 0 0 0 0.4353,0.4353 h 10.45 A 0.4353,0.4353 0 0 0 55.4,18.394 Z m -14.8,10.01 v 0.8705 a 2.176,2.176 0 0 0 2.176,2.176 h 13.93 a 2.176,2.176 0 0 0 2.176,-2.176 V 28.404 a 0.4353,0.4353 0 0 0 -0.4353,-0.4353 h -17.41 a 0.4353,0.4353 0 0 0 -0.4353,0.4353 z m -0.8705,-7.4 v -1.741 a 0.4353,0.4353 0 0 0 -0.4353,-0.4353 h -0.8705 a 1.306,1.306 0 0 0 -1.306,1.306 v 0.8706 a 0.4353,0.4353 0 0 0 0.4353,0.4353 h 1.741 a 0.4353,0.4353 0 0 0 0.4353,-0.4353 z m -2.612,1.741 v 4.788 a 1.306,1.306 0 0 0 1.306,1.306 h 0.8705 a 0.4353,0.4353 0 0 0 0.4353,-0.4353 v -5.659 A 0.4353,0.4353 0 0 0 39.294,22.3094 h -1.741 a 0.4353,0.4353 0 0 0 -0.4353,0.4353 z m 22.63,0 v 5.659 a 0.4353,0.4353 0 0 0 0.4353,0.4353 h 0.8705 a 1.306,1.306 0 0 0 1.306,-1.306 v -4.788 A 0.4353,0.4353 0 0 0 61.924,22.31 h -1.741 a 0.4353,0.4353 0 0 0 -0.4353,0.4353 z m 2.612,-1.741 v -0.8706 a 1.306,1.306 0 0 0 -1.306,-1.306 H 60.183 a 0.4353,0.4353 0 0 0 -0.4353,0.4353 v 1.741 a 0.4353,0.4353 0 0 0 0.4353,0.4353 h 1.741 a 0.4353,0.4353 0 0 0 0.4353,-0.4353 z m -3.482,-6.203 v 11.86 a 0.4353,0.4353 0 0 1 -0.4353,0.4353 h -17.41 A 0.4353,0.4353 0 0 1 40.5969,26.661 v -11.86 a 6.42,6.42 0 0 1 6.42,-6.42 h 0.3809 A 0.1632,0.1632 0 0 0 47.561,8.2178 V 7.5105 a 2.179,2.179 0 0 1 2.229,-2.176 c 1.188,0.0282 2.124,1.028 2.124,2.217 v 0.6664 a 0.1632,0.1632 0 0 0 0.1632,0.1632 h 0.3809 a 6.42,6.42 0 0 1 6.42,6.42 z m -10.45,-6.583 a 0.1632,0.1632 0 0 0 0.1632,0.1632 h 2.285 A 0.1632,0.1632 0 0 0 51.0389,8.218 V 7.5404 c 0,-0.7306 -0.5978,-1.348 -1.328,-1.336 a 1.307,1.307 0 0 0 -1.283,1.306 z m -0.4353,4.081 a 1.741,1.741 0 1 0 1.741,-1.741 1.741,1.741 0 0 0 -1.741,1.741 z m 8.27,5.223 a 1.307,1.307 0 0 0 -1.306,-1.306 h -10.45 a 1.307,1.307 0 0 0 -1.306,1.306 v 6.529 a 1.307,1.307 0 0 0 1.306,1.306 h 10.45 a 1.307,1.307 0 0 0 1.306,-1.306 z" /> + <path + inkscape:connector-curvature="0" + id="puzzle-ll" + d="m 8.484,37.13 c -1.759,0 -3.175,1.416 -3.175,3.175 v 18.89 c 0,1.759 1.416,3.175 3.175,3.175 h 18.93 c 1.759,0 3.175,-1.416 3.175,-3.175 v -18.89 c 0,-1.759 -1.416,-3.175 -3.175,-3.175 h -5.842 v 2.798 h -0.01188 c 0.0052,0.0528 0.01281,0.1048 0.01447,0.1586 0,2.002 -1.623,3.625 -3.625,3.625 -2.002,0 -3.625,-1.623 -3.625,-3.625 0.01013,-0.0551 0.02494,-0.1053 0.03669,-0.1586 H 14.32614 V 37.13 Z m 28.69,12.62 c 3e-6,2.002 -1.623,3.625 -3.625,3.625 -4.515,-0.8302 -3.163,-7.154 0,-7.251 2.002,0 3.625,1.623 3.625,3.625 z m -6.582,-3.623 h 2.798 v 7.247 h -2.798 z" /> + <path + inkscape:connector-curvature="0" + id="puzzle-lr" + d="m 37.31,59.24 c 0,1.759 1.416,3.175 3.175,3.175 h 18.89 c 1.759,0 3.175,-1.416 3.175,-3.175 V 40.31 c 0,-1.759 -1.416,-3.175 -3.175,-3.175 h -18.89 c -1.759,0 -3.175,1.416 -3.175,3.175 v 5.842 h 2.798 v 0.0119 c 0.0528,-0.005 0.1048,-0.0128 0.1586,-0.0145 2.002,0 3.625,1.623 3.625,3.625 0,2.002 -1.623,3.625 -3.625,3.625 -0.0551,-0.0101 -0.1053,-0.0249 -0.1586,-0.0367 v 0.0351 H 37.31 Z" /> + <path + inkscape:connector-curvature="0" + id="puzzle-ul" + d="m 31.48,20.23 c 0.9818,-0.9818 0.9818,-2.563 0,-3.544 L 20.94,6.146 c -0.9818,-0.9819 -2.563,-0.9819 -3.545,0 l -10.57,10.57 c -0.9818,0.9818 -0.9818,2.563 6e-6,3.544 l 10.54,10.54 c 0.9818,0.9819 2.563,0.9819 3.545,0 l 3.261,-3.261 -1.562,-1.562 0.0064,-0.0069 c -0.03229,-0.02696 -0.06563,-0.05145 -0.09668,-0.08057 -1.118,-1.118 -1.118,-2.93 0,-4.048 1.118,-1.118 2.93,-1.118 4.048,0 0.02514,0.0363 0.04485,0.07241 0.0681,0.109 l 0.0196,-0.01948 1.562,1.562 z M 8.42,29.199 c -1.118,-1.118 -1.118,-2.93 -6.1e-6,-4.048 2.9840001,-2.057 5.7590001,2.228 4.0480001,4.048 -1.118,1.118 -2.9300001,1.118 -4.0480001,0 z m 5.697,-1.652 -1.562,1.562 -4.045,-4.045 1.562,-1.562 z" /> + </g> + </g> + </g> + <g + inkscape:export-ydpi="93" + inkscape:export-xdpi="93" + inkscape:export-filename="/tmp/aleksis-layout.png" + transform="translate(-9.1355604)" + id="text1709" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:66.17029572px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + aria-label="ALEKSIS"> + <path + inkscape:connector-curvature="0" + id="path841" + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded Medium';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 126.22416,97.988904 c 0.19851,0.529362 -0.26468,1.058725 -0.79404,1.257236 h -0.26469 c -0.52936,0 -0.86021,-0.264682 -0.99255,-0.794044 l -2.97766,-12.837037 h -11.71215 l -2.97766,12.837037 c -0.19851,0.529362 -0.72787,0.992554 -1.25723,0.794044 -0.59554,-0.198511 -0.99256,-0.727874 -0.79405,-1.257236 l 9.85938,-42.5475 c 0.13234,-0.529363 0.46319,-0.794044 0.99255,-0.794044 0.59553,0 0.92638,0.264681 1.05872,0.794044 z m -10.9181,-37.717069 -5.35979,23.291944 h 10.78575 z" /> + <path + inkscape:connector-curvature="0" + id="path843" + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded Medium';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 130.9605,99.24614 c -0.72787,0 -1.05872,-0.330852 -1.05872,-1.058725 v -42.5475 c 0,-0.529363 0.46319,-0.992555 1.05872,-0.992555 0.52937,0 0.99256,0.463192 0.99256,0.992555 V 97.19486 h 13.96193 c 0.59553,0 1.05873,0.463192 1.05873,0.992555 0,0.727873 -0.33086,1.058725 -1.05873,1.058725 z" /> + <path + inkscape:connector-curvature="0" + id="path845" + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded Medium';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 151.86515,77.939304 V 97.19486 h 12.90321 c 0.59553,0 1.05872,0.463192 1.05872,0.992555 0,0.727873 -0.33085,1.058725 -1.05872,1.058725 H 150.8726 c -0.72788,0 -1.05873,-0.330852 -1.05873,-1.058725 v -42.5475 c 0,-0.529363 0.46319,-0.992555 1.05873,-0.992555 h 13.89576 c 0.59553,0 1.05872,0.463192 1.05872,0.992555 0,0.727873 -0.33085,1.058724 -1.05872,1.058724 h -12.90321 v 19.189386 h 12.90321 c 0.72787,0 1.05872,0.330852 1.05872,1.058725 0,0.529362 -0.46319,0.992554 -1.05872,0.992554 z" /> + <path + inkscape:connector-curvature="0" + id="path847" + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded Medium';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 178.16784,75.160152 12.63853,22.564071 c 0.26468,0.463192 0.0662,1.124895 -0.39702,1.389576 l -0.52937,0.132341 c -0.39702,0 -0.72787,-0.198511 -0.92638,-0.529363 l -12.10916,-21.637687 -4.49958,6.749371 v 14.358954 c 0,0.595532 -0.4632,1.058725 -0.99256,1.058725 -0.72787,0 -1.05872,-0.330852 -1.05872,-1.058725 v -42.5475 c 0,-0.529363 0.46319,-0.992555 1.05872,-0.992555 0.52936,0 0.99256,0.463192 0.99256,0.992555 v 24.350668 l 16.67491,-24.880031 c 0.33085,-0.529362 0.99255,-0.595532 1.45575,-0.330851 0.46319,0.330851 0.59553,0.992554 0.26468,1.455746 z" /> + <path + inkscape:connector-curvature="0" + id="path849" + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded Medium';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 204.19758,78.468667 -1.1249,-0.529363 c -1.3234,-0.529362 -3.44085,-1.455746 -5.22745,-3.308514 -1.85277,-1.786598 -3.37469,-4.30107 -3.37469,-8.205117 0,-6.6832 3.37469,-11.844483 9.52853,-11.844483 6.35234,0 9.59469,4.102558 9.59469,11.844483 0,0.529362 -0.46319,1.058725 -1.05873,1.058725 -0.59553,0 -1.05872,-0.529363 -1.05872,-1.058725 0,-6.6832 -2.4483,-9.793204 -7.47724,-9.793204 -4.6981,0 -7.47725,4.036388 -7.47725,9.793204 0,3.176174 1.19107,5.293624 2.77915,6.74937 1.52192,1.455747 3.30852,2.31596 4.63193,2.845323 l 1.05872,0.463192 c 1.1249,0.529362 3.30851,1.389576 5.16128,3.110004 1.85277,1.720427 3.44086,4.234899 3.44086,8.138946 0,3.242345 -0.86022,6.021497 -2.38213,8.072776 -1.72043,2.24979 -4.10256,3.374685 -7.21256,3.374685 -6.35235,0 -9.52853,-4.102558 -9.52853,-11.778312 0,-0.727874 0.33085,-1.058725 1.05873,-1.058725 0.52936,0 0.99255,0.463192 0.99255,1.058725 0,4.301069 1.1249,6.74937 2.58064,8.072776 1.45575,1.389576 3.30852,1.654257 4.89661,1.654257 4.76426,0 7.47724,-3.507026 7.47724,-9.396182 0,-3.176174 -1.25724,-5.293624 -2.77915,-6.6832 -0.79405,-0.661703 -1.58809,-1.191065 -2.4483,-1.588087 z" /> + <path + inkscape:connector-curvature="0" + id="path851" + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded Medium';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 217.99822,55.639915 c 0,-0.529363 0.4632,-0.992555 1.05873,-0.992555 0.59553,0 1.05872,0.463192 1.05872,0.992555 v 42.5475 c 0,0.727873 -0.33085,1.058725 -1.05872,1.058725 -0.72787,0 -1.05873,-0.330852 -1.05873,-1.058725 z" /> + <path + inkscape:connector-curvature="0" + id="path853" + style="font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded Medium';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:1.5;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 234.43947,78.468667 -1.12489,-0.529363 c -1.32341,-0.529362 -3.44086,-1.455746 -5.22745,-3.308514 -1.85277,-1.786598 -3.37469,-4.30107 -3.37469,-8.205117 0,-6.6832 3.37469,-11.844483 9.52852,-11.844483 6.35235,0 9.5947,4.102558 9.5947,11.844483 0,0.529362 -0.4632,1.058725 -1.05873,1.058725 -0.59553,0 -1.05872,-0.529363 -1.05872,-1.058725 0,-6.6832 -2.4483,-9.793204 -7.47725,-9.793204 -4.69809,0 -7.47724,4.036388 -7.47724,9.793204 0,3.176174 1.19107,5.293624 2.77915,6.74937 1.52192,1.455747 3.30852,2.31596 4.63192,2.845323 l 1.05873,0.463192 c 1.12489,0.529362 3.30851,1.389576 5.16128,3.110004 1.85277,1.720427 3.44086,4.234899 3.44086,8.138946 0,3.242345 -0.86022,6.021497 -2.38213,8.072776 -1.72043,2.24979 -4.10256,3.374685 -7.21257,3.374685 -6.35235,0 -9.52852,-4.102558 -9.52852,-11.778312 0,-0.727874 0.33085,-1.058725 1.05873,-1.058725 0.52936,0 0.99255,0.463192 0.99255,1.058725 0,4.301069 1.12489,6.74937 2.58064,8.072776 1.45575,1.389576 3.30852,1.654257 4.8966,1.654257 4.76426,0 7.47725,-3.507026 7.47725,-9.396182 0,-3.176174 -1.25724,-5.293624 -2.77916,-6.6832 -0.79404,-0.661703 -1.58808,-1.191065 -2.4483,-1.588087 z" /> + </g> + <g + inkscape:export-ydpi="93" + inkscape:export-xdpi="93" + inkscape:export-filename="/tmp/aleksis-layout.png" + transform="matrix(0.95095206,0,0,0.95095206,2.6877943,0.86956426)" + id="text2300" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:27.36661148px;line-height:1.25;font-family:'Liberation Sans';-inkscape-font-specification:'Liberation Sans';letter-spacing:0px;word-spacing:0px;fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + aria-label="The Free School Information System"> + <path + inkscape:connector-curvature="0" + id="path2302" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 50.719721,108.67707 c 0.164199,0 0.29191,0.12771 0.29191,0.27366 0,0.20069 -0.09122,0.29191 -0.29191,0.29191 h -2.645439 v 11.43925 c 0,0.1642 -0.145956,0.29191 -0.291911,0.29191 -0.200688,0 -0.29191,-0.0912 -0.29191,-0.29191 v -11.43925 h -2.663684 c -0.145955,0 -0.273666,-0.12771 -0.273666,-0.29191 0,-0.14595 0.127711,-0.27366 0.273666,-0.27366 z" /> + <path + inkscape:connector-curvature="0" + id="path2304" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 56.86552,120.70013 c 0,0.20069 -0.09122,0.29191 -0.29191,0.29191 -0.200689,0 -0.291911,-0.0912 -0.291911,-0.29191 v -5.56454 H 52.55984 v 5.56454 c 0,0.20069 -0.09122,0.29191 -0.29191,0.29191 -0.200689,0 -0.291911,-0.0912 -0.291911,-0.29191 v -11.73115 c 0,-0.14596 0.127711,-0.27367 0.291911,-0.27367 0.164199,0 0.29191,0.12771 0.29191,0.27367 v 5.58279 h 3.721859 v -5.58279 c 0,-0.14596 0.127711,-0.27367 0.291911,-0.27367 0.1642,0 0.29191,0.12771 0.29191,0.27367 z" /> + <path + inkscape:connector-curvature="0" + id="path2306" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 58.794866,115.11734 v 5.30913 h 3.557659 c 0.1642,0 0.291911,0.12771 0.291911,0.27366 0,0.20069 -0.09122,0.29191 -0.291911,0.29191 H 58.5212 c -0.200689,0 -0.291911,-0.0912 -0.291911,-0.29191 v -11.73115 c 0,-0.14596 0.127711,-0.27367 0.291911,-0.27367 h 3.831325 c 0.1642,0 0.291911,0.12771 0.291911,0.27367 0,0.20069 -0.09122,0.29191 -0.291911,0.29191 h -3.557659 v 5.29088 h 3.557659 c 0.200689,0 0.291911,0.0912 0.291911,0.29191 0,0.14595 -0.127711,0.27366 -0.291911,0.27366 z" /> + <path + inkscape:connector-curvature="0" + id="path2308" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 68.41765,114.55177 h 3.55766 c 0.200688,0 0.29191,0.0912 0.29191,0.29191 0,0.14595 -0.127711,0.27366 -0.29191,0.27366 h -3.55766 v 5.58279 c 0,0.1642 -0.127711,0.29191 -0.273666,0.29191 -0.200689,0 -0.291911,-0.0912 -0.291911,-0.29191 v -11.73115 c 0,-0.14596 0.127711,-0.27367 0.291911,-0.27367 h 3.831326 c 0.164199,0 0.29191,0.12771 0.29191,0.27367 0,0.20069 -0.09122,0.29191 -0.29191,0.29191 h -3.55766 z" /> + <path + inkscape:connector-curvature="0" + id="path2310" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 78.517642,120.68189 c 0,0.20069 -0.09122,0.29191 -0.291911,0.29191 -0.145955,0 -0.273666,-0.12771 -0.273666,-0.29191 v -3.1198 c 0,-1.51428 -0.839243,-2.35352 -2.298795,-2.35352 h -1.641997 v 5.47332 c 0,0.20069 -0.09122,0.29191 -0.291911,0.29191 -0.145955,0 -0.273666,-0.12771 -0.273666,-0.29191 v -11.73116 c 0,-0.14595 0.127711,-0.27366 0.273666,-0.27366 h 1.933908 c 1.952151,0 2.846127,1.00344 2.846127,3.2475 0,1.11291 -0.218933,1.93391 -0.675043,2.463 -0.200688,0.23717 -0.437866,0.41962 -0.748021,0.54733 0.237178,0.12771 0.437866,0.25542 0.638555,0.45611 0.529087,0.51084 0.802754,1.24062 0.802754,2.17108 z m -4.506369,-11.43925 v 5.40035 h 1.641997 c 1.587263,0 2.262306,-0.74802 2.262306,-2.71842 0,-1.89742 -0.656799,-2.68193 -2.262306,-2.68193 z" /> + <path + inkscape:connector-curvature="0" + id="path2312" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 80.317565,115.11734 v 5.30913 h 3.55766 c 0.164199,0 0.29191,0.12771 0.29191,0.27366 0,0.20069 -0.09122,0.29191 -0.29191,0.29191 h -3.831326 c -0.200688,0 -0.29191,-0.0912 -0.29191,-0.29191 v -11.73115 c 0,-0.14596 0.12771,-0.27367 0.29191,-0.27367 h 3.831326 c 0.164199,0 0.29191,0.12771 0.29191,0.27367 0,0.20069 -0.09122,0.29191 -0.29191,0.29191 h -3.55766 v 5.29088 h 3.55766 c 0.200688,0 0.29191,0.0912 0.29191,0.29191 0,0.14595 -0.127711,0.27366 -0.29191,0.27366 z" /> + <path + inkscape:connector-curvature="0" + id="path2314" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 86.018943,115.11734 v 5.30913 h 3.55766 c 0.164199,0 0.29191,0.12771 0.29191,0.27366 0,0.20069 -0.09122,0.29191 -0.29191,0.29191 h -3.831326 c -0.200689,0 -0.291911,-0.0912 -0.291911,-0.29191 v -11.73115 c 0,-0.14596 0.127711,-0.27367 0.291911,-0.27367 h 3.831326 c 0.164199,0 0.29191,0.12771 0.29191,0.27367 0,0.20069 -0.09122,0.29191 -0.29191,0.29191 h -3.55766 v 5.29088 h 3.55766 c 0.200688,0 0.29191,0.0912 0.29191,0.29191 0,0.14595 -0.127711,0.27366 -0.29191,0.27366 z" /> + <path + inkscape:connector-curvature="0" + id="path2316" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 97.739836,115.2633 -0.310155,-0.14596 c -0.364888,-0.14595 -0.948709,-0.40137 -1.441308,-0.91222 -0.510843,-0.4926 -0.930465,-1.18588 -0.930465,-2.2623 0,-1.84269 0.930465,-3.26575 2.627195,-3.26575 1.751463,0 2.645437,1.13115 2.645437,3.26575 0,0.14595 -0.12771,0.29191 -0.29191,0.29191 -0.164198,0 -0.291909,-0.14596 -0.291909,-0.29191 0,-1.84269 -0.675043,-2.70018 -2.061618,-2.70018 -1.295353,0 -2.061618,1.11291 -2.061618,2.70018 0,0.87573 0.328399,1.45955 0.766265,1.86093 0.419621,0.40137 0.91222,0.63855 1.277108,0.78451 l 0.291911,0.12771 c 0.310155,0.14595 0.91222,0.38313 1.423064,0.85748 0.510843,0.47436 0.948707,1.16765 0.948707,2.24407 0,0.89397 -0.23718,1.66024 -0.656797,2.22581 -0.474354,0.62031 -1.131153,0.93047 -1.98864,0.93047 -1.751463,0 -2.627195,-1.13116 -2.627195,-3.24751 0,-0.20068 0.09122,-0.29191 0.291911,-0.29191 0.145955,0 0.273666,0.12771 0.273666,0.29191 0,1.18589 0.310155,1.86093 0.711532,2.22582 0.401377,0.38313 0.91222,0.45611 1.350086,0.45611 1.313597,0 2.061618,-0.96695 2.061618,-2.5907 0,-0.87574 -0.346644,-1.45956 -0.766265,-1.84269 -0.218933,-0.18244 -0.437866,-0.3284 -0.675043,-0.43787 z" /> + <path + inkscape:connector-curvature="0" + id="path2318" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 101.39898,111.94282 c 0,-1.33185 0.34664,-2.17109 0.85748,-2.64544 0.51085,-0.47436 1.16765,-0.60207 1.75147,-0.60207 0.60206,0 1.25886,0.12771 1.76971,0.60207 0.51084,0.47435 0.85748,1.31359 0.85748,2.64544 0,0.20068 -0.0912,0.29191 -0.29191,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 0,-1.82444 -0.6568,-2.68193 -2.04337,-2.68193 -1.33184,0 -2.04338,0.85749 -2.04338,2.68193 v 5.78347 c 0,1.82444 0.72978,2.70018 2.04338,2.70018 1.36833,0 2.04337,-0.87574 2.04337,-2.70018 0,-0.20068 0.0912,-0.29191 0.29191,-0.29191 0.20069,0 0.29191,0.0912 0.29191,0.29191 0,1.36833 -0.34664,2.15284 -0.85748,2.64544 -0.51085,0.4926 -1.16765,0.62031 -1.76971,0.62031 -0.58382,0 -1.24062,-0.12771 -1.75147,-0.62031 -0.51084,-0.4926 -0.85748,-1.27711 -0.85748,-2.64544 z" /> + <path + inkscape:connector-curvature="0" + id="path2320" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 112.59648,120.70013 c 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 v -5.56454 h -3.72186 v 5.56454 c 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 v -11.73115 c 0,-0.14596 0.12771,-0.27367 0.29191,-0.27367 0.1642,0 0.29191,0.12771 0.29191,0.27367 v 5.58279 h 3.72186 v -5.58279 c 0,-0.14596 0.12771,-0.27367 0.29191,-0.27367 0.1642,0 0.29191,0.12771 0.29191,0.27367 z" /> + <path + inkscape:connector-curvature="0" + id="path2322" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 113.94201,111.94282 c 0,-2.09811 0.87573,-3.24751 2.60895,-3.24751 1.75146,0 2.6272,1.13116 2.6272,3.24751 v 5.78347 c 0,1.36833 -0.34665,2.15284 -0.85749,2.64544 -0.51084,0.4926 -1.16764,0.62031 -1.76971,0.62031 -0.58382,0 -1.24062,-0.12771 -1.75146,-0.62031 -0.51084,-0.4926 -0.85749,-1.27711 -0.85749,-2.64544 z m 0.56558,5.78347 c 0,1.84269 0.67504,2.70018 2.04337,2.70018 1.33184,0 2.04338,-0.80276 2.04338,-2.70018 v -5.78347 c 0,-1.87918 -0.67505,-2.68193 -2.04338,-2.68193 -1.38657,0 -2.04337,0.85749 -2.04337,2.68193 z" /> + <path + inkscape:connector-curvature="0" + id="path2324" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 120.28479,111.94282 c 0,-2.09811 0.87573,-3.24751 2.60895,-3.24751 1.75147,0 2.6272,1.13116 2.6272,3.24751 v 5.78347 c 0,1.36833 -0.34665,2.15284 -0.85749,2.64544 -0.51084,0.4926 -1.16764,0.62031 -1.76971,0.62031 -0.58382,0 -1.24062,-0.12771 -1.75146,-0.62031 -0.51084,-0.4926 -0.85749,-1.27711 -0.85749,-2.64544 z m 0.56558,5.78347 c 0,1.84269 0.67504,2.70018 2.04337,2.70018 1.33184,0 2.04338,-0.80276 2.04338,-2.70018 v -5.78347 c 0,-1.87918 -0.67505,-2.68193 -2.04338,-2.68193 -1.38657,0 -2.04337,0.85749 -2.04337,2.68193 z" /> + <path + inkscape:connector-curvature="0" + id="path2326" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 126.82826,120.99204 c -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 v -11.73115 c 0,-0.14596 0.12771,-0.27367 0.29191,-0.27367 0.14596,0 0.27367,0.12771 0.27367,0.27367 v 11.45749 h 3.84957 c 0.1642,0 0.29191,0.12771 0.29191,0.27366 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 z" /> + <path + inkscape:connector-curvature="0" + id="path2328" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 136.00263,108.96898 c 0,-0.14596 0.12771,-0.27367 0.29191,-0.27367 0.1642,0 0.29191,0.12771 0.29191,0.27367 v 11.73115 c 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 z" /> + <path + inkscape:connector-curvature="0" + id="path2330" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 142.79811,120.99204 c -0.12771,0 -0.21894,-0.0547 -0.25543,-0.18244 l -4.17797,-10.34458 v 10.23511 c 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 -0.20068,0 -0.29191,-0.0912 -0.29191,-0.29191 v -11.73115 c 0,-0.31016 0.43787,-0.38313 0.56558,-0.0912 l 4.15973,10.34457 V 108.969 c 0,-0.14596 0.12771,-0.27367 0.29191,-0.27367 0.1642,0 0.29191,0.12771 0.29191,0.27367 v 11.73115 c 0,0.1642 -0.073,0.25542 -0.23718,0.29191 z" /> + <path + inkscape:connector-curvature="0" + id="path2332" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 144.99427,114.55177 h 3.55766 c 0.20069,0 0.29191,0.0912 0.29191,0.29191 0,0.14595 -0.12771,0.27366 -0.29191,0.27366 h -3.55766 v 5.58279 c 0,0.1642 -0.12771,0.29191 -0.27366,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 v -11.73115 c 0,-0.14596 0.12771,-0.27367 0.29191,-0.27367 h 3.83132 c 0.1642,0 0.29191,0.12771 0.29191,0.27367 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 h -3.55766 z" /> + <path + inkscape:connector-curvature="0" + id="path2334" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 149.96759,111.94282 c 0,-2.09811 0.87573,-3.24751 2.60895,-3.24751 1.75146,0 2.62719,1.13116 2.62719,3.24751 v 5.78347 c 0,1.36833 -0.34664,2.15284 -0.85749,2.64544 -0.51084,0.4926 -1.16764,0.62031 -1.7697,0.62031 -0.58383,0 -1.24062,-0.12771 -1.75147,-0.62031 -0.51084,-0.4926 -0.85748,-1.27711 -0.85748,-2.64544 z m 0.56557,5.78347 c 0,1.84269 0.67504,2.70018 2.04338,2.70018 1.33184,0 2.04337,-0.80276 2.04337,-2.70018 v -5.78347 c 0,-1.87918 -0.67504,-2.68193 -2.04337,-2.68193 -1.38658,0 -2.04338,0.85749 -2.04338,2.68193 z" /> + <path + inkscape:connector-curvature="0" + id="path2336" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 161.43705,120.68189 c 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 -0.14595,0 -0.27366,-0.12771 -0.27366,-0.29191 v -3.1198 c 0,-1.51428 -0.83925,-2.35352 -2.2988,-2.35352 h -1.642 v 5.47332 c 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 -0.14595,0 -0.27366,-0.12771 -0.27366,-0.29191 v -11.73116 c 0,-0.14595 0.12771,-0.27366 0.27366,-0.27366 h 1.93391 c 1.95215,0 2.84613,1.00344 2.84613,3.2475 0,1.11291 -0.21893,1.93391 -0.67505,2.463 -0.20068,0.23717 -0.43786,0.41962 -0.74802,0.54733 0.23718,0.12771 0.43787,0.25542 0.63856,0.45611 0.52909,0.51084 0.80275,1.24062 0.80275,2.17108 z m -4.50637,-11.43925 v 5.40035 h 1.642 c 1.58726,0 2.26231,-0.74802 2.26231,-2.71842 0,-1.89742 -0.6568,-2.68193 -2.26231,-2.68193 z" /> + <path + inkscape:connector-curvature="0" + id="path2338" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 169.33061,111.0306 -2.7914,9.76075 c -0.0547,0.12771 -0.14595,0.20069 -0.29191,0.20069 -0.12771,0 -0.21893,-0.073 -0.27366,-0.20069 l -2.7914,-9.76075 v 9.66953 c 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 v -11.73115 c 0,-0.31016 0.47436,-0.38313 0.56558,-0.073 l 3.0833,10.7642 3.10155,-10.7642 c 0.0912,-0.31015 0.56558,-0.23718 0.56558,0.073 v 11.73115 c 0,0.1642 -0.14596,0.29191 -0.29191,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 z" /> + <path + inkscape:connector-curvature="0" + id="path2340" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 177.33363,120.6454 c 0.0547,0.14595 -0.073,0.29191 -0.21894,0.34664 h -0.073 c -0.14596,0 -0.23718,-0.073 -0.27367,-0.21893 l -0.821,-3.53942 h -3.22926 l -0.821,3.53942 c -0.0547,0.14595 -0.20068,0.27367 -0.34664,0.21893 -0.1642,-0.0547 -0.27367,-0.20069 -0.21893,-0.34664 l 2.71841,-11.73116 c 0.0365,-0.14595 0.12771,-0.21893 0.27367,-0.21893 0.1642,0 0.25542,0.073 0.29191,0.21893 z m -3.01033,-10.39931 -1.4778,6.42203 h 2.97384 z" /> + <path + inkscape:connector-curvature="0" + id="path2342" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 184.16758,108.67707 c 0.1642,0 0.29191,0.12771 0.29191,0.27366 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 h -2.64544 v 11.43925 c 0,0.1642 -0.14595,0.29191 -0.29191,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 v -11.43925 h -2.66368 c -0.14596,0 -0.27367,-0.12771 -0.27367,-0.29191 0,-0.14595 0.12771,-0.27366 0.27367,-0.27366 z" /> + <path + inkscape:connector-curvature="0" + id="path2344" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 185.53336,108.96898 c 0,-0.14596 0.12771,-0.27367 0.29191,-0.27367 0.1642,0 0.29191,0.12771 0.29191,0.27367 v 11.73115 c 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 z" /> + <path + inkscape:connector-curvature="0" + id="path2346" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 187.31161,111.94282 c 0,-2.09811 0.87573,-3.24751 2.60895,-3.24751 1.75146,0 2.62719,1.13116 2.62719,3.24751 v 5.78347 c 0,1.36833 -0.34664,2.15284 -0.85748,2.64544 -0.51085,0.4926 -1.16764,0.62031 -1.76971,0.62031 -0.58382,0 -1.24062,-0.12771 -1.75146,-0.62031 -0.51085,-0.4926 -0.85749,-1.27711 -0.85749,-2.64544 z m 0.56558,5.78347 c 0,1.84269 0.67504,2.70018 2.04337,2.70018 1.33184,0 2.04337,-0.80276 2.04337,-2.70018 v -5.78347 c 0,-1.87918 -0.67504,-2.68193 -2.04337,-2.68193 -1.38657,0 -2.04337,0.85749 -2.04337,2.68193 z" /> + <path + inkscape:connector-curvature="0" + id="path2348" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 198.67161,120.99204 c -0.12771,0 -0.21893,-0.0547 -0.25542,-0.18244 l -4.17797,-10.34458 v 10.23511 c 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 v -11.73115 c 0,-0.31016 0.43786,-0.38313 0.56558,-0.0912 l 4.15972,10.34457 V 108.969 c 0,-0.14596 0.12771,-0.27367 0.29191,-0.27367 0.1642,0 0.29191,0.12771 0.29191,0.27367 v 11.73115 c 0,0.1642 -0.073,0.25542 -0.23718,0.29191 z" /> + <path + inkscape:connector-curvature="0" + id="path2350" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 206.81432,115.2633 -0.31016,-0.14596 c -0.36489,-0.14595 -0.94871,-0.40137 -1.44131,-0.91222 -0.51084,-0.4926 -0.93046,-1.18588 -0.93046,-2.2623 0,-1.84269 0.93046,-3.26575 2.62719,-3.26575 1.75147,0 2.64544,1.13115 2.64544,3.26575 0,0.14595 -0.12771,0.29191 -0.29191,0.29191 -0.1642,0 -0.29191,-0.14596 -0.29191,-0.29191 0,-1.84269 -0.67504,-2.70018 -2.06162,-2.70018 -1.29535,0 -2.06161,1.11291 -2.06161,2.70018 0,0.87573 0.3284,1.45955 0.76626,1.86093 0.41962,0.40137 0.91222,0.63855 1.27711,0.78451 l 0.29191,0.12771 c 0.31016,0.14595 0.91222,0.38313 1.42306,0.85748 0.51085,0.47436 0.94871,1.16765 0.94871,2.24407 0,0.89397 -0.23717,1.66024 -0.65679,2.22581 -0.47436,0.62031 -1.13116,0.93047 -1.98865,0.93047 -1.75146,0 -2.62719,-1.13116 -2.62719,-3.24751 0,-0.20068 0.0912,-0.29191 0.29191,-0.29191 0.14596,0 0.27367,0.12771 0.27367,0.29191 0,1.18589 0.31015,1.86093 0.71153,2.22582 0.40138,0.38313 0.91222,0.45611 1.35008,0.45611 1.3136,0 2.06162,-0.96695 2.06162,-2.5907 0,-0.87574 -0.34664,-1.45956 -0.76626,-1.84269 -0.21894,-0.18244 -0.43787,-0.3284 -0.67505,-0.43787 z" /> + <path + inkscape:connector-curvature="0" + id="path2352" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 214.14059,114.89841 v 5.80172 c 0,0.14596 -0.12772,0.27367 -0.29191,0.27367 -0.1642,0 -0.29192,-0.12771 -0.29192,-0.27367 v -5.80172 l -3.17452,-5.80172 c -0.073,-0.12771 -0.0365,-0.31016 0.10946,-0.38313 0.14596,-0.073 0.31016,-0.0182 0.40138,0.10946 l 2.9556,5.40035 2.97383,-5.40035 c 0.073,-0.12771 0.25543,-0.18244 0.38314,-0.10946 0.14595,0.073 0.20068,0.25542 0.10946,0.38313 z" /> + <path + inkscape:connector-curvature="0" + id="path2354" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 220.85395,115.2633 -0.31016,-0.14596 c -0.36489,-0.14595 -0.94871,-0.40137 -1.44131,-0.91222 -0.51084,-0.4926 -0.93046,-1.18588 -0.93046,-2.2623 0,-1.84269 0.93046,-3.26575 2.62719,-3.26575 1.75147,0 2.64544,1.13115 2.64544,3.26575 0,0.14595 -0.12771,0.29191 -0.29191,0.29191 -0.1642,0 -0.29191,-0.14596 -0.29191,-0.29191 0,-1.84269 -0.67504,-2.70018 -2.06162,-2.70018 -1.29535,0 -2.06162,1.11291 -2.06162,2.70018 0,0.87573 0.3284,1.45955 0.76627,1.86093 0.41962,0.40137 0.91222,0.63855 1.27711,0.78451 l 0.29191,0.12771 c 0.31015,0.14595 0.91222,0.38313 1.42306,0.85748 0.51085,0.47436 0.94871,1.16765 0.94871,2.24407 0,0.89397 -0.23718,1.66024 -0.6568,2.22581 -0.47435,0.62031 -1.13115,0.93047 -1.98864,0.93047 -1.75146,0 -2.62719,-1.13116 -2.62719,-3.24751 0,-0.20068 0.0912,-0.29191 0.29191,-0.29191 0.14595,0 0.27366,0.12771 0.27366,0.29191 0,1.18589 0.31016,1.86093 0.71154,2.22582 0.40137,0.38313 0.91222,0.45611 1.35008,0.45611 1.3136,0 2.06162,-0.96695 2.06162,-2.5907 0,-0.87574 -0.34664,-1.45956 -0.76627,-1.84269 -0.21893,-0.18244 -0.43786,-0.3284 -0.67504,-0.43787 z" /> + <path + inkscape:connector-curvature="0" + id="path2356" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 230.24185,108.67707 c 0.1642,0 0.29191,0.12771 0.29191,0.27366 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 h -2.64544 v 11.43925 c 0,0.1642 -0.14596,0.29191 -0.29191,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 v -11.43925 h -2.66369 c -0.14595,0 -0.27366,-0.12771 -0.27366,-0.29191 0,-0.14595 0.12771,-0.27366 0.27366,-0.27366 z" /> + <path + inkscape:connector-curvature="0" + id="path2358" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 232.04547,115.11734 v 5.30913 h 3.55766 c 0.1642,0 0.29191,0.12771 0.29191,0.27366 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 h -3.83133 c -0.20068,0 -0.29191,-0.0912 -0.29191,-0.29191 v -11.73115 c 0,-0.14596 0.12771,-0.27367 0.29191,-0.27367 h 3.83133 c 0.1642,0 0.29191,0.12771 0.29191,0.27367 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 h -3.55766 v 5.29088 h 3.55766 c 0.20069,0 0.29191,0.0912 0.29191,0.29191 0,0.14595 -0.12771,0.27366 -0.29191,0.27366 z" /> + <path + inkscape:connector-curvature="0" + id="path2360" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:18.24440765px;font-family:'Ostrich Sans Rounded';-inkscape-font-specification:'Ostrich Sans Rounded';fill:#3d7ebf;fill-opacity:1;stroke:#3d7ebf;stroke-width:0.99766129;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="m 243.84049,111.0306 -2.7914,9.76075 c -0.0547,0.12771 -0.14595,0.20069 -0.29191,0.20069 -0.12771,0 -0.21893,-0.073 -0.27366,-0.20069 l -2.7914,-9.76075 v 9.66953 c 0,0.20069 -0.0912,0.29191 -0.29191,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 v -11.73115 c 0,-0.31016 0.47436,-0.38313 0.56558,-0.073 l 3.0833,10.7642 3.10155,-10.7642 c 0.0912,-0.31015 0.56558,-0.23718 0.56558,0.073 v 11.73115 c 0,0.1642 -0.14596,0.29191 -0.29191,0.29191 -0.20069,0 -0.29191,-0.0912 -0.29191,-0.29191 z" /> + </g> + </g> + </g> +</svg> diff --git a/aleksis/core/templates/core/base.html b/aleksis/core/templates/core/base.html index cfbd8c669927ad0062efe84cb547d296ac5e34bd..e30d428f060f540cbf7d4dbbb483a1371dbddf38 100644 --- a/aleksis/core/templates/core/base.html +++ b/aleksis/core/templates/core/base.html @@ -63,8 +63,9 @@ <!-- Main nav (sidenav) --> <ul id="slide-out" class="sidenav sidenav-fixed"> <li class="logo"> + {% static "img/aleksis-banner.svg" as aleksis_banner %} <a id="logo-container" href="/" class="brand-logo"> - <img src="{{ request.site.preferences.theme__logo.url }}" + <img src="{% firstof request.site.preferences.theme__logo.url aleksis_banner %}" alt="{{ request.site.preferences.general__title }} – Logo"> </a> </li> diff --git a/aleksis/core/util/notifications.py b/aleksis/core/util/notifications.py index 33b92251b302c3f8051a13b4dc39b77d4676ce5a..c9cbcb9f76700d3e26f9c448a5e02c5e103a4936 100644 --- a/aleksis/core/util/notifications.py +++ b/aleksis/core/util/notifications.py @@ -33,7 +33,7 @@ def send_templated_sms( def _send_notification_email(notification: "Notification", template: str = "notification") -> None: context = { "notification": notification, - "notification_user": notification.recipient.adressing_name, + "notification_user": notification.recipient.addressing_name, } send_templated_mail( template_name=template, @@ -48,7 +48,7 @@ def _send_notification_sms( ) -> None: context = { "notification": notification, - "notification_user": notification.recipient.adressing_name, + "notification_user": notification.recipient.addressing_name, } send_templated_sms( template_name=template, diff --git a/poetry.lock b/poetry.lock index 81039b64ef9f58ecbdad3aa9b795628e33c681ba..71a3ea5d6daa285a0d6405cd7f6ee0eecf2d399d 100644 --- a/poetry.lock +++ b/poetry.lock @@ -1036,7 +1036,7 @@ description = "Plugin to catch bad style specific to Django Projects" name = "flake8-django" optional = false python-versions = "*" -version = "0.0.4" +version = "1.0.0" [package.dependencies] flake8 = "*" @@ -2468,9 +2468,7 @@ flake8-builtins = [ {file = "flake8_builtins-1.5.2-py2.py3-none-any.whl", hash = "sha256:a0296d23da92a6f2494243b9f2039bfdb73f34aba20054c1b70b2a60c84745bb"}, ] flake8-django = [ - {file = "flake8-django-0.0.4.tar.gz", hash = "sha256:7329ec2e2b8b194e8109639c534359014c79df4d50b14f4b85b8395edc5d6760"}, - {file = "flake8_django-0.0.4-py3.5.egg", hash = "sha256:ca66462724acbcf241d29edec201dac40c05cc27ae118b5abb8d74066681402f"}, - {file = "flake8_django-0.0.4-py3.7.egg", hash = "sha256:29721a4976f784921b140752234447af1192c4e4f989d0db4e2d9f7f7915fa86"}, + {file = "flake8-django-1.0.0.tar.gz", hash = "sha256:2c9e4b8bdcad3084d3a335a0e305cbf66cd9a2af937d66c50c859c1f966036b2"}, ] flake8-docstrings = [ {file = "flake8-docstrings-1.5.0.tar.gz", hash = "sha256:3d5a31c7ec6b7367ea6506a87ec293b94a0a46c0bce2bb4975b7f1d09b6f3717"}, diff --git a/pyproject.toml b/pyproject.toml index dbd98772abea67c1bd190ade3ad2eb3a25f77ee0..5248e6174a473ec69fc6419292aed121fdf275e4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -101,7 +101,7 @@ pytest-django-testing-postgresql = "^0.1" selenium = "^3.141.0" safety = "^1.8.5" flake8 = "^3.7.9" -flake8-django = "^0.0.4" +flake8-django = "^1.0.0" flake8-fixme = "^1.1.1" flake8-mypy = "^17.8.0" flake8-bandit = "^2.1.2"