--- a/Allura/allura/templates/setup_openid_user.html
+++ b/Allura/allura/templates/setup_openid_user.html
@@ -1,32 +1,19 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:py="http://genshi.edgewall.org/"
- xmlns:xi="http://www.w3.org/2001/XInclude">
-
- <xi:include href="master.html" />
-
- <head>
- <meta content="text/html; charset=UTF-8" http-equiv="content-type" py:replace="''"/>
- <title>Login Form</title>
- </head>
-
- <body>
- <h1 class="title">Choose Login Name</h1>
- <div class="content">
- <div class="row">
- <div class="column grid_12">
+{% extends 'jinja_master/master.html' %}
+
+{% block title %}Login Form{% endblock %}
+
+{% block header %}Choose Login Name{% endblock %}
+
+{% block content %}
<div id="loginform">
<form method="POST" action="do_setup_openid_user">
<label for="username">Login Name:</label>
<input id="username" name="username"/>
+ <br />
<label for="display_name">Displayed Name:</label>
<input id="display_name" name="display_name"/>
+ <br />
<input type="submit" value="Setup Account"/>
</form>
</div>
- </div>
- </div>
- </div>
- </body>
-</html>
+{% endblock %}