Merge pull request #1855 from Maralai/fix/registration

Fix/registration
wger-project · Dec 30, 2024 · c512614 · c512614
2 parents 2fb082c + 76da122
commit c512614
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -83,6 +83,7 @@ Developers
 * Taylor Fuller - https://github.com/taylor-fuller
 * eyJhb - https://github.com/eyJhb
 * Joshua Shelley - https://github.com/navyjosh
+* Matt Harrison - https://github.com/Maralai
 
 
 Translators

diff --git a/wger/core/templates/navigation.html b/wger/core/templates/navigation.html
@@ -281,7 +281,7 @@
                         <li class="dropdown nav-item">
                             <a href="#" class="dropdown-toggle nav-link text-white"
                                data-bs-toggle="dropdown">
-                                {% translate "Login" %} / {% translate "Register" %}
+                                {% translate "Login" %}{% if allow_registration %} / {% translate "Register" %}{% endif %}
                                 <span class="caret"></span>
                             </a>
                             <ul class="dropdown-menu">
@@ -290,12 +290,14 @@
                                         {% translate "Login" %}
                                     </a>
                                 </li>
+                                {% if allow_registration %}
                                 <li>
                                     <a class="dropdown-item"
                                        href="{% url 'core:user:registration' %}">
                                         {% translate "Register" %}
                                     </a>
                                 </li>
+                                {% endif %}
                                 <li>
                                     <a class="dropdown-item"
                                        href="{% url 'core:user:password_reset' %}">

diff --git a/wger/core/templates/user/login.html b/wger/core/templates/user/login.html
@@ -13,13 +13,15 @@
 
 
 {% block sidebar %}
+{% if allow_registration %}
 <h4>{% translate "No account?" %}</h4>
 <p>
     <a href="{% url 'core:user:registration' %}">
         <span class="{% fa_class 'sign-in-alt' %}"></span>
         {% translate "Register" %}
     </a>
 </p>
+{% endif %}
 
 <h4>{% translate "Forgot password?" %}</h4>
 <p>

diff --git a/wger/software/templates/features.html b/wger/software/templates/features.html
@@ -325,13 +325,13 @@ <h1 class="display-3 uppercase font-bebas-neue header-community">
         </section>
 
         <!-- sign up section -->
-        <section class="main-section  ">
+        {% if allow_registration %}
+        <section class="main-section">
             <div class="container d-flex align-items-center justify-content-center sign-up-bg">
-
                 <!-- form -->
                 <form method="post"
-                      action="{% url 'core:user:registration' %}"
-                      class="row justify-content-center">
+                    action="{% url 'core:user:registration' %}"
+                    class="row justify-content-center">
                     {% csrf_token %}
                     <h3 class="col-12 text-center fs-1 uppercase font-bebas-neue">
                         {% translate "Sign Up Now For Free" %}
@@ -342,6 +342,7 @@ <h3 class="col-12 text-center fs-1 uppercase font-bebas-neue">
                 </form>
             </div>
         </section>
+        {% endif %}
 
         <!-- not enough section  -->
         <section class="bg-bottom-menu p-5">
@@ -417,11 +418,13 @@ <h6 class="text-white fw-bold text-center">
                         <li class="list-group-item bg-transparent border-0 text-light ps-0">
                             <h1 class="fs-5 text-white">{% translate "Account" %}</h1>
                         </li>
+                        {% if allow_registration %}
                         <li class="list-group-item bg-transparent border-0 text-light fw-lighter ps-0">
                             <a href="{% url 'core:user:registration' %}">
                                 {% translate "Register" %}
                             </a>
                         </li>
+                        {% endif %}
                         <li class="list-group-item bg-transparent border-0 text-light fw-lighter ps-0">
                             <a href="{% url 'core:user:login' %}">
                                 {% translate "Login" %}