Explicitly list beta and development versions in docs as "devel"

Previously we listed both those as unsupported, which confused some users
particularly with new beta releases. While they are technically not supported
yet, it gave off the image that specific features would not be in newer
versions anymore, since they got listed as unsupported.

In passing, fix the style of the links in case they only exist in old
versions, which would put an extra | character in the version list.

diff --git a/pgweb/docs/views.py b/pgweb/docs/views.py
index eea782af06a48bdf85222799ccc1e9df852c84da..c0bb86a480a368f863a85680f94da2bbe0a5a2d8 100644 (file)
--- a/pgweb/docs/views.py
+++ b/pgweb/docs/views.py
@@ -43,7 +43,10 @@ def docpage(request, version, typ, filename):
 
        fullname = "%s.%s" % (filename, extension)
        page = get_object_or_404(DocPage, version=ver, file=fullname)
-       versions = DocPage.objects.filter(file=fullname).extra(select={'supported':"COALESCE((SELECT supported FROM core_version v WHERE v.tree=version), 'f')"}).order_by('-supported', '-version').only('version', 'file')
+       versions = DocPage.objects.filter(file=fullname).extra(select={
+               'supported':"COALESCE((SELECT supported FROM core_version v WHERE v.tree=version), 'f')",
+               'beta':"CASE WHEN (SELECT beta FROM core_version v WHERE v.tree=version)='t' THEN true WHEN version=0 THEN true ELSE false END",
+       }).order_by('-supported', '-version').only('version', 'file')
 
        if typ=="interactive":
                comments = DocComment.objects.filter(version=ver, file=fullname, approved=True).order_by('posted_at')
@@ -53,7 +56,8 @@ def docpage(request, version, typ, filename):
        return render_to_response('docs/docspage.html', {
                'page': page,
                'supported_versions': [v for v in versions if v.supported],
-               'unsupported_versions': [v for v in versions if not v.supported],
+               'devel_versions': [v for v in versions if not v.supported and v.beta],
+               'unsupported_versions': [v for v in versions if not v.supported and not v.beta],
                'title': page.title,
                'doc_type': typ,
                'comments': comments,

diff --git a/templates/docs/docspage.html b/templates/docs/docspage.html
index 0dcef1071a484a94fc443d3341d7a4bc32a6dfed..df534d9528a3e3a0693145e59952e0af3216aba8 100644 (file)
--- a/templates/docs/docspage.html
+++ b/templates/docs/docspage.html
@@ -40,8 +40,8 @@
 <a href="/" title="Home">Home</a> &rarr; <a href="/docs" title="Documentation">Documentation</a> &rarr; <a href="/docs/manuals" title="Manuals">Manuals</a> &rarr; <a href="/docs/{{page.display_version}}/{{doc_type}}/{{doc_index_filename}}">PostgreSQL {{page.display_version}}</a>{%if loaddate%} ({{loaddate|date:"Y-m-d H:i:s"}}){%endif%}
 </div>
 <div id="docVersions">
-{%if supported_versions%}
 This page in other versions:
+{%if supported_versions%}
 {%for ver in supported_versions %}
        {%if not forloop.first %}/{%endif%}
        {%if ver.version == page.version %}
@@ -51,8 +51,21 @@ This page in other versions:
        {%endif%}
 {%endfor%}
 {%endif%}
+
+{%if devel_versions%}
+{%if supported_versions%}&nbsp;|&nbsp; {%endif%}Development versions:
+{%for ver in devel_versions %}
+       {%if not forloop.first %}/{%endif%}
+       {%if ver.version == page.version %}
+       <b>{{ver.display_version}}</b>
+       {% else %}
+       <a href="/docs/{{ver.display_version}}/{{doc_type}}/{{ver.file}}" title="This page in version {{ver.display_version}}" rel="nofollow">{{ver.display_version}}</a>
+       {%endif%}
+{%endfor%}
+{%endif%}
+
 {%if unsupported_versions%}
-&nbsp;|&nbsp; Unsupported versions:
+{%if supported_versions or devel_versions%}&nbsp;|&nbsp; {%endif%}Unsupported versions:
 {%for ver in unsupported_versions %}
        {%if not forloop.first %}/{%endif%}
        {%if ver.version == page.version %}