Added item/block details only to logged in users

This commit is contained in:
Felipe Martín 2013-05-29 17:38:36 +02:00
parent 199dae3695
commit 24c54e50e5
4 changed files with 79 additions and 5 deletions

View File

@ -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 %}

View File

@ -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 %}

View File

@ -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'})

View File

@ -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'),