From: Yasin Rahman <loic.baron@lip6.fr>
Date: Wed, 20 May 2015 15:58:18 +0000 (+0200)
Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab
X-Git-Tag: myslice-1.5~31^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=14c923a4aad838d46abda54e906b0dae73e59fae;hp=5199a0430bc1d916307395058c6ffe5cc24a6a91;p=myslice.git

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

diff --git a/portal/templates/join_request_denied.html b/portal/templates/join_request_denied.html
index 1d6db002..e0b12c7f 100644
--- a/portal/templates/join_request_denied.html
+++ b/portal/templates/join_request_denied.html
@@ -1,4 +1,4 @@
-<img src="{{current_site}}/static/img/f4f-logo.png" width="80px">
+<img src="{{current_site}}/static/img/{{theme.logo}}" width="80px">
 <br>
 <p>Dear {{theme.label}} user,</p>
 <p></p>
diff --git a/portal/templates/project_request_denied.html b/portal/templates/project_request_denied.html
index 2824e2df..158ad117 100644
--- a/portal/templates/project_request_denied.html
+++ b/portal/templates/project_request_denied.html
@@ -3,17 +3,14 @@
 <p>Dear {{theme.label}} user,</p>
 <p></p>
 <p>You have recently requested a project in the {{theme.label}} portal.</p>
-<br>
+
 <b>Project name  :</b> {{project_name}}</br>
 <b>Authority     :</b> {{authority_hrn}}</br>
 <b>Email         :</b> {{email}}</br>
 <b>Purpose       :</b> {{purpose}}</br>
-<p></p>
-<br>
+
 <p>We regret to inform you that, a manager of your institution has rejected your request. Please contact the manager of your institution for further information. 
 For any other queries, please contact us by replying to this email.</p>
-<br>
 <p>We wish you a fruitful user experience on {{theme.label}}.</p>
-<br>
 <p>Yours sincerely,</p>
 <p>The {{theme.label}} team</p>
diff --git a/portal/templates/projectrequest_view.html b/portal/templates/projectrequest_view.html
index 3b267bfe..85582280 100644
--- a/portal/templates/projectrequest_view.html
+++ b/portal/templates/projectrequest_view.html
@@ -130,7 +130,7 @@ $(document).ready(function() {
             $('.project-list').append('<tr><td>'+ val +'</td></tr>');
         });
     } else {
-        $('.project-list').html('<tr><td>no projetcs</td></tr>');
+        $('.project-list').html('<tr><td>no projects</td></tr>');
     }
     
     $('.nav-tabs a').click(function (e) {