From 3e4ca2ab20f205c81a734c5f8b9177992ee2737a Mon Sep 17 00:00:00 2001 From: Jed Barber Date: Fri, 24 Feb 2017 17:18:28 +1100 Subject: Added email contact, revised formatting and css --- project/templates/about.html | 26 ++++++++++++++++++++++---- project/templates/adapad.html | 1 + project/templates/base.html | 2 ++ project/templates/grasp.html | 1 + project/templates/index.html | 26 ++++++++++++++++++++------ project/templates/stvcount.html | 41 ++++++++++++++++++++++++----------------- project/templates/thue2a.html | 1 + 7 files changed, 71 insertions(+), 27 deletions(-) (limited to 'project/templates') diff --git a/project/templates/about.html b/project/templates/about.html index 3079224..55c7f36 100644 --- a/project/templates/about.html +++ b/project/templates/about.html @@ -1,8 +1,18 @@ {% extends "base.html" %} + + {% block title %}About{% endblock %} + + +{% block style %} + +{% endblock %} + + + {% block content %}

About Me

@@ -31,9 +41,17 @@ really not cut out for research. My mindset is too focused on solving problems.

Contact

-

-Email: TBA
-IRC: jedb on irc.freenode.net -

+ + + + + + + + + +
Email:contact@REMOVETHISjedbarber.id.au
IRC:jedb on irc.freenode.net
{% endblock %} + + diff --git a/project/templates/adapad.html b/project/templates/adapad.html index a534c2d..be25618 100644 --- a/project/templates/adapad.html +++ b/project/templates/adapad.html @@ -51,3 +51,4 @@ progresses.

{% endblock %} + diff --git a/project/templates/base.html b/project/templates/base.html index cd9dc01..090dc5c 100644 --- a/project/templates/base.html +++ b/project/templates/base.html @@ -4,6 +4,8 @@ {% block title %}{% endblock %} + {% block style %} + {% endblock %}

Jedidiah Barber's Personal Site

diff --git a/project/templates/grasp.html b/project/templates/grasp.html index 7919547..534ecbe 100644 --- a/project/templates/grasp.html +++ b/project/templates/grasp.html @@ -68,3 +68,4 @@ comprehensible graph image is found, a parser for it may be added.

{% endblock %} + diff --git a/project/templates/index.html b/project/templates/index.html index de16dbf..4652567 100644 --- a/project/templates/index.html +++ b/project/templates/index.html @@ -1,13 +1,27 @@ {% extends "base.html" %} + + {% block title %}Jedidiah Barber's Personal Site{% endblock %} + + +{% block style %} + +{% endblock %} + + + {% block content %} - + + + {% endblock %} + + diff --git a/project/templates/stvcount.html b/project/templates/stvcount.html index e44ec43..39f87d1 100644 --- a/project/templates/stvcount.html +++ b/project/templates/stvcount.html @@ -7,6 +7,12 @@ +{% block style %} + +{% endblock %} + + + {% block content %}

Single Transferable Vote Counter

@@ -153,15 +159,15 @@ Q9500.

- - - - - + + + + + - + @@ -169,7 +175,7 @@ Q9500.

- + @@ -177,7 +183,7 @@ Q9500.

- + @@ -185,7 +191,7 @@ Q9500.

- + @@ -193,7 +199,7 @@ Q9500.

- + @@ -201,7 +207,7 @@ Q9500.

- + @@ -209,7 +215,7 @@ Q9500.

- + @@ -217,7 +223,7 @@ Q9500.

- + @@ -225,7 +231,7 @@ Q9500.

- + @@ -233,7 +239,7 @@ Q9500.

- + @@ -241,7 +247,7 @@ Q9500.

- + @@ -249,7 +255,7 @@ Q9500.

- + @@ -286,3 +292,4 @@ Liberal/National government would definitely have been better off with a normal {% endblock %} + diff --git a/project/templates/thue2a.html b/project/templates/thue2a.html index 3ce9de9..5675cd7 100644 --- a/project/templates/thue2a.html +++ b/project/templates/thue2a.html @@ -95,3 +95,4 @@ available here.

{% endblock %} + -- cgit
Probable non-DD Senate composition
PartySeats WonContinuing SenatorsTotal SeatsDifference From ActualPartySeats WonContinuing SenatorsTotal SeatsDifference From Actual
  Liberal/National CoalitionLiberal/National Coalition 17 15 32
  Australian Labor PartyAustralian Labor Party 14 10 24
  Australian GreensAustralian Greens 4 4 8
  Xenophon GroupXenophon Group 2 1 3
  Jacqui Lambie Network*Jacqui Lambie Network* 1 1 2
  Liberal Democratic PartyLiberal Democratic Party 0 1 1
  Family First PartyFamily First Party 0 1 1
  Palmer United Party*Palmer United Party* 0 1 1
  Glenn Lazarus Team*Glenn Lazarus Team* 0 1 1
  Australian Motoring Enthusiast PartyAustralian Motoring Enthusiast Party 0 1 1
  One NationOne Nation 1 0 1
  Derryn Hinch's Justice PartyDerryn Hinch's Justice Party 1 0 1