Skip to content

Commit

Permalink
modified history tab
Browse files Browse the repository at this point in the history
  • Loading branch information
benjaminleichter committed May 19, 2014
1 parent 4feda40 commit f3c6d02
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions html/explore/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<head>

<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
{% if displayviz %}
<meta property="og:image" content="http://atlas.cid.harvard.edu{{ displayImage }}"/>
Expand Down Expand Up @@ -495,6 +495,7 @@ <h3> </h3>
<button id="help">{% trans "Help" %}</button>
</div>
</div>
{% if previous_page != "http://atlas.cid.harvard.edu/" and previous_page != "http://127.0.0.1:8000/" and previous_page != "None" %}
<div class="tab-pane" id="history">
<div id="historyBox">
<div id="historyBoxInner">
Expand All @@ -504,6 +505,7 @@ <h3> </h3>
</div>
</div>
</div>
{% endif %}
{% if app_name == "product_space" or app_name == "pie_scatter" %}
<div class="tab-pane active" id="legendPane">
<div id="legend">
Expand Down Expand Up @@ -1370,7 +1372,7 @@ <h4 style="border-bottom: solid 1px #999; font-family:'PT Sans Narrow',Helvetica
product_code = "{{product_code}}",
prod_class = "{{prod_class}}",
previous_page = "{{previous_page}}",
previous_image = "{{ STATIC_URL }}media/img/empty_static.png",
previous_image = "{{ STATIC_URL }}/img/empty_static.png",
static_url = "{{STATIC_URL}}";

// Use chosen plugin to make dropdowns look fancy
Expand Down Expand Up @@ -1553,10 +1555,10 @@ <h4 style="border-bottom: solid 1px #999; font-family:'PT Sans Narrow',Helvetica
<script type="text/javascript">

if(previous_page == "http://atlas.cid.harvard.edu" || previous_page == "http://atlas.cid.harvard.edu/beta" || previous_page == "None" || previous_page == "http://127.0.0.1:8000/"){
previous_image = "{{ STATIC_URL }}img/default.png";
} else if(previous_image == "{{ STATIC_URL }}img/empty_static.png"){
$("#historyTab").css("display", "none");
} else{
$("#historyTab").css("display", "none");
$("#history").css("display", "none");
console.log("no previous page!");
}else{
previous_image = "http://atlas.cid.harvard.edu{{ displayImage }}";
$("#historySlide").attr("href", previous_page);
}
Expand All @@ -1570,6 +1572,9 @@ <h4 style="border-bottom: solid 1px #999; font-family:'PT Sans Narrow',Helvetica
$("#historySlide").mouseleave(function(){
$("#historyOverlay").hide();
});
if( /iPhone/i.test(navigator.userAgent) ) {
$("head").append("<meta")
}
</script>
</body>
{% include "story/story_forms.html" %}
Expand Down

0 comments on commit f3c6d02

Please sign in to comment.