added title tags to various pages and marked a string translatable

diff --git a/mediagoblin/templates/mediagoblin/admin/panel.html b/mediagoblin/templates/mediagoblin/admin/panel.html
index 0da3c18fc0fd27907485db226ca5dfe1545e66a7..618c5c40b6ba58333925ef4c66970c6b53683d9b 100644 (file)
--- a/mediagoblin/templates/mediagoblin/admin/panel.html
+++ b/mediagoblin/templates/mediagoblin/admin/panel.html
@@ -17,6 +17,10 @@
 #}
 {% extends "mediagoblin/base.html" %}
 
+{% block title -%}
+  {% trans %}Media processing panel{% endtrans %} — {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
 
 <h1>{% trans %}Media processing panel{% endtrans %}</h1>

diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
index 672e9d9a9daf5506a268761282e7c84ce45634b6..46aeddef743405e5c7c8de837f4c27ce2d04e1c3 100644 (file)
--- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html
+++ b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
@@ -19,6 +19,10 @@
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
+{% block title -%}
+  {% trans %}Recover password{% endtrans %} — {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}"
         method="POST" enctype="multipart/form-data">

diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 8161ea9dfa16771dd6d6001adb3bf5ebc0a48ed3..4a39059d35c1d7723a72a313b10d92f73f64c219 100644 (file)
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -24,6 +24,10 @@
           src="{{ request.staticdirect('/js/autofilledin_password.js') }}"></script>
 {% endblock %}
 
+{% block title -%}
+  {% trans %}Log in{% endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.auth.login') }}"
         method="POST" enctype="multipart/form-data">

diff --git a/mediagoblin/templates/mediagoblin/auth/register.html b/mediagoblin/templates/mediagoblin/auth/register.html
index 39c9efff161e3471917ac11f033592780dbf1f99..a2505cb9d71c137392ea5a7633b3612c98d6b97f 100644 (file)
--- a/mediagoblin/templates/mediagoblin/auth/register.html
+++ b/mediagoblin/templates/mediagoblin/auth/register.html
@@ -24,6 +24,10 @@
           src="{{ request.staticdirect('/js/show_password.js') }}"></script>
 {% endblock mediagoblin_head %}
 
+{% block title -%}
+  {% trans %}Create an account!{% endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.auth.register') }}"

diff --git a/mediagoblin/templates/mediagoblin/edit/attachments.html b/mediagoblin/templates/mediagoblin/edit/attachments.html
index 580127fbafe5e403bd8bb25ffc9064125ebf8f92..ee9d5cb77773519294904e4dde10ee9feb612861 100644 (file)
--- a/mediagoblin/templates/mediagoblin/edit/attachments.html
+++ b/mediagoblin/templates/mediagoblin/edit/attachments.html
@@ -18,13 +18,23 @@
 {% extends "mediagoblin/base.html" %}
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+
+{% block title -%}
+  {% trans media_title=media.title -%}
+      Editing attachments for {{ media_title }}
+  {%- endtrans %} — {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.edit.attachments',
                                user= media.get_uploader.username,
                                media= media._id) }}"
         method="POST" enctype="multipart/form-data">
     <div class="form_box">
-      <h1>Editing attachments for {{ media.title }}</h1>
+      <h1>
+        {% trans media_title=media.title -%}
+          Editing attachments for {{ media_title }}
+        {%- endtrans %}</h1>
       <div style="text-align: center;" >
         <img src="{{ request.app.public_store.file_url(
                          media.media_files['thumb']) }}" />

diff --git a/mediagoblin/templates/mediagoblin/edit/edit.html b/mediagoblin/templates/mediagoblin/edit/edit.html
index 3f7cbe0eaad3fe92e5ad9735e23034690f66bb6b..3e305ae09b6f8c53f6447e2e867397ae82fa61bd 100644 (file)
--- a/mediagoblin/templates/mediagoblin/edit/edit.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit.html
@@ -19,6 +19,12 @@
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
+{% block title -%}
+  {% trans media_title=media.title -%}
+    Editing {{ media_title }}
+  {%- endtrans %} — {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.edit.edit_media',

diff --git a/mediagoblin/templates/mediagoblin/edit/edit_account.html b/mediagoblin/templates/mediagoblin/edit/edit_account.html
index 1d80debc64a8a6c3be0ada8b3a79f94bf2604aa8..9bacb1576a2edcdf24635d3a6ea42ee88109bf4f 100644 (file)
--- a/mediagoblin/templates/mediagoblin/edit/edit_account.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_account.html
@@ -24,6 +24,13 @@
           src="{{ request.staticdirect('/js/show_password.js') }}"></script>
 {% endblock mediagoblin_head %}
 
+{% block title -%}
+  {% trans username=user.username -%}
+    Changing {{ username }}'s account settings
+  {%- endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
+
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.edit.account') }}?username={{ 

diff --git a/mediagoblin/templates/mediagoblin/edit/edit_profile.html b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
index 90862a4fb5dd8523009ee2d291e4b48ca7090169..2b2fa4fa2033e24ebae506a31e8dd6482259dd8b 100644 (file)
--- a/mediagoblin/templates/mediagoblin/edit/edit_profile.html
+++ b/mediagoblin/templates/mediagoblin/edit/edit_profile.html
@@ -19,6 +19,12 @@
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
+{% block title -%}
+  {% trans username=user.username -%}
+    Editing {{ username }}'s profile
+  {%- endtrans %} — {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
 
   <form action="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{ 

diff --git a/mediagoblin/templates/mediagoblin/submit/start.html b/mediagoblin/templates/mediagoblin/submit/start.html
index 311633845e2f053c57cd308f1373197a5ff4bc51..aa390f56ad779b9504ab49f27c263e7bbe97fff2 100644 (file)
--- a/mediagoblin/templates/mediagoblin/submit/start.html
+++ b/mediagoblin/templates/mediagoblin/submit/start.html
@@ -19,6 +19,10 @@
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
+{% block title -%}
+  {% trans %}Add your media{% endtrans %} — {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
   <form action="{{ request.urlgen('mediagoblin.submit.start') }}"
         method="POST" enctype="multipart/form-data">

diff --git a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
index ecbfb40942f2796a71b35992f6c14d3d1a45db88..f6fa69d0b4c884011ab7f5c97400de4d8cc35a7f 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/processing_panel.html
@@ -17,6 +17,10 @@
 #}
 {% extends "mediagoblin/base.html" %}
 
+{% block title -%}
+  {% trans %}Media processing panel{% endtrans %} — {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
 
 <h1>{% trans %}Media processing panel{% endtrans %}</h1>