github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-01-27 07:48:16 -05:00
Code Issues Packages Projects Releases Wiki Activity

Feedback page update

Browse Source
This commit is contained in:
Josh Wardle
2013-09-20 16:50:09 -07:00
committed by Ricky Ramirez
parent db119b9197
commit a2b7967133
10 changed files with 159 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
r2/r2/config/routing.py
View File

@@ -113,8 +113,10 @@ def make_map():
mc('/i18n', controller='redirect', action='redirect',
dest='http://www.reddit.com/r/i18n')
mc('/feedback', controller='feedback', action='feedback')
mc('/ad_inq', controller='feedback', action='ad_inq')
mc('/feedback', controller='redirect', action='redirect',
dest='/contact')
mc('/contact', controller='front', action='contact_us')
mc('/ad_inq', controller='front', action='ad_inq')
mc('/admin/awards', controller='awards')
mc('/admin/awards/:awardcn/:action', controller='awards',

1
r2/r2/controllers/__init__.py
View File

@@ -54,7 +54,6 @@ def load_controllers():
from listingcontroller import MyredditsController
from feedback import FeedbackController
from front import FormsController
from front import FrontController
from health import HealthController

38
r2/r2/controllers/feedback.py
View File

@@ -1,38 +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 reddit_base import RedditController
from pylons import c, request
from pylons.i18n import _
from r2.lib.pages import FormPage, Feedback, Captcha, PaneStack, SelfServeBlurb, FeedbackBlurb
class FeedbackController(RedditController):
def GET_ad_inq(self):
return FormPage('advertise',
content = SelfServeBlurb(),
loginbox = False).render()
def GET_feedback(self):
return FormPage('feedback',
content = FeedbackBlurb(),
loginbox = False).render()

10
r2/r2/controllers/front.py
View File

@@ -1096,6 +1096,16 @@ class FrontController(RedditController, OAuth2ResourceController):
def GET_account_activity(self):
return AccountActivityPage().render()
def GET_contact_us(self):
return BoringPage(_("contact us"), show_sidebar=False,
content=ContactUs(), page_classes=["contact-us-page"]
).render()
def GET_ad_inq(self):
return FormPage('advertise',
content = SelfServeBlurb(),
loginbox = False).render()
def GET_rules(self):
return BoringPage(_("rules of reddit"), show_sidebar=False,
content=RulesPage(), page_classes=["rulespage-body"]

2
r2/r2/lib/menus.py
View File

@@ -81,7 +81,7 @@ menu = MenuHandler(hot = _('hot'),
logout = _("logout"),
#reddit footer strings
feedback = _("contact us"),
contact = _("contact us"),
buttons = _("buttons"),
widget = _("widget"),
code = _("source code"),

5
r2/r2/lib/pages/pages.py
View File

@@ -693,7 +693,7 @@ class RedditFooter(CachedTemplate):
OffsiteButton(_("FAQ"), dest = "/wiki/faq", nocname=True),
OffsiteButton(_("reddiquette"), nocname=True, dest = "/wiki/reddiquette"),
NamedButton("rules", False, nocname=True),
NamedButton("feedback", False),
NamedButton("contact", False),
],
title = _("help"),
type = "flat_vert",
@@ -2542,6 +2542,9 @@ class ButtonDemoPanel(Templated):
class SelfServeBlurb(Templated):
pass
class ContactUs(Templated):
pass
class FeedbackBlurb(Templated):
pass

65
r2/r2/public/static/css/reddit.less
View File

@@ -3196,25 +3196,66 @@ button.button[disabled] {
padding-top: 10px;
}
.feedback.instructions dl {
margin-left: 20px;
body.contact-us-page {
overflow-y: scroll;
}
.feedback.instructions dt {
margin-top: 10px;
margin-bottom: 10px;
.contact-us-page .content {
width: 600px;
margin: 0px auto;
}
.feedback.instructions dd:before {
background-image: url(../continue-thread.png); /* SPRITE */
height: 15px;
width: 30px;
.contact-us-page h1 {
font-size: xx-large;
text-align: center;
margin: 20px 0px;
}
.contact-us-page .info {
font-size: larger;
text-align: center;
margin-bottom: 20px;
}
.contact-us-page h2.button {
background-color: #cee2f5;
font-size: x-large;
font-weight: bold;
color: #369;
text-align: center;
border-radius: 7px;
border: 2px solid #369;
line-height: 1.5em;
margin: 0px 10px 10px 10px;
}
.contact-us-page h2.button:hover {
background-color: #daeaf8;
cursor: pointer;
}
.contact-us-page .details{
margin: 0;
display: none;
}
.contact-us-page li:target .details {
display: block;
content: " ";
float: left;
margin: 2px 5px 0 0;
}
.contact-us-page .details li {
background-color: #fafafa;
font-size: small;
border: 1px solid #ccc;
margin: 0px 40px 10px 40px;
padding: 10px;
width: 500px;
}
.contact-us-page img.space-snoo {
display: block;
margin: 50px auto 0 auto;
}
.button-demo a.view-code,
.button-demo a.hide-code { float: right; margin-bottom: 1em; }

BIN
r2/r2/public/static/space-snoo.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

87
r2/r2/templates/contactus.html Normal file
View File

@@ -0,0 +1,87 @@
## 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 static
%>
<h1>how can we help you?</h1>
<p class="info">
reddit is a community, and as such there are a lot of outlets to get help for what ails you.
</p>
<ol class="contact-options">
<li id="get-help-moderating">
<h2 class="button">get help moderating</h2>
<ul class="details">
<li>Are you a new moderator? Need advice? You'll find a community ready to assist you at&#32;<a href="/r/modhelp">/r/modhelp</a>.</li>
</ul>
</li>
<li id="report-a-bug">
<h2 class="button">report a bug</h2>
<ul class="details">
<li>Check out&#32;<a href="/r/bugs">/r/bugs</a>&#32;for other people with the same problem, or submit your own bug report.</li>
</ul>
</li>
<li id="press-enquiry">
<h2 class="button">make a press enquiry</h2>
<ul class="details">
<li>You can email us at&#32;<a href="mailto:press@reddit.com">press@reddit.com</a>&#32;or give us a call at&#32;<a href="tel:424-234-9948">424-234-9948</a>.</li>
</ul>
</li>
<li id="reddit-trademark">
<h2 class="button">using the reddit trademark</h2>
<ul class="details">
<li>You'll need a license to use the reddit trademark. Read our&#32;<a href="http://www.reddit.com/wiki/licensing">licensing page</a>&#32;to find out how to get permission.</li>
</ul>
</li>
<li id="ask-a-question">
<h2 class="button">ask a general question</h2>
<ul class="details">
<li>Maybe you want to&#32;<a href="/r/askreddit">/r/askreddit</a>? Or for help try making a post at&#32;<a href="/r/help">/r/help</a>.</li>
</ul>
</li>
<li id="message-the-admins">
<h2 class="button">message the admins</h2>
<ul class="details">
<li>If your submission isn't showing up message the mods by sending a private message to /r/[name of subreddit]</li>
<li>If you need help on the site or have general site questions, create a text post submission to&#32;<a href="/r/help">/r/help</a>.</li>
<li>If you got an inappropriate or harrassing PM, click "report" and/or "block user" in the options under the PM.</li>
<li>If you know you need the admins, you can message them&#32;<a href="/message/compose?to=%2Fr%2Freddit.com">here</a>.</li>
</ul>
</li>
</ol>
<img class="space-snoo" title="${_("\"In 5-billion years the Sun will expand and engulf our orbit as the charred ember that was once Earth vaporizes. Have a nice day.\"")}" alt="" src="${static('space-snoo.png')}">
<script type="text/javascript">
$('.contact-options').on('click', 'h2', function() {
var toggled_details = $(this).siblings(".details");
if (toggled_details.is(":visible")){
toggled_details.slideUp();
} else {
$(".details").slideUp();
toggled_details.slideDown();
}
});
</script>

72
r2/r2/templates/feedbackblurb.html
View File

@@ -1,72 +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.pages import Feedback
import random
%>
<div class="feedback instructions">
<h1>Request Help</h1>
<p>
reddit is a community, and as such there are a lot of outlets to get help for what ails you.
</p>
<dl>
<dt>Making a press inquiry?</dt>
<dd><a href="/wiki/press">Get our press contact details</a>.</dd>
<dt>Are your submissions not showing up? Subreddit marked as spam? Is the spam filter acting up?</dt>
<dd>
&#32;<a href="/message/compose?to=${g.admin_message_acct|u}">Send a private message to the admins.</a>&#32;(We really do want to help)
</dd>
<dt>Got a feature request?</dt>
<dd><a href="/r/ideasfortheadmins">Post it to our development community so the admins can see it</a>.</dd>
<dt>Got a bug report?</dt>
<dd><a href="/r/bugs/">Check /r/bugs for other people with the same problem, or submit your own bug report.</a></dd>
<dt>Are you a new moderator? Having trouble staying out of the fray? Need advice?</dt>
<dd><a href="/r/modhelp">There's a subreddit for that</a>.</dd>
<dt>Want to advertise but don't know how?</dt>
<dd><a href="/ad_inq">The instructions are here</a>.</dd>
<dt>General questions? Need help?</dt>
<dd><a href="/r/help">There's a subreddit for that, too</a>.</dd>
<dt>Frustrated? Need a break?</dt>
<% r = random.randint(0,2) %>
%if r == 0:
<dd><a href="/r/aww+cats+catpictures+bagcat+kitties+awww+kittens+catfort">Here's some pictures of kitties.</a></dd>
%elif r == 1:
<dd><a href="/r/earthporn">How about some soothing nature photos?</a></dd>
%elif r == 2:
<dd><a href="/r/happy+upliftingnews">Happiness is contagious.</a></dd>
%endif
</dl>
<p>
Or, if none of these solve your problem,&#32;
<a href="#" onclick="$('#feedback-form').slideDown(function(){$(this).find('input[type=text]:first').focus();}); return false;">
send a message to our feedback.
</a>
</p>
<div id="feedback-form" style="display:none">
${Feedback(title=_("send reddit feedback"), action = "feedback")}
</div>
</div>