aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAleksej <deletesoftware@yandex.ru>2012-08-18 23:31:27 +0400
committerAleksej <deletesoftware@yandex.ru>2012-08-18 23:31:27 +0400
commitfafef8df2e240c3b127386af04425cca33b3d84e (patch)
tree88a9f03e6f1b9f21a5f24c1809acbf013b02acb8
parent5257f5f554247e607439230acc36e1fac48b0ede (diff)
downloadmediagoblin-fafef8df2e240c3b127386af04425cca33b3d84e.tar.lz
mediagoblin-fafef8df2e240c3b127386af04425cca33b3d84e.tar.xz
mediagoblin-fafef8df2e240c3b127386af04425cca33b3d84e.zip
add titles to two pages and fix a typo in docs
-rw-r--r--docs/source/siteadmin/theming.rst2
-rw-r--r--mediagoblin/templates/mediagoblin/404.html2
-rw-r--r--mediagoblin/templates/mediagoblin/auth/change_fp.html4
3 files changed, 7 insertions, 1 deletions
diff --git a/docs/source/siteadmin/theming.rst b/docs/source/siteadmin/theming.rst
index b21e2743..98ec6de7 100644
--- a/docs/source/siteadmin/theming.rst
+++ b/docs/source/siteadmin/theming.rst
@@ -111,7 +111,7 @@ Other variables you may consider setting:
`theme_linked_assets_dir`
Your web server needs to serve the theme files out of some directory,
and MediaGoblin will symlink the current theme's assets here. See
- the "Link the assets" setp in :ref:`theming-installing-section`.
+ the "Link the assets" step in :ref:`theming-installing-section`.
Making a theme
diff --git a/mediagoblin/templates/mediagoblin/404.html b/mediagoblin/templates/mediagoblin/404.html
index 5e58d191..c0fe8b62 100644
--- a/mediagoblin/templates/mediagoblin/404.html
+++ b/mediagoblin/templates/mediagoblin/404.html
@@ -17,6 +17,8 @@
#}
{% extends "mediagoblin/base.html" %}
+{% block title %}404 &mdash; {{ super() }}{% endblock %}
+
{% block mediagoblin_content %}
<img class="right_align" src="{{ request.staticdirect('/images/404.png') }}"
alt="{% trans %}Image of 404 goblin stressing out{% endtrans %}" />
diff --git a/mediagoblin/templates/mediagoblin/auth/change_fp.html b/mediagoblin/templates/mediagoblin/auth/change_fp.html
index d95516e8..1f7d9aca 100644
--- a/mediagoblin/templates/mediagoblin/auth/change_fp.html
+++ b/mediagoblin/templates/mediagoblin/auth/change_fp.html
@@ -24,6 +24,10 @@
src="{{ request.staticdirect('/js/show_password.js') }}"></script>
{% endblock mediagoblin_head %}
+{% block title -%}
+ {% trans %}Set your new password{% endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
{% block mediagoblin_content %}
<form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}"
method="POST" enctype="multipart/form-data">