From d1806d43a9d14e27346a0f7a1c36411dead19738 Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Sun, 30 Jun 2019 03:48:09 -0700 Subject: more descriptive HTML titles --- python/fatcat_web/templates/about.html | 3 +++ python/fatcat_web/templates/auth_account.html | 3 +++ python/fatcat_web/templates/auth_login.html | 2 ++ python/fatcat_web/templates/base.html | 4 ++-- python/fatcat_web/templates/changelog.html | 3 +++ python/fatcat_web/templates/changelog_view.html | 3 +++ python/fatcat_web/templates/container_search.html | 9 +++++++++ python/fatcat_web/templates/deleted_entity.html | 2 ++ python/fatcat_web/templates/editgroup_reviewable.html | 3 +++ python/fatcat_web/templates/editgroup_view.html | 2 ++ python/fatcat_web/templates/editor_view.html | 3 +++ python/fatcat_web/templates/entity_base.html | 13 +++++++++++++ python/fatcat_web/templates/home.html | 2 ++ python/fatcat_web/templates/release_search.html | 11 ++++++++++- python/fatcat_web/templates/stats.html | 3 +++ 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 %} 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 %}

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 %}
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 -%} + Perpetual Access Machine + {%- endblock -%} | fatcat! 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 %}

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

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

{{ 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) %} {{ text }}{% if count != None %} ({{ count }}){% endif %} {% 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 %} {% 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 %}
@@ -14,7 +23,7 @@
-
Can also lookup by identifier or search containers. +
Can also lookup by identifier or search for containers (eg, journals).

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

Stats

-- cgit v1.2.3