From 24c54e50e5607cd514351bdda52d139926a52462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Mart=C3=ADn?= <fmartin@bytepix.com>
Date: Wed, 29 May 2013 17:38:36 +0200
Subject: [PATCH] Added item/block details only to logged in users

---
 .../database/templates/blocks_detail.html     | 27 +++++++++++++++++++
 .../database/templates/items_detail.html      | 27 +++++++++++++++++++
 minecraftcodex/database/views.py              | 26 +++++++++++++++---
 minecraftcodex/herobrine/urls.py              |  4 +--
 4 files changed, 79 insertions(+), 5 deletions(-)
 create mode 100644 minecraftcodex/database/templates/blocks_detail.html
 create mode 100644 minecraftcodex/database/templates/items_detail.html

diff --git a/minecraftcodex/database/templates/blocks_detail.html b/minecraftcodex/database/templates/blocks_detail.html
new file mode 100644
index 0000000..7d676da
--- /dev/null
+++ b/minecraftcodex/database/templates/blocks_detail.html
@@ -0,0 +1,27 @@
+{% extends "layout.html" %}
+
+{% block content %}
+<div class="row-fluid">
+    <div class="span9">
+        <h1>{{ item.name() }}</h1>
+        <hr />
+        <h3>Can drop</h3>
+        ...
+        <h3>Used in</h3>
+        ...
+    </div>
+    <div class="span3">
+        <div class="well">
+            <div class="codexicon x8 margin-auto text-center">
+                {% if item.main_texture %}
+                <img src="/static/textures/{{ item.main_texture.get_image(8) }}" />
+                {% endif %}
+            </div>
+            <ul>
+                <li>Data value: {{ item.data_value + 256 }}</li>
+            </li>
+            <div class="clearfix"></div>
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/minecraftcodex/database/templates/items_detail.html b/minecraftcodex/database/templates/items_detail.html
new file mode 100644
index 0000000..7d676da
--- /dev/null
+++ b/minecraftcodex/database/templates/items_detail.html
@@ -0,0 +1,27 @@
+{% extends "layout.html" %}
+
+{% block content %}
+<div class="row-fluid">
+    <div class="span9">
+        <h1>{{ item.name() }}</h1>
+        <hr />
+        <h3>Can drop</h3>
+        ...
+        <h3>Used in</h3>
+        ...
+    </div>
+    <div class="span3">
+        <div class="well">
+            <div class="codexicon x8 margin-auto text-center">
+                {% if item.main_texture %}
+                <img src="/static/textures/{{ item.main_texture.get_image(8) }}" />
+                {% endif %}
+            </div>
+            <ul>
+                <li>Data value: {{ item.data_value + 256 }}</li>
+            </li>
+            <div class="clearfix"></div>
+        </div>
+    </div>
+</div>
+{% endblock %}
diff --git a/minecraftcodex/database/views.py b/minecraftcodex/database/views.py
index afe2793..dd7243e 100644
--- a/minecraftcodex/database/views.py
+++ b/minecraftcodex/database/views.py
@@ -2,6 +2,7 @@ from django.shortcuts import render_to_response
 from database.models import Version, Item, Block
 from django.core.paginator import Paginator
 from django.template import RequestContext
+from django.http import HttpResponseForbidden, Http404
 
 
 def home(request):
@@ -70,7 +71,17 @@ def items(request):
 
 
 def items_detail(request, data_value):
-    pass
+    section = 'items'
+    if request.user.is_authenticated():
+        item = Item.objects.get(data_value=int(data_value)-256)
+        data = {
+            'section': section,
+            'item': item
+        }
+        context = RequestContext(request, data)
+        return render_to_response('items_detail.html', context_instance=context)
+    else:
+        raise Http404
 
 
 def blocks(request):
@@ -96,8 +107,17 @@ def blocks(request):
 
 
 def blocks_detail(request, data_value):
-    pass
-
+    section = 'blocks'
+    if request.user.is_authenticated():
+        item = Block.objects.get(data_value=int(data_value))
+        data = {
+            'section': section,
+            'item': item
+        }
+        context = RequestContext(request, data)
+        return render_to_response('blocks_detail.html', context_instance=context)
+    else:
+        raise Http404
 
 def about(request):
     context = RequestContext(request, {'section': 'about'})
diff --git a/minecraftcodex/herobrine/urls.py b/minecraftcodex/herobrine/urls.py
index 61e982b..49e1117 100644
--- a/minecraftcodex/herobrine/urls.py
+++ b/minecraftcodex/herobrine/urls.py
@@ -37,12 +37,12 @@ urlpatterns = patterns('',
     url(r'^versions/', 'database.views.versions', name='version_list'),
 
     # Items
-    url(r'^items/', 'database.views.items', name='items_list'),
     url(r'^items/(?P<data_value>\d+)/', 'database.views.items_detail', name='items_detail'),
+    url(r'^items/', 'database.views.items', name='items_list'),
 
     # Items
-    url(r'^blocks/', 'database.views.blocks', name='blocks_list'),
     url(r'^blocks/(?P<data_value>\d+)/', 'database.views.blocks_detail', name='blocks_detail'),
+    url(r'^blocks/', 'database.views.blocks', name='blocks_list'),
 
     # Blog
     url(r'^blog/$', 'blog.views.blog', name='blog_list'),