diff options
| author |  Christopher Baklid <[email protected]> | 2018-05-20 00:22:27 +0200 |
|---|---|---|
| committer | Christopher Baklid <[email protected]> | 2018-05-20 00:22:27 +0200 |
| commit | 333a043f5f44905a423e55317780f1bf5c19a35f (patch) | |
| tree | aea16d376bef3d7132bdb64b7bd61821a8780ab3 /templates | |
| parent | updates docker-compose file [ci skip] (diff) | |
| parent | [Jams] Form inputs should be a flex column (diff) | |
Merge branch 'master' of github.com:discord-python/site
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/main/jams/join.html | 2 | ||||
| -rw-r--r-- | templates/staff/jams/index.html | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/templates/main/jams/join.html b/templates/main/jams/join.html index 35a786f2..e24ea8ff 100644 --- a/templates/main/jams/join.html +++ b/templates/main/jams/join.html @@ -128,7 +128,7 @@ interest. Keep an eye on <code>#announcements</code> on Discord for information on the next jam! </p> {% else %} - <form action="{{ url_for("main.jams.join", jam=jam.number) }}" method="post" class="uk-form-horizontal"> + <form action="{{ url_for("main.jams.join", jam=jam.number) }}" method="post" class="uk-form-horizontal uk-flex uk-flex-column"> {% for question in questions %} {{ show_question(question) }} <br /> diff --git a/templates/staff/jams/index.html b/templates/staff/jams/index.html index 2ed83702..dea7429c 100644 --- a/templates/staff/jams/index.html +++ b/templates/staff/jams/index.html @@ -81,7 +81,7 @@ <i class="uk-icon fa-fw far fa-pencil"></i> Basics </a> - {% if jam.state in ["planning", "preparing", "announced"] %} + {% if jam.state in ["planning", "announced", "finished"] %} <a class="uk-button uk-button-default uk-width-expand" data-jam="{{ jam.number }}" id="jam-{{ jam.number }}-button-info" href="{{ url_for("staff.jams.edit.info", jam=jam.number) }}"> <i class="uk-icon fa-fw far fa-pencil"></i> Info </a> @@ -91,7 +91,7 @@ </a> {% endif %} - {% if jam.state == "judging" %} + {% if jam.state in ["judging", "finished"] %} <a class="uk-button uk-button-default uk-width-expand" data-jam="{{ jam.number }}" id="jam-{{ jam.number }}-button-ending" href="{{ url_for("staff.jams.edit.ending", jam=jam.number) }}"> <i class="uk-icon fa-fw far fa-pencil"></i> Ending </a> @@ -208,7 +208,7 @@ case "preparing": document.getElementById("state-" + jam + "-preparing").removeAttribute("hidden"); - document.getElementById("jam-" + jam + "-button-info").removeAttribute("hidden"); + document.getElementById("jam-" + jam + "-button-info").setAttribute("hidden", "hidden"); document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden"); break; case "running": @@ -218,7 +218,7 @@ document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden"); break; case "judging": - document.getElementById("state-" + jam + "-judging").removeAttribute("hidden"); + document.getElementById("state-" + jam + "-finished").removeAttribute("hidden"); document.getElementById("jam-" + jam + "-button-info").setAttribute("hidden", "hidden"); document.getElementById("jam-" + jam + "-button-ending").removeAttribute("hidden"); @@ -226,8 +226,8 @@ case "finished": document.getElementById("state-" + jam + "-finished").removeAttribute("hidden"); - document.getElementById("jam-" + jam + "-button-info").setAttribute("hidden", "hidden"); - document.getElementById("jam-" + jam + "-button-ending").setAttribute("hidden", "hidden"); + document.getElementById("jam-" + jam + "-button-info").removeAttribute("hidden"); + document.getElementById("jam-" + jam + "-button-ending").removeAttribute("hidden"); break; default: document.getElementById("state-" + jam + "-unknown").removeAttribute("hidden"); |