diff --git a/planet/controllers/sequence.py b/planet/controllers/sequence.py index 430ec99..0f2d9cb 100644 --- a/planet/controllers/sequence.py +++ b/planet/controllers/sequence.py @@ -45,7 +45,7 @@ def sequence_view(sequence_id): :param sequence_id: ID of the sequence """ - current_sequence = Sequence.query.options(undefer('coding_sequence')).get_or_404(sequence_id) + current_sequence = Sequence.query.get_or_404(sequence_id) return render_template('sequence.html', sequence=current_sequence, @@ -58,6 +58,38 @@ def sequence_view(sequence_id): ) +@sequence.route('/modal/coding/') +def sequence_modal_coding(sequence_id): + """ + Returns the coding sequence in a modal + + :param sequence_id: ID of the sequence + :return: Response with the fasta file + """ + current_sequence = Sequence.query\ + .options(undefer('coding_sequence'))\ + .options(noload('xrefs'))\ + .get_or_404(sequence_id) + + return render_template('modals/sequence.html', sequence=current_sequence, coding=True) + + +@sequence.route('/modal/protein/') +def sequence_modal_protein(sequence_id): + """ + Returns the protein sequence in a modal + + :param sequence_id: ID of the sequence + :return: Response with the fasta file + """ + current_sequence = Sequence.query\ + .options(undefer('coding_sequence'))\ + .options(noload('xrefs'))\ + .get_or_404(sequence_id) + + return render_template('modals/sequence.html', sequence=current_sequence, coding=False) + + @sequence.route('/fasta/coding/') def sequence_fasta_coding(sequence_id): """ diff --git a/planet/static/css/main.css b/planet/static/css/main.css index 9ee9563..6ac3028 100644 --- a/planet/static/css/main.css +++ b/planet/static/css/main.css @@ -305,4 +305,8 @@ submenu #legend { display:none; margin-top:800px; +} + +.breadcrumb { + margin-top:15px } \ No newline at end of file diff --git a/planet/templates/modals/sequence.html b/planet/templates/modals/sequence.html new file mode 100644 index 0000000..43cb3ea --- /dev/null +++ b/planet/templates/modals/sequence.html @@ -0,0 +1,14 @@ + + + \ No newline at end of file diff --git a/planet/templates/sequence.html b/planet/templates/sequence.html index 3d095b4..791c224 100644 --- a/planet/templates/sequence.html +++ b/planet/templates/sequence.html @@ -5,33 +5,26 @@
{% if sequence %} -

Sequence: {{ sequence.name }} ({{ sequence.type }})

- - Species: {{ sequence.species.name }} + +

{{ sequence.name }} ({{ sequence.type }})


{% if sequence.description %} Description: {{sequence.description}} - {% endif %} + {% else %} -

Coding Sequence (length: {{ sequence.coding_sequence|length }} bp) - - -

-
{{ sequence.coding_sequence }}
+ No description available + {% endif %}
- {% if sequence.type == 'protein_coding' %} -

Protein Sequence (length: {{ sequence.protein_sequence|length }} aa) - - -

-
{{ sequence.protein_sequence }}
+

Sequence: coding (download) {%- if sequence.type == 'protein_coding' -%}, protein (download) {% endif %}

-
- {% endif %}

Sequence details