Merge pull request #2339 from CTFd/update-core-beta

Update core beta

CTFd/themes/core-beta/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

CTFd/themes/core-beta/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"

CTFd/themes/core-beta/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 
+            <div
-              class="progress-bar" 
+              class="progress-bar"
-              role="progressbar" 
+              role="progressbar"
-              :style="{ width: `${getSolvePercentage()}%`, 'background-color': 'rgb(0, 209, 64)' }" 
+              :style="{ width: `${getSolvePercentage()}%`, 'background-color': 'rgb(0, 209, 64)' }"
             >
             </div>
-            <div 
+            <div
-              class="progress-bar" 
+              class="progress-bar"
-              role="progressbar" 
+              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 
+              <div
-                class="progress-bar" 
+                class="progress-bar"
-                role="progressbar" 
+                role="progressbar"
                 :style="{ width: `${category.percent}%`, 'background-color': category.color }"
               >
               </div>