aljaz/CTFd
1
0
Fork 0
mirror of https://github.com/aljazceru/CTFd.git synced 2025-12-17 05:54:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Squashed 'CTFd/themes/core-beta/' changes from 5ce3003b..bb4edfb6

Browse Source 
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
This commit is contained in:
Kevin Chung
2023-06-22 00:24:12 -04:00
parent a64e7d51ef
commit 6e0072b902
3 changed files with 24 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@@ -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 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 ## Todo
- Document how we are using Vite - Document how we are using Vite

9
templates/settings.html
View File

@@ -164,6 +164,11 @@
{{ form.expiration(class="form-control") }} {{ form.expiration(class="form-control") }}
</div> </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="row">
<div class="col"> <div class="col">
{{ form.submit(class="btn btn-block btn-primary float-end px-4") }} {{ form.submit(class="btn btn-block btn-primary float-end px-4") }}
@@ -218,6 +223,7 @@
<tr> <tr>
<td class="text-center"><b>{% trans %}Created{% endtrans %}</b></td> <td class="text-center"><b>{% trans %}Created{% endtrans %}</b></td>
<td><b>{% trans %}Expiration{% endtrans %}</b></td> <td><b>{% trans %}Expiration{% endtrans %}</b></td>
<td><b>{% trans %}Description{% endtrans %}</b></td>
<td><b>{% trans %}Delete{% endtrans %}</b></td> <td><b>{% trans %}Delete{% endtrans %}</b></td>
</tr> </tr>
</thead> </thead>
@@ -230,6 +236,9 @@
<td> <td>
<span data-time="{{ token.expiration | isoformat }}"></span> <span data-time="{{ token.expiration | isoformat }}"></span>
</td> </td>
<td>
<span>{{ token.description | default('', true) }}</span>
</td>
<td class="text-center"> <td class="text-center">
<span <span
class="delete-token" role="button" class="delete-token" role="button"

22
templates/teams/public.html
View File

@@ -82,7 +82,7 @@
<table class="table table-striped"> <table class="table table-striped">
<thead> <thead>
<tr> <tr>
<td><b>{% trans %}User Name{% trans %}</b></td> <td><b>{% trans %}User Name{% endtrans %}</b></td>
<td><b>{% trans %}Score{% endtrans %}</b></td> <td><b>{% trans %}Score{% endtrans %}</b></td>
</tr> </tr>
</thead> </thead>
@@ -169,15 +169,15 @@
<div class="row" x-data="TeamGraphs"> <div class="row" x-data="TeamGraphs">
<div class="col-md-6 d-none d-md-block d-lg-block py-4"> <div class="col-md-6 d-none d-md-block d-lg-block py-4">
<div class="progress"> <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 <div
class="progress-bar" class="progress-bar"
role="progressbar" role="progressbar"
:style="{ width: `${getFailPercentage()}%`, 'background-color': 'rgb(207, 38, 0)' }" :style="{ width: `${getFailPercentage()}%`, 'background-color': 'rgb(207, 38, 0)' }"
> >
</div> </div>
@@ -198,9 +198,9 @@
<div class="col-md-6 d-none d-md-block d-lg-block py-4"> <div class="col-md-6 d-none d-md-block d-lg-block py-4">
<div class="progress"> <div class="progress">
<template x-for="category in getCategoryBreakdown()" :key="category.name"> <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 }" :style="{ width: `${category.percent}%`, 'background-color': category.color }"
> >
</div> </div>