Merge pull request #2066 from JANVI-CHATURVEDI/fix-getstarted-clean-final

Fix "Get Started" Button and Add Registration Sidebar

Author: rolandgeider

wger/core/templates/form_content.html

@@ -23,7 +23,4 @@
 {% endblock %}
 
 
-<!--
-        Sidebar
--->
 {% block sidebar %}{% if sidebar %}{% include sidebar %}{% endif %}{% endblock %}

wger/core/templates/user/registration_sidebar.html

@@ -0,0 +1,17 @@
+
+{% load i18n static wger_extras crispy_forms_tags %}
+
+
+
+{% block sidebar %}
+{% if user.is_anonymous %}
+    <h4>{% trans "Already have an account?" %}</h4>
+    <p>
+        <a href="{% url 'core:user:login' %}">
+            <span class="{% fa_class 'sign-in-alt' %}"></span>
+            {% trans "Login" %}
+        </a>
+    </p>
+{% endif %}
+{% endblock %}
+

wger/core/views/user.py

@@ -284,6 +284,10 @@ def registration(request):
     template_data['form'] = form
     template_data['title'] = _('Register')
 
+    # Add this line to use the new registration-specific sidebar
+    template_data['sidebar'] = 'user/registration_sidebar.html'
+
+
     return render(request, 'form_content.html', template_data)
 
 

wger/software/templates/features.html

@@ -118,7 +118,7 @@ <h1 class="font-bebas-neue display-3 uppercase">
                        href="{% if user.is_authenticated %}
                                 {% url 'core:index' %}
                             {% else %}
-                                {% url 'core:user:login' %}
+                                {% url 'core:user:registration' %}
                             {% endif %}">
                         {% translate "Get Started" %}
                     </a>