Merge branch 'dev' of /var/git/teleforma into prodev

Conflicts:
	teleforma/context_processors.py
	teleforma/templatetags/teleforma_tags.py

diff --cc teleforma/templatetags/teleforma_tags.py
index 341fd2709e8922092afa93c822c34efaea20f96a,56c245726147ce6158f25b3615e1a3fdee1093fb..50b60b1ad4d188a1248e98dd41a40eb839d54681
--- 1/teleforma/templatetags/teleforma_tags.py
--- 2/teleforma/templatetags/teleforma_tags.py
+++ b/teleforma/templatetags/teleforma_tags.py
@@@ -194,105 -193,7 +194,105 @@@ def get_video_id(media)
      return
  
  @register.filter
- def get_host(url, host):
+ def set_host(url, host):
      u = urlparse(url)
 -    return u.scheme + '://' + host + ':' + str(u.port) + u.path
 -    
 +    if host == '127.0.0.1' or host == 'localhost':
 +        nu = u.scheme + '://' + host + ':' + str(u.port) + u.path
 +        return nu
 +    else:
 +        return url
 +
 +@register.filter
 +def mult(value, arg):
 +    "Multiplies the arg and the value"
 +    return int(value) * int(arg)
 +
 +@register.filter
 +def sub(value, arg):
 +    "Subtracts the arg from the value"
 +    return int(value) - int(arg)
 +
 +@register.filter
 +def div(value, arg):
 +    "Divides the value by the arg"
 +    return int(value) / int(arg)
 +
 +@register.filter
 +def submitted(question, user):
 +    answers = Answer.objects.filter(question=question, user=user, status=3)
 +    if answers:
 +        return answers[0].date_submitted
 +    else:
 +        return ''
 +
 +@register.filter
 +def saved(question, user):
 +    answers = Answer.objects.filter(question=question, user=user, status=2)
 +    if answers:
 +        return answers[0].date_submitted
 +    else:
 +        return ''
 +
 +@register.filter
 +def validated(question, user):
 +    answers = Answer.objects.filter(question=question, user=user, status=3, validated=True)
 +    if answers:
 +        return answers[0].date_validated
 +    else:
 +        return ''
 +
 +@register.filter
 +def summary(text, N):
 +    return text[:N] + '...'
 +    
 +@register.filter
 +def progress(seminar, user):
 +    return seminar_progress(user, seminar)
 +    
 +@register.filter
 +def in_download_formats(file):
 +    ext = os.path.splitext(file)[1][1:]
 +    return ext in settings.TELEMETA_DOWNLOAD_FORMATS
 +    
 +@register.filter
 +def user_seminars(user):
 +    return all_seminars(user)['all_seminars']
 +
 +@register.filter
 +def free_first(qs):
 +    free_formats = ['webm', 'ogg']
 +    medias = []
 +    for media in qs:
 +        if 'webm' in media.mime_type or 'ogg' in media.mime_type:
 +            medias.insert(0, media)
 +        else:
 +            medias.append(media)
 +    return medias
 +
 +@register.simple_tag
 +def admin_username():
 +    return settings.ADMIN_USERNAME
 +
 +@register.filter
 +def hours(time):
 +    return str(int(str(time).split(':')[0]))
 +
 +@register.filter
 +def point(time):
 +    return str(time)
 +
 +@register.filter
 +def preview(related):
 +    return related.filter(title='preview')[0]
 +
 +@register.filter
 +def fancy_duration(duration):
 +    time = ''
 +    d = unicode(duration).split(':')
 +    hours = int(d[0])
 +    minutes = int(d[1])
 +    if hours:
 +        time += str(hours) + 'h'
 +    time += str(minutes) + 'mn'
 +    return time
 +    

diff --cc teleforma/views/core.py
Simple merge