Merge pull request #74 from stanmart/script-blocks

Put scripts in script blocks and css in style blocks
stanmart · May 11, 2024 · de2d86a · de2d86a
2 parents 6aa2d4c + b983ed4
commit de2d86a
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 15 deletions.
diff --git a/introduction/Coalitions.html b/introduction/Coalitions.html
@@ -1,4 +1,4 @@
-{{ block head }}
+{{ block styles }}
 <link rel="stylesheet" href="{{ static 'live_bargaining.css' }}">
 {{ endblock }}
 
@@ -189,11 +189,13 @@ <h3>Currently accepted proposal </h2>
 
 </div>
 
+<b id="exercises-remaining-text" class="red-highlight">Please complete all exercises before moving to the next page.</b>
+{{ next_button }}
 
-<script src="{{ static 'coalitions_demo.js' }}"></script>
+{{ endblock }}
 
-<b id="exercises-remaining-text" class="red-highlight">Please complete all exercises before moving to the next page.</b>
+{{ block scripts }}
 
-{{ next_button }}
+<script src="{{ static 'coalitions_demo.js' }}"></script>
 
 {{ endblock }}
diff --git a/introduction/Proposal.html b/introduction/Proposal.html
@@ -1,4 +1,4 @@
-{{ block head }}
+{{ block styles }}
 <link rel="stylesheet" href="{{ static 'live_bargaining.css' }}">
 {{ endblock }}
 
@@ -187,15 +187,14 @@ <h3> Make a proposal </h2>
     </table>
 </div>
 
+<b id="exercises-remaining-text" class="red-highlight">Please complete all exercises before moving to the next page.</b>
+{{ next_button }}
 
+{{ endblock }}
 
+{{ block scripts }}
 
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 <script src="{{ static 'proposal_demo.js' }}"></script>
 
-<b id="exercises-remaining-text" class="red-highlight">Please complete all exercises before moving to the next page.</b>
-
-{{ next_button }}
-
-
 {{ endblock }}
diff --git a/live_bargaining/Bargain.html b/live_bargaining/Bargain.html
@@ -1,4 +1,4 @@
-{{ block head }}
+{{ block styles }}
 <link rel="stylesheet" href="{{ static 'live_bargaining.css' }}">
 {{ endblock }}
 
@@ -180,6 +180,9 @@ <h3 id="popup-title">Warning</h3>
     </div>
 </div>
 
+{{ endblock }}
+
+{{ block scripts }}
 
 <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
 <script src="{{ static 'live_bargaining.js' }}"></script>

diff --git a/live_bargaining/BargainingResults.html b/live_bargaining/BargainingResults.html
@@ -1,4 +1,4 @@
-{{ block head }}
+{{ block styles }}
 <link rel="stylesheet" href="{{ static 'live_bargaining.css' }}">
 {{ endblock }}
 
@@ -62,6 +62,10 @@ <h3>Payment</h3>
 
 {{ next_button }}
 
+{{ endblock }}
+
+{{ block scripts }}
+
 <script src="{{ static 'accept.js' }}"></script>
 
 {{ endblock }}
diff --git a/live_bargaining/Info.html b/live_bargaining/Info.html
@@ -1,4 +1,4 @@
-{{ block head }}
+{{ block styles }}
 <link rel="stylesheet" href="{{ static 'live_bargaining.css' }}">
 {{ endblock }}
 

diff --git a/sliders/Game.html b/sliders/Game.html
@@ -28,6 +28,7 @@
 {{ endblock }}
 
 {{ block scripts }}
+
 <script src="{{ static 'sliders.js' }}"></script>
 
 {{ endblock }}
diff --git a/survey/Completion.html b/survey/Completion.html
@@ -1,4 +1,4 @@
-{{ block head }}
+{{ block styles }}
 <link rel="stylesheet" href="{{ static 'live_bargaining.css' }}">
 {{ endblock }}
 

diff --git a/survey/Questions.html b/survey/Questions.html
@@ -2,7 +2,7 @@
 Survey
 {{ endblock }}
 
-{{ block head }}
+{{ block styles }}
 <link rel="stylesheet" href="{{ static 'live_bargaining.css' }}">
 {{ endblock }}
 
@@ -79,6 +79,10 @@ <h4>Feedback</h4>
 
 {{ next_button}}
 
+{{ endblock }}
+
+{{ block scripts }}
+
 <script src="{{ static 'questions.js' }}"></script>
 
 {{ endblock }}