From 04a95150646247abd13992b5c103a6d780d8861b Mon Sep 17 00:00:00 2001 From: Caleb Forbes Davis V Date: Fri, 8 Jul 2011 01:59:44 -0500 Subject: F360(tagging) - adds tag fields for submission, edit and display --- mediagoblin/templates/mediagoblin/submit/start.html | 1 + mediagoblin/templates/mediagoblin/user_pages/media.html | 4 ++++ 2 files changed, 5 insertions(+) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html index 50c86afe..7bacb552 100644 --- a/mediagoblin/templates/mediagoblin/submit/start.html +++ b/mediagoblin/templates/mediagoblin/submit/start.html @@ -25,6 +25,7 @@

Submit yer media

{{ wtforms_util.render_field_div(submit_form.file) }} + {{ wtforms_util.render_field_div(submit_form.tags) }} {{ wtforms_util.render_field_div(submit_form.title) }} {{ wtforms_util.render_textarea_div(submit_form.description) }}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 1484cc73..1c263880 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -48,6 +48,10 @@ user= media.uploader().username) }}"> {{- media.uploader().username }}

+ +

+ {{ ' '.join(media.tags) }} +


Comments

-- cgit v1.2.3 From 6f2e4585cc7475362205a9ddb0e69d6da2b6dc85 Mon Sep 17 00:00:00 2001 From: Caleb Forbes Davis V Date: Tue, 12 Jul 2011 22:26:10 -0500 Subject: uses standard functions instead of form filters and fixes taglist default - seems simpler to use the same tag field processing procedures on media submit and edit, so now processing with a regular function instead of a form filter. Filters run on form load and post by default. - moved tags to sidebar - taglist defaults to [] instead of None - adds case sensitivity toggle --- mediagoblin/templates/mediagoblin/user_pages/media.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 1c263880..47d5db35 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -48,10 +48,6 @@ user= media.uploader().username) }}"> {{- media.uploader().username }}

- -

- {{ ' '.join(media.tags) }} -


Comments

@@ -114,6 +110,11 @@

{% endif %}

+ {% if media.tags %} +

+ {{ ' '.join(media.tags) }} +

+ {% endif %}
{% else %}

Sorry, no such media found.

-- cgit v1.2.3 From 06a5f21eb14d43ff7c9e54727f53c2b78455a6f5 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Mon, 25 Jul 2011 21:26:58 +0200 Subject: Ok, so here are the actual changes. Woops! --- mediagoblin/templates/mediagoblin/base.html | 44 +++++++++++++---------------- 1 file changed, 20 insertions(+), 24 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 12f188de..b38ad674 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -36,27 +36,25 @@ {% block mediagoblin_body %}

{% block mediagoblin_header %} -
-
-
- {% block mediagoblin_logo %} - - {% endblock %} +
+
+ {% block mediagoblin_logo %} + + {% endblock %} + {% if request.user %} + Submit media + {% endif %} + {% block mediagoblin_header_title %}{% endblock %} +
{% if request.user %} - Submit media + + {{ request.user['username'] }}'s account + (logout) + {% else %} + + Login {% endif %} - {% block mediagoblin_header_title %}{% endblock %} -
- {% if request.user %} - - {{ request.user['username'] }}'s account - (logout) - {% else %} - - Login - {% endif %} -
@@ -69,11 +67,9 @@
{% block mediagoblin_footer %} -
-
-
- Powered by MediaGoblin, a GNU project -
+
+
+ Powered by MediaGoblin, a GNU project
{% endblock %} -- cgit v1.2.3 From b1f11df07cdef805f354f2c046e146783ad4256f Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Mon, 25 Jul 2011 22:19:22 +0200 Subject: Moved a div around --- .../templates/mediagoblin/user_pages/user.html | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 9d99ac53..b445d844 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -26,19 +26,18 @@ {% block mediagoblin_content -%} {% if user %} -

{{ user.username }}'s profile

-
- {% include "mediagoblin/utils/profile.html" %} - {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} +

{{ user.username }}'s profile

+
+ {% include "mediagoblin/utils/profile.html" %} + {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} Edit profile - {% endif %} -
-
- {% set pagination_base_url = user_gallery_url %} - {% include "mediagoblin/utils/object_gallery.html" %} -
-

View all of {{ user.username }}'s media

+ {% endif %} +
+
+ {% set pagination_base_url = user_gallery_url %} + {% include "mediagoblin/utils/object_gallery.html" %} +

View all of {{ user.username }}'s media

atom feed @@ -46,5 +45,6 @@ {# This *should* not occur as the view makes sure we pass in a user. #}

Sorry, no such user found.

+
{% endif %} {% endblock %} -- cgit v1.2.3 From ad74472b597d6a477f6c2e747478417a52327b4b Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 25 Jul 2011 15:30:56 -0500 Subject: Now actually apply Velmont's patch instead of just committing it ;) --- mediagoblin/templates/mediagoblin/user_pages/user.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 9d99ac53..a2b85aff 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -42,9 +42,9 @@ atom feed - {% else %} - {# This *should* not occur as the view makes sure we pass in a user. #} -

Sorry, no such user found.

+ {% else %} + {# This *should* not occur as the view makes sure we pass in a user. #} +

Sorry, no such user found.

{% endif %} {% endblock %} -- cgit v1.2.3 From 996b3bf7c98d58ef5059ffe12639809155638734 Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Tue, 26 Jul 2011 23:40:17 +0200 Subject: Insert links and content for ticket #387: content for verification in user.html, needs-verification link in base.html, highlight class for links in base.css --- mediagoblin/templates/mediagoblin/base.html | 4 ++++ mediagoblin/templates/mediagoblin/user_pages/user.html | 15 +++++++++++++++ 2 files changed, 19 insertions(+) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index b38ad674..22a691b5 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -50,6 +50,10 @@ {{ request.user['username'] }}'s account + + + needs verification! (logout) {% else %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 7ab2031e..b0c1027c 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -26,6 +26,20 @@ {% block mediagoblin_content -%} {% if user %} + +

+

Verification needed

+ +

Almost done! Your account still needs to be verified.

+

An email should arrive in a few moments with instructions on how to do so.

+

In case it doesn't:

+ + Resend verification email + +

Someone has registered an account with this username, but it still has to be verified.

+

If you are that person but you've lost your verification email, you can log in and resend it.

+
+ {#

{{ user.username }}'s profile

{% include "mediagoblin/utils/profile.html" %} @@ -43,6 +57,7 @@ user=user.username) }}>atom feed
+ #} {% else %} {# This *should* not occur as the view makes sure we pass in a user. #}

Sorry, no such user found.

-- cgit v1.2.3 From 0712a06dc6d6b05cb78d4b10af12c051e8f765e3 Mon Sep 17 00:00:00 2001 From: Caleb Forbes Davis V Date: Wed, 27 Jul 2011 14:42:09 -0500 Subject: changes tags to a list of dicts in the db, adding tag slugs - adds a function to convert the tag list of dicts to a text string properly delimited for loading into forms - tag string conversion function updated to generate list of dicts - updates all mentions of the conversion of the string to the tags db object - adds a tags template utility and updates the media template accordingly --- .../templates/mediagoblin/user_pages/media.html | 4 +--- mediagoblin/templates/mediagoblin/utils/tags.html | 25 ++++++++++++++++++++++ 2 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 mediagoblin/templates/mediagoblin/utils/tags.html (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 47d5db35..8dd42115 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -111,9 +111,7 @@ {% endif %}

{% if media.tags %} -

- {{ ' '.join(media.tags) }} -

+ {% include "mediagoblin/utils/tags.html" %} {% endif %}
{% else %} diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html new file mode 100644 index 00000000..94c4cf69 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/utils/tags.html @@ -0,0 +1,25 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011 Free Software Foundation, Inc +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +#} + +{% block tags_content -%} +
    + {% for tag in media.tags %} +
  • {{ tag['name'] }}
    • + {% endfor %} +
+{% endblock %} -- cgit v1.2.3 From 4476adcdb02d8c36ae87efe1c00ef0972ecff64d Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 28 Jul 2011 21:20:32 -0500 Subject: Make "needs verification" link only appear if you need verification really. --- mediagoblin/templates/mediagoblin/base.html | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 22a691b5..8e3b0724 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -50,10 +50,15 @@ {{ request.user['username'] }}'s account - - - needs verification! + + {# the following link should only appear when verification is needed #} + {% if request.user.status == "needs_email_verification" %} + + needs verification! + {% endif %} + (logout) {% else %} -- cgit v1.2.3 From 990d3b6985041facf391f4ece0829a11c0fd317e Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 28 Jul 2011 22:12:24 -0500 Subject: Give useful verification information on users that need to verify their email --- .../templates/mediagoblin/user_pages/user.html | 63 +++++++++++++++------- 1 file changed, 44 insertions(+), 19 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index b0c1027c..ae540bfe 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -25,22 +25,49 @@ {% endblock mediagoblin_head %} {% block mediagoblin_content -%} - {% if user %} - -
-

Verification needed

- -

Almost done! Your account still needs to be verified.

-

An email should arrive in a few moments with instructions on how to do so.

-

In case it doesn't:

- - Resend verification email - -

Someone has registered an account with this username, but it still has to be verified.

-

If you are that person but you've lost your verification email, you can log in and resend it.

-
- {# + {# If no user... #} + {% if not user %} +

Sorry, no such user found.

+ + {# User exists, but needs verification #} + {% elif user.status == "needs_email_verification" %} + {% if user == request.user %} + {# this should only be visible when you are this user #} +

+

Verification needed

+ +

Almost done! Your account still needs to be verified.

+

+ An email should arrive in a few moments with instructions + on how to do so. +

+

In case it doesn't:

+ + Resend verification email +
+ {% else %} + {# if the user is not you, but still needs to verify their email #} +
+

Verification needed

+ +

+ Someone has registered an account with this username, but it + still has to be verified. +

+ +

+ If you are that person but you've lost your verification + email, you can + log in + and resend it. +

+
+ {% endif %} + + {# Active(?) (or at least verified at some point) user, horray! #} + {% else %}

{{ user.username }}'s profile

+
{% include "mediagoblin/utils/profile.html" %} {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} @@ -48,6 +75,7 @@ user.username }}">Edit profile {% endif %}
+
{% set pagination_base_url = user_gallery_url %} {% include "mediagoblin/utils/object_gallery.html" %} @@ -56,10 +84,7 @@ 'mediagoblin.user_pages.atom_feed', user=user.username) }}>atom feed
+
- #} - {% else %} - {# This *should* not occur as the view makes sure we pass in a user. #} -

Sorry, no such user found.

{% endif %} {% endblock %} -- cgit v1.2.3 From f22339d22983cb0fb4d0261c8296e3e27a3f5939 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 28 Jul 2011 22:14:20 -0500 Subject: A small amount of indenting in base.html --- mediagoblin/templates/mediagoblin/base.html | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 8e3b0724..9fcd1dcd 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -39,10 +39,17 @@

{% block mediagoblin_logo %} - + {% endblock %} {% if request.user %} - Submit media + + Submit media + {% endif %} {% block mediagoblin_header_title %}{% endblock %}
-- cgit v1.2.3 From 391861ac9feb8e31454f62ba7ca7e70fea2445ef Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 28 Jul 2011 22:15:18 -0500 Subject: I prefer it when "needs verification" looks like a button :) --- mediagoblin/templates/mediagoblin/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 9fcd1dcd..c1d3caed 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -62,7 +62,7 @@ {% if request.user.status == "needs_email_verification" %} + class="header_submit"> needs verification! {% endif %} -- cgit v1.2.3 From a435bcb313b1f15d522387a27625fa1ed1290bcb Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Thu, 28 Jul 2011 22:19:05 -0500 Subject: I think the "'s account" is a waste of space --- mediagoblin/templates/mediagoblin/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index c1d3caed..0dbd6d6f 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -56,7 +56,7 @@ {% if request.user %} - {{ request.user['username'] }}'s account + {{ request.user['username'] }} {# the following link should only appear when verification is needed #} {% if request.user.status == "needs_email_verification" %} -- cgit v1.2.3 From 3880c8f31b68cc19a868d738071ea6180100ef22 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 29 Jul 2011 08:10:45 -0500 Subject: "Resend verification email" button should actually resend the verification email --- mediagoblin/templates/mediagoblin/user_pages/user.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index ae540bfe..7769b8b3 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -43,7 +43,8 @@

In case it doesn't:

- Resend verification email + Resend verification email
{% else %} {# if the user is not you, but still needs to verify their email #} -- cgit v1.2.3 From 7074304c91bfc19e2a6365f3d9567ec5a2636f9d Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 29 Jul 2011 08:14:02 -0500 Subject: Remove the verification needed page --- .../mediagoblin/auth/verification_needed.html | 29 ---------------------- 1 file changed, 29 deletions(-) delete mode 100644 mediagoblin/templates/mediagoblin/auth/verification_needed.html (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/auth/verification_needed.html b/mediagoblin/templates/mediagoblin/auth/verification_needed.html deleted file mode 100644 index 4104da19..00000000 --- a/mediagoblin/templates/mediagoblin/auth/verification_needed.html +++ /dev/null @@ -1,29 +0,0 @@ -{# -# GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011 Free Software Foundation, Inc -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -#} -{% extends "mediagoblin/base.html" %} - -{% block mediagoblin_content %} -

- Verfication needed!
- Please check your email to verify your account. -

- -

- Still haven't received an email? Click here to resend it. -

-{% endblock %} -- cgit v1.2.3 From dc9cbb3888ea2e285fcf2d8368382a688f03268a Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 29 Jul 2011 08:23:56 -0500 Subject: Only show submit button if user is active --- mediagoblin/templates/mediagoblin/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 0dbd6d6f..0a037d26 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -45,7 +45,7 @@ alt="Mediagoblin logo" /> {% endblock %} - {% if request.user %} + {% if request.user and request.user['status'] == 'active' %} Submit media -- cgit v1.2.3 From 7b6836a362a2c4a42be1ae95e7a31e07c113d600 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 29 Jul 2011 08:25:22 -0500 Subject: "Needs verification!" button should go to the left of username Looks cleaner is all.. --- mediagoblin/templates/mediagoblin/base.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 0a037d26..45c17e94 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -54,10 +54,6 @@ {% block mediagoblin_header_title %}{% endblock %}
{% if request.user %} - - {{ request.user['username'] }} - {# the following link should only appear when verification is needed #} {% if request.user.status == "needs_email_verification" %} + {{ request.user['username'] }} + (logout) {% else %} -- cgit v1.2.3 From 97a553091d285017dbdb4867f1d7462159302a4f Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 29 Jul 2011 08:25:32 -0500 Subject: Fixing an indentation issue on the login button --- mediagoblin/templates/mediagoblin/base.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 45c17e94..656fb46b 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -68,8 +68,8 @@ (logout) {% else %} - - Login + + Login {% endif %}
-- cgit v1.2.3 From ebcd29d4f8e984f59d808360708f8fc38cfbda99 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Fri, 29 Jul 2011 08:27:32 -0500 Subject: Don't need the register success template anymore --- .../mediagoblin/auth/register_success.html | 25 ---------------------- 1 file changed, 25 deletions(-) delete mode 100644 mediagoblin/templates/mediagoblin/auth/register_success.html (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/auth/register_success.html b/mediagoblin/templates/mediagoblin/auth/register_success.html deleted file mode 100644 index cd82a0b9..00000000 --- a/mediagoblin/templates/mediagoblin/auth/register_success.html +++ /dev/null @@ -1,25 +0,0 @@ -{# -# GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011 Free Software Foundation, Inc -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU Affero General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU Affero General Public License for more details. -# -# You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see . -#} -{% extends "mediagoblin/base.html" %} - -{% block mediagoblin_content %} -

- Register successful! :D
- You should get a confirmation email soon. -

-{% endblock %} -- cgit v1.2.3 From 2faec3672371db3e17bf6671306fcc243eefadf2 Mon Sep 17 00:00:00 2001 From: Will Kahn-Greene Date: Sat, 30 Jul 2011 22:27:46 -0400 Subject: 270. Moves 960.gs stuff to extlib/ per policy This adds the README.txt from the tarball for 960.gs and also moves the files and fixes the symlinks. --- mediagoblin/templates/mediagoblin/base.html | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 656fb46b..6af02c00 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -21,11 +21,11 @@ {% block title %}GNU MediaGoblin{% endblock title %} + href="{{ request.staticdirect('/css/extlib/reset.css') }}"/> + href="{{ request.staticdirect('/css/extlib/text.css') }}"/> + href="{{ request.staticdirect('/css/extlib/960_16_col.css') }}"/> {% block mediagoblin_head %} -- cgit v1.2.3 From 34e4be6fb1c047ece5d3fc311e758468f2a72795 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sat, 30 Jul 2011 21:45:11 -0500 Subject: tags field should be last on the submission form --- mediagoblin/templates/mediagoblin/submit/start.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html index 7bacb552..6d00510c 100644 --- a/mediagoblin/templates/mediagoblin/submit/start.html +++ b/mediagoblin/templates/mediagoblin/submit/start.html @@ -25,9 +25,9 @@

Submit yer media

{{ wtforms_util.render_field_div(submit_form.file) }} - {{ wtforms_util.render_field_div(submit_form.tags) }} {{ wtforms_util.render_field_div(submit_form.title) }} {{ wtforms_util.render_textarea_div(submit_form.description) }} + {{ wtforms_util.render_field_div(submit_form.tags) }}
-- cgit v1.2.3 From 4a74d54ef59ea3a4eff06d78f6c235fcb6631203 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 31 Jul 2011 15:00:42 -0500 Subject: Add a clear div between the object gallery and the "user's media" / atom feed --- mediagoblin/templates/mediagoblin/user_pages/user.html | 1 + 1 file changed, 1 insertion(+) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 7769b8b3..76cf36be 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -80,6 +80,7 @@
{% set pagination_base_url = user_gallery_url %} {% include "mediagoblin/utils/object_gallery.html" %} +

View all of {{ user.username }}'s media

Date: Sun, 31 Jul 2011 15:07:43 -0500 Subject: Give a more usful message if no media is available. --- mediagoblin/templates/mediagoblin/utils/object_gallery.html | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html index 2c7a7129..a14d7d7b 100644 --- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html @@ -33,5 +33,9 @@ {% else %} {{ render_pagination(request, pagination) }} {% endif %} + {% else %} +

+ There doesn't seem to be anything here... +

{% endif %} {% endblock %} -- cgit v1.2.3 From 77bc1c286778f7b0618f64c1d7498e7f6735d3c6 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 31 Jul 2011 15:22:54 -0500 Subject: Show the message about nothing exiting either if media_entries object not there or empty --- mediagoblin/templates/mediagoblin/utils/object_gallery.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html index a14d7d7b..1b1c69f6 100644 --- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html @@ -19,7 +19,7 @@ {% from "mediagoblin/utils/pagination.html" import render_pagination %} {% block object_gallery_content -%} - {% if media_entries %} + {% if media_entries and media_entries.count() %} {% for entry in media_entries %}
@@ -35,7 +35,7 @@ {% endif %} {% else %}

- There doesn't seem to be anything here... + There doesn't seem to be any media here yet...

{% endif %} {% endblock %} -- cgit v1.2.3 From 71454fd351bcc18662168bd89d6876ea498c3715 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 31 Jul 2011 20:45:49 -0500 Subject: Added tag listing views. Also added routing, added templates, etc. --- .../templates/mediagoblin/listings/tag.html | 28 ++++++++++++++++++++++ mediagoblin/templates/mediagoblin/utils/tags.html | 6 ++++- 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 mediagoblin/templates/mediagoblin/listings/tag.html (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/listings/tag.html b/mediagoblin/templates/mediagoblin/listings/tag.html new file mode 100644 index 00000000..db3381d2 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/listings/tag.html @@ -0,0 +1,28 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011 Free Software Foundation, Inc +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see . +#} +{% extends "mediagoblin/base.html" %} + +{% block mediagoblin_content -%} +

+ Media tagged with: {{ tag_name }} +

+ +
+ {% include "mediagoblin/utils/object_gallery.html" %} +
+{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html index 94c4cf69..ade41944 100644 --- a/mediagoblin/templates/mediagoblin/utils/tags.html +++ b/mediagoblin/templates/mediagoblin/utils/tags.html @@ -17,9 +17,13 @@ #} {% block tags_content -%} +

Tags

 {% endblock %} -- cgit v1.2.3 From 5d9006479088ecadcc4dcef14a9d8ccb0e4227f3 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 31 Jul 2011 20:48:13 -0500 Subject: Updated media detail view to linkify the tags. Adjusted tag link styling. --- mediagoblin/templates/mediagoblin/user_pages/media.html | 3 +++ 1 file changed, 3 insertions(+) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 7622d6e6..353cf91c 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -97,9 +97,11 @@ media = media._id)) }}
{% endif %} +
{% include "mediagoblin/utils/prev_next.html" %}

Sidebar content here!

+

{% if media['uploader'] == request.user['_id'] or request.user['is_admin'] %} @@ -116,6 +118,7 @@

{% endif %}

+ {% if media.tags %} {% include "mediagoblin/utils/tags.html" %} {% endif %} -- cgit v1.2.3 From 92ed289261fc8b091ef459757eb321db9be7d6b8 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 31 Jul 2011 20:54:21 -0500 Subject: Align image in media detail to center --- mediagoblin/templates/mediagoblin/user_pages/media.html | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 353cf91c..a1382518 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -23,8 +23,11 @@ {% block mediagoblin_content %} {% if media %}
- +
+ +

{{media.title}} -- cgit v1.2.3 From 1a897068725233b607d377b713b733c6d5084477 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 31 Jul 2011 21:24:33 -0500 Subject: Added tags atom feed and linked it in the appropriate places --- mediagoblin/templates/mediagoblin/listings/tag.html | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/listings/tag.html b/mediagoblin/templates/mediagoblin/listings/tag.html index db3381d2..6f10ec8d 100644 --- a/mediagoblin/templates/mediagoblin/listings/tag.html +++ b/mediagoblin/templates/mediagoblin/listings/tag.html @@ -17,6 +17,13 @@ #} {% extends "mediagoblin/base.html" %} +{% block mediagoblin_head %} + +{% endblock mediagoblin_head %} + {% block mediagoblin_content -%}

Media tagged with: {{ tag_name }} @@ -25,4 +32,10 @@
{% include "mediagoblin/utils/object_gallery.html" %}
+ +
+ atom feed +
{% endblock %} -- cgit v1.2.3 From b855b010d08eecb34108da6c8b9bed728fa0ff72 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 31 Jul 2011 21:24:54 -0500 Subject: user pages atom feed not enclosed properly in div, fixing. --- mediagoblin/templates/mediagoblin/user_pages/gallery.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html index a434ff15..637c892d 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html +++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html @@ -36,10 +36,10 @@ {% include "mediagoblin/utils/object_gallery.html" %}

- - atom feed + atom feed +
{% else %} {# This *should* not occur as the view makes sure we pass in a user. #}

Sorry, no such user found.

-- cgit v1.2.3 From f9372f6c8b2b9889a05d072c79abe96dee699cda Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Sun, 31 Jul 2011 21:33:01 -0500 Subject: "needs verification"->"verify your email" willkg says "needs verification" isn't a verb, so it's a weird link. Good point. --- mediagoblin/templates/mediagoblin/base.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 6af02c00..4da685f9 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -59,7 +59,7 @@ - needs verification! + verify your email! {% endif %}

{% endfor %} +
{% if pagination_base_url %} {# different url, so set that and don't keep the get params #} {{ render_pagination(request, pagination, pagination_base_url, False) }} -- cgit v1.2.3 From 2542aa30c0fcee783a12f9b8b610e4998871fdd9 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 1 Aug 2011 10:49:05 -0500 Subject: Make index page paginated --- mediagoblin/templates/mediagoblin/root.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html index bae033c4..ed7b931f 100644 --- a/mediagoblin/templates/mediagoblin/root.html +++ b/mediagoblin/templates/mediagoblin/root.html @@ -39,5 +39,5 @@ {# temporarily, an "image gallery" that isn't one really ;) #} - {% include "mediagoblin/utils/object_gallery.html" %} + {% include "mediagoblin/utils/object_gallery.html" %} {% endblock %} -- cgit v1.2.3 From aaa46f5a156093c4295e4cb0d85eae72e28468ea Mon Sep 17 00:00:00 2001 From: Jef van Schendel Date: Tue, 2 Aug 2011 21:17:30 +0200 Subject: Sidebar changes: correct tags header to be

, show action buttons header only to owner --- mediagoblin/templates/mediagoblin/user_pages/media.html | 5 +---- mediagoblin/templates/mediagoblin/utils/tags.html | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index a1382518..ddcf3ce9 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -103,11 +103,9 @@
{% include "mediagoblin/utils/prev_next.html" %} -

Sidebar content here!

- -

{% if media['uploader'] == request.user['_id'] or request.user['is_admin'] %} +

Temporary button holder

delete

{% endif %} -

{% if media.tags %} {% include "mediagoblin/utils/tags.html" %} diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html index ade41944..32db6e31 100644 --- a/mediagoblin/templates/mediagoblin/utils/tags.html +++ b/mediagoblin/templates/mediagoblin/utils/tags.html @@ -17,7 +17,7 @@ #} {% block tags_content -%} -

Tags

+

Tags

@@ -85,7 +85,7 @@ {% block mediagoblin_footer %}
- Powered by MediaGoblin, a GNU project + {% trans %}Powered by MediaGoblin, a GNU project{% endtrans %}
{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html index d19034cb..3dc170c8 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit.html +++ b/mediagoblin/templates/mediagoblin/edit/edit.html @@ -26,15 +26,15 @@ media= media._id) }}" method="POST" enctype="multipart/form-data">
-

Editing {{ media.title }}

+

{% trans media_title=media.title %}Editing {{ media_title }}{% endtrans %}

{{ wtforms_util.render_divs(form) }}
- Cancel - + {% trans %}Cancel{% endtrans %} +
diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html index a11b86d7..4171cb4d 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html @@ -25,10 +25,10 @@ user['username'] }}" method="POST" enctype="multipart/form-data">
-

Editing {{ user['username'] }}'s profile

+

{% trans username=user['username'] %}Editing {{ username }}'s profile{% endtrans %}

{{ wtforms_util.render_divs(form) }}
- +
diff --git a/mediagoblin/templates/mediagoblin/listings/tag.html b/mediagoblin/templates/mediagoblin/listings/tag.html index 6f10ec8d..18123dbd 100644 --- a/mediagoblin/templates/mediagoblin/listings/tag.html +++ b/mediagoblin/templates/mediagoblin/listings/tag.html @@ -26,7 +26,7 @@ {% block mediagoblin_content -%}

- Media tagged with: {{ tag_name }} + {% trans %}Media tagged with:{% endtrans %} {{ tag_name }}

@@ -36,6 +36,6 @@
atom feed + tag=tag_slug) }}">{% trans %}atom feed{% endtrans %}
{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html index ed7b931f..3570374e 100644 --- a/mediagoblin/templates/mediagoblin/root.html +++ b/mediagoblin/templates/mediagoblin/root.html @@ -22,17 +22,18 @@ {% if request.user %}

- Submit an item + {% trans %}Submit an item{% endtrans %}

{% else %}

- If you have an account, you can - Login. + {% trans login_url=request.urlgen('mediagoblin.auth.login') %}If you have an account, you can + Login.{% endtrans %}

{% if allow_registration %}

- If you don't have an account, please - Register. + {% trans + register_url=request.urlgen('mediagoblin.auth.register') %}If you don't have an account, please + Register.{% endtrans %}

{% endif %} {% endif %} diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html index 6d00510c..eb34c2e2 100644 --- a/mediagoblin/templates/mediagoblin/submit/start.html +++ b/mediagoblin/templates/mediagoblin/submit/start.html @@ -23,13 +23,13 @@
-

Submit yer media

+

{% trans %}Submit yer media{% endtrans %}

{{ wtforms_util.render_field_div(submit_form.file) }} {{ wtforms_util.render_field_div(submit_form.title) }} {{ wtforms_util.render_textarea_div(submit_form.description) }} {{ wtforms_util.render_field_div(submit_form.tags) }}
- +
diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html index 637c892d..71f14da4 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html +++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html @@ -29,7 +29,9 @@

{{ user.username }}'s media

+ user=user.username) }}">{% trans + username=user.username %}{{ username }}'s + media{% endtrans %}
@@ -38,10 +40,10 @@
atom feed + user=user.username) }}>{% trans %}atom feed{% endtrans %}
{% else %} {# This *should* not occur as the view makes sure we pass in a user. #} -

Sorry, no such user found.

+

{% trans %}Sorry, no such user found.{% endtrans %}

{% endif %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index a1382518..92894d0d 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -38,24 +38,24 @@ {% endautoescape %}

- — uploaded on - {{ "%4d-%02d-%02d"|format(media.created.year, - media.created.month, media.created.day) }} - by - - {{- media.uploader().username }} + {% 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 {{ username }}{% endtrans %}


-

Comments

+

{% trans %}Comments{% endtrans %}

{% if request.user %}
{{ wtforms_util.render_field_div(comment_form.comment_content) }}
- +
{% endif %} @@ -77,7 +77,7 @@
— - {{ comment_author['username'] }} at + {{ comment_author['username'] }} {% trans %}at{% endtrans %} {% include "mediagoblin/utils/prev_next.html" %} -

Sidebar content here!

+

{% trans %}Sidebar content here!{% endtrans %}

{% if media['uploader'] == request.user['_id'] or @@ -117,7 +117,7 @@

delete + class="media_icon" />{% trans %}delete{% endtrans %}

{% endif %}

@@ -127,6 +127,6 @@ {% endif %}
{% else %} -

Sorry, no such media found.

+

{% trans %}Sorry, no such media found.{% endtrans %}

{% endif %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 76cf36be..c3ad07db 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -27,53 +27,56 @@ {% block mediagoblin_content -%} {# If no user... #} {% if not user %} -

Sorry, no such user found.

+

{% trans %}Sorry, no such user found.{% endtrans %}

{# User exists, but needs verification #} {% elif user.status == "needs_email_verification" %} {% if user == request.user %} {# this should only be visible when you are this user #}

-

Verification needed

+

{% trans %}Verification needed{% endtrans %}

-

Almost done! Your account still needs to be verified.

+

{% trans %}Almost done! Your account still needs to be + verified.{% endtrans %}

- An email should arrive in a few moments with instructions - on how to do so. + {% trans %}An email should arrive in a few moments with + instructions on how to do so.{% endtrans %}

-

In case it doesn't:

+

{% trans %}In case it doesn't:{% endtrans %}

Resend verification email + class="button">{% trans %}Resend verification email{% endtrans %}
{% else %} {# if the user is not you, but still needs to verify their email #}
-

Verification needed

+

{% trans %}Verification needed{% endtrans %}

- Someone has registered an account with this username, but it - still has to be verified. + {% trans %}Someone has registered an account with this + username, but it still has to be verified.{% endtrans %}

- If you are that person but you've lost your verification + {% trans login_url=request.urlgen('mediagoblin.auth.login') + %}If you are that person but you've lost your verification email, you can - log in - and resend it. + log in and resend it.{% + endtrans %}

{% endif %} {# Active(?) (or at least verified at some point) user, horray! #} {% else %} -

{{ user.username }}'s profile

+

{% trans username=user.username %}{{ username }}'s profile{% + endtrans %}

{% include "mediagoblin/utils/profile.html" %} {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} Edit profile + user.username }}">{% trans %}Edit profile{% endtrans %} {% endif %}
@@ -81,10 +84,12 @@ {% set pagination_base_url = user_gallery_url %} {% include "mediagoblin/utils/object_gallery.html" %}
-

View all of {{ user.username }}'s media

- atom feed +

{% trans + username=user.username %}View all of {{ username }}'s media{% + endtrans %}

+ {% trans %}atom feed1{% + endtrans %}
-- cgit v1.2.3 From 58b79b159e15335a0d8c82ba329543088cabfd49 Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Mon, 8 Aug 2011 10:19:21 -0500 Subject: Just some indentation changes to the templates because I'm picky about such things :) --- mediagoblin/templates/mediagoblin/auth/login.html | 19 +++++--- .../templates/mediagoblin/auth/register.html | 2 +- .../mediagoblin/auth/verification_email.txt | 8 ++-- mediagoblin/templates/mediagoblin/base.html | 4 +- .../templates/mediagoblin/edit/edit_profile.html | 6 ++- .../templates/mediagoblin/listings/tag.html | 4 +- mediagoblin/templates/mediagoblin/root.html | 15 ++++--- .../templates/mediagoblin/user_pages/gallery.html | 18 +++++--- .../templates/mediagoblin/user_pages/media.html | 16 ++++--- .../templates/mediagoblin/user_pages/user.html | 50 +++++++++++++--------- 10 files changed, 88 insertions(+), 54 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index 8b1e2296..5750feb0 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -25,9 +25,11 @@

{% trans %}Log in{% endtrans %}

{% if login_failed %} -
{% trans %}Login failed!{% - endtrans %}
{% endif %} {{ - wtforms_util.render_divs(login_form) }} +
+ {% trans %}Login failed!{% endtrans %} +
+ {% endif %} + {{ wtforms_util.render_divs(login_form) }}
@@ -36,10 +38,13 @@ style="display: none;"/> {% endif %} {% if allow_registration %} -

{% trans %}Don't have an account yet?{% endtrans - %}
{% trans %}Create one here!{% endtrans %}

{% endif - %} +

+ {% trans %}Don't have an account yet?{% endtrans %} +
+ + {%- trans %}Create one here!{% endtrans %} +

+ {% endif %}
{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html index 5d512829..623cbdfd 100644 --- a/mediagoblin/templates/mediagoblin/auth/register.html +++ b/mediagoblin/templates/mediagoblin/auth/register.html @@ -28,7 +28,7 @@ {{ wtforms_util.render_divs(register_form) }}
+ class="button" />
diff --git a/mediagoblin/templates/mediagoblin/auth/verification_email.txt b/mediagoblin/templates/mediagoblin/auth/verification_email.txt index cb01600d..32053101 100644 --- a/mediagoblin/templates/mediagoblin/auth/verification_email.txt +++ b/mediagoblin/templates/mediagoblin/auth/verification_email.txt @@ -14,11 +14,13 @@ # # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -#} +-#} -{% 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 %} diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index b9c98ef6..986e0995 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -85,7 +85,9 @@ {% block mediagoblin_footer %}
- {% trans %}Powered by MediaGoblin, a GNU project{% endtrans %} + {% trans -%} + Powered by MediaGoblin, a GNU project + {%- endtrans %}
{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html index 4171cb4d..534e5f20 100644 --- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html +++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html @@ -25,7 +25,11 @@ user['username'] }}" method="POST" enctype="multipart/form-data">
-

{% trans username=user['username'] %}Editing {{ username }}'s profile{% endtrans %}

+

+ {%- trans username=user['username'] -%} + Editing {{ username }}'s profile + {%- endtrans %} +

{{ wtforms_util.render_divs(form) }}
diff --git a/mediagoblin/templates/mediagoblin/listings/tag.html b/mediagoblin/templates/mediagoblin/listings/tag.html index 18123dbd..a013797f 100644 --- a/mediagoblin/templates/mediagoblin/listings/tag.html +++ b/mediagoblin/templates/mediagoblin/listings/tag.html @@ -36,6 +36,8 @@
{% trans %}atom feed{% endtrans %} + tag=tag_slug) }}"> + {%- trans %}atom feed{% endtrans -%} +
{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html index 3570374e..a4e19984 100644 --- a/mediagoblin/templates/mediagoblin/root.html +++ b/mediagoblin/templates/mediagoblin/root.html @@ -22,18 +22,21 @@ {% if request.user %}

- {% trans %}Submit an item{% endtrans %} + + {%- trans %}Submit an item{% endtrans -%} +

{% else %}

- {% trans login_url=request.urlgen('mediagoblin.auth.login') %}If you have an account, you can - Login.{% endtrans %} + {% trans login_url=request.urlgen('mediagoblin.auth.login') -%} + If you have an account, you can Login. + {%- endtrans %}

{% if allow_registration %}

- {% trans - register_url=request.urlgen('mediagoblin.auth.register') %}If you don't have an account, please - Register.{% endtrans %} + {% trans register_url=request.urlgen('mediagoblin.auth.register') -%} + If you don't have an account, please Register. + {%- endtrans %}

{% endif %} {% endif %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html index 71f14da4..a66a547e 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html +++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html @@ -27,20 +27,24 @@ {% block mediagoblin_content -%} {% if user %}

- {% trans - username=user.username %}{{ username }}'s - media{% endtrans %}

+ {%- trans username=user.username, + user_url=request.urlgen( + 'mediagoblin.user_pages.user_home', + user=user.username) -%} + {{ username }}'s media + {%- endtrans %} +
{% include "mediagoblin/utils/object_gallery.html" %}
- + {%- trans %}atom feed{% endtrans -%} +
{% else %} {# This *should* not occur as the view makes sure we pass in a user. #} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 2acf7a3d..afc0d903 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -38,13 +38,15 @@ {% endautoescape %}

- {% 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 {{ username }}{% endtrans %} + {% 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 {{ username }} + {%- endtrans %}


diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index c3ad07db..1115fc56 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -36,11 +36,15 @@

{% trans %}Verification needed{% endtrans %}

-

{% trans %}Almost done! Your account still needs to be - verified.{% endtrans %}

- {% 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 %} +

+

+ {% trans -%} + An email should arrive in a few moments with instructions on how to do so. + {%- endtrans %}

{% trans %}In case it doesn't:{% endtrans %}

@@ -53,30 +57,32 @@

{% trans %}Verification needed{% endtrans %}

- {% 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 %}

- {% trans login_url=request.urlgen('mediagoblin.auth.login') - %}If you are that person but you've lost your verification - email, you can - log in 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 log in and resend it. + {%- endtrans %}

{% endif %} {# Active(?) (or at least verified at some point) user, horray! #} {% else %} -

{% trans username=user.username %}{{ username }}'s profile{% - endtrans %}

+

+ {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%} +

{% include "mediagoblin/utils/profile.html" %} {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %} {% trans %}Edit profile{% endtrans %} + user.username }}"> + {%- trans %}Edit profile{% endtrans -%} + {% endif %}
@@ -84,12 +90,16 @@ {% set pagination_base_url = user_gallery_url %} {% include "mediagoblin/utils/object_gallery.html" %}
-

{% trans - username=user.username %}View all of {{ username }}'s media{% - endtrans %}

- {% trans %}atom feed1{% - endtrans %} +

+ + {% trans username=user.username -%} + View all of {{ username }}'s media{% endtrans -%} + +

+ + {%- trans %}atom feed{% endtrans -%} +
-- cgit v1.2.3 From db3e0583494f201c663c7d037410011da951666b Mon Sep 17 00:00:00 2001 From: Christopher Allan Webber Date: Wed, 10 Aug 2011 10:50:42 -0500 Subject: Make it so that form fields and descriptions are actually translated --- mediagoblin/templates/mediagoblin/utils/wtforms.html | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mediagoblin/templates') diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html index 1d2f8619..e3d8e137 100644 --- a/mediagoblin/templates/mediagoblin/utils/wtforms.html +++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html @@ -19,9 +19,9 @@ {# Generically render a field #} {% macro render_field_div(field) %}
-
{{ field.label }}
+
{{ _(field.label.text) }}
{% if field.description -%} -
{{ field.description }}
+
{{ _(field.description) }}
{%- endif %}
{{ field }}
{%- if field.errors -%} @@ -38,9 +38,9 @@ # ... mostly the same thing except it includes rows and cols #} {% macro render_textarea_div(field, rows=8, cols=20) %}
-
{{ field.label }}
+
{{ _(field.label.text) }}
{% if field.description -%} -
{{ field.description }}
+
{{ _(field.description) }}
{%- endif %}
{{ field(rows=rows, cols=cols) }}
{%- if field.errors -%} @@ -64,7 +64,7 @@ {% macro render_table(form) -%} {% for field in form %} - {{field.label}} + {{ _(field.label.text) }} {{field}} {% if field.errors %} -- cgit v1.2.3