Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

remove all but cloud exporter #1255

Merged
merged 1 commit into from
Apr 12, 2020
Merged

remove all but cloud exporter #1255

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions app/views/layouts/knitter2.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@
<span class="d-none d-sm-block"><span class="fa fa-file"></span> Post</span>
</a>

<!--
<div class="btn-group" role="group">
<button id="btnGroupDrop1" type="button" title="Export map" class="btn btn-outline-secondary dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" type="button">
<span class="fa fa-download"></span>
Expand All @@ -87,6 +88,7 @@
<a class="dropdown-item" href="#"><%= render :partial => 'maps/exports' %></a>
</div>
</div>
-->
</div>

<div class="sidebar-tabs">
Expand Down
36 changes: 13 additions & 23 deletions app/views/maps/_sidebar_exports.html.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
<p>
Export maps to generate downloadable, printable, high-resolution files.
</p>
<p>
If you only need one or two images, consider using the new <a href="https://publiclab.org/wiki/mapknitter-exporting-your-map#Per-image+exporting">per-image download</a> in the Images pane; to download a single full-resolution distorted image, click the <code><i class='fa fa-download'></i></code> button next to the image.
</p>
<p>
<img style="width:100%;" src="/images/download-btn.png" />
</p>
<p>
<a href="#" onClick="$('#exporting-info').toggle();">Learn more about exporting &raquo;</a>
</p>
<div style="display:none;" id="exporting-info">
<p>From this panel you can export this map in a variety of formats. If you've changed the map at all since last exporting, you can re-run the export, but be aware that this will <b>delete and replace previously exported files</b>, so download them first if you want them. All formats are generated sequentially, so if you're waiting for a JPG you will have to let all the other formats complete first.</p>
<p>This may take some time - a large map could take as long as <b>an hour or more</b>. Closing this panel will not stop the export.</p>
<p><a href="//publiclab.org/wiki/mapknitter-exporting">Learn even more &raquo;</a></p>
<div class="new-exporter">
<p>To use the new Cloud Exporter, select multiple images (drag with the shift key, or by long-pressing) and click the Download <code><i class='fa fa-download'></i></code> button in the upper left of the map.</p>
<p><a href="https://publiclab.org/wiki/mapknitter-cloud-exporter">Learn more &raquo;</a></p>
</div>

<div class="cloud-exports">
<p><b>Exports</b></p>
<hr />
<%= render partial: 'maps/cloud_exports', locals: { exports: @map.exports }%>
</div>

<!--
<ul class="nav nav-tabs">
<li class="nav-item">
<a class="nav-link active" href="#map-export-subtab" role="tab" data-toggle="tab">Start export</a>
Expand All @@ -30,7 +27,7 @@

<div class="tab-content">
<div role="tabpanel" class="tab-pane active" id="map-export-subtab">

<div class="progress"<% unless @map.exporting? %> style="display:none;"<% end %>>
<div class="progress-bar progress-bar-striped progress-bar-animated active" role="progressbar" aria-valuenow="100" aria-valuemin="0" aria-valuemax="100" style="width: 100%">
<span class="" id="export_progress"><%= @map.export ? @map.export.status : "Loading..." %></span>
Expand All @@ -46,11 +43,6 @@

<% if logged_in? || @map.anonymous? %>

<div class="new-exporter">
<p>MapKnitter now has a new beta Cloud Exporter. To use it, select multiple images (with the shift key, or by long-pressing) and click the Download <code><i class='fa fa-download'></i></code> button in the upper left of the map.</p>
<p>Exporting may take many minutes; keep the window open as it runs if you'd like to be notified when it completes. <a href="https://publiclab.org/wiki/mapknitter-cloud-exporter">Using the Cloud Exporter &raquo;</a></p>
</div>

<p>
<button id="begin-export" class="btn btn-lg btn-primary"<% if @map.export && @map.exporting? %> style="display:none;"<% end %>>Start export</button>
<button <% unless @map.export && @map.exporting? %>style="display:none;"<% end %> id="cancel-export" class="btn btn-lg btn-outline-secondary"><i class="fas fa-times"></i> Cancel export</button>
Expand All @@ -74,14 +66,11 @@
<% end %>
<p style="color:#888;">
<% if @map.export %>Export last run <%= time_ago_in_words @map.export.updated_at %> ago<% if @map.export.user %> by <a href="//publiclab.org/profile/<%= @map.export.user.login %>"><%= @map.export.user.login %></a>.<% end %><% end %>
<a href="/exports">View all running exports</a>
<a href="/exports">View all running exports</a> (beta)
</p>
</div>

<div role="tabpanel" class="tab-pane active" id="map-exports-subtab">
<p><b>Exports generated by the Cloud Exporter</b></p>
<hr />
<%= render partial: 'maps/cloud_exports', locals: { exports: @map.exports }%>
</div>

<div class="tab-pane" id="map-export-options-subtab">
Expand All @@ -95,6 +84,7 @@

</div>
</div>
-->
<script>
var exporting, exportResolutionSlider
(function(){
Expand Down