Merge pull request #6138 from LMFDB/main

main -> web
LMFDB · Aug 12, 2024 · be7e78a · be7e78a
2 parents eb35774 + e80d88f
commit be7e78a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/lmfdb/app.py b/lmfdb/app.py
@@ -308,7 +308,6 @@ def netloc_redirect():
         return redirect(urlunparse(replaced), code=302)
 
 
-
 def timestamp():
     return '[%s UTC]' % time.strftime("%Y-%m-%d %H:%M:%S", time.gmtime())
 

diff --git a/lmfdb/classical_modular_forms/web_space.py b/lmfdb/classical_modular_forms/web_space.py
@@ -506,6 +506,7 @@ def __init__(self, level, weight):
                     space['level'] = level
                     space['conrey_index'] = char['first']
                     space['char_orbit_label'] = char['label'].split('.')[-1]
+                    space['label'] = "%s.%s.%s"%(level,weight,space['char_orbit_label'])
                     space['char_degree'] = char['degree']
                     space['dim'] = newspace_dims_by_label[char['label']]
                     space['generate_link'] = (self.weight == 2) and (space['char_orbit_label'] != 'a')

diff --git a/lmfdb/templates/base.html b/lmfdb/templates/base.html
@@ -25,8 +25,11 @@
           href="https://ajax.googleapis.com/ajax/libs/jqueryui/1.12.1/themes/smoothness/jquery-ui.css"
           integrity="sha384-Nlo8b0yiGl7Dn+BgLn4mxhIIBU6We7aeeiulNCjHdUv/eKHx59s3anfSUjExbDxn"
           crossorigin="anonymous">
-    <!--reCAPTCHA-->
-    <script src="https://www.google.com/recaptcha/enterprise.js?render=6LchHWwpAAAAACFe52hZNEkUP5Bn5_0FfLiEuF3i&waf=session" async defer></script>
+
+    {% if not BETA %}
+      <!--reCAPTCHA-->
+      <script src="https://www.google.com/recaptcha/enterprise.js?render=6LchHWwpAAAAACFe52hZNEkUP5Bn5_0FfLiEuF3i&waf=session" async defer></script>
+    {% endif %}
 
 
 
@@ -182,10 +185,10 @@
 
   {%- if BETA -%}
   <body class="beta {{ body_class }}">
-    {%- else -%}
-    <body class="{{ body_class }}">
-      {%- endif -%}
+  {%- else -%}
+  <body class="{{ body_class }}">
+  {%- endif -%}
 
-      {% block body -%}{%- endblock body %}
-      </body>
+  {% block body -%}{%- endblock body %}
+  </body>
 </html>