--- a/Allura/allura/templates/app_admin_options.html
+++ b/Allura/allura/templates/app_admin_options.html
@@ -1,50 +1,39 @@
-<!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>$c.project.name / $app.config.options.mount_label / Options</title>
- </head>
-
- <body>
- <h1 class="title">$app.config.options.mount_point Options</h1>
- <div class="content">
- <div class="row">
- <div class="column grid_12">
- <py:if test="not len(app.config_options) > 1">
- No options to administer for ${app.config.options.mount_point}.
- </py:if>
- <py:if test="len(app.config_options) > 1">
+{% extends 'jinja_master/master.html' %}
+
+{% block title %}{{c.project.name}} / {{app.config.options.mount_label}} / Options{% endblock %}
+
+{% block header %}{{app.config.options.mount_point}} Options{% endblock %}
+
+{% block content %}
<form method="post" action="configure">
<ol>
- <py:for each="o in app.config_options" py:if="o.name not in ['mount_point', 'mount_label', 'ordinal']">
- <li><label for="$o.name" class="span-3">$o.name</label>
- <div py:if="not allow_config">
- ${app.config.options.get(o.name, o.default)}
+ {% for o in app.config_options if o.name not in ['mount_point', 'mount_label', 'ordinal'] %}
+ <li><label for="{{o.name}}" class="span-3">{{o.name}}</label>
+ {% if not allow_config %}
+ <div>
+ {{app.config.options.get(o.name, o.default)}}
</div>
- <div class="editable viewing" style="min-height:1em;"
- py:if="allow_config">
- <div class="viewer">${app.config.options.get(o.name, o.default)}</div>
- <div class="editor"><input name="$o.name" value="${app.config.options.get(o.name, o.default)}"/></div>
+ {% else%}
+ <div class="editable viewing" style="min-height:1em;">
+ <div class="viewer">{{app.config.options.get(o.name, o.default)}}</div>
+ <div class="editor"><input name="{{o.name}}" value="{{app.config.options.get(o.name, o.default)}}"/></div>
</div>
+ {% endif %}
</li>
<hr class="clear clearfix" />
- </py:for>
+ {% else %}
+ <li>No options to administer for {{app.config.options.mount_point}}.</li>
+ {% endfor %}
+
<li>
<label> </label>
- <input type="submit" value="Update config" py:if="allow_config" />
- <input py:if="app.installable and allow_config" type="submit" name="delete" value="Delete Tool" />
+ {% if allow_config %}
+ <input type="submit" value="Update config" />
+ {% if app.installable %}
+ <input type="submit" name="delete" value="Delete Tool" />
+ {% endif %}
+ {% endif %}
</li>
</ol>
</form>
- </py:if>
- </div>
- </div>
- </div>
- </body>
-</html>
+{% endblock %}