Commit 13d0938f370842e67489d4dde91a2dc33a0fe580
Committed by
Rodrigo Siqueira de Melo
Rodrigo Siqueira de Melo
1 parent
df127fc2
Exists in
master
and in
31 other branches
Removed browserid left-overs
Showing
2 changed files
with
5 additions
and
18 deletions
Show diff stats
colab/settings.py
| @@ -244,7 +244,6 @@ TASTYPIE_DEFAULT_FORMATS = ['json', ] | @@ -244,7 +244,6 @@ TASTYPIE_DEFAULT_FORMATS = ['json', ] | ||
| 244 | 244 | ||
| 245 | from .utils.conf import load_colab_apps, load_py_settings | 245 | from .utils.conf import load_colab_apps, load_py_settings |
| 246 | 246 | ||
| 247 | -BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False | ||
| 248 | SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False | 247 | SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False |
| 249 | 248 | ||
| 250 | locals().update(load_colab_apps()) | 249 | locals().update(load_colab_apps()) |
colab/templates/header.html
| @@ -37,21 +37,13 @@ | @@ -37,21 +37,13 @@ | ||
| 37 | <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a> | 37 | <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a> |
| 38 | <ul class="dropdown-menu"> | 38 | <ul class="dropdown-menu"> |
| 39 | {% trans 'Login' as login_text %} | 39 | {% trans 'Login' as login_text %} |
| 40 | - {% if BROWSERID_ENABLED %} | ||
| 41 | - <li>{% browserid_login text=login_text %}</li> | ||
| 42 | - {% else %} | ||
| 43 | - <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li> | ||
| 44 | - <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li> | ||
| 45 | - {% endif %} | 40 | + <li><a href="{% url 'signup' %}">{% trans "Register" %}</a></li> |
| 41 | + <li><a href="{% url 'login' %}">{% trans "Login" %}</a></li> | ||
| 46 | </ul> | 42 | </ul> |
| 47 | </li> | 43 | </li> |
| 48 | {% trans 'Login' as login_text %} | 44 | {% trans 'Login' as login_text %} |
| 49 | - {% if BROWSERID_ENABLED %} | ||
| 50 | - <li class="visible-xs hidden-sm hidden-md">{% browserid_login text=login_text %}</li> | ||
| 51 | - {% else %} | ||
| 52 | - <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li> | ||
| 53 | - <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li> | ||
| 54 | - {% endif %} | 45 | + <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'signup' %}">{% trans "Register" %}</a></li> |
| 46 | + <li class="visible-xs hidden-sm hidden-md"><a href="{% url 'login' %}">{% trans "Login" %}</a></li> | ||
| 55 | {% else %} | 47 | {% else %} |
| 56 | <li id="user-menu" class="dropdown"> | 48 | <li id="user-menu" class="dropdown"> |
| 57 | <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b> </a> | 49 | <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b> </a> |
| @@ -66,11 +58,7 @@ | @@ -66,11 +58,7 @@ | ||
| 66 | <div> | 58 | <div> |
| 67 | <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a> | 59 | <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a> |
| 68 | {% trans 'Logout' as logout_text %} | 60 | {% trans 'Logout' as logout_text %} |
| 69 | - {% if BROWSERID_ENABLED %} | ||
| 70 | - {% browserid_logout text=logout_text link_class='btn btn-default pull-right' %} | ||
| 71 | - {% else %} | ||
| 72 | - <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a> | ||
| 73 | - {% endif %} | 61 | + <a class="btn btn-default pull-right" href="{% url 'logout' %}"> {% trans "Logout" %}</a> |
| 74 | </div> | 62 | </div> |
| 75 | </div> | 63 | </div> |
| 76 | </li> | 64 | </li> |