Moved studio to a new app
This commit is contained in:
parent
c0b87d9e6a
commit
2431d62c8f
|
@ -72,7 +72,7 @@ Thank you!
|
||||||
<ul class="nav pull-right">
|
<ul class="nav pull-right">
|
||||||
{% if user.is_authenticated() %}
|
{% if user.is_authenticated() %}
|
||||||
<li class="{% if section == 'studio' %}active{% endif %}">
|
<li class="{% if section == 'studio' %}active{% endif %}">
|
||||||
<a href="{{ url('studio') }}">Studio</a>
|
<a href="{{ url('studio_main') }}">Studio</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
<li class="{% if section == 'blog' %}active{% endif %}">
|
<li class="{% if section == 'blog' %}active{% endif %}">
|
||||||
|
|
|
@ -124,10 +124,6 @@ def about(request):
|
||||||
return render_to_response('about.html', context_instance=context)
|
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):
|
def error404(request):
|
||||||
from raven.contrib.django.raven_compat.models import sentry_exception_handler
|
from raven.contrib.django.raven_compat.models import sentry_exception_handler
|
||||||
sentry_exception_handler(request=request)
|
sentry_exception_handler(request=request)
|
||||||
|
|
|
@ -132,6 +132,7 @@ INSTALLED_APPS = (
|
||||||
'django.contrib.admin',
|
'django.contrib.admin',
|
||||||
'database',
|
'database',
|
||||||
'blog',
|
'blog',
|
||||||
|
'studio',
|
||||||
'south'
|
'south'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
@ -50,7 +50,7 @@ urlpatterns = patterns('',
|
||||||
'blog.views.blog_item', name='blog_item'),
|
'blog.views.blog_item', name='blog_item'),
|
||||||
|
|
||||||
# Admin only
|
# Admin only
|
||||||
url(r'^studio/', 'database.views.studio', name='studio'),
|
url(r'^studio/', 'studio.views.main', name='studio_main'),
|
||||||
|
|
||||||
# Robots
|
# Robots
|
||||||
(r'^robots\.txt$', lambda r: HttpResponse("", mimetype="text/plain")),
|
(r'^robots\.txt$', lambda r: HttpResponse("", mimetype="text/plain")),
|
||||||
|
|
|
@ -0,0 +1,3 @@
|
||||||
|
from django.db import models
|
||||||
|
|
||||||
|
# Create your models here.
|
|
@ -2,6 +2,8 @@
|
||||||
|
|
||||||
{% block head %}
|
{% block head %}
|
||||||
{{ super() }}
|
{{ 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 %}
|
{% endblock %}
|
||||||
|
|
||||||
{% block header %}
|
{% block header %}
|
||||||
|
@ -10,12 +12,24 @@
|
||||||
<div class="navbar-inner">
|
<div class="navbar-inner">
|
||||||
<div class="container" style="width: auto;">
|
<div class="container" style="width: auto;">
|
||||||
<a class="brand" href="/">
|
<a class="brand" href="/">
|
||||||
Minecraft Codex : Block Studio
|
Minecraft Codex : Studio
|
||||||
</a>
|
</a>
|
||||||
{#<div class="nav-collapse">#}
|
{#<div class="nav-collapse">#}
|
||||||
<div>
|
<div>
|
||||||
<ul class="nav">
|
<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>
|
||||||
<ul class="nav pull-right">
|
<ul class="nav pull-right">
|
||||||
<li>
|
<li>
|
||||||
|
@ -33,13 +47,13 @@
|
||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<div class="studio-editor">
|
<div class="studio-editor">
|
||||||
<div class="span3">
|
<div class="span4">
|
||||||
<div class="well">Left</div>
|
<div class="well">Left</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="span6">
|
<div class="span8">
|
||||||
<div class="well">Canvas</div>
|
<div class="well">Canvas</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="span3">
|
<div class="span4">
|
||||||
<div class="well">Right</div>
|
<div class="well">Right</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
|
@ -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)
|
|
@ -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)
|
Loading…
Reference in New Issue