# HG changeset patch # User veltr # Date 1354113824 -3600 # Node ID 4360509f98e49d8c244e1935761fb083396495ca # Parent f2686ce658fd7f424e04003c6be2f13d303455df# Parent 45416f40602e45c606320f5447c9abfdef277eff Merge with 45416f40602e45c606320f5447c9abfdef277eff diff -r f2686ce658fd -r 4360509f98e4 src/hashcut/static/hashcut/bpi/css/common.css --- a/src/hashcut/static/hashcut/bpi/css/common.css Wed Nov 28 15:43:28 2012 +0100 +++ b/src/hashcut/static/hashcut/bpi/css/common.css Wed Nov 28 15:43:44 2012 +0100 @@ -171,24 +171,36 @@ } .header .profil-wrap a{ width: 160px; - display: block; + display: inline-block; text-align: right; - position: absolute; right: 0; - font-size: 14px; + font-size: 13px; color: #30036d; padding-right: 18px; } +.profil-wrap li{ + text-align: right; + line-height: 18px; +} .header .profil-wrap a:hover{ color: #FF00FC; } -.header .profil-wrap a.all-hashcut{ - top: 12px; - background: url(../img/arrow-top.png) right 2px no-repeat; +a.all-hashcut{ + top: 2px; + background: url(../img/arrow-top.png) right 3px no-repeat; +} +a.my-profil{ + top: 42px; + background: url(../img/arrow-bot.png) right 6px no-repeat; } -.header .profil-wrap a.my-profil{ - top: 32px; - background: url(../img/arrow-bot.png) right 4px no-repeat; +.space-top{ + padding-top: 10px; +} +.space-top-2{ + padding-top: 30px; +} +a.new-hashcut{ + background: url(../img/pencil-icon.png) right 3px no-repeat; } /* content */ .content{ @@ -204,6 +216,9 @@ } .pointer{ position: absolute; + width: 20px; + height: 13px; + background: url(../img/popin-triangle.png); top: 0; } .popin-content{ @@ -233,10 +248,10 @@ } .user.popin{ - top: 48px; + top: 55px; right: 0; } -.user.popin img.pointer{ +.user.popin .pointer{ right: 36px; } .button { diff -r f2686ce658fd -r 4360509f98e4 src/hashcut/static/hashcut/bpi/css/home.css --- a/src/hashcut/static/hashcut/bpi/css/home.css Wed Nov 28 15:43:28 2012 +0100 +++ b/src/hashcut/static/hashcut/bpi/css/home.css Wed Nov 28 15:43:44 2012 +0100 @@ -9,6 +9,8 @@ font-size: 24px; text-decoration: underline; font-weight: bold; + background: url(../img/pencil-icon.png) right 12px no-repeat; + padding-right: 22px; } .title-header h2 a:hover{ text-decoration: none; @@ -20,8 +22,6 @@ margin-right: 0; } - - .last .video-item:nth-child(4n+4){ margin-right: 0; } @@ -49,39 +49,41 @@ .definition p a:hover{ text-decoration: none; } -.how-to li{ +.how-to li{ background-image: url(../img/how-to-sprite.png); background-repeat: no-repeat; margin-bottom: 2px; } -.how-to li h3{ - color: #de2500; +.how-to h3{ font-size: 18px; font-weight: bold; margin-bottom: 12px; } -.how-to li p{ +.how-to h3 a{ + color: #de2500; +} + +.how-to h3 a:hover{ + text-decoration: underline; +} +.how-to p{ font-size: 12px; word-wrap: break-word; width: 210px; } -.how-to li.inscription{ +.inscription{ height: 84px; background-position: 212px 0; } -.how-to li.creation{ +.creation{ height: 100px; background-position: 212px -128px; } -.how-to li.creation{ - height: 100px; - background-position: 212px -128px; -} -.how-to li.publier{ +.publier{ height: 90px; background-position: 212px -266px; } -.how-to li.next-step{ +.next-step{ height: 24px; background-position: 212px -377px; } \ No newline at end of file diff -r f2686ce658fd -r 4360509f98e4 src/hashcut/static/hashcut/iri/css/home.css --- a/src/hashcut/static/hashcut/iri/css/home.css Wed Nov 28 15:43:28 2012 +0100 +++ b/src/hashcut/static/hashcut/iri/css/home.css Wed Nov 28 15:43:44 2012 +0100 @@ -27,6 +27,7 @@ } .last .video-item{ width: 140px; + height: 130px; float: left; margin: 0 20px 12px 0; } diff -r f2686ce658fd -r 4360509f98e4 src/hashcut/templates/bpi_mashup_edit.html --- a/src/hashcut/templates/bpi_mashup_edit.html Wed Nov 28 15:43:28 2012 +0100 +++ b/src/hashcut/templates/bpi_mashup_edit.html Wed Nov 28 15:43:44 2012 +0100 @@ -13,79 +13,10 @@ {% block wrap_header %}
- - - -
- -
-

Mashup75

-

mash@cinecast.fr

- 12 Hashcuts -

- -

-
-
- - - - - - - + {% include 'partial/bpi_mashup_popin_user.html' %}
- +

@@ -101,10 +32,8 @@

-

- Hashcut - Le Mashup
Cliquable -

+ {% include 'partial/bpi_hashcut_logo.html' %} +

Hashcut sans titre @@ -112,9 +41,11 @@

Durée: 00:00

- Tous les Hashcuts - Mon profil -
+ +
{% endblock %} @@ -191,7 +122,7 @@
- +
@@ -262,7 +193,7 @@
- +
    @@ -323,8 +254,7 @@ {% endblock %} {% block js_import %} - - +{{ block.super }} @@ -335,15 +265,22 @@ project: "{% url api_dispatch_list api_name='1.0' resource_name='projects' %}", segment: "{% url api_dispatch_list api_name='1.0' resource_name='segments' %}", ldt: "{% url projectjson_id id='' %}", - hashcut_page: "hashcut.html?project=" + hashcut_page: "{% url mashup_hashcut branding=branding ldt_id='' %}", + csrf_token: "{{csrf_token}}" }; $(function() { + IriSP.video_url_transform = function(oldurl) { + var newurl = oldurl.replace(/mp4:/i,''); + newurl = newurl.replace(/ddc_player\//i,''); + newurl = newurl.replace(/rtmp/i,'http'); + return newurl; + }; var hashcut = IriSP.editor({ - //url: "data/bpidata.json", - //url: "data/moon-local.json", - filter: { - tags__icontains: "Mash Up 2012" - } + //url: "data/bpidata.json", + //url: "data/moon-local.json", + filter: { + tags__icontains: "BPI" + } }); }); diff -r f2686ce658fd -r 4360509f98e4 src/hashcut/templates/bpi_mashup_hashcut.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hashcut/templates/bpi_mashup_hashcut.html Wed Nov 28 15:43:44 2012 +0100 @@ -0,0 +1,190 @@ +{% extends "bpi_mashup_home.html" %} +{% load static %} +{% load i18n %} +{% load analytics %} +{% load thumbnail %} + {% block title %}Hashcut Playing - BPI{% endblock %} + {% block css_import %} + {{ block.super }} + + {% endblock %} + +{% block wrap_header %} +
    +
    + {% include 'partial/bpi_mashup_popin_user.html' %} + {% include 'partial/bpi_hashcut_logo.html' %} +
    +
    +
    + + + +
    Copier
    +     +
    + + + + +
    +

    Hashcut sans titre

    +
    +
    + +
    +
    +
    +{% endblock %} + +{% block content %} +
    +
    +

    Lire le Hashcut

    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    00:00
    +
    /
    +
    1:03:30
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +
    +
    +
    +
    +

    Segment sans titre

    + + + + + + + + + + + + + + + +
    Extrait de : ( - )
    Description :
    Tags :
    +
    +
    +
    +
    + +
    +

    Plus d’informations

    +
    + + + + + + + + + + + + + + + + + + + + +
    Titre :Titre du Hashcut
    Durée :
    Auteur :
    Description :
    + +
    +

    Médias utilisés dans le Hashcut

    +
      + +
    +
    +
    +{% endblock %} + +{% block js_import %} +{{ block.super }} + + + + + +{% endblock %} + diff -r f2686ce658fd -r 4360509f98e4 src/hashcut/templates/bpi_mashup_home.html --- a/src/hashcut/templates/bpi_mashup_home.html Wed Nov 28 15:43:28 2012 +0100 +++ b/src/hashcut/templates/bpi_mashup_home.html Wed Nov 28 15:43:44 2012 +0100 @@ -8,6 +8,7 @@ {% block head %} + {% block title %}Hashcut Home - BPI{% endblock %} @@ -36,85 +37,15 @@ {% block wrap_header %}
    - - - - - - - - - - -

    - Hashcut - Le Mashup
    Cliquable     -

    + {% include 'partial/bpi_mashup_popin_user.html' %} + {% include 'partial/bpi_hashcut_logo.html' %}

    Créer un hashcut !

    - - Mon profil +
    diff -r f2686ce658fd -r 4360509f98e4 src/hashcut/templates/partial/bpi_hashcut_logo.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hashcut/templates/partial/bpi_hashcut_logo.html Wed Nov 28 15:43:44 2012 +0100 @@ -0,0 +1,5 @@ +{% load static %} +

    + Hashcut + Le Mashup
    Cliquable     +

    \ No newline at end of file diff -r f2686ce658fd -r 4360509f98e4 src/hashcut/templates/partial/bpi_mashup_popin_user.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/hashcut/templates/partial/bpi_mashup_popin_user.html Wed Nov 28 15:43:44 2012 +0100 @@ -0,0 +1,68 @@ + + +
    +
    +
    +

    Mashup75

    +

    mash@cinecast.fr

    + 12 Hashcuts +

    + +

    +
    +
    + + + + + + \ No newline at end of file diff -r f2686ce658fd -r 4360509f98e4 src/hashcut/urls.py --- a/src/hashcut/urls.py Wed Nov 28 15:43:28 2012 +0100 +++ b/src/hashcut/urls.py Wed Nov 28 15:43:44 2012 +0100 @@ -1,8 +1,9 @@ from django.conf.urls.defaults import patterns, url -from hashcut.views import MashupHome, MashupEdit +from hashcut.views import MashupHome, MashupEdit, MashupHashcut urlpatterns = patterns('', url(r'^(?P.*)/edit/$', MashupEdit.as_view(), name="mashup_edit"), + url(r'^(?P.*)/hashcut/(?P.*)/$', MashupHashcut.as_view(), name="mashup_hashcut"), url(r'^(?P.*)/$', MashupHome.as_view(), name="mashup_home"), url(r'^$', MashupHome.as_view()), ) diff -r f2686ce658fd -r 4360509f98e4 src/hashcut/views.py --- a/src/hashcut/views.py Wed Nov 28 15:43:28 2012 +0100 +++ b/src/hashcut/views.py Wed Nov 28 15:43:44 2012 +0100 @@ -24,7 +24,6 @@ # the branding template is supposed to override the default template. So we insert instead of append if self.branding and self.branding != "": - #names.insert(0,"%s_%s" % (self.branding, self.template_name)) names.insert(0,"%s_%s" % (self.branding, self.template_suffix)) return names @@ -61,7 +60,6 @@ # the branding template is supposed to override the default template. So we insert instead of append if self.branding and self.branding != "": - #names.insert(0,"%s_%s" % (self.branding, self.template_name)) names.insert(0,"%s_%s" % (self.branding, self.template_suffix)) return names @@ -72,6 +70,38 @@ context = {"branding":self.branding} return self.render_to_response(context) + + +class MashupHashcut(TemplateResponseMixin, View): + + # iri = default brand name + branding = "iri" + template_suffix = "mashup_hashcut.html" + template_name = "iri_mashup_hashcut.html" + + def get_template_names(self): + """ + Return a list of template names to be used for the request. Must return + a list. May not be called if get_template is overridden. + """ + try: + names = super(MashupHashcut, self).get_template_names() + except ImproperlyConfigured: + raise ImproperlyConfigured("Class MashupHashcut requires either a definition of 'template_name'") + + # the branding template is supposed to override the default template. So we insert instead of append + if self.branding and self.branding != "": + names.insert(0,"%s_%s" % (self.branding, self.template_suffix)) + + return names + + def get(self, request, branding="iri", ldt_id=None, **kwargs): + self.branding = branding + if not ldt_id: + return HttpResponseNotFound("A project id must be given.") + context = {"branding":self.branding, "ldt_id":ldt_id} + return self.render_to_response(context) +