--- a/integration/js/compile.bat Thu Nov 29 17:54:48 2012 +0100
+++ b/integration/js/compile.bat Thu Nov 29 19:28:10 2012 +0100
@@ -6,4 +6,6 @@
FOR %%f IN (%jsfiles%) DO (type %%f.js >> hashcut.js)
+copy hashcut.js ..\..\src\hashcut\static\hashcut\js
+
echo Hashcut.js compiled successfully!
--- a/integration/js/compile.sh Thu Nov 29 17:54:48 2012 +0100
+++ b/integration/js/compile.sh Thu Nov 29 19:28:10 2012 +0100
@@ -8,3 +8,5 @@
do
cat $jsfile.js >> hashcut.js
done
+
+cp hashcut.js ../../src/hashcut/static/hashcut/js
--- a/integration/js/mashupplayer.js Thu Nov 29 17:54:48 2012 +0100
+++ b/integration/js/mashupplayer.js Thu Nov 29 19:28:10 2012 +0100
@@ -20,8 +20,6 @@
IriSP.mashupcore(project, mashup);
project.trigger("set-current",mashup);
- $(".info-title a").text(mashup.title);
- $(".title-video-wrap .title-video").text(mashup.title);
$(".info-duration td").text(mashup.duration.toString());
$(".info-author a").text(mashup.creator);
$(".info-description td").text(mashup.description);
--- a/integration/js/mediaplayer.js Thu Nov 29 17:54:48 2012 +0100
+++ b/integration/js/mediaplayer.js Thu Nov 29 19:28:10 2012 +0100
@@ -125,8 +125,6 @@
content.trigger("set-current", media);
- $(".info-title a").text(media.title);
- $(".title-video-wrap .title-video").text(media.title);
$(".info-duration td").text(media.duration.toString());
$(".info-description td").text(media.description);
$(".info-tags td").text(media.keywords);
--- a/integration/js/social.js Thu Nov 29 17:54:48 2012 +0100
+++ b/integration/js/social.js Thu Nov 29 19:28:10 2012 +0100
@@ -1,15 +1,21 @@
-IriSP.social = function(sel, url) {
+IriSP.social = function(opts) {
+
+ var opts = opts || {};
+ opts.sel = opts.sel || $(".Ldt-Social");
+ opts.url = opts.url || document.location.href;
- var sel = sel || $(".Ldt-Social"),
- url = url || document.location.href,
- text = sel.find("title").text(),
+ if (opts.swf) {
+ ZeroClipboard.setMoviePath(opts.swf);
+ }
+
+ var text = opts.sel.find("title").text(),
clipId = IriSP.Model.getUID(),
clip;
- sel.find(".Ldt-Social-CopyBtn").attr("id", this.clipId);
+ opts.sel.find(".Ldt-Social-CopyBtn").attr("id", clipId);
- sel.find(".Ldt-Social-Url").click(function() {
- var _pop = sel.find(".Ldt-Social-UrlPop");
+ opts.sel.find(".Ldt-Social-Url").click(function() {
+ var _pop = opts.sel.find(".Ldt-Social-UrlPop");
_pop.toggle();
if (_pop.is(":visible")) {
if (typeof clip == "undefined") {
@@ -23,28 +29,28 @@
});
}
clip.show();
- clip.setText( url );
- sel.find(".Ldt-Social-Input").val(url).focus();
+ clip.setText( opts.url );
+ opts.sel.find(".Ldt-Social-Input").val(opts.url).focus();
} else {
clip.hide();
}
return false;
});
- sel.find(".Ldt-Social-Input").focus(function() {
+ opts.sel.find(".Ldt-Social-Input").focus(function() {
this.select();
});
- sel.find(".Ldt-Social-Ext").click(function() {
+ opts.sel.find(".Ldt-Social-Ext").click(function() {
window.open(
- sel.find(this).attr("href"),
+ opts.sel.find(this).attr("href"),
"_blank",
"height=300,width=450,left=100,top=100,toolbar=0,menubar=0,status=0,location=0");
return false;
});
- sel.find(".Ldt-Social-Fb").attr("href", "http://www.facebook.com/share.php?" + $.param({ u: url, t: text }));
- sel.find(".Ldt-Social-Twitter").attr("href", "https://twitter.com/intent/tweet?" + $.param({ url: url, text: text }));
- sel.find(".Ldt-Social-Gplus").attr("href", "https://plus.google.com/share?" + $.param({ url: url, title: text }));
- sel.find(".Ldt-Social-Mail").attr("href", "mailto:?" + $.param({ subject: text, body: text + ": " + url }));
+ opts.sel.find(".Ldt-Social-Fb").attr("href", "http://www.facebook.com/share.php?" + $.param({ u: opts.url, t: text }));
+ opts.sel.find(".Ldt-Social-Twitter").attr("href", "https://twitter.com/intent/tweet?" + $.param({ url: opts.url, text: text }));
+ opts.sel.find(".Ldt-Social-Gplus").attr("href", "https://plus.google.com/share?" + $.param({ url: opts.url, title: text }));
+ opts.sel.find(".Ldt-Social-Mail").attr("href", "mailto:?" + $.param({ subject: text, body: text + ": " + opts.url }));
}
/* END social.js */
--- a/src/hashcut/static/hashcut/js/hashcut.js Thu Nov 29 17:54:48 2012 +0100
+++ b/src/hashcut/static/hashcut/js/hashcut.js Thu Nov 29 19:28:10 2012 +0100
@@ -3151,8 +3151,6 @@
IriSP.mashupcore(project, mashup);
project.trigger("set-current",mashup);
- $(".info-title a").text(mashup.title);
- $(".title-video-wrap .title-video").text(mashup.title);
$(".info-duration td").text(mashup.duration.toString());
$(".info-author a").text(mashup.creator);
$(".info-description td").text(mashup.description);
@@ -3357,8 +3355,6 @@
content.trigger("set-current", media);
- $(".info-title a").text(media.title);
- $(".title-video-wrap .title-video").text(media.title);
$(".info-duration td").text(media.duration.toString());
$(".info-description td").text(media.description);
$(".info-tags td").text(media.keywords);
@@ -3389,18 +3385,24 @@
/* END mediaplayer.js */
-IriSP.social = function(sel, url) {
+IriSP.social = function(opts) {
+
+ var opts = opts || {};
+ opts.sel = opts.sel || $(".Ldt-Social");
+ opts.url = opts.url || document.location.href;
- var sel = sel || $(".Ldt-Social"),
- url = url || document.location.href,
- text = sel.find("title").text(),
+ if (opts.swf) {
+ ZeroClipboard.setMoviePath(opts.swf);
+ }
+
+ var text = opts.sel.find("title").text(),
clipId = IriSP.Model.getUID(),
clip;
- sel.find(".Ldt-Social-CopyBtn").attr("id", this.clipId);
+ opts.sel.find(".Ldt-Social-CopyBtn").attr("id", clipId);
- sel.find(".Ldt-Social-Url").click(function() {
- var _pop = sel.find(".Ldt-Social-UrlPop");
+ opts.sel.find(".Ldt-Social-Url").click(function() {
+ var _pop = opts.sel.find(".Ldt-Social-UrlPop");
_pop.toggle();
if (_pop.is(":visible")) {
if (typeof clip == "undefined") {
@@ -3414,28 +3416,28 @@
});
}
clip.show();
- clip.setText( url );
- sel.find(".Ldt-Social-Input").val(url).focus();
+ clip.setText( opts.url );
+ opts.sel.find(".Ldt-Social-Input").val(opts.url).focus();
} else {
clip.hide();
}
return false;
});
- sel.find(".Ldt-Social-Input").focus(function() {
+ opts.sel.find(".Ldt-Social-Input").focus(function() {
this.select();
});
- sel.find(".Ldt-Social-Ext").click(function() {
+ opts.sel.find(".Ldt-Social-Ext").click(function() {
window.open(
- sel.find(this).attr("href"),
+ opts.sel.find(this).attr("href"),
"_blank",
"height=300,width=450,left=100,top=100,toolbar=0,menubar=0,status=0,location=0");
return false;
});
- sel.find(".Ldt-Social-Fb").attr("href", "http://www.facebook.com/share.php?" + $.param({ u: url, t: text }));
- sel.find(".Ldt-Social-Twitter").attr("href", "https://twitter.com/intent/tweet?" + $.param({ url: url, text: text }));
- sel.find(".Ldt-Social-Gplus").attr("href", "https://plus.google.com/share?" + $.param({ url: url, title: text }));
- sel.find(".Ldt-Social-Mail").attr("href", "mailto:?" + $.param({ subject: text, body: text + ": " + url }));
+ opts.sel.find(".Ldt-Social-Fb").attr("href", "http://www.facebook.com/share.php?" + $.param({ u: opts.url, t: text }));
+ opts.sel.find(".Ldt-Social-Twitter").attr("href", "https://twitter.com/intent/tweet?" + $.param({ url: opts.url, text: text }));
+ opts.sel.find(".Ldt-Social-Gplus").attr("href", "https://plus.google.com/share?" + $.param({ url: opts.url, title: text }));
+ opts.sel.find(".Ldt-Social-Mail").attr("href", "mailto:?" + $.param({ subject: text, body: text + ": " + opts.url }));
}
/* END social.js */
--- a/src/hashcut/templates/bpi_mashup_content.html Thu Nov 29 17:54:48 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_content.html Thu Nov 29 19:28:10 2012 +0100
@@ -1,10 +1,44 @@
-{% extends "bpi_mashup_edit.html" %}
+{% extends "bpi_mashup_home.html" %}
{% load static %}
{% load i18n %}
{% load analytics %}
{% load thumbnail %}
- {% block title %}Hashcut Media - BPI{% endblock %}
+ {% block title %}Lecture de la Vidéo '{{content.title}}'{% endblock %}
+ {% block css_page %}
+ <link rel="stylesheet" href="{% static 'hashcut/bpi/css/players.css' %}" />
+ {% endblock %}
+{% block wrap_header %}
+<div class="wrap-header">
+ <div class="header">
+ {% include 'partial/bpi_mashup_popin_user.html' %}
+ {% include 'partial/bpi_hashcut_logo.html' %}
+ <div class="title-video-wrap">
+ <div class="Ldt-Social">
+ <div class="Ldt-Social-Url-Container">
+ <a href="#" target="_blank" class="Ldt-Social-Square Ldt-Social-Url" title="Partager le lien"></a>
+ <span class="Ldt-Social-UrlPop">
+ <input class="Ldt-Social-Input"/>
+ <div class="Ldt-Social-CopyBtn">Copier</div>
+ </span>
+ </div>
+ <a href="#" target="_blank" class="Ldt-Social-Fb Ldt-Social-Ext" title="Partager sur Facebook"></a>
+ <a href="#" target="_blank" class="Ldt-Social-Twitter Ldt-Social-Ext" title="Partager sur Twitter"></a>
+ <a href="#" target="_blank" class="Ldt-Social-Gplus Ldt-Social-Ext" title="Partager sur Google+"></a>
+ <a href="#" target="_blank" class="Ldt-Social-Mail" title="Partager par mail"></a>
+ </div>
+ <p class="title-video" href="#">Media » {{content.title}}</p>
+ </div>
+ <div class="profil-wrap">
+ <ul>
+ <li><a href="{% url mashup_home branding=branding %}" class="all-hashcut">Tous les Hashcuts</a></li>
+ <li><a href="{% url mashup_edit branding=branding %}" class="new-hashcut">Créer un Hashcut</a></li>
+ <li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
+ </ul>
+ </div>
+ </div><!-- header -->
+</div><!-- wrap-header -->
+{% endblock %}
{% block content %}
<div class="content clearfix">
@@ -37,7 +71,7 @@
<div class="Ldt-Ctrl-Time">
<div title="Temps écoulé" class="Ldt-Ctrl-Time-Elapsed">00:00</div>
<div class="Ldt-Ctrl-Time-Separator">/</div>
- <div title="Temps total" class="Ldt-Ctrl-Time-Total">1:03:30</div>
+ <div title="Temps total" class="Ldt-Ctrl-Time-Total">00:00</div>
</div>
<div class="Ldt-Ctrl-spacer"></div>
<div title="Couper le son" class="Ldt-Ctrl-button Ldt-Ctrl-Sound Ldt-Ctrl-Sound-Full"></div>
@@ -59,7 +93,7 @@
<tbody>
<tr class="info-title">
<th>Titre :</th>
- <td><a href="#">Titre du Média</a></td>
+ <td><a href="#">{{content.title}}</a></td>
</tr>
<tr class="info-duration">
<th>Durée :</th>
@@ -112,7 +146,9 @@
IriSP.mediaplayer({
id: "{{ctt_id}}"
});
- IriSP.social();
+ IriSP.social({
+ swf: "{% static 'hashcut/lib/ZeroClipboard.swf' %}"
+ });
});
</script>
{% endblock %}
--- a/src/hashcut/templates/bpi_mashup_edit.html Thu Nov 29 17:54:48 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_edit.html Thu Nov 29 19:28:10 2012 +0100
@@ -3,9 +3,8 @@
{% load i18n %}
{% load analytics %}
{% load thumbnail %}
- {% block title %}Hashcut Edition - BPI{% endblock %}
- {% block css_import %}
- {{ block.super }}
+ {% block title %}Création de Hashcut{% endblock %}
+ {% block css_page %}
<link rel="stylesheet" href="{% static 'hashcut/lib/jquery.tagit.css' %}" />
<link rel="stylesheet" href="{% static 'hashcut/bpi/css/edition.css' %}" />
{% endblock %}
--- a/src/hashcut/templates/bpi_mashup_hashcut.html Thu Nov 29 17:54:48 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_hashcut.html Thu Nov 29 19:28:10 2012 +0100
@@ -3,9 +3,8 @@
{% load i18n %}
{% load analytics %}
{% load thumbnail %}
- {% block title %}Hashcut Playing - BPI{% endblock %}
- {% block css_import %}
- {{ block.super }}
+ {% block title %}Lecture du Hashcut '{{proj.title}}'{% endblock %}
+ {% block css_page %}
<link rel="stylesheet" href="{% static 'hashcut/bpi/css/players.css' %}" />
{% endblock %}
@@ -28,7 +27,7 @@
<a href="#" target="_blank" class="Ldt-Social-Gplus Ldt-Social-Ext" title="Partager sur Google+"></a>
<a href="#" target="_blank" class="Ldt-Social-Mail" title="Partager par mail"></a>
</div>
- <p class="title-video" href="#">Hashcut sans titre</p>
+ <p class="title-video" href="#">Hashcut » {{proj.title}}</p>
</div>
<div class="profil-wrap">
<ul>
@@ -71,7 +70,7 @@
<div class="Ldt-Ctrl-Time">
<div title="Temps écoulé" class="Ldt-Ctrl-Time-Elapsed">00:00</div>
<div class="Ldt-Ctrl-Time-Separator">/</div>
- <div title="Temps total" class="Ldt-Ctrl-Time-Total">1:03:30</div>
+ <div title="Temps total" class="Ldt-Ctrl-Time-Total">00:00</div>
</div>
<div class="Ldt-Ctrl-spacer"></div>
<div title="Couper le son" class="Ldt-Ctrl-button Ldt-Ctrl-Sound Ldt-Ctrl-Sound-Full"></div>
@@ -99,7 +98,7 @@
<div class="segment-info mashup-description">
<div class="pointer" style="left: 50%;"></div>
<div class="popin-content">
- <h2><span class="annotation-title">Segment sans titre</span></h2>
+ <h2><span class="annotation-title"></span></h2>
<table>
<tbody>
<tr>
@@ -128,7 +127,7 @@
<tbody>
<tr class="info-title">
<th>Titre :</th>
- <td><a href="#">Titre du Hashcut</a></td>
+ <td><a href="#">{{proj.title}}</a></td>
</tr>
<tr class="info-duration">
<th>Durée :</th>
@@ -142,13 +141,8 @@
<th>Description : </th>
<td></td>
</tr>
-<!-- <tr class="info-tags">
- <th>Tags : </th>
- <td>Mashup, Création, Art</td>
- </tr> -->
</tbody>
</table>
-<!-- <a href="#" class="button cloner">Cloner le Hashcut</a> -->
</div>
<h2>Médias utilisés dans le Hashcut</h2>
<ul class="list-video">
@@ -183,7 +177,9 @@
IriSP.mashupplayer({
id: "{{ldt_id}}"
});
- IriSP.social();
+ IriSP.social({
+ swf: "{% static 'hashcut/lib/ZeroClipboard.swf' %}"
+ });
});
</script>
{% endblock %}
--- a/src/hashcut/templates/bpi_mashup_home.html Thu Nov 29 17:54:48 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_home.html Thu Nov 29 19:28:10 2012 +0100
@@ -10,8 +10,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="description" content="Interface d'édition de Hashcuts (Mashups vidéo cliquables)" />
<meta name="copyright" content="Institut de Recherche et d'Innovation (IRI), 2012" />
- <meta name="author" content="Anthony Ly, Raphaël Velt" />
- <title>{% block title %}Hashcut Home - BPI{% endblock %}</title>
+ <meta name="author" content="Anthony Ly, Raphaël Velt, Thibaut Cavalié" />
+ <title>Hashcut BPI » {% block title %}Accueil{% endblock %}</title>
{% block css_declaration %}
{% endblock %}
@@ -19,6 +19,8 @@
<link rel="stylesheet" href="{% static 'hashcut/lib/jquery-ui.css' %}" />
<link rel="stylesheet" href="{% static 'hashcut/bpi/css/reset.css' %}" />
<link rel="stylesheet" href="{% static 'hashcut/bpi/css/common.css' %}" />
+ {% endblock %}
+ {% block css_page %}
<link rel="stylesheet" href="{% static 'hashcut/bpi/css/home.css' %}" />
{% endblock %}
@@ -97,24 +99,24 @@
<div class="right-content">
<div class="definition">
<h2>Hashcuts ?</h2>
- <p>Un <strong>Hashcut</strong> est à la fois une <a href="#">Hypervidéo</a> (ensemble de vidéos cliquable, permettant une navigation entre vidéos) et un <a href="#">Mashup</a> (mélange de médias, de l’anglais mash, «purée»).</p>
+ <p>Un <strong>Hashcut</strong> est à la fois une <a href="http://fr.wikipedia.org/wiki/Hypervid%C3%A9o" target="_blank">Hypervidéo</a> (vidéo cliquable) et un <a href="http://fr.wikipedia.org/wiki/Mashup_%28video%29" target="_blank">Mashup</a> (mélange de médias, de l’anglais mash, «purée»).</p>
<p>Un <strong>Hashcut</strong> est un assemblage de citations de vidéos, mises bout à bout, sans altération des médias d’origine, et permet à chacun de proposer un nouveau regard, une porte d’entrée éditorialisée sur ces médias.</p>
</div>
<div class="how-to">
<h2>Comment faire ?</h2>
<ul>
<li class="inscription">
- <h3>1. S’inscrire</h3>
+ <h3><a href="#">1. S’inscrire</a></h3>
<p>Commencez par créer votre espace personnel sur cette plateforme !</p>
</li>
<li class="next-step"></li>
<li class="creation">
- <h3>2. Créer un hashcut</h3>
+ <h3><a href="{% url mashup_edit branding=branding %}">2. Créer un hashcut</a></h3>
<p>Choisissez des médias, segmentez les, assemblez les segments et rajoutez des commentaires sur le Hashcut.</p>
</li>
<li class="next-step"></li>
<li class="publier">
- <h3>3. Publier et partager</h3>
+ <h3><a href="#">3. Publier et partager</a></h3>
<p>Une fois le hashcut terminé, publiez-le sur cette plateforme etpartagez votre création sur les réseaux sociaux</p>
</li>
</ul>
--- a/src/hashcut/templates/iri_mashup_content.html Thu Nov 29 17:54:48 2012 +0100
+++ b/src/hashcut/templates/iri_mashup_content.html Thu Nov 29 19:28:10 2012 +0100
@@ -1,10 +1,44 @@
-{% extends "iri_mashup_edit.html" %}
+{% extends "bpi_mashup_home.html" %}
{% load static %}
{% load i18n %}
{% load analytics %}
{% load thumbnail %}
- {% block title %}Hashcut Media - iri{% endblock %}
+ {% block title %}Lecture de la Vidéo '{{content.title}}'{% endblock %}
+ {% block css_page %}
+ <link rel="stylesheet" href="{% static 'hashcut/bpi/css/players.css' %}" />
+ {% endblock %}
+{% block wrap_header %}
+<div class="wrap-header">
+ <div class="header">
+ {% include 'partial/bpi_mashup_popin_user.html' %}
+ {% include 'partial/bpi_hashcut_logo.html' %}
+ <div class="title-video-wrap">
+ <div class="Ldt-Social">
+ <div class="Ldt-Social-Url-Container">
+ <a href="#" target="_blank" class="Ldt-Social-Square Ldt-Social-Url" title="Partager le lien"></a>
+ <span class="Ldt-Social-UrlPop">
+ <input class="Ldt-Social-Input"/>
+ <div class="Ldt-Social-CopyBtn">Copier</div>
+ </span>
+ </div>
+ <a href="#" target="_blank" class="Ldt-Social-Fb Ldt-Social-Ext" title="Partager sur Facebook"></a>
+ <a href="#" target="_blank" class="Ldt-Social-Twitter Ldt-Social-Ext" title="Partager sur Twitter"></a>
+ <a href="#" target="_blank" class="Ldt-Social-Gplus Ldt-Social-Ext" title="Partager sur Google+"></a>
+ <a href="#" target="_blank" class="Ldt-Social-Mail" title="Partager par mail"></a>
+ </div>
+ <p class="title-video" href="#">Media » {{content.title}}</p>
+ </div>
+ <div class="profil-wrap">
+ <ul>
+ <li><a href="{% url mashup_home branding=branding %}" class="all-hashcut">Tous les Hashcuts</a></li>
+ <li><a href="{% url mashup_edit branding=branding %}" class="new-hashcut">Créer un Hashcut</a></li>
+ <li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
+ </ul>
+ </div>
+ </div><!-- header -->
+</div><!-- wrap-header -->
+{% endblock %}
{% block content %}
<div class="content clearfix">
@@ -37,7 +71,7 @@
<div class="Ldt-Ctrl-Time">
<div title="Temps écoulé" class="Ldt-Ctrl-Time-Elapsed">00:00</div>
<div class="Ldt-Ctrl-Time-Separator">/</div>
- <div title="Temps total" class="Ldt-Ctrl-Time-Total">1:03:30</div>
+ <div title="Temps total" class="Ldt-Ctrl-Time-Total">00:00</div>
</div>
<div class="Ldt-Ctrl-spacer"></div>
<div title="Couper le son" class="Ldt-Ctrl-button Ldt-Ctrl-Sound Ldt-Ctrl-Sound-Full"></div>
@@ -59,7 +93,7 @@
<tbody>
<tr class="info-title">
<th>Titre :</th>
- <td><a href="#">Titre du Média</a></td>
+ <td><a href="#">{{content.title}}</a></td>
</tr>
<tr class="info-duration">
<th>Durée :</th>
@@ -112,7 +146,9 @@
IriSP.mediaplayer({
id: "{{ctt_id}}"
});
- IriSP.social();
+ IriSP.social({
+ swf: "{% static 'hashcut/lib/ZeroClipboard.swf' %}"
+ });
});
</script>
{% endblock %}
--- a/src/hashcut/templates/iri_mashup_edit.html Thu Nov 29 17:54:48 2012 +0100
+++ b/src/hashcut/templates/iri_mashup_edit.html Thu Nov 29 19:28:10 2012 +0100
@@ -3,9 +3,8 @@
{% load i18n %}
{% load analytics %}
{% load thumbnail %}
- {% block title %}Hashcut Edition - IRI{% endblock %}
- {% block css_import %}
- {{ block.super }}
+ {% block title %}Création de Hashcut{% endblock %}
+ {% block css_page %}
<link rel="stylesheet" href="{% static 'hashcut/lib/jquery.tagit.css' %}" />
<link rel="stylesheet" href="{% static 'hashcut/iri/css/edition.css' %}" />
{% endblock %}
--- a/src/hashcut/templates/iri_mashup_hashcut.html Thu Nov 29 17:54:48 2012 +0100
+++ b/src/hashcut/templates/iri_mashup_hashcut.html Thu Nov 29 19:28:10 2012 +0100
@@ -3,9 +3,8 @@
{% load i18n %}
{% load analytics %}
{% load thumbnail %}
- {% block title %}Hashcut Playing - iri{% endblock %}
- {% block css_import %}
- {{ block.super }}
+ {% block title %}Lecture du Hashcut '{{proj.title}}'{% endblock %}
+ {% block css_page %}
<link rel="stylesheet" href="{% static 'hashcut/iri/css/players.css' %}" />
{% endblock %}
@@ -28,7 +27,7 @@
<a href="#" target="_blank" class="Ldt-Social-Gplus Ldt-Social-Ext" title="Partager sur Google+"></a>
<a href="#" target="_blank" class="Ldt-Social-Mail" title="Partager par mail"></a>
</div>
- <p class="title-video" href="#">Hashcut sans titre</p>
+ <p class="title-video" href="#">Hashcut » {{proj.title}}</p>
</div>
<div class="profil-wrap">
<ul>
@@ -71,7 +70,7 @@
<div class="Ldt-Ctrl-Time">
<div title="Temps écoulé" class="Ldt-Ctrl-Time-Elapsed">00:00</div>
<div class="Ldt-Ctrl-Time-Separator">/</div>
- <div title="Temps total" class="Ldt-Ctrl-Time-Total">1:03:30</div>
+ <div title="Temps total" class="Ldt-Ctrl-Time-Total">00:00</div>
</div>
<div class="Ldt-Ctrl-spacer"></div>
<div title="Couper le son" class="Ldt-Ctrl-button Ldt-Ctrl-Sound Ldt-Ctrl-Sound-Full"></div>
@@ -99,7 +98,7 @@
<div class="segment-info mashup-description">
<div class="pointer" style="left: 50%;"></div>
<div class="popin-content">
- <h2><span class="annotation-title">Segment sans titre</span></h2>
+ <h2><span class="annotation-title"></span></h2>
<table>
<tbody>
<tr>
@@ -128,7 +127,7 @@
<tbody>
<tr class="info-title">
<th>Titre :</th>
- <td><a href="#">Titre du Hashcut</a></td>
+ <td><a href="#">{{proj.title}}</a></td>
</tr>
<tr class="info-duration">
<th>Durée :</th>
@@ -142,13 +141,8 @@
<th>Description : </th>
<td></td>
</tr>
-<!-- <tr class="info-tags">
- <th>Tags : </th>
- <td>Mashup, Création, Art</td>
- </tr> -->
</tbody>
</table>
-<!-- <a href="#" class="button cloner">Cloner le Hashcut</a> -->
</div>
<h2>Médias utilisés dans le Hashcut</h2>
<ul class="list-video">
@@ -183,7 +177,9 @@
IriSP.mashupplayer({
id: "{{ldt_id}}"
});
- IriSP.social();
+ IriSP.social({
+ swf: "{% static 'hashcut/lib/ZeroClipboard.swf' %}"
+ });
});
</script>
{% endblock %}
--- a/src/hashcut/templates/iri_mashup_home.html Thu Nov 29 17:54:48 2012 +0100
+++ b/src/hashcut/templates/iri_mashup_home.html Thu Nov 29 19:28:10 2012 +0100
@@ -10,8 +10,8 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<meta name="description" content="Interface d'édition de Hashcuts (Mashups vidéo cliquables)" />
<meta name="copyright" content="Institut de Recherche et d'Innovation (IRI), 2012" />
- <meta name="author" content="Anthony Ly, Raphaël Velt" />
- <title>{% block title %}Hashcut Home - IRI{% endblock %}</title>
+ <meta name="author" content="Anthony Ly, Raphaël Velt, Thibaut Cavalié" />
+ <title>Hashcut BPI » {% block title %}Accueil{% endblock %}</title>
{% block css_declaration %}
{% endblock %}
@@ -19,6 +19,8 @@
<link rel="stylesheet" href="{% static 'hashcut/lib/jquery-ui.css' %}" />
<link rel="stylesheet" href="{% static 'hashcut/iri/css/reset.css' %}" />
<link rel="stylesheet" href="{% static 'hashcut/iri/css/common.css' %}" />
+ {% endblock %}
+ {% block css_page %}
<link rel="stylesheet" href="{% static 'hashcut/iri/css/home.css' %}" />
{% endblock %}
@@ -97,24 +99,24 @@
<div class="right-content">
<div class="definition">
<h2>Hashcuts ?</h2>
- <p>Un <strong>Hashcut</strong> est à la fois une <a href="#">Hypervidéo</a> (ensemble de vidéos cliquable, permettant une navigation entre vidéos) et un <a href="#">Mashup</a> (mélange de médias, de l’anglais mash, «purée»).</p>
+ <p>Un <strong>Hashcut</strong> est à la fois une <a href="http://fr.wikipedia.org/wiki/Hypervid%C3%A9o" target="_blank">Hypervidéo</a> (vidéo cliquable) et un <a href="http://fr.wikipedia.org/wiki/Mashup_%28video%29" target="_blank">Mashup</a> (mélange de médias, de l’anglais mash, «purée»).</p>
<p>Un <strong>Hashcut</strong> est un assemblage de citations de vidéos, mises bout à bout, sans altération des médias d’origine, et permet à chacun de proposer un nouveau regard, une porte d’entrée éditorialisée sur ces médias.</p>
</div>
<div class="how-to">
<h2>Comment faire ?</h2>
<ul>
<li class="inscription">
- <h3>1. S’inscrire</h3>
+ <h3><a href="#">1. S’inscrire</a></h3>
<p>Commencez par créer votre espace personnel sur cette plateforme !</p>
</li>
<li class="next-step"></li>
<li class="creation">
- <h3>2. Créer un hashcut</h3>
+ <h3><a href="{% url mashup_edit branding=branding %}">2. Créer un hashcut</a></h3>
<p>Choisissez des médias, segmentez les, assemblez les segments et rajoutez des commentaires sur le Hashcut.</p>
</li>
<li class="next-step"></li>
<li class="publier">
- <h3>3. Publier et partager</h3>
+ <h3><a href="#">3. Publier et partager</a></h3>
<p>Une fois le hashcut terminé, publiez-le sur cette plateforme etpartagez votre création sur les réseaux sociaux</p>
</li>
</ul>
--- a/src/hashcut/views.py Thu Nov 29 17:54:48 2012 +0100
+++ b/src/hashcut/views.py Thu Nov 29 19:28:10 2012 +0100
@@ -2,7 +2,7 @@
from django.http import HttpResponseNotFound
from django.views.generic.base import View, TemplateResponseMixin
from ldt.api.ldt.resources import ProjectResource
-from ldt.ldt_utils.models import Project
+from ldt.ldt_utils.models import Project, Content
import logging
from hashcut.models import Mashup, Branding
@@ -150,8 +150,9 @@
self.branding = branding
if not ldt_id:
return HttpResponseNotFound("A project id must be given.")
+ proj = Project.objects.get(ldt_id=ldt_id)
context = self.get_context_dict(request)
- context.update({"ldt_id":ldt_id})
+ context.update({"ldt_id":ldt_id, "proj": proj})
return self.render_to_response(context)
@@ -183,8 +184,9 @@
self.branding = branding
if not ctt_id:
return HttpResponseNotFound("A content id must be given.")
+ content = Content.objects.get(iri_id=ctt_id)
context = self.get_context_dict(request)
- context.update({"ctt_id":ctt_id})
+ context.update({"ctt_id":ctt_id, "content": content})
return self.render_to_response(context)