From 36877d613dd43293aa1d0d08ba395f28af388ff3 Mon Sep 17 00:00:00 2001
From: Mondi Geetha <mondi.geetha@gmail.com>
Date: Sat, 1 Jul 2017 17:58:42 +0530
Subject: [PATCH 1/9] Added styles for proper positioning of error msgs

---
 .../datacenterlight/css/landing-page.css      | 38 +++++++++++--------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css
index bcfa3f83..bf71eff1 100755
--- a/datacenterlight/static/datacenterlight/css/landing-page.css
+++ b/datacenterlight/static/datacenterlight/css/landing-page.css
@@ -430,7 +430,6 @@ h6 {
 }
 .pricing-section .card .description{
     padding: 12px;
-    border-bottom: 1px solid rgba(128, 128, 128, 0.3);
 }
 .pricing-section .card .descriptions{
     padding: 10px 30px;
@@ -646,11 +645,10 @@ h6 {
 }
 .price-calc-section .card .description{
     padding: 12px;
-    border-bottom: 1px solid rgba(128, 128, 128, 0.3);
     position: relative;
     display: flex;
-    justify-content: space-around;
-    align-items: center;
+    justify-content: space-around !important;
+    align-items: center !important;
 }
 
 .price-calc-section .card .description span {
@@ -661,10 +659,10 @@ h6 {
     width: 30%;
     text-align: left;
 }
-.price-calc-section .card .description input{
-   font-size: 20px;
-    text-align: center;
-    width: 60px;
+.price-calc-section .card .description .select-number{
+	font-size: 20px;
+	text-align: center;
+	width: 60px;
 }
 .price-calc-section .card .description i{
     color: #29427A;
@@ -701,8 +699,8 @@ h6 {
 .price-calc-section .card .check-ip{
     font-size: 18px;
 }
-.price-calc-section .card .description.input{
-    justify-content: center;
+.price-calc-section .card .justify-center{
+    justify-content: center !important;
 }
 .price-calc-section .card .description.input label{
     font-size: 15px;
@@ -711,10 +709,11 @@ h6 {
     margin-bottom: 0;
     width: 40px;
 }
-.price-calc-section .card .description.input input{
-     width: 200px;
-    font-size: 14px;
-    text-align: left;
+/*Changed class****.price-calc-section .card .description.input input*/
+.price-calc-section .card .description input{
+	width: 200px;
+	font-size: 14px;
+	text-align: left;
     padding: 5px 10px;
     border-radius: 4px;
     border: 1px solid #d0d0d0;
@@ -726,6 +725,15 @@ h6 {
     font-size: 17px;
     margin: 0 8px;
 }
+.help-block.with-errors {
+    text-align: center;
+    margin: 0;
+    padding: 0;
+}
+.form-group {
+    margin: 0;
+    border-bottom: 1px solid rgba(128, 128, 128, 0.3);
+}
 
 @media(max-width:990px) {
     .pricing-section .text {
@@ -911,7 +919,7 @@ h6 {
         text-align: center;
     }
 
-    .price-calc-section .card .description input {
+    .price-calc-section .card .description .select-number{
         font-size: 17px;
         text-align: center;
         width: 60px;

From afcec7eb0308dfdb9321d716210a96d237cc042e Mon Sep 17 00:00:00 2001
From: Mondi Geetha <mondi.geetha@gmail.com>
Date: Sat, 1 Jul 2017 17:59:34 +0530
Subject: [PATCH 2/9] Removed unwanted code and add bootstrap-validator cdn js

---
 .../templates/datacenterlight/base.html       | 50 +------------------
 1 file changed, 1 insertion(+), 49 deletions(-)

diff --git a/datacenterlight/templates/datacenterlight/base.html b/datacenterlight/templates/datacenterlight/base.html
index c62d92f7..becb36d8 100644
--- a/datacenterlight/templates/datacenterlight/base.html
+++ b/datacenterlight/templates/datacenterlight/base.html
@@ -60,53 +60,5 @@
     <script src="{% static 'datacenterlight/js/form.js' %}"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jquery-validate/1.16.0/jquery.validate.min.js"></script>
-    
-    <script src="//cdnjs.cloudflare.com/ajax/libs/bootstrap-select/1.5.4/bootstrap-select.js"></script>
-    
-    <script type="text/javascript">
-           $(document).ready(function(){
-               $.validator.setDefaults({
-                   ignore: []
-               });
-
-               var name_message = "{% trans 'Please enter your name' %}";
-               var email_message = "{% trans 'Please enter a valid email address' %}";
-               $('#order_form').validate({
-                   wrapper: 'div',
-                   errorLabelContainer: "#error_message_box",
-                   rules: {
-                       name: {
-                           required: true,
-                           minlength: 3
-                       },
-                       email: {
-                           required: true,
-                           email: true
-                       }
-                   },
-                   messages: {
-                       name: name_message,
-                       email: email_message
-                   },
-                   submitHandler: function (form) {
-                       return true;
-                   }
-               });
-           });
-
-          // window.onload=function(){
-          //   $('.selectpicker').selectpicker({
-          //        style: 'btn-link',
-          //        windowPadding: 10,
-          //   });
-
-          //   var hash = window.location.hash.substr(1);
-          //   console.log(hash);
-          //   if (hash == 'requestform'){
-          //       $('#reques-success-message').modal('show');
-          //   }
-
-          //  };
-    </script>
-
+    <script src="//cdnjs.cloudflare.com/ajax/libs/1000hz-bootstrap-validator/0.11.9/validator.min.js"></script>
 </html>

From e4cfcbf618d28526d9c1f4216d6a0fd77e05354a Mon Sep 17 00:00:00 2001
From: Mondi Geetha <mondi.geetha@gmail.com>
Date: Sat, 1 Jul 2017 18:01:08 +0530
Subject: [PATCH 3/9] Added some classes and divs for error msg alignment
 alongside the input field

---
 .../templates/datacenterlight/index.html      | 70 +++++++++++++------
 1 file changed, 49 insertions(+), 21 deletions(-)

diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html
index 6d63b29b..b05f617a 100755
--- a/datacenterlight/templates/datacenterlight/index.html
+++ b/datacenterlight/templates/datacenterlight/index.html
@@ -139,7 +139,7 @@
                         <div class="landing card">
                             <img class="img-beta" src="{% static 'datacenterlight/img/beta-img.png' %}" alt="">
                             <div class="caption">
-                                <form id="order_form" method="POST" action="">
+                                <form id="order_form" method="POST" action="" data-toggle="validator" role="form" data-disable="false">
                                     {% csrf_token %}
                                     <div class="title">
                                        <h3>{% trans "VM hosting" %} </h3>
@@ -152,28 +152,37 @@
                                         </div>
                                     </div>
                                     <div class="descriptions">
-                                        <div class="description">
+                                        <div class="description form-group">
                                             <p>{% trans "Hosted in Switzerland" %}</p>
                                         </div>
-                                        <div class="description">
+                                        <div class="form-group">
+                                            <div class="description input">
                                             <i class="fa fa-minus-circle left" data-minus="cpu" aria-hidden="true"></i>
-                                            <input class="input-price" type="number"  min="1" max="42" id="coreValue" name="cpu">
+                                            <input class="input-price select-number" type="number"  min="1" max="42" id="coreValue" name="cpu" data-error="{% trans 'Please enter a value greater than or equal to 1.' %}" required>
                                             <span> Core</span>
                                             <i class="fa fa-plus-circle right" data-plus="cpu"  aria-hidden="true"></i>
+                                            </div>
+                                            <div class="help-block with-errors"></div>
                                         </div>
-                                        <div class="description">
+                                        <div class="form-group">
+                                            <div class="description input">
                                             <i class="fa fa-minus-circle left" data-minus="ram" aria-hidden="true"></i>
-                                            <input id="ramValue" class="input-price" type="number"  min="2" max="200"  name="ram">
+                                            <input id="ramValue" class="input-price select-number" type="number"  min="2" max="200"  name="ram" data-error="{% trans 'Please enter a value greater than or equal to 2.' %}" required>
                                             <span> GB RAM</span>
                                             <i class="fa fa-plus-circle right" data-plus="ram"  aria-hidden="true"></i>
+                                            </div>
+                                            <div class="help-block with-errors"></div>
                                         </div>
-                                        <div class="description">
+                                        <div class="form-group">
+                                            <div class="description input">
                                             <i class="fa fa-minus-circle left" data-minus="storage" aria-hidden="true"></i>
-                                            <input id="storageValue" class="input-price" type="number"  min="10" max="500" step="10" name="storage">
+                                            <input id="storageValue" class="input-price select-number" type="number"  min="10" max="500" step="10" name="storage" data-error="{% trans 'Please enter a value greater than or equal to 10.' %}" required>
                                             <span>{% trans "GB Storage (SSD)" %}</span>
                                             <i class="fa fa-plus-circle right" data-plus="storage"  aria-hidden="true"></i>
+                                            </div>
+                                            <div class="help-block with-errors"></div>
                                         </div>
-                                        <div class="description select-configuration input">
+                                        <div class="description select-configuration input form-group justify-center">
                                             <label for="config">OS</label>
                                             <select name="config" id="">
                                                 {% for template in templates %}
@@ -185,21 +194,40 @@
                                         <!--<div class="description check-ip">
                                             <input type="checkbox" name="ipv6"> Ipv6 Only<br>
                                         </div>-->
-                                        <div class="description input">
-                                            <label for="name">{% trans "Name"%}</label>
-                                            <input type="text" name="name" placeholder="{% trans "Your Name" %}">
-                                        </div>
-                                        <div class="description input">
-                                            <label for="email">{% trans "Email" %}</label>
-                                            <input type="email" name="email" placeholder="{% trans "Your Email" %}">
-                                        </div>
+                                            <div class="form-group">
+                                                <div class="description input justify-center">
+                                                <label for="name" class="control-label">{% trans "Name"%}</label>
+                                                <input type="text" name="name" class="form-control" placeholder="{% trans 'Your Name'%}" data-error="{% trans 'Please enter your name' %}" required>
+                                                </div>
+                                                <div class="help-block with-errors">
+                                                    {% for message in messages %}
+                                                        {% if 'name' in message.tags %}
+                                                        <ul class="list-unstyled"><li>
+                                                            {{ message|safe }}
+                                                        </li></ul>
+                                                        {% endif %}
+                                                    {% endfor %}
+                                                </div>
+                                            </div>
+                                            <div class="form-group">
+                                                <div class="description input justify-center">
+                                                <label for="email" class="control-label">Email</label>
+                                                <input name="email" type="email" pattern="^[^@\s]+@([^@\s]+\.)+[^@\s]+$" class="form-control" placeholder="{% trans 'Your Email' %}" data-error="{% trans 'Please enter a valid email address' %}" required>
+                                                </div>
+                                                <div class="help-block with-errors">
+                                                    {% for message in messages %}
+                                                        {% if 'email' in message.tags %}
+                                                         <ul class="list-unstyled"><li>
+                                                            {{ message|safe }}
+                                                        </li></ul>
+                                                        {% endif %}
+                                                    {% endfor %}
+                                                </div>
+                                            </div>
                                     </div>
                                     <input type="submit" class="btn btn-primary" value="{% trans 'Order Now!' %}"></input>
                                 </form>
                             </div>
-                            <div>
-                                <div id="error_message_box" class="error-message-box"></div>
-                            </div>
                         </div>
                     </div>
 
@@ -250,4 +278,4 @@
         
     </div>
     <!-- /.banner -->
-    {% endblock %}
\ No newline at end of file
+    {% endblock %}

From 0c969946f7ee6a3e8ff999d23920a3c00cd8d0cb Mon Sep 17 00:00:00 2001
From: Mondi Geetha <mondi.geetha@gmail.com>
Date: Sat, 1 Jul 2017 18:02:10 +0530
Subject: [PATCH 4/9] Added code for proper return when name/email are not good

---
 datacenterlight/views.py | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/datacenterlight/views.py b/datacenterlight/views.py
index 07709981..b7c08a63 100644
--- a/datacenterlight/views.py
+++ b/datacenterlight/views.py
@@ -12,6 +12,7 @@ from django import forms
 from django.core.exceptions import ValidationError
 from django.views.decorators.cache import cache_control
 from django.conf import settings
+from django.utils.translation import ugettext_lazy as _
 from utils.forms import BillingAddressForm, UserBillingAddressForm
 from utils.models import BillingAddress
 from membership.models import StripeCustomer
@@ -194,12 +195,9 @@ class IndexView(CreateView):
     
     @cache_control(no_cache=True, must_revalidate=True, no_store=True)
     def get(self, request, *args, **kwargs):
-        if 'specs' in request.session :
-            del request.session['specs']
-        if 'user' in request.session :
-            del request.session['user']
-        if 'billing_address_data' in request.session :
-            del request.session['billing_address_data']
+        for session_var in ['specs', 'user', 'billing_address_data']:
+            if session_var in request.session:
+                del request.session[session_var]
         try:
             manager = OpenNebulaManager()
             templates = manager.get_templates()
@@ -233,14 +231,16 @@ class IndexView(CreateView):
         try:
             name = name_field.clean(name)
         except ValidationError as err:
-            messages.add_message(self.request, messages.ERROR, '%(value) is not a proper name.'.format(name))
-            return HttpResponseRedirect(reverse('datacenterlight:index'))
+            msg='{} {}.'.format(name, _('is not a proper name'))
+            messages.add_message(self.request, messages.ERROR, msg, extra_tags='name')
+            return HttpResponseRedirect(reverse('datacenterlight:index') + "#order_form")
 
         try:    
             email = email_field.clean(email)
         except ValidationError as err:
-            messages.add_message(self.request, messages.ERROR, '%(value) is not a proper email.'.format(email))
-            return HttpResponseRedirect(reverse('datacenterlight:index'))
+            msg='{} {}.'.format(email, _('is not a proper email'))
+            messages.add_message(self.request, messages.ERROR, msg, extra_tags='email')
+            return HttpResponseRedirect(reverse('datacenterlight:index') + "#order_form")
 
         specs = {
             'cpu': cores,

From 0a2b2c815de27157dc85b70736b54dc4de663238 Mon Sep 17 00:00:00 2001
From: Mondi Geetha <mondi.geetha@gmail.com>
Date: Sun, 2 Jul 2017 02:14:18 +0530
Subject: [PATCH 5/9] Aligned Logo, Text, Signature to left

---
 .../emails/request_access_confirmation.html               | 8 ++++----
 .../emails/request_access_notification.html               | 8 ++++----
 .../emails/request_beta_access_notification.html          | 8 ++++----
 .../templates/datacenterlight/emails/user_activation.html | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html b/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html
index e96a8ef1..2f71944f 100644
--- a/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html
+++ b/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html
@@ -74,7 +74,7 @@
             <![endif]-->
               <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
                 <table cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 10px;" align="left" valign="middle">
+<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 0px;" align="left" valign="middle">
                       <a href="{{base_url}}" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; color: #676767; text-decoration: none !important;"><img width="137" src="{{base_url}}{% static 'datacenterlight/img/datacenterlight.png' %}" alt="logo" style="max-width: 600px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; border: none;"></a>
                     </td>
                     <td class="pull-right mobile-header-padding-right" style="color: #4d4d4d; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;" align="right">
@@ -95,12 +95,12 @@
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5 0;" align="center">
+<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5px 0px;" align="center">
               {% trans "Thank you for your request." %}
             </td>
           </tr>
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 7px 20px;" align="center">
+<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 5px 20px;" align="center">
              <p>{% trans "You are one step away from being our beta tester!" %}  <br/><br/> 
                {% trans "Currently we are running our tests to make sure everything runs perfectly." %}<br/>
              {% trans "In the meantime, we would like to ask you a little patience<br/> until our team contacts you with beta access." %}<br/>
@@ -117,7 +117,7 @@
 <td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;" bgcolor="#ffffff">
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 5px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 </td>
           </tr></table>
 </center>
diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_notification.html b/datacenterlight/templates/datacenterlight/emails/request_access_notification.html
index 09531ba6..095c917e 100644
--- a/datacenterlight/templates/datacenterlight/emails/request_access_notification.html
+++ b/datacenterlight/templates/datacenterlight/emails/request_access_notification.html
@@ -73,7 +73,7 @@
             <![endif]-->
               <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
                 <table cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 10px;" align="left" valign="middle">
+<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 0px;" align="left" valign="middle">
                       <a href="{{base_url}}" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; color: #676767; text-decoration: none !important;"><img width="137" src="{{base_url}}{% static 'datacenterlight/img/datacenterlight.png' %}" alt="logo" style="max-width: 600px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; border: none;"></a>
                     </td>
                     <td class="pull-right mobile-header-padding-right" style="color: #4d4d4d; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;" align="right">
@@ -94,12 +94,12 @@
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5 0;" align="center">
+<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5px 0px;" align="center">
               An user requested a beta access
             </td>
           </tr>
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 7px 20px;" align="center">
+<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 5px 20px;" align="center">
              <p>User {{email}} requested beta access         </p></td>
           </tr>
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
@@ -113,7 +113,7 @@
 <td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;" bgcolor="#ffffff">
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 5px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 </td>
           </tr></table>
 </center>
diff --git a/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html b/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html
index 7991eb69..c6f3033e 100644
--- a/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html
+++ b/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html
@@ -73,7 +73,7 @@
             <![endif]-->
               <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
                 <table cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 10px;" align="left" valign="middle">
+<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 0px;" align="left" valign="middle">
                       <a href="{{base_url}}" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; color: #676767; text-decoration: none !important;"><img width="137" src="{{base_url}}{% static 'datacenterlight/img/datacenterlight.png' %}" alt="logo" style="max-width: 600px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; border: none;"></a>
                     </td>
                     <td class="pull-right mobile-header-padding-right" style="color: #4d4d4d; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;" align="right">
@@ -94,14 +94,14 @@
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5 0;" align="center">
+<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5px 0px;" align="center">
               An user requested a beta access
 
 
             </td>
           </tr>
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 7px 20px;" align="center">
+<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 5px 20px;" align="center">
              <p>User {{email}} requested beta access         </p>
              {% for vm in vms %}
                 Type: {{vm.type}} - Amount: {{vm.amount}}
@@ -119,7 +119,7 @@
 <td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;" bgcolor="#ffffff">
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 5px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 </td>
           </tr></table>
 </center>
diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.html b/datacenterlight/templates/datacenterlight/emails/user_activation.html
index bf688127..e591fc54 100644
--- a/datacenterlight/templates/datacenterlight/emails/user_activation.html
+++ b/datacenterlight/templates/datacenterlight/emails/user_activation.html
@@ -74,7 +74,7 @@
             <![endif]-->
               <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
                 <table cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 10px;" align="left" valign="middle">
+<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px;" align="left" valign="middle">
                       <a href="{{base_url}}" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; color: #676767; text-decoration: none !important;"><img width="137" src="{{base_url}}{% static 'datacenterlight/img/datacenterlight.png' %}" alt="logo" style="max-width: 600px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; border: none;"></a>
                     </td>
                     <td class="pull-right mobile-header-padding-right" style="color: #4d4d4d; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;" align="right">
@@ -95,12 +95,12 @@
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5 0;" align="center">
+<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5px 0px;" align="center">
               {{dcl_text}} {% trans 'account activation' %}
             </td>
           </tr>
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 7px 20px;" align="center">
+<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 5px 20px;" align="center">
              <p>
                 {% blocktrans %}
                 You can activate your {{dcl_text}} account by <a href="{{base_url}}{{activation_link}}">clicking here</a>.<br/><br/>
@@ -120,7 +120,7 @@
 <td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;" bgcolor="#ffffff">
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">{% trans 'Your' %} {{dcl_text}} {% trans 'team' %}<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 5px 0px;text-align: left; line-height: 21px;;" align="left">{% trans 'Your' %} {{dcl_text}} {% trans 'team' %}<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 </td>
           </tr></table>
 </center>

From f48ea4714e7ba8036e46c6f7a13170c3df76e250 Mon Sep 17 00:00:00 2001
From: Mondi Geetha <mondi.geetha@gmail.com>
Date: Sun, 2 Jul 2017 18:34:17 +0530
Subject: [PATCH 6/9] changed error message color

---
 datacenterlight/static/datacenterlight/css/landing-page.css | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/datacenterlight/static/datacenterlight/css/landing-page.css b/datacenterlight/static/datacenterlight/css/landing-page.css
index bf71eff1..d943a8e9 100755
--- a/datacenterlight/static/datacenterlight/css/landing-page.css
+++ b/datacenterlight/static/datacenterlight/css/landing-page.css
@@ -730,6 +730,9 @@ h6 {
     margin: 0;
     padding: 0;
 }
+.has-error .checkbox, .has-error .checkbox-inline, .has-error .control-label, .has-error .help-block, .has-error .radio, .has-error .radio-inline, .has-error.checkbox label, .has-error.checkbox-inline label, .has-error.radio label, .has-error.radio-inline label{
+color: #eb4d5c;
+}
 .form-group {
     margin: 0;
     border-bottom: 1px solid rgba(128, 128, 128, 0.3);

From fd856d7613d3db5c5eba45a01c5c7b73ba9fac71 Mon Sep 17 00:00:00 2001
From: Mondi Geetha <mondi.geetha@gmail.com>
Date: Sun, 2 Jul 2017 20:55:08 +0530
Subject: [PATCH 7/9] Reverted back email templates as they are part of another
 PR

---
 .../emails/request_access_confirmation.html               | 8 ++++----
 .../emails/request_access_notification.html               | 8 ++++----
 .../emails/request_beta_access_notification.html          | 8 ++++----
 .../templates/datacenterlight/emails/user_activation.html | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html b/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html
index 2f71944f..e96a8ef1 100644
--- a/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html
+++ b/datacenterlight/templates/datacenterlight/emails/request_access_confirmation.html
@@ -74,7 +74,7 @@
             <![endif]-->
               <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
                 <table cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 0px;" align="left" valign="middle">
+<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 10px;" align="left" valign="middle">
                       <a href="{{base_url}}" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; color: #676767; text-decoration: none !important;"><img width="137" src="{{base_url}}{% static 'datacenterlight/img/datacenterlight.png' %}" alt="logo" style="max-width: 600px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; border: none;"></a>
                     </td>
                     <td class="pull-right mobile-header-padding-right" style="color: #4d4d4d; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;" align="right">
@@ -95,12 +95,12 @@
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5px 0px;" align="center">
+<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5 0;" align="center">
               {% trans "Thank you for your request." %}
             </td>
           </tr>
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 5px 20px;" align="center">
+<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 7px 20px;" align="center">
              <p>{% trans "You are one step away from being our beta tester!" %}  <br/><br/> 
                {% trans "Currently we are running our tests to make sure everything runs perfectly." %}<br/>
              {% trans "In the meantime, we would like to ask you a little patience<br/> until our team contacts you with beta access." %}<br/>
@@ -117,7 +117,7 @@
 <td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;" bgcolor="#ffffff">
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 5px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 </td>
           </tr></table>
 </center>
diff --git a/datacenterlight/templates/datacenterlight/emails/request_access_notification.html b/datacenterlight/templates/datacenterlight/emails/request_access_notification.html
index 095c917e..09531ba6 100644
--- a/datacenterlight/templates/datacenterlight/emails/request_access_notification.html
+++ b/datacenterlight/templates/datacenterlight/emails/request_access_notification.html
@@ -73,7 +73,7 @@
             <![endif]-->
               <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
                 <table cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 0px;" align="left" valign="middle">
+<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 10px;" align="left" valign="middle">
                       <a href="{{base_url}}" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; color: #676767; text-decoration: none !important;"><img width="137" src="{{base_url}}{% static 'datacenterlight/img/datacenterlight.png' %}" alt="logo" style="max-width: 600px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; border: none;"></a>
                     </td>
                     <td class="pull-right mobile-header-padding-right" style="color: #4d4d4d; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;" align="right">
@@ -94,12 +94,12 @@
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5px 0px;" align="center">
+<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5 0;" align="center">
               An user requested a beta access
             </td>
           </tr>
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 5px 20px;" align="center">
+<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 7px 20px;" align="center">
              <p>User {{email}} requested beta access         </p></td>
           </tr>
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
@@ -113,7 +113,7 @@
 <td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;" bgcolor="#ffffff">
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 5px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 </td>
           </tr></table>
 </center>
diff --git a/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html b/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html
index c6f3033e..7991eb69 100644
--- a/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html
+++ b/datacenterlight/templates/datacenterlight/emails/request_beta_access_notification.html
@@ -73,7 +73,7 @@
             <![endif]-->
               <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
                 <table cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 0px;" align="left" valign="middle">
+<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 10px;" align="left" valign="middle">
                       <a href="{{base_url}}" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; color: #676767; text-decoration: none !important;"><img width="137" src="{{base_url}}{% static 'datacenterlight/img/datacenterlight.png' %}" alt="logo" style="max-width: 600px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; border: none;"></a>
                     </td>
                     <td class="pull-right mobile-header-padding-right" style="color: #4d4d4d; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;" align="right">
@@ -94,14 +94,14 @@
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5px 0px;" align="center">
+<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5 0;" align="center">
               An user requested a beta access
 
 
             </td>
           </tr>
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 5px 20px;" align="center">
+<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 7px 20px;" align="center">
              <p>User {{email}} requested beta access         </p>
              {% for vm in vms %}
                 Type: {{vm.type}} - Amount: {{vm.amount}}
@@ -119,7 +119,7 @@
 <td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;" bgcolor="#ffffff">
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 5px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">Your data center light team<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 </td>
           </tr></table>
 </center>
diff --git a/datacenterlight/templates/datacenterlight/emails/user_activation.html b/datacenterlight/templates/datacenterlight/emails/user_activation.html
index e591fc54..bf688127 100644
--- a/datacenterlight/templates/datacenterlight/emails/user_activation.html
+++ b/datacenterlight/templates/datacenterlight/emails/user_activation.html
@@ -74,7 +74,7 @@
             <![endif]-->
               <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
                 <table cellpadding="0" cellspacing="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px;" align="left" valign="middle">
+<td class="pull-left mobile-header-padding-left" style="vertical-align: middle; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 290px; padding-left: 10px;" align="left" valign="middle">
                       <a href="{{base_url}}" style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; color: #676767; text-decoration: none !important;"><img width="137" src="{{base_url}}{% static 'datacenterlight/img/datacenterlight.png' %}" alt="logo" style="max-width: 600px; outline: none; text-decoration: none; -ms-interpolation-mode: bicubic; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; border: none;"></a>
                     </td>
                     <td class="pull-right mobile-header-padding-right" style="color: #4d4d4d; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;" align="right">
@@ -95,12 +95,12 @@
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5px 0px;" align="center">
+<td class="header-lg" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5 0;" align="center">
               {{dcl_text}} {% trans 'account activation' %}
             </td>
           </tr>
 <tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 5px 20px;" align="center">
+<td class="free-text" style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 7px 20px;" align="center">
              <p>
                 {% blocktrans %}
                 You can activate your {{dcl_text}} account by <a href="{{base_url}}{{activation_link}}">clicking here</a>.<br/><br/>
@@ -120,7 +120,7 @@
 <td align="center" valign="top" width="100%" style="height: 100px; border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;" bgcolor="#ffffff">
       <center style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
         <table cellspacing="0" cellpadding="0" width="600" class="w320" style="border-collapse: collapse !important; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;"><tr style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
-<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 5px 0px;text-align: left; line-height: 21px;;" align="left">{% trans 'Your' %} {{dcl_text}} {% trans 'team' %}<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
+<td style="border-collapse: collapse; font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important; font-size: 14px; font-weight: 600; color: #7293de; padding: 25px 9px 0px;text-align: left; line-height: 21px;;" align="left">{% trans 'Your' %} {{dcl_text}} {% trans 'team' %}<br style="font-family: 'Raleway', 'Helvetica Neue', 'Arial', 'sans-serif' !important;">
 </td>
           </tr></table>
 </center>

From 5b6a0691379a7c259d80f9f895d262b54475a220 Mon Sep 17 00:00:00 2001
From: Mondi Geetha <mondi.geetha@gmail.com>
Date: Sun, 2 Jul 2017 23:16:19 +0530
Subject: [PATCH 8/9] Added DE translations for error messages

---
 .../locale/de/LC_MESSAGES/django.po           | 56 +++++++++++++------
 .../templates/datacenterlight/index.html      |  2 +-
 2 files changed, 39 insertions(+), 19 deletions(-)

diff --git a/datacenterlight/locale/de/LC_MESSAGES/django.po b/datacenterlight/locale/de/LC_MESSAGES/django.po
index 6eeb605b..a0c9a470 100644
--- a/datacenterlight/locale/de/LC_MESSAGES/django.po
+++ b/datacenterlight/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-07-01 02:15+0530\n"
+"POT-Creation-Date: 2017-07-02 23:08+0530\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,14 +18,6 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: templates/datacenterlight/base.html:72
-msgid "Please enter your name"
-msgstr "Bitte gib Deinen Namen ein"
-
-#: templates/datacenterlight/base.html:73
-msgid "Please enter a valid email address"
-msgstr "Bitte gib eine gültige E-Mail-Adresse ein"
-
 #: templates/datacenterlight/beta_access.html:13
 msgid "Enter name"
 msgstr "Name"
@@ -264,41 +256,61 @@ msgstr "MwSt. inklusive"
 msgid "Hosted in Switzerland"
 msgstr "Standort: Schweiz"
 
-#: templates/datacenterlight/index.html:173
+#: templates/datacenterlight/index.html:161
+msgid "Please enter a value greater than or equal to 1."
+msgstr "Bitte gib einen Wert größer oder gleich 1 ein."
+
+#: templates/datacenterlight/index.html:170
+msgid "Please enter a value greater than or equal to 2."
+msgstr "Bitte gib einen Wert größer oder gleich 2 ein."
+
+#: templates/datacenterlight/index.html:179
+msgid "Please enter a value greater than or equal to 10."
+msgstr "Bitte gib einen Wert größer oder gleich 10 ein"
+
+#: templates/datacenterlight/index.html:180
 #: templates/datacenterlight/pricing.html:50
 msgid "GB Storage (SSD)"
 msgstr "GB Storage (SSD)"
 
-#: templates/datacenterlight/index.html:189
+#: templates/datacenterlight/index.html:199
 msgid "Name"
 msgstr ""
 
-#: templates/datacenterlight/index.html:190
+#: templates/datacenterlight/index.html:200
 msgid "Your Name"
 msgstr "Dein Name"
 
-#: templates/datacenterlight/index.html:193
+#: templates/datacenterlight/index.html:200
+msgid "Please enter your name"
+msgstr "Bitte gib Deinen Namen ein"
+
+#: templates/datacenterlight/index.html:214
 msgid "Email"
 msgstr "E-Mail-Adresse"
 
-#: templates/datacenterlight/index.html:194
+#: templates/datacenterlight/index.html:215
 msgid "Your Email"
 msgstr "Deine E-Mail"
 
-#: templates/datacenterlight/index.html:197
+#: templates/datacenterlight/index.html:215
+msgid "Please enter a valid email address"
+msgstr "Bitte gib eine gültige E-Mailadresse ein"
+
+#: templates/datacenterlight/index.html:228
 #: templates/datacenterlight/pricing.html:79
 msgid "Order Now!"
 msgstr "Bestelle jetzt!"
 
-#: templates/datacenterlight/index.html:226
+#: templates/datacenterlight/index.html:254
 msgid "Switzerland "
 msgstr "Schweiz"
 
-#: templates/datacenterlight/index.html:243
+#: templates/datacenterlight/index.html:271
 msgid "Questions?"
 msgstr "Fragen?"
 
-#: templates/datacenterlight/index.html:243
+#: templates/datacenterlight/index.html:271
 msgid "Contact us!"
 msgstr "Kontaktiere uns!"
 
@@ -380,6 +392,14 @@ msgstr ""
 msgid "as soon as possible!"
 msgstr ""
 
+#: views.py:234
+msgid "is not a proper name"
+msgstr "ist kein gültiger Name"
+
+#: views.py:241
+msgid "is not a proper email"
+msgstr "ist keine gültige E-Mailadresse"
+
 #~ msgid "Buy VM"
 #~ msgstr "VM Kaufen"
 
diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html
index b05f617a..31e02fb9 100755
--- a/datacenterlight/templates/datacenterlight/index.html
+++ b/datacenterlight/templates/datacenterlight/index.html
@@ -211,7 +211,7 @@
                                             </div>
                                             <div class="form-group">
                                                 <div class="description input justify-center">
-                                                <label for="email" class="control-label">Email</label>
+                                                <label for="email" class="control-label">{% trans "Email"%}</label>
                                                 <input name="email" type="email" pattern="^[^@\s]+@([^@\s]+\.)+[^@\s]+$" class="form-control" placeholder="{% trans 'Your Email' %}" data-error="{% trans 'Please enter a valid email address' %}" required>
                                                 </div>
                                                 <div class="help-block with-errors">

From 3a865bd01089612b3d44a324786d537afeae88cf Mon Sep 17 00:00:00 2001
From: Mondi Geetha <mondi.geetha@gmail.com>
Date: Sun, 2 Jul 2017 23:33:33 +0530
Subject: [PATCH 9/9] Increased minimum length of the name to 3

---
 datacenterlight/templates/datacenterlight/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/datacenterlight/templates/datacenterlight/index.html b/datacenterlight/templates/datacenterlight/index.html
index 31e02fb9..6807575d 100755
--- a/datacenterlight/templates/datacenterlight/index.html
+++ b/datacenterlight/templates/datacenterlight/index.html
@@ -197,7 +197,7 @@
                                             <div class="form-group">
                                                 <div class="description input justify-center">
                                                 <label for="name" class="control-label">{% trans "Name"%}</label>
-                                                <input type="text" name="name" class="form-control" placeholder="{% trans 'Your Name'%}" data-error="{% trans 'Please enter your name' %}" required>
+                                                <input type="text" name="name" class="form-control" placeholder="{% trans 'Your Name'%}" data-minlength="3" data-error="{% trans 'Please enter your name' %}" required>
                                                 </div>
                                                 <div class="help-block with-errors">
                                                     {% for message in messages %}