Skip to content

Commit

Permalink
Wired archive view types and pending logic back in.
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Phillips committed Sep 23, 2014
1 parent f867a82 commit 1e3e0f2
Show file tree
Hide file tree
Showing 4 changed files with 55 additions and 96 deletions.
139 changes: 46 additions & 93 deletions perma_web/perma/templates/single-link-header.html
View file
Expand Up @@ -53,6 +53,8 @@
</div>

<div class="row archive-selection-container">

{% if asset.image_capture and asset.image_capture != 'failed' %}
<div class="col-xs-12 col-md-6">
<div class="archive-btn-container">

Expand All @@ -61,25 +63,63 @@
<p>A static image of the webpage as it existed when the archive was created</p>
</div>
<div class="col-xs-5">
<a href="#" class="btn btn-sm archive active btn-success" role="button">Screen capture</a>
{% if asset.image_capture == 'pending' %}
<a id="image_cap_container_loading" href="{% url 'single_link_header' archive.guid %}" class="btn btn-sm archive" {% if serve_type == 'image' %}disabled="disabled"{% endif %} role="button"><img src="{{ STATIC_URL }}img/spinner.gif"> Screen capture</a>
<a id="image_cap_container_complete" href="{% url 'single_link_header' archive.guid %}" class="btn btn-sm archive" {% if serve_type == 'image' %}disabled="disabled"{% endif %} role="button">Screen capture</a>
{% else %}
<a href="{% url 'single_link_header' archive.guid %}" class="btn btn-sm archive" {% if serve_type == 'image' %}disabled="disabled"{% endif %} role="button">Screen capture</a>
{% endif %}
</div>
</div>
</div>
</div>
{% endif %}


{% if asset.warc_capture and asset.warc_capture != 'failed' %}
<div class="col-xs-12 col-md-6">
<div class="archive-btn-container">
<div class="row">
<div class="col-xs-7">
<p>A recreation using the HTML as it existed when the archive was created</p>
</div>
<div class="col-xs-5">
<a href="#" class="btn archive btn-success" role="button">Page capture</a>
{% if asset.warc_capture == 'pending' %}
<a id="warc_cap_container_loading" href="{% url 'single_link_header' archive.guid %}?type=source" class="btn btn-sm archive" disabled="disabled" role="button"><img src="{{ STATIC_URL }}img/spinner.gif"> Page capture</a>
<a id="warc_cap_container_complete" href="{% url 'single_link_header' archive.guid %}?type=source" class="btn btn-sm archive" {% if serve_type == 'source' %}disabled="disabled"{% endif %} role="button">Page capture</a>
{% else %}
<a href="{% url 'single_link_header' archive.guid %}?type=source" class="btn btn-sm archive" {% if serve_type == 'source' %}disabled="disabled"{% endif %} role="button">Page capture</a>
{% endif %}
</div>
</div>
</div>
</div>
{% endif %}



{% if asset.pdf_capture and asset.pdf_capture != 'failed' %}
<div class="col-xs-12 col-md-6">
<div class="archive-btn-container">
<div class="row">
<div class="col-xs-7">
<p>The PDF document that was captured when the archive was created</p>
</div>
<div class="col-xs-5">
{% if asset.pdf_capture == 'pending' %}
<a id="pdf_cap_container_loading" href="{% url 'single_link_header' archive.guid %}?type=pdf" class="btn btn-sm archive" disabled="disabled" role="button"><img src="{{ STATIC_URL }}img/spinner.gif"> PDF capture</a>
<a id="pdf_cap_container_complete" href="{% url 'single_link_header' archive.guid %}?type=pdf" class="btn btn-sm archive" {% if serve_type == 'pdf' %}disabled="disabled"{% endif %} role="button">PDF capture</a>
{% else %}
<a href="{% url 'single_link_header' archive.guid %}?type=pdf" class="btn btn-sm archive" {% if serve_type == 'pdf' %}disabled="disabled"{% endif %} role="button">PDF capture</a>
{% endif %}
</div>
</div>
</div>
</div>
{% endif %}




</div>
<!--
<div class="row">
Expand Down Expand Up @@ -120,102 +160,15 @@
<span class="sr-only">Toggle Dropdown</span>
</button>
<ul class="dropdown-menu" role="menu">
<li><a href="#">Vest archive</a></li>
<li><a href="#">Place in the dark archive</a></li>
<li><a href="#">Delete archive</a></li>
<li><a href="sdf">Vest archive</a></li>
<li><a href="svddsv">Place in the dark archive</a></li>
<li><a href="sdds">Delete archive</a></li>
</ul>
</div>
</div>

</div>

</section>




<!--
<div class="row">
<div class="col-xs-12 col-sm-9">
<p class="archive-note">
We have {{ asset|count_archives }} for this archive
</p>
</div>
</div>
<div class="row">
{% if asset.image_capture and asset.image_capture != 'failed' %}
<div class="col-sm-6 image-container">
{% if serve_type != 'image' %}<a href="{% url 'single_link_header' archive.guid %}">{% endif %}
<div class="{% if serve_type == 'image' %}selected-archive-container{% endif %} archive-container" style="overflow: hidden; ">
<div style="float: left; min-width: 55px;">
<img src="{{ STATIC_URL }}img/static_capture_icon.png" class="" style="margin-top: 2px;" height=76px width=53px>
</div>
<div style="float: left; width: 77%; margin-left: 12px;">
{% if asset.image_capture == 'pending' %}
<p class="archive-heading" id="image_cap_container_loading">Screen capture <img style="margin-top: 13px;" class="pull-right" src="{{ STATIC_URL }}img/dots.gif"></p>
<p class="archive-heading" id="image_cap_container_complete">Screen capture</p>
{% else %}
<p class="archive-heading">Screen capture</p>
{% endif %}
<p>A static image of the webpage as it existed when the archive was created</p>
</div>
</div>
{% if serve_type != 'image' %}</a>{% endif %}
</div>
{% endif %}
{% if asset.warc_capture and asset.warc_capture != 'failed' %}
<div class="col-sm-6 source-container">
{% if serve_type != 'source' %}<a href="{% url 'single_link_header' archive.guid %}?type=source">{% endif %}
<div class="{% if serve_type == 'source' %}selected-archive-container{% endif %} archive-container" style="overflow: hidden; ">
<div style="float: left; min-width: 55px;">
<img src="{{ STATIC_URL }}img/lsource_capture_icon.png" style="margin-top: 2px;" height=76px width=53px>
</div>
<div style="float: left; width: 77%; margin-left: 12px;">
{% if asset.warc_capture == 'pending' %}
<p class="archive-heading" id="warc_cap_container_loading">Page capture <img style="margin-top: 13px;" class="pull-right" src="{{ STATIC_URL }}img/dots.gif"></p>
<p class="archive-heading" id="warc_cap_container_complete">Page capture</p>
{% else %}
<p class="archive-heading">Page capture</p>
{% endif %}
<p>A recreation of the webpage using the HTML as it existed when the archive was created</p>
</div>
</div>
{% if serve_type != 'source' %}</a>{% endif %}
</div>
{% endif %}
{% if asset.pdf_capture and asset.pdf_capture != 'failed' %}
<div class="col-sm-6 pdf-container">
{% if serve_type != 'pdf' %}<a href="{% url 'single_link_header' archive.guid %}?type=pdf_capture">{% endif %}
<div class="{% if serve_type == 'pdf' %}selected-archive-container{% endif %} archive-container" style="overflow: hidden; ">
<div style="float: left; min-width: 55px;">
<img src="{{ STATIC_URL }}img/pdf_capture_icon.png" style="margin-top: 2px;" height=76px width=53px>
</div>
<div style="float: left; width: 77%; margin-left: 12px;">
{% if asset.pdf_capture == 'pending' %}
<p class="archive-heading" id="pdf_cap_container_loading">PDF capture <img style="margin-top: 13px;" class="pull-right" src="{{ STATIC_URL }}img/dots.gif"></p>
<p class="archive-heading" id="pdf_cap_container_complete">PDF capture</p>
{% else %}
<p class="archive-heading">PDF capture</p>
{% endif %}
<p>The PDF document that was captured when the archive was created </p>
</div>
</div>
{% if serve_type != 'pdf' %}</a>{% endif %}
</div>
{% endif %}
</div>
-->

</div> <!-- /full-header -->

<div id="compact-header">
Expand Down
6 changes: 6 additions & 0 deletions perma_web/static/css/style-responsive-archive.scss
View file
Expand Up @@ -265,6 +265,7 @@ img.watermark-image {
}

a.btn.archive {
width: 100%;
padding: 4px;
border-radius: 3px;
margin-top: 5px;
Expand All @@ -275,6 +276,11 @@ a.btn.archive {
border: 2px solid #888;
}

a.btn.archive img {
height: 20px;
margin-top: -2px;
}

a.btn.vest, a.btn.dashboard, a.btn.user-delete, input.btn.vest {
width:100px;
padding:2px 0px;
Expand Down
Binary file added perma_web/static/img/spinner.gif
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 3 additions & 3 deletions perma_web/static/js/single-link.js
View file
Expand Up @@ -17,23 +17,23 @@ var check_status = function() {

if ($('#image_cap_container_loading').is(":visible") && data.image_capture != 'pending') {
$('#image_cap_container_loading').hide();
$('#image_cap_container_complete').show();
$('#image_cap_container_complete').css({'display': 'block'});

// A kludge to reload iframe
$('iframe').attr('src', $('iframe').attr('src'));
}

if ($('#warc_cap_container_loading').is(":visible") && data.source_capture != 'pending') {
$('#warc_cap_container_loading').hide();
$('#warc_cap_container_complete').show();
$('#warc_cap_container_complete').css({'display': 'block'});

// A kludge to reload iframe
$('iframe').attr('src', $('iframe').attr('src'));
}

if ($('#pdf_cap_container_loading').is(":visible") && data.pdf_capture != 'pending') {
$('#pdf_cap_container_loading').hide();
$('#pdf_cap_container_complete').show();
$('#pdf_cap_container_complete').css({'display': 'block'});

// A kludge to reload iframe
$('iframe').attr('src', $('iframe').attr('src'));
Expand Down

0 comments on commit 1e3e0f2

Please sign in to comment.