convert the very basic UI we had to bootstrap

This commit is contained in:
2016-03-30 16:00:49 -05:00
parent 5225d2bd6b
commit 85f9ae7d4d
13 changed files with 105 additions and 37 deletions

View File

@@ -1,33 +1,90 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
{% load url from future %}
<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>
{% extends 'bootstrap.html' %}
{% load bootstrap3 %}
{% load static %}
<body>
<div id="mainwrapper">
<div id="body">
{% if messages %}
<div id="messages">
<ul class="messages">
{% for message in messages %}
<li{% if message.tags %} class="{{ message.tags }}"{% endif %}>{{ message }}</li>
{% endfor %}
{% block bootstrap3_extra_head %}
{% block extra_meta %}{% endblock %}
<link href="{% get_static_prefix %}css/core.css" rel="stylesheet" type='text/css' />
<link href='//fonts.googleapis.com/css?family=Oxygen' rel='stylesheet' type='text/css'>
<link rel="stylesheet" href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css">
{% block extra_media %}{% endblock %}
{% endblock %}
{% 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>
</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 %}
<div id="content"><div class="inner">
{% block content %}{% endblock %}
</div></div>
</ul>
</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>
</body>
</html>
<!--
vi:tabstop=4:expandtab:autoindent
-->
</div>
{% autoescape off %}{% bootstrap_messages %}{% endautoescape %}
<div id="content">
{% block content %}(no content){% endblock %}
</div>
{% block footer %}<div id="footer" class="container">{% block extrafooter %}{% endblock %}</div>{% endblock %}
{% endblock %}

View File

@@ -0,0 +1,3 @@
{% extends 'bootstrap3/bootstrap3.html' %}
{% block bootstrap3_title %}{% block title %}{% endblock %} - {{ site.domain }}{% endblock %}

View File

@@ -1,6 +1,10 @@
{% extends 'base.html' %}
{% block title %}index{% endblock %}
<!--
vi:tabstop=4:expandtab:autoindent
-->
{% block title %}{{ site.domain }}{% endblock %}
{% block navbarbrand %}
<a class="navbar-brand navbar-brand-active" href="{% url 'home' %}">{{ site.domain }}</a>
{% endblock %}
{% block content %}
{% endblock content %}

View File

@@ -1,14 +0,0 @@
{% extends 'base.html' %}
{% block title %}races{% endblock %}
{% block content %}
<ul>
{% for race in races %}
<li><a href="{% url 'race_detail' race.key %}">{{ race.name }}</a></li>
{% endfor %}
</ul>
{% endblock %}
<!--
vi:tabstop=4:expandtab:autoindent
-->

View File

@@ -1,14 +0,0 @@
{% extends 'base.html' %}
{% block title %}race: {{ race.name }}{% endblock %}
{% block content %}
<ul>
{% for update in race.raceupdate_set.all %}
<li>{{ update.racer.nick }} &mdash; {{ update.update }} &mdash; {{ update.event_time }}</li>
{% endfor %}
</ul>
{% endblock %}
<!--
vi:tabstop=4:expandtab:autoindent
-->