Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
6bb207d
feat: auto- title "Supersized Science" podcasts
wesleyboar Feb 17, 2026
54e8c28
fix: google search bugs (#538)
wesleyboar Feb 23, 2026
eb93d55
fix: accent color contrast vs normal text (CMS)
wesleyboar Feb 23, 2026
554d136
fix: accent color contrast vs normal text (Portal)
wesleyboar Feb 23, 2026
c76dd79
fix: invisible hover state on footer social logos (#539)
wesleyboar Feb 24, 2026
945c01d
chore: delete inaccurate, unrealized code
wesleyboar Feb 24, 2026
7583bc4
fix: darker nav text
wesleyboar Feb 24, 2026
0f28fa6
Merge branch 'fix/ally-issues' of github.com:TACC/tup-ui into fix/all…
wesleyboar Feb 24, 2026
da1377a
fix: explain "Update" pill (and remove extra span)
wesleyboar Feb 25, 2026
101e695
fix(a11y): nav dropdown icons unexplained to aria
wesleyboar Feb 25, 2026
a0df382
fix: aria-label="…" when data-prefix="Published:"
wesleyboar Feb 26, 2026
d0f7301
chore: format markup for "Update" pill
wesleyboar Feb 26, 2026
982e446
fix: improve focus UI clarity (kill old code)
wesleyboar Feb 26, 2026
c6b6e3a
fix: save use of previous commit on snippet
wesleyboar Feb 26, 2026
fce6a43
fix(a11y): relate SoftwareTable button & dialog
wesleyboar Mar 3, 2026
d531fa8
fix: login; required fail, autocomplete wrong
wesleyboar Mar 4, 2026
a40e6be
chore: npx nx format:write
wesleyboar Mar 4, 2026
22dfb64
fix: require input on software list search
wesleyboar Mar 4, 2026
a042317
Revert "fix: require input on software list search"
wesleyboar Mar 4, 2026
0113873
enhance: software table accessibility
wesleyboar Mar 4, 2026
724df48
deps: core-cms#fix/a11y-issues
wesleyboar Mar 6, 2026
d66054c
refactor: djangocms-blog settings
wesleyboar Mar 9, 2026
e74bad3
refactor: DJANGOCMS_ICON_SETS settings load path
wesleyboar Mar 9, 2026
3f241a3
fix: missing comma
wesleyboar Mar 9, 2026
1f0c07d
test: fix failing test
wesleyboar Mar 9, 2026
dc82a9f
chore: npx nx format:write
wesleyboar Mar 9, 2026
8074e5a
deps: update Core-CMS from v37 to v38
wesleyboar Mar 9, 2026
0246de9
fix: login page missing styles
wesleyboar Mar 9, 2026
e6d0ec4
feat: special title for Supersized science podcast
wesleyboar Mar 9, 2026
9087a3c
fix: CSS expects portal <html> ID as page-portal
wesleyboar Mar 10, 2026
2b02b37
fix: CSS expects portal <html> ID as page-portal
wesleyboar Mar 10, 2026
56f8971
deps: Core-CMS v4.38.4 (unreleased)
wesleyboar Mar 10, 2026
2d38b97
fix: podcast has excess vertical space
wesleyboar Mar 10, 2026
bfd8fc1
fix: default video player not overwritten yet
wesleyboar Mar 10, 2026
7f6024c
chore: link for podcast vertical space
wesleyboar Mar 10, 2026
681b82e
fix: nav icon wrong color
wesleyboar Mar 10, 2026
683633e
debug: portal nav logged in state not shown
wesleyboar Mar 10, 2026
9db864e
Revert "debug: portal nav logged in state not shown"
wesleyboar Mar 11, 2026
2334cfc
fix: portal nav not showing logged in state
wesleyboar Mar 11, 2026
74b6036
refactor: simplify portal nav (#541)
wesleyboar Mar 11, 2026
0188884
Revert "fix: portal nav not showing logged in state"
wesleyboar Mar 11, 2026
8f96ebd
Merge branch 'main' into fix/ally-issues
wesleyboar Mar 11, 2026
add55ed
fix: accent color contrast vs normal text (Portal) 2
wesleyboar Mar 12, 2026
798a230
Revert "fix: accent color contrast vs normal text (Portal) 2"
wesleyboar Mar 12, 2026
c300403
fix: should use Core-Styles#fix/a11y-issues
wesleyboar Mar 12, 2026
b3b1e97
fix: complete suite of link state UX for Navbar
wesleyboar Mar 12, 2026
488c412
fix(a11y): accent blue for links on dark section
wesleyboar Mar 13, 2026
1bfdf0a
fix: ci error
wesleyboar Mar 14, 2026
69d3761
chore: delete outdated new window js
wesleyboar Mar 16, 2026
f16ff86
fix: remove unnecessary aria-label, improve text
wesleyboar Mar 16, 2026
1a7be24
fix: remove another unnecessary aria-label
wesleyboar Mar 16, 2026
f0c1d30
fix: Update needds "d" (last remaining instance)
wesleyboar Mar 16, 2026
acfea9a
feat: add `link_name` to PORTAL_LOGO setting
wesleyboar Mar 16, 2026
f821538
fix(a11y): parent Name reads `i.icon` as odd char
wesleyboar Mar 17, 2026
b788860
fix(a11y): describe logged in user
wesleyboar Mar 17, 2026
f0722d5
fix: update footer since new logo CSS & HTML
wesleyboar Mar 17, 2026
4b63942
refactor: logged in dropodown as button not link
wesleyboar Mar 17, 2026
b5f6fd0
fix: inaccessible footer social logos colors
wesleyboar Mar 17, 2026
d645ae4
fix: link contrast in footer
wesleyboar Mar 17, 2026
13a43bd
fix(a11y): footer logo hover/active UX
wesleyboar Mar 17, 2026
f29716a
deps: @tacc/core-styles v2.54.0-rc1
wesleyboar Mar 17, 2026
c6076ad
chore: delete/trim code now in Core-CMS
cursoragent Mar 18, 2026
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
3 changes: 2 additions & 1 deletion apps/tup-cms/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ COPY . /code/
RUN npx nx build tup-ui
RUN npx nx build tup-cms-react

FROM taccwma/core-cms:v4.28.2
# v4.38.4+
FROM taccwma/core-cms:fix-a11y-issues

WORKDIR /code

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% extends "base.html" %}

{% block html_page_id %}portal{% endblock %}
{% block html_page_id %}page-portal{% endblock %}

{% block title %}User Portal{% endblock %}

{% block assets_core_project %}
{% block assets_project %}
{% include './assets.html' %}
{% endblock %}

Expand Down
4 changes: 2 additions & 2 deletions apps/tup-cms/src/apps/portal/templates/portal/portal.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{% extends "base.html" %}

{% block html_page_id %}portal{% endblock %}
{% block html_page_id %}page-portal{% endblock %}

{% block title %}User Portal{% endblock %}

{% block assets_core_project %}
{% block assets_project %}
{% include './assets.html' %}
{% endblock %}

Expand Down
Empty file.
5 changes: 0 additions & 5 deletions apps/tup-cms/src/apps/portal_nav/apps.py

This file was deleted.

7 changes: 0 additions & 7 deletions apps/tup-cms/src/apps/portal_nav/urls.py

This file was deleted.

13 changes: 0 additions & 13 deletions apps/tup-cms/src/apps/portal_nav/views.py

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,17 @@

<article class="{% if article.updates %}has-update{% endif %}">
{% spaceless %}
<time data-prefix="Published:" datetime="{{ article.postDateTime }}">
<span>{{ article.postDate }}</span>
<time
data-prefix="Published:"
aria-label="Published {{ article.postDate }}"
datetime="{{ article.postDateTime }}"
>
{{ article.postDate }}

{% if article.updates %}
<span class="c-pill c-pill--is-updated">Update</span>
<span class="c-pill c-pill--is-updated">
Updated
</span>
{% endif %}
</time>
<h4>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,9 @@
<span>{% trans "Published" %}</span>&nbsp;
<time datetime="{{ article.postDateTime }}">{{ article.postDate }}</time>
{% if article.updates %}
<span class="c-pill c-pill--is-updated">Update</span>
<span class="c-pill c-pill--is-updated" >
Updated
</span>
{% endif %}
</li>
{% endif %}
Expand All @@ -25,7 +27,9 @@
<ul class="c-news__data c-news__tags">{% spaceless %}
{% comment %}
{% if article.updates %}
<li class="c-pill c-pill--is-updated">Update</li>
<li class="c-pill c-pill--is-updated" >
Updated
</li>
{% endif %}
{% endcomment %}
{% endspaceless %}</ul>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
<aside class="c-update">
<header class="c-update__header">
<h3 class="c-update__title">
<span class="c-pill c-pill--is-updated">Update</span>&nbsp;
<span class="c-pill c-pill--is-updated">
Updated
</span>&nbsp;
</h3>
<span>{% trans "Published" %}</span>&nbsp;
<time datetime="{{ update.postDateTime }}">
Expand Down
13 changes: 11 additions & 2 deletions apps/tup-cms/src/taccsite_cms/custom_app_settings.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
CUSTOM_APPS = [
'apps.portal_nav',

# TUP CMS
'apps.portal.apps.PortalConfig',
'apps.user_news',
'apps.staff_profile'
'apps.staff_profile',

# DJANGOCMS_BLOG
'parler',
'taggit',
'taggit_autosuggest',
'sortedm2m',
'djangocms_blog',

]
CUSTOM_MIDDLEWARE = []
STATICFILES_DIRS = ()
26 changes: 2 additions & 24 deletions apps/tup-cms/src/taccsite_cms/settings_custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
"is_remote": False,
"img_class": "",
"link_href": "/",
"link_name": "TACC Homepage",
"link_target": "_self",
"img_alt_text": "TACC Logo",
"img_crossorigin": "anonymous",
Expand Down Expand Up @@ -141,29 +142,6 @@
# DJANGOCMS_BLOG
########################

from taccsite_cms.settings import INSTALLED_APPS

# News must be installed BEFORE our CMS app; reason unknown
# https://github.com/TACC/Core-CMS-Resources/pull/127/commits/0b09af6cb0ae6dd630f9ca94bf36ca9e042a5d81
tacc_app_index = INSTALLED_APPS.index('taccsite_cms')
INSTALLED_APPS[tacc_app_index:tacc_app_index] = [
# 'filer', # already in Core
# 'easy_thumbnails', # already in Core
'parler',
'taggit',
'taggit_autosuggest',
# 'meta', # already in Core
'sortedm2m',
'djangocms_blog',
]
# REQ: 'taggit_autosuggest' requires the following is added to `urls.py`
"""
urlpatterns += [
# Support `taggit_autosuggest` (from `djangocms-blog`)
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
]
"""

# Paths for alternate templates that user can choose for blog-specific plugin
# - Devs can customize core templates at `templates/djangocms_blog/`.
# - Users can choose alt. templates from `templates/djangocms_blog/plugins/*`.
Expand Down Expand Up @@ -224,7 +202,7 @@
# DJANGOCMS_ICON SETTINGS
# https://github.com/django-cms/djangocms-icon

from taccsite_cms.settings import DJANGOCMS_ICON_SETS as CORECMS_ICON_SETS
from taccsite_cms._settings.djangocms_plugins import DJANGOCMS_ICON_SETS as CORECMS_ICON_SETS

DECAL_ICONFILE = os.path.join(BASE_DIR, 'taccsite_custom', 'tup_cms', 'static', 'tup_cms', 'img', 'icons', 'decals.json')
with open(DECAL_ICONFILE, 'r') as fh:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{# https://github.com/TACC/Core-CMS/blob/v4.38.0/taccsite_cms/templates/djangocms_video/default/video_player.html #}
{% extends "djangocms_video/default/video_player_base.html" %}
{% load cms_tags %}

{% block video_iframe_title %}
{% if "title" not in instance.attributes_str %}
{% if "supersized-science" in instance.embed_link_with_parameters %}
title='"Supersized Science" Podcast Episode for this Article'
{% else %}
{{ block.super }}
{% endif %}
{% endif %}
{% endblock video_iframe_title %}
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{# @var user #}
{# WARNING: Some markup is duplicated in other repositories: https://confluence.tacc.utexas.edu/x/LoCnCQ #}
<!-- FAQ: This template loads independently at a unique url (see `urls.py`)
so CMS and User Guide can render this markup into their markup. -->
{# FAQ: Template (and user var) is included into TACC/Core-CMS nav_portal.html #}

{# GH-101: Remove style tag i.e. rely only on `site.header.css` #}
<style type="text/css">
Expand All @@ -19,40 +18,41 @@
</style>
{% if user.is_authenticated %}
<li class="nav-item dropdown">
<a
<button
class="nav-link dropdown-toggle"
href="#"
id="navbarDropdown"
role="button"
type="button"
data-toggle="dropdown"
aria-haspopup="true"
aria-expanded="false"
>
<i class="icon icon-user" role="presentation"></i>
<span>{{ user.get_username }}</span>
<span class="sr-only">Toggle Dropdown</span>
<i class="icon icon-user" aria-hidden="true"></i>
<span aria-label="You are logged in as {{ user.get_username }}">{{ user.get_username }}</span>
<span class="sr-only">(Toggle Dropdown)</span>
</a>
<nav class="dropdown-menu dropdown-menu-right">
<a class="dropdown-item" href="/portal">
<i class="icon icon-dashboard" role="presentation"></i> My Dashboard
<i class="icon icon-dashboard" aria-hidden="true"></i> My Dashboard
</a>
<a class="dropdown-item" href="/portal/account">
<i class="icon icon-user" role="presentation"></i> Manage Account
<i class="icon icon-user" aria-hidden="true"></i> Manage Account
</a>
{% if show_impersonation %}
{% for group in user.groups.all %}
{% if group.name == 'Impersonator' %}
<a class="dropdown-item" href="/portal/impersonation">
<i class="icon icon-user" role="presentation"></i> Impersonate User
<i class="icon icon-user" aria-hidden="true"></i> Impersonate User
</a>
{% endif %}
{% endfor %}
<a class="dropdown-item" href="/portal/logout">
<i class="icon icon-exit" role="presentation"></i> Log Out
<i class="icon icon-exit" aria-hidden="true"></i> Log Out
</a>
</nav>
</li>
{% else %}
<li class="nav-item">
<a class="nav-link" href="/portal/login">
<i class="icon icon-user"></i> Log in
<i class="icon icon-user" aria-hidden="true"></i> Log in
</a>
</li>
{% endif %}
3 changes: 0 additions & 3 deletions apps/tup-cms/src/taccsite_cms/templates/plain.html

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/hide-svg-icons.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/trumps-has-decal.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/spacing-fixes.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/podcast-embeds.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@2d38b978/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/podcast-embeds.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/scrolling-fixes.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/global-a11y.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@982e4461/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/global-a11y.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/tup-730-drop-cap-and-fix-has-blog-tag-no-drop-cap.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/c-feed-list-tweaks.css" rel="stylesheet" />
<link href="https://cdn.jsdelivr.net/gh/TACC/tup-ui@460405e9/apps/tup-cms/src/taccsite_custom/tup_cms/static/tup_cms/css/ad-hoc/navbar-width-horz-scrollbar.css" rel="stylesheet" />
Expand Down

This file was deleted.

5 changes: 2 additions & 3 deletions apps/tup-cms/src/taccsite_cms/urls_custom.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
from django.urls import path, include

from django.urls import re_path as url
from django.urls import re_path
from apps.user_news.urls import urls as user_news_urls
from django.views.generic.base import RedirectView

custom_urls = [
path('core/markup/nav/', include('apps.portal_nav.urls', namespace='portal_nav')),
path('logout/', RedirectView.as_view(url="/portal/logout"), name='logout'),
path('login/', RedirectView.as_view(url="/portal/login"), name='login'),
path('portal/', include('apps.portal.urls', namespace='portal')),
Expand All @@ -15,5 +14,5 @@
path(user_news_urls['legacy']['base'], include('apps.user_news.urls', namespace='user_news_legacy')),

# To support `taggit_autosuggest` (from `djangocms-blog`)
url(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
re_path(r'^taggit_autosuggest/', include('taggit_autosuggest.urls')),
]
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,3 @@
.navbar-dark .navbar-toggler {
border-color: var(--global-color-primary--normal);
}

/* 2. To make keyboard focus stand out on header */
/*
.nav-link:focus-visible,
#header-logo:focus-visible,
.navbar-dark .navbar-toggler:focus-visible {
*/
#s-header :focus,
#header-branding a:focus,
.s-search-bar::part(input):focus,
.s-search-bar::part(button):focus {
outline-color: var(--global-color-primary--xx-light);
}
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,3 @@
display: grid;
align-items: center;
}
/* To reduce width of social media icon links */
.c-footer .logos--social a {
padding: 0.5em;
}


/* TO MAKE HEADER FONT CONSISTENT ON CMS & PORTAL */

/* TODO: Remove after TACC/Core-CMS#v4.25.1 */
.s-header {
font-family: var(--global-font-family--sans--portal);
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
/* to remove scrollbar on embedded podcast audio */
/* to remove extra height embedded podcast audio, but not cause scrollbar */
iframe[src*="rss.com"] {
/* FAQ: for wide screen, 200px; for narrow screen, 202px */
height: 202px;
height: 152px;
}
Loading