From 9190ff5fdd63263022bffdc8568836598bd75c66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Mart=C3=ADn?= <fmartin@bytepix.com>
Date: Fri, 24 May 2013 17:34:36 +0200
Subject: [PATCH] Added new info to versions, with a single page for each
 version. Added downloads to list

---
 minecraftcodex/database/models.py             |  2 +-
 .../database/templates/version.html           | 21 +++++++++
 .../database/templates/versions.html          | 44 ++++++++++++-------
 minecraftcodex/database/views.py              |  9 +++-
 minecraftcodex/herobrine/urls.py              |  2 +
 5 files changed, 60 insertions(+), 18 deletions(-)
 create mode 100644 minecraftcodex/database/templates/version.html

diff --git a/minecraftcodex/database/models.py b/minecraftcodex/database/models.py
index 9a7619b..85b0ab4 100644
--- a/minecraftcodex/database/models.py
+++ b/minecraftcodex/database/models.py
@@ -111,7 +111,7 @@ class VersionAdmin(admin.ModelAdmin):
     ordering = ('-date', '-version_number')
 
     def url_html(self, obj):
-        if obj.url != '':
+        if obj.url:
             return ('<a href="%s">%s</a>' % (obj.url, obj.url))
         else:
             return "--"
diff --git a/minecraftcodex/database/templates/version.html b/minecraftcodex/database/templates/version.html
new file mode 100644
index 0000000..fa753f1
--- /dev/null
+++ b/minecraftcodex/database/templates/version.html
@@ -0,0 +1,21 @@
+{% extends "layout.html" %}
+
+{% block head_title %}
+{{ super() }} | Version | {{ item.version_number }}
+{% endblock %}
+
+{% block content %}
+    <h1>Minecraft versions</h1>
+    <hr />
+    <a href="/versions"><i class="icon-arrow-left"></i> Go back</a>
+    <h2>{% if item.status != 'release' %}{{ item.status }}{% endif %} {{ item.version_number }}</h2>
+    Released on {{ item.date }}
+    {% if item.jarfiles %}
+        <h3>Downloads</h3>
+        {% for jarfile in item.jarfiles %}
+            <button href="{{ jarfile.url }}" class="btn btn-info btn-small">{{ jarfile.description|capitalize }}</button>
+        {% endfor %}
+    {% endif %}
+    <h3>Changelog</h3>
+    <p>{{ item.changelog|nl2br }}</p>
+{% endblock %}
diff --git a/minecraftcodex/database/templates/versions.html b/minecraftcodex/database/templates/versions.html
index 92c9981..0cf3651 100644
--- a/minecraftcodex/database/templates/versions.html
+++ b/minecraftcodex/database/templates/versions.html
@@ -5,31 +5,45 @@
 {% endblock %}
 
 {% block content %}
-    <table class="table table-bordered">
+    <h1>Minecraft versions</h1>
+    <hr />
+    <table class="table table-condensed table-hover">
         <thead>
             <tr>
-                <th nowrap="nowrap">Version number</th>
-                <th>Released</th>
-                <th>Changes</th>
+                <th><div class="text-center">Status</div></th>
+                <th nowrap="nowrap"><div class="text-center">Version number</div></th>
+                <th><div class="text-center">Release date</div></th>
+                <th>Downloads</th>
+                <th></th>
             </tr>
         </thead>
         <tbody>
-            <h1>Minecraft versions</h1>
-            <hr />
             {% for item in page.object_list %}
             <tr>
-                <td nowrap="nowrap">
-                    <p class="text-center">
-                        {{ item.status }} {{ item.version_number }}
-                    </p>
+                <td>
+                   <div class="text-center">{{ item.status }}</div>
+                </td>
+                <td nowrap="nowrap" width="20%">
+                    <div class="text-center">{{ item.version_number }} </div>
                 </td>
                 <td>
-                    <p class="text-center">
-                        {{ item.date }}
-                    </p>
+                    <div class="text-center">{{ item.date }}</div>
                 </td>
                 <td>
-                    {{ item.changelog|nl2br }}
+                    {% if item.jarfiles %}
+                        {% for jarfile in item.jarfiles %}
+                            <button href="{{ jarfile.url }}" class="btn btn-info btn-small">{{ jarfile.description|capitalize }}</button>
+                        {% endfor %}
+                    {% endif %}
+                </td>
+                <td>
+                    <div class="text-right">
+                        {% if item.status == 'release' %}
+                            <a href="{{ url('version_release', item.version_number)}}">More details &raquo;</a>
+                        {% else %}
+                            <a href="{{ url('version', item.status, item.version_number)}}">More details &raquo;</a>
+                        {% endif %}
+                    </div>
                 </td>
             </tr>
             {% endfor %}
@@ -39,7 +53,7 @@
         <ul>
             {% for p in range(1, paginator.num_pages) %}
             <li {% if p == page_number %}class="active"{% endif %}>
-                <a href="?page={{p}}">{{ p }}</a>
+                <a href="?page={{ p }}">{{ p }}</a>
             </li>
             {% endfor %}
         </ul>
diff --git a/minecraftcodex/database/views.py b/minecraftcodex/database/views.py
index cd696a8..0a60fa2 100644
--- a/minecraftcodex/database/views.py
+++ b/minecraftcodex/database/views.py
@@ -11,8 +11,8 @@ def home(request):
 
 def versions(request):
     section = 'versions'
-    versions = Version.objects.all().order_by('-date', '-version_number')
-    paginator = Paginator(versions, 10)
+    versions = Version.objects.filter(snapshot=False).order_by('-date', '-version_number')
+    paginator = Paginator(versions, 50)
     page_number = 1
 
     if 'page' in request.GET:
@@ -30,6 +30,11 @@ def versions(request):
 
     return render_to_response('versions.html', context_instance=context)
 
+def version(request, version, status='release'):
+    item = Version.objects.get(status=status, version_number=version)
+    context = RequestContext(request, { 'item': item })
+    return render_to_response('version.html', context_instance=context)
+
 
 def about(request):
     context = RequestContext(request)
diff --git a/minecraftcodex/herobrine/urls.py b/minecraftcodex/herobrine/urls.py
index 4bafed9..8a2f92c 100644
--- a/minecraftcodex/herobrine/urls.py
+++ b/minecraftcodex/herobrine/urls.py
@@ -20,6 +20,8 @@ urlpatterns = patterns('',
     # Static
     url(r'^about/', 'database.views.about'),
     # Database
+    url(r'^versions/(?P<version>[a-z0-9\.\_]+)/', 'database.views.version', name='version_release'),
+    url(r'^versions/(?P<status>[a-z]+)\-(?P<version>[a-z0-9\.\_]+)/', 'database.views.version', name='version'),
     url(r'^versions/', 'database.views.versions'),
     # Robots
     (r'^robots\.txt$', lambda r: HttpResponse("", mimetype="text/plain")),