Allow loading and serving of developer docs on the main website

diff --git a/pgweb/docs/views.py b/pgweb/docs/views.py
index b50d77b7f855ea4c146520a9c5e4bd0058e95e38..7240081225967f17def9d35d3504add06278243d 100644 (file)
--- a/pgweb/docs/views.py
+++ b/pgweb/docs/views.py
@@ -20,10 +20,14 @@ def docpage(request, version, typ, filename):
        currver = Version.objects.filter(current=True)[0].tree
        if version == 'current':
                ver = currver
+       elif version == 'devel':
+               if not typ == 'static':
+                       raise Http404("Only static version of developer docs available")
+               ver = Decimal(0.0)
        else:
                ver = Decimal(version)
 
-       if ver < Decimal("7.1"):
+       if ver < Decimal("7.1") and ver > Decimal(0.0):
                extension = "htm"
        else:
                extension = "html"
@@ -38,7 +42,7 @@ def docpage(request, version, typ, filename):
        return render_to_response('docs/docspage.html', {
                'page': page,
                'title': page.title,
-               'doc_nav_version': ver,
+               'doc_nav_version': ver > 0 and ver or "devel",
                'doc_type': typ,
                'comments': comments,
                'can_comment': (typ=="interactive" and ver==currver),

diff --git a/pgweb/urls.py b/pgweb/urls.py
index a42b59b32bd41cbaf348aafbfb0c8269a12fe43b..e0e66b29595bc13691566c3a6f03ed95acbcc7ac 100644 (file)
--- a/pgweb/urls.py
+++ b/pgweb/urls.py
@@ -42,9 +42,9 @@ urlpatterns = patterns('',
     (r'^mirrors.xml$', 'downloads.views.mirrors_xml'),
     (r'^applications-v2.xml$', 'downloads.views.applications_v2_xml'),
 
-    (r'^docs/(current|\d\.\d)/(static|interactive)/(.*).html?$', 'docs.views.docpage'),
-    (r'^docs/(current|\d\.\d)/(static|interactive)/$', 'docs.views.docsrootpage'),
-    (r'^docs/(current|\d\.\d)/$', 'docs.views.redirect_root'),
+    (r'^docs/(current|devel|\d\.\d)/(static|interactive)/(.*).html?$', 'docs.views.docpage'),
+    (r'^docs/(current|devel|\d\.\d)/(static|interactive)/$', 'docs.views.docsrootpage'),
+    (r'^docs/(current|devel|\d\.\d)/$', 'docs.views.redirect_root'),
 
     (r'^community/$', 'core.views.community'),
     (r'^community/contributors/$', 'contributors.views.completelist'),