Skip to content

Subdir portals agp #1649

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 4 commits into from
Feb 19, 2016
Merged

Subdir portals agp #1649

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f65d6bf
Merge branch 'subdir-portals' of https://github.com/biocore/qiita int…
antgonza Feb 19, 2016
17042b9
fixing some files!
antgonza Feb 19, 2016
60c50e8
Merge branch 'subdir-portals' of https://github.com/biocore/qiita int…
antgonza Feb 19, 2016
b3fc0a1
addressing @squirrelo comments
antgonza Feb 19, 2016
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
12 changes: 6 additions & 6 deletions qiita_pet/templates/admin_approval.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends sitebase.html %}
{% block head %}
<link rel="stylesheet" href="/static/vendor/css/jquery.dataTables.css" type="text/css">
<script src="/static/vendor/js/jquery.dataTables.min.js" type="text/javascript"></script>
<link rel="stylesheet" href="{% raw qiita_config.portal_dir %}/static/vendor/css/jquery.dataTables.css" type="text/css">
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/jquery.dataTables.min.js" type="text/javascript"></script>

<script type="text/javascript">
$(document).ready(function() {
Expand All @@ -19,15 +19,15 @@ <h2>Studies awaiting approval</h2>
</thead>
{% for study_id, study_title, study_owner, pds in study_info %}
<tr>
<td><a href='/study/description/{{study_id}}?top_tab=processed_data_tab'>{{study_title}}</a></td>
<td><a href='{% raw qiita_config.portal_dir %}/study/description/{{study_id}}?top_tab=processed_data_tab'>{{study_title}}</a></td>
<td>{{study_owner}}</td>
<td>
<a href="/study/description/{{study_id}}?top_tab=processed_data_tab&sub_tab={{pds[0]}}">{{pds[0]}}</a>
<a href="{% raw qiita_config.portal_dir %}/study/description/{{study_id}}?top_tab=processed_data_tab&sub_tab={{pds[0]}}">{{pds[0]}}</a>
{% for pd in pds[1:] %}
, <a href="/study/description/{{study_id}}?top_tab=processed_data_tab&sub_tab={{pd}}">{{pd}}</a>
, <a href="{% raw qiita_config.portal_dir %}/study/description/{{study_id}}?top_tab=processed_data_tab&sub_tab={{pd}}">{{pd}}</a>
{% end %}
</td>
</tr>
{% end %}
</table>
{% end %}
{% end %}
2 changes: 1 addition & 1 deletion qiita_pet/templates/analysis_results.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ <h3 class="panel-title"><a data-toggle="collapse" data-parent="#accordion" href=
<h3 style="color:red">ERROR</h3>
{% end %}
{%for result, result_name in results%}
<a href='{{"/results/%s" % result}}' target="resframe">{{result_name}}</a><br />
<a href='{% raw qiita_config.portal_dir %}{{"/results/%s" % result}}' target="resframe">{{result_name}}</a><br />
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this can become one string formatting call.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After discussion, this will work as is.

{% end %}
</div>
{% end %}
Expand Down
10 changes: 5 additions & 5 deletions qiita_pet/templates/analysis_selected.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{% block head %}
{% from future.utils import viewitems %}
{% from itertools import chain %}
<script src="/static/vendor/js/moi.js"></script>
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/moi.js"></script>
<script type="text/javascript">

function error(evt) { $('#ws-error').html("<b>Server communication error. Sample removal will not be recorded. Please try again later.</b>"); };
Expand Down Expand Up @@ -75,7 +75,7 @@ <h1>Selected Samples</h1>
<span id="ws-error" style="color:red"></span>
<div id="no-selected" class="jumbotron">
<h1>No samples selected</h1>
<h3><a href="/study/list/">Please select at least one sample to continue</a><h3>
<h3><a href="{% raw qiita_config.portal_dir %}/study/list/">Please select at least one sample to continue</a><h3>
</div>
{% if sel_data %}
<div class="row topfloat">
Expand All @@ -93,7 +93,7 @@ <h3><a href="/study/list/">Please select at least one sample to continue</a><h3>
{% for study, proc_datas in viewitems(sel_data) %}
<div class="row" id="study{{study.id}}">
<div class="col-md-12" style="border:2px solid #a1a1a1; border-radius: 15px;">
<h2><a href="/study/description/{{study.id}}">{{study.title}}</a></h2>
<h2><a href="{% raw qiita_config.portal_dir %}/study/description/{{study.id}}">{{study.title}}</a></h2>
<h4>Processed Data</h4>
<table class='table table-striped' id='study{{study.id}}-table'>
<tr>
Expand Down Expand Up @@ -126,7 +126,7 @@ <h4>Processed Data</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myModalLabel">Processed Data {{pid}}</h4>
</div>
<form role="form" action="/analysis/3" method="post">
<form role="form" action="{% raw qiita_config.portal_dir %}/analysis/3" method="post">
<input type="hidden" name="action" value="create">
<div class="modal-body">
<b>Datatype</b>: {{proc_info[pid]["data_type"]}} <br/>
Expand Down Expand Up @@ -159,7 +159,7 @@ <h4 class="modal-title" id="myModalLabel">Processed Data {{pid}}</h4>
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<h4 class="modal-title" id="myModalLabel">Create new analysis</h4>
</div>
<form role="form" action="/analysis/3" method="post">
<form role="form" action="{% raw qiita_config.portal_dir %}/analysis/3" method="post">
<input type="hidden" name="action" value="create">
<div class="modal-body">
<div>
Expand Down
4 changes: 2 additions & 2 deletions qiita_pet/templates/analysis_waiting.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% extends sitebase.html%}

{%block head%}
<script src="/static/vendor/js/moi.js"></script>
<script src="/static/vendor/js/moi_list.js"></script>
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/moi.js"></script>
<script src="{% raw qiita_config.portal_dir %}/static/vendor/js/moi_list.js"></script>
<script type="text/javascript">
$(document).ready(function() {
moi_list.init("{{group_id}}");
Expand Down
6 changes: 3 additions & 3 deletions qiita_pet/templates/change_lost_pass.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{%extends sitebase.html%}
{%block head%}
<script type="text/javascript" src="/static/vendor/js/jquery.validate.min.js"></script>
<script type="text/javascript" src="/static/js/password_validation.js"></script>
<script type="text/javascript" src="{% raw qiita_config.portal_dir %}/static/vendor/js/jquery.validate.min.js"></script>
<script type="text/javascript" src="{% raw qiita_config.portal_dir %}/static/js/password_validation.js"></script>
<script type="text/javascript">
$( document ).ready(function() { dualpass_validator(); });
</script>
Expand All @@ -12,7 +12,7 @@
<div style='width: 50%;'>
<h1>Password Reset</h1>
<h3>Enter new password below</h3>
<form role="form" action="/auth/reset/{{code}}" method="post" id="lost_pass" name="lost_pass">
<form role="form" action="{% raw qiita_config.portal_dir %}/auth/reset/{{code}}" method="post" id="lost_pass" name="lost_pass">
<div class="form-group">
<label for="email" class="col-sm-10 control-label">Email</label>
<input type="email" class="form-control" id="email" name="email">
Expand Down
4 changes: 2 additions & 2 deletions qiita_pet/templates/change_password.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{%extends sitebase.html%}
{%block head%}
<script type="text/javascript" src="/static/js/jquery.validate.min.js"></script>
<script type="text/javascript" src="{% raw qiita_config.portal_dir %}/static/js/jquery.validate.min.js"></script>
<script type="text/javascript">
// http://www.9lessons.info/2012/04/bootstrap-registration-form-tutorial.html
$(document).ready(function()
Expand Down Expand Up @@ -49,7 +49,7 @@
<div style='width: 50%;'>
<h1>Change Password</h1><br />
<h3>Enter new password below</h3>
<form role="form" action="/profile/password/" method="post" id="change_password" name="change_password">
<form role="form" action="{% raw qiita_config.portal_dir %}/profile/password/" method="post" id="change_password" name="change_password">
<div class="form-group">
<label for="oldpass" class="control-label">Current Password</label>
<input type="password" class="form-control" id="oldpass" name="oldpass">
Expand Down
6 changes: 3 additions & 3 deletions qiita_pet/templates/create_user.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{% extends sitebase.html %}
{%block head%}
<script type="text/javascript" src="/static/vendor/js/jquery.validate.min.js"></script>
<script type="text/javascript" src="/static/js/password_validation.js"></script>
<script type="text/javascript" src="{% raw qiita_config.portal_dir %}/static/vendor/js/jquery.validate.min.js"></script>
<script type="text/javascript" src="{% raw qiita_config.portal_dir %}/static/js/password_validation.js"></script>
<script type="text/javascript">
$( document ).ready(function() { dualpass_validator(); });
</script>
Expand All @@ -10,7 +10,7 @@
{%block content%}
<h1>Enter User Information</h1>
<div style="color:red;">{% raw error %}</div>
<form class="form-horizontal dualpass" role="form" action="/auth/create/" method="post" id="createuser">
<form class="form-horizontal dualpass" role="form" action="{% raw qiita_config.portal_dir %}/auth/create/" method="post" id="createuser">
<div class="form-group">
<label for="email" class="col-sm-2 control-label">Email</label>
<div class="col-sm-10">
Expand Down