From 6e0072b9028bc7c878e3a74be66754fbbcb7d32c Mon Sep 17 00:00:00 2001
From: Kevin Chung <kchung@ctfd.io>
Date: Thu, 22 Jun 2023 00:24:12 -0400
Subject: [PATCH] Squashed 'CTFd/themes/core-beta/' changes from
 5ce3003b..bb4edfb6

bb4edfb6 Add description to TokensForm
50070166 Fix issue with missing endtrans tag
34c58129 Update README.md

git-subtree-dir: CTFd/themes/core-beta
git-subtree-split: bb4edfb6d4535406f7038099501d144d0cc998da
---
 README.md                   |  4 ++++
 templates/settings.html     |  9 +++++++++
 templates/teams/public.html | 22 +++++++++++-----------
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 3fa13b9e..17c0d870 100644
--- a/README.md
+++ b/README.md
@@ -15,6 +15,10 @@ git subtree add --prefix CTFd/themes/core-beta git@github.com:CTFd/core-beta.git
 git subtree pull --prefix CTFd/themes/core-beta git@github.com:CTFd/core-beta.git main --squash
 ```
 
+### Subtree Gotcha
+
+Make sure to use Merge Commits when dealing with the subtree here. For some reason Github's squash and commit uses the wrong line ending which causes issues with the subtree script: https://stackoverflow.com/a/47190256. 
+
 ## Todo
 
 - Document how we are using Vite
diff --git a/templates/settings.html b/templates/settings.html
index d7ce93ba..3af06e0a 100644
--- a/templates/settings.html
+++ b/templates/settings.html
@@ -164,6 +164,11 @@
                   {{ form.expiration(class="form-control") }}
                 </div>
 
+                <div class="mb-3">
+                  <b>{{ form.description.label(class="form-label") }}</b>
+                  {{ form.description(class="form-control", rows="3") }}
+                </div>
+
                 <div class="row">
                   <div class="col">
                     {{ form.submit(class="btn btn-block btn-primary float-end px-4") }}
@@ -218,6 +223,7 @@
                   <tr>
                     <td class="text-center"><b>{% trans %}Created{% endtrans %}</b></td>
                     <td><b>{% trans %}Expiration{% endtrans %}</b></td>
+                    <td><b>{% trans %}Description{% endtrans %}</b></td>
                     <td><b>{% trans %}Delete{% endtrans %}</b></td>
                   </tr>
                   </thead>
@@ -230,6 +236,9 @@
                       <td>
                         <span data-time="{{ token.expiration | isoformat }}"></span>
                       </td>
+                      <td>
+                        <span>{{ token.description | default('', true) }}</span>
+                      </td>
                       <td class="text-center">
                         <span
                             class="delete-token" role="button"
diff --git a/templates/teams/public.html b/templates/teams/public.html
index dfd2adba..7340137f 100644
--- a/templates/teams/public.html
+++ b/templates/teams/public.html
@@ -82,7 +82,7 @@
         <table class="table table-striped">
           <thead>
           <tr>
-            <td><b>{% trans %}User Name{% trans %}</b></td>
+            <td><b>{% trans %}User Name{% endtrans %}</b></td>
             <td><b>{% trans %}Score{% endtrans %}</b></td>
           </tr>
           </thead>
@@ -169,15 +169,15 @@
       <div class="row" x-data="TeamGraphs">
         <div class="col-md-6 d-none d-md-block d-lg-block py-4">
           <div class="progress">
-            <div 
-              class="progress-bar" 
-              role="progressbar" 
-              :style="{ width: `${getSolvePercentage()}%`, 'background-color': 'rgb(0, 209, 64)' }" 
+            <div
+              class="progress-bar"
+              role="progressbar"
+              :style="{ width: `${getSolvePercentage()}%`, 'background-color': 'rgb(0, 209, 64)' }"
             >
             </div>
-            <div 
-              class="progress-bar" 
-              role="progressbar" 
+            <div
+              class="progress-bar"
+              role="progressbar"
               :style="{ width: `${getFailPercentage()}%`, 'background-color': 'rgb(207, 38, 0)' }"
             >
             </div>
@@ -198,9 +198,9 @@
         <div class="col-md-6 d-none d-md-block d-lg-block py-4">
           <div class="progress">
             <template x-for="category in getCategoryBreakdown()" :key="category.name">
-              <div 
-                class="progress-bar" 
-                role="progressbar" 
+              <div
+                class="progress-bar"
+                role="progressbar"
                 :style="{ width: `${category.percent}%`, 'background-color': category.color }"
               >
               </div>