Merge remote-tracking branch 'origin/main' into support-python-3-13

eoyoa · eoyoa · commit ad3ecb010f8a · 2025-06-06T15:01:02.000-05:00
# Conflicts:
#	projects/assignment_server/poetry.lock
#	projects/assignment_server/pyproject.toml
#	projects/author_server/poetry.lock
#	projects/book_server/pyproject.toml
#	projects/interactives/poetry.lock
#	projects/rsmanage/poetry.lock
diff --git a/bases/rsptx/interactives/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html b/bases/rsptx/interactives/runestone/common/project_template/_templates/plugin_layouts/sphinx_bootstrap/layout.html
@@ -107,6 +107,9 @@
 {# Sidebar: Rework into our Boostrap nav section. #}
 {% macro navBar() %}
 
+<!-- Dummy div that is focused by js when user uses "back to top"-->
+<div id="top" tabindex="-1"></div>
+
 <!-- Begin navbar -->
 <div id="navbar" class="navbar navbar-default navbar-fixed-top" role="navigation">
 
@@ -411,7 +414,7 @@ <h4>Before you keep reading...</h4>
       <span id='numuserspan'></span><span class='loggedinuser'></span>
       {% endif %}
       {% endif %}
-      | <a href="#">Back to top</a>
+      | <a href="#" onclick="document.getElementById('top').focus()">Back to top</a>
       {% if theme_source_link_position == "footer" %}
         <br />
         {% include "sourcelink.html" %}
diff --git a/bases/rsptx/web2py_server/applications/runestone/views/layout.html b/bases/rsptx/web2py_server/applications/runestone/views/layout.html
@@ -36,7 +36,7 @@
 
     </head>
     <body class="sphinxrs">
-        <a class="assistive" href="#rst-content">Skip to main content</a>
+        <a id="skip-to-content" class="assistive" href="#rst-content">Skip to main content</a>
         {{ block navbar }}
         <!-- Begin navbar -->
         <div id="navbar" class="navbar navbar-default navbar-fixed-top" role="navigation">
@@ -218,9 +218,9 @@
                         &emsp; ● <a href="/{{=request.application}}/default/privacy">Privacy Policy</a> &emsp; ●  <a href="/{{=request.application}}/default/terms">Terms of Service</a>
                     {{ pass }}
                     {{ if auth.user: }}
-                        <span class='loggedinuser'>{{=auth.user.email}}</span> | <a href="#">Back to top</a>
+                        <span class='loggedinuser'>{{=auth.user.email}}</span> | <a href="#" onclick="document.getElementById('skip-to-content').focus()">Back to top</a>
                     {{ else: }}
-                        <span class='loggedinuser'>Not logged in</span> | <a href="#">Back to top</a>
+                        <span class='loggedinuser'>Not logged in</span> | <a href="#" onclick="document.getElementById('skip-to-content').focus()">Back to top</a>
                     {{ pass }}
                 </p>
             </div>
