diff --git a/question.php b/question.php
index 9bce9108957aebe1a06310ce87a4a163e3717c21..527371a194b6c1e7d0fdf1fd592fd339baf497c7 100644
--- a/question.php
+++ b/question.php
@@ -426,17 +426,17 @@ class qtype_stack_question extends question_graded_automatically_with_countback
$remainder = array();
foreach ($this->session->get_session() as $statement) {
if (method_exists($statement, 'is_toplevel_property') &&
- $statement->is_toplevel_property('contextvariable')) {
- $contextsession[] = $statement;
- } else {
- $remainder[] = $statement;
- }
+ $statement->is_toplevel_property('contextvariable')) {
+ $contextsession[] = $statement;
+ } else {
+ $remainder[] = $statement;
+ }
}
$this->contextsession = $contextsession;
$this->session = new stack_cas_session2(array_merge($contextsession, $remainder), $this->options, $this->seed);
foreach ($this->prts as $name => $prt) {
- $prt->add_contextsession($prt->add_contextsession);
+ $prt->add_contextsession($contextsession);
}
// Allow inputs to update themselves based on the model answers.
diff --git a/requirements.txt b/requirements.txt
index f4c6fec8b0db17e3e4e1f19718bceeda55d5253c..b10821603284ac2b1158e33a3466b164e3566f0a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-#A list of extensions required for readthedocs to install
+# A list of extensions required for readthedocs to install.
python-markdown-math
-mkdocs-bootstrap
\ No newline at end of file
+mkdocs-bootstrap
diff --git a/site_overrides/main.html b/site_overrides/main.html
index eebbbf55b98d1389084896a25c36061cd2e209b5..1206058df58af7f7872aac8bf8219e50d4323e07 100644
--- a/site_overrides/main.html
+++ b/site_overrides/main.html
@@ -12,19 +12,18 @@
</script>
{% endblock %}
-
-
<!--Override basic header-->
{% block header %}
<header class="md-header" data-md-component="header">
<nav class="md-header-nav md-grid" aria-label="{{ lang.t('header.title') }}">
- <a href="{{ config.site_url | default(nav.homepage.url, true) | url }}" title="{{ config.site_name }}" class="md-header-nav__button md-logo" style="width:1.7rem;" aria-label="{{ config.site_name }}">
+ <a href="{{ config.site_url | default(nav.homepage.url, true) | url }}" title="{{ config.site_name }}"
+ class="md-header-nav__button md-logo" style="width:1.7rem;" aria-label="{{ config.site_name }}">
{% include "partials/logo.html" %}
</a>
<label class="md-header-nav__button md-icon" for="__drawer">
{% include ".icons/material/menu" ~ ".svg" %}
</label>
- <!--Make site title permament-->
+ <!--Make site title permament-->
<div class="md-header-nav__title" data-md-component="header-title">
<div class="md-header-nav__ellipsis md-ellipsis">
{{ config.site_name }}
@@ -63,12 +62,23 @@
<div class="md-content">
<div class="md-content__inner md-typeset">
<div class="row">
- <div class="footerColumn"><a href="https://www.stack-assessment.org"><img src="{{nav.homepage.url | url}}/content/logo_large.png" width="70px" style="margin-top:1.3em;float:left;"><h2 style="color:white;margin-top:1.1em!important;"><b>STACK</b></h2></a></div>
- <div class="footerColumn"><a href="https://www.stack-assessment.org/About/"><h5 style="color:white;">About STACK</h5></a><a href="https://www.stack-assessment.org/Training_and_events/"><h5 style="color:white;">Training and Events</h5></a><a href="https://www.stack-assessment.org/Case_studies/"><h5 style="color:white;">Case Studies</h5></a><a href="https://stack-demo.maths.ed.ac.uk/demo/"><h5 style="color:white;">Demonstration site</h5><a></div>
- <div class="footerColumn"><a href="https://www.stack-assessment.org/Legal/PrivacyStatement/"><h5 style="color:white;">Privacy statement</h5></a><a href="https://www.stack-assessment.org/Legal/Licenses/"><h5 style="color:white;">Licenses</h5></a><a href="https://www.stack-assessment.org/Legal/Accessibility/"><h5 style="color:white;">Accessibility</h5></a></div>
- </div>
+ <div class="footerColumn"><a href="https://www.stack-assessment.org">
+ <img src="{{nav.homepage.url | url}}/content/logo_large.png" width="70px" style="margin-top:1.3em;float:left;">
+ <h2 style="color:white;margin-top:1.1em!important;"><b>STACK</b></h2></a>
+ </div>
+ <div class="footerColumn"><a href="https://www.stack-assessment.org/About/">
+ <h5 style="color:white;">About STACK</h5></a>
+ <a href="https://www.stack-assessment.org/Training_and_events/"><h5 style="color:white;">Training and Events</h5></a>
+ <a href="https://www.stack-assessment.org/Case_studies/"><h5 style="color:white;">Case Studies</h5></a>
+ <a href="https://stack-demo.maths.ed.ac.uk/demo/"><h5 style="color:white;">Demonstration site</h5><a></div>
+ <div class="footerColumn"><a href="https://www.stack-assessment.org/Legal/PrivacyStatement/">
+ <h5 style="color:white;">Privacy statement</h5></a><a href="https://www.stack-assessment.org/Legal/Licenses/">
+ <h5 style="color:white;">Licenses</h5></a><a href="https://www.stack-assessment.org/Legal/Accessibility/">
+ <h5 style="color:white;">Accessibility</h5></a>
+ </div>
+ </div>
</div>
</div>
-
-</div></footer>
-{% endblock %}
\ No newline at end of file
+</div>
+</footer>
+{% endblock %}
diff --git a/site_overrides/partials/logo.html b/site_overrides/partials/logo.html
index d856797a7dd9c1e4a7998bfbc2c2ee371e7833c3..a201ac87ea49264e8601f1b9926b506a8ad73d04 100644
--- a/site_overrides/partials/logo.html
+++ b/site_overrides/partials/logo.html
@@ -1,7 +1,7 @@
-<!--Set the logo-->
+<!-- Set the logo. -->
{% if config.theme.logo %}
<img src="{{ config.theme.logo | url }}" alt="logo" style="width:2rem;height:0.95rem;">
{% else %}
{% set icon = config.theme.icon.logo or "material/library" %}
{% include ".icons/" ~ icon ~ ".svg" %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/stack/potentialresponsetree.class.php b/stack/potentialresponsetree.class.php
index 668eae2e598d4ea874fa4d78775107ea3d115267..545d6fab9c91c24809ab26f978efbc6d39d36f67 100644
--- a/stack/potentialresponsetree.class.php
+++ b/stack/potentialresponsetree.class.php
@@ -242,7 +242,8 @@ class stack_potentialresponse_tree {
}
$visitednodes[$nodekey] = true;
- $nodekey = $this->nodes[$nodekey]->traverse($results, $nodekey, $cascontext, $answers, $localoptions, $this->contextsession);
+ $nodekey = $this->nodes[$nodekey]->traverse($results, $nodekey, $cascontext, $answers, $localoptions,
+ $this->contextsession);
if ($results->_errors) {
break;