SmarFIRE portal: theme specific templates created
authorLoic Baron <loic.baron@lip6.fr>
Fri, 20 Feb 2015 15:58:07 +0000 (16:58 +0100)
committerLoic Baron <loic.baron@lip6.fr>
Fri, 20 Feb 2015 15:58:07 +0000 (16:58 +0100)
26 files changed:
portal/templates/smartfire/smartfire_activate_user.html [new file with mode: 0644]
portal/templates/smartfire/smartfire_activate_user.txt [new file with mode: 0644]
portal/templates/smartfire/smartfire_authority_request_denied.html [new file with mode: 0644]
portal/templates/smartfire/smartfire_authority_request_denied.txt [new file with mode: 0644]
portal/templates/smartfire/smartfire_authority_request_email.html [new file with mode: 0644]
portal/templates/smartfire/smartfire_authority_request_email.txt [new file with mode: 0644]
portal/templates/smartfire/smartfire_authority_request_email_subject.txt [new file with mode: 0644]
portal/templates/smartfire/smartfire_contact_support_email.html [new file with mode: 0644]
portal/templates/smartfire/smartfire_contact_support_email.txt [new file with mode: 0644]
portal/templates/smartfire/smartfire_contact_support_email_subject.txt [new file with mode: 0644]
portal/templates/smartfire/smartfire_email_activation.html [new file with mode: 0644]
portal/templates/smartfire/smartfire_home-view.html
portal/templates/smartfire/smartfire_slice_request_denied.html [new file with mode: 0644]
portal/templates/smartfire/smartfire_slice_request_denied.txt [new file with mode: 0644]
portal/templates/smartfire/smartfire_slice_request_email_subject.txt [new file with mode: 0644]
portal/templates/smartfire/smartfire_slice_request_validated.html [new file with mode: 0644]
portal/templates/smartfire/smartfire_slice_request_validated.txt [new file with mode: 0644]
portal/templates/smartfire/smartfire_user_request_denied.html [new file with mode: 0644]
portal/templates/smartfire/smartfire_user_request_denied.txt [new file with mode: 0644]
portal/templates/smartfire/smartfire_user_request_email.html [new file with mode: 0644]
portal/templates/smartfire/smartfire_user_request_email.txt [new file with mode: 0644]
portal/templates/smartfire/smartfire_user_request_email_subject.txt [new file with mode: 0644]
portal/templates/smartfire/smartfire_user_request_validated.html [new file with mode: 0644]
portal/templates/smartfire/smartfire_user_request_validated.txt [new file with mode: 0644]
portal/templates/user_register_email.txt [deleted file]
portal/templates/user_register_email_subject.txt [deleted file]

diff --git a/portal/templates/smartfire/smartfire_activate_user.html b/portal/templates/smartfire/smartfire_activate_user.html
new file mode 100644 (file)
index 0000000..8e6288d
--- /dev/null
@@ -0,0 +1,29 @@
+<img src="{{ STATIC_URL }}img/SmartFIRE_logo.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>
+
+Organization: {{organization}}<br>
+First name: {{first_name}}<br>
+Last name: {{last_name}}<br>
+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:
+</p>
+
+<ul style="list-style-type:decimal;">
+<li>
+You must confirm that you have indeed made this request by clicking on the following link: <br>
+       <a href={{validation_link}}>{{validation_link}}</a> 
+       <ul><li>If you did not make this request, we apologise. You may disregard this email or you may advise us the error by replying to this email.</li></ul>
+</li>
+<li>
+A manager from your organization must also validate your request. Upon confirmation of your signup request, we will send an email to the managers at your organization with a validation request.
+</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.
+</p>
diff --git a/portal/templates/smartfire/smartfire_activate_user.txt b/portal/templates/smartfire/smartfire_activate_user.txt
new file mode 100644 (file)
index 0000000..ac84bc3
--- /dev/null
@@ -0,0 +1,24 @@
+We have received a user signup request for your email address at {{current_site}}
+
+You have the following user details:
+
+Organization: {{organization}}
+First name: {{first_name}}
+Last name: {{last_name}}
+Email: {{email}}
+
+You may now log 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:
+
+       1. You must confirm that you have indeed made this request by clicking on the following link:
+
+               {{validation_link}}
+
+               If you did not make this request, we apologise. You may disregard this email or you may advise us the error by replying to this email.
+
+       2. A manager from your organization must also validate your request. Upon confirmation of your signup request, we will send an email to the managers at your organization with a validation request.
+
+We look forward to welcoming you to SmartFIRE portal. 
+Please don't hesitate to contact us at support@onelab.eu with any additional questions that you might have.
+
+
+
diff --git a/portal/templates/smartfire/smartfire_authority_request_denied.html b/portal/templates/smartfire/smartfire_authority_request_denied.html
new file mode 100644 (file)
index 0000000..76f68d0
--- /dev/null
@@ -0,0 +1,20 @@
+<img src="{{ STATIC_URL }}img/SmartFIRE_logo.png">
+<br>
+<p>Dear SmartFIRE user,</p>
+<p></p>
+<p>You have recently requested an addition of the following authority in the SmartFIRE portal ({{portal_url}}):</p> 
+<p></p>
+<b>Name of organization:</b> {{site_name}}<br>
+<b>Short name:</b> {{short_name}}<br>
+<b>Url:</b> {{url}}<br>
+<b>City:</b> {{city}}<br>
+<b>Country:</b> {{country}}<br>
+<p></p>
+</p>After verifying your request, we regret to inform you that, we are unable to validate your request.</p>
+<p>For any queries, contact us by replying to this email.</p>
+<br>
+<p>On behalf of the entire team, I wish you all the best.</p>
+<br>
+<p>Yours sincerely,</p>
+<p>The SmartFIRE team</p>
+
diff --git a/portal/templates/smartfire/smartfire_authority_request_denied.txt b/portal/templates/smartfire/smartfire_authority_request_denied.txt
new file mode 100644 (file)
index 0000000..276d69a
--- /dev/null
@@ -0,0 +1,18 @@
+Dear SmartFIRE user,
+
+You have recently requested an addition of the following authority in the SmartFIRE portal ({{portal_url}}): 
+
+Name of organization: {{site_name}}
+Short name: {{short_name}}
+Url: {{url}}
+City: {{city}}
+Country: {{country}}
+
+
+After verifying your request, we regret to inform you that, we are unable to validate your request.
+For any queries, contact us by replying to this email.
+
+On behalf of the entire team, I wish you all the best.
+
+Yours sincerely,
+The SmartFIRE team
diff --git a/portal/templates/smartfire/smartfire_authority_request_email.html b/portal/templates/smartfire/smartfire_authority_request_email.html
new file mode 100644 (file)
index 0000000..f22728a
--- /dev/null
@@ -0,0 +1,22 @@
+<img src="{{ STATIC_URL }}img/SmartFIRE_logo.png">
+<br>
+<h1>NEW AUTHORITY REQUEST</h1>
+<br>
+<p>This email is only for SmartFIRE admins</p>
+<br>
+<h2>{{site_name}}</h2>             
+<b>Authority hrn    :</b> {{authority_hrn}}<br>         
+<b>Abreviated name  :</b> {{site_abbreviated_name}}<br>
+<b>URL              :</b> {{site_url}}<br>              
+<b>City             :</b> {{address_city}}<br>          
+<b>Country          :</b> {{address_country}}<br>  
+
+<br><br>
+
+<h2>PI for this Authority</h2>     
+<b>First Name   :</b> {{first_name}}<br>
+<b>Last Name    :</b> {{last_name}}<br>
+<b>Authority hrn:</b> {{authority_hrn}}<br>
+<b>Public key   :</b> {{public_key}}<br>
+<b>Email        :</b> {{email}}<br>
+<b>User Hrn     :</b> {{user_hrn}}<br>
diff --git a/portal/templates/smartfire/smartfire_authority_request_email.txt b/portal/templates/smartfire/smartfire_authority_request_email.txt
new file mode 100644 (file)
index 0000000..93daae0
--- /dev/null
@@ -0,0 +1,22 @@
+This email is only for SmartFIRE admins.
+
+NEW AUTHORITY REQUEST
+
+Site             : {{site_name}}             
+
+Authority hrn    : {{authority_hrn}}         
+Abreviated name  : {{site_abbreviated_name}} 
+URL              : {{site_url}}              
+
+
+City             : {{address_city}}          
+Country          : {{address_country}}  
+
+
+PI for this Authority     
+First Name   : {{first_name}}
+Last Name    : {{last_name}}
+Authority hrn: {{authority_hrn}}
+Public key   : {{public_key}}
+Email        : {{email}}
+User Hrn     : {{user_hrn}}
diff --git a/portal/templates/smartfire/smartfire_authority_request_email_subject.txt b/portal/templates/smartfire/smartfire_authority_request_email_subject.txt
new file mode 100644 (file)
index 0000000..1366a27
--- /dev/null
@@ -0,0 +1 @@
+SmartFIRE new Authority request submitted
diff --git a/portal/templates/smartfire/smartfire_contact_support_email.html b/portal/templates/smartfire/smartfire_contact_support_email.html
new file mode 100644 (file)
index 0000000..1bf0c40
--- /dev/null
@@ -0,0 +1,10 @@
+<img src="{{ STATIC_URL }}img/SmartFIRE_logo.png">
+<br>
+<h1>User details</h1>
+<br>
+<b>Email        :</b> {{email}}
+
+<h1>Query details</h1>
+
+<b>Subject             :</b> {{subject}}
+<b>Query               :</b> {{description}}
diff --git a/portal/templates/smartfire/smartfire_contact_support_email.txt b/portal/templates/smartfire/smartfire_contact_support_email.txt
new file mode 100644 (file)
index 0000000..536d1b2
--- /dev/null
@@ -0,0 +1,9 @@
+User details: 
+
+email           : {{email}}
+
+Query Details:
+
+Subject         : {{subject}}
+Description     : {{description}}
+
diff --git a/portal/templates/smartfire/smartfire_contact_support_email_subject.txt b/portal/templates/smartfire/smartfire_contact_support_email_subject.txt
new file mode 100644 (file)
index 0000000..7d15d8d
--- /dev/null
@@ -0,0 +1 @@
+SmartFIRE support: user ticket
diff --git a/portal/templates/smartfire/smartfire_email_activation.html b/portal/templates/smartfire/smartfire_email_activation.html
new file mode 100644 (file)
index 0000000..124f32a
--- /dev/null
@@ -0,0 +1,25 @@
+{% extends "layout.html" %}
+
+{% block content %}
+
+<div class="row">
+       <h1><img src="{{ STATIC_URL }}img/icon_user_small.png" alt="User Registration" />User sign-up</h1>
+</div>
+<div class="row">
+       {% if activation_status == 'success' %}
+               <h3>Signup request confirmed.</h3>
+               <p>You are currently able to log in to the portal using your email address and the password that you have provided; however, your access is still limited.</p> 
+               <p>You will have full access as soon as your account is validated by a manager at your organization. We have sent an email to your organisation's managers with a validation request.</p>
+    {% elif activation_status == 'validated' %}
+               <h3>Account validated.</h3>
+               <p>We have identified you as a valid PLE user. Your SmartFIRE account has automatically been approved.</p>
+        <p>You have a full access to SmartFIRE testbeds.</p>
+       {%else%}
+               <h3>Signup confirmation failed.</h3>
+               <p>You have probably arrived at this page by clicking a confirmation link in an email that we have sent to you. 
+               We have been unable to match the link that you have clicked to a signup request in our database.</p>
+               <p>Please <a href="/portal/contact/">contact support</a> so that we may help you complete the signup process.</p>
+       {%endif%}
+ </div>
+
+{% endblock %}
index 379547c..89fdf64 100644 (file)
@@ -30,9 +30,7 @@
                        <div>
                                <p><strong>Your slices </strong>
                                        <span title="A slice is a set of testbed resources on which you can conduct an experiment. 
-                                       Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'. 
-                                       However, on the OneLab portal, you will only see slices that you have created through OneLab. If you have created slices elsewhere, 
-                                       such as on the PlanetLab Europe portal, those slices will not appear here."
+                                       Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'." 
                                        class="glyphicon glyphicon-info-sign">
                                </span>
 
@@ -96,9 +94,7 @@
                        <div>
                                <p><strong>Your slices </strong>
                                <span title="A slice is a set of testbed resources on which you can conduct an experiment. 
-                                       Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'. 
-                                       However, on the OneLab portal, you will only see slices that you have created through OneLab. If you have created slices elsewhere, 
-                                       such as on the PlanetLab Europe portal, those slices will not appear here."
+                                       Either ask your colleagues to give you access to an existing slice or request a new slice by clicking 'Request Slice'."
                                        class="glyphicon glyphicon-info-sign">
                                </span>
                                </p>
diff --git a/portal/templates/smartfire/smartfire_slice_request_denied.html b/portal/templates/smartfire/smartfire_slice_request_denied.html
new file mode 100644 (file)
index 0000000..082f4f3
--- /dev/null
@@ -0,0 +1,17 @@
+<img src="{{ STATIC_URL }}img/SmartFIRE_logo.png">
+<br>
+<p>Dear SmartFIRE user,</p>
+<p></p>
+<p>You have recently requested the following slice on the SmartFIRE portal({{portal_url}}):</p> 
+<br>
+<b>Slice name   :</b> {{slice_name}}<br>
+<b>URL          :</b> {{url}}<br>
+<b>Purpose      :</b> {{purpose}}<br>
+<br>
+<p>We regret to inform you that, a manager of your institution has not confirmed 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>On behalf of the entire team, I wish you a fruitful user experience on SmartFIRE.</p>
+<br>
+<p>Yours sincerely,</p>
+<p>The SmartFIRE team</p>
diff --git a/portal/templates/smartfire/smartfire_slice_request_denied.txt b/portal/templates/smartfire/smartfire_slice_request_denied.txt
new file mode 100644 (file)
index 0000000..367be5d
--- /dev/null
@@ -0,0 +1,14 @@
+Dear SmartFIRE user,
+
+You have recently requested the following slice on the SmartFIRE portal({{portal_url}}):
+
+Slice name   : {{slice_name}}
+URL          : {{url}}
+Purpose      : {{purpose}}
+We regret to inform you that, a manager of your institution has not confirmed your request. Please contact the manager of your institution for further information. For any other queries, please contact us by replying to this email.
+
+On behalf of the entire team, I wish you a fruitful user experience on SmartFIRE.
+
+Yours sincerely,
+The SmartFIRE team
diff --git a/portal/templates/smartfire/smartfire_slice_request_email_subject.txt b/portal/templates/smartfire/smartfire_slice_request_email_subject.txt
new file mode 100644 (file)
index 0000000..e3988df
--- /dev/null
@@ -0,0 +1 @@
+Slice request submitted 
diff --git a/portal/templates/smartfire/smartfire_slice_request_validated.html b/portal/templates/smartfire/smartfire_slice_request_validated.html
new file mode 100644 (file)
index 0000000..ce4855f
--- /dev/null
@@ -0,0 +1,21 @@
+<img src="{{ STATIC_URL }}img/SmartFIRE_logo.png">
+<br>
+<p>Dear SmartFIRE user,</p>
+<p></p>
+<p>You have recently requested a slice in the SmartFIRE portal.</p>
+<br>
+<b>Slice name   :</b> {{slice_name}}<br>
+<b>URL          :</b> {{number_of_nodes}}<br>
+<b>Purpose      :</b> {{purpose}}<br>
+<p></p>
+<p>
+       We are pleased to inform you that a manager from your institution has validated your slice request on the SmartFIRE portal. 
+       You can now add resources to you slice and start experimenting.
+</p>
+<p></p>
+<p>On behalf of the entire team, I wish you a fruitful user experience with the SmartFIRE portal.</p>
+<p></p>
+<p>Yours sincerely,</p>
+<p>The SmartFIRE team</p>
+
+
diff --git a/portal/templates/smartfire/smartfire_slice_request_validated.txt b/portal/templates/smartfire/smartfire_slice_request_validated.txt
new file mode 100644 (file)
index 0000000..977b545
--- /dev/null
@@ -0,0 +1,16 @@
+Dear SmartFIRE user,
+
+You have recently requested a slice in the SmartFIRE portal.
+
+Slice name      : {{slice_name}}
+URL             : {{number_of_nodes}}
+Purpose         : {{purpose}}
+
+
+We are pleased to inform you that a manager from your institution has validated your slice request on the SmartFIRE portal. You can now add resources to you slice and start experimenting.
+
+On behalf of the entire team, I wish you a fruitful user experience with the SmartFIRE portal.
+
+Yours sincerely,
+The SmartFIRE team
+
diff --git a/portal/templates/smartfire/smartfire_user_request_denied.html b/portal/templates/smartfire/smartfire_user_request_denied.html
new file mode 100644 (file)
index 0000000..7620c37
--- /dev/null
@@ -0,0 +1,11 @@
+<img src="{{ STATIC_URL }}img/SmartFIRE_logo.png">
+<br>
+<p>Dear {{first_name}} {{last_name}},</p>
+<p></p>
+<p>You have recently registered as a user to SmartFIRE portal. We are sorry 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, contact us by replying to this email.</p>
+<p></p>
+<p>On behalf of the entire team, I wish you all the best.</p>
+<p></p>
+<p>Yours sincerely,</p>
+<p>The SmartFIRE team</p>
+
diff --git a/portal/templates/smartfire/smartfire_user_request_denied.txt b/portal/templates/smartfire/smartfire_user_request_denied.txt
new file mode 100644 (file)
index 0000000..c30d5b2
--- /dev/null
@@ -0,0 +1,8 @@
+Dear {{first_name}} {{last_name}},
+
+You have recently registered as a user to SmartFIRE portal. We are sorry 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, contact us by replying to this email.
+
+On behalf of the entire team, I wish you all the best.
+
+Yours sincerely,
+The SmartFIRE team
diff --git a/portal/templates/smartfire/smartfire_user_request_email.html b/portal/templates/smartfire/smartfire_user_request_email.html
new file mode 100644 (file)
index 0000000..14add2d
--- /dev/null
@@ -0,0 +1,16 @@
+<img src="{{ STATIC_URL }}img/SmartFIRE_logo.png">
+<br>
+<h1>NEW USER REQUEST</h1>
+<br>
+<b>First name   :</b> {{first_name}}<br>
+<b>Last name    :</b> {{last_name}}<br>
+<b>Organization :</b> {{organization}}<br>
+<b>Authority hrn:</b> {{authority_hrn}}<br>
+<b>Public key   :</b> {{public_key}}<br>
+<b>Email        :</b> {{email}}<br>
+<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>
+<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/smartfire/smartfire_user_request_email.txt b/portal/templates/smartfire/smartfire_user_request_email.txt
new file mode 100644 (file)
index 0000000..17ce184
--- /dev/null
@@ -0,0 +1,14 @@
+NEW USER REQUEST
+
+First name   : {{first_name}}
+Last name    : {{last_name}} 
+Organization :{{organization}}
+Authority hrn: {{authority_hrn}}
+Public key   : {{public_key}}
+Email        : {{email}}
+User hrn     : {{user_hrn}}
+Portal url   : {{ current_site }}
+
+Please note that the validation request will only become visible once the user has confirmed his/her email address.
+
+
diff --git a/portal/templates/smartfire/smartfire_user_request_email_subject.txt b/portal/templates/smartfire/smartfire_user_request_email_subject.txt
new file mode 100644 (file)
index 0000000..a373b60
--- /dev/null
@@ -0,0 +1 @@
+User request submitted
diff --git a/portal/templates/smartfire/smartfire_user_request_validated.html b/portal/templates/smartfire/smartfire_user_request_validated.html
new file mode 100644 (file)
index 0000000..e200609
--- /dev/null
@@ -0,0 +1,14 @@
+<img src="{{ STATIC_URL }}img/SmartFIRE_logo.png">
+<br>
+<p>Dear {{first_name}} {{last_name}},</p>
+<p></p>
+<p>It is my pleasure to welcome you as a fully signed-up user of the SmartFIRE experimental facility. SmartFIRE provides you with access to world class computer networking testbeds, such as IoT-LAB, NITOS, and PlanetLab Europe. Our aim at SmartFIRE is to promote the use of these testbeds for pre-commercial research and development by industry, for scientific research, and for university level laboratory exercises.</p>
+<p></p>
+</p>
+Your entry point for access to the testbeds is the SmartFIRE portal, which provides a web-based interface for browsing and reserving resources on the various testbeds. To run an experiment using those resources, you may log in to the testbed and/or individual nodes on the testbed with your SmartFIRE public/private key pair, or you may use an experiment control tool such as as NEPI or OMF. The SmartFIRE  operations team is standing by at support@onelab.eu to provide you with help regarding the portal and to refer your testbed- and tool-specific queries to those best able to answer them.
+</p>
+<p></p>
+</p>On behalf of the entire team, I wish you a fruitful user experience with the SmartFIRE portal.</p>
+<p></p>
+<p>Yours sincerely,</p>
+<p>The SmartFIRE team</p>
diff --git a/portal/templates/smartfire/smartfire_user_request_validated.txt b/portal/templates/smartfire/smartfire_user_request_validated.txt
new file mode 100644 (file)
index 0000000..936c453
--- /dev/null
@@ -0,0 +1,10 @@
+Dear {{first_name}} {{last_name}},
+
+It is my pleasure to welcome you as a fully signed-up user of the SmartFIRE experimental facility. SmartFIRE provides you with access to world class computer networking testbeds, such as IoT-LAB, NITOS, and PlanetLab Europe. Our aim at SmartFIRE is to promote the use of these testbeds for pre-commercial research and development by industry, for scientific research, and for university level laboratory exercises.
+
+Your entry point for access to the testbeds is the SmartFIRE portal, which provides a web-based interface for browsing and reserving resources on the various testbeds. To run an experiment using those resources, you may log in to the testbed and/or to individual nodes on the testbed with your SmartFIRE public/private key pair, or you may use an experiment control tool such as as NEPI or OMF. The SmartFIRE operations team is standing by at support@onelab.eu to provide you with help regarding the portal and to refer your testbed- and tool-specific queries to those best able to answer them.
+
+On behalf of the entire team, I wish you a fruitful user experience with the SmartFIRE portal.
+
+Yours sincerely,
+The SmartFIRE team
diff --git a/portal/templates/user_register_email.txt b/portal/templates/user_register_email.txt
deleted file mode 100644 (file)
index dc34c21..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-Your have registered for an account in {{site}}.
-
-Your activation key is :{{activation_key}}; it will expire in {{expiration_days}} days.
-
diff --git a/portal/templates/user_register_email_subject.txt b/portal/templates/user_register_email_subject.txt
deleted file mode 100644 (file)
index 6ec4cc2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-Onelab New User request submitted