diff --git a/planet/templates/clade.html b/planet/templates/clade.html index 3e90783..523dafe 100644 --- a/planet/templates/clade.html +++ b/planet/templates/clade.html @@ -5,39 +5,26 @@
{% if clade %} -

Clade: {{ clade.name }}

- - -
-
-
-
Species in this clade: {{ clade.species_count }}
-
- - - {% for s in species %} - - {% endfor %} - -
{{ s.name }}
-
-
-
-
+ +

{{ clade.name }}

{% if clade.species_count > 1 %} -
-
-
-
Species Tree
-
-
-
-
-
+ +
+
{% endif %} + {% set comma = joiner(", ") %} +

Species in this clade ({{ clade.species_count }}):  + {%- for s in species -%} + {{ comma() }}{{ s.name }} ({{ s.code }}) + {% endfor %}


+ {{ macro.pagination('Families', url_for('clade.clade_families', clade_id=clade.id), families_count, url_for('clade.clade_families_table', clade_id=clade.id)) }} {{ macro.pagination('Interpro domains', url_for('clade.clade_interpro', clade_id=clade.id), interpro_count, url_for('clade.clade_interpro_table', clade_id=clade.id)) }} diff --git a/planet/templates/macros/chartjs.html b/planet/templates/macros/chartjs.html index 2f982bf..25deafa 100644 --- a/planet/templates/macros/chartjs.html +++ b/planet/templates/macros/chartjs.html @@ -34,8 +34,11 @@ $.getJSON( "{{ url}}", function( data ) { var ctx = document.getElementById("{{ target }}").getContext("2d"); data['options'] = { - 'responsive': true, - 'maintainAspectRatio': false + responsive: true, + maintainAspectRatio: false, + legend: { + position: 'bottom' + } } var myChart = new Chart(ctx, data); });