From db3c6b44d8ba27d032a3c259f8b3a2a9d1c877b5 Mon Sep 17 00:00:00 2001 From: Eliot Whalan Date: Thu, 16 Jun 2016 07:58:59 +1000 Subject: Revert "Add Expat copyright headers to pages (SWIG)" This reverts commit 3b4701b240f55b4e97edee7fdc13fec35a76fc5a. --- pages/banners.swig | 26 -------------------------- pages/banners/donate.swig | 26 -------------------------- pages/banners/virusscans.swig | 4 ++++ pages/ca.swig | 16 ++++++++++++++++ pages/check_fileapi.swig | 21 --------------------- pages/check_fileapica.swig | 3 +++ pages/check_script.swig | 21 --------------------- pages/check_scriptca.swig | 3 +++ pages/faq.swig | 21 --------------------- pages/index.swig | 22 ---------------------- pages/layout.swig | 22 ---------------------- pages/layoutca.swig | 15 +++++++++++++++ pages/nav.swig | 21 --------------------- pages/nojs.swig | 22 ---------------------- pages/other.swig | 22 ---------------------- pages/tools.swig | 23 ----------------------- pages/upload_form.swig | 21 --------------------- pages/upload_form_nojs.swig | 21 --------------------- pages/upload_formca.swig | 3 +++ 19 files changed, 44 insertions(+), 289 deletions(-) create mode 100644 pages/ca.swig create mode 100644 pages/check_fileapica.swig create mode 100644 pages/check_scriptca.swig create mode 100644 pages/layoutca.swig create mode 100644 pages/upload_formca.swig (limited to 'pages') diff --git a/pages/banners.swig b/pages/banners.swig index ce25555..59b72e8 100644 --- a/pages/banners.swig +++ b/pages/banners.swig @@ -1,29 +1,3 @@ -{# -Copyright (c) 2013 Peter Lejeck - -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 -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -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 6a9b73b..dcd7f7c 100644 --- a/pages/banners/donate.swig +++ b/pages/banners/donate.swig @@ -1,29 +1,3 @@ -{# -Copyright (c) 2013 Peter Lejeck - -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 -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -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. -#} -

pomf.se is a free service, but our hosting bill isn't — 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.

+======= +

+>>>>>>> parent of 3b4701b... Add Expat copyright headers to pages (SWIG) Virus scans are now a daily routine — if a file gets detected it will be removed without further notice.

diff --git a/pages/ca.swig b/pages/ca.swig new file mode 100644 index 0000000..252ff7c --- /dev/null +++ b/pages/ca.swig @@ -0,0 +1,16 @@ +{% extends "layoutca.swig" %} + +{% block body %} +
+
+

Ropa Interior~

+
+

Màxima grandària de pujada {{max_upload_size}}MiB, read the FAQ

+ {% include "check_scriptca.swig" %} + {% include "check_fileapica.swig" %} + {% include "upload_formca.swig" %} +
+{% include "banners.swig" %} +{% include "nav.swig" %} + +{% endblock %} diff --git a/pages/check_fileapi.swig b/pages/check_fileapi.swig index 2ba1d86..a4efb07 100644 --- a/pages/check_fileapi.swig +++ b/pages/check_fileapi.swig @@ -1,24 +1,3 @@ -{# -Copyright (c) 2013 Peter Lejeck - -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 -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -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. -#} -

Your browser is shit. Install the latest Firefox or Botnet and come back <3

diff --git a/pages/check_fileapica.swig b/pages/check_fileapica.swig new file mode 100644 index 0000000..aba061d --- /dev/null +++ b/pages/check_fileapica.swig @@ -0,0 +1,3 @@ +

+ El seu navegador és una merda. Instal l'última Firefox o Botnet i tornar <3 +

diff --git a/pages/check_script.swig b/pages/check_script.swig index 224c547..8bf8f39 100644 --- a/pages/check_script.swig +++ b/pages/check_script.swig @@ -1,24 +1,3 @@ -{# -Copyright (c) 2015 the Pantsu.cat developers - -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 -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -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. -#} - diff --git a/pages/check_scriptca.swig b/pages/check_scriptca.swig new file mode 100644 index 0000000..3c8b01a --- /dev/null +++ b/pages/check_scriptca.swig @@ -0,0 +1,3 @@ + diff --git a/pages/faq.swig b/pages/faq.swig index f4d78a6..efcdd5a 100644 --- a/pages/faq.swig +++ b/pages/faq.swig @@ -1,24 +1,3 @@ -{# -Copyright (c) 2015, 2016 the Pantsu.cat developers - -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 -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -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. -#} - {% extends "layout.swig" %} {% block title %}FAQ{% endblock %} diff --git a/pages/index.swig b/pages/index.swig index 91054a8..bdde4f4 100644 --- a/pages/index.swig +++ b/pages/index.swig @@ -1,25 +1,3 @@ -{# -Copyright (c) 2013 Peter Lejeck -Copyright (c) 2015 the Pantsu.cat developers - -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 -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -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. -#} - {% extends "layout.swig" %} {% block body %} diff --git a/pages/layout.swig b/pages/layout.swig index ebc3c53..5845cd1 100644 --- a/pages/layout.swig +++ b/pages/layout.swig @@ -1,25 +1,3 @@ -{# -Copyright (c) 2013 Peter Lejeck -Copyright (c) 2015, 2016 the Pantsu.cat developers - -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 -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -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. -#} - diff --git a/pages/layoutca.swig b/pages/layoutca.swig new file mode 100644 index 0000000..536676f --- /dev/null +++ b/pages/layoutca.swig @@ -0,0 +1,15 @@ + + + + + + Ropa Interior.cat · {% block title %}Allotjament d'arxius valent{% endblock %} + + + + +
+ {% block body %}What the fuck are you doing here, baka?{% endblock %} +
+ + diff --git a/pages/nav.swig b/pages/nav.swig index 9bad2af..a6ee95b 100644 --- a/pages/nav.swig +++ b/pages/nav.swig @@ -1,24 +1,3 @@ -{# -Copyright (c) 2015 the Pantsu.cat developers - -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 -the Software without restriction, including without limitation the rights to -use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of -the Software, and to permit persons to whom the Software is furnished to do so, -subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS -FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR -COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER -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. -#} -