Skip to content
Snippets Groups Projects
Commit ed17939b authored by Chris Sangwin's avatar Chris Sangwin
Browse files

Fix error in previous commit & code tidy.

parent 2169a184
Branches
No related tags found
No related merge requests found
...@@ -436,7 +436,7 @@ class qtype_stack_question extends question_graded_automatically_with_countback ...@@ -436,7 +436,7 @@ class qtype_stack_question extends question_graded_automatically_with_countback
$this->session = new stack_cas_session2(array_merge($contextsession, $remainder), $this->options, $this->seed); $this->session = new stack_cas_session2(array_merge($contextsession, $remainder), $this->options, $this->seed);
foreach ($this->prts as $name => $prt) { 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. // Allow inputs to update themselves based on the model answers.
......
#A list of extensions required for readthedocs to install # A list of extensions required for readthedocs to install.
python-markdown-math python-markdown-math
mkdocs-bootstrap mkdocs-bootstrap
...@@ -12,13 +12,12 @@ ...@@ -12,13 +12,12 @@
</script> </script>
{% endblock %} {% endblock %}
<!--Override basic header--> <!--Override basic header-->
{% block header %} {% block header %}
<header class="md-header" data-md-component="header"> <header class="md-header" data-md-component="header">
<nav class="md-header-nav md-grid" aria-label="{{ lang.t('header.title') }}"> <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" %} {% include "partials/logo.html" %}
</a> </a>
<label class="md-header-nav__button md-icon" for="__drawer"> <label class="md-header-nav__button md-icon" for="__drawer">
...@@ -63,12 +62,23 @@ ...@@ -63,12 +62,23 @@
<div class="md-content"> <div class="md-content">
<div class="md-content__inner md-typeset"> <div class="md-content__inner md-typeset">
<div class="row"> <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">
<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> <img src="{{nav.homepage.url | url}}/content/logo_large.png" width="70px" style="margin-top:1.3em;float:left;">
<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> <h2 style="color:white;margin-top:1.1em!important;"><b>STACK</b></h2></a>
</div> </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>
</div></footer> </div>
</div>
</footer>
{% endblock %} {% endblock %}
<!--Set the logo--> <!-- Set the logo. -->
{% if config.theme.logo %} {% if config.theme.logo %}
<img src="{{ config.theme.logo | url }}" alt="logo" style="width:2rem;height:0.95rem;"> <img src="{{ config.theme.logo | url }}" alt="logo" style="width:2rem;height:0.95rem;">
{% else %} {% else %}
......
...@@ -242,7 +242,8 @@ class stack_potentialresponse_tree { ...@@ -242,7 +242,8 @@ class stack_potentialresponse_tree {
} }
$visitednodes[$nodekey] = true; $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) { if ($results->_errors) {
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment