diff --git a/dr_botzo/dr_botzo/settings.py b/dr_botzo/dr_botzo/settings.py index fcf93a7..f17a338 100644 --- a/dr_botzo/dr_botzo/settings.py +++ b/dr_botzo/dr_botzo/settings.py @@ -40,6 +40,7 @@ INSTALLED_APPS = ( 'django.contrib.sites', 'django_extensions', 'adminplus', + 'bootstrap3', 'registration', 'rest_framework', 'countdown', diff --git a/dr_botzo/dr_botzo/urls.py b/dr_botzo/dr_botzo/urls.py index 16760f5..105377d 100644 --- a/dr_botzo/dr_botzo/urls.py +++ b/dr_botzo/dr_botzo/urls.py @@ -1,5 +1,8 @@ +"""General/baselite/site-wide URLs.""" + from django.conf.urls import patterns, include, url from django.contrib import admin +from django.views.generic import TemplateView from adminplus.sites import AdminSitePlus @@ -7,7 +10,7 @@ admin.site = AdminSitePlus() admin.autodiscover() urlpatterns = patterns('', - url(r'^$', 'dr_botzo.views.home', name='home'), + url(r'^$', TemplateView.as_view(template_name='index.html'), name='home'), url(r'^dispatch/', include('dispatch.urls')), url(r'^markov/', include('markov.urls')), diff --git a/dr_botzo/markov/templates/context.html b/dr_botzo/markov/templates/markov/context.html similarity index 100% rename from dr_botzo/markov/templates/context.html rename to dr_botzo/markov/templates/markov/context.html diff --git a/dr_botzo/markov/templates/import_file.html b/dr_botzo/markov/templates/markov/import_file.html similarity index 100% rename from dr_botzo/markov/templates/import_file.html rename to dr_botzo/markov/templates/markov/import_file.html diff --git a/dr_botzo/markov/templates/teach_line.html b/dr_botzo/markov/templates/markov/teach_line.html similarity index 100% rename from dr_botzo/markov/templates/teach_line.html rename to dr_botzo/markov/templates/markov/teach_line.html diff --git a/dr_botzo/markov/urls.py b/dr_botzo/markov/urls.py index a1d0fd2..c56276f 100644 --- a/dr_botzo/markov/urls.py +++ b/dr_botzo/markov/urls.py @@ -1,8 +1,9 @@ """URL patterns for markov stuff.""" from django.conf.urls import patterns, url +from django.views.generic import TemplateView urlpatterns = patterns('markov.views', - url(r'^$', 'index', name='markov_index'), + url(r'^$', TemplateView.as_view(template_name='index.html'), name='markov_index'), url(r'^context/(?P\d+)/$', 'context_index', name='markov_context_index'), ) diff --git a/dr_botzo/markov/views.py b/dr_botzo/markov/views.py index 1415a7c..2975866 100644 --- a/dr_botzo/markov/views.py +++ b/dr_botzo/markov/views.py @@ -27,6 +27,4 @@ def context_index(request, context_id): chain = " ".join(markovlib.generate_line(context)) end_t = time.time() - return render(request, 'context.html', {'chain': chain, - 'context': context, - 'elapsed': end_t - start_t}) + return render(request, 'markov/context.html', {'chain': chain, 'context': context, 'elapsed': end_t - start_t}) diff --git a/dr_botzo/templates/races/index.html b/dr_botzo/races/templates/races/index.html similarity index 100% rename from dr_botzo/templates/races/index.html rename to dr_botzo/races/templates/races/index.html diff --git a/dr_botzo/templates/races/race_detail.html b/dr_botzo/races/templates/races/race_detail.html similarity index 100% rename from dr_botzo/templates/races/race_detail.html rename to dr_botzo/races/templates/races/race_detail.html diff --git a/dr_botzo/templates/base.html b/dr_botzo/templates/base.html index 6a72057..1ba1a23 100644 --- a/dr_botzo/templates/base.html +++ b/dr_botzo/templates/base.html @@ -1,33 +1,90 @@ - -{% load url from future %} - -{% load static %} - {% block title %}{% endblock %} - dr.botzo - - {% block extra_media %}{% endblock %} - +{% extends 'bootstrap.html' %} +{% load bootstrap3 %} +{% load static %} - -
-
- {% if messages %} -
-
    - {% for message in messages %} - {{ message }} - {% endfor %} +{% block bootstrap3_extra_head %} + {% block extra_meta %}{% endblock %} + + + + {% block extra_media %}{% endblock %} +{% endblock %} + +{% block bootstrap3_content %} +
+ {% block navbar_menu %} + + {% endblock %} +
- - - + + + {% autoescape off %}{% bootstrap_messages %}{% endautoescape %} + +
+ {% block content %}(no content){% endblock %} +
+ + {% block footer %}{% endblock %} +{% endblock %} diff --git a/dr_botzo/templates/bootstrap.html b/dr_botzo/templates/bootstrap.html new file mode 100644 index 0000000..dbc202b --- /dev/null +++ b/dr_botzo/templates/bootstrap.html @@ -0,0 +1,3 @@ +{% extends 'bootstrap3/bootstrap3.html' %} + +{% block bootstrap3_title %}{% block title %}{% endblock %} - {{ site.domain }}{% endblock %} diff --git a/dr_botzo/templates/index.html b/dr_botzo/templates/index.html index e50527d..b969381 100644 --- a/dr_botzo/templates/index.html +++ b/dr_botzo/templates/index.html @@ -1,6 +1,10 @@ {% extends 'base.html' %} -{% block title %}index{% endblock %} - +{% block title %}{{ site.domain }}{% endblock %} + +{% block navbarbrand %} +{{ site.domain }} +{% endblock %} + +{% block content %} +{% endblock content %} diff --git a/requirements.txt b/requirements.txt index bc06277..7db8cd6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,6 +4,7 @@ colorama==0.3.6 distlib==0.2.1 Django==1.8.8 django-adminplus==0.3 +django-bootstrap3==7.0.1 django-extensions==1.5.3 django-filter==0.10.0 django-registration-redux==1.4