FIX templates: url http/https

diff --git a/portal/templates/activate_user.html b/portal/templates/activate_user.html
index 9f165d0..0692b0b 100644 (file)
--- a/portal/templates/activate_user.html
+++ b/portal/templates/activate_user.html
@@ -10,7 +10,7 @@ Email: {{email}}<br>
 
 <p></p>
 <p>
-You may now <a href="http://{{current_site}}">log</a> in to the portal using your email address and the password that you provided, but your access will be limited. To gain full access, two steps are required:
+You may now <a href="{{current_site}}">log</a> in to the portal using your email address and the password that you provided, but your access will be limited. To gain full access, two steps are required:
 </p>
 
 <ul style="list-style-type:decimal;">
@@ -24,6 +24,6 @@ A manager from your organization must also validate your request. Upon confirmat
 </li>
 </ul>
 <p>
-We look forward to welcoming you to OneLab. You will find answers to frequently asked questions <a href="http://{{current_site}}/support/">here</a>. 
-Please don't hesitate to <a href="http://{{current_site}}/contact/">contact us</a> with any additional questions that you might have.
+We look forward to welcoming you to OneLab. You will find answers to frequently asked questions <a href="{{current_site}}/support/">here</a>. 
+Please don't hesitate to <a href="{{current_site}}/contact/">contact us</a> with any additional questions that you might have.
 </p>

diff --git a/portal/templates/fed4fire/fed4fire_activate_user.html b/portal/templates/fed4fire/fed4fire_activate_user.html
index 078c498..4ad469b 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_activate_user.html
+++ b/portal/templates/fed4fire/fed4fire_activate_user.html
@@ -9,7 +9,7 @@ Email: {{email}}<br>
 
 <p></p>
 <p>
-You may now <a href="http://{{current_site}}">log</a> in to the portal using your email address and the password that you provided, but your access will be limited. To gain full access, two steps are required:
+You may now <a href="{{current_site}}">log</a> in to the portal using your email address and the password that you provided, but your access will be limited. To gain full access, two steps are required:
 </p>
 
 <ul style="list-style-type:decimal;">
@@ -23,6 +23,6 @@ A manager from your organization must also validate your request. Upon confirmat
 </li>
 </ul>
 <p>
-We look forward to welcoming you to Fed4FIRE portal. You will find answers to frequently asked questions <a href="http://{{current_site}}/support/">here</a>. 
-Please don't hesitate to <a href="http://{{current_site}}/contact/">contact us</a> with any additional questions that you might have.
+We look forward to welcoming you to Fed4FIRE portal. You will find answers to frequently asked questions <a href="{{current_site}}/support/">here</a>. 
+Please don't hesitate to <a href="{{current_site}}/contact/">contact us</a> with any additional questions that you might have.
 </p>

diff --git a/portal/templates/fed4fire/fed4fire_slice_request_email.html b/portal/templates/fed4fire/fed4fire_slice_request_email.html
index 770b78b..6a26829 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_slice_request_email.html
+++ b/portal/templates/fed4fire/fed4fire_slice_request_email.html
@@ -12,7 +12,7 @@
 <b>Email           :</b> {{email}}</br>
 <b>Portal url     :</b> {{current_site}}</br> 
 <p></p>
-<p>You can see new slice request <a href="http://{{current_site}}/portal/validate">in the portal.</a><p>
+<p>You can see new slice request <a href="{{current_site}}/portal/validate">in the portal.</a><p>
 <p>Please be sure that you know the user who is requesting this slice, as you are responsible for his or her actions.</p>
 <p>And kindly ensure that the stated experiment purpose is clear, and, if there is a website that explains the website, that a URL is provided.</p>
 <p>Fed4FIRE and its affiliated testbeds exist purely to support useful and interesting work. To ensure the future of these environments, we need to know what work is actually being done.</p>

diff --git a/portal/templates/fed4fire/fed4fire_slice_request_email.txt b/portal/templates/fed4fire/fed4fire_slice_request_email.txt
index 5b7ccb0..b530cda 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_slice_request_email.txt
+++ b/portal/templates/fed4fire/fed4fire_slice_request_email.txt
@@ -10,7 +10,7 @@ Email           : {{email}}
 Organization   : {{organization}}
 Portal url             : {{current_site}}
 
-You can see new slice request in: http://{{current_site}}/portal/validate
+You can see new slice request in: {{current_site}}/portal/validate
 Please be sure that you know the user who is requesting this slice, as you are responsible for his or her actions.
  
 And kindly ensure that the stated experiment purpose is clear, and, if there is a website that explains the website, that a URL is provided. 

diff --git a/portal/templates/fed4fire/fed4fire_user_request_email.html b/portal/templates/fed4fire/fed4fire_user_request_email.html
index 1406133..e54d0bf 100644 (file)
--- a/portal/templates/fed4fire/fed4fire_user_request_email.html
+++ b/portal/templates/fed4fire/fed4fire_user_request_email.html
@@ -11,6 +11,6 @@
 <b>User hrn     :</b> {{user_hrn}}<br>
 <b>Portal url  :</b> {{ current_site }}<br>
 <p></p>
-<p>You can validate the user <a href="http://{{current_site}}/portal/validate">here</a>.<p>
+<p>You can validate the user <a href="{{current_site}}/portal/validate">here</a>.<p>
 <br>
 <p>Please note that the validation request will only become visible once the user has confirmed his/her email address.</p>

diff --git a/portal/templates/onelab/onelab_user_request_email.html b/portal/templates/onelab/onelab_user_request_email.html
index 4947947..e4cf19b 100644 (file)
--- a/portal/templates/onelab/onelab_user_request_email.html
+++ b/portal/templates/onelab/onelab_user_request_email.html
@@ -14,9 +14,9 @@
 <b>User hrn     :</b> {{user_hrn}}<br>
 <b>Portal url  :</b> {{ current_site }}<br>
 <p></p>
-<p>You can see new user request <a href="http://{{current_site}}/portal/validate">in the portal.</a><p>
+<p>You can see new user request <a href="{{current_site}}/portal/validate">in the portal.</a><p>
 <p>Please note that the request will only become visible to you on the OneLab portal once the user has confirmed his/her email address.</p>
 <p>Please only validate users who you know for whose actions you are prepared to take responsibility, as described in the 
-<a href="http://{{current_site}}/terms">OneLab terms and conditions.</a> If you find any anomalies in the request 
+<a href="{{current_site}}/terms">OneLab terms and conditions.</a> If you find any anomalies in the request 
 (mistakes/spam/unauthorized persons) please <a href="mailto:support@onelab.eu">notify us.</a></p>
 

diff --git a/portal/templates/onelab/onelab_user_request_email.txt b/portal/templates/onelab/onelab_user_request_email.txt
index 83ec9d3..ce8d548 100644 (file)
--- a/portal/templates/onelab/onelab_user_request_email.txt
+++ b/portal/templates/onelab/onelab_user_request_email.txt
@@ -12,7 +12,7 @@ Email        : {{email}}
 User hrn     : {{user_hrn}}
 Portal url   : {{ current_site }}
 
-You can see new user request in the portal: http://{{current_site}}/portal/validate
+You can see new user request in the portal: {{current_site}}/portal/validate
 
 Please note that the request will only become visible to you on the OneLab portal once the user has confirmed his/her email address.
 

diff --git a/portal/templates/slice_request_email.html b/portal/templates/slice_request_email.html
index 4f86902..d76655e 100644 (file)
--- a/portal/templates/slice_request_email.html
+++ b/portal/templates/slice_request_email.html
@@ -12,9 +12,9 @@
 <b>Email           :</b> {{email}}</br>
 <b>Portal url     :</b> {{current_site}}</br> 
 <p></p>
-<p>You can see new slice request <a href="http://{{current_site}}/portal/validate">in the portal.</a><p>
+<p>You can see new slice request <a href="{{current_site}}/portal/validate">in the portal.</a><p>
 <p>Please be sure that you know the user who is requesting this slice, as you are responsible for his or her actions, as described in the 
-<a href="http://{{current_site}}/terms">OneLab terms and conditions.</a></p>
+<a href="{{current_site}}/terms">OneLab terms and conditions.</a></p>
 <p>And kindly ensure that the stated experiment purpose is clear, and, if there is a website that explains the website, that a URL is provided.</p>
 <p>OneLab and its affiliated testbeds exist purely to support useful and interesting work. To ensure the future of these environments, we need to know what work is actually being done.</p>
 <p></p>

diff --git a/portal/templates/slice_request_email.txt b/portal/templates/slice_request_email.txt
index 997e752..6188b53 100644 (file)
--- a/portal/templates/slice_request_email.txt
+++ b/portal/templates/slice_request_email.txt
@@ -10,9 +10,9 @@ Email           : {{email}}
 Organization   : {{organization}}
 Portal url             : {{current_site}}
 
-You can see new slice request in: http://{{current_site}}/portal/validate
+You can see new slice request in: {{current_site}}/portal/validate
 Please be sure that you know the user who is requesting this slice, as you are responsible for his or her actions, as described in the OneLab terms and conditions:
-       http://{{current_site}}/terms
+       {{current_site}}/terms
  
 And kindly ensure that the stated experiment purpose is clear, and, if there is a website that explains the website, that a URL is provided. 
 OneLab and its affiliated testbeds exist purely to support useful and interesting work. To ensure the future of these environments, we need to know what work is actually being done. 

diff --git a/portal/templates/smartfire/smartfire_activate_user.html b/portal/templates/smartfire/smartfire_activate_user.html
index 48e0142..04884b0 100644 (file)
--- a/portal/templates/smartfire/smartfire_activate_user.html
+++ b/portal/templates/smartfire/smartfire_activate_user.html
@@ -10,7 +10,7 @@ Email: {{email}}<br>
 
 <p></p>
 <p>
-You may now <a href="http://{{current_site}}">log</a> in to the portal using your email address and the password that you provided, but your access will be limited. To gain full access, two steps are required:
+You may now <a href="{{current_site}}">log</a> in to the portal using your email address and the password that you provided, but your access will be limited. To gain full access, two steps are required:
 </p>
 
 <ul style="list-style-type:decimal;">
@@ -24,6 +24,6 @@ A manager from your organization must also validate your request. Upon confirmat
 </li>
 </ul>
 <p>
-We look forward to welcoming you to SmartFIRE. You will find answers to frequently asked questions <a href="http://{{current_site}}/support/">here</a>. 
-Please don't hesitate to <a href="http://{{current_site}}/contact/">contact us</a> with any additional questions that you might have.
+We look forward to welcoming you to SmartFIRE. You will find answers to frequently asked questions <a href="{{current_site}}/support/">here</a>. 
+Please don't hesitate to <a href="{{current_site}}/contact/">contact us</a> with any additional questions that you might have.
 </p>

diff --git a/portal/templates/smartfire/smartfire_user_request_email.html b/portal/templates/smartfire/smartfire_user_request_email.html
index ae8952c..e9522ff 100644 (file)
--- a/portal/templates/smartfire/smartfire_user_request_email.html
+++ b/portal/templates/smartfire/smartfire_user_request_email.html
@@ -11,6 +11,6 @@
 <b>User hrn     :</b> {{user_hrn}}<br>
 <b>Portal url  :</b> {{ current_site }}<br>
 <p></p>
-<p>You can validate the user <a href="http://{{current_site}}/portal/validate">here</a>.<p>
+<p>You can validate the user <a href="{{current_site}}/portal/validate">here</a>.<p>
 <br>
 <p>Please note that the validation request will only become visible once the user has confirmed his/her email address.</p>

diff --git a/portal/templates/user_request_email.html b/portal/templates/user_request_email.html
index f14eb83..37dfb52 100644 (file)
--- a/portal/templates/user_request_email.html
+++ b/portal/templates/user_request_email.html
@@ -11,6 +11,6 @@
 <b>User hrn     :</b> {{user_hrn}}<br>
 <b>Portal url  :</b> {{ current_site }}<br>
 <p></p>
-<p>You can validate the user <a href="http://{{current_site}}/portal/validate">here</a>.<p>
+<p>You can validate the user <a href="{{current_site}}/portal/validate">here</a>.<p>
 <br>
 <p>Please note that the validation request will only become visible once the user has confirmed his/her email address.</p>