diff --git a/r2/r2/config/extensions.py b/r2/r2/config/extensions.py index c08eb7c3a..6ad95f254 100644 --- a/r2/r2/config/extensions.py +++ b/r2/r2/config/extensions.py @@ -36,7 +36,6 @@ extension_mapping = { "rss": ("xml", "text/xml; charset=UTF-8"), "xml": ("xml", "text/xml; charset=UTF-8"), "js": ("js", "text/javascript; charset=UTF-8"), - "wired": ("wired", "text/javascript; charset=UTF-8"), "embed": ("htmllite", "text/javascript; charset=UTF-8"), "mobile": ("mobile", "text/html; charset=UTF-8"), "png": ("png", "image/png"), diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py index 13ab4c7b5..9c413632f 100644 --- a/r2/r2/controllers/reddit_base.py +++ b/r2/r2/controllers/reddit_base.py @@ -431,7 +431,7 @@ def set_content_type(): if e.has_key('extension'): c.extension = ext = e['extension'] - if ext in ('embed', 'wired', 'widget'): + if ext in ('embed', 'widget'): wrapper = request.params.get("callback", "document.write") wrapper = filters._force_utf8(wrapper) if not valid_jsonp_callback(wrapper): diff --git a/r2/r2/public/static/robots.txt b/r2/r2/public/static/robots.txt index c712fd60c..58b4e324f 100644 --- a/r2/r2/public/static/robots.txt +++ b/r2/r2/public/static/robots.txt @@ -22,7 +22,6 @@ Disallow: /*.xml Disallow: /*.rss Disallow: /*.i Disallow: /*.embed -Disallow: /*.wired Disallow: /*/comments/*?*sort= Disallow: /r/*/comments/*/*/c* Disallow: /comments/*/*/c* diff --git a/r2/r2/templates/base.wired b/r2/r2/templates/base.wired deleted file mode 100644 index 51fb0abb5..000000000 --- a/r2/r2/templates/base.wired +++ /dev/null @@ -1,30 +0,0 @@ -## The contents of this file are subject to the Common Public Attribution -## License Version 1.0. (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License at -## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public -## License Version 1.1, but Sections 14 and 15 have been added to cover use of -## software over a computer network and provide for limited attribution for the -## Original Developer. In addition, Exhibit A has been modified to be -## consistent with Exhibit B. -## -## Software distributed under the License is distributed on an "AS IS" basis, -## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -## the specific language governing rights and limitations under the License. -## -## The Original Code is reddit. -## -## The Original Developer is the Initial Developer. The Initial Developer of -## the Original Code is reddit Inc. -## -## All portions of the code written by reddit are Copyright (c) 2006-2013 -## reddit Inc. All Rights Reserved. -############################################################################### - -<%! - from pylons.i18n import _ -%> -
-Powered by - -${next.body()} -
diff --git a/r2/r2/templates/goldpayment.wired b/r2/r2/templates/goldpayment.wired deleted file mode 100644 index e69de29bb..000000000 diff --git a/r2/r2/templates/infobar.wired b/r2/r2/templates/infobar.wired deleted file mode 100644 index 48249e05f..000000000 --- a/r2/r2/templates/infobar.wired +++ /dev/null @@ -1,22 +0,0 @@ -## The contents of this file are subject to the Common Public Attribution -## License Version 1.0. (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License at -## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public -## License Version 1.1, but Sections 14 and 15 have been added to cover use of -## software over a computer network and provide for limited attribution for the -## Original Developer. In addition, Exhibit A has been modified to be -## consistent with Exhibit B. -## -## Software distributed under the License is distributed on an "AS IS" basis, -## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -## the specific language governing rights and limitations under the License. -## -## The Original Code is reddit. -## -## The Original Developer is the Initial Developer. The Initial Developer of -## the Original Code is reddit Inc. -## -## All portions of the code written by reddit are Copyright (c) 2006-2013 -## reddit Inc. All Rights Reserved. -############################################################################### - diff --git a/r2/r2/templates/link.wired b/r2/r2/templates/link.wired deleted file mode 100644 index 236ec7a6b..000000000 --- a/r2/r2/templates/link.wired +++ /dev/null @@ -1,42 +0,0 @@ -## The contents of this file are subject to the Common Public Attribution -## License Version 1.0. (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License at -## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public -## License Version 1.1, but Sections 14 and 15 have been added to cover use of -## software over a computer network and provide for limited attribution for the -## Original Developer. In addition, Exhibit A has been modified to be -## consistent with Exhibit B. -## -## Software distributed under the License is distributed on an "AS IS" basis, -## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -## the specific language governing rights and limitations under the License. -## -## The Original Code is reddit. -## -## The Original Developer is the Initial Developer. The Initial Developer of -## the Original Code is reddit Inc. -## -## All portions of the code written by reddit are Copyright (c) 2006-2013 -## reddit Inc. All Rights Reserved. -############################################################################### - -<%! - from pylons.i18n import _, ungettext - from r2.lib.template_helpers import get_domain -%> -<%inherit file="printable.htmllite" /> - -<%def name="entry()"> -${thing.num} - - ${thing.title} -  (${thing.domain}) - -${thing.score} ${ungettext("point", "points", thing.score)} - by   ${thing.author.name} -   [ - ${thing.num_comments} ${ungettext("comment", "comments", thing.num_comments or 0)}] - - - - diff --git a/r2/r2/templates/listing.wired b/r2/r2/templates/listing.wired deleted file mode 100644 index 7483ac15f..000000000 --- a/r2/r2/templates/listing.wired +++ /dev/null @@ -1,30 +0,0 @@ -## The contents of this file are subject to the Common Public Attribution -## License Version 1.0. (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License at -## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public -## License Version 1.1, but Sections 14 and 15 have been added to cover use of -## software over a computer network and provide for limited attribution for the -## Original Developer. In addition, Exhibit A has been modified to be -## consistent with Exhibit B. -## -## Software distributed under the License is distributed on an "AS IS" basis, -## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -## the specific language governing rights and limitations under the License. -## -## The Original Code is reddit. -## -## The Original Developer is the Initial Developer. The Initial Developer of -## the Original Code is reddit Inc. -## -## All portions of the code written by reddit are Copyright (c) 2006-2013 -## reddit Inc. All Rights Reserved. -############################################################################### - -<% from r2.lib.template_helpers import replace_render %> - - -%for a in thing.things: - ${a} -%endfor: -
- diff --git a/r2/r2/templates/menuarea.wired b/r2/r2/templates/menuarea.wired deleted file mode 100644 index 48249e05f..000000000 --- a/r2/r2/templates/menuarea.wired +++ /dev/null @@ -1,22 +0,0 @@ -## The contents of this file are subject to the Common Public Attribution -## License Version 1.0. (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License at -## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public -## License Version 1.1, but Sections 14 and 15 have been added to cover use of -## software over a computer network and provide for limited attribution for the -## Original Developer. In addition, Exhibit A has been modified to be -## consistent with Exhibit B. -## -## Software distributed under the License is distributed on an "AS IS" basis, -## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -## the specific language governing rights and limitations under the License. -## -## The Original Code is reddit. -## -## The Original Developer is the Initial Developer. The Initial Developer of -## the Original Code is reddit Inc. -## -## All portions of the code written by reddit are Copyright (c) 2006-2013 -## reddit Inc. All Rights Reserved. -############################################################################### - diff --git a/r2/r2/templates/panestack.wired b/r2/r2/templates/panestack.wired deleted file mode 100644 index 5d1c1444b..000000000 --- a/r2/r2/templates/panestack.wired +++ /dev/null @@ -1,32 +0,0 @@ -## The contents of this file are subject to the Common Public Attribution -## License Version 1.0. (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License at -## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public -## License Version 1.1, but Sections 14 and 15 have been added to cover use of -## software over a computer network and provide for limited attribution for the -## Original Developer. In addition, Exhibit A has been modified to be -## consistent with Exhibit B. -## -## Software distributed under the License is distributed on an "AS IS" basis, -## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -## the specific language governing rights and limitations under the License. -## -## The Original Code is reddit. -## -## The Original Developer is the Initial Developer. The Initial Developer of -## the Original Code is reddit Inc. -## -## All portions of the code written by reddit are Copyright (c) 2006-2013 -## reddit Inc. All Rights Reserved. -############################################################################### - -%if div: -
\ -%endif - %for t in thing.stack: - ${t} - %endfor -%if div: -
-%endif diff --git a/r2/r2/templates/reddit.wired b/r2/r2/templates/reddit.wired deleted file mode 100644 index 7c807a05c..000000000 --- a/r2/r2/templates/reddit.wired +++ /dev/null @@ -1,25 +0,0 @@ -## The contents of this file are subject to the Common Public Attribution -## License Version 1.0. (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License at -## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public -## License Version 1.1, but Sections 14 and 15 have been added to cover use of -## software over a computer network and provide for limited attribution for the -## Original Developer. In addition, Exhibit A has been modified to be -## consistent with Exhibit B. -## -## Software distributed under the License is distributed on an "AS IS" basis, -## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -## the specific language governing rights and limitations under the License. -## -## The Original Code is reddit. -## -## The Original Developer is the Initial Developer. The Initial Developer of -## the Original Code is reddit Inc. -## -## All portions of the code written by reddit are Copyright (c) 2006-2013 -## reddit Inc. All Rights Reserved. -############################################################################### - -<%inherit file="base.wired"/> - -${thing.content()} diff --git a/r2/r2/templates/searchbar.wired b/r2/r2/templates/searchbar.wired deleted file mode 100644 index 48249e05f..000000000 --- a/r2/r2/templates/searchbar.wired +++ /dev/null @@ -1,22 +0,0 @@ -## The contents of this file are subject to the Common Public Attribution -## License Version 1.0. (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License at -## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public -## License Version 1.1, but Sections 14 and 15 have been added to cover use of -## software over a computer network and provide for limited attribution for the -## Original Developer. In addition, Exhibit A has been modified to be -## consistent with Exhibit B. -## -## Software distributed under the License is distributed on an "AS IS" basis, -## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -## the specific language governing rights and limitations under the License. -## -## The Original Code is reddit. -## -## The Original Developer is the Initial Developer. The Initial Developer of -## the Original Code is reddit Inc. -## -## All portions of the code written by reddit are Copyright (c) 2006-2013 -## reddit Inc. All Rights Reserved. -############################################################################### - diff --git a/r2/r2/templates/sharelink.wired b/r2/r2/templates/sharelink.wired deleted file mode 100644 index 48249e05f..000000000 --- a/r2/r2/templates/sharelink.wired +++ /dev/null @@ -1,22 +0,0 @@ -## The contents of this file are subject to the Common Public Attribution -## License Version 1.0. (the "License"); you may not use this file except in -## compliance with the License. You may obtain a copy of the License at -## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public -## License Version 1.1, but Sections 14 and 15 have been added to cover use of -## software over a computer network and provide for limited attribution for the -## Original Developer. In addition, Exhibit A has been modified to be -## consistent with Exhibit B. -## -## Software distributed under the License is distributed on an "AS IS" basis, -## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for -## the specific language governing rights and limitations under the License. -## -## The Original Code is reddit. -## -## The Original Developer is the Initial Developer. The Initial Developer of -## the Original Code is reddit Inc. -## -## All portions of the code written by reddit are Copyright (c) 2006-2013 -## reddit Inc. All Rights Reserved. -############################################################################### -