Download as
Browse Code »

Commit 13d0938f370842e67489d4dde91a2dc33a0fe580

Authored by Sergio Oliveira
Committed by Rodrigo Siqueira de Melo
1 parent df127fc2
Exists in master and in 31 other branches 1.12.x, add_requests_as_dep, celery_service, change-passwd-signal, colab-signals, colab-vcard, colab_search, colab_tag, colab_tag_merge, community_association, detach_super_archives, fix-dashboard, fix-message-preview, fix_app_label, fix_header, fixed_gitlab_import, go_to_profile_panel, mobile_user_scalable, paginate-threads, profile_integration, refactor-data-import, remove-gitlab-plugin, removing_namespace, search_block, search_filters, split_screen, startplugin, timestamp_plugins, translation_review, user_regex, validate-passwd

Removed browserid left-overs

Showing 2 changed files with 5 additions and 18 deletions   Show diff stats
colab/settings.py
  Diff comments   View file @13d0938
... ... @@ -244,7 +244,6 @@ TASTYPIE_DEFAULT_FORMATS = ['json', ]
244 244  
245 245 from .utils.conf import load_colab_apps, load_py_settings
246 246  
247   -BROWSERID_ENABLED = locals().get('BROWSERID_ENABLED') or False
248 247 SOCIAL_NETWORK_ENABLED = locals().get('SOCIAL_NETWORK_ENABLED') or False
249 248  
250 249 locals().update(load_colab_apps())
... ...
colab/templates/header.html
  Diff comments   View file @13d0938
... ... @@ -37,21 +37,13 @@
37 37 <a href="#" class="dropdown-toggle" data-toggle="dropdown">Acesso <b class="caret"></b></a>
38 38 <ul class="dropdown-menu">
39 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 42 </ul>
47 43 </li>
48 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 47 {% else %}
56 48 <li id="user-menu" class="dropdown">
57 49 <a href="#" class="dropdown-toggle user" data-toggle="dropdown">{% gravatar user.email 40 %} <b class="caret"></b>&nbsp;&nbsp;</a>
... ... @@ -66,11 +58,7 @@
66 58 <div>
67 59 <a class="btn btn-info pull-left" href="{% url 'user_profile' user.username %}">{% trans "My Profile" %}</a>
68 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 62 </div>
75 63 </div>
76 64 </li>
... ...