diff --git a/r2/r2/controllers/front.py b/r2/r2/controllers/front.py index 195449adf..9bb89407d 100644 --- a/r2/r2/controllers/front.py +++ b/r2/r2/controllers/front.py @@ -1373,11 +1373,6 @@ class FrontController(RedditController): content=ContactUs(), page_classes=["contact-us-page"] ).render() - def GET_rules(self): - return BoringPage(_("rules of reddit"), show_sidebar=False, - content=RulesPage(), page_classes=["rulespage-body"] - ).render() - @validate(vendor=VOneOf("v", ("claimed-gold", "claimed-creddits", "spent-creddits", "paypal", "coinbase", "stripe"), diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 4f441b0e4..e7756e59d 100644 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -4986,8 +4986,6 @@ class ApiHelp(Templated): self.api_docs = api_docs super(ApiHelp, self).__init__(*a, **kw) -class RulesPage(Templated): - pass class AwardReceived(Templated): pass diff --git a/r2/r2/public/static/brick.png b/r2/r2/public/static/brick.png deleted file mode 100644 index f7e311128..000000000 Binary files a/r2/r2/public/static/brick.png and /dev/null differ diff --git a/r2/r2/public/static/css/compact.css b/r2/r2/public/static/css/compact.css index 69c029e92..82b410389 100644 --- a/r2/r2/public/static/css/compact.css +++ b/r2/r2/public/static/css/compact.css @@ -475,11 +475,6 @@ body.post-under-6h-old .gilded-icon { opacity: .55; } #suggested-reddits ul li a { background: url('data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4gPHN2ZyB2ZXJzaW9uPSIxLjEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+PGRlZnM+PGxpbmVhckdyYWRpZW50IGlkPSJncmFkIiBncmFkaWVudFVuaXRzPSJvYmplY3RCb3VuZGluZ0JveCIgeDE9IjAuNSIgeTE9IjAuMCIgeDI9IjAuNSIgeTI9IjEuMCI+PHN0b3Agb2Zmc2V0PSIwJSIgc3RvcC1jb2xvcj0iI2JlY2ZlMCIvPjxzdG9wIG9mZnNldD0iMTAwJSIgc3RvcC1jb2xvcj0iIzgxYTNjNSIvPjwvbGluZWFyR3JhZGllbnQ+PC9kZWZzPjxyZWN0IHg9IjAiIHk9IjAiIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIGZpbGw9InVybCgjZ3JhZCkiIC8+PC9zdmc+IA=='); background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #becfe0), color-stop(100%, #81a3c5)); background: -moz-linear-gradient(top, #becfe0, #81a3c5); background: -webkit-linear-gradient(top, #becfe0, #81a3c5); background: linear-gradient(to bottom, #becfe0, #81a3c5); background-color: #9fb9d2; -moz-border-radius: 10px; -webkit-border-radius: 10px; border-radius: 10px; display: inline-block; margin: 5px; padding: 3px 7px; text-decoration: none; border: 1px solid #507faf; color: #304c69; } -.rulespage { padding: 3px; } -.rulespage li { padding: 3px; } -.rulespage li .good-example { background: #bcf5a9; } -.rulespage li .bad-example { background: #f5a9a9; } - /* Autocomplete */ #sr-autocomplete-area { position: relative; z-index: 50; } diff --git a/r2/r2/public/static/css/compact.scss b/r2/r2/public/static/css/compact.scss index 964064b87..d2a79e0f0 100644 --- a/r2/r2/public/static/css/compact.scss +++ b/r2/r2/public/static/css/compact.scss @@ -1400,19 +1400,6 @@ body.post-under-6h-old .gilded-icon { color: hsl(210, 37%, 30%); } -.rulespage { - padding: 3px; - li { - padding: 3px; - .good-example { - background: #bcf5a9; - } - .bad-example { - background: #f5a9a9; - } - } -} - /* Autocomplete */ #sr-autocomplete-area { position: relative; diff --git a/r2/r2/public/static/css/reddit.less b/r2/r2/public/static/css/reddit.less index 3855398cb..cbac00a6b 100644 --- a/r2/r2/public/static/css/reddit.less +++ b/r2/r2/public/static/css/reddit.less @@ -3539,92 +3539,6 @@ label + #moresearchinfo { color: red; } -body.rulespage-body { - overflow-y: scroll; -} - -.rulespage { - margin: 0 auto; - position: relative; - vertical-align: middle; - width: 600px; -} - -.rulespage h1 { - font-size: xx-large; - text-align: center; - margin-top: 20px; -} - -.rulespage .info { - font-size: larger; - padding-top: 10px; -} - -.rulespage .rule-list { - margin:10px; - padding:10px; - font-size: medium; -} - -.rulespage li { - border-bottom: 1px solid #ddd; - padding: 10px; - margin: 10px; - -webkit-background-clip: padding-box; - -moz-background-clip: padding-box; - background-clip: padding-box; -} - -.rulespage li.first-rule { - border-top: 1px solid #ddd; - padding-top: 18px; -} - -.rulespage li#minors { - padding-bottom: 18px; -} - -.rulespage .expander { - color: gray; - cursor: help; - padding: 10px; -} - -.rulespage .examples { - font-size: small; -} - -.rulespage li.example { - border: none; -} - -.rulespage li.good-example { - background: #bcf5a9; -} - -.rulespage li.bad-example { - background: #f5a9a9; -} - -.rulespage em { - font-weight: bold; -} - -.rulespage em.toggle { - font-weight: normal; -} - -.rulespage .info { - text-align: center; -} - -.rulespage img.bottom { - margin-top: 30px; - text-align: center; - padding-bottom: -40px; -} - .aboutpage { margin-right: 320px; } .aboutpage p { margin: 5px; } .aboutpage h1, .aboutpage h2 { margin: 10px;} diff --git a/r2/r2/templates/rulespage.compact b/r2/r2/templates/rulespage.compact deleted file mode 100644 index 6dd57b4eb..000000000 --- a/r2/r2/templates/rulespage.compact +++ /dev/null @@ -1,110 +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-2015 -## reddit Inc. All Rights Reserved. -############################################################################### - -<%! -from r2.lib.template_helpers import static -%> - -<%def name="expando_start(phrase)"> -
-

[+] ${phrase}

- -
- - -<%def name="good_example(phrase, leadin='OK:')"> -
  • ${leadin} ${unsafe(phrase)}
    • - - -<%def name="bad_example(phrase, leadin='NOT OK:')"> -
  • ${leadin} ${unsafe(phrase)}
    • - - - - -
    -

    rules of reddit

    -
    -

    reddit is a pretty open platform and free speech place, but there are a few rules:

    -
      -
    1. -

      Don't spam.

      - ${expando_start("What is spam?")} - ${bad_example('Submitting only links to your blog or personal website.')} - ${good_example('Submitting links from a variety of sites and sources.')} - ${good_example('Submitting links from your own site, talking with redditors in the comments, and also submitting cool stuff from other sites.')} - ${bad_example('Posting the same comment repeatedly in multiple subreddits.')} - ${expando_end()} -
      2. -
    2. -

      Don't ask for votes or engage in vote manipulation.

      - ${expando_start("What does vote manipulation look like?")} - ${bad_example('Buying votes or using services to vote.')} - ${good_example('Sharing reddit links with your friends.')} - ${bad_example('Sharing links with your friends or coworkers and asking them to vote.')} - ${bad_example('Creating submissions such as "For every upvote I will ..." or "... please upvote this!", regardless of the cause.')} - ${expando_end()} -
      3. -
    3. -

      Don't post personal information.

      - ${expando_start("What might be personal information?")} - ${bad_example("Posting a link to your friend's facebook profile.")} - ${good_example("Posting your senator's publicly available contact information")} - ${bad_example("Posting the full name, employer, or other real-life details of another redditor")} - ${good_example("Posting a link to a public page maintained by a celebrity.")} - ${expando_end()} -
      4. -
    4. -

      No child pornography or sexually suggestive content featuring minors.

      -
      5. -
    5. -

      Don't break the site or do anything that interferes with normal use of the site.

      - ${expando_start("Tell me more.")} - ${bad_example('Creating programs that request information more than once every 2 seconds or violate any of our other  API rules.')} - ${good_example('Responsibly  reporting security  issues to us.', leadin="AWESOME:")} - ${expando_end()} -
      6. - -
    -
    -
    -

    You should also be mindful of  reddiquette, an informal expression of reddit's community values as written by the community itself. Please abide by it the best you can.

    -
    -
    diff --git a/r2/r2/templates/rulespage.html b/r2/r2/templates/rulespage.html deleted file mode 100644 index 3f0732e86..000000000 --- a/r2/r2/templates/rulespage.html +++ /dev/null @@ -1,113 +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-2015 -## reddit Inc. All Rights Reserved. -############################################################################### - -<%! -from r2.lib.template_helpers import static -%> - -<%def name="expando_start(phrase)"> -
    -

    [+] ${phrase}

    - -
    - - -<%def name="good_example(phrase, leadin='OK:')"> -
  • ${leadin} ${unsafe(phrase)}
    • - - -<%def name="bad_example(phrase, leadin='NOT OK:')"> -
  • ${leadin} ${unsafe(phrase)}
    • - - - - -
    -

    rules of reddit

    -
    -

    reddit is a pretty open platform and free speech place, but there are a few rules:

    -
      -
    1. -

      Don't spam.

      - ${expando_start("What is spam?")} - ${bad_example('Submitting only links to your blog or personal website.')} - ${good_example('Submitting links from a variety of sites and sources.')} - ${good_example('Submitting links from your own site, talking with redditors in the comments, and also submitting cool stuff from other sites.')} - ${bad_example('Posting the same comment repeatedly in multiple subreddits.')} - ${expando_end()} -
      2. -
    2. -

      Don't ask for votes or engage in vote manipulation.

      - ${expando_start("What does vote manipulation look like?")} - ${bad_example('Buying votes or using services to vote.')} - ${good_example('Sharing reddit links with your friends.')} - ${bad_example('Sharing links with your friends or coworkers and asking them to vote.')} - ${bad_example('Creating submissions such as "For every upvote I will ..." or "... please upvote this!", regardless of the cause.')} - ${expando_end()} -
      3. -
    3. -

      Don't post personal information.

      - ${expando_start("What might be personal information?")} - ${bad_example("Posting a link to your friend's facebook profile.")} - ${good_example("Posting your senator's publicly available contact information")} - ${bad_example("Posting the full name, employer, or other real-life details of another redditor")} - ${good_example("Posting a link to a public page maintained by a celebrity.")} - ${expando_end()} -
      4. -
    4. -

      No child pornography or sexually suggestive content featuring minors.

      -
      5. -
    5. -

      Don't break the site or do anything that interferes with normal use of the site.

      - ${expando_start("Tell me more.")} - ${bad_example('Creating programs that request information more than once every 2 seconds or violate any of our other  API rules.')} - ${good_example('Responsibly  reporting security  issues to us.', leadin="AWESOME:")} - ${expando_end()} -
      6. - -
    -
    -
    -

    You should also be mindful of  reddiquette, an informal expression of reddit's community values as written by the community itself. Please abide by it the best you can.

    -
    -
    - ${_('this brick has no semantic value')} -
    -