Merge pull request #1656 from josenavas/subdir-portals-2

Fixing some more templates

qiita_pet/templates/user_messages.html

@@ -33,7 +33,7 @@
 
 {% block content%}
 <h2 style="text-decoration: underline;">System Messages</h2>
-<form method="POST" action="/user/messages/" name="msgform">
+<form method="POST" action="{% raw qiita_config.portal_dir %}/user/messages/" name="msgform">
 <div class="row">
   <div class="col-sm-6"><a href="#" onclick="checkbox_action('check')">Select all</a> | <a href="#" onclick="checkbox_action('uncheck')">Select None</a> | <a href="#" onclick="checkbox_action('invert')">Select Inverse</a></div>
   <input type="hidden" name="action" id="action" value="">

qiita_pet/templates/user_profile.html

@@ -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>
@@ -11,7 +11,7 @@
 <div class="row">
   <div class="col-lg-6">
     <h3>User Information</h3>
-    <form role="form" action="/profile/" method="post">
+    <form role="form" action="{% raw qiita_config.portal_dir %}/profile/" method="post">
       <input type="hidden" name="action" value="profile">
       {% for form_item in profile %}
       <div class="form-group">
@@ -25,7 +25,7 @@ <h3>User Information</h3>
   </div>
   <div class="col-lg-6">
   <h3>Change Password</h3>
-  <form role="form" action="/profile/" method="post" id="change_pass" name="change_pass" class="dualpass">
+  <form role="form" action="{% raw qiita_config.portal_dir %}/profile/" method="post" id="change_pass" name="change_pass" class="dualpass">
   <input type="hidden" name="action" value="password">
 <div class="form-group">
     <label for="oldpass" class="col-sm-10 control-label">Old Password</label>

qiita_pet/templates/vamps_submission.html

@@ -3,7 +3,7 @@
 
 <h1>Submission summary for study: <b>{{study_title}}</b></h1>
 
-<form role="form" action="/vamps/{{preprocessed_data_id}}" method="post">
+<form role="form" action="{% raw qiita_config.portal_dir %}/vamps/{{preprocessed_data_id}}" method="post">
     <div class="panel panel-default">
         <div class="panel-heading">
             The information below describes information contained in the sample
@@ -27,6 +27,6 @@ <h1>Submission summary for study: <b>{{study_title}}</b></h1>
       <input type="submit" class="btn btn-primary" value="Submit to VAMPS">
     {% end %}
     <br/><br/>
-    <a class="btn btn-primary" href="/study/description/{{study_id}}?top_tab=preprocessed_data_tab&sub_tab={{preprocessed_data_id}}">Return to study</a>
+    <a class="btn btn-primary" href="{% raw qiita_config.portal_dir %}/study/description/{{study_id}}?top_tab=preprocessed_data_tab&sub_tab={{preprocessed_data_id}}">Return to study</a>
 </form>
 {% end %}

qiita_pet/templates/waiting.html

@@ -1,7 +1,9 @@
+{% from qiita_core.qiita_settings import qiita_config %}
+
 <div id="waiting">
   <center>
-    <img src="/static/img/logo-clear.png" style="margin-left: 75px;">
+    <img src="{% raw qiita_config.portal_dir %}/static/img/logo-clear.png" style="margin-left: 75px;">
     <br/>
-    <img src="/static/img/waiting.gif" width="100" height="100" border="0">
+    <img src="{% raw qiita_config.portal_dir %}/static/img/waiting.gif" width="100" height="100" border="0">
   </center>
 </div>