diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-08-19 12:18:18 -0500 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-08-19 12:18:18 -0500 |
| commit | a066e8bb547d02e6ae0a0f3e383f44bf6db889a6 (patch) | |
| tree | 42f9249146515607ebe27a1fa876317427072f03 | |
| parent | 944b92dc2fef2932136020709d2037548a29e7e0 (diff) | |
| parent | fafef8df2e240c3b127386af04425cca33b3d84e (diff) | |
| download | mediagoblin-a066e8bb547d02e6ae0a0f3e383f44bf6db889a6.tar.lz mediagoblin-a066e8bb547d02e6ae0a0f3e383f44bf6db889a6.tar.xz mediagoblin-a066e8bb547d02e6ae0a0f3e383f44bf6db889a6.zip | |
Merge remote-tracking branch 'refs/remotes/merge-requests/42'
| -rw-r--r-- | docs/source/siteadmin/theming.rst | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/404.html | 2 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/auth/change_fp.html | 4 |
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 — {{ 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 %} — {{ super() }} +{%- endblock %} + {% block mediagoblin_content %} <form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}" method="POST" enctype="multipart/form-data"> |