From daecdea906ddd8121d469820f2e7514387f4ca7b Mon Sep 17 00:00:00 2001
From: Aleksej <deletesoftware@yandex.ru>
Date: Mon, 13 Aug 2012 20:28:48 +0400
Subject: [PATCH] added title tags to various pages and marked a string
 translatable

---
 mediagoblin/templates/mediagoblin/admin/panel.html   |  4 ++++
 .../templates/mediagoblin/auth/forgot_password.html  |  4 ++++
 mediagoblin/templates/mediagoblin/auth/login.html    |  4 ++++
 mediagoblin/templates/mediagoblin/auth/register.html |  4 ++++
 .../templates/mediagoblin/edit/attachments.html      | 12 +++++++++++-
 mediagoblin/templates/mediagoblin/edit/edit.html     |  6 ++++++
 .../templates/mediagoblin/edit/edit_account.html     |  7 +++++++
 .../templates/mediagoblin/edit/edit_profile.html     |  6 ++++++
 mediagoblin/templates/mediagoblin/submit/start.html  |  4 ++++
 .../mediagoblin/user_pages/processing_panel.html     |  4 ++++
 10 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/mediagoblin/templates/mediagoblin/admin/panel.html b/mediagoblin/templates/mediagoblin/admin/panel.html
index 0da3c18f..618c5c40 100644
--- 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 %} &mdash; {{ 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 672e9d9a..46aeddef 100644
--- 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 %} &mdash; {{ 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 8161ea9d..4a39059d 100644
--- 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 39c9efff..a2505cb9 100644
--- 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 580127fb..ee9d5cb7 100644
--- 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 %} &mdash; {{ 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 3f7cbe0e..3e305ae0 100644
--- 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 %} &mdash; {{ 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 1d80debc..9bacb157 100644
--- 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 90862a4f..2b2fa4fa 100644
--- 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 %} &mdash; {{ 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 31163384..aa390f56 100644
--- 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 %} &mdash; {{ 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 ecbfb409..f6fa69d0 100644
--- 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 %} &mdash; {{ super() }}
+{%- endblock %}
+
 {% block mediagoblin_content %}
 
 <h1>{% trans %}Media processing panel{% endtrans %}</h1>
-- 
2.25.1