Skip to content

Commit f5a8fcc

Browse files
Update base.html and the token display page to newer style. Add logout text to token display.
1 parent 1d8f384 commit f5a8fcc

File tree

2 files changed

+18
-77
lines changed

2 files changed

+18
-77
lines changed

service/templates/base.html

Lines changed: 6 additions & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -26,74 +26,6 @@
2626
</style>
2727
{% endblock %}
2828
</head>
29-
<!--<html>-->
30-
<!--<head>-->
31-
<!--<meta name="viewport" content="width=device-width, initial-scale=1">-->
32-
<!--<style>-->
33-
<!--body {font-family: Arial, Helvetica, sans-serif;}-->
34-
<!--form {border: 3px solid #f1f1f1;}-->
35-
36-
<!--input[type=text], input[type=password] {-->
37-
<!-- width: 100%;-->
38-
<!-- padding: 12px 20px;-->
39-
<!-- margin: 8px 0;-->
40-
<!-- display: inline-block;-->
41-
<!-- border: 1px solid #ccc;-->
42-
<!-- box-sizing: border-box;-->
43-
<!--}-->
44-
45-
<!--button {-->
46-
<!-- background-color: #000033;-->
47-
<!-- color: white;-->
48-
<!-- padding: 14px 20px;-->
49-
<!-- margin: 8px 0;-->
50-
<!-- border: none;-->
51-
<!-- cursor: pointer;-->
52-
<!-- width: 100%;-->
53-
<!--}-->
54-
55-
<!--button:hover {-->
56-
<!-- opacity: 0.8;-->
57-
<!--}-->
58-
59-
<!--.cancelbtn {-->
60-
<!-- width: auto;-->
61-
<!-- padding: 10px 18px;-->
62-
<!-- background-color: #f44336;-->
63-
<!--}-->
64-
65-
<!--.imgcontainer {-->
66-
<!-- text-align: center;-->
67-
<!-- margin: 24px 0 12px 0;-->
68-
<!--}-->
69-
70-
<!--img.avatar {-->
71-
<!-- width: 40%;-->
72-
<!--/* border-radius: 50%; */-->
73-
<!--}-->
74-
75-
<!--.container {-->
76-
<!-- padding: 16px;-->
77-
<!--}-->
78-
79-
<!--span.psw {-->
80-
<!-- float: right;-->
81-
<!-- padding-top: 16px;-->
82-
<!--}-->
83-
84-
<!--/* Change styles for span and cancel button on extra small screens */-->
85-
<!--@media screen and (max-width: 300px) {-->
86-
<!-- span.psw {-->
87-
<!-- display: block;-->
88-
<!-- float: none;-->
89-
<!-- }-->
90-
<!-- .cancelbtn {-->
91-
<!-- width: 100%;-->
92-
<!-- }-->
93-
<!--}-->
94-
<!--</style>-->
95-
<!--</head>-->
96-
<body>
9729

9830
{% block banner %}
9931
{% with tenant_id=tenant_id, is_banner=true %}
@@ -105,11 +37,12 @@
10537
{% endblock %}
10638

10739
{% block footer %}
108-
<footer>
109-
<div class="footer">
110-
<p>Tapis project funded by NSF OAC grants #1931439, #1931575 and #2232259. </p>
111-
</div>
40+
<footer class="s-footer" style="top: 100vh; position: sticky;">
41+
<p>Tapis project funded by NSF OAC grants
42+
<a href="https://www.nsf.gov/awardsearch/showAward?AWD_ID=1931439" rel="noreferrer" target="_blank">#1931439</a>,
43+
<a href="https://www.nsf.gov/awardsearch/showAward?AWD_ID=1931575" rel="noreferrer" target="_blank">#1931575</a>
44+
and #2232259.
45+
</p>
11246
</footer>
11347
{% endblock %}
11448

115-
</body>

service/templates/token-display.html

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,21 @@
1616
{% endblock %}
1717
{% block head_extra %}
1818
<style>
19-
body {
19+
body, html {
2020
background-color: var(--global-color-primary--light);
2121

2222
/* So body is as tall as page, thus sticky footer sticks to bottom of page */
2323
/* FAQ: Replaces base.html fixed footer because it has a disadvantage—
2424
it covers the login form on screens shorter than the form */
2525
min-height: 100vh;
26+
min-width: 100vw;
27+
max-width: 100vw;
28+
max-height: 100vh;
29+
overflow: auto;
30+
}
31+
#details td.token-cell {
32+
word-break: break-all;
33+
white-space: pre-wrap;
2634
}
2735
</style>
2836
{% endblock %}
@@ -45,8 +53,8 @@ <h2> User Profile And Access Token</h2>
4553
<table id="details" class="table table-striped">
4654
<thead>
4755
<tr>
48-
<th>Token Details</th>
49-
<th width="200px"> </th>
56+
<th width="130rem">Token Details</th>
57+
<th><a href="/v3/oauth2/logout">Logout</a></th>
5058
</tr>
5159
</thead>
5260
<tbody>
@@ -60,7 +68,7 @@ <h2> User Profile And Access Token</h2>
6068
</tr>
6169
<tr>
6270
<td>Access Token</td>
63-
<td>{{ token }}</td>
71+
<td class="token-cell">{{ token }}</td>
6472
</tr>
6573
</tbody>
6674
</table>

0 commit comments

Comments
 (0)