Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
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
10 changes: 2 additions & 8 deletions service/templates/authorize.html
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 Expand Up @@ -50,6 +43,7 @@ <h1>
</label>
</div>
</form>
{% include "./content_footer.html" %}
</main>
{% endblock %}

Expand Down
10 changes: 10 additions & 0 deletions service/templates/content_figure.html
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>
21 changes: 21 additions & 0 deletions service/templates/content_footer.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<style>
.powered_by {
/* To move non-image links to the left */
margin-left: auto;
}
</style>
<footer>
<a href="https://tacc.utexas.edu/about/security-and-compliance/">
Security
</a>
<a href="https://tacc.utexas.edu/use-tacc/user-policies/">
Policies
</a>
{% if client_display_name == "TACC User Portal" %}

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note

This is a temporary solution to reduce testing surface area of this change to just TUP, who has expedited request for this.

<a href="https://tapis-project.org" target="_blank" class="powered_by">
Powered by:
<img src="https://dev.develop.tapis.io/v3/oauth2/authorize/tapis.png"
alt="Tapis logo" title="Tapis (TACC APIs)" height="50px">
</a>
{% endif %}
</footer>
10 changes: 2 additions & 8 deletions service/templates/device-code.html
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 All @@ -35,5 +28,6 @@ <h1>
<button type="submit">Submit</button>
</footer>
</form>
{% include "./content_footer.html" %}
</main>
{% endblock %}
18 changes: 2 additions & 16 deletions service/templates/login.html
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 Expand Up @@ -61,14 +54,7 @@ <h1>
{% endif %}
</nav>
</form>
<footer>
<a href="https://tacc.utexas.edu/about/security-and-compliance/">
Security
</a>
<a href="https://tacc.utexas.edu/use-tacc/user-policies/">
Policies
</a>
</footer>
{% include "./content_footer.html" %}
</main>
{% endblock %}

Expand Down
9 changes: 1 addition & 8 deletions service/templates/logout.html
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
10 changes: 2 additions & 8 deletions service/templates/mfa.html
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 Expand Up @@ -47,6 +40,7 @@ <h1>
<button type="submit" name="action" value="submit">Submit</button>
</footer>
</form>
{% include "./content_footer.html" %}
</main>
{% endblock %}

Expand Down
18 changes: 2 additions & 16 deletions service/templates/select_idp.html
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 Expand Up @@ -42,14 +35,7 @@ <h1>
</nav>

</form>
<footer>
<a href="https://tacc.utexas.edu/about/security-and-compliance/">
Security
</a>
<a href="https://tacc.utexas.edu/use-tacc/user-policies/">
Policies
</a>
</footer>
{% include "./content_footer.html" %}

</main>
{% endblock %}
Expand Down
9 changes: 1 addition & 8 deletions service/templates/success.html
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
10 changes: 2 additions & 8 deletions service/templates/tenant.html
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 All @@ -36,6 +29,7 @@ <h1>
<input type="hidden" name="client_state" value="{{ client_state }}">

</form>
{% include "./content_footer.html" %}
</main>

{% endblock %}