# HG changeset patch # User cavaliet # Date 1354625789 -3600 # Node ID 4e3edc45a890fedc7420c56cff60dca594bf3356 # Parent 7b5c49cab8f15a09e1abfa55aec672febe451a27# Parent 09d29a596d4959bfa4dcc4918c189ae251bcfec4 Merge with 09d29a596d4959bfa4dcc4918c189ae251bcfec4 diff -r 09d29a596d49 -r 4e3edc45a890 src/ldt/ldt/ldt_utils/views/front.py --- a/src/ldt/ldt/ldt_utils/views/front.py Tue Dec 04 13:43:30 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/front.py Tue Dec 04 13:56:29 2012 +0100 @@ -1,6 +1,5 @@ from django.conf import settings from django.contrib.auth.models import Group, User -from django.http import HttpResponseRedirect from django.core.paginator import Paginator, InvalidPage, EmptyPage from django.core.urlresolvers import reverse from django.shortcuts import render_to_response @@ -10,9 +9,7 @@ from ldt.ldt_utils.forms import SearchForm from ldt.ldt_utils.views.content import get_content_tags from ldt.ldt_utils.views.workspace import get_search_results -from tagging.models import Tag, TaggedItem -from django.contrib.sites.models import Site -from django.template import Context +from tagging.models import TaggedItem from ldt.utils.url import absstatic import base64 diff -r 09d29a596d49 -r 4e3edc45a890 src/ldt/ldt/ldt_utils/views/group.py --- a/src/ldt/ldt/ldt_utils/views/group.py Tue Dec 04 13:43:30 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/group.py Tue Dec 04 13:56:29 2012 +0100 @@ -9,7 +9,6 @@ from ldt.security.utils import add_change_attr, get_userlist, get_userlist_group from ldt.security.cache import get_cached_checker, cached_assign from ldt.user.forms import PictureForm -import logging @login_required diff -r 09d29a596d49 -r 4e3edc45a890 src/ldt/ldt/ldt_utils/views/project.py --- a/src/ldt/ldt/ldt_utils/views/project.py Tue Dec 04 13:43:30 2012 +0100 +++ b/src/ldt/ldt/ldt_utils/views/project.py Tue Dec 04 13:56:29 2012 +0100 @@ -17,7 +17,7 @@ from ldt.user.forms import PictureForm import lxml.etree import math -import logging + @login_required def create_ldt_view(request): diff -r 09d29a596d49 -r 4e3edc45a890 src/ldt/ldt/security/utils.py --- a/src/ldt/ldt/security/utils.py Tue Dec 04 13:43:30 2012 +0100 +++ b/src/ldt/ldt/security/utils.py Tue Dec 04 13:56:29 2012 +0100 @@ -1,9 +1,9 @@ from django.conf import settings from django.contrib.contenttypes.models import ContentType from django.core.cache import cache -from guardian.shortcuts import assign, remove_perm, get_users_with_perms, get_groups_with_perms, get_objects_for_user +from guardian.shortcuts import remove_perm, get_users_with_perms, get_groups_with_perms, get_objects_for_user from cache import get_cached_userlist, cached_assign -from ldt.security import change_security, get_current_user +from ldt.security import change_security import types def unprotect_instance(instance): diff -r 09d29a596d49 -r 4e3edc45a890 web/ldtplatform/templates/registration/login.html --- a/web/ldtplatform/templates/registration/login.html Tue Dec 04 13:43:30 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,56 +0,0 @@ -{% extends "registration/base.html" %} -{% load i18n %} -{% load absstatic %} -{% load static %} - -{% block css_import %} - {{ block.super }} - - -{% endblock %} - -{% block login %} -{% endblock %} - -{% block content_title %}{% trans 'Log in' %}{% endblock %} -{% block iricontent %} - {% if form.errors %} -

{% trans "Sorry, that's not a valid username or password." %}

- {% endif %} -

- -

- {% if social_list %} -

{% trans "Or login with your external account" %} :

{{ backend_name }}

- {% endif %} -

- -{% endblock %} - - -