# HG changeset patch
# User Daniele Nicolodi <daniele@grinta.net>
# Date 1313943447 -7200
# Node ID cd4a15072c9739b72d733cf5b6105f52c14ad7d9
# Parent  e7e0258660aafce3f1b29dbde4a8c59b7322111c
Tweak templates.

diff -r e7e0258660aa -r cd4a15072c97 src/ltpdarepo/templates/database.html
--- a/src/ltpdarepo/templates/database.html	Sun Aug 21 18:17:27 2011 +0200
+++ b/src/ltpdarepo/templates/database.html	Sun Aug 21 18:17:27 2011 +0200
@@ -2,7 +2,7 @@
 {% block title %}{{ database.id }}{% endblock %}
 {% block body %}
 <h2>Database &#x00AB;{{ database.id }}&#x00BB;</h2>
-<p class="discrete">{{ database.description|default('&mdash;'|safe, true) }}</p>
+<p class="discrete">{{ database.description }}</p>
 <ul class="actions">
   <li><a href="{{ url_for('browse.browse', database=database.id) }}">Browse</a></li>
   <li><a href="{{ url_for('browse.activity', database=database.id) }}">Show activity</a></li>
diff -r e7e0258660aa -r cd4a15072c97 src/ltpdarepo/templates/databases/edit.html
--- a/src/ltpdarepo/templates/databases/edit.html	Sun Aug 21 18:17:27 2011 +0200
+++ b/src/ltpdarepo/templates/databases/edit.html	Sun Aug 21 18:17:27 2011 +0200
@@ -1,5 +1,6 @@
 {% import 'forms.html' as forms %}
 {% extends "layout.html" %}
+{% block title %}{{ database.id }}{% endblock %}
 {% block body %}
 <h2>Database &#x00AB;{{ database.id }}&#x00BB;</h2>
 {{ forms.render(form) }}
diff -r e7e0258660aa -r cd4a15072c97 src/ltpdarepo/templates/databases/permissions.html
--- a/src/ltpdarepo/templates/databases/permissions.html	Sun Aug 21 18:17:27 2011 +0200
+++ b/src/ltpdarepo/templates/databases/permissions.html	Sun Aug 21 18:17:27 2011 +0200
@@ -1,4 +1,5 @@
 {% extends "layout.html" %}
+{% block title %}{{ database.id }}{% endblock %}
 {% block body %}
 <h2>Permissions for database &#x00AB;{{ database }}&#x00BB;</h2>
 <form action="" method="post">
diff -r e7e0258660aa -r cd4a15072c97 src/ltpdarepo/templates/objs.html
--- a/src/ltpdarepo/templates/objs.html	Sun Aug 21 18:17:27 2011 +0200
+++ b/src/ltpdarepo/templates/objs.html	Sun Aug 21 18:17:27 2011 +0200
@@ -3,7 +3,7 @@
 {% block title %}{{ database.id }}{% endblock %}
 {% block body %}
 <h2>{% block pagetitle %}Database &#x00AB;{{ database.id }}&#x00BB;{% endblock %}</h2>
-<p class="discrete">{{ database.description|default('&nbsp;'|safe, true) }}</p>
+<p class="discrete">{{ database.description }}</p>
 <p class="discrete">{{ batch.count }} objects</p>
 
 {% block above %}{% endblock %}
diff -r e7e0258660aa -r cd4a15072c97 src/ltpdarepo/templates/queries/drop.html
--- a/src/ltpdarepo/templates/queries/drop.html	Sun Aug 21 18:17:27 2011 +0200
+++ b/src/ltpdarepo/templates/queries/drop.html	Sun Aug 21 18:17:27 2011 +0200
@@ -1,6 +1,6 @@
 {% import 'forms.html' as forms %}
 {% extends "layout.html" %}
-{% block title %}Drop query{% endblock %}
+{% block title %}Query {{ query.title }}{% endblock %}
 {% block body %}
 <h2>Drop query &#x00AB;{{ query.title }}&#x00BB;</h2>
 <p class="discrete">Are you sure you want to drop this named query?</p>
diff -r e7e0258660aa -r cd4a15072c97 src/ltpdarepo/templates/queries/edit.html
--- a/src/ltpdarepo/templates/queries/edit.html	Sun Aug 21 18:17:27 2011 +0200
+++ b/src/ltpdarepo/templates/queries/edit.html	Sun Aug 21 18:17:27 2011 +0200
@@ -1,6 +1,6 @@
 {% import 'forms.html' as forms %}
 {% extends "layout.html" %}
-{% block title %}Edit query{% endblock %}
+{% block title %}Query {{ query.title }}{% endblock %}
 {% block body %}
 <h2>Edit named query</h2>
 {{ forms.render(form) }}
diff -r e7e0258660aa -r cd4a15072c97 src/ltpdarepo/templates/queries/view.html
--- a/src/ltpdarepo/templates/queries/view.html	Sun Aug 21 18:17:27 2011 +0200
+++ b/src/ltpdarepo/templates/queries/view.html	Sun Aug 21 18:17:27 2011 +0200
@@ -1,5 +1,5 @@
 {% extends "layout.html" %}
-{% block title %}{{ query.title }}{% endblock %}
+{% block title %}Query {{ query.title }}{% endblock %}
 {% block body %}
 <h2>Query &laquo;{{ query.title }}&raquo;</h2>
 <p class="field"><span class="label">Database:</span> <tt>{{ query.db }}</tt></p>
diff -r e7e0258660aa -r cd4a15072c97 src/ltpdarepo/templates/users/drop.html
--- a/src/ltpdarepo/templates/users/drop.html	Sun Aug 21 18:17:27 2011 +0200
+++ b/src/ltpdarepo/templates/users/drop.html	Sun Aug 21 18:17:27 2011 +0200
@@ -1,5 +1,6 @@
 {% import 'forms.html' as forms %}
 {% extends "layout.html" %}
+{% block title %}User {{ user.username }}{% endblock %}
 {% block body %}
 <h2>Drop user &#x00AB;{{ user.username }}&#x00BB;</h2>
 <p class="discrete">
diff -r e7e0258660aa -r cd4a15072c97 src/ltpdarepo/templates/users/edit.html
--- a/src/ltpdarepo/templates/users/edit.html	Sun Aug 21 18:17:27 2011 +0200
+++ b/src/ltpdarepo/templates/users/edit.html	Sun Aug 21 18:17:27 2011 +0200
@@ -1,5 +1,6 @@
 {% import 'forms.html' as forms %}
 {% extends "layout.html" %}
+{% block title %}User {{ username }}{% endblock %}
 {% block body %}
 <h2>User &#x00AB;{{ username }}&#x00BB;</h2>
 {{ forms.render(form) }}
diff -r e7e0258660aa -r cd4a15072c97 src/ltpdarepo/templates/users/password.html
--- a/src/ltpdarepo/templates/users/password.html	Sun Aug 21 18:17:27 2011 +0200
+++ b/src/ltpdarepo/templates/users/password.html	Sun Aug 21 18:17:27 2011 +0200
@@ -1,7 +1,8 @@
 {% import 'forms.html' as forms %}
 {% extends "layout.html" %}
+{% block title %}User {{ session.username }}{% endblock %}
 {% block body %}
-<h2>User &#x00AB;{{ session.username }}&#x00BB; password</h2>
-<p class="discrete"></p>
+<h2>New user &#x00AB;{{ session.username }}&#x00BB; password</h2>
+<p class="discrete">Please choose a safe password</p>
 {{ forms.render(form) }}
 {% endblock %}
diff -r e7e0258660aa -r cd4a15072c97 src/ltpdarepo/templates/users/reset.html
--- a/src/ltpdarepo/templates/users/reset.html	Sun Aug 21 18:17:27 2011 +0200
+++ b/src/ltpdarepo/templates/users/reset.html	Sun Aug 21 18:17:27 2011 +0200
@@ -1,6 +1,6 @@
 {% import 'forms.html' as forms %}
 {% extends "layout.html" %}
-{% block title %}User {{ user.username }}{% endblock%}
+{% block title %}User {{ user.username }}{% endblock %}
 {% block body %}
 <h2>Reset password for user &#x00AB;{{ user.username }}&#x00BB;</h2>
 <p class="discrete">A password reset token will be sent to the user email address.</p>