15 files changed, 63 insertions, 3 deletions
diff --git a/python/fatcat_web/templates/about.html b/python/fatcat_web/templates/about.html
index a760ff0c..706ab9fd 100644
--- a/python/fatcat_web/templates/about.html
+++ b/python/fatcat_web/templates/about.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% block title %}About{% endblock %}
+
 {% block body %}
 
 <img class="ui fluid bordered image" src="/static/fatcat.jpg" title="CC0 photo of an oversized feline" alt="">
diff --git a/python/fatcat_web/templates/auth_account.html b/python/fatcat_web/templates/auth_account.html
index 4b1562d7..4faeb48f 100644
--- a/python/fatcat_web/templates/auth_account.html
+++ b/python/fatcat_web/templates/auth_account.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% block title %}Account Settings{% endblock %}
+
 {% block body %}
 
 <h1 class="ui header">
diff --git a/python/fatcat_web/templates/auth_login.html b/python/fatcat_web/templates/auth_login.html
index 85e33d79..0f768054 100644
--- a/python/fatcat_web/templates/auth_login.html
+++ b/python/fatcat_web/templates/auth_login.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% block title %}Login/Signup{% endblock %}
+
 {% block fullbody %}
 <div class="ui centered grid container">
 <div class="eight wide column" style="font-size: 1.14285714rem;">
diff --git a/python/fatcat_web/templates/base.html b/python/fatcat_web/templates/base.html
index b853f413..10011153 100644
--- a/python/fatcat_web/templates/base.html
+++ b/python/fatcat_web/templates/base.html
@@ -11,8 +11,8 @@
     {%- elif config.FATCAT_DOMAIN.startswith('dev.') -%}
       {{- "[DEV] " -}}
     {%- endif -%}
-    fatcat!
-  {%- endblock -%}</title>
+    Perpetual Access Machine
+  {%- endblock -%} | fatcat!</title>
 
   <link rel="stylesheet"
     href="https://cdn.jsdelivr.net/npm/semantic-ui@2.4.1/dist/semantic.min.css"
diff --git a/python/fatcat_web/templates/changelog.html b/python/fatcat_web/templates/changelog.html
index c8b4c030..8b899d38 100644
--- a/python/fatcat_web/templates/changelog.html
+++ b/python/fatcat_web/templates/changelog.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% block title %}Changelog{% endblock %}
+
 {% block body %}
 
 <h1 class="ui header">Recent Changes
diff --git a/python/fatcat_web/templates/changelog_view.html b/python/fatcat_web/templates/changelog_view.html
index 5b403b09..60e59bd3 100644
--- a/python/fatcat_web/templates/changelog_view.html
+++ b/python/fatcat_web/templates/changelog_view.html
@@ -1,5 +1,8 @@
 {% set auth_to = {} %}
 {% extends "editgroup_view.html" %}
+
+{% block title %}Changelog #{{ entry.index }}{% endblock %}
+
 {% block editgroupheader %}
 
 <h1 class="ui header">Changelog Entry
diff --git a/python/fatcat_web/templates/container_search.html b/python/fatcat_web/templates/container_search.html
index b8bbfa18..7f6799dd 100644
--- a/python/fatcat_web/templates/container_search.html
+++ b/python/fatcat_web/templates/container_search.html
@@ -1,4 +1,13 @@
 {% extends "base.html" %}
+
+{% block title %}
+{% if query %}
+  Search: {{ query }}
+{% else %}
+  Release Search
+{% endif %}
+{% endblock %}
+
 {% block fullmain %}
 
 <div class="ui vertical stripe segment" style="background-color: #EEE; padding-top: 4.5em;">
diff --git a/python/fatcat_web/templates/deleted_entity.html b/python/fatcat_web/templates/deleted_entity.html
index 714ac73f..e3fa83a7 100644
--- a/python/fatcat_web/templates/deleted_entity.html
+++ b/python/fatcat_web/templates/deleted_entity.html
@@ -1,6 +1,8 @@
 {% import "entity_macros.html" as entity_macros %}
 {% extends "base.html" %}
 
+{% block title %}[deleted]{% endblock %}
+
 {% block fullbody %}
 
 <div class="ui stackable mobile reversed grid centered">
diff --git a/python/fatcat_web/templates/editgroup_reviewable.html b/python/fatcat_web/templates/editgroup_reviewable.html
index b1ece6af..4cfea697 100644
--- a/python/fatcat_web/templates/editgroup_reviewable.html
+++ b/python/fatcat_web/templates/editgroup_reviewable.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% block title %}Reviewable Editgroups{% endblock %}
+
 {% block body %}
 
 <h1 class="ui header">Reviewable Editgroups
diff --git a/python/fatcat_web/templates/editgroup_view.html b/python/fatcat_web/templates/editgroup_view.html
index 3508578c..e8146d19 100644
--- a/python/fatcat_web/templates/editgroup_view.html
+++ b/python/fatcat_web/templates/editgroup_view.html
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% import "entity_macros.html" as entity_macros %}
 
+{% block title %}Editgroup{% endblock %}
+
 {% block body %}
 
 {% macro edit_list(auth_to, editgroup, edits, entity_type, entity_name) -%}
diff --git a/python/fatcat_web/templates/editor_view.html b/python/fatcat_web/templates/editor_view.html
index c62f8d93..6ac58e3d 100644
--- a/python/fatcat_web/templates/editor_view.html
+++ b/python/fatcat_web/templates/editor_view.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% block title %}{{ editor.username }} (editor){% endblock %}
+
 {% block body %}
 
 <h1 class="ui header">{{ editor.username }}
diff --git a/python/fatcat_web/templates/entity_base.html b/python/fatcat_web/templates/entity_base.html
index b846614d..7442e737 100644
--- a/python/fatcat_web/templates/entity_base.html
+++ b/python/fatcat_web/templates/entity_base.html
@@ -1,5 +1,18 @@
 {% extends "base.html" %}
 
+{# TODO: more specific titles #}
+{% block title %}
+{% if entity_type == "container" and entity.name %}
+  {{ entity.name }}
+{% elif entity_type == "creator" and entity.display_name %}
+  {{ entity.display_name }}
+{% elif entity_type == "release" and entity.title %}
+  {{ entity.title }}
+{% else %}
+  {{ entity_type }}_{{ entity.ident or entity.revision }}
+{% endif %}
+{% endblock %}
+
 {% macro entity_tab(name, text, url_suffix, count=None) %}
 <a href ="{% if editgroup %}/editgroup/{{ editgroup.editgroup_id }}{% endif %}/{{ entity_type }}/{% if entity.ident %}{{ entity.ident }}{% elif entity.revision %}rev/{{ entity.revision }}{% endif %}{{ url_suffix }}" class="{% if entity_view == name %}active{% endif %} item" style="padding: 0em 1.2em;">{{ text }}{% if count != None %} ({{ count }}){% endif %}</a>
 {% endmacro %}
diff --git a/python/fatcat_web/templates/home.html b/python/fatcat_web/templates/home.html
index ea120fc3..171981c7 100644
--- a/python/fatcat_web/templates/home.html
+++ b/python/fatcat_web/templates/home.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
 
+{% block title %}Perpetual Access to the Scholarly Record{% endblock %}
+
 {% block extra_head %}
   <link rel="canonical" href="https://{{ config.FATCAT_DOMAIN }}/">
 {% endblock %}
diff --git a/python/fatcat_web/templates/release_search.html b/python/fatcat_web/templates/release_search.html
index b996c383..9427663d 100644
--- a/python/fatcat_web/templates/release_search.html
+++ b/python/fatcat_web/templates/release_search.html
@@ -1,4 +1,13 @@
 {% extends "base.html" %}
+
+{% block title %}
+{% if query %}
+  Search: {{ query }}
+{% else %}
+  Release Search
+{% endif %}
+{% endblock %}
+
 {% block fullmain %}
 
 <div class="ui vertical stripe segment" style="background-color: #EEE; padding-top: 4.5em;">
@@ -14,7 +23,7 @@
           <input type="checkbox" name="fulltext_only" value="true" {% if fulltext_only %}checked{% endif %}>
           <label>Fulltext Available Only</label>
         </div>
-        <br>Can also lookup by <b><a href="/release/lookup">identifier</a></b> or search <b><a href="/container/search?q={{ query or "" }}">containers</a></b>.
+        <br>Can also lookup by <b><a href="/release/lookup">identifier</a></b> or search for <b><a href="/container/search?q={{ query or "" }}">containers</a></b> (eg, journals).
       </div>
     </form>
   </div>
diff --git a/python/fatcat_web/templates/stats.html b/python/fatcat_web/templates/stats.html
index 5b769b1b..fb7828ff 100644
--- a/python/fatcat_web/templates/stats.html
+++ b/python/fatcat_web/templates/stats.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% block title %}Stats{% endblock %}
+
 {% block body %}
 
 <h1>Stats</h1>