From 03e1332ba54e3bf4886a1a06009eba0d68ba9db7 Mon Sep 17 00:00:00 2001
From: Juuso Lapinlampi <wub@partyvan.eu>
Date: Sun, 31 Jan 2016 02:45:10 +0000
Subject: Deprecate Swig banners

I have a belief that Swig banners are a Grunt only thing, and they don't
really integrate very well into Swig anyway. It's kind of a hack, and a
bad one because we don't need it anymore.

By deprecating Swig banners, we should have easier time replacing
Grunt/npm with Make in a future release.

Reviewed-by: Eliot Whalan <ewhal@pantsu.cat>
---
 CHANGELOG.md                  | 4 ++++
 pages/banners.swig            | 5 +++++
 pages/banners/donate.swig     | 5 +++++
 pages/banners/virusscans.swig | 5 +++++
 pages/index.swig              | 2 +-
 pages/nojs.swig               | 2 +-
 6 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 050b257..c4a0d91 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,10 @@ This project adheres to [Semantic Versioning](http://semver.org/).
   JavaScript. (Luminarys)
 - Luminarys added to `package.json` contributors. (Juuso Lapinlampi)
 
+### Deprecated
+
+- Swig banners. Use Swig templates or an alternative. (Juuso Lapinlampi)
+
 ## `2.0.1` - 2016-01-28
 
 ### Changed
diff --git a/pages/banners.swig b/pages/banners.swig
index e8f0cbd..ce25555 100644
--- a/pages/banners.swig
+++ b/pages/banners.swig
@@ -19,6 +19,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #}
 
+{#
+This template is deprecated since version 2.1.0. It may be removed in a future
+release.
+#}
+
 {% for banner in banners %}
 	{% include banner %}
 {% endfor %}
diff --git a/pages/banners/donate.swig b/pages/banners/donate.swig
index f4706c9..6a9b73b 100644
--- a/pages/banners/donate.swig
+++ b/pages/banners/donate.swig
@@ -19,6 +19,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #}
 
+{#
+This template is deprecated since version 2.1.0. It may be removed in a future
+release.
+#}
+
 <p class="alert alert-info">
 	<strong>pomf.se is a free service, but our hosting bill isn't</strong> &mdash; we need almost $100 a month for that. Donations help keep pomf.se free, online, and fast. Everything (after fees) goes to the hosting bill.
 	<span class="donate-btns">
diff --git a/pages/banners/virusscans.swig b/pages/banners/virusscans.swig
index 4a3d5a8..16a3608 100644
--- a/pages/banners/virusscans.swig
+++ b/pages/banners/virusscans.swig
@@ -19,6 +19,11 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #}
 
+{#
+This template is deprecated since version 2.1.0. It may be removed in a future
+release.
+#}
+
 <p class="alert alert-info">
 	<strong>Virus scans are now a daily routine</strong> &mdash; if a file gets detected it will be removed without further notice.
 </p>
diff --git a/pages/index.swig b/pages/index.swig
index ff7db42..d9eb263 100644
--- a/pages/index.swig
+++ b/pages/index.swig
@@ -30,7 +30,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 	{% include "check_fileapi.swig" %}
 	{% include "upload_form.swig" %}
 </div>
-{% include "banners.swig" %}
+{% include "banners.swig" %} {# Deprecated since version 2.1.0. #}
 {% include "nav.swig" %}
 <script src="pomf.min.js"></script>
 {% endblock %}
diff --git a/pages/nojs.swig b/pages/nojs.swig
index 9facb91..5552b11 100644
--- a/pages/nojs.swig
+++ b/pages/nojs.swig
@@ -28,6 +28,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 	<p class="lead">Max upload size is {{max_upload_size}}MiB, read the <a href="faq.html">FAQ</a></p>
 	{% include "upload_form_nojs.swig" %}
 </div>
-{% include "banners.swig" %}
+{% include "banners.swig" %} {# Deprecated since version 2.1.0. #}
 {% include "nav.swig" %}
 {% endblock %}
-- 
cgit v1.2.3