Skip to content

Commit

Permalink
improving linking functionality
Browse files Browse the repository at this point in the history
  • Loading branch information
@ninapavlich
ninapavlich committed Jul 16, 2015
1 parent 50f04d0 commit 7c21194
Show file tree
Hide file tree
Showing 3 changed files with 169 additions and 163 deletions.
2 changes: 1 addition & 1 deletion sitetest/templates/partials/result_link.html
View file
@@ -1 +1 @@
<a href="{{link_item.page_url|safe}}#{{link_item.page_results_hash|safe}}" class='pagelink'>{{link_item.url|truncate(100, True)}}</a> - <a class="fa fa-external-link" href="{{link_item.url}}" target="_blank">&nbsp;</a>
<a href="{{link_item.page_url|safe}}#{{link_item.page_hash|safe}}" class='pagelink'>{{link_item.url|truncate(100, True)}}</a> - <a class="fa fa-external-link" href="{{link_item.url}}" target="_blank">&nbsp;</a>
322 changes: 160 additions & 162 deletions sitetest/templates/result_full.html
View file
Expand Up @@ -3,173 +3,171 @@
{% include 'partials/result_title.html' with context %}
</div>

<div class="panel-collapse collapse" id=
"{{link.page_results_hash}}">
<div class="panel-collapse collapse" id="{{link.page_results_hash}}">
<div class="panel-body">


<!-- Nav tabs -->
<ul class="nav nav-tabs" role="tablist">
<li class="active"><a href="#{{link.page_results_hash}}-stats" role="tab" data-toggle="tab">Stats</a></li>

{% if link.referers|length > 0 %}
<li><a href="#{{link.page_results_hash}}-referers" role="tab" data-toggle="tab">Referer Links</a></li>
{% endif %}

{% if link.hyper_links|length > 0 %}
<li><a href="#{{link.page_results_hash}}-hyper_links" role="tab" data-toggle="tab">Child Links</a></li>
{% endif %}

{% if link.image_links|length > 0 %}
<li><a href="#{{link.page_results_hash}}-image_links" role="tab" data-toggle="tab">Images</a></li>
{% endif %}

{% if link.css_links|length > 0 %}
<li><a href="#{{link.page_results_hash}}-css_links" role="tab" data-toggle="tab">CSS</a></li>
{% endif %}

{% if link.script_links|length > 0 %}
<li><a href="#{{link.page_results_hash}}-script_links" role="tab" data-toggle="tab">Scripts</a></li>
{% endif %}

{% if link.validation %}
{% if link.validation.warnings|length > 0 or link.validation.errors|length > 0 %}
<li><a href="#{{link.page_results_hash}}-validation" role="tab" data-toggle="tab">Validation</a></li>
{% endif %}
{% endif %}

{% if link.loading_score %}
<li><a href="#{{link.page_results_hash}}-loading-score" role="tab" data-toggle="tab">Page Speed</a></li>
{% endif %}

{% if link.enumerated_source %}
<li><a href="#{{link.page_results_hash}}-source" role="tab" data-toggle="tab">Source</a></li>
{% endif %}

<li><a href="#{{link.page_results_hash}}-tools" role="tab" data-toggle="tab">Tools</a></li>

</ul>



<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="{{link.page_results_hash}}-stats">

{% include 'partials/result_stats.html' with context %}

</div>

{% if link.referers|length > 0 %}
<div class="tab-pane" id="{{link.page_results_hash}}-referers">
<h5>There are {{link.referers|length}} links that refer
to this page</h5>

<ul>
{% for link_item_url,link_item in link.referers|dictsort %}
<li>
{% include 'partials/result_link.html' with context %}
</li>
{% endfor %}
</ul>
</div>
{% endif %}

{% if link.hyper_links|length > 0 %}
<div class="tab-pane" id="{{link.page_results_hash}}-hyper_links">
<h5>There are {{link.hyper_links|length}} links within this page</h5>

<ul>
{% for link_item_url,link_item in link.hyper_links|dictsort %}
<li>
{% include 'partials/result_link.html' with context %}
</li>
{% endfor %}
</ul>
</div>
{% endif %}

{% if link.image_links|length > 0 %}
<div class="tab-pane" id="{{link.page_results_hash}}-image_links">
<section class="link-children">
<h5>There are {{link.image_links|length}} images within this page</h5>

<div class='image-row' >
{% for link_item_url,link_item in link.image_links|dictsort %}
<div class='image-cell'>
<a href="{{link_item.url}}" target="_blank">
<p>{{link_item.url}}</p>
<img src="{{link_item.url}}" alt="preview image" />
</a>
</div>
{% if loop_index is divisibleby 4 %}
</div>
<div class='image-row' >
{% endif %}

{% endfor %}
</div>

</section>
</div>
{% endif %}


{% if link.css_links|length > 0 %}
<div class="tab-pane" id="{{link.page_results_hash}}-css_links">
<h5>There are {{link.css_links|length}} css files linked in this page</h5>
<ul>
{% for link_item_url,link_item in link.css_links|dictsort %}
<li>
{% include 'partials/result_link.html' with context %}
</li>
{% endfor %}
</ul>
</div>
{% endif %}

{% if link.script_links|length > 0 %}
<div class="tab-pane" id="{{link.page_results_hash}}-script_links">
<h5>There are {{link.script_links|length}} javascript files linked in this page</h5>
<ul>
{% for link_item_url,link_item in link.script_links|dictsort %}
<li>
{% include 'partials/result_link.html' with context %}
</li>
{% endfor %}
</ul>
</div>
{% endif %}

{% if link.validation %}
{% if link.validation.warnings|length > 0 or link.validation.errors|length > 0 %}
<div class="tab-pane" id="{{link.page_results_hash}}-validation">

{% include 'partials/result_validation.html' with context %}

</div>

{% endif %}
{% endif %}

{% if link.loading_score %}
<div class="tab-pane" id="{{link.page_results_hash}}-loading-score">

{% include 'partials/result_score.html' with context %}

</div>
{% endif %}

{% if link.enumerated_source %}
<div class="tab-pane" id="{{link.page_results_hash}}-source">
<pre>{{link.enumerated_source|e}}</pre>
</div>
{% endif %}

<div class="tab-pane" id="{{link.page_results_hash}}-tools">
{% include 'partials/result_tools.html' with context %}
<ul class="nav nav-tabs" role="tablist">
<li class="active"><a href="#{{link.page_results_hash}}-stats" role="tab" data-toggle="tab">Stats</a></li>

{% if link.referers|length > 0 %}
<li><a href="#{{link.page_results_hash}}-referers" role="tab" data-toggle="tab">Referer Links</a></li>
{% endif %}

{% if link.hyper_links|length > 0 %}
<li><a href="#{{link.page_results_hash}}-hyper_links" role="tab" data-toggle="tab">Child Links</a></li>
{% endif %}

{% if link.image_links|length > 0 %}
<li><a href="#{{link.page_results_hash}}-image_links" role="tab" data-toggle="tab">Images</a></li>
{% endif %}

{% if link.css_links|length > 0 %}
<li><a href="#{{link.page_results_hash}}-css_links" role="tab" data-toggle="tab">CSS</a></li>
{% endif %}

{% if link.script_links|length > 0 %}
<li><a href="#{{link.page_results_hash}}-script_links" role="tab" data-toggle="tab">Scripts</a></li>
{% endif %}

{% if link.validation %}
{% if link.validation.warnings|length > 0 or link.validation.errors|length > 0 %}
<li><a href="#{{link.page_results_hash}}-validation" role="tab" data-toggle="tab">Validation</a></li>
{% endif %}
{% endif %}

{% if link.loading_score %}
<li><a href="#{{link.page_results_hash}}-loading-score" role="tab" data-toggle="tab">Page Speed</a></li>
{% endif %}

{% if link.enumerated_source %}
<li><a href="#{{link.page_results_hash}}-source" role="tab" data-toggle="tab">Source</a></li>
{% endif %}

<li><a href="#{{link.page_results_hash}}-tools" role="tab" data-toggle="tab">Tools</a></li>

</ul>



<!-- Tab panes -->
<div class="tab-content">
<div class="tab-pane active" id="{{link.page_results_hash}}-stats">
{% include 'partials/result_stats.html' with context %}
</div>

{% if link.referers|length > 0 %}
<div class="tab-pane" id="{{link.page_results_hash}}-referers">
<h5>There are {{link.referers|length}} links that refer
to this page</h5>

<ul>
{% for link_item_url,link_item in link.referers|dictsort %}
<li>
{% include 'partials/result_link.html' with context %}
</li>
{% endfor %}
</ul>
</div>
{% endif %}

{% if link.hyper_links|length > 0 %}
<div class="tab-pane" id="{{link.page_results_hash}}-hyper_links">
<h5>There are {{link.hyper_links|length}} links within this page</h5>

<ul>
{% for link_item_url,link_item in link.hyper_links|dictsort %}
<li>
{% include 'partials/result_link.html' with context %}
</li>
{% endfor %}
</ul>
</div>
{% endif %}

{% if link.image_links|length > 0 %}
<div class="tab-pane" id="{{link.page_results_hash}}-image_links">
<section class="link-children">
<h5>There are {{link.image_links|length}} images within this page</h5>

<div class='image-row' >
{% for link_item_url,link_item in link.image_links|dictsort %}
<div class='image-cell'>
<a href="{{link_item.url}}" target="_blank">
<p>{{link_item.url}}</p>
<img src="{{link_item.url}}" alt="preview image" />
</a>
</div>
{% if loop_index is divisibleby 4 %}
</div>
<div class='image-row' >
{% endif %}

{% endfor %}
</div>

</section>
</div>
{% endif %}


{% if link.css_links|length > 0 %}
<div class="tab-pane" id="{{link.page_results_hash}}-css_links">
<h5>There are {{link.css_links|length}} css files linked in this page</h5>
<ul>
{% for link_item_url,link_item in link.css_links|dictsort %}
<li>
{% include 'partials/result_link.html' with context %}
</li>
{% endfor %}
</ul>
</div>
{% endif %}

{% if link.script_links|length > 0 %}
<div class="tab-pane" id="{{link.page_results_hash}}-script_links">
<h5>There are {{link.script_links|length}} javascript files linked in this page</h5>
<ul>
{% for link_item_url,link_item in link.script_links|dictsort %}
<li>
{% include 'partials/result_link.html' with context %}
</li>
{% endfor %}
</ul>
</div>
{% endif %}

{% if link.validation %}
{% if link.validation.warnings|length > 0 or link.validation.errors|length > 0 %}
<div class="tab-pane" id="{{link.page_results_hash}}-validation">

{% include 'partials/result_validation.html' with context %}

</div>

{% endif %}
{% endif %}

{% if link.loading_score %}
<div class="tab-pane" id="{{link.page_results_hash}}-loading-score">

{% include 'partials/result_score.html' with context %}

</div>
{% endif %}

{% if link.enumerated_source %}
<div class="tab-pane" id="{{link.page_results_hash}}-source">
<pre>{{link.enumerated_source|e}}</pre>
</div>
{% endif %}

<div class="tab-pane" id="{{link.page_results_hash}}-tools">
{% include 'partials/result_tools.html' with context %}
</div>
</div>
</div>
</div>
</div>
</div>
8 changes: 8 additions & 0 deletions sitetest/templates/results_base.html
View file
Expand Up @@ -185,6 +185,8 @@
$(selector).trigger("click")
});



$( document ).ready(function() {
if(window.location.hash !=''){

Expand All @@ -193,6 +195,12 @@
var isPanel = $(item).hasClass("panel-collapse");
if(isPanel){
$(item).collapse('show');
}else{
var panel_id = window.location.hash.replace("result-h", "result-body-h");
var isPanel = $(panel_id).hasClass("panel-collapse");
if(isPanel){
$(panel_id).collapse('show');
}
}
});
}
Expand Down

0 comments on commit 7c21194

Please sign in to comment.