adding smashwords link to FAQ menu and improving URL hygiene

pull/1/head
Andromeda Yelton 2013-02-06 09:09:20 -05:00
parent a5c0bc8f76
commit 30dcab3d88
3 changed files with 24 additions and 23 deletions

View File

@ -153,7 +153,7 @@
<div class="column">
<span>About Unglue.it</span>
<ul>
<li><a href="/about/main/" class="hijax">Concept</a></li>
<li><a href="{% url about_specific 'main' %}" class="hijax">Concept</a></li>
<li><a href="{{ abouturl }}">Team</a></li>
<li><a href="http://blog.unglue.it">Blog</a></li>
<li><a href="{{ pressurl }}">Press</a></li>
@ -179,7 +179,7 @@
<span>Help</span>
<ul>
<li><a href="{{ faqurl }}">General FAQ</a></li>
<li><a href="/faq/rightsholders/">Rights Holder FAQ</a></li>
<li><a href="{% url faq_location 'rightsholders' %}">Rights Holder FAQ</a></li>
<li><a href="{% url api_help %}">API</a></li>
<li><a href="mailto:support@gluejar.com">support@gluejar.com</a>
<li><a href="{{ librariesurl }}">Unglue.it &hearts; Libraries</a>

View File

@ -8,41 +8,42 @@
</li>
<li class="parent {% if location != 'basics' %}collapse{% endif %}">
<a href="/faq/basics/"><span>Basics</span></a>
<a href="{% url faq_location 'basics' %}"><span>Basics</span></a>
<ul class="menu level2">
<li class="first"><a href="/faq/basics/howitworks"><span>How it Works</span></a></li>
<li><a href="/faq/basics/account"><span>Your Account</span></a></li>
<li class="last"><a href="/faq/basics/company/"><span>The Company</span></a></li>
<li class="first"><a href="{% url faq_sublocation 'basics' 'howitworks' %}"><span>How it Works</span></a></li>
<li><a href="{% url faq_sublocation 'basics' 'account' %}"><span>Your Account</span></a></li>
<li class="last"><a href="{% url faq_sublocation 'basics' 'company' %}"><span>The Company</span></a></li>
</ul>
</li>
<li class="parent {% if location != 'campaigns' %}collapse{% endif %}">
<a href="/faq/campaigns/"><span>Campaigns</span></a>
<a href="{% url faq_location 'campaigns' %}"><span>Campaigns</span></a>
<ul class="menu level2">
<li class="first"><a href="/faq/campaigns/overview"><span>Overview</span></a></li>
<li><a href="/faq/campaigns/supporting"><span>Supporting Campaigns</span></a></li>
<li class="last"><a href="/faq/campaigns/premiums"><span>Premiums</span></a></li>
<li class="first"><a href="{% url faq_sublocation 'campaigns' 'overview' %}"><span>Overview</span></a></li>
<li><a href="{% url faq_sublocation 'campaigns' 'supporting' %}"><span>Supporting Campaigns</span></a></li>
<li class="last"><a href="{% url faq_sublocation 'campaigns' 'premiums' %}"><span>Premiums</span></a></li>
</ul>
</li>
<li class="parent {% if location != 'unglued_ebooks' %}collapse{% endif %}">
<a href="/faq/unglued_ebooks/"><span>Unglued Ebooks</span></a>
<a href="{% url faq_location 'unglued_ebooks' %}"><span>Unglued Ebooks</span></a>
<ul class="menu level2">
<li class="first"><a href="/faq/unglued_ebooks/general"><span>General Questions</span></a></li>
<li><a href="/faq/unglued_ebooks/using"><span>Using Your Unglued Ebook</span></a></li>
<li class="last"><a href="/faq/unglued_ebooks/copyright"><span>Ungluing and Copyright</span></a></li>
<li class="first"><a href="{% url faq_sublocation 'unglued_ebooks' 'general' %}"><span>General Questions</span></a></li>
<li><a href="{% url faq_sublocation 'unglued_ebooks' 'using' %}"><span>Using Your Unglued Ebook</span></a></li>
<li class="last"><a href="{% url faq_sublocation 'unglued_ebooks' 'copyright' %}"><span>Ungluing and Copyright</span></a></li>
</ul>
</li>
<li class="parent {% if location != 'rightsholders' %}collapse{% endif %}">
<a href="/faq/rightsholders/"><span>For Rights Holders</span></a>
<a href="{% url faq_location 'rightsholders' %}"><span>For Rights Holders</span></a>
<ul class="menu level2">
<li class="first"><a href="/faq/rightsholders/authorization"><span>Becoming Authorized</span></a></li>
<li><a href="/faq/rightsholders/campaigns"><span>Running Campaigns</span></a></li>
<li><a href="/faq/rightsholders/publicity"><span>Publicizing Campaigns</span></a></li>
<li><a href="/faq/rightsholders/funding"><span>Funding</span></a></li>
<li><a href="/faq/rightsholders/conversion"><span>Ebook Conversion</span></a></li>
<li class="last"><a href="/faq/rightsholders/rights/"><span>Rights</span></a></li>
<li class="first"><a href="{% url faq_sublocation 'rightsholders' 'authorization' %}"><span>Becoming Authorized</span></a></li>
<li><a href="{% url faq_sublocation 'rightsholders' 'campaigns' %}"><span>Running Campaigns</span></a></li>
<li><a href="{% url faq_sublocation 'rightsholders' 'publicity' %}"><span>Publicizing Campaigns</span></a></li>
<li><a href="{% url faq_sublocation 'rightsholders' 'funding' %}"><span>Funding</span></a></li>
<li><a href="{% url faq_sublocation 'rightsholders' 'conversion' %}"><span>Ebook Conversion</span></a></li>
<li><a href="{% url faq_sublocation 'rightsholders' 'rights' %}"><span>Rights</span></a></li>
<li class="last"><a href="{% url about_specific 'smashwords' %}"><span>Smashwords Authors</span></a></li>
</ul>
</li>

View File

@ -33,7 +33,7 @@ urlpatterns = patterns(
url(r"^campaign_admin/$", "campaign_admin", name="campaign_admin"),
url(r"^faq/$", FAQView.as_view(), {'location':'faq', 'sublocation':'all'}, name="faq"),
url(r"^faq/(?P<location>\w*)/$", FAQView.as_view(), {'sublocation':'all'}, name="faq_location"),
url(r"^faq/(?P<location>\w*)/(?P<sublocation>\w*)/$", FAQView.as_view()),
url(r"^faq/(?P<location>\w*)/(?P<sublocation>\w*)/$", FAQView.as_view(), name="faq_sublocation"),
url(r"^wishlist/$", "wishlist", name="wishlist"),
url(r"^campaigns/(?P<facet>\w*)$", CampaignListView.as_view(), name='campaign_list'),
url(r"^lists/(?P<facet>\w*)$", WorkListView.as_view(), name='work_list'),
@ -86,7 +86,7 @@ urlpatterns = patterns(
url(r"^info/languages/(?P<template_name>[\w\.]*)$", InfoLangView.as_view()),
url(r'^supporter/(?P<supporter>[^/]+)/feed/$', SupporterWishlistFeed()),
url(r'^campaign_archive.js/$', "campaign_archive_js", name="campaign_archive_js"),
url(r"^about/(?P<facet>\w*)/$", "about", name="about"),
url(r"^about/(?P<facet>\w*)/$", "about", name="about_specific"),
url(r"^libraries/$", TemplateView.as_view(
template_name="libraries.html",
get_context_data=lambda: {'site': Site.objects.get_current()}