Update register and login buttons

Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com> Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>

Update register and login buttons
Signed-off-by: Alexandre Barbosa <alexandreab@live.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com> Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
Alexandre Barbosa · Sergio Oliveira
1 parent ed436f44
Showing 4 changed files with 41 additions and 25 deletions Show diff stats
colab/accounts/templates/accounts/user_create_form.html
colab/accounts/urls.py
colab/accounts/views.py
colab/templates/base.html
@@ -17,7 +17,7 @@
   <label>{% trans "Required fields" %}</label>
 </p>
-<form action="." method="post" role="form" class="form-horizontal signup">
+<form action="{% url "signup" %}" method="post" role="form" class="form-horizontal signup">
   {% csrf_token %}
   <div class="row">
@@ -9,32 +9,15 @@ from django.contrib.auth import views as auth_views
 from colab.settings import BROWSERID_ENABLED
-urlpatterns = patterns('',
-    url(r'^register/$', 'colab.accounts.views.signup', name='signup'),
-
-#FIXME Configure for XMPP
-#    url(r'^change-password/$',
-#        ChangeXMPPPasswordView.as_view(), name='change_password'),
-
-    url(r'^(?P<username>[\w@+.-]+)/?$',
-        UserProfileDetailView.as_view(), name='user_profile'),
-
-    url(r'^(?P<username>[\w@+.-]+)/edit/?$',
-        UserProfileUpdateView.as_view(), name='user_profile_update'),
-
-    url(r'^(?P<username>[\w@+.-]+)/subscriptions/?$',
-        ManageUserSubscriptionsView.as_view(), name='user_list_subscriptions'),
-)
 if not BROWSERID_ENABLED:
-    urlpatterns += patterns('',
+    urlpatterns = patterns('',
         url(r'^login/?$', 'django.contrib.auth.views.login', name='login'),
         url(r'^logout/?$',  'django.contrib.auth.views.logout', name='logout'),
         url(r'^password-reset-done/?$', 'colab.accounts.views.password_reset_done_custom',
             name="password_reset_done"),
-
         url(r'^password-reset-complete/$', 'colab.accounts.views.password_reset_complete_custom',
             name="password_reset_complete"),
@@ -55,6 +38,23 @@ if not BROWSERID_ENABLED:
             'colab.accounts.views.password_changed', name='password_change_done'),
     )
 else:
-    urlpatterns += patterns('',
-        url(r'^login/?$', LoginView.as_view(), name='login'),
+    urlpatterns = patterns('',
+        url(r'^login/?$', LoginView.as_view(), name='colab.login'),
     )
+
+urlpatterns += patterns('',
+    url(r'^register/?$', 'colab.accounts.views.signup', name='signup'),
+
+#FIXME Configure for XMPP
+#    url(r'^change-password/$',
+#        ChangeXMPPPasswordView.as_view(), name='change_password'),
+
+    url(r'^(?P<username>[\w@+.-]+)/?$',
+        UserProfileDetailView.as_view(), name='user_profile'),
+
+    url(r'^(?P<username>[\w@+.-]+)/edit/?$',
+        UserProfileUpdateView.as_view(), name='user_profile_update'),
+
+    url(r'^(?P<username>[\w@+.-]+)/subscriptions/?$',
+        ManageUserSubscriptionsView.as_view(), name='user_list_subscriptions'),
+)
@@ -146,7 +146,10 @@ def signup(request):
     # If the user is authenticated in Persona, but not in the Colab then he
     # will be redirected to the register form.
     if request.method == 'GET':
-        user_form = UserCreationForm()
+        if BROWSERID_ENABLED:
+            user_form = UserCreationForm()
+        else:
+            user_form = UserCreationFormNoBrowserId()
         lists_form = ListsForm()
         return render(request, 'accounts/user_create_form.html',
@@ -187,6 +190,7 @@ def signup(request):
     messages.success(request, _('Your profile has been created!'))
+
     return redirect('user_profile', username=user.username)
@@ -55,7 +55,9 @@
   <!-- data-no-turbolink will disable Rails TurboLinks for all pages under Colab -->
   <body class="container" data-no-turbolink>
-    {% browserid_info %}
+    {% if BROWSERID_ENABLED %}
+      {% browserid_info %}
+    {% endif %}
     {% block ribbon %}
     {% if ribbon %}
@@ -110,11 +112,21 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
                 <ul class="dropdown-menu">
                   {% trans 'Login' as login_text %}
-                  <li>{% browserid_login text=login_text %}</li>
+                  {% if BROWSERID_ENABLED %}
+                    <li>{% browserid_login text=login_text %}</li>
+                  {% else %}
+                    <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
+                    <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
+                  {% endif %}
                 </ul>
               </li>
               {% trans 'Login' as login_text %}
-              <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li>
+              {% if BROWSERID_ENABLED %}
+                <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li>
+              {% else %}
+                <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li>
+                <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li>
+              {% endif %}
             {% else %}
               <li id="user-menu" class="dropdown">
                 <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
	@@ -17,7 +17,7 @@		@@ -17,7 +17,7 @@
17	<label>{% trans "Required fields" %}</label>	17	<label>{% trans "Required fields" %}</label>
18	</p>	18	</p>
19		19
20	-<form action="." method="post" role="form" class="form-horizontal signup">	20	+<form action="{% url "signup" %}" method="post" role="form" class="form-horizontal signup">
21	{% csrf_token %}	21	{% csrf_token %}
22		22
23	<div class="row">	23	<div class="row">