EbookFoundation
/
regluit
mirror of https://github.com/EbookFoundation/regluit.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Gluejar/regluit into payment

pull/1/head
Raymond Yee 2012-01-04 10:55:58 -05:00
parent c5e84d7006 4f33fbcbd1
commit 65d04a151b
8 changed files with 82 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
deploy/regluit.conf
View File

@ -6,8 +6,10 @@ WSGISocketPrefix /opt/regluit
ServerName please.unglueit.com
ServerAdmin info@gluejar.com
Redirect 301 /admin https://please.unglueit.com/admin
Redirect 301 /accounts https://please.unglueit.com/accounts
RewriteEngine On
RewriteRule ^/$ https://please.unglueit.com/ [R=301]
RewriteRule /admin(.*) https://please.unglueit.com/admin$1 [R=301]
RewriteRule /accounts(.*) https://please.unglueit.com/accounts$1 [R=301]
WSGIDaemonProcess regluit processes=4 threads=4 python-eggs=/tmp/regluit-python-eggs
WSGIScriptAlias / /opt/regluit/deploy/regluit.wsgi

2
frontend/templates/basedocumentation.html
View File

@ -20,7 +20,7 @@
<div id="main-container">
<div class="js-main">
<div id="js-leftcol">
{% include "explore.html" %}
{% include "faqmenu.html" %}
</div>
<div id="js-maincol-fr" class="have-right doc">
<div class="js-maincol-inner">

16
frontend/templates/faq.html
View File

@ -5,6 +5,22 @@
<h2>FAQ</h2>
<dl>
{% if location == 'basics' or location == 'faq' %}
If you were on the Basics or general FAQ page, you'd be able to read this. Oh hey! You are!<br />
{% endif %}
{% if location == 'starting_campaigns' or location == 'faq' %}
If you were on the Starting Campaigns or general FAQ page, you'd be able to read this. Oh hey! You are!<br />
{% endif %}
{% if location == 'supporting_campaigns' or location == 'faq' %}
If you were on the Supporting Campaigns or general FAQ page, you'd be able to read this. Oh hey! You are!<br />
{% endif %}
{% if location == 'unglued_ebooks' or location == 'faq' %}
If you were on the Unglued Ebooks or general FAQ page, you'd be able to read this. Oh hey! You are!<br />
{% endif %}
<dt>I know a book that should be unglued.</dt>
<dd>Great! Find it in our database (using the search box above) and add it to your wishlist, so we know it should be on our list, too. You can also contact us: <!-- info? --></dd>

46
frontend/templates/faqmenu.html Normal file
View File

@ -0,0 +1,46 @@
<div class="jsmodule">
<h3 class="jsmod-title"><span>FAQs</span></h3>
<div class="jsmod-content">
<ul class="menu level1">
<li class="first parent {% if location != 'basics' %}collapse{% endif %}">
<a href="/faq/basics/"><span>Basics</span></a>
<ul class="menu level2">
<li class="first"><a href="{% url work_list 'recommended' %}"><span>How it Works</span></a></li>
<li><a href="{% url work_list 'popular' %}"><span>Your Account</span></a></li>
<li class="last"><a href="{% url campaign_list 'newest' %}"><span>The Company</span></a></li>
</ul>
</li>
<li class="parent {% if location != 'starting_campaigns' %}collapse{% endif %}">
<a href="/faq/starting_campaigns/"><span>Starting Campaigns</span></a>
<ul class="menu level2">
<li class="first"><a href="{% url work_list 'recommended' %}"><span>The Basics</span></a></li>
<li><a href="{% url work_list 'popular' %}"><span>Funding</span></a></li>
<li><a href="{% url work_list 'popular' %}"><span>Rewards</span></a></li>
<li><a href="{% url work_list 'popular' %}"><span>Campaign Pages</span></a></li>
<li class="last"><a href="{% url campaign_list 'newest' %}"><span>Supporter Relationships</span></a></li>
</ul>
</li>
<li class="parent {% if location != 'supporting_campaigns' %}collapse{% endif %}">
<a href="/faq/supporting_campaigns/"><span>Supporting Campaigns</span></a>
<ul class="menu level2">
<li class="first"><a href="{% url work_list 'recommended' %}"><span>Stuff</span></a></li>
<li><a href="{% url work_list 'popular' %}"><span>More Stuff</span></a></li>
<li class="last"><a href="{% url campaign_list 'newest' %}"><span>Totally Spurious Stuff</span></a></li>
</ul>
</li>
<li class="parent {% if location != 'unglued_ebooks' %}collapse{% endif %}">
<a href="/faq/unglued_ebooks/"><span>Unglued Ebooks</span></a>
<ul class="menu level2">
<li class="first"><a href="{% url work_list 'recommended' %}"><span>DRM is lame</span></a></li>
<li><a href="{% url work_list 'popular' %}"><span>CC is awesome</span></a></li>
<li class="last"><a href="{% url campaign_list 'newest' %}"><span>These Links Also Spurious</span></a></li>
</ul>
</li>
</ul>
</div>
</div>

6
frontend/urls.py
View File

@ -5,7 +5,7 @@ from django.views.generic import ListView, DetailView
from django.contrib.auth.decorators import login_required
from regluit.core.models import Campaign
from regluit.frontend.views import CampaignFormView, GoodreadsDisplayView, LibraryThingView, PledgeView
from regluit.frontend.views import CampaignFormView, GoodreadsDisplayView, LibraryThingView, PledgeView, FAQView
from regluit.frontend.views import CampaignListView, DonateView, WorkListView
urlpatterns = patterns(
@ -23,8 +23,8 @@ urlpatterns = patterns(
url(r"^rightsholders/claim/$", "claim", name="claim"),
url(r"^rh_admin/$", "rh_admin", name="rh_admin"),
url(r"^campaign_admin/$", "campaign_admin", name="campaign_admin"),
url(r"^faq/$", TemplateView.as_view(template_name="faq.html"),
name="faq"),
url(r"^faq/$", FAQView.as_view(), {'location':'faq'}, name="faq"),
url(r"^faq/(?P<location>\w*)/$", FAQView.as_view()),
url(r"^wishlist/$", "wishlist", name="wishlist"),
url(r"^campaigns/(?P<pk>\d+)/$",CampaignFormView.as_view(), name="campaign_by_id"),
url(r"^campaigns/(?P<facet>\w*)$", CampaignListView.as_view(), name='campaign_list'),

5
frontend/views.py
View File

@ -742,6 +742,11 @@ class CampaignFormView(FormView):
logger.info("CampaignFormView paypal: Error " + str(t.reference))
return HttpResponse(response)
class FAQView(TemplateView):
template_name = "faq.html"
def get_context_data(self, **kwargs):
location = self.kwargs["location"]
return {'location': location}
class GoodreadsDisplayView(TemplateView):
template_name = "goodreads_display.html"

3
static/css/documentation.css
View File

@ -195,3 +195,6 @@ dd {
.errorlist li {
border: solid #8dc63f 4px;
}
.collapse ul {
display: none;
}

4
static/less/documentation.less
View File

@ -133,3 +133,7 @@ dd {
.errorlist li {
border: solid @call-to-action 4px;
}
.collapse ul {
display: none;
}