Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions makeabilitylab/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')

# Makeability Lab Global Variables, including Makeability Lab version
ML_WEBSITE_VERSION = "2.16.0" # Keep this updated with each release and also change the short description below
ML_WEBSITE_VERSION_DESCRIPTION = "Keyword taxonomy cleanup tooling (#1352): a 'Merge selected keywords' admin action on the Keyword changelist that reassigns every reference (across Publications, Talks, Posters, Grants, Projects, and Project Umbrellas) onto a chosen target and deletes the duplicates, plus a read-only 'Duplicate keywords' Data Health check that finds case/whitespace variants and deep-links to the filtered changelist to merge them. Keyword.save() now normalizes whitespace so casual variants can't be created. Also: the merge reassigns at the M2M through-table level to stay compatible with the legacy sort_value column on website_publication_keywords. Admin hygiene (#1346): the Photo changelist no longer crashes on a missing image file and now shows the owning project. SEO on-page fixes (duplicate <title>, /None sponsor links, YouTube embed)."
ML_WEBSITE_VERSION = "2.16.1" # Keep this updated with each release and also change the short description below
ML_WEBSITE_VERSION_DESCRIPTION = "SEO: shorten the home page <title> to 'HCI & AI Research at UW | Makeability Lab' so it stays under Google's ~60-character display limit (the 2.16.0 'University of Washington' variant was truncated). Follow-up to the 2.16.0 on-page SEO fixes."
DATE_MAKEABILITYLAB_FORMED = datetime.date(2012, 1, 1) # Date Makeability Lab was formed
MAX_BANNERS = 7 # Maximum number of banners on a page

Expand Down
2 changes: 1 addition & 1 deletion website/templates/website/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
{% endcomment %}

{# base.html appends " | Makeability Lab", so this block holds only the descriptive prefix (repeating the lab name here caused a duplicated title). #}
{% block pagetitle %}HCI &amp; AI Research at the University of Washington{% endblock %}
{% block pagetitle %}HCI &amp; AI Research at UW{% endblock %}

{% load static %}
{% load thumbnail %}
Expand Down
4 changes: 1 addition & 3 deletions website/tests/test_page_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,7 @@ def test_home_title_is_not_duplicated(self):
resp = self.client.get(reverse("website:index"), secure=True)
self.assertNotContains(resp, "<title>Makeability Lab | Makeability Lab</title>")
self.assertContains(
resp,
"<title>HCI &amp; AI Research at the University of Washington "
"| Makeability Lab</title>",
resp, "<title>HCI &amp; AI Research at UW | Makeability Lab</title>"
)

def test_no_http_scheme_in_social_urls(self):
Expand Down
Loading