Just some indentation changes to the templates because I'm picky about such things :)
This commit is contained in:
Christopher Allan Webber
parent
03be33ab29
commit
58b79b159e
@ -25,9 +25,11 @@
|
||||
<div class="grid_6 prefix_1 suffix_1 form_box">
|
||||
<h1>{% trans %}Log in{% endtrans %}</h1>
|
||||
{% if login_failed %}
|
||||
<div class="form_field_error">{% trans %}Login failed!{%
|
||||
endtrans %}</div> {% endif %} {{
|
||||
wtforms_util.render_divs(login_form) }}
|
||||
<div class="form_field_error">
|
||||
{% trans %}Login failed!{% endtrans %}
|
||||
</div>
|
||||
{% endif %}
|
||||
{{ wtforms_util.render_divs(login_form) }}
|
||||
<div class="form_submit_buttons">
|
||||
<input type="submit" value="{% trans %}Submit{% endtrans %}" class="button"/>
|
||||
</div>
|
||||
@ -36,10 +38,13 @@
|
||||
style="display: none;"/>
|
||||
{% endif %}
|
||||
{% if allow_registration %}
|
||||
<p>{% trans %}Don't have an account yet?{% endtrans
|
||||
%}<br /><a href="{{ request.urlgen('mediagoblin.auth.register')
|
||||
}}">{% trans %}Create one here!{% endtrans %}</a></p> {% endif
|
||||
%}
|
||||
<p>
|
||||
{% trans %}Don't have an account yet?{% endtrans %}
|
||||
<br />
|
||||
<a href="{{ request.urlgen('mediagoblin.auth.register') }}">
|
||||
{%- trans %}Create one here!{% endtrans %}</a>
|
||||
</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</form>
|
||||
{% endblock %}
|
||||
|
||||
@ -28,7 +28,7 @@
|
||||
{{ wtforms_util.render_divs(register_form) }}
|
||||
<div class="form_submit_buttons">
|
||||
<input type="submit" value="{% trans %}Submit{% endtrans %}"
|
||||
class="button" />
|
||||
class="button" />
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@ -14,11 +14,13 @@
|
||||
#
|
||||
# You should have received a copy of the GNU Affero General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#}
|
||||
-#}
|
||||
|
||||
{% trans username=username, verification_url=verification_url %}Hi {{ username }},
|
||||
{% trans username=username, verification_url=verification_url|safe -%}
|
||||
Hi {{ username }},
|
||||
|
||||
to activate your GNU MediaGoblin account, open the following URL in
|
||||
your web browser:
|
||||
|
||||
{{ verification_url|safe }}{% endtrans %}
|
||||
{{ verification_url }}
|
||||
{%- endtrans %}
|
||||
|
||||
@ -85,7 +85,9 @@
|
||||
{% block mediagoblin_footer %}
|
||||
<div class="container_16">
|
||||
<div class="grid_16 mediagoblin_footer">
|
||||
{% trans %}Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a>{% endtrans %}
|
||||
{% trans -%}
|
||||
Powered by <a href="http://mediagoblin.org">MediaGoblin</a>, a <a href="http://gnu.org/">GNU project</a>
|
||||
{%- endtrans %}
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@ -25,7 +25,11 @@
|
||||
user['username'] }}"
|
||||
method="POST" enctype="multipart/form-data">
|
||||
<div class="grid_8 prefix_1 suffix_1 edit_box form_box">
|
||||
<h1>{% trans username=user['username'] %}Editing {{ username }}'s profile{% endtrans %}</h1>
|
||||
<h1>
|
||||
{%- trans username=user['username'] -%}
|
||||
Editing {{ username }}'s profile
|
||||
{%- endtrans %}
|
||||
</h1>
|
||||
{{ wtforms_util.render_divs(form) }}
|
||||
<div class="form_submit_buttons">
|
||||
<input type="submit" value="{% trans %}Submit{% endtrans %}" class="button" />
|
||||
|
||||
@ -36,6 +36,8 @@
|
||||
<div class="grid_16">
|
||||
<a href="{{ request.urlgen(
|
||||
'mediagoblin.listings.tag_atom_feed',
|
||||
tag=tag_slug) }}">{% trans %}atom feed{% endtrans %}</a>
|
||||
tag=tag_slug) }}">
|
||||
{%- trans %}atom feed{% endtrans -%}
|
||||
</a>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
@ -22,18 +22,21 @@
|
||||
|
||||
{% if request.user %}
|
||||
<p>
|
||||
<a href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}Submit an item{% endtrans %}</a>
|
||||
<a href="{{ request.urlgen('mediagoblin.submit.start') }}">
|
||||
{%- trans %}Submit an item{% endtrans -%}
|
||||
</a>
|
||||
</p>
|
||||
{% else %}
|
||||
<p>
|
||||
{% trans login_url=request.urlgen('mediagoblin.auth.login') %}If you have an account, you can
|
||||
<a href="{{ login_url }}">Login</a>.{% endtrans %}
|
||||
{% trans login_url=request.urlgen('mediagoblin.auth.login') -%}
|
||||
If you have an account, you can <a href="{{ login_url }}">Login</a>.
|
||||
{%- endtrans %}
|
||||
</p>
|
||||
{% if allow_registration %}
|
||||
<p>
|
||||
{% trans
|
||||
register_url=request.urlgen('mediagoblin.auth.register') %}If you don't have an account, please
|
||||
<a href="{{ register_url }}">Register</a>.{% endtrans %}
|
||||
{% trans register_url=request.urlgen('mediagoblin.auth.register') -%}
|
||||
If you don't have an account, please <a href="{{ register_url }}">Register</a>.
|
||||
{%- endtrans %}
|
||||
</p>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
@ -27,20 +27,24 @@
|
||||
{% block mediagoblin_content -%}
|
||||
{% if user %}
|
||||
<h1>
|
||||
<a href="{{ request.urlgen(
|
||||
'mediagoblin.user_pages.user_home',
|
||||
user=user.username) }}">{% trans
|
||||
username=user.username %}{{ username }}</a>'s
|
||||
media{% endtrans %}</h1>
|
||||
{%- trans username=user.username,
|
||||
user_url=request.urlgen(
|
||||
'mediagoblin.user_pages.user_home',
|
||||
user=user.username) -%}
|
||||
<a href="{{ user_url }}">{{ username }}</a>'s media
|
||||
{%- endtrans %}
|
||||
</h1>
|
||||
|
||||
</div>
|
||||
<div class="container_16 media_gallery">
|
||||
{% include "mediagoblin/utils/object_gallery.html" %}
|
||||
</div>
|
||||
<div class="grid_16">
|
||||
<a href={{ request.urlgen(
|
||||
<a href="{{ request.urlgen(
|
||||
'mediagoblin.user_pages.atom_feed',
|
||||
user=user.username) }}>{% trans %}atom feed{% endtrans %}</a>
|
||||
user=user.username) }}">
|
||||
{%- trans %}atom feed{% endtrans -%}
|
||||
</a>
|
||||
</div>
|
||||
{% else %}
|
||||
{# This *should* not occur as the view makes sure we pass in a user. #}
|
||||
|
||||
@ -38,13 +38,15 @@
|
||||
{% endautoescape %}
|
||||
|
||||
<p>
|
||||
{% trans date="%4d-%02d-%02d"|format(media.created.year,
|
||||
media.created.month, media.created.day), user_url=
|
||||
request.urlgen('mediagoblin.user_pages.user_home',user=
|
||||
media.uploader().username),
|
||||
username=media.uploader().username %}
|
||||
— uploaded on {{ date }} by <a href="{{
|
||||
user_url }}">{{ username }}{% endtrans %}</a>
|
||||
{% trans date="%4d-%02d-%02d"|format(
|
||||
media.created.year,
|
||||
media.created.month, media.created.day),
|
||||
user_url=request.urlgen(
|
||||
'mediagoblin.user_pages.user_home',
|
||||
user=media.uploader().username),
|
||||
username=media.uploader().username -%}
|
||||
— uploaded on {{ date }} by <a href="{{ user_url }}">{{ username }}</a>
|
||||
{%- endtrans %}
|
||||
</p>
|
||||
<br />
|
||||
|
||||
|
||||
@ -36,11 +36,15 @@
|
||||
<div class="grid_6 prefix_1 suffix_1 form_box">
|
||||
<h1>{% trans %}Verification needed{% endtrans %}</h1>
|
||||
|
||||
<p>{% trans %}Almost done! Your account still needs to be
|
||||
verified.{% endtrans %}</p>
|
||||
<p>
|
||||
{% trans %}An email should arrive in a few moments with
|
||||
instructions on how to do so.{% endtrans %}
|
||||
{% trans -%}
|
||||
Almost done! Your account still needs to be verified.
|
||||
{%- endtrans %}
|
||||
</p>
|
||||
<p>
|
||||
{% trans -%}
|
||||
An email should arrive in a few moments with instructions on how to do so.
|
||||
{%- endtrans %}
|
||||
</p>
|
||||
<p>{% trans %}In case it doesn't:{% endtrans %}</p>
|
||||
|
||||
@ -53,30 +57,32 @@
|
||||
<h1>{% trans %}Verification needed{% endtrans %}</h1>
|
||||
|
||||
<p>
|
||||
{% trans %}Someone has registered an account with this
|
||||
username, but it still has to be verified.{% endtrans %}
|
||||
{% trans -%}
|
||||
Someone has registered an account with this username, but it still has to be verified.
|
||||
{%- endtrans %}
|
||||
</p>
|
||||
|
||||
<p>
|
||||
{% trans login_url=request.urlgen('mediagoblin.auth.login')
|
||||
%}If you are that person but you've lost your verification
|
||||
email, you can
|
||||
<a href="{{ login_url }}">log in</a> and resend it.{%
|
||||
endtrans %}
|
||||
{% trans login_url=request.urlgen('mediagoblin.auth.login') -%}
|
||||
If you are that person but you've lost your verification email, you can <a href="{{ login_url }}">log in</a> and resend it.
|
||||
{%- endtrans %}
|
||||
</p>
|
||||
</div>
|
||||
{% endif %}
|
||||
|
||||
{# Active(?) (or at least verified at some point) user, horray! #}
|
||||
{% else %}
|
||||
<h1>{% trans username=user.username %}{{ username }}'s profile{%
|
||||
endtrans %}</h1>
|
||||
<h1>
|
||||
{%- trans username=user.username %}{{ username }}'s profile{% endtrans -%}
|
||||
</h1>
|
||||
|
||||
<div class="grid_6 alpha">
|
||||
{% include "mediagoblin/utils/profile.html" %}
|
||||
{% if request.user['_id'] == user['_id'] or request.user['is_admin'] %}
|
||||
<a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
|
||||
user.username }}">{% trans %}Edit profile{% endtrans %}</a>
|
||||
user.username }}">
|
||||
{%- trans %}Edit profile{% endtrans -%}
|
||||
</a>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
@ -84,12 +90,16 @@
|
||||
{% set pagination_base_url = user_gallery_url %}
|
||||
{% include "mediagoblin/utils/object_gallery.html" %}
|
||||
<div class="clear"></div>
|
||||
<p><a href="{{ user_gallery_url }}">{% trans
|
||||
username=user.username %}View all of {{ username }}'s media{%
|
||||
endtrans %}</a></p>
|
||||
<a href={{ request.urlgen( 'mediagoblin.user_pages.atom_feed',
|
||||
user=user.username) }}>{% trans %}atom feed1{%
|
||||
endtrans %}</a>
|
||||
<p>
|
||||
<a href="{{ user_gallery_url }}">
|
||||
{% trans username=user.username -%}
|
||||
View all of {{ username }}'s media{% endtrans -%}
|
||||
</a>
|
||||
</p>
|
||||
<a href="{{ request.urlgen( 'mediagoblin.user_pages.atom_feed',
|
||||
user=user.username) }}">
|
||||
{%- trans %}atom feed{% endtrans -%}
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="clear"></div>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user