Merge branch 'next' into main-css

f-klubben · Sep 14, 2024 · 3e43690 · 3e43690
2 parents 35de0a4 + 1960480
commit 3e43690
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 25 deletions.
diff --git a/stregsystem/models.py b/stregsystem/models.py
@@ -529,6 +529,7 @@ def process_submitted(cls, submitted_data, admin_user: User):
  processed_mobile_payment.status = row['status']
  processed_mobile_payment.member = Member.objects.get(id=row['member'].id)
  processed_mobile_payment.submit_processed_mobile_payment(admin_user)
+ processed_mobile_payment.save()
 
  # Return how many records were modified.
  return len(mobile_payment_ids)

diff --git a/stregsystem/static/stregsystem/stregsystem.css b/stregsystem/static/stregsystem/stregsystem.css
@@ -3,6 +3,22 @@ body {
  background-color: white;
 }
 
+header {
+ display: grid;
+ grid-template-columns: 1fr auto 1fr;
+ padding: 3px 4vw;
+ column-gap: 4vw;
+ text-align: center;
+ place-items: center;
+
+ & .left {
+ justify-self: start;
+ }
+ & .right {
+ justify-self: end;
+ }
+}
+
 main {
  padding: 1em;
 

diff --git a/stregsystem/templates/stregsystem/base.html b/stregsystem/templates/stregsystem/base.html
@@ -19,7 +19,7 @@
  var media_url = "{% get_media_prefix %}";
 </script>
 </head>
-<body onLoad='if (document.focusform) {document.focusform.quickbuy.focus()}'>
+<body>
 {% comment %}
 <pre>{% filter escape %}{% debug %}{% endfilter %}</pre>
 
@@ -28,29 +28,20 @@
 <div id="canvas-container"></div>
 <img id="rocket" src="{% static "/stregsystem/rocket.png" %}">
 <script src="{% static "/stregsystem/fireworks.js" %}"></script>
-
-<table width="100%">
- <tr>
- <td>
- <center>
- <input type="button" onclick="location.href='/{{room.id}}';" value="Genstart" tabindex="10" accesskey="q">
- </center>
- </td>
- <td align=center>
- <h1>{% block heading %}TREOENs STREGSYSTEM
-{% if room.id != 1 %}
- : {{room.description}}
-{% endif %}
-{% endblock %}</h1>
- </td>
- <td>
- <center>
- <input type="button" onclick="location.href='/{{room.id}}';" value="Menu" tabindex="11" />
- <input type="button" onclick="location.href='/signup'" value="Tilmeld" tabindex="12"/>
- </center>
- </td>
- </tr>
-</table>
+<header>
+ <div class="left">
+ <input type="button" onclick="location.href='/{{room.id}}';" value="Genstart" tabindex="10" accesskey="q">
+ </div>
+ <h1>
+ {% block heading %}
+ TREOENs STREGSYSTEM {% if room.id != 1 %} : {{room.description}} {% endif %}
+ {% endblock %}
+ </h1>
+ <div class="right">
+ <input type="button" onclick="location.href='/{{room.id}}';" value="Menu" tabindex="11" />
+ <input type="button" onclick="location.href='/signup'" value="Tilmeld" tabindex="12"/>
+ </div>
+</header>
 <hr>
 
 {% block content %}{% endblock %}

diff --git a/treo/settings.py b/treo/settings.py
@@ -72,7 +72,7 @@
 
 CSRF_COOKIE_SECURE = cfg.getboolean("debug", "CSRF_COOKIE_SECURE")
 CSRF_COOKIE_HTTPONLY = cfg.getboolean("debug", "CSRF_COOKIE_HTTPONLY")
-CSRF_TRUSTED_ORIGINS = ["https://fappen.fklub.dk"]
+CSRF_TRUSTED_ORIGINS = ["https://fappen.fklub.dk", "https://stregsystem.fklub.dk"]
 SESSION_COOKIE_SECURE = cfg.getboolean("debug", "SESSION_COOKIT_SECURE")
 
 SECURE_BROWSER_XSS_FILTER = cfg.getboolean("debug", "SECURE_BROWSER_XSS_FILTER")