# HG changeset patch
# User grandjoncl
# Date 1354102287 -3600
# Node ID c2d9d1c6c228913573e06b8d2cc1e757429307f5
# Parent  a6a37775a76dd0a1aa56b61172ada2422fd99b14# Parent  94f9d36371f6078821a0347ae2643320019de797
Merge with 8251c6a02d6fc48c19f241f8055ceac0017ac457

diff -r a6a37775a76d -r c2d9d1c6c228 .settings/org.eclipse.core.resources.prefs
--- a/.settings/org.eclipse.core.resources.prefs	Sat Dec 01 02:15:38 2012 +0100
+++ b/.settings/org.eclipse.core.resources.prefs	Wed Nov 28 12:31:27 2012 +0100
@@ -1,41 +1,42 @@
-eclipse.preferences.version=1
-encoding//src/ldt/ldt/core/migrations/0001_initial.py=utf-8
-encoding//src/ldt/ldt/core/migrations/0002_auto__del_owner.py=utf-8
-encoding//src/ldt/ldt/indexation/backends/elasticsearch_backend.py=utf-8
-encoding//src/ldt/ldt/indexation/highlighter.py=utf-8
-encoding//src/ldt/ldt/indexation/models.py=utf-8
-encoding//src/ldt/ldt/indexation/query_parser.py=utf-8
-encoding//src/ldt/ldt/indexation/search_indexes.py=utf-8
-encoding//src/ldt/ldt/indexation/tests.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0001_initial.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0002_auto__add_field_media_mimetype_field__chg_field_media_external_src_url.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0003_auto__chg_field_project_owner.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0004_auto__add_field_project_description.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0005_add_permissions.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0006_auto__add_field_media_image.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0007_auto__add_field_content_image__del_field_media_image.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0008_auto__add_field_project_image.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0009_auto__chg_field_content_image__chg_field_project_image.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0010_auto__add_annotationstat.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0011_gen_stat_annotation.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0012_auto__add_field_content_last_annotated.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0013_auto__add_field_content_front_project__chg_field_content_last_annotate.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0014_auto__del_annotationstat__chg_field_content_last_annotated.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0015_auto__add_contentstat__del_field_content_last_annotated__del_field_con.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0016_one_to_one_stat_annotation.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0017_correct_image_path.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0018_auto__chg_field_content_iri_id__chg_field_project_ldt_id__chg_field_au.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0019_recalculate_media_hash_src.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0020_auto__add_field_segment_id_hash__chg_field_segment_iri_id__chg_field_s.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0021_recalculate_segment_id_hash_script.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0022_auto__add_unique_media_src_hash__chg_field_segment_cutting_id__chg_fie.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0023_auto__add_field_segment_audio_src__add_field_segment_audio_href.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/migrations/0024_auto__chg_field_tag_name.py=utf-8
-encoding//src/ldt/ldt/ldt_utils/views/json.py=utf-8
-encoding//src/ldt/ldt/management/utils.py=utf-8
-encoding//src/ldt/ldt/test/test_runner.py=utf-8
-encoding//src/ldt/ldt/text/migrations/0001_initial.py=utf-8
-encoding//src/ldt/ldt/user/migrations/0001_initial.py=utf-8
-encoding//src/ldt/ldt/user/migrations/0008_auto__chg_field_groupprofile_image__chg_field_groupprofile_group__chg_.py=utf-8
-encoding//virtualenv/web/env/guardianenv/Lib/site-packages/guardian/migrations/0001_initial.py=utf-8
-encoding/<project>=UTF-8
+eclipse.preferences.version=1
+encoding//src/ldt/ldt/core/migrations/0001_initial.py=utf-8
+encoding//src/ldt/ldt/core/migrations/0002_auto__del_owner.py=utf-8
+encoding//src/ldt/ldt/indexation/backends/elasticsearch_backend.py=utf-8
+encoding//src/ldt/ldt/indexation/highlighter.py=utf-8
+encoding//src/ldt/ldt/indexation/models.py=utf-8
+encoding//src/ldt/ldt/indexation/query_parser.py=utf-8
+encoding//src/ldt/ldt/indexation/search_indexes.py=utf-8
+encoding//src/ldt/ldt/indexation/tests.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0001_initial.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0002_auto__add_field_media_mimetype_field__chg_field_media_external_src_url.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0003_auto__chg_field_project_owner.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0004_auto__add_field_project_description.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0005_add_permissions.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0006_auto__add_field_media_image.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0007_auto__add_field_content_image__del_field_media_image.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0008_auto__add_field_project_image.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0009_auto__chg_field_content_image__chg_field_project_image.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0010_auto__add_annotationstat.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0011_gen_stat_annotation.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0012_auto__add_field_content_last_annotated.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0013_auto__add_field_content_front_project__chg_field_content_last_annotate.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0014_auto__del_annotationstat__chg_field_content_last_annotated.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0015_auto__add_contentstat__del_field_content_last_annotated__del_field_con.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0016_one_to_one_stat_annotation.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0017_correct_image_path.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0018_auto__chg_field_content_iri_id__chg_field_project_ldt_id__chg_field_au.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0019_recalculate_media_hash_src.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0020_auto__add_field_segment_id_hash__chg_field_segment_iri_id__chg_field_s.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0021_recalculate_segment_id_hash_script.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0022_auto__add_unique_media_src_hash__chg_field_segment_cutting_id__chg_fie.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0023_auto__add_field_segment_audio_src__add_field_segment_audio_href.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0024_auto__chg_field_tag_name.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/migrations/0025_chg_site_domain.py=utf-8
+encoding//src/ldt/ldt/ldt_utils/views/json.py=utf-8
+encoding//src/ldt/ldt/management/utils.py=utf-8
+encoding//src/ldt/ldt/test/test_runner.py=utf-8
+encoding//src/ldt/ldt/text/migrations/0001_initial.py=utf-8
+encoding//src/ldt/ldt/user/migrations/0001_initial.py=utf-8
+encoding//src/ldt/ldt/user/migrations/0008_auto__chg_field_groupprofile_image__chg_field_groupprofile_group__chg_.py=utf-8
+encoding//virtualenv/web/env/guardianenv/Lib/site-packages/guardian/migrations/0001_initial.py=utf-8
+encoding/<project>=UTF-8
diff -r a6a37775a76d -r c2d9d1c6c228 src/ldt/ldt/ldt_utils/views/front.py
--- a/src/ldt/ldt/ldt_utils/views/front.py	Sat Dec 01 02:15:38 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/front.py	Wed Nov 28 12:31:27 2012 +0100
@@ -11,6 +11,9 @@
 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 ldt.utils.url import absstatic
 import base64
 
 
@@ -143,7 +146,9 @@
     search = ''
     field = 'all'
     content_tag = None
-    
+    colorurl=absstatic(request, "ldt/swf/ldt/pkg/color.xml")
+    i18nurl=absstatic(request, "ldt/swf/ldt/pkg/i18n")
+    baseurl=absstatic(request, "ldt/swf/ldt/")
     sform = SearchForm(request.GET)
     if sform.is_valid():
         search = sform.cleaned_data["search"]
@@ -156,7 +161,8 @@
             content_list = TaggedItem.objects.get_by_model(Content.objects.all(), '"'+content_tag+'"')
         results, nb = get_search_results(request, search, field, page, content_list)
 
-    return render_to_response('front/front_search_results.html', {'results': results, 'nb_results' : nb, 'search' : search, 'field': field, 'tag_label':content_tag, 'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/'}, context_instance=RequestContext(request))
+
+    return render_to_response('front/front_search_results.html', {'results': results, 'nb_results' : nb, 'search' : search, 'field': field, 'tag_label':content_tag, 'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl}, context_instance=RequestContext(request))
 
 
 
diff -r a6a37775a76d -r c2d9d1c6c228 src/ldt/ldt/ldt_utils/views/lignesdetemps.py
--- a/src/ldt/ldt/ldt_utils/views/lignesdetemps.py	Sat Dec 01 02:15:38 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/lignesdetemps.py	Wed Nov 28 12:31:27 2012 +0100
@@ -10,17 +10,22 @@
 from ldt.security.utils import set_forbidden_stream
 from ldt.ldt_utils.stat import update_stat_project
 from ldt.ldt_utils.searchutils import search_generate_ldt
+from ldt.utils.url import absstatic
 import base64
 import django.core.urlresolvers
 import lxml.etree
-
+from django.contrib.sites.models import Site
+from django.template import Context, Template
   
 def search_index_get(request, field, query):
     
     language_code = request.LANGUAGE_CODE[:2]
     
     url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.lignesdetemps.search_init", args=[field, query])
-    return render_to_response('ldt/ldt_utils/init_ldt.html', {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': url}, context_instance=RequestContext(request))
+    colorurl=absstatic(request, "ldt/swf/ldt/pkg/color.xml")
+    i18nurl=absstatic(request, "ldt/swf/ldt/pkg/i18n")
+    baseurl=absstatic(request, "ldt/swf/ldt/")
+    return render_to_response('ldt/ldt_utils/init_ldt.html', {'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl, 'url': url}, context_instance=RequestContext(request))
 
 def search_init(request, field, query):
     
@@ -82,8 +87,10 @@
     language_code = request.LANGUAGE_CODE[:2]
     readonly = 'true'
     template_path = 'ldt/ldt_utils/init_ldt.html'
-    
-    return render_to_response(template_path, {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': url_str, 'posturl': post_url, 'id': id, 'readonly': readonly}, context_instance=RequestContext(request))
+    colorurl=absstatic(request, "ldt/swf/ldt/pkg/color.xml")
+    i18nurl=absstatic(request, "ldt/swf/ldt/pkg/i18n")
+    baseurl=absstatic(request, "ldt/swf/ldt/")
+    return render_to_response(template_path, {'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl, 'url': url_str, 'posturl': post_url, 'id': id, 'readonly': readonly}, context_instance=RequestContext(request))
     
 def init_segment(request, project_id, content_id, ensemble_id, cutting_id, segment_id):
 
@@ -179,7 +186,9 @@
     urlStr = settings.WEB_URL + reverse("ldt.ldt_utils.views.lignesdetemps.init", args=['ldt_project', id])
     posturl = settings.WEB_URL + reverse("ldt.ldt_utils.views.lignesdetemps.save_ldt_project")
     language_code = request.LANGUAGE_CODE[:2]
-    
+    colorurl=absstatic(request, "ldt/swf/ldt/pkg/color.xml")
+    i18nurl=absstatic(request, "ldt/swf/ldt/pkg/i18n")
+    baseurl=absstatic(request, "ldt/swf/ldt/")
     try:
         ldt = Project.safe_objects.get(ldt_id=id)
     except Project.DoesNotExist:
@@ -195,7 +204,7 @@
     else:
         template_path = 'ldt/ldt_utils/init_ldt.html'
   
-    return render_to_response(template_path, {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': urlStr, 'posturl': posturl, 'id': id, 'readonly': readonly}, context_instance=RequestContext(request))
+    return render_to_response(template_path, {'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl, 'url': urlStr, 'posturl': posturl, 'id': id, 'readonly': readonly}, context_instance=RequestContext(request))
     
     
 def init(request, method, url):
@@ -314,8 +323,10 @@
     
     urlStr = settings.WEB_URL + reverse("ldt.ldt_utils.views.lignesdetemps.init", args=['ldt', url])
     language_code = request.LANGUAGE_CODE[:2]
-    
-    return render_to_response('ldt/ldt_utils/init_ldt.html', {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': urlStr, 'weburl':settings.WEB_URL + settings.BASE_URL}, context_instance=RequestContext(request))
+    colorurl=absstatic(request, "ldt/swf/ldt/pkg/color.xml")
+    i18nurl=absstatic(request, "ldt/swf/ldt/pkg/i18n")
+    baseurl=absstatic(request, "ldt/swf/ldt/")
+    return render_to_response('ldt/ldt_utils/init_ldt.html', {'colorurl': colorurl, 'i18nurl': i18nurl, 'language': language_code, 'baseurl': baseurl, 'url': urlStr, 'weburl':settings.WEB_URL + settings.BASE_URL}, context_instance=RequestContext(request))
 
 
 def ldt(request, url, startSegment=None): 
diff -r a6a37775a76d -r c2d9d1c6c228 src/ldt/ldt/ldt_utils/views/workspace.py
--- a/src/ldt/ldt/ldt_utils/views/workspace.py	Sat Dec 01 02:15:38 2012 +0100
+++ b/src/ldt/ldt/ldt_utils/views/workspace.py	Wed Nov 28 12:31:27 2012 +0100
@@ -3,7 +3,7 @@
 from django.contrib.auth.models import Group
 from django.core.urlresolvers import reverse#, resolve
 from django.core.paginator import Paginator, InvalidPage, EmptyPage
-from django.http import HttpResponseForbidden
+from django.http import HttpResponseForbidden, HttpResponse
 from ldt.indexation import get_results_with_context, highlight_documents
 from django.shortcuts import render_to_response
 from django.template import RequestContext
@@ -11,18 +11,23 @@
 from django.utils.html import escape
 from django.utils.translation import ugettext as _
 from ldt.ldt_utils.forms import SearchForm
+from ldt.utils.url import absstatic
 from ldt.ldt_utils.models import Content, Project, Segment
 from ldt.ldt_utils.utils import boolean_convert
 from ldt.ldt_utils.projectserializer import ProjectJsonSerializer
 from ldt.ldt_utils.views.content import get_contents_page, get_content_tags
 from ldt.ldt_utils.views.project import get_projects_page, get_published_projects_page
 from ldt.security.utils import add_change_attr, get_userlist
+from ldt.templatetags import absurl
 from operator import itemgetter
 from itertools import groupby
 import base64
 import django.core.urlresolvers
 import ldt.auth as ldt_auth
 from django.utils.safestring import mark_safe
+from django.contrib.sites.models import Site
+from django.template import Context, Template
+import logging
 
 
 
@@ -93,7 +98,6 @@
     json_url = request.GET.get("json_url")
     player_id = request.GET.get("player_id")
     ldt_id = request.GET.get("ldt_id")
-    
     rend_dict = get_datas_for_embed(request, json_url, player_id, ldt_id)
     
     embed_rendered = dict((typestr,
@@ -101,7 +105,6 @@
                            for typestr in ('seo_body', 'seo_meta', 'links'))
 
     rend_dict['embed_rendered'] = embed_rendered
-
     return render_to_response("ldt/ldt_utils/embed_popup.html", rend_dict, context_instance=RequestContext(request))
 
 
@@ -197,15 +200,13 @@
     if not ldt_auth.check_access(request.user, project):
         return HttpResponseForbidden(_("You can not access this project"))
     WEB_URL=settings.WEB_URL
-    LDT_MEDIA_PREFIX=settings.LDT_MEDIA_PREFIX
     LANGUAGE_CODE=settings.LANGUAGE_CODE
     ps = ProjectJsonSerializer(project, from_contents=True, from_display=True)
     annotations = ps.get_annotations(first_cutting=True)
     rend_dict = {'json_url':json_url, 'player_id':player_id, 'annotations':annotations, 'ldt_id': ldt_id, 'stream_mode': stream_mode, 
                 'external_url': external_url,
                  'polemic':False, 'show_mic_record':False, 'annotations_list':False, 'iframe_url':iframe_url, 'WEB_URL':WEB_URL,
-                  'LDT_MEDIA_PREFIX':LDT_MEDIA_PREFIX, 'LANGUAGE_CODE':LANGUAGE_CODE}
-    
+                'LANGUAGE_CODE':LANGUAGE_CODE}
     return rend_dict
 
 
@@ -241,8 +242,9 @@
     results = []
     search = ''
     field = 'all'
-    
-        
+    colorurl=absstatic(request, "ldt/swf/ldt/pkg/color.xml")
+    i18nurl=absstatic(request, "ldt/swf/ldt/pkg/i18n")
+    baseurl=absstatic(request, "ldt/swf/ldt/")
     sform = SearchForm(request.GET)
     if sform.is_valid():
         search = sform.cleaned_data["search"]
@@ -250,14 +252,13 @@
         field = sform.cleaned_data["field"]
         page = sform.cleaned_data["page"] or 1
         ldt_pres = sform.cleaned_data["ldt_pres"]
-        
         if ldt_pres:
             url = settings.WEB_URL + django.core.urlresolvers.reverse("ldt.ldt_utils.views.lignesdetemps.search_init", args=[field, queryStr])
-            return render_to_response('ldt/ldt_utils/init_ldt_full.html', {'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/', 'url': url}, context_instance=RequestContext(request))
-        else:                                            
+            return render_to_response('ldt/ldt_utils/init_ldt_full.html', {'colorurl': colorurl, 'i18nurl': i18nurl , 'language': language_code, 'baseurl': baseurl, 'url': url}, context_instance=RequestContext(request))
+        else:                                        
             results, nb = get_search_results(request, search, field, page)            
             
-    return render_to_response('ldt/ldt_utils/search_results.html', {'results': results, 'nb_results' : nb, 'search' : search, 'field': field, 'LDT_MEDIA_PREFIX': settings.LDT_MEDIA_PREFIX, 'colorurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/color.xml', 'i18nurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/pkg/i18n', 'language': language_code, 'baseurl': settings.LDT_MEDIA_PREFIX + 'swf/ldt/'}, context_instance=RequestContext(request))
+    return render_to_response('ldt/ldt_utils/search_results.html', {'results': results, 'nb_results' : nb, 'search' : search, 'field': field, 'colorurl': colorurl, 'i18nurl': i18nurl , 'language': language_code, 'baseurl': baseurl}, context_instance=RequestContext(request))
         
  
 def get_search_results(request, search, field, page, content_list=None):
diff -r a6a37775a76d -r c2d9d1c6c228 src/ldt/ldt/management/commands/initsitedomain.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/ldt/ldt/management/commands/initsitedomain.py	Wed Nov 28 12:31:27 2012 +0100
@@ -0,0 +1,24 @@
+from django.core.management.base import BaseCommand
+from ldt.ldt_utils.models import Content, Project
+from ldt.ldt_utils.contentindexer import ContentIndexer, ProjectIndexer
+from django.conf import settings
+from django.db import models
+from django.contrib.sites.models import Site
+
+class Command(BaseCommand):
+    help = 'set the site domain to the right value according to the django settings'
+    
+    def handle(self, *args, **options):
+        site = Site.objects.get(id=settings.SITE_ID)
+        web_url = settings.WEB_URL
+        if (web_url.startswith("http://")):
+            domain_area = web_url.split("//",1)
+            domain = domain_area[1]
+        else:
+            domain=web_url
+        if site.domain!=domain:
+            site.domain = domain
+            site.save()
+        if site.name!=domain:
+            site.name=domain
+            site.save()
\ No newline at end of file
diff -r a6a37775a76d -r c2d9d1c6c228 src/ldt/ldt/utils/url.py
--- a/src/ldt/ldt/utils/url.py	Sat Dec 01 02:15:38 2012 +0100
+++ b/src/ldt/ldt/utils/url.py	Wed Nov 28 12:31:27 2012 +0100
@@ -1,8 +1,19 @@
+from django.contrib.staticfiles.storage import staticfiles_storage
+from django.contrib.sites.models import Site
 from ldt import settings
 import httplib2
 import re
 import urlparse
 
+
+def absstatic(request, path):
+    if request.is_secure():
+        domain = "https://%s" % Site.objects.get_current().domain
+    else:
+        domain = "http://%s" % Site.objects.get_current().domain
+    new_path = staticfiles_storage.url(path)
+    return urlparse.urljoin(domain, new_path)
+
 def request_with_auth(url, method='GET'):
     h = httplib2.Http()
     web_auth = settings.WEB_AUTH if settings.WEB_AUTH else []
diff -r a6a37775a76d -r c2d9d1c6c228 web/ldtplatform/templates/registration/login.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/web/ldtplatform/templates/registration/login.html	Wed Nov 28 12:31:27 2012 +0100
@@ -0,0 +1,56 @@
+{% extends "registration/base.html" %}
+{% load i18n %}
+{% load absstatic %}
+{% load static %}
+
+{% block css_import %}
+	{{ 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>
+   {% endif %}
+  	<div class="span-24 last">
+        <form action="" method='post' id="login-form">
+        	<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>
+                <li><a href="{% url django.contrib.auth.views.password_reset  %}" >{% trans "Forget password?" %}</a></li>
+            </ul>
+            <div id="submitcontent-buttons-login" class="span-24 last">
+                <button class="button"type="submit" value="login">{% trans "login" %}</button>
+            </div>
+            </div>
+	    </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='{% 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> 
+
+{% endblock %}
+
+
+