From 2431d62c8f220592ee09d1479367ddfd7ce82e5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felipe=20Mart=C3=ADn?= <fmartin@bytepix.com>
Date: Thu, 30 May 2013 12:04:18 +0200
Subject: [PATCH] Moved studio to a new app

---
 minecraftcodex/database/templates/layout.html |  2 +-
 minecraftcodex/database/views.py              |  4 ----
 minecraftcodex/herobrine/settings.py          |  1 +
 minecraftcodex/herobrine/urls.py              |  2 +-
 minecraftcodex/studio/__init__.py             |  0
 minecraftcodex/studio/models.py               |  3 +++
 minecraftcodex/studio/static/css/HI           |  0
 minecraftcodex/studio/static/js/HI            |  0
 .../templates/studio/main.html                | 24 +++++++++++++++----
 minecraftcodex/studio/tests.py                | 16 +++++++++++++
 minecraftcodex/studio/views.py                |  7 ++++++
 11 files changed, 48 insertions(+), 11 deletions(-)
 create mode 100644 minecraftcodex/studio/__init__.py
 create mode 100644 minecraftcodex/studio/models.py
 create mode 100644 minecraftcodex/studio/static/css/HI
 create mode 100644 minecraftcodex/studio/static/js/HI
 rename minecraftcodex/{database => studio}/templates/studio/main.html (54%)
 create mode 100644 minecraftcodex/studio/tests.py
 create mode 100644 minecraftcodex/studio/views.py

diff --git a/minecraftcodex/database/templates/layout.html b/minecraftcodex/database/templates/layout.html
index f1647be..8153644 100644
--- a/minecraftcodex/database/templates/layout.html
+++ b/minecraftcodex/database/templates/layout.html
@@ -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 %}">
diff --git a/minecraftcodex/database/views.py b/minecraftcodex/database/views.py
index 865938a..e00657b 100644
--- a/minecraftcodex/database/views.py
+++ b/minecraftcodex/database/views.py
@@ -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)
diff --git a/minecraftcodex/herobrine/settings.py b/minecraftcodex/herobrine/settings.py
index 005e8d9..67141fb 100644
--- a/minecraftcodex/herobrine/settings.py
+++ b/minecraftcodex/herobrine/settings.py
@@ -132,6 +132,7 @@ INSTALLED_APPS = (
     'django.contrib.admin',
     'database',
     'blog',
+    'studio',
     'south'
 )
 
diff --git a/minecraftcodex/herobrine/urls.py b/minecraftcodex/herobrine/urls.py
index 1f24af4..334449f 100644
--- a/minecraftcodex/herobrine/urls.py
+++ b/minecraftcodex/herobrine/urls.py
@@ -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")),
diff --git a/minecraftcodex/studio/__init__.py b/minecraftcodex/studio/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/minecraftcodex/studio/models.py b/minecraftcodex/studio/models.py
new file mode 100644
index 0000000..71a8362
--- /dev/null
+++ b/minecraftcodex/studio/models.py
@@ -0,0 +1,3 @@
+from django.db import models
+
+# Create your models here.
diff --git a/minecraftcodex/studio/static/css/HI b/minecraftcodex/studio/static/css/HI
new file mode 100644
index 0000000..e69de29
diff --git a/minecraftcodex/studio/static/js/HI b/minecraftcodex/studio/static/js/HI
new file mode 100644
index 0000000..e69de29
diff --git a/minecraftcodex/database/templates/studio/main.html b/minecraftcodex/studio/templates/studio/main.html
similarity index 54%
rename from minecraftcodex/database/templates/studio/main.html
rename to minecraftcodex/studio/templates/studio/main.html
index 4fce777..1a2bd14 100644
--- a/minecraftcodex/database/templates/studio/main.html
+++ b/minecraftcodex/studio/templates/studio/main.html
@@ -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>
diff --git a/minecraftcodex/studio/tests.py b/minecraftcodex/studio/tests.py
new file mode 100644
index 0000000..501deb7
--- /dev/null
+++ b/minecraftcodex/studio/tests.py
@@ -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)
diff --git a/minecraftcodex/studio/views.py b/minecraftcodex/studio/views.py
new file mode 100644
index 0000000..304e6ad
--- /dev/null
+++ b/minecraftcodex/studio/views.py
@@ -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)