From b9ab39991cbe8b5a7e7f4c12b8b3fe61ccad6df8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Mart=C3=ADn?= <fmartin@bytepix.com>
Date: Wed, 29 May 2013 14:33:33 +0200
Subject: [PATCH] Improved blocks and items listing layout a lot. Added details
 URL only viewable by admins

---
 minecraftcodex/database/templates/blocks.html | 30 +++++++++++++++++++
 minecraftcodex/database/templates/items.html  | 30 +++++++++++++++++++
 minecraftcodex/database/views.py              | 12 ++++++--
 minecraftcodex/herobrine/urls.py              |  2 ++
 4 files changed, 72 insertions(+), 2 deletions(-)

diff --git a/minecraftcodex/database/templates/blocks.html b/minecraftcodex/database/templates/blocks.html
index 5b98d7a..3a9a55e 100644
--- a/minecraftcodex/database/templates/blocks.html
+++ b/minecraftcodex/database/templates/blocks.html
@@ -3,6 +3,35 @@
 {% block content %}
     <h1>Blocks</h1>
     <hr />
+    <div class="row-fluid">
+        {% for item in page.object_list %}
+        <div class="span3">
+            {% if user.is_authenticated %}
+            <a href="{{ url('blocks_detail', item.data_value) }}">
+            {% else %}
+            <a href="#">
+            {% endif %}
+                <div class="well">
+                    <div class="pull-right text-right">
+                        <span class="badge">{{ item.data_value }}</span>
+                        <h5 class="text-black">{{ item.name() }}</h5>
+                    </div>
+                    <div class="codexicon x4 margin-auto pull-left">
+                        {% if item.main_texture %}
+                        <img src="/static/textures/{{ item.main_texture.get_image(4) }}" />
+                        {% endif %}
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+            </a>
+        </div>
+        {% if loop.index % 4 == 0 %}
+    </div>
+    <div class="row-fluid">
+        {% endif %}
+        {% endfor %}
+    </div>
+    {#
     <table class="table table-condensed table-hover">
         <thead>
             <tr>
@@ -31,6 +60,7 @@
             {% endfor %}
         </tbody>
     </table>
+    #}
     <div class="pagination pagination-centered">
         <ul>
             {% for p in range(1, paginator.num_pages+1) %}
diff --git a/minecraftcodex/database/templates/items.html b/minecraftcodex/database/templates/items.html
index dcff34a..ed12515 100644
--- a/minecraftcodex/database/templates/items.html
+++ b/minecraftcodex/database/templates/items.html
@@ -3,6 +3,35 @@
 {% block content %}
     <h1>Items</h1>
     <hr />
+    <div class="row-fluid">
+        {% for item in page.object_list %}
+        <div class="span3">
+            {% if user.is_authenticated %}
+            <a href="{{ url('items_detail', item.data_value + 256) }}">
+            {% else %}
+            <a href="#">
+            {% endif %}
+                <div class="well">
+                    <div class="pull-right text-right">
+                        <span class="badge">{{ item.data_value + 256 }}</span>
+                        <h5 class="text-black">{{ item.name() }}</h5>
+                    </div>
+                    <div class="codexicon x4 margin-auto pull-left">
+                        {% if item.main_texture %}
+                        <img src="/static/textures/{{ item.main_texture.get_image(4) }}" />
+                        {% endif %}
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+            </a>
+        </div>
+        {% if loop.index % 4 == 0 %}
+    </div>
+    <div class="row-fluid">
+        {% endif %}
+        {% endfor %}
+    </div>
+    {#
     <table class="table table-condensed table-hover">
         <thead>
             <tr>
@@ -31,6 +60,7 @@
             {% endfor %}
         </tbody>
     </table>
+    #}
     <div class="pagination pagination-centered">
         <ul>
             {% for p in range(1, paginator.num_pages+1) %}
diff --git a/minecraftcodex/database/views.py b/minecraftcodex/database/views.py
index a27aeb3..afe2793 100644
--- a/minecraftcodex/database/views.py
+++ b/minecraftcodex/database/views.py
@@ -51,7 +51,7 @@ def items(request):
     section = 'items'
 
     items = Item.objects.all().order_by('data_value')
-    paginator = Paginator(items, 50)
+    paginator = Paginator(items, 48)
     page_number = 1
 
     if 'page' in request.GET:
@@ -69,11 +69,15 @@ def items(request):
     return render_to_response('items.html', context_instance=context)
 
 
+def items_detail(request, data_value):
+    pass
+
+
 def blocks(request):
     section = 'blocks'
 
     items = Block.objects.all().order_by('data_value')
-    paginator = Paginator(items, 50)
+    paginator = Paginator(items, 48)
     page_number = 1
 
     if 'page' in request.GET:
@@ -91,6 +95,10 @@ def blocks(request):
     return render_to_response('blocks.html', context_instance=context)
 
 
+def blocks_detail(request, data_value):
+    pass
+
+
 def about(request):
     context = RequestContext(request, {'section': 'about'})
     return render_to_response('about.html', context_instance=context)
diff --git a/minecraftcodex/herobrine/urls.py b/minecraftcodex/herobrine/urls.py
index 4cf8bf0..61e982b 100644
--- a/minecraftcodex/herobrine/urls.py
+++ b/minecraftcodex/herobrine/urls.py
@@ -38,9 +38,11 @@ urlpatterns = patterns('',
 
     # Items
     url(r'^items/', 'database.views.items', name='items_list'),
+    url(r'^items/(?P<data_value>\d+)/', 'database.views.items_detail', name='items_detail'),
 
     # Items
     url(r'^blocks/', 'database.views.blocks', name='blocks_list'),
+    url(r'^blocks/(?P<data_value>\d+)/', 'database.views.blocks_detail', name='blocks_detail'),
 
     # Blog
     url(r'^blog/$', 'blog.views.blog', name='blog_list'),