heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/merge-requests/42'

Browse Source
This commit is contained in:
Christopher Allan Webber 2012-08-19 12:18:18 -05:00
commit a066e8bb54
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/source/siteadmin/theming.rst
View File

@ -111,7 +111,7 @@ Other variables you may consider setting:
`theme_linked_assets_dir` `theme_linked_assets_dir`
Your web server needs to serve the theme files out of some directory, Your web server needs to serve the theme files out of some directory,
and MediaGoblin will symlink the current theme's assets here. See 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 Making a theme

2
mediagoblin/templates/mediagoblin/404.html
View File

@ -17,6 +17,8 @@
#} #}
{% extends "mediagoblin/base.html" %} {% extends "mediagoblin/base.html" %}
{% block title %}404 — {{ super() }}{% endblock %}
{% block mediagoblin_content %} {% block mediagoblin_content %}
<img class="right_align" src="{{ request.staticdirect('/images/404.png') }}" <img class="right_align" src="{{ request.staticdirect('/images/404.png') }}"
alt="{% trans %}Image of 404 goblin stressing out{% endtrans %}" /> alt="{% trans %}Image of 404 goblin stressing out{% endtrans %}" />

4
mediagoblin/templates/mediagoblin/auth/change_fp.html
View File

@ -24,6 +24,10 @@
src="{{ request.staticdirect('/js/show_password.js') }}"></script> src="{{ request.staticdirect('/js/show_password.js') }}"></script>
{% endblock mediagoblin_head %} {% endblock mediagoblin_head %}
{% block title -%}
{% trans %}Set your new password{% endtrans %} &mdash; {{ super() }}
{%- endblock %}
{% block mediagoblin_content %} {% block mediagoblin_content %}
<form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}" <form action="{{ request.urlgen('mediagoblin.auth.verify_forgot_password') }}"
method="POST" enctype="multipart/form-data"> method="POST" enctype="multipart/form-data">