Merge branch 'bootstrap' into 'master'
Add initial bootstrap3 support See merge request !6
This commit is contained in:
commit
88c130c7a3
|
|
@ -40,6 +40,7 @@ INSTALLED_APPS = (
|
||||||
'django.contrib.sites',
|
'django.contrib.sites',
|
||||||
'django_extensions',
|
'django_extensions',
|
||||||
'adminplus',
|
'adminplus',
|
||||||
|
'bootstrap3',
|
||||||
'registration',
|
'registration',
|
||||||
'rest_framework',
|
'rest_framework',
|
||||||
'countdown',
|
'countdown',
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,8 @@
|
||||||
|
"""General/baselite/site-wide URLs."""
|
||||||
|
|
||||||
from django.conf.urls import patterns, include, url
|
from django.conf.urls import patterns, include, url
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
from django.views.generic import TemplateView
|
||||||
|
|
||||||
from adminplus.sites import AdminSitePlus
|
from adminplus.sites import AdminSitePlus
|
||||||
|
|
||||||
|
|
@ -7,7 +10,7 @@ admin.site = AdminSitePlus()
|
||||||
admin.autodiscover()
|
admin.autodiscover()
|
||||||
|
|
||||||
urlpatterns = patterns('',
|
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'^dispatch/', include('dispatch.urls')),
|
||||||
url(r'^markov/', include('markov.urls')),
|
url(r'^markov/', include('markov.urls')),
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,9 @@
|
||||||
"""URL patterns for markov stuff."""
|
"""URL patterns for markov stuff."""
|
||||||
|
|
||||||
from django.conf.urls import patterns, url
|
from django.conf.urls import patterns, url
|
||||||
|
from django.views.generic import TemplateView
|
||||||
|
|
||||||
urlpatterns = patterns('markov.views',
|
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<context_id>\d+)/$', 'context_index', name='markov_context_index'),
|
url(r'^context/(?P<context_id>\d+)/$', 'context_index', name='markov_context_index'),
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -27,6 +27,4 @@ def context_index(request, context_id):
|
||||||
chain = " ".join(markovlib.generate_line(context))
|
chain = " ".join(markovlib.generate_line(context))
|
||||||
end_t = time.time()
|
end_t = time.time()
|
||||||
|
|
||||||
return render(request, 'context.html', {'chain': chain,
|
return render(request, 'markov/context.html', {'chain': chain, 'context': context, 'elapsed': end_t - start_t})
|
||||||
'context': context,
|
|
||||||
'elapsed': end_t - start_t})
|
|
||||||
|
|
|
||||||
|
|
@ -1,33 +1,90 @@
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
|
{% extends 'bootstrap.html' %}
|
||||||
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
{% load bootstrap3 %}
|
||||||
{% load url from future %}
|
{% load static %}
|
||||||
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
|
|
||||||
<head>{% load static %}
|
|
||||||
<title>{% block title %}{% endblock %} - dr.botzo</title>
|
|
||||||
<link href="{% get_static_prefix %}css/core.css" rel="stylesheet" type='text/css' />
|
|
||||||
{% block extra_media %}{% endblock %}
|
|
||||||
</head>
|
|
||||||
|
|
||||||
<body>
|
{% block bootstrap3_extra_head %}
|
||||||
<div id="mainwrapper">
|
{% block extra_meta %}{% endblock %}
|
||||||
<div id="body">
|
<link href="{% get_static_prefix %}css/core.css" rel="stylesheet" type='text/css' />
|
||||||
{% if messages %}
|
<link href='//fonts.googleapis.com/css?family=Oxygen' rel='stylesheet' type='text/css'>
|
||||||
<div id="messages">
|
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
|
||||||
<ul class="messages">
|
{% block extra_media %}{% endblock %}
|
||||||
{% for message in messages %}
|
{% endblock %}
|
||||||
<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
|
|
||||||
{% endfor %}
|
{% block bootstrap3_content %}
|
||||||
|
<div id="header" class="navbar navbar-fixed-top navbar-inverse">
|
||||||
|
<div class="container">
|
||||||
|
<div class="navbar-header">
|
||||||
|
{% block navbarbrand %}
|
||||||
|
<a class="navbar-brand" href="{% url 'home' %}">{{ site.domain }}</a>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
<!-- .navbar-toggle is used as the toggle for collapsed navbar content -->
|
||||||
|
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
|
||||||
|
<span class="icon-bar"></span>
|
||||||
|
<span class="icon-bar"></span>
|
||||||
|
<span class="icon-bar"></span>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
<div class="navbar-collapse collapse" aria-expanded="false" style="height: 1px;">
|
||||||
|
<div class="navbar-right">
|
||||||
|
<ul class="nav navbar-nav">
|
||||||
|
{% if user.is_authenticated %}
|
||||||
|
<li class="dropdown">
|
||||||
|
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
|
||||||
|
{{ user }}
|
||||||
|
<b class="caret"></b>
|
||||||
|
</a>
|
||||||
|
<ul class="dropdown-menu">
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'auth_password_change' %}">
|
||||||
|
<i class="fa fa-pencil-square-o"></i>
|
||||||
|
Change password
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'auth_logout' %}">
|
||||||
|
<i class="fa fa-power-off"></i>
|
||||||
|
Log out
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% if user.is_authenticated and user.is_staff %}
|
||||||
|
<li>
|
||||||
|
<a href="/admin/">
|
||||||
|
<i class="fa fa-database"></i>
|
||||||
|
Admin
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
{% endif %}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</li>
|
||||||
|
{% else %}
|
||||||
|
<ul class="nav navbar-nav">
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'auth_login' %}?next={{ request.path }}">Log in</a>
|
||||||
|
</li>
|
||||||
|
<li>
|
||||||
|
<a href="{% url 'registration_register' %}">Sign up</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
</ul>
|
||||||
<div id="content"><div class="inner">
|
|
||||||
{% block content %}{% endblock %}
|
|
||||||
</div></div>
|
|
||||||
</div>
|
</div>
|
||||||
|
{% block navbar_menu %}
|
||||||
|
<ul class="nav navbar-nav">
|
||||||
|
<li><a href="{% url 'markov_index' %}">Markov</a></li>
|
||||||
|
<li><a href="{% url 'races_index' %}">Races</a></li>
|
||||||
|
</ul>
|
||||||
|
{% endblock %}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</div>
|
||||||
</html>
|
|
||||||
<!--
|
{% autoescape off %}{% bootstrap_messages %}{% endautoescape %}
|
||||||
vi:tabstop=4:expandtab:autoindent
|
|
||||||
-->
|
<div id="content">
|
||||||
|
{% block content %}(no content){% endblock %}
|
||||||
|
</div>
|
||||||
|
|
||||||
|
{% block footer %}<div id="footer" class="container">{% block extrafooter %}{% endblock %}</div>{% endblock %}
|
||||||
|
{% endblock %}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,3 @@
|
||||||
|
{% extends 'bootstrap3/bootstrap3.html' %}
|
||||||
|
|
||||||
|
{% block bootstrap3_title %}{% block title %}{% endblock %} - {{ site.domain }}{% endblock %}
|
||||||
|
|
@ -1,6 +1,10 @@
|
||||||
{% extends 'base.html' %}
|
{% extends 'base.html' %}
|
||||||
|
|
||||||
{% block title %}index{% endblock %}
|
{% block title %}{{ site.domain }}{% endblock %}
|
||||||
<!--
|
|
||||||
vi:tabstop=4:expandtab:autoindent
|
{% block navbarbrand %}
|
||||||
-->
|
<a class="navbar-brand navbar-brand-active" href="{% url 'home' %}">{{ site.domain }}</a>
|
||||||
|
{% endblock %}
|
||||||
|
|
||||||
|
{% block content %}
|
||||||
|
{% endblock content %}
|
||||||
|
|
|
||||||
|
|
@ -4,6 +4,7 @@ colorama==0.3.6
|
||||||
distlib==0.2.1
|
distlib==0.2.1
|
||||||
Django==1.8.8
|
Django==1.8.8
|
||||||
django-adminplus==0.3
|
django-adminplus==0.3
|
||||||
|
django-bootstrap3==7.0.1
|
||||||
django-extensions==1.5.3
|
django-extensions==1.5.3
|
||||||
django-filter==0.10.0
|
django-filter==0.10.0
|
||||||
django-registration-redux==1.4
|
django-registration-redux==1.4
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue