Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --git a/portal/templates/activate_user.html b/portal/templates/activate_user.html
index 494b65c..8f2b0c1 100644 (file)
--- a/portal/templates/activate_user.html
+++ b/portal/templates/activate_user.html
@@ -1,4 +1,4 @@
-<img src="https://onelab.eu/templates/onelab2/images/logo.png">
+<img src="https://onelab.eu/static/images/onelab.png">
 <br>
 <p>We have received a user signup request for your email address at {{current_site}}</p>
 <p>You have the following user details:</p>

diff --git a/portal/templates/authority_request_email.html b/portal/templates/authority_request_email.html
index bdcd065..64bf981 100644 (file)
--- a/portal/templates/authority_request_email.html
+++ b/portal/templates/authority_request_email.html
@@ -1,4 +1,4 @@
-<img src="{{ STATIC_URL }}img/onelab.png">
+<img src="https://onelab.eu/static/images/onelab.png">
 <br>
 <h1>NEW AUTHORITY REQUEST</h1>
 <br>
@@ -9,8 +9,6 @@
 <b>Abreviated name  :</b> {{site_abbreviated_name}}<br>
 <b>URL              :</b> {{site_url}}<br>              
 <b>City             :</b> {{address_city}}<br>          
-<b>Postcode         :</b> {{address_postalcode}}<br>    
-<b>State            :</b> {{address_state}}<br>         
 <b>Country          :</b> {{address_country}}<br>  
 
 <br><br>

diff --git a/portal/templates/contact_support_email.html b/portal/templates/contact_support_email.html
index 9774347..9848087 100644 (file)
--- a/portal/templates/contact_support_email.html
+++ b/portal/templates/contact_support_email.html
@@ -1,4 +1,4 @@
-<img src="https://onelab.eu/templates/onelab2/images/logo.png">
+<img src="https://onelab.eu/static/images/onelab.png">
 <br>
 <h1>User details</h1>
 <br>

diff --git a/portal/templates/onelab/onelab_user_request_email.html b/portal/templates/onelab/onelab_user_request_email.html
index de11037..4947947 100644 (file)
--- a/portal/templates/onelab/onelab_user_request_email.html
+++ b/portal/templates/onelab/onelab_user_request_email.html
@@ -1,4 +1,4 @@
-<img src="{{ STATIC_URL }}img/onelab.png">     
+<img src="https://onelab.eu/static/images/onelab.png"> 
 <br>
 <h1>NEW USER REQUEST</h1>
 <br>

diff --git a/portal/templates/slice_request_denied.html b/portal/templates/slice_request_denied.html
index 2405490..c381413 100644 (file)
--- a/portal/templates/slice_request_denied.html
+++ b/portal/templates/slice_request_denied.html
@@ -1,4 +1,4 @@
-<img src="{{ STATIC_URL }}img/onelab.png">
+<img src="https://onelab.eu/static/images/onelab.png">
 <br>
 <p>Dear OneLab user,</p>
 <p></p>

diff --git a/portal/templates/slice_request_email.html b/portal/templates/slice_request_email.html
index 3f5f68f..4f86902 100644 (file)
--- a/portal/templates/slice_request_email.html
+++ b/portal/templates/slice_request_email.html
@@ -1,4 +1,4 @@
-<img src="{{ STATIC_URL }}img/onelab.png">
+<img src="https://onelab.eu/static/images/onelab.png">
 <br>
 <h1>NEW SLICE REQUEST</h1>
 <br>

diff --git a/portal/templates/slice_request_validated.html b/portal/templates/slice_request_validated.html
index 9c18227..c508a24 100644 (file)
--- a/portal/templates/slice_request_validated.html
+++ b/portal/templates/slice_request_validated.html
@@ -1,4 +1,4 @@
-<img src="{{ STATIC_URL }}img/onelab.png">
+<img src="https://onelab.eu/static/images/onelab.png">
 <br>
 <p>Dear OneLab user,</p>
 <p></p>

diff --git a/portal/templates/user_request_denied.html b/portal/templates/user_request_denied.html
index 9b954f7..40ad706 100644 (file)
--- a/portal/templates/user_request_denied.html
+++ b/portal/templates/user_request_denied.html
@@ -1,4 +1,4 @@
-<img src="{{ STATIC_URL }}img/onelab.png">
+<img src="https://onelab.eu/static/images/onelab.png">
 <br>
 <p>Dear {{first_name}} {{last_name}},</p>
 <p></p>

diff --git a/portal/templates/user_request_email.html b/portal/templates/user_request_email.html
index c198fee..f14eb83 100644 (file)
--- a/portal/templates/user_request_email.html
+++ b/portal/templates/user_request_email.html
@@ -1,4 +1,4 @@
-<img src="https://onelab.eu/templates/onelab2/images/logo.png">
+<img src="https://onelab.eu/static/images/onelab.png">
 <br>
 <h1>NEW USER REQUEST</h1>
 <br>

diff --git a/portal/templates/user_request_validated.html b/portal/templates/user_request_validated.html
index be97941..fc88316 100644 (file)
--- a/portal/templates/user_request_validated.html
+++ b/portal/templates/user_request_validated.html
@@ -1,4 +1,4 @@
-<img src="{{ STATIC_URL }}img/onelab.png">
+<img src="https://onelab.eu/static/images/onelab.png">
 <br>
 <p>Dear {{first_name}} {{last_name}},</p>
 <p></p>