From 648cb7288786fac55316927ea53d9e9090d85156 Mon Sep 17 00:00:00 2001 From: Mikko Nieminen Date: Thu, 24 Aug 2023 14:34:22 +0200 Subject: [PATCH] add tokens tour help (#1102) --- timeline/templates/timeline/timeline.html | 1 - tokens/templates/tokens/_token_dropdown.html | 11 +++++ tokens/templates/tokens/_token_item.html | 2 +- .../templates/tokens/_token_item_buttons.html | 11 ----- .../tokens/token_confirm_delete.html | 2 +- tokens/templates/tokens/token_create.html | 1 + .../tokens/token_create_success.html | 1 + tokens/templates/tokens/token_list.html | 47 +++++++++++++++++-- 8 files changed, 59 insertions(+), 17 deletions(-) create mode 100644 tokens/templates/tokens/_token_dropdown.html delete mode 100644 tokens/templates/tokens/_token_item_buttons.html diff --git a/timeline/templates/timeline/timeline.html b/timeline/templates/timeline/timeline.html index b73d5603..dd27190b 100644 --- a/timeline/templates/timeline/timeline.html +++ b/timeline/templates/timeline/timeline.html @@ -88,5 +88,4 @@

}); {% include 'timeline/_list_tour.html' %} {# Common tour help items #} - {% endblock javascript %} diff --git a/tokens/templates/tokens/_token_dropdown.html b/tokens/templates/tokens/_token_dropdown.html new file mode 100644 index 00000000..39d2cd98 --- /dev/null +++ b/tokens/templates/tokens/_token_dropdown.html @@ -0,0 +1,11 @@ + + diff --git a/tokens/templates/tokens/_token_item.html b/tokens/templates/tokens/_token_item.html index 8f8f917c..e147317b 100644 --- a/tokens/templates/tokens/_token_item.html +++ b/tokens/templates/tokens/_token_item.html @@ -3,5 +3,5 @@ {{ item.created|date:'Y-m-d H:i' }} {{ token.expiry|date:'Y-m-d H:i'|default:'Never' }} {{ item.token_key }} - {% include 'tokens/_token_item_buttons.html' %} + {% include 'tokens/_token_dropdown.html' %} diff --git a/tokens/templates/tokens/_token_item_buttons.html b/tokens/templates/tokens/_token_item_buttons.html deleted file mode 100644 index 98e39df7..00000000 --- a/tokens/templates/tokens/_token_item_buttons.html +++ /dev/null @@ -1,11 +0,0 @@ -
- - -
diff --git a/tokens/templates/tokens/token_confirm_delete.html b/tokens/templates/tokens/token_confirm_delete.html index f65cc2c9..661df83b 100644 --- a/tokens/templates/tokens/token_confirm_delete.html +++ b/tokens/templates/tokens/token_confirm_delete.html @@ -7,7 +7,7 @@ {% block projectroles %}
-

Confirm Deletion of API Token "{{ object.token_key }}"

+

Confirm Deletion of API Token "{{ object.token_key }}"

diff --git a/tokens/templates/tokens/token_create.html b/tokens/templates/tokens/token_create.html index 290d633f..58a6679b 100644 --- a/tokens/templates/tokens/token_create.html +++ b/tokens/templates/tokens/token_create.html @@ -7,6 +7,7 @@ {% endblock title %} {% block projectroles %} +

Create API Token

diff --git a/tokens/templates/tokens/token_create_success.html b/tokens/templates/tokens/token_create_success.html index 30bbff31..db1ad54d 100644 --- a/tokens/templates/tokens/token_create_success.html +++ b/tokens/templates/tokens/token_create_success.html @@ -5,6 +5,7 @@ {% endblock title %} {% block projectroles %} +

API Token Created

diff --git a/tokens/templates/tokens/token_list.html b/tokens/templates/tokens/token_list.html index 448d66cf..33ab2062 100644 --- a/tokens/templates/tokens/token_list.html +++ b/tokens/templates/tokens/token_list.html @@ -11,7 +11,6 @@ table#sodar-tk-list-table tbody tr td:first-child { width: 60px !important; } - @media screen and (max-width: 650px) { table#sodar-tk-list-table thead tr th:nth-child(2), table#sodar-tk-list-table tbody tr td:nth-child(2) { @@ -25,7 +24,7 @@

API Tokens

- Create Token @@ -34,7 +33,8 @@

API Tokens

- +
@@ -62,3 +62,44 @@

API Tokens

{% endblock projectroles %} + +{% block javascript %} + {{ block.super }} + + +{% endblock javascript %}
#