From 154c2ce7679b5d40fd70c08898b6354c14beb334 Mon Sep 17 00:00:00 2001
From: Nils G <nils.gondermann@ruhr-uni-bochum.de>
Date: Fri, 24 Apr 2020 13:14:52 +0200
Subject: [PATCH] Set header values via global JS function instead of includes
---
static/game/debug/renderer.js | 2 ++
views/default/login.html | 4 +++-
views/game/debug/renderer.html | 1 -
views/include/header_debug.html | 5 -----
views/include/header_default.html | 5 -----
views/layout.html | 7 +++++++
6 files changed, 12 insertions(+), 12 deletions(-)
delete mode 100644 views/include/header_debug.html
delete mode 100644 views/include/header_default.html
diff --git a/static/game/debug/renderer.js b/static/game/debug/renderer.js
index d5867b2..bacab23 100644
--- a/static/game/debug/renderer.js
+++ b/static/game/debug/renderer.js
@@ -1,5 +1,7 @@
function render(_role, _roles){
+ HEADER_SET(ROOM_CODE, "Lynchburg", PLAYER_NAME+":"+_role);
+
if(_role in _roles) {
renderRole(_roles[_role], _roles["idle"]);
return;
diff --git a/views/default/login.html b/views/default/login.html
index a16cabc..77b685c 100644
--- a/views/default/login.html
+++ b/views/default/login.html
@@ -1,5 +1,4 @@
{{include 'include/popup.html'}}
-{{include 'include/header_default.html'}}
<form id="form_login" @submit.prevent="submitLogin">
<input type="text" id="room_code" placeholder="{{=T('Enter Room Code')}}" maxlength="4" v-model="room_code"><br><br>
@@ -8,6 +7,9 @@
</form>
<script>
+
+ HEADER_SET("", "Lynchburg", "");
+
var app = new Vue({
el: "#form_login",
data: {
diff --git a/views/game/debug/renderer.html b/views/game/debug/renderer.html
index 320ebb0..cf111f2 100644
--- a/views/game/debug/renderer.html
+++ b/views/game/debug/renderer.html
@@ -6,6 +6,5 @@
{{block game_js}}
- {{include 'include/header_debug.html'}}
<script src="{{=URL('static/game/debug','renderer.js')}}" type="text/javascript"></script>
{{end game_js}}
diff --git a/views/include/header_debug.html b/views/include/header_debug.html
deleted file mode 100644
index d900f69..0000000
--- a/views/include/header_debug.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script type="text/javascript">
- $("#header_left").html(ROOM_CODE);
- $("#header_center").html("Lynchburg");
- $("#header_right").html(PLAYER_NAME+":{{=player_record.role}}");
-</script>
diff --git a/views/include/header_default.html b/views/include/header_default.html
deleted file mode 100644
index c92519a..0000000
--- a/views/include/header_default.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<script type="text/javascript">
- $("#header_left").html("");
- $("#header_center").html("Lynchburg");
- $("#header_right").html("");
-</script>
diff --git a/views/layout.html b/views/layout.html
index 20f7ab6..4185870 100644
--- a/views/layout.html
+++ b/views/layout.html
@@ -6,6 +6,13 @@
<script src="{{=URL('static','js/jquery.js')}}" type="text/javascript"></script>
<script src="{{=URL('static','js/ajax.js')}}" type="text/javascript"></script>
<script src="{{=URL('static','js/vue.js')}}" type="text/javascript"></script>
+ <script type="text/javascript">
+ function HEADER_SET(_left, _middle, _right) {
+ $("#header_left").html(_left);
+ $("#header_center").html(_middle);
+ $("#header_right").html(_right);
+ }
+ </script>
{{block head}}{{end head}}
</head>
--
GitLab