diff options
author | Abyss777 <abyss@fox5.ru> | 2016-11-09 14:32:43 +0500 |
---|---|---|
committer | Abyss777 <abyss@fox5.ru> | 2016-11-09 14:32:43 +0500 |
commit | 26ecb43bc27087ae1f7aac8a8b0ffa8421b846d9 (patch) | |
tree | eade1dba9bbda5e1d24958211ac91c9d391bb7cb /web | |
parent | 03c7abe38d7d4852e80630d9f3f2124387f65d2c (diff) | |
download | etbsa-traccar-web-26ecb43bc27087ae1f7aac8a8b0ffa8421b846d9.tar.gz etbsa-traccar-web-26ecb43bc27087ae1f7aac8a8b0ffa8421b846d9.tar.bz2 etbsa-traccar-web-26ecb43bc27087ae1f7aac8a8b0ffa8421b846d9.zip |
- Add other icons
- Add Category combobox
Diffstat (limited to 'web')
-rw-r--r-- | web/app/DeviceImages.js | 8 | ||||
-rw-r--r-- | web/app/Style.js | 1 | ||||
-rw-r--r-- | web/app/store/DeviceImages.js | 56 | ||||
-rw-r--r-- | web/app/view/DeviceDialog.js | 8 | ||||
-rw-r--r-- | web/images/bicycle.svg | 94 | ||||
-rw-r--r-- | web/images/default.svg | 26 | ||||
-rw-r--r-- | web/images/motorcycle.svg | 94 | ||||
-rw-r--r-- | web/images/person.svg | 93 | ||||
-rw-r--r-- | web/images/plane.svg | 94 | ||||
-rw-r--r-- | web/images/ship.svg | 94 | ||||
-rw-r--r-- | web/l10n/en.json | 12 | ||||
-rw-r--r-- | web/load.js | 5 |
12 files changed, 558 insertions, 27 deletions
diff --git a/web/app/DeviceImages.js b/web/app/DeviceImages.js index d781b52..87f2ca8 100644 --- a/web/app/DeviceImages.js +++ b/web/app/DeviceImages.js @@ -48,14 +48,14 @@ Ext.define('Traccar.DeviceImages', { svg.getElementById(device.get('rotateId')).setAttribute('transform', rotateTransform); // Adjust size and prepare scale transformation - width *= device.get('scale'); - height *= device.get('scale'); + width *= Traccar.Style.mapScaleNormal; + height *= Traccar.Style.mapScaleNormal; if (zoom) { width *= Traccar.Style.mapScaleSelected; height *= Traccar.Style.mapScaleSelected; - scaleTransform = 'scale(' + device.get('scale') * Traccar.Style.mapScaleSelected + ') '; + scaleTransform = 'scale(' + Traccar.Style.mapScaleSelected + ') '; } else { - scaleTransform = 'scale(' + device.get('scale') + ') '; + scaleTransform = 'scale(' + Traccar.Style.mapScaleNormal + ') '; } if (device.get('scaleId') !== device.get('rotateId')) { diff --git a/web/app/Style.js b/web/app/Style.js index 4fe5afd..b19584f 100644 --- a/web/app/Style.js +++ b/web/app/Style.js @@ -59,6 +59,7 @@ Ext.define('Traccar.Style', { mapColorUnknown: 'rgba(250, 190, 77, 1.0)', mapColorOffline: 'rgba(255, 84, 104, 1.0)', + mapScaleNormal: 1, mapScaleSelected: 1.5, mapMaxZoom: 19, diff --git a/web/app/store/DeviceImages.js b/web/app/store/DeviceImages.js index ba91575..64a7855 100644 --- a/web/app/store/DeviceImages.js +++ b/web/app/store/DeviceImages.js @@ -21,43 +21,73 @@ Ext.define('Traccar.store.DeviceImages', { data: [{ key: 'route', - name: Strings.categoryDefault, + name: Strings.categoryRoute, svg: document.getElementById('routeSvg').contentDocument, fillId: 'arrow', rotateId: 'arrow', - scaleId: 'arrow', - scale: 1 + scaleId: 'arrow' }, { key: 'default', name: Strings.categoryDefault, svg: document.getElementById('defaultSvg').contentDocument, - fillId: ['arrow', 'path4148'], - rotateId: 'layer2', - scaleId: 'layer2', - scale: 1 + fillId: ['path4148', 'path4149'], + rotateId: 'path4148', + scaleId: 'layer2' }, { key: 'car', name: Strings.categoryCar, svg: document.getElementById('carSvg').contentDocument, fillId: ['path4148', 'path4157'], rotateId: 'path4148', - scaleId: 'layer2', - scale: 1 + scaleId: 'layer2' }, { key: 'bus', name: Strings.categoryBus, svg: document.getElementById('busSvg').contentDocument, fillId: ['path4148', 'path4200'], rotateId: 'path4148', - scaleId: 'layer2', - scale: 1 + scaleId: 'layer2' }, { key: 'truck', name: Strings.categoryTruck, svg: document.getElementById('truckSvg').contentDocument, fillId: ['path4148', 'path4336'], rotateId: 'path4148', - scaleId: 'layer2', - scale: 1 + scaleId: 'layer2' + }, { + key: 'ship', + name: Strings.categoryShip, + svg: document.getElementById('shipSvg').contentDocument, + fillId: ['path4148', 'path4177'], + rotateId: 'path4148', + scaleId: 'layer2' + }, { + key: 'plane', + name: Strings.categoryPlane, + svg: document.getElementById('planeSvg').contentDocument, + fillId: ['path4148', 'path4203'], + rotateId: 'path4148', + scaleId: 'layer2' + }, { + key: 'motorcycle', + name: Strings.categoryMotorcycle, + svg: document.getElementById('motorcycleSvg').contentDocument, + fillId: ['path4148', 'path4256'], + rotateId: 'path4148', + scaleId: 'layer2' + }, { + key: 'bicycle', + name: Strings.categoryBicycle, + svg: document.getElementById('bicycleSvg').contentDocument, + fillId: ['path4148', 'path4282'], + rotateId: 'path4148', + scaleId: 'layer2' + }, { + key: 'person', + name: Strings.categoryPerson, + svg: document.getElementById('personSvg').contentDocument, + fillId: ['path4148', 'path4308'], + rotateId: 'path4148', + scaleId: 'layer2' }] });
\ No newline at end of file diff --git a/web/app/view/DeviceDialog.js b/web/app/view/DeviceDialog.js index 68740b2..dea5074 100644 --- a/web/app/view/DeviceDialog.js +++ b/web/app/view/DeviceDialog.js @@ -57,6 +57,14 @@ Ext.define('Traccar.view.DeviceDialog', { xtype: 'textfield', name: 'contact', fieldLabel: Strings.deviceContact + }, { + xtype: 'combobox', + name: 'category', + fieldLabel: Strings.deviceCategory, + store: 'DeviceImages', + queryMode: 'local', + displayField: 'name', + valueField: 'key', }] } }); diff --git a/web/images/bicycle.svg b/web/images/bicycle.svg new file mode 100644 index 0000000..2f0c4d9 --- /dev/null +++ b/web/images/bicycle.svg @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="50" + height="50" + viewBox="0 0 50.000001 50.000001" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="bicycle.svg" + inkscape:export-filename="/home/local/RG/kas/repos/traccar/traccar-web/web/images/default.svg.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8.0000004" + inkscape:cx="15.977102" + inkscape:cy="28.79197" + inkscape:document-units="px" + inkscape:current-layer="layer2" + showgrid="false" + units="px" + inkscape:window-width="1920" + inkscape:window-height="981" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" /> + <metadata + id="metadata7"> + <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 /> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Layer 2"> + <path + style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" + d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z" + id="path4148" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" + id="path9144" + ry="5.0823298" + rx="5.2149124" + cy="16.191458" + cx="-31.99658" /> + <path + d="m 21.136144,27.536275 -3.110899,0 q -0.396293,0 -0.574625,-0.346757 -0.168424,-0.346756 0.06935,-0.66379 l 1.862577,-2.486738 q -0.643976,-0.307127 -1.357303,-0.307127 -1.307767,0 -2.239055,0.931288 -0.931289,0.931288 -0.931289,2.239055 0,1.307767 0.931289,2.239055 0.931288,0.931289 2.239055,0.931289 1.139342,0 2.011186,-0.713328 0.871845,-0.723235 1.099713,-1.822947 z m -1.842762,-1.268138 1.842762,0 q -0.178332,-0.842122 -0.743049,-1.466283 l -1.099713,1.466283 z m 4.755515,0 2.853309,-3.804411 -4.755515,0 -0.980825,1.307766 q 1.040269,1.020454 1.248323,2.496645 l 1.634708,0 z m 10.164913,2.873124 q 0.931289,-0.931288 0.931289,-2.239055 0,-1.307767 -0.931289,-2.239055 -0.931288,-0.931288 -2.239055,-0.931288 -0.594439,0 -1.198786,0.237776 l 1.723874,2.575903 q 0.14861,0.227869 0.09907,0.485459 -0.04954,0.257591 -0.267497,0.396293 -0.14861,0.108981 -0.356664,0.108981 -0.346756,0 -0.525088,-0.287313 L 29.72579,24.673058 q -0.921381,0.941196 -0.921381,2.229148 0,1.307767 0.931288,2.239055 0.931289,0.931289 2.239055,0.931289 1.307767,0 2.239055,-0.931289 z m 0.891659,-5.369769 q 1.307767,1.297859 1.307767,3.130714 0,1.832855 -1.307767,3.140621 -1.297859,1.29786 -3.130714,1.29786 -1.832855,0 -3.140621,-1.29786 -1.29786,-1.307766 -1.29786,-3.140621 0,-0.96101 0.386386,-1.81304 0.396293,-0.861937 1.089806,-1.486098 l -0.643977,-0.970918 -3.497284,4.646534 q -0.178332,0.257591 -0.505274,0.257591 l -1.951742,0 q -0.227869,1.624801 -1.476191,2.714606 -1.248323,1.089806 -2.912753,1.089806 -1.832855,0 -3.140622,-1.29786 -1.297859,-1.307766 -1.297859,-3.140621 0,-1.832855 1.297859,-3.130714 1.307767,-1.307766 3.140622,-1.307766 1.129434,0 2.130074,0.544902 l 1.357303,-1.81304 -2.21924,0 q -0.25759,0 -0.44583,-0.188239 -0.188239,-0.188239 -0.188239,-0.445829 0,-0.257591 0.188239,-0.44583 0.18824,-0.188239 0.44583,-0.188239 l 3.804412,0 0,1.268137 4.309685,0 -0.842122,-1.268137 -2.199426,0 q -0.25759,0 -0.445829,-0.188239 -0.188239,-0.188239 -0.188239,-0.44583 0,-0.25759 0.188239,-0.445829 0.188239,-0.18824 0.445829,-0.18824 l 2.536275,0 q 0.326941,0 0.525088,0.277406 l 2.645255,3.962928 q 0.901567,-0.435921 1.902206,-0.435921 1.832855,0 3.130714,1.307766 z" + style="fill:#008000;stroke:#000000;stroke-width:0.71658581;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4282" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/web/images/default.svg b/web/images/default.svg index b199135..5af1abc 100644 --- a/web/images/default.svg +++ b/web/images/default.svg @@ -15,7 +15,7 @@ id="svg2" version="1.1" inkscape:version="0.91 r13725" - sodipodi:docname="default.svg"> + sodipodi:docname="default.svg" <defs id="defs4" /> <sodipodi:namedview @@ -25,9 +25,9 @@ borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" - inkscape:zoom="11.313709" - inkscape:cx="1.1750604" - inkscape:cy="21.052061" + inkscape:zoom="8.0000004" + inkscape:cx="5.642786" + inkscape:cy="31.741592" inkscape:document-units="px" inkscape:current-layer="layer2" showgrid="false" @@ -75,10 +75,18 @@ d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z" id="path4148" inkscape:connector-curvature="0" /> - <polygon - transform="translate(11.748737,10.957319)" - id="arrow" - points="13,19 7,22 13,4 19,22 " - style="fill:#008000;stroke:#000000;stroke-width:1px" /> + <path + style="fill:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" + id="path9144" + ry="5.0823298" + rx="5.2149124" + cy="16.191458" + cx="-31.99658" /> + <circle + style="fill:#008000;stroke:#000000;stroke-width:0.81650639;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4149" + cx="25" + cy="25" + r="7.0917473" /> </g> </svg> diff --git a/web/images/motorcycle.svg b/web/images/motorcycle.svg new file mode 100644 index 0000000..d3b6ee7 --- /dev/null +++ b/web/images/motorcycle.svg @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="50" + height="50" + viewBox="0 0 50.000001 50.000001" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="motorcycle.svg" + inkscape:export-filename="/home/local/RG/kas/repos/traccar/traccar-web/web/images/default.svg.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8.0000004" + inkscape:cx="25.580285" + inkscape:cy="37.395" + inkscape:document-units="px" + inkscape:current-layer="layer2" + showgrid="false" + units="px" + inkscape:window-width="1920" + inkscape:window-height="981" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" /> + <metadata + id="metadata7"> + <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 /> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Layer 2"> + <path + style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" + d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z" + id="path4148" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" + id="path9144" + ry="5.0823298" + rx="5.2149124" + cy="16.191458" + cx="-31.99658" /> + <path + d="m 36.550791,26.40708 q 0.120641,1.035497 -0.221174,2.000621 -0.341815,0.955071 -0.995284,1.638701 -0.65347,0.683629 -1.598487,1.065657 -0.934964,0.382029 -1.970462,0.311655 -1.618593,-0.110587 -2.814945,-1.256672 -1.186298,-1.146085 -1.347152,-2.754625 -0.120641,-1.115924 0.271441,-2.111208 0.402135,-1.005338 1.196352,-1.719128 L 28.35729,22.50637 q -0.965124,0.80427 -1.51806,1.950355 -0.552936,1.146084 -0.552936,2.453023 0,0.271442 -0.191014,0.472509 -0.18096,0.191014 -0.452401,0.191014 l -2.573665,0 -0.693682,0 q -0.231228,1.648754 -1.497954,2.754625 -1.266725,1.105872 -2.955692,1.105872 -1.859874,0 -3.18692,-1.316993 -1.316992,-1.327045 -1.316992,-3.18692 0,-1.859874 1.316992,-3.176866 1.327046,-1.327046 3.18692,-1.327046 0.764056,0 1.528113,0.271441 l 0.241281,-0.452402 q -1.236565,-1.105871 -3.056226,-1.105871 l -0.643416,0 q -0.261388,0 -0.452402,-0.191014 -0.191014,-0.191014 -0.191014,-0.452402 0,-0.261388 0.191014,-0.452402 0.191014,-0.191014 0.452402,-0.191014 l 1.286832,0 q 0.784163,0 1.45774,0.140747 0.673575,0.130694 1.166191,0.382028 0.502669,0.251335 0.723843,0.402135 0.221174,0.140748 0.512722,0.361922 l 5.147328,0 1.156139,0 -0.854537,-1.286832 -2.23185,0 q -0.301601,0 -0.492615,-0.221174 -0.191014,-0.231228 -0.140747,-0.53283 0.04021,-0.231227 0.231227,-0.382028 0.191014,-0.150801 0.432295,-0.150801 l 2.543505,0 q 0.331761,0 0.532829,0.281495 l 0.703736,1.055604 1.146084,-1.146084 q 0.191015,-0.191015 0.462456,-0.191015 l 1.015391,0 q 0.261388,0 0.452402,0.191015 0.191014,0.191014 0.191014,0.452402 l 0,1.286832 q 0,0.261388 -0.191014,0.452402 -0.191014,0.191014 -0.452402,0.191014 l -1.799554,0 1.156138,1.729181 q 1.316992,-0.633363 2.764678,-0.361922 1.437633,0.261388 2.453024,1.357206 1.015391,1.085764 1.186298,2.543504 z m -18.628905,3.739855 q 1.156138,0 2.040835,-0.723843 0.884697,-0.733896 1.115925,-1.849821 l -3.15676,0 q -0.351868,0 -0.552936,-0.311654 -0.18096,-0.321709 -0.01005,-0.633363 l 1.477847,-2.784785 q -0.472509,-0.130694 -0.914858,-0.130694 -1.327045,0 -2.272063,0.945017 -0.945017,0.945017 -0.945017,2.272063 0,1.327046 0.945017,2.272063 0.945018,0.945017 2.272063,0.945017 z m 11.88309,-0.945017 q 0.945018,0.945017 2.272063,0.945017 1.327046,0 2.272063,-0.945017 0.945017,-0.945017 0.945017,-2.272063 0,-1.327046 -0.945017,-2.272063 -0.945017,-0.945017 -2.272063,-0.945017 -0.603202,0 -1.216459,0.241281 l 1.749288,2.613878 q 0.1508,0.231227 0.100534,0.492615 -0.05027,0.261388 -0.271441,0.402135 -0.150801,0.110587 -0.361922,0.110587 -0.351868,0 -0.532829,-0.291548 l -1.749287,-2.613877 q -0.934964,0.95507 -0.934964,2.262009 0,1.327046 0.945017,2.272063 z" + style="fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:0.80562139;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4256" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/web/images/person.svg b/web/images/person.svg new file mode 100644 index 0000000..306b303 --- /dev/null +++ b/web/images/person.svg @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="50" + height="50" + viewBox="0 0 50.000001 50.000001" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="person.svg" + inkscape:export-filename="/home/local/RG/kas/repos/traccar/traccar-web/web/images/default.svg.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8.0000004" + inkscape:cx="19.841247" + inkscape:cy="37.395" + inkscape:document-units="px" + inkscape:current-layer="layer2" + showgrid="false" + units="px" + inkscape:window-width="1920" + inkscape:window-height="981" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" /> + <metadata + id="metadata7"> + <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 /> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Layer 2"> + <path + style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" + d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z" + id="path4148" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" + id="path9144" + ry="5.0823298" + rx="5.2149124" + cy="16.191458" + cx="-31.99658" /> + <path + d="m 32.504338,30.89794 q 0,1.278083 -0.738708,2.192674 -0.726983,0.914591 -1.758829,0.914591 l -10.013601,0 q -1.031846,0 -1.770555,-0.914591 -0.726982,-0.914591 -0.726982,-2.192674 0,-0.99667 0.0938,-1.876084 0.10553,-0.891141 0.375217,-1.782281 0.269687,-0.902865 0.68008,-1.536044 0.422119,-0.644904 1.1022,-1.043572 0.691806,-0.410393 1.582946,-0.410393 1.536044,1.500867 3.670091,1.500867 2.134046,0 3.67009,-1.500867 0.89114,0 1.571221,0.410393 0.691806,0.398668 1.102199,1.043572 0.422119,0.633179 0.691806,1.536044 0.269687,0.89114 0.363492,1.782281 0.105529,0.879414 0.105529,1.876084 z M 28.177619,17.319779 q 1.324984,1.313259 1.324984,3.177618 0,1.864359 -1.324984,3.189343 -1.31326,1.313259 -3.177618,1.313259 -1.864359,0 -3.189344,-1.313259 -1.313259,-1.324984 -1.313259,-3.189343 0,-1.864359 1.313259,-3.177618 1.324985,-1.324985 3.189344,-1.324985 1.864358,0 3.177618,1.324985 z" + style="stroke:#000000;stroke-width:0.7;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;fill:#008000;fill-opacity:1" + id="path4308" /> + </g> +</svg> diff --git a/web/images/plane.svg b/web/images/plane.svg new file mode 100644 index 0000000..b3b749c --- /dev/null +++ b/web/images/plane.svg @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="50" + height="50" + viewBox="0 0 50.000001 50.000001" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="plane.svg" + inkscape:export-filename="/home/local/RG/kas/repos/traccar/traccar-web/web/images/default.svg.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8.0000004" + inkscape:cx="13.062504" + inkscape:cy="37.395" + inkscape:document-units="px" + inkscape:current-layer="layer2" + showgrid="false" + units="px" + inkscape:window-width="1920" + inkscape:window-height="981" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" /> + <metadata + id="metadata7"> + <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 /> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Layer 2"> + <path + style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" + d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z" + id="path4148" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" + id="path9144" + ry="5.0823298" + rx="5.2149124" + cy="16.191458" + cx="-31.99658" /> + <path + d="m 33.004602,16.995793 q 0.521366,0.616159 0.142191,1.753686 -0.379176,1.137525 -1.279717,2.038066 l -1.907725,1.907727 1.895876,8.247061 q 0.05924,0.225136 -0.142191,0.391024 l -1.516701,1.137526 q -0.08294,0.0711 -0.225135,0.0711 -0.0474,0 -0.08294,-0.01184 -0.177739,-0.03554 -0.248833,-0.189588 l -3.305935,-6.019407 -3.06895,3.06895 0.62801,2.29875 q 0.05924,0.201437 -0.0948,0.367326 l -1.137525,1.137525 q -0.106643,0.106644 -0.272533,0.106644 l -0.0237,0 q -0.17774,-0.0237 -0.284384,-0.154045 l -2.239504,-2.986006 -2.986005,-2.239503 q -0.130341,-0.08294 -0.15404,-0.272532 -0.01184,-0.15404 0.106644,-0.296231 l 1.137526,-1.149375 Q 18.050879,26.096 18.216769,26.096 q 0.0711,0 0.09479,0.01185 l 2.29875,0.628008 3.06895,-3.068949 -6.019407,-3.305935 q -0.165889,-0.09479 -0.201437,-0.284381 -0.0237,-0.189588 0.106643,-0.31993 l 1.516701,-1.5167 q 0.165889,-0.154041 0.355477,-0.0948 l 7.879736,1.884027 1.895875,-1.895876 q 0.900542,-0.900541 2.038068,-1.279716 1.137525,-0.379175 1.753686,0.14219 z" + style="fill:#008000;stroke:#000000;stroke-width:0.93743491;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path4203" + inkscape:connector-curvature="0" /> + </g> +</svg> diff --git a/web/images/ship.svg b/web/images/ship.svg new file mode 100644 index 0000000..5e24299 --- /dev/null +++ b/web/images/ship.svg @@ -0,0 +1,94 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> + +<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" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="50" + height="50" + viewBox="0 0 50.000001 50.000001" + id="svg2" + version="1.1" + inkscape:version="0.91 r13725" + sodipodi:docname="ship.svg" + inkscape:export-filename="/home/local/RG/kas/repos/traccar/traccar-web/web/images/default.svg.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90"> + <defs + id="defs4" /> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="11.313709" + inkscape:cx="36.757017" + inkscape:cy="20.285436" + inkscape:document-units="px" + inkscape:current-layer="layer2" + showgrid="false" + units="px" + inkscape:window-width="1920" + inkscape:window-height="981" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" /> + <metadata + id="metadata7"> + <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 /> + <cc:license + rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" /> + </cc:Work> + <cc:License + rdf:about="http://creativecommons.org/licenses/by-sa/3.0/"> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Reproduction" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#Distribution" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Notice" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#Attribution" /> + <cc:permits + rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /> + <cc:requires + rdf:resource="http://creativecommons.org/ns#ShareAlike" /> + </cc:License> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer2" + inkscape:label="Layer 2"> + <path + style="opacity:1;fill:#008000;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" + d="M 24.861328,1.5332031 C 22.988281,4.0058594 21.115235,6.4785156 19.242188,8.9511719 12.384811,11.305004 7.56648,18.411829 7.9656275,25.658945 8.1243699,33.146749 13.834,40.035153 21.150251,41.610345 27.989532,43.285719 35.647133,40.179534 39.361234,34.187995 43.421356,28.066366 42.795931,19.360483 37.916491,13.875765 36.03007,11.625208 33.474003,10.003272 30.796946,8.9054182 28.818406,6.4480132 26.839867,3.9906081 24.861328,1.5332031 Z M 25,10.332031 C 32.308131,10.16753 39.022437,16.25267 39.595703,23.535156 40.48381,30.788539 35.105845,38.081555 27.914062,39.375 20.786251,40.98485 12.992585,36.360512 10.986328,29.333984 8.6726776,22.401128 12.498474,14.188659 19.287109,11.490234 21.087914,10.727308 23.044264,10.329914 25,10.332031 Z" + id="path4148" + inkscape:connector-curvature="0" /> + <path + style="fill:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none" + id="path9144" + ry="5.0823298" + rx="5.2149124" + cy="16.191458" + cx="-31.99658" /> + <path + d="m 31.631482,30.552917 q 0.160099,-0.160099 0.379182,-0.160099 0.219083,0 0.379182,0.160099 l 1.078564,1.078564 -0.758365,0.758365 -0.699381,-0.699381 -0.699381,0.699381 q -0.151673,0.1601 -0.379183,0.1601 -0.227509,0 -0.379182,-0.1601 l -0.699381,-0.699381 -0.699381,0.699381 q -0.1601,0.1601 -0.379183,0.1601 -0.219083,0 -0.379182,-0.1601 l -0.699382,-0.699381 -0.699381,0.699381 q -0.160099,0.1601 -0.379182,0.1601 -0.219084,0 -0.379183,-0.1601 l -0.699381,-0.699381 -0.699381,0.699381 q -0.160099,0.1601 -0.379182,0.1601 -0.219084,0 -0.379183,-0.1601 l -0.699381,-0.699381 -0.699381,0.699381 q -0.160099,0.1601 -0.379182,0.1601 -0.219084,0 -0.379183,-0.1601 l -0.699381,-0.699381 -0.699381,0.699381 q -0.1601,0.1601 -0.379183,0.1601 -0.219083,0 -0.379182,-0.1601 L 19.0679,31.690465 18.368519,32.389846 q -0.160099,0.1601 -0.379182,0.1601 -0.219084,0 -0.379183,-0.1601 l -1.078564,-1.078563 0.758366,-0.758366 0.699381,0.699382 0.699381,-0.699382 q 0.160099,-0.160099 0.379182,-0.160099 0.219083,0 0.379183,0.160099 l 0.699381,0.699382 0.699381,-0.699382 q 0.1601,-0.160099 0.379183,-0.160099 0.219083,0 0.379182,0.160099 l 0.699382,0.699382 0.69938,-0.699382 q 0.1601,-0.160099 0.379183,-0.160099 0.219083,0 0.379183,0.160099 l 0.699381,0.699382 0.699381,-0.699382 q 0.160099,-0.160099 0.379182,-0.160099 0.219083,0 0.379183,0.160099 l 0.699381,0.699382 0.699381,-0.699382 q 0.160099,-0.160099 0.379182,-0.160099 0.219084,0 0.379183,0.160099 l 0.699381,0.699382 0.699381,-0.699382 q 0.160099,-0.160099 0.379183,-0.160099 0.219083,0 0.379182,0.160099 l 0.699381,0.699382 0.699382,-0.699382 z M 18.368519,30.232719 q -0.160099,0.160099 -0.379182,0.160099 -0.219084,0 -0.379183,-0.160099 l -1.078564,-1.078564 0.758366,-0.758365 0.699381,0.690955 0.699381,-0.690955 q 0.160099,-0.160099 0.379182,-0.160099 0.219083,0 0.379183,0.160099 l 0.699381,0.690955 0.539282,-0.539282 0,-2.468899 -1.769519,-2.645852 q -0.143246,-0.219083 -0.05898,-0.471871 0.08426,-0.261215 0.337051,-0.345478 l 1.491452,-0.488724 0,-2.519457 1.078563,0 0,-1.078564 2.157128,0 0,-1.078564 2.157127,0 0,1.078564 2.157127,0 0,1.078564 1.078564,0 0,2.519457 1.491451,0.488724 q 0.252788,0.08426 0.337051,0.345478 0.08426,0.252788 -0.05898,0.471871 l -1.769518,2.645852 0,2.468899 0.160099,-0.151673 q 0.160099,-0.160099 0.379183,-0.160099 0.219083,0 0.379182,0.160099 l 0.699381,0.690955 0.699382,-0.690955 q 0.160099,-0.160099 0.379182,-0.160099 0.219083,0 0.379182,0.160099 l 1.078564,1.078564 -0.758365,0.758365 -0.699381,-0.699381 -0.699381,0.699381 q -0.151673,0.160099 -0.379183,0.160099 -0.227509,0 -0.379182,-0.160099 l -0.699381,-0.699381 -0.699381,0.699381 q -0.1601,0.160099 -0.379183,0.160099 -0.219083,0 -0.379182,-0.160099 l -0.699382,-0.699381 -0.699381,0.699381 q -0.160099,0.160099 -0.379182,0.160099 -0.219084,0 -0.379183,-0.160099 l -0.699381,-0.699381 -0.699381,0.699381 q -0.160099,0.160099 -0.379182,0.160099 -0.219084,0 -0.379183,-0.160099 l -0.699381,-0.699381 -0.699381,0.699381 q -0.160099,0.160099 -0.379182,0.160099 -0.219084,0 -0.379183,-0.160099 l -0.699381,-0.699381 -0.699381,0.699381 q -0.1601,0.160099 -0.379183,0.160099 -0.219083,0 -0.379182,-0.160099 l -0.69939,-0.699381 -0.699381,0.699381 z m 3.39579,-9.546973 0,1.078563 3.235692,-1.078563 3.23569,1.078563 0,-1.078563 -1.078563,0 0,-1.078564 -4.314255,0 0,1.078564 -1.078564,0 z" + id="path4177" + inkscape:connector-curvature="0" + style="fill:#008000;stroke:#000000;stroke-width:0.66699368;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> + </g> +</svg> diff --git a/web/l10n/en.json b/web/l10n/en.json index 580c2a9..9dc20ad 100644 --- a/web/l10n/en.json +++ b/web/l10n/en.json @@ -60,6 +60,7 @@ "devicePhone": "Phone", "deviceModel": "Model", "deviceContact": "Contact", + "deviceCategory": "Category", "deviceLastUpdate": "Last Update", "deviceCommand": "Command", "deviceFollow": "Follow", @@ -185,5 +186,14 @@ "statisticsActiveDevices": "Active Devices", "statisticsRequests": "Requests", "statisticsMessagesReceived": "Messages Received", - "statisticsMessagesStored": "Messages Stored" + "statisticsMessagesStored": "Messages Stored", + "categoryDefault": "Default", + "categoryCar": "Car", + "categoryBus": "Bus", + "categoryTruck": "Truck", + "categoryShip": "Ship", + "categoryPlane": "Plane", + "categoryMotorcycle": "Motorcycle", + "categoryBicycle": "Bicycle", + "categoryPerson": "Person" }
\ No newline at end of file diff --git a/web/load.js b/web/load.js index 7f5c62c..6257fe0 100644 --- a/web/load.js +++ b/web/load.js @@ -135,5 +135,10 @@ addSvgFile('images/car.svg', 'carSvg'); addSvgFile('images/bus.svg', 'busSvg'); addSvgFile('images/truck.svg', 'truckSvg'); + addSvgFile('images/ship.svg', 'shipSvg'); + addSvgFile('images/plane.svg', 'planeSvg'); + addSvgFile('images/motorcycle.svg', 'motorcycleSvg'); + addSvgFile('images/bicycle.svg', 'bicycleSvg'); + addSvgFile('images/person.svg', 'personSvg'); })(); |