Skip to content

fix: hide Tapis logo next to TACC logo for TACC User Portal client #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wesleyboar merged 5 commits into from
Sep 2, 2026
Merged

fix: hide Tapis logo next to TACC logo for TACC User Portal client #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
103dd79
fix: hide generic Tapis logo next to TACC logo for the TACC User Port…
wesleyboar Sep 2, 2026
ad36c17
fix: match client_display_name exactly for Tapis-logo suppression
wesleyboar Sep 2, 2026
05e1d59
refactor: extract repeated header figure into content_figure.html
wesleyboar Sep 2, 2026
2fd2b88
refactor: move TACC User Portal check from branding.html to content_f…
wesleyboar Sep 2, 2026
316b11b
fix: indentation
wesleyboar Sep 2, 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
9 changes: 1 addition & 8 deletions service/templates/authorize.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@
<main class="s-form-page">
<form action="" method="post" id="auth-form" class="s-form s-form--login">
<h1>
<figure>
{% with tenant_id=tenant_id %}
{% include "./branding.html" %}
{% endwith %}
{% with tenant_id="tacc" %}
{% include "./branding.html" %}
{% endwith %}
</figure>
{% include "./content_figure.html" %}
<span>Connect to Tapis</span>
</h1>
<p>The <var>{{ client_display_name }}</var> wants to use <a href="https://tapis-project.org/" target="_blank">Tapis</a> (TACC APIs) service to grant actions on behalf of <var>{{ username }}</var>.</p>
Expand Down
10 changes: 10 additions & 0 deletions service/templates/content_figure.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<figure>
{% if client_display_name != "TACC User Portal" %}
{% with tenant_id=tenant_id %}
{% include "./branding.html" %}
{% endwith %}
{% endif %}
{% with tenant_id="tacc" %}
{% include "./branding.html" %}
{% endwith %}
</figure>
9 changes: 1 addition & 8 deletions service/templates/device-code.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@
<main class="s-form-page">
<form action="" method="post" class="s-form s-form--login">
<h1>
<figure>
{% with tenant_id=tenant_id %}
{% include "./branding.html" %}
{% endwith %}
{% with tenant_id="tacc" %}
{% include "./branding.html" %}
{% endwith %}
</figure>
{% include "./content_figure.html" %}
<span>Enter User Code</span>
</h1>

Expand Down
9 changes: 1 addition & 8 deletions service/templates/login.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@
<main class="s-form-page">
<form action="" method="post" class="s-form s-form--login">
<h1>
<figure>
{% with tenant_id=tenant_id %}
{% include "./branding.html" %}
{% endwith %}
{% with tenant_id="tacc" %}
{% include "./branding.html" %}
{% endwith %}
</figure>
{% include "./content_figure.html" %}
<span>Log In</span>
</h1>
<p>to continue to the <var>{{ client_display_name }}</var></p>
Expand Down
9 changes: 1 addition & 8 deletions service/templates/logout.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@
<main class="s-form-page">
<form action="" method="post" class="s-form s-form--login">
<h1>
<figure>
{% with tenant_id=tenant_id %}
{% include "./branding.html" %}
{% endwith %}
{% with tenant_id="tacc" %}
{% include "./branding.html" %}
{% endwith %}
</figure>
{% include "./content_figure.html" %}
</h1>

{% if logout_message %}
Expand Down
9 changes: 1 addition & 8 deletions service/templates/mfa.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@
<main class="s-form-page">
<form action="" method="post" class="s-form s-form--login">
<h1>
<figure>
{% with tenant_id=tenant_id %}
{% include "./branding.html" %}
{% endwith %}
{% with tenant_id="tacc" %}
{% include "./branding.html" %}
{% endwith %}
</figure>
{% include "./content_figure.html" %}
<span>Enter MFA Token</span>
</h1>

Expand Down
9 changes: 1 addition & 8 deletions service/templates/select_idp.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@
<main class="s-form-page">
<form action="" method="post" class="s-form s-form--login">
<h1>
<figure>
{% with tenant_id=tenant_id %}
{% include "./branding.html" %}
{% endwith %}
{% with tenant_id="tacc" %}
{% include "./branding.html" %}
{% endwith %}
</figure>
{% include "./content_figure.html" %}
<span>Log in to Tapis</span>
</h1>
<p>Select an account to continue</p>
Expand Down
9 changes: 1 addition & 8 deletions service/templates/success.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@
<main class="s-form-page">
<form action="" method="post" class="s-form s-form--login">
<h1>
<figure>
{% with tenant_id=tenant_id %}
{% include "./branding.html" %}
{% endwith %}
{% with tenant_id="tacc" %}
{% include "./branding.html" %}
{% endwith %}
</figure>
{% include "./content_figure.html" %}
<span>Congrats! Device Code entered successfully. Please return to your application</span>
</h1>

Expand Down
9 changes: 1 addition & 8 deletions service/templates/tenant.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,7 @@
<main class="s-form-page">
<form action="" method="post" class="s-form s-form--login">
<h1>
<figure>
{% with tenant_id=tenant_id %}
{% include "./branding.html" %}
{% endwith %}
{% with tenant_id="tacc" %}
{% include "./branding.html" %}
{% endwith %}
</figure>
{% include "./content_figure.html" %}
<span>Tapis Tenant</span>
</h1>

Expand Down