Skip to content

Fixing study description templates #1657

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 20, 2016
Merged

Fixing study description templates #1657

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions qiita_pet/templates/study_description_templates/prep_template_info_tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{% from qiita_core.qiita_settings import qiita_config %}

<!-- modal view to enter preprocessing parameters -->
<div class="modal fade" id="preprocess-modal-view-{{prep_template.id}}" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
<div class="modal-dialog">
Expand All @@ -6,7 +8,7 @@
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myModalLabel">Choose preprocessing parameters</h4>
</div>
<form action="/study/preprocess" method="post" onsubmit='return submit_preprocess({{prep_template.id}});'>
<form action="{% raw qiita_config.portal_dir %}/study/preprocess" method="post" onsubmit='return submit_preprocess({{prep_template.id}});'>
<div class="modal-body">
<div>
<div class="form-group">
Expand Down Expand Up @@ -70,7 +72,7 @@ <h4 class="modal-title" id="myModalLabel">Choose preprocessing parameters</h4>
{% end %}
<tr>
<td style="padding: 5px;">
<a class="btn btn-primary" href="/metadata_summary/?study_id={{study.id}}&prep_template={{prep_template.id}}">
<a class="btn btn-primary" href="{% raw qiita_config.portal_dir %}/metadata_summary/?study_id={{study.id}}&prep_template={{prep_template.id}}">
Show prep template summary
</a>
</td>
Expand Down
9 changes: 5 additions & 4 deletions qiita_pet/templates/study_description_templates/preprocessed_data_info_tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% from qiita_core.qiita_settings import qiita_config %}
{% from qiita_pet.handlers.util import download_link_or_path %}

<script>
Expand All @@ -23,7 +24,7 @@
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myModalLabel">Choose processing parameters</h4>
</div>
<form action="/study/process" method="post" id="parameter-form-{{ppd_id}}">
<form action="{% raw qiita_config.portal_dir %}/study/process" method="post" id="parameter-form-{{ppd_id}}">
<div class="modal-body">
<div>
<div class="form-group">
Expand Down Expand Up @@ -89,9 +90,9 @@ <h4 class="modal-title" id="myModalLabel">Choose processing parameters</h4>
<table border="0" width="60%">
<tr>
{% if not ebi_link %}
<td><a class="btn btn-primary glyphicon glyphicon-export" href="/ebi_submission/{{ppd_id}}" style="word-spacing: -10px;"> Submit to EBI</a></td>
<td><a class="btn btn-primary glyphicon glyphicon-export" href="{% raw qiita_config.portal_dir %}/ebi_submission/{{ppd_id}}" style="word-spacing: -10px;"> Submit to EBI</a></td>
{% end %}
<td><a class="btn btn-primary glyphicon glyphicon-export" href="/vamps/{{ppd_id}}" style="word-spacing: -10px;"> Submit to VAMPS</a></td>
<td><a class="btn btn-primary glyphicon glyphicon-export" href="{% raw qiita_config.portal_dir %}/vamps/{{ppd_id}}" style="word-spacing: -10px;"> Submit to VAMPS</a></td>
</tr>
</table>
<br/>
Expand All @@ -108,7 +109,7 @@ <h4 class="modal-title" id="myModalLabel">Choose processing parameters</h4>
{% end %}
<tr>
<td style="padding:3px;">
<a href="/preprocessing_summary/{{ppd_id}}">Preprocessing summary</a>
<a href="{% raw qiita_config.portal_dir %}/preprocessing_summary/{{ppd_id}}">Preprocessing summary</a>
</td>
</tr>
</table>
Expand Down
3 changes: 2 additions & 1 deletion qiita_pet/templates/study_description_templates/study_information_tab.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
{% from qiita_core.qiita_settings import qiita_config %}
{% from qiita_pet.handlers.util import download_link_or_path %}

<div class="tab-pane active" id="study_information_tab" style="padding: 10px;">
Expand Down Expand Up @@ -43,7 +44,7 @@
<br/>
However, modifying your sample template is fine.
<br/><br/>
<a class="btn btn-primary" href="/metadata_summary/?study_id={{study_id}}&sample_template={{study_id}}">Show sample template summary</a>
<a class="btn btn-primary" href="{% raw qiita_config.portal_dir %}/metadata_summary/?study_id={{study_id}}&sample_template={{study_id}}">Show sample template summary</a>
</br>
{% for stid, stpath in sample_templates %}
<br/>{% raw download_link_or_path(is_local_request, stpath, stid, "Sample template") %}
Expand Down