Skip to content

Commit

Permalink
Merge pull request #1262 from hotosm/icon-state-change
Browse files Browse the repository at this point in the history 
SVG element identifiers
  • Loading branch information
@dakotabenjamin
dakotabenjamin authored Oct 27, 2018
2 parents 621f4f8 + 9e06166 commit 1893739
Showing 1 changed file with 13 additions and 14 deletions.
27 changes: 13 additions & 14 deletions client/app/project/project.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -456,12 +456,12 @@ <h6 style="width:84%">Task too big to complete quickly? Or is the satellite imag
<ul class="list-type--none buttons--sidebyside">
<li>
<div ng-show="projectCtrl.isSelectedSplittable">
<button style="padding:16px" class="button button--secondary" ng-click="projectCtrl.splitTask()">
<button id="split-task-btn" style="padding:16px" class="button button--secondary" ng-click="projectCtrl.splitTask()">
<!-- from collecticons.io-->
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="12px" height="12px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
<path d="M416,288v64h-79.6c-1.5-0.2-4.2-1.4-5.4-2.2L237.3,256l93.8-93.8c1.2-0.9,3.9-2,5.4-2.2H416v64l96-96l-96-96v64h-80
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="12px" height="12px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
<path id="split-task" fill="#ffffff" d="M416,288v64h-79.6c-1.5-0.2-4.2-1.4-5.4-2.2L237.3,256l93.8-93.8c1.2-0.9,3.9-2,5.4-2.2H416v64l96-96l-96-96v64h-80
c-17.2,0-37.8,8.5-49.9,20.7L210.7,192H0v128h210.7l75.3,75.3c12.2,12.2,32.7,20.7,49.9,20.7h80v64l96-96L416,288z"/>
</svg>
<!-- <i class="icon-split"></i> -->
Expand All @@ -484,14 +484,14 @@ <h6 style="width:84%">Task too big to complete quickly? Or is the satellite imag
</div>
</li>
<li>
<button style="padding:16px" class="button button--secondary"
<button id="bad-imagery-btn" style="padding:16px" class="button button--secondary"
ng-click="projectCtrl.unLockTaskMapping(projectCtrl.comment, 'BADIMAGERY')">
<!-- <i class="icon-danger"></i> -->
<!-- from collecticons.io-->
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="12px" height="12px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
<path d="M480.2,392.4L287.8,55.6c-17.5-30.6-46-30.6-63.5,0L31.8,392.4C14.3,423,28.8,448,64,448h384
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="12px" height="12px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
<path id="bad-imagery" fill="#ffffff" d="M480.2,392.4L287.8,55.6c-17.5-30.6-46-30.6-63.5,0L31.8,392.4C14.3,423,28.8,448,64,448h384
C483.2,448,497.7,423,480.2,392.4z M256,416c-22.1,0-40-17.9-40-40c0-22.1,17.9-40,40-40s40,17.9,40,40C296,398.1,278.1,416,256,416
z M288,320h-64V160h64V320z"/>
</svg>
Expand All @@ -517,29 +517,28 @@ <h6 style="width:84%">Can't finish but need to stop mapping? Or have you complet
</div>
<ul class="list-type--none buttons--sidebyside">
<li>
<button class="button button--secondary"
<button id="stop-mapping-btn" class="button button--secondary"
ng-click="projectCtrl.stopMapping(projectCtrl.comment)"
style="width:205%">
style="width:208%">
<!-- from collecticons.io-->
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="12px" height="12px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
<path fill="#998383" id="svg_1" d="m160,352l192,0l0,-192l-192,0l0,192zm96,-352c-141.4,0 -256,114.6 -256,256s114.6,256 256,256s256,-114.6 256,-256s-114.6,-256 -256,-256zm135.8,391.8c-36.3,36.2 -84.5,56.2 -135.8,56.2s-99.5,-20 -135.8,-56.2c-36.2,-36.3 -56.2,-84.5 -56.2,-135.8s20,-99.5 56.2,-135.8c36.3,-36.2 84.5,-56.2 135.8,-56.2s99.5,20 135.8,56.2c36.2,36.3 56.2,84.5 56.2,135.8s-20,99.5 -56.2,135.8z"/>
<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="12px" height="12px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
<path id="stop-mapping" fill="#ffffff" d="m160,352l192,0l0,-192l-192,0l0,192zm96,-352c-141.4,0 -256,114.6 -256,256s114.6,256 256,256s256,-114.6 256,-256s-114.6,-256 -256,-256zm135.8,391.8c-36.3,36.2 -84.5,56.2 -135.8,56.2s-99.5,-20 -135.8,-56.2c-36.2,-36.3 -56.2,-84.5 -56.2,-135.8s20,-99.5 56.2,-135.8c36.3,-36.2 84.5,-56.2 135.8,-56.2s99.5,20 135.8,56.2c36.2,36.3 56.2,84.5 56.2,135.8s-20,99.5 -56.2,135.8z"/>
</svg>
{{ ' Stop Mapping' | translate }}
</button>
</li>

<li>
<button class="button"
<button id="complete-mapping-btn" class="button"
ng-click="projectCtrl.unLockTaskMapping(projectCtrl.comment, 'MAPPED')"
style="width:132%">
<!-- from collecticons.io-->
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="12px" height="12px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
<polygon points="197.43961906433105,462.2024230957031 19.373008728027344,284.13482666015625 62.93051719665527,240.57638549804688 192.86768913269043,370.5115966796875 448.51847648620605,58.048545837402344 496.1955394744873,97.0572280883789 " id="svg_2" fill="#ffffff" fill-opacity="1" stroke="#000000" stroke-opacity="1" stroke-width="11"/>

<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="12px" height="12px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
<polygon id="complete-mapping" fill="#ffffff" points="197.43961906433105,462.2024230957031 19.373008728027344,284.13482666015625 62.93051719665527,240.57638549804688 192.86768913269043,370.5115966796875 448.51847648620605,58.048545837402344 496.1955394744873,97.0572280883789 " id="svg_2" fill="#ffffff" fill-opacity="1" stroke="#ffffff" stroke-opacity="1" stroke-width="11"/>
</svg>
<!-- <i class="icon-sm-tick"></i> -->
{{ ' Mark as Completely Mapped' | translate }}
Expand Down

0 comments on commit 1893739

Please sign in to comment.