diff options
author | Anton Tananaev <anton.tananaev@gmail.com> | 2016-12-22 23:28:06 +1300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-12-22 23:28:06 +1300 |
commit | b156d60043e8b8498ebd1953acc5a2f77e0b7b44 (patch) | |
tree | 7783aeca0a25e461f58ed7eddd62fd49f1d9ae9b | |
parent | 987f2aad51e825eba983517b113412ff49777c42 (diff) | |
parent | e165b86817ba09824d488e16d41a041761aa9537 (diff) | |
download | trackermap-web-b156d60043e8b8498ebd1953acc5a2f77e0b7b44.tar.gz trackermap-web-b156d60043e8b8498ebd1953acc5a2f77e0b7b44.tar.bz2 trackermap-web-b156d60043e8b8498ebd1953acc5a2f77e0b7b44.zip |
Merge pull request #368 from Abyss777/animal_category
Add "Animal" device category
-rw-r--r-- | web/app/store/DeviceImages.js | 7 | ||||
-rw-r--r-- | web/images/animal.svg | 48 | ||||
-rw-r--r-- | web/l10n/en.json | 3 | ||||
-rw-r--r-- | web/load.js | 1 |
4 files changed, 58 insertions, 1 deletions
diff --git a/web/app/store/DeviceImages.js b/web/app/store/DeviceImages.js index 4a89f4cc..c1a8201d 100644 --- a/web/app/store/DeviceImages.js +++ b/web/app/store/DeviceImages.js @@ -89,5 +89,12 @@ Ext.define('Traccar.store.DeviceImages', { fillId: 'background', rotateId: 'background', scaleId: 'layer1' + }, { + key: 'animal', + name: Strings.categoryAnimal, + svg: document.getElementById('animalSvg').contentDocument, + fillId: 'background', + rotateId: 'background', + scaleId: 'layer1' }] }); diff --git a/web/images/animal.svg b/web/images/animal.svg new file mode 100644 index 00000000..39b9042d --- /dev/null +++ b/web/images/animal.svg @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + width="40" + height="40" + viewBox="0 0 40 40" + id="svg4145" + version="1.1" + sodipodi:docname="animal.svg"> + <defs + id="defs4147" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + showgrid="false" + units="px" /> + <metadata + id="metadata4150"> + <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 + id="layer1"> + <path + style="fill:#008000;fill-opacity:1;stroke:#333333;stroke-width:1.89999998;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + d="M 20.001953 3.6816406 L 18.871094 7.0722656 A 12.37437 12.37437 0 0 1 20.001953 7.0097656 A 12.37437 12.37437 0 0 1 21.130859 7.0664062 L 20.001953 3.6816406 z M 20 7.625 A 12.37437 12.37437 0 0 0 7.625 20 A 12.37437 12.37437 0 0 0 20 32.375 A 12.37437 12.37437 0 0 0 32.375 20 A 12.37437 12.37437 0 0 0 20 7.625 z " + id="background" /> + <path + id="icon" + style="font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:125%;font-family:FontAwesome;-inkscape-font-specification:'FontAwesome, Normal';text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.4083333px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 19.524552,15.801568 q 0,0.5865 -0.173722,1.114351 -0.173721,0.518076 -0.576024,0.899301 -0.402302,0.381225 -0.960039,0.381225 -0.694887,0 -1.261767,-0.557176 -0.566881,-0.56695 -0.841178,-1.329401 -0.274297,-0.762451 -0.274297,-1.476026 0,-0.5865 0.173721,-1.104576 0.173722,-0.527851 0.576024,-0.909076 0.402303,-0.381225 0.96004,-0.381225 0.704029,0 1.261767,0.56695 0.56688,0.557175 0.841178,1.319626 0.274297,0.752677 0.274297,1.476027 z m -3.126988,4.721329 q 0,0.782001 -0.384015,1.358727 -0.384016,0.576725 -1.088045,0.576725 -0.694886,0 -1.29834,-0.537626 -0.59431,-0.5474 -0.914324,-1.309851 -0.320013,-0.76245 -0.320013,-1.485801 0,-0.782001 0.384016,-1.358727 0.384016,-0.5865 1.088046,-0.5865 0.694885,0 1.289195,0.547401 0.603454,0.537626 0.923468,1.309851 0.320012,0.762451 0.320012,1.485801 z M 20,20.258972 q 1.078902,0 2.331525,0.95795 1.252624,0.948177 2.093802,2.316678 0.841177,1.358727 0.841177,2.482852 0,0.449651 -0.155435,0.742902 -0.155435,0.303025 -0.448018,0.439875 -0.28344,0.146624 -0.585167,0.1955 -0.301727,0.05865 -0.694887,0.05865 -0.621739,0 -1.718928,-0.439875 Q 20.576024,26.573625 20,26.573625 q -0.603454,0 -1.764644,0.4301 -1.152048,0.439876 -1.828648,0.439876 -1.673212,0 -1.673212,-1.427152 0,-0.840651 0.512021,-1.867027 0.512021,-1.03615 1.27091,-1.886576 0.768031,-0.850426 1.718929,-1.427152 Q 19.186252,20.258968 20,20.258968 Z m 2.185233,-2.062527 q -0.557737,0 -0.96004,-0.381225 -0.402302,-0.381225 -0.576023,-0.899301 -0.173722,-0.527851 -0.173722,-1.114351 0,-0.72335 0.274297,-1.476027 0.274298,-0.762451 0.832035,-1.319626 0.566881,-0.56695 1.27091,-0.56695 0.557737,0 0.960039,0.381225 0.402303,0.381225 0.576025,0.909076 0.173721,0.518076 0.173721,1.104576 0,0.713575 -0.274297,1.476026 -0.274297,0.762451 -0.841178,1.329401 -0.56688,0.557176 -1.261767,0.557176 z m 3.949878,-1.016601 q 0.704029,0 1.088046,0.5865 0.384016,0.576726 0.384016,1.358727 0,0.723351 -0.320014,1.485801 -0.320013,0.762451 -0.923467,1.309851 -0.59431,0.537626 -1.289196,0.537626 -0.704029,0 -1.088045,-0.576725 -0.384016,-0.576726 -0.384016,-1.358727 0,-0.72335 0.320013,-1.485801 0.320014,-0.772225 0.914324,-1.309851 0.603454,-0.547401 1.298339,-0.547401 z" /> + </g> +</svg> diff --git a/web/l10n/en.json b/web/l10n/en.json index 3c7a965b..109482b8 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -213,5 +213,6 @@ "categoryPlane": "Plane", "categoryMotorcycle": "Motorcycle", "categoryBicycle": "Bicycle", - "categoryPerson": "Person" + "categoryPerson": "Person", + "categoryAnimal": "Animal" }
\ No newline at end of file diff --git a/web/load.js b/web/load.js index 4dedd770..7aee735d 100644 --- a/web/load.js +++ b/web/load.js @@ -144,5 +144,6 @@ addSvgFile('images/motorcycle.svg', 'motorcycleSvg'); addSvgFile('images/bicycle.svg', 'bicycleSvg'); addSvgFile('images/person.svg', 'personSvg'); + addSvgFile('images/animal.svg', 'animalSvg'); })(); |