Added base template, added minimu UI kit

nylar · May 16, 2015 · 5c8d523 · 5c8d523
1 parent c9e9a35
commit 5c8d523
Show file tree

Hide file tree

Showing 9 changed files with 92 additions and 19 deletions.
diff --git a/fora/settings.py b/fora/settings.py
@@ -58,7 +58,7 @@
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
+        'DIRS': [os.path.join(BASE_DIR, 'fora/templates')],
         'APP_DIRS': True,
         'OPTIONS': {
             'context_processors': [
@@ -103,3 +103,7 @@
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 
 STATIC_URL = '/static/'
+
+STATICFILES_DIRS = (
+    os.path.join(BASE_DIR, 'fora/static/'),
+)
diff --git a/fora/static/css/minimu.min.css b/fora/static/css/minimu.min.css
diff --git a/fora/static/js/app.js b/fora/static/js/app.js
@@ -0,0 +1,6 @@
+$(document).ready(function() {
+    $(".chosen").chosen({
+        width: "250px",
+        "disable_search": true
+    });
+});
diff --git a/fora/templates/base.html b/fora/templates/base.html
@@ -0,0 +1,20 @@
+{% load staticfiles %}
+
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+
+        <title>Fora</title>
+
+        {% block extra_css %}{% endblock extra_css %}
+
+        <link rel="stylesheet" type="text/css" href="https://cdnjs.cloudflare.com/ajax/libs/meyer-reset/2.0/reset.min.css">
+        <link rel="stylesheet" type="text/css" href="http://fonts.googleapis.com/css?family=Open+Sans:400,600">
+        <link rel="stylesheet" type="text/css" href="{% static 'css/minimu.min.css' %}">
+    </head>
+    <body>
+        {% block content %}{% endblock content %}
+        {% block extra_js %}{% endblock extra_js %}
+    </body>
+</html>
diff --git a/forums/templates/forums/forum_detail.html b/forums/templates/forums/forum_detail.html
@@ -1,5 +1,10 @@
-<a href="{% url 'forums:update' object.slug %}">Update</a>
-<a href="{% url 'forums:visibility' object.slug %}">Change Visibility</a>
+{% extends "base.html" %}
+
+{% block content %}
+<a href="{% url 'threads:new' %}" class="btn btn-green">New Thread</a>
+<a href="{% url 'forums:update' object.slug %}" class="btn btn-grey">Update</a>
+<a href="{% url 'forums:visibility' object.slug %}" class="btn btn-grey">Change Visibility</a>
 
 <h1>{{ object.name }}</h1>
-<p>{{ object.description }}</p>
+<p>{{ object.description }}</p>
+{% endblock content %}
diff --git a/forums/templates/forums/forum_form.html b/forums/templates/forums/forum_form.html
@@ -1,5 +1,13 @@
+{% extends "base.html" %}
+
+{% block content %}
 <form action="" method="post">
     {% csrf_token %}
     {{ form.as_p }}
-    <input type="submit" value="Create Forum" />
-</form>
+    {% if object %}
+    <input type="submit" value="Update Forum" class="btn btn-green" />
+    {% else %}
+    <input type="submit" value="Create Forum" class="btn btn-green" />
+    {% endif %}
+</form>
+{% endblock content %}
diff --git a/forums/templates/forums/forum_list.html b/forums/templates/forums/forum_list.html
@@ -1,10 +1,27 @@
-<a href="{% url 'forums:new' %}">New Forum</a>
+{% extends "base.html" %}
 
-{% for forum in object_list %}
-<div>
-    <h1>{{ forum.name }}</h1>
-    <p>{{ forum.description }}</p>
-</div>
-{% empty %}
-<p>No forums found</p>
-{% endfor %}
+{% block content %}
+<a href="{% url 'forums:new' %}" class="btn btn-green">New Forum</a>
+
+
+<table>
+    <thead>
+        <tr>
+            <th>Name</th>
+            <th>Description</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for forum in object_list %}
+        <tr>
+            <td><a href="{% url 'forums:show' forum.slug %}">{{ forum.name }}</a></td>
+            <td>{{ forum.description }}</td>
+        </tr>
+        {% empty %}
+        <tr>
+            <td colspan="2">No forums found</td>
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>  
+{% endblock content %}
diff --git a/threads/templates/threads/thread_detail.html b/threads/templates/threads/thread_detail.html
@@ -1,3 +1,7 @@
+{% extends "base.html" %}
+
+{% block content %}
 <h1>{{ object.subject }}</h1>
-<p>Forum: <a href="{% url 'forums:show' object.forum.slug %}"></a></p>
-<p>{{ object.created }}</p>
+<p>Forum: <a href="{% url 'forums:show' object.forum.slug %}">{{ object.forum.name }}</a></p>
+<p>{{ object.created }}</p>
+{% endblock content %}
diff --git a/threads/templates/threads/thread_form.html b/threads/templates/threads/thread_form.html
@@ -1,5 +1,13 @@
+{% extends "base.html" %}
+
+{% block content %}
 <form action="" method="post">
     {% csrf_token %}
     {{ form.as_p }}
-    <input type="submit" value="Create Thread" />
-</form>
+    {% if object %}
+    <input type="submit" value="Update Thread" class="btn btn-green" />
+    {% else %}
+    <input type="submit" value="Create Thread" class="btn btn-green" />
+    {% endif %}
+</form>
+{% endblock content %}