diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html index d5a5ddef..47b8393d 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html +++ b/mediagoblin/templates/mediagoblin/auth/login.html @@ -20,7 +20,7 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_content %} -

Login:

+

Login:

diff --git a/mediagoblin/templates/mediagoblin/auth/login.html~ b/mediagoblin/templates/mediagoblin/auth/login.html~ index 19d90907..d5a5ddef 100644 --- a/mediagoblin/templates/mediagoblin/auth/login.html~ +++ b/mediagoblin/templates/mediagoblin/auth/login.html~ @@ -33,7 +33,7 @@ {{ wtforms_util.render_table(login_form) }} - + diff --git a/mediagoblin/templates/mediagoblin/base.html~ b/mediagoblin/templates/mediagoblin/base.html~ index 07be3c47..d73d8c20 100644 --- a/mediagoblin/templates/mediagoblin/base.html~ +++ b/mediagoblin/templates/mediagoblin/base.html~ @@ -23,8 +23,6 @@ -

GNU MediaGoblin at your duty!

- + {% endblock mediagoblin_body %} diff --git a/mediagoblin/templates/mediagoblin/media_details.html~ b/mediagoblin/templates/mediagoblin/media_details.html~ index 1b02c809..bd63a289 100644 --- a/mediagoblin/templates/mediagoblin/media_details.html~ +++ b/mediagoblin/templates/mediagoblin/media_details.html~ @@ -20,7 +20,7 @@ {# temporarily, an "image gallery" that isn't one really ;) #} {% if media %} -

Media details for {{media.title}}

+

Media details for {{media.title}}

diff --git a/mediagoblin/templates/mediagoblin/root.html~ b/mediagoblin/templates/mediagoblin/root.html~ index fa78bda2..e2b2730a 100644 --- a/mediagoblin/templates/mediagoblin/root.html~ +++ b/mediagoblin/templates/mediagoblin/root.html~ @@ -19,7 +19,7 @@ {% block mediagoblin_content %} -

{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}

+

{% trans %}Welcome to GNU MediaGoblin!{% endtrans %}

{% if request.user %}

diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html index 21a7ed4e..8b446417 100644 --- a/mediagoblin/templates/mediagoblin/submit/start.html +++ b/mediagoblin/templates/mediagoblin/submit/start.html @@ -20,7 +20,7 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% block mediagoblin_content %} -

Submit yer media

+

Submit yer media

diff --git a/mediagoblin/templates/mediagoblin/submit/start.html~ b/mediagoblin/templates/mediagoblin/submit/start.html~ index 562d9050..21a7ed4e 100644 --- a/mediagoblin/templates/mediagoblin/submit/start.html~ +++ b/mediagoblin/templates/mediagoblin/submit/start.html~ @@ -28,7 +28,7 @@ {{ wtforms_util.render_table(submit_form) }} - + diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 08cc9251..e07cee44 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -20,11 +20,11 @@ {# temporarily, an "image gallery" that isn't one really ;) #} {% if media %} -

Media details for Media details for {{media.uploader.username}} / {{media.title}} -

+
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html~ b/mediagoblin/templates/mediagoblin/user_pages/media.html~ new file mode 100644 index 00000000..08cc9251 --- /dev/null +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html~ @@ -0,0 +1,41 @@ +{# +# 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 %} + + {# temporarily, an "image gallery" that isn't one really ;) #} + {% if media %} +

Media details for {{media.uploader.username}} + / {{media.title}} +

+
+ + +
Uploaded on {{ "%4d-%02d-%02d"|format(media.created.year, + media.created.month,media.created.day)}} by {{media.uploader.username}} +
Description: {{media.description}} +
+ {% else %} +

Sorry, no such media found.

+ {% endif %} +{% endblock %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index 85f05e08..5c8692fc 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -18,7 +18,7 @@ {% extends "mediagoblin/base.html" %} {% block mediagoblin_content -%} {% if user %} -

User page for '{{ user.username }}'

+

User page for '{{ user.username }}'

{#- Should we outsource such a media 'gallery' view to it's own file? It could be useful for the home page and other views too -#} diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html~ b/mediagoblin/templates/mediagoblin/user_pages/user.html~ new file mode 100644 index 00000000..4ae7986e --- /dev/null +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html~ @@ -0,0 +1,39 @@ +{# +# 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 -%} + {% if user %} +

User page for '{{ user.username }}' + + {#- Should we outsource such a media 'gallery' view to it's own file? + It could be useful for the home page and other views too -#} +
    + {%- for entry in media_entries %} +
  • + + +
    • + {%- endfor %} +
+ {% else %} + {# This *should* not occur as the view makes sure we pass in a user. #} +

Sorry, no such user found.

+ {% endif %} +{% endblock %}