Merge pull request #376 from localcontexts/sandbox-tweaks

sandbox updates
localcontexts · Oct 17, 2024 · 9afe8ca · 9afe8ca
2 parents 66442a8 + 538c209
commit 9afe8ca
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/researchers/views.py b/researchers/views.py
@@ -1,4 +1,4 @@
-from datetime import timezone
+from django.utils import timezone
 from django.shortcuts import render, redirect
 from django.contrib.auth.decorators import login_required
 from django.contrib import messages

diff --git a/templates/account-settings-base.html b/templates/account-settings-base.html
@@ -73,15 +73,17 @@ <h2 class="mt-0">Account Settings</h2>
                     </a>
                 {% endif %}
 
-                {% if institution or researcher and envi != "SANDBOX" %}
-                <a class="side-nav-a" href="{% if institution %}{% url 'subscription' institution.id 'institution' %}{% else %}{% url 'subscription' researcher.id 'researcher' %}{% endif %}">
-                        <div class="flex-this  side-nav-item {% if 'subscription' in request.path %} selected {% else %} grey-text {% endif %}">
-                            <div class="w-20 margin-right-8"><i class="fa fa-calendar-check-o fa-3x" aria-hidden="true"></i></div>
-                            <div class="w-80">
-                                <p class="mt-0"><strong>Subscription</strong><br>Subscription details and activity</p>
+                {% if institution or researcher %}
+                    {% if envi != "SANDBOX" %}
+                        <a class="side-nav-a" href="{% if institution %}{% url 'subscription' institution.id 'institution' %}{% else %}{% url 'subscription' researcher.id 'researcher' %}{% endif %}">
+                            <div class="flex-this  side-nav-item {% if 'subscription' in request.path %} selected {% else %} grey-text {% endif %}">
+                                <div class="w-20 margin-right-8"><i class="fa fa-calendar-check-o fa-3x" aria-hidden="true"></i></div>
+                                <div class="w-80">
+                                    <p class="mt-0"><strong>Subscription</strong><br>Subscription details and activity</p>
+                                </div>
                             </div>
-                        </div>
-                    </a>
+                        </a>
+                    {% endif %}
                 {% endif %}
 
                 <!-- Manage API Keys -->

diff --git a/templates/partials/headers/header-content.html b/templates/partials/headers/header-content.html
@@ -11,12 +11,14 @@
             <div class='menu-button'></div>
         </label>
         <ul class="menu ul-no-bullets">
-            <li>
-                <a 
-                    class="{% if '/subscription-inquiry/' in request.path %} active-link bold {% endif %} white-text upper" 
-                    href="{% url 'subscription-inquiry' %}"> Subscription
-                </a>
-            </li> 
+            {% if not 'sandbox' in request.get_host %}
+                <li>
+                    <a
+                        class="{% if '/subscription-inquiry/' in request.path %} active-link bold {% endif %} white-text upper" 
+                        href="{% url 'subscription-inquiry' %}"> Subscription
+                    </a>
+                </li>
+            {% endif %}
             <li>
                 <a 
                     class="{% if '/registry/' in request.path %} active-link bold {% endif %} white-text upper"