From c10dc9f2e294a8cf7343b86f0b8e51d12110d3a1 Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Sat, 24 Feb 2018 10:12:32 +0100
Subject: [PATCH 1/2] Remove some more beta access resources

---
 .../datacenterlight/beta_access.html          |  28 ---
 .../datacenterlight/beta_success.html         |  46 -----
 .../emails/base_email_datacenterlight.html    | 178 ------------------
 3 files changed, 252 deletions(-)
 delete mode 100644 datacenterlight/templates/datacenterlight/beta_access.html
 delete mode 100644 datacenterlight/templates/datacenterlight/beta_success.html
 delete mode 100644 datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html

diff --git a/datacenterlight/templates/datacenterlight/beta_access.html b/datacenterlight/templates/datacenterlight/beta_access.html
deleted file mode 100644
index d87692fb..00000000
--- a/datacenterlight/templates/datacenterlight/beta_access.html
+++ /dev/null
@@ -1,28 +0,0 @@
-{% load i18n %}
-<form novalidate id ="beta_access" class="form-beta" method="POST" action="{% url 'datacenterlight:beta_access'%}">
-  {% csrf_token %}
-  {{ form.non_field_errors }}
-  <div>
-	{% for message in messages %}
-		<strong>{{ message }}</strong>
-	{% endfor %}
-  </div>
- <div class="inputs">
-	 <div class="form-group">
-		<input type="text" name="name" class="form-control" id="name" placeholder="{% trans 'Enter name' %}">
-		<span style="color: white">{{ form.name.errors|striptags}}</span>
-	  </div>
-	  <div class="form-group">
-		<input type="email" name="email" class="form-control" id="email" placeholder="{% trans 'Enter email' %}">
-		<span style="color: white">{{ form.email.errors|striptags}}</span>
-	  </div>
- </div>
-  <button type="submit" class="btn btn-default btn-transparent btn-lg">{% trans "Request Beta Access" %}</button>
-</form>
-<script>
-  // use jquery form plugin for the below to work from
-  // https://github.com/jquery-form/form
-	$('#beta_access').ajaxForm({
-		target: '#beta_access_form', success: function(response) { }
-	});
-</script>
\ No newline at end of file
diff --git a/datacenterlight/templates/datacenterlight/beta_success.html b/datacenterlight/templates/datacenterlight/beta_success.html
deleted file mode 100644
index 7ac49457..00000000
--- a/datacenterlight/templates/datacenterlight/beta_success.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% load i18n %}
-
-<div class="modal fade bs-example-modal-sm" style="color:black;"  id="successModal" tabindex="-1" role="dialog">
-    <div class="modal-dialog">
-        <div class="modal-content">
-            <div class="modal-header">
-              <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-            </div>
-            <div class="modal-body">
-              <div class="modal-icon"><i class="checkmark" aria-hidden="true"></i></div>
-              <h4 class="modal-title">{% trans "Request Sent" %}</h4>
-              <p class="modal-text">{% trans "Thank you for your subscription! You will receive a confirmation mail from our team" %}</p>
-            </div>
-        </div><!-- /.modal-content -->
-    </div>
-</div><!-- /.modal -->
-<script>
-	// Show modal
-	$('#successModal').modal('show');
-	// close the modal after 3 seconds
-	setTimeout(function() {
-	    $('#successModal').modal('hide');
-	}, 5000);
-</script>
-<style>
-.vertical-alignment-helper {
-    display:table;
-    height: 100%;
-    width: 100%;
-    pointer-events:none; /* This makes sure that we can still click outside of the modal to close it */
-}
-.vertical-align-center {
-    /* To center vertically */
-    display: table-cell;
-    vertical-align: middle;
-    pointer-events:none;
-}
-.modal-content {
-    /* Bootstrap sets the size of the modal in the modal-dialog class, we need to inherit it */
-    width:inherit;
-    height:inherit;
-    /* To center horizontally */
-    margin: 0 auto;
-    pointer-events: all;
-}
-</style>
\ No newline at end of file
diff --git a/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html b/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html
deleted file mode 100644
index 3f06b069..00000000
--- a/datacenterlight/templates/datacenterlight/emails/base_email_datacenterlight.html
+++ /dev/null
@@ -1,178 +0,0 @@
-{% load static from staticfiles %}
-{% load i18n %}
-{% comment %} unused {% endcomment %}
-
-<!-- Inliner Build Version 4380b7741bb759d6cb997545f3add21ad48f010b -->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
-      style="font-family: 'Lato', 'sans-serif' !important;">
-<head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1">
-    <title>{{dcl_text}}</title>
-</head>
-<body bgcolor="#ffffff"
-      style="font-family: 'Lato', 'sans-serif' !important; -webkit-font-smoothing: antialiased; -webkit-text-size-adjust: none; width: 100% !important; height: 100%; color: white; margin: 0;">
-<style type="text/css">
-@media only screen and (max-width: 480px) {
-  table[class*="container-for-gmail-android"] {
-    min-width: 290px !important; width: 100% !important;
-  }
-  img[class="force-width-gmail"] {
-    display: none !important; width: 0 !important; height: 0 !important;
-  }
-  table[class="w320"] {
-    width: 320px !important;
-  }
-  td[class*="mobile-header-padding-left"] {
-    width: 160px !important; padding-left: 0 !important;
-  }
-  td[class*="mobile-header-padding-right"] {
-    width: 160px !important; padding-right: 0 !important;
-  }
-  td[class="header-lg"] {
-    font-size: 24px !important; padding-bottom: 5px !important;
-  }
-  td[class="content-padding"] {
-    padding: 5px 0 5px !important;
-  }
-  td[class="button"] {
-    padding: 5px 5px 30px !important;
-  }
-  td[class*="free-text"] {
-    padding: 10px 18px 30px !important;
-  }
-  td[class~="mobile-hide-img"] {
-    display: none !important; height: 0 !important; width: 0 !important; line-height: 0 !important;
-  }
-  td[class~="item"] {
-    width: 140px !important; vertical-align: top !important;
-  }
-  td[class~="quantity"] {
-    width: 50px !important;
-  }
-  td[class~="price"] {
-    width: 90px !important;
-  }
-  td[class="item-table"] {
-    padding: 30px 20px !important;
-  }
-  td[class="mini-container-left"] {
-    padding: 0 15px 15px !important; display: block !important; width: 290px !important;
-  }
-  td[class="mini-container-right"] {
-    padding: 0 15px 15px !important; display: block !important; width: 290px !important;
-  }
-}
-</style>
-<table align="center" cellpadding="0" cellspacing="0"
-       class="container-for-gmail-android" width="100%"
-       style="border-collapse: collapse !important; min-width: 600px; font-family: 'Lato', 'sans-serif' !important;">
-    <tr style="font-family: 'Lato', 'sans-serif' !important;">
-        <td align="left" valign="top" width="100%"
-            style="border-collapse: collapse; font-family: 'Lato', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff url(http://s3.amazonaws.com/swu-filepicker/4E687TRe69Ld95IDWyEg_bg_top_02.jpg) repeat-x;"
-            bgcolor="#ffffff">
-            <center style="font-family: 'Lato', 'sans-serif' !important;">
-                <table cellspacing="0" cellpadding="0" width="100%"
-                       bgcolor="#ffffff"
-                       background="{{base_url}}{% static 'datacenterlight/img/dcl-email-bg.jpg' %}"
-                       style="border-collapse: collapse !important; font-family: 'Lato', 'sans-serif' !important; background: transparent;">
-                    <tr style="font-family: 'Lato', 'sans-serif' !important;">
-                        <td width="100%" height="80" valign="top"
-                            style="text-align: center; vertical-align: middle; border-collapse: collapse; font-family: 'Lato', 'sans-serif' !important; font-size: 14px; color: #777777; line-height: 21px; background-color: #ffffff"
-                            align="center">
-                            <!--[if gte mso 9]>
-                            <v:rect xmlns:v="urn:schemas-microsoft-com:vml"
-                                    fill="true" stroke="false"
-                                    style="mso-width-percent:1000;height:80px; v-text-anchor:middle;">
-                                <v:fill type="tile"
-                                        src="{{base_url}}{% static 'datacenterlight/img/dcl-email-bg.jpg' %}"
-                                        color="#ffffff"/>
-                                <v:textbox inset="0,0,0,0">
-                            <![endif]-->
-                            <center style="font-family: 'Lato', 'sans-serif' !important;">
-                                <table cellpadding="0" cellspacing="0"
-                                       width="600" class="w320"
-                                       style="border-collapse: collapse !important; font-family: 'Lato', 'sans-serif' !important;">
-                                    <tr style="font-family: 'Lato', 'sans-serif' !important;">
-                                        <td class="pull-left mobile-header-padding-left"
-                                            style="vertical-align: middle; border-collapse: collapse; font-family: 'Lato', '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: 'Lato', '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: 'Lato', 'sans-serif' !important; border: none;"></a>
-                                        </td>
-                                        <td class="pull-right mobile-header-padding-right"
-                                            style="color: #4d4d4d; border-collapse: collapse; font-family: 'Lato', 'sans-serif' !important; font-size: 14px; text-align: right; line-height: 21px; width: 290px; padding-left: 10px;"
-                                            align="right">
-                                        </td>
-                                    </tr>
-                                </table>
-                            </center>
-                            <!--[if gte mso 9]>
-                            </v:textbox>
-                            </v:rect>
-                            <![endif]-->
-                        </td>
-                    </tr>
-                </table>
-            </center>
-        </td>
-    </tr>
-    <tr style="font-family: 'Lato', 'sans-serif' !important;">
-        <td align="center" valign="top" width="100%"
-            style="border-collapse: collapse; font-family: 'Lato', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff; padding: 20px 0 5px;"
-            class="content-padding" bgcolor="#f7f7f7">
-            <center style="font-family: 'Lato', 'sans-serif' !important;">
-                <table cellspacing="0" cellpadding="0" width="600" class="w320"
-                       style="border-collapse: collapse !important; font-family: 'Lato', 'sans-serif' !important;">
-                    <tr style="font-family: 'Lato', 'sans-serif' !important;">
-                        <td class="header-lg"
-                            style="border-collapse: collapse; font-family: 'Lato', 'sans-serif' !important; font-size: 32px; color: #4d4d4d; text-align: left; line-height: normal; font-weight: 400; padding: 35px 5px 0px;"
-                            align="center">
-                            {% block email_head %}
-                            {% endblock %}
-                        </td>
-                    </tr>
-                    <tr style="font-family: 'Lato', 'sans-serif' !important;">
-                        <td class="free-text"
-                            style="border-collapse: collapse; font-family: 'Lato', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: left; line-height: 21px; width: 100% !important; padding: 40px 5px 20px;"
-                            align="center">
-                            <p>
-                                {% block email_body %}
-                                {% endblock %}
-                            </p></td>
-                    </tr>
-                    <tr style="font-family: 'Lato', 'sans-serif' !important;">
-                        <td class="button"
-                            style="border-collapse: collapse; font-family: 'Lato', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; padding: 0;"
-                            align="center">&nbsp;
-                        </td>
-                    </tr>
-                </table>
-            </center>
-        </td>
-    </tr>
-    <tr style="font-family: 'Lato', 'sans-serif' !important;">
-        <td align="center" valign="top" width="100%"
-            style="height: 100px; border-collapse: collapse; font-family: 'Lato', 'sans-serif' !important; font-size: 14px; color: #777777; text-align: center; line-height: 21px; background: #ffffff;"
-            bgcolor="#ffffff">
-            <center style="font-family: 'Lato', 'sans-serif' !important;">
-                <table cellspacing="0" cellpadding="0" width="600" class="w320"
-                       style="border-collapse: collapse !important; font-family: 'Lato', 'sans-serif' !important;">
-                    <tr style="font-family: 'Lato', 'sans-serif' !important;">
-                        <td style="border-collapse: collapse; font-family: 'Lato', '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 Data Center Light Team' %}
-                        </td>
-                    </tr>
-                </table>
-            </center>
-        </td>
-    </tr>
-</table>
-</body>
-</html>
-

From 8d5391782633caabc03d3a70da7b7435d2105f1e Mon Sep 17 00:00:00 2001
From: PCoder <purple.coder@yahoo.co.uk>
Date: Sat, 3 Mar 2018 11:41:52 +0100
Subject: [PATCH 2/2] Update Changelog

---
 Changelog | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Changelog b/Changelog
index bdbe2806..28736552 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,5 @@
+Next:
+    * #3554: [dcl] Remove some more beta access resources (some were left in the earlier release)
 1.4.1: 2018-02-23
     * #3798: [dg] Redirect user to digital glarus on clicking logo in the email
     * #3554: [dcl] Remove beta access resources