Moved studio to a new app

This commit is contained in:
Felipe Martín 2013-05-30 12:04:18 +02:00
parent c0b87d9e6a
commit 2431d62c8f
11 changed files with 48 additions and 11 deletions

View File

@ -72,7 +72,7 @@ Thank you!
<ul class="nav pull-right">
{% if user.is_authenticated() %}
<li class="{% if section == 'studio' %}active{% endif %}">
<a href="{{ url('studio') }}">Studio</a>
<a href="{{ url('studio_main') }}">Studio</a>
</li>
{% endif %}
<li class="{% if section == 'blog' %}active{% endif %}">

View File

@ -124,10 +124,6 @@ def about(request):
return render_to_response('about.html', context_instance=context)
def studio(request):
context = RequestContext(request)
return render_to_response('studio/main.html', context_instance=context)
def error404(request):
from raven.contrib.django.raven_compat.models import sentry_exception_handler
sentry_exception_handler(request=request)

View File

@ -132,6 +132,7 @@ INSTALLED_APPS = (
'django.contrib.admin',
'database',
'blog',
'studio',
'south'
)

View File

@ -50,7 +50,7 @@ urlpatterns = patterns('',
'blog.views.blog_item', name='blog_item'),
# Admin only
url(r'^studio/', 'database.views.studio', name='studio'),
url(r'^studio/', 'studio.views.main', name='studio_main'),
# Robots
(r'^robots\.txt$', lambda r: HttpResponse("", mimetype="text/plain")),

View File

View File

@ -0,0 +1,3 @@
from django.db import models
# Create your models here.

View File

View File

View File

@ -2,6 +2,8 @@
{% block head %}
{{ super() }}
<script type="text/javascript" src="/static/lib/jquery.2.0.0.js"></script>
<script type="text/javascript" src="/static/lib/bootstrap/js/bootstrap-dropdown.js"></script>
{% endblock %}
{% block header %}
@ -10,12 +12,24 @@
<div class="navbar-inner">
<div class="container" style="width: auto;">
<a class="brand" href="/">
Minecraft Codex : Block Studio
Minecraft Codex : Studio
</a>
{#<div class="nav-collapse">#}
<div>
<ul class="nav">
<li class="dropdown">
<a href="#" class="dropdown-toggle"
data-toggle="dropdown">
File
<b class="caret"></b>
</a>
<ul class="dropdown-menu">
<li><a href="#">New</a></li>
<li><a href="#">Save</a></li>
<li class="divider"></li>
<li><a href="{{ url('homepage') }}">Exit</a></li>
</ul>
</li>
</ul>
<ul class="nav pull-right">
<li>
@ -33,13 +47,13 @@
{% block content %}
<div class="studio-editor">
<div class="span3">
<div class="span4">
<div class="well">Left</div>
</div>
<div class="span6">
<div class="span8">
<div class="well">Canvas</div>
</div>
<div class="span3">
<div class="span4">
<div class="well">Right</div>
</div>
</div>

View File

@ -0,0 +1,16 @@
"""
This file demonstrates writing tests using the unittest module. These will pass
when you run "manage.py test".
Replace this with more appropriate tests for your application.
"""
from django.test import TestCase
class SimpleTest(TestCase):
def test_basic_addition(self):
"""
Tests that 1 + 1 always equals 2.
"""
self.assertEqual(1 + 1, 2)

View File

@ -0,0 +1,7 @@
from django.shortcuts import render_to_response
from django.template import RequestContext
def main(request):
context = RequestContext(request)
return render_to_response('studio/main.html', context_instance=context)