Pointer fix for Image options (#935)

* Latest pull from upstream

* Pointer changes

* Deeleted extra files

* Delete passenger.3000.pid.lock

Deleted file

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Last update to app/views/images/_index.html.erb

Co-Authored-By: Divya Baid <32747809+divyabaid16@users.noreply.github.com>

* Update _index.html.erb

* Update _index.html.erb
This commit is contained in:
Aditi Ahuja
2019-09-03 01:29:20 +05:30
committed by Gaurav Sachdeva
parent a5adb4cc27
commit 7ead1485b1
2 changed files with 4 additions and 4 deletions
+3 -3
View File
@@ -83,8 +83,8 @@
%>
<% end %>
<% if warpable.placed? %>
<a id="locate-warpable-<%= warpable.id %>" title="Pan to this image" class="btn btn-sm btn-success"><i class='fa fa-crosshairs'></i></a>
<a title="Download full resolution distorted image (please allow popups)" class="btn btn-sm btn-outline-secondary img-download img-download-<%= warpable.id %>" data-image="/images/fetch/?url=<%= warpable.image.url(:original) %>"><i class="fa fa-download"></i></a>
<a rel="tooltip" id="locate-warpable-<%= warpable.id %>" title="Pan to this image" style="cursor: pointer" class="btn btn-sm btn-success"><i class='fa fa-crosshairs'></i></a>
<a rel="tooltip" title="Download full resolution distorted image (please allow popups)" style="cursor: pointer" class="btn btn-sm btn-outline-secondary img-download img-download-<%= warpable.id %>" data-image="/images/fetch/?url=<%= warpable.image.url(:original) %>"><i class="fa fa-download"></i></a>
<a title="History of the image" class = "btn btn-sm btn-warning" onClick="$('#image-vesrions-<%= warpable.id %>').toggle()" style="cursor: pointer;">
<i class='fas fa-clock'></i>
</a>
@@ -150,4 +150,4 @@
function list(){
$('td').show()
}
</script>
</script>
+1 -1
View File
@@ -86,7 +86,7 @@
<p>
<a onClick="window.mapknitter.addImage('{%= file.url %}',{%= file.id %});$('.add-image-{%= file.id %}').hide();$('#uploadModal').modal('hide')" class="btn btn-sm btn-outline-secondary add-image-{%= file.id %}">Place</a>
<a class="btn btn-sm btn-outline-secondary add-image-gps-{%= file.id %}" style="display:none;">Auto-place with GPS</a>
<a rel="tooltip" title="Download full resolution distorted image (please allow popups)" class="btn btn-sm btn-outline-secondary img-download-{%= file.id %}" data-image="/images/fetch/?url={%= file.original_url %}"><i class="fa fa-download"></i></a>
<a rel="tooltip" title="Download full resolution distorted image (please allow popups)" style="cursor: pointer" class="btn btn-sm btn-outline-secondary img-download-{%= file.id %}" data-image="/images/fetch/?url={%= file.original_url %}"><i class="fa fa-download"></i></a>
<div class="full-image-container-{%= file.id %}" style="overflow:hidden;width:0;height:0;"><img id="full-img-{%= file.id %}" /></div>
<a target="_blank" href="http://publiclab.org/wiki/mapknitter#GPS+Placement">Learn more</a>
</p>