# HG changeset patch
# User ymh <ymh.work@gmail.com>
# Date 1354632101 -3600
# Node ID 37ce8f29b6ae59a1b0f7ed88cddb479e127e5663
# Parent  6b79d542440771464a8cb6a4a6f927bc614125de# Parent  10389426d9c08ce30e9bc7108b830416f79cad2e
Merge with 10389426d9c08ce30e9bc7108b830416f79cad2e

diff -r 6b79d5424407 -r 37ce8f29b6ae src/ldtplatform/settings.py
--- a/src/ldtplatform/settings.py	Tue Dec 04 10:19:44 2012 +0100
+++ b/src/ldtplatform/settings.py	Tue Dec 04 15:41:41 2012 +0100
@@ -147,6 +147,7 @@
     'guardian',
     'sorl.thumbnail',
     'tastypie',
+    'hashcut',
 )
 
 AUTH_PROFILE_MODULE = 'user.UserProfile'
diff -r 6b79d5424407 -r 37ce8f29b6ae src/ldtplatform/templates/registration/login.html
--- a/src/ldtplatform/templates/registration/login.html	Tue Dec 04 10:19:44 2012 +0100
+++ b/src/ldtplatform/templates/registration/login.html	Tue Dec 04 15:41:41 2012 +0100
@@ -1,32 +1,30 @@
 {% extends "registration/base.html" %}
 {% load i18n %}
-{% block js_declaration %}
-{{ block.super }}
-{% endblock %}
+{% load absstatic %}
+{% load static %}
 
 {% block css_import %}
-	{{ block.super }}
-	<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldt.css" />
-	<link rel="stylesheet" href="{{LDT_MEDIA_PREFIX}}css/ldtform.css" />
+    {{ block.super }}
+    <link rel="stylesheet" href='{% absstatic "ldt/css/ldt.css" %}'/>
+    <link rel="stylesheet" href='{% absstatic "ldt/css/ldtform.css" %}' />
 {% endblock %}
 
-
 {% block login %}
 {% endblock %}
 
 {% block content_title %}{% trans 'Log in' %}{% endblock %}
 {% block iricontent %}
     {% if form.errors %}
-   	<p class="error">{% trans "Sorry, that's not a valid username or password." %}</p>
+    <p class="error">{% trans "Sorry, that's not a valid username or password." %}</p>
    {% endif %}
-  	<div class="span-24 last">
+    <div class="span-24 last">
         <form action="" method='post' id="login-form">
-        	<div id="loginform_div" class="span-12">
+            <div id="loginform_div" class="span-12">
             {% csrf_token %}
             <input type="hidden" name="next" value="{{ next }}" />
-	        <ul id="login_fields_list">
-	        {{form.as_ul}}
-	        </ul>
+            <ul id="login_fields_list">
+            {{form.as_ul}}
+            </ul>
             <ul>
                 <li><a href="{% url django.contrib.auth.views.password_reset  %}" >{% trans "Forget password?" %}</a></li>
             </ul>
@@ -34,21 +32,23 @@
                 <button class="button"type="submit" value="login">{% trans "login" %}</button>
             </div>
             </div>
-	    </form>
+        </form>
         <div id="login_links" class="span-12 last">
             <div id="login_links_list" class="span-12 last">
             {% if social_list %}
             <p>{% trans "Or login with your external account" %}&nbsp;:</p>
             <ul>
-            {% for backend_name in social_list %}
-            <li><a href="{{ backend_name }}"><img src="{{LDT_MEDIA_PREFIX}}img/logo_{{backend_name}}.png" />&nbsp;{{ backend_name }}</a></li>
-            {% endfor %}
-            {% comment %}{{social_list|safe}}{% endcomment %}
+           {% for backend_name in social_list %}
+             
+            <li><a href="{{ backend_name }}"><img src='{% absstatic "ldt" %}/img/logo_{{backend_name}}.png' class='social_link' id="{{backend_name}}_logo_id"/>&nbsp;{{ backend_name }}</a></li>
+           
+           {% endfor %}
+           {% comment %}{{social_list|safe}}{% endcomment %}
             </ul>
             {% endif %}
             </div>
         </div>
-	</div> 
+    </div> 
 
 {% endblock %}
 
diff -r 6b79d5424407 -r 37ce8f29b6ae src/ldtplatform/urls.py
--- a/src/ldtplatform/urls.py	Tue Dec 04 10:19:44 2012 +0100
+++ b/src/ldtplatform/urls.py	Tue Dec 04 15:41:41 2012 +0100
@@ -45,6 +45,7 @@
     #(r'^static/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.STATIC_ROOT}),
     
     (r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict),
+    (r'^hashcut/', include('hashcut.urls')),
 )
 
 urlpatterns += staticfiles_urlpatterns()