From 1cfbe8d16e08195c9ca291f2d12ad5909dbedcdc Mon Sep 17 00:00:00 2001
From: Eliot Whalan <ewhal@pantsu.cat>
Date: Mon, 30 May 2016 09:10:27 +1000
Subject: Revert "Merge branch 'wub/deprecate-ewhal'"

This reverts commit 647d32a29978579f88baa7c06c207e6a8d6a0d3e, reversing
changes made to 22063af06536671b680fa9bc84b4626192c106cc.
---
 pages/check_script.swig     | 11 ++---------
 pages/nav.swig              |  1 -
 pages/nojs.swig             |  5 -----
 pages/other.swig            |  5 -----
 pages/upload_form_nojs.swig |  5 -----
 5 files changed, 2 insertions(+), 25 deletions(-)

(limited to 'pages')

diff --git a/pages/check_script.swig b/pages/check_script.swig
index d612980..224c547 100644
--- a/pages/check_script.swig
+++ b/pages/check_script.swig
@@ -1,7 +1,5 @@
 {#
-Copyright (c) 2013 Eric Johansson <neku@pomf.se>
-Copyright (c) 2013 Peter Lejeck <peter.lejeck@gmail.com>
-Copyright (c) 2015, 2016 the Pantsu.cat developers <hostmaster@pantsu.cat>
+Copyright (c) 2015 the Pantsu.cat developers <hostmaster@pantsu.cat>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in
@@ -21,11 +19,6 @@ 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.
 #}
 
-{#
-JavaScript-free uploader is deprecated since 2.1.0. It may be removed in a
-future release.
-#}
-
 <noscript>
-	<p class="alert alert-error"><strong>Enable JavaScript</strong> you fucking autistic neckbeard, it's not gonna hurt you. There's also a <a href="nojs.html">JavaScript-free uploader</a> if you need it, <span lang="jp">baka</span>.</p>
+	<p class="alert alert-error">This site requires JavaScript. Please enable JavaScript in your browser or use the <a href="nojs.html">JavaScript-free uploader</a>.</p>
 </noscript>
diff --git a/pages/nav.swig b/pages/nav.swig
index fb1344a..9bad2af 100644
--- a/pages/nav.swig
+++ b/pages/nav.swig
@@ -26,7 +26,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 		{# tools.html is deprecated since 2.1.0. #}
 		<li><a href="tools.html">Tools</a></li>
 		<li><a href="//git.pantsu.cat/pantsu/pomf">Git</a></li>
-		{# other.html is deprecated since 2.1.0. #}
 		<li><a href="other.html">Other</a></li>
 		<li><a href="//transparency.pantsu.cat">Transparency</a></li>
 	</ul>
diff --git a/pages/nojs.swig b/pages/nojs.swig
index 46eb08c..5552b11 100644
--- a/pages/nojs.swig
+++ b/pages/nojs.swig
@@ -20,11 +20,6 @@ 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.
-#}
-
 {% extends "layout.swig" %}
 
 {% block body %}
diff --git a/pages/other.swig b/pages/other.swig
index 9fb129d..a664aa5 100644
--- a/pages/other.swig
+++ b/pages/other.swig
@@ -20,11 +20,6 @@ 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.
-#}
-
 {% extends "layout.swig" %}
 
 {% block title %}Other Services{% endblock %}
diff --git a/pages/upload_form_nojs.swig b/pages/upload_form_nojs.swig
index efb0978..1952a0d 100644
--- a/pages/upload_form_nojs.swig
+++ b/pages/upload_form_nojs.swig
@@ -19,11 +19,6 @@ 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.
-#}
-
 <form enctype="multipart/form-data" method="post" action="upload.php?output=html">
 	<input type="file" name="files[]" multiple data-max-size="{{max_upload_size}}MiB">
 	<input type="submit" value="Submit">
-- 
cgit v1.2.3