Merge pull request #4098 from akatsoulas/locale-login-redirect

Add next url when logging in.

kitsune/customercare/jinja2/customercare/twitter_modal.html

@@ -31,7 +31,7 @@
           <span class="highlight">{{ _('Yes, I am.') }}</span>
           {{ _('Click to sign in.') }}
         </a>
-        <a href="{{ url('users.fxa_authentication_init') }}?is_contributor=True" class="btn btn-submit btn-modal register">
+        <a href="{{ url('users.fxa_authentication_init') }}?is_contributor=True&next={{ request.META.get('HTTP_REFERER', '/') }}" class="btn btn-submit btn-modal register">
           <span class="highlight">{{ _("No, I'm not.") }}</span>
           {{ _('Click to register.') }}
         </a>

kitsune/landings/jinja2/landings/includes/register_contributor.html

@@ -9,7 +9,7 @@
             <button id="sign-up-contributor" class="btn btn-submit" data-event-category="Sign Me Up Click" data-event-action="Logged In">{{ _('Sign me up') }} &raquo;</button>
           </form>
         {% else %}
-          <a id="sign-up-contributor" class="btn btn-submit" href="{{ url('users.fxa_authentication_init') }}?is_contributor=True" data-event-category="Sign Me Up Click" data-event-action="Logged In">
+          <a id="sign-up-contributor" class="btn btn-submit" href="{{ url('users.fxa_authentication_init') }}?is_contributor=True&next={{ request.META.get('HTTP_REFERER', '/') }}" data-event-category="Sign Me Up Click" data-event-action="Logged In">
             {{ _('Sign me up') }} &raquo;
           </a>
         {% endif %}

kitsune/landings/jinja2/landings/mobile/includes/register_contributor.html

@@ -14,7 +14,7 @@
         <button id="sign-up-contributor" class="btn btn-submit">{{ _('Sign me up') }}</button>
       </form>
     {% else %}
-      <a id="sign-up-contributor" class="btn btn-submit" href="{{ url('users.fxa_authentication_init') }}?is_contributor=True">
+      <a id="sign-up-contributor" class="btn btn-submit" href="{{ url('users.fxa_authentication_init') }}?is_contributor=True&next={{ request.META.get('HTTP_REFERER', '/') }}">
         {{ _('Sign me up') }}
       </a>
     {% endif %}

kitsune/sumo/jinja2/handlers/403.html

@@ -16,7 +16,7 @@
 
       {% if not user.is_authenticated() %}
           <p>
-            Please try to log in / sign up first with <a href="{{ url('users.fxa_authentication_init') }}">{{ _('Firefox Accounts') }}</a>
+            Please try to log in / sign up first with <a href="{{ url('users.fxa_authentication_init') }}?next={{ request.META.get('HTTP_REFERER', '/') }}">{{ _('Firefox Accounts') }}</a>
             or continue with an existing <a class="legacy-login-toggle" href="#">{{ _('SUMO account') }}</a>.
           </p>
           <div id="login-legacy" class="hidden">

kitsune/users/jinja2/users/mobile/includes/macros.html

@@ -17,7 +17,7 @@
     </fieldset>
     <div class="submit">
       <button type="submit" data-type="submit" data-name="login" class="btn btn-submit" data-progress="{{ _('Signing in...') }}" data-done="{{ _('Signed in!') }}" data-reset="{{ _('Sign in') }}">{{ _('Sign in') }}</button>
-      <a class="btn" href="{{ url('users.fxa_authentication_init') }}">{{ _("Don't have an account? Register") }} </a>
+     <a class="btn" href="{{ url('users.fxa_authentication_init') }}?next={{ request.META.get('HTTP_REFERER', '/') }}">{{ _("Don't have an account? Register") }} </a>
     </div>
     <ul class="login-help">
       <li><a href="{{ url('users.pw_reset') }}">{{ _("My password isn't working.") }}</a></li>