--- 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 {
--- 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
--- 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;
}
--- 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 %}
<div class="wrap-header">
<div class="header">
-
- <!-- popin user -->
-
- <div class="popin user info" id="user">
- <img class="pointer" src="{% static 'hashcut/bpi/img/popin-triangle.png' %}" alt="" />
- <div class="popin-content">
- <h2>Mashup75</h2>
- <h3>mash@cinecast.fr</h3>
- <a href="#" class="nb-hashcut">12 Hashcuts</a>
- <p>
- <a href="#" class="change-account button">Changer de compte</a>
- </p>
- </div>
- </div><!-- popin user info-->
-
- <div class="popin user signup" id="user">
- <img class="pointer" src="{% static 'hashcut/bpi/img/popin-triangle.png' %}" alt="" />
- <div class="popin-content">
- <h2>Créer un compte :</h2>
- <form action="#" class="signup-form">
- <p>
- <label for="signup-pseudo">Pseudonyme : </label>
- <input type="text" id="signup-pseudo" name="" />
- </p>
- <p >
- <label for="signup-email">Email : </label>
- <input type="text" id="signup-email" name="" />
- </p>
- <p >
- <label for="signup-password">Mot de passe : </label>
- <input type="password" id="signup-password" name="" />
- </p>
- <p>
- <label for="signup-password">Confirmer le mot de passe : </label>
- <input type="password" id="signup-password" name="" />
- </p>
- <p>
- <input class="button" type="submit" value="Créer le compte">
- </p>
- </form>
-
- </div>
- </div><!-- popin user signup-->
-
- <div class="popin user login" id="user">
- <img class="pointer" src="{% static 'hashcut/bpi/img/popin-triangle.png' %}" alt="" />
- <div class="popin-content">
- <h2>Connexion :</h2>
- <form action="#" class="login-form">
- <p>
- <label for="signup-pseudo">E-mail : </label>
- <input type="text" id="signup-pseudo" name="" />
- </p>
- <p >
- <label for="signup-email">Mot de passe : </label>
- <input type="password" id="signup-email" name="" />
- </p>
- <p>
- <input class="button" type="submit" value="Se connecter">
- </p>
- <p>
- <a class="button signup-button" href="#">Créer un compte</a>
- </p>
- </form>
-
- </div>
- </div><!-- popin user login-->
-
- <!-- /popin user -->
-
+ {% include 'partial/bpi_mashup_popin_user.html' %}
<!-- popin update-title -->
<div class="popin update-title" id="update-title">
- <img class="pointer" src="{% static 'hashcut/bpi/img/popin-triangle.png' %}" alt="" />
+ <div class="pointer"></div>
<div class="popin-content">
<form class="clearfix" action="#" id="hashcut-form" method="">
<p>
@@ -101,10 +32,8 @@
</div>
<!-- /popin update-title -->
- <h1><a title="Hashcut - Le Mashup cliquable" class="clearfix" href="#">
- <img src="{% static 'hashcut/bpi/img/hashcut-logo.png' %}" alt="Hashcut" />
- <span>Le Mashup<br />Cliquable</span>
- </a></h1>
+ {% include 'partial/bpi_hashcut_logo.html' %}
+
<div class="title-video-wrap">
<p class="title-video">
<a title="Modifier le titre et la description" class="open-popin" href="#update-title">Hashcut sans titre</a>
@@ -112,9 +41,11 @@
<p class="time-length">Durée: <span class="mashup-total-duration">00:00</span></p>
</div>
<div class="profil-wrap">
- <a href="{% url mashup_home branding=branding %}" class="all-hashcut">Tous les Hashcuts</a>
- <a href="#user" class="my-profil open-popin">Mon profil</a>
- </div>
+ <ul class="space-top">
+ <li><a href="{% url mashup_home branding=branding %}" class="all-hashcut">Tous les Hashcuts</a></li>
+ <li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
+ </ul>
+ </div>
</div><!-- header -->
</div> <!-- wrap-header -->
{% endblock %}
@@ -191,7 +122,7 @@
<div class="Ldt-Slice"></div>
<div class="segmentation">
<div class="pointer-padder">
- <img class="pointer" src="{% static 'hashcut/bpi/img/popin-triangle.png' %}" alt="" />
+ <div class="pointer"></div>
</div>
<div class="popin-content">
<div class="validate">
@@ -262,7 +193,7 @@
<div class="segment-info mashup-description">
<div class="pointer-padder">
- <img class="pointer" src="{% static 'hashcut/bpi/img/popin-triangle.png' %}" alt="" />
+ <div class="pointer"></div>
</div>
<div class="popin-content">
<ul class="tools">
@@ -323,8 +254,7 @@
{% endblock %}
<!-- JavaScript -->
{% block js_import %}
-<script type="text/javascript" src="{% static 'hashcut/lib/jquery.min.js' %}"></script>
-<script type="text/javascript" src="{% static 'hashcut/lib/jquery-ui.min.js' %}"></script>
+{{ block.super }}
<script type="text/javascript" src="{% static 'hashcut/lib/tag-it.js' %}"></script>
<script type="text/javascript" src="{% static 'hashcut/lib/underscore-min.js' %}"></script>
<script type="text/javascript" src="{% static 'hashcut/lib/popcorn-complete.min.js' %}"></script>
@@ -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"
+ }
});
});
</script>
--- /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 %}
+ <title>{% block title %}Hashcut Playing - BPI{% endblock %}</title>
+ {% block css_import %}
+ {{ block.super }}
+ <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="#">Hashcut sans titre</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">
+ <div class="left-content">
+ <h2>Lire le Hashcut</h2>
+ <div class="bloc-video">
+ <div class="video">
+ <div class="video-wait"></div>
+ </div>
+ <div class="widget">
+ <div class="Ldt-Slider-Container">
+ <div class="Ldt-Slider"></div>
+ </div>
+ <div class="Ldt-Slider-Time"></div>
+
+ <div class="Ldt-Ctrl">
+ <div class="Ldt-Ctrl-Left">
+ <div title="Lecture" class="Ldt-Ctrl-button Ldt-Ctrl-Play Ldt-Ctrl-Play-PlayState"></div>
+ <div class="Ldt-Ctrl-spacer"></div>
+ <div class="Ldt-Ctrl-InOutBlock">
+ <div title="Débuter le segment ici" class="Ldt-Ctrl-button Ldt-Ctrl-SetIn"></div>
+ <div class="Ldt-Ctrl-spacer"></div>
+ <div title="Finir le segment ici" class="Ldt-Ctrl-button Ldt-Ctrl-SetOut"></div>
+ <div class="Ldt-Ctrl-spacer"></div>
+ </div>
+ </div>
+ <div class="Ldt-Ctrl-Right">
+ <div class="Ldt-Ctrl-spacer"></div>
+ <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>
+ <div class="Ldt-Ctrl-spacer"></div>
+ <div title="Couper le son" class="Ldt-Ctrl-button Ldt-Ctrl-Sound Ldt-Ctrl-Sound-Full"></div>
+ </div>
+ <div title="Changer le volume" class="Ldt-Ctrl-Volume-Control">
+ <div class="Ldt-Ctrl-Volume-Bar"></div>
+ </div>
+ </div>
+
+ </div>
+ <div class="frise mashup-frise">
+ <div class="frise-overflow">
+ <div class="frise-segments">
+ </div>
+ <div class="frise-indications">
+ </div>
+ </div>
+ <div class="frise-position"></div>
+ <div class="mashup-tooltip segment-tooltip-wrapper">
+ <div class="segment-tooltip"></div>
+ <div class="segment-tooltip-tip"></div>
+ </div>
+
+ </div>
+ <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>
+ <table>
+ <tbody>
+ <tr>
+ <th>Extrait de :</th>
+ <td><span class="annotation-media-title"></span> (<span class="annotation-time annotation-begin"></span> - <span class="annotation-time annotation-end"></span>)</td>
+ </tr>
+ <tr>
+ <th>Description :</th>
+ <td><span class="annotation-description"></span></td>
+ </tr>
+ <tr>
+ <th>Tags :</th>
+ <td><span class="annotation-tags"></span></td>
+ </tr>
+ </tbody>
+ </table>
+ </div>
+ </div>
+ </div><!-- bloc-video -->
+ </div><!-- left-content -->
+
+ <div class="right-content">
+ <h2>Plus d’informations</h2>
+ <div class="more-info-wrap">
+ <table class="more-info ">
+ <tbody>
+ <tr class="info-title">
+ <th>Titre :</th>
+ <td><a href="#">Titre du Hashcut</a></td>
+ </tr>
+ <tr class="info-duration">
+ <th>Durée :</th>
+ <td></td>
+ </tr>
+ <tr class="info-author">
+ <th>Auteur : </th>
+ <td><a href="#"></a></td>
+ </tr>
+ <tr class="info-description">
+ <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">
+
+ </ul>
+ </div><!-- right-content -->
+</div><!-- content -->
+{% endblock %}
+<!-- JavaScript -->
+{% block js_import %}
+{{ block.super }}
+<script type="text/javascript" src="{% static 'hashcut/lib/underscore-min.js' %}"></script>
+<script type="text/javascript" src="{% static 'hashcut/lib/popcorn-complete.min.js' %}"></script>
+<script type="text/javascript" src="{% static 'hashcut/lib/ZeroClipboard.js' %}"></script>
+<script type="text/javascript" src="{% static 'hashcut/js/hashcut.js' %}"></script>
+<script type="text/javascript">
+ IriSP.endpoints = {
+ content: "{% url api_dispatch_list api_name='1.0' resource_name='contents' %}",
+ 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='' %}",
+ media_page: "media.html?media="
+ };
+
+ $(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;
+ };
+ IriSP.mashupplayer({
+ id: "{{ldt_id}}"
+ });
+ IriSP.social();
+ });
+</script>
+{% endblock %}
+
--- 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 %}
<meta charset="utf-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>
@@ -36,85 +37,15 @@
{% block wrap_header %}
<div class="wrap-header">
<div class="header">
-
- <!-- popin user -->
- <!--div class="popin user info" id="user">
- <img class="pointer" src="img/popin-triangle.png" alt="" />
- <div class="popin-content">
- <h2>Mashup75</h2>
- <h3>mash@cinecast.fr</h3>
- <a href="#" class="nb-hashcut">12 Hashcuts</a>
- <p>
- <a href="#" class="change-account button">Changer de compte</a>
- </p>
- </div>
- </div--><!-- popin user info-->
-
- <!--div class="popin user signup" id="user">
- <img class="pointer" src="img/popin-triangle.png" alt="" />
- <div class="popin-content">
- <h2>Créer un compte :</h2>
- <form action="#" class="signup-form">
- <p>
- <label for="signup-pseudo">Pseudonyme : </label>
- <input type="text" id="signup-pseudo" name="" />
- </p>
- <p >
- <label for="signup-email">Email : </label>
- <input type="text" id="signup-email" name="" />
- </p>
- <p >
- <label for="signup-password">Mot de passe : </label>
- <input type="password" id="signup-password" name="" />
- </p>
- <p>
- <label for="signup-password">Confirmer le mot de passe : </label>
- <input type="password" id="signup-password" name="" />
- </p>
- <p>
- <input class="button" type="submit" value="Créer le compte">
- </p>
- </form>
-
- </div>
- </div--><!-- popin user signup-->
-
- <!--div class="popin user login" id="user">
- <img class="pointer" src="img/popin-triangle.png" alt="" />
- <div class="popin-content">
- <h2>Connexion :</h2>
- <form action="#" class="login-form">
- <p>
- <label for="signup-pseudo">E-mail : </label>
- <input type="text" id="signup-pseudo" name="" />
- </p>
- <p >
- <label for="signup-email">Mot de passe : </label>
- <input type="password" id="signup-email" name="" />
- </p>
- <p>
- <input class="button" type="submit" value="Se connecter">
- </p>
- <p>
- <a class="button signup-button" href="#">Créer un compte</a>
- </p>
- </form>
-
- </div>
- </div--><!-- popin user login-->
-
- <!-- /popin user -->
-
- <h1><a title="Hashcut - Le Mashup cliquable" class="clearfix" href="#">
- <img src="{% static 'hashcut/bpi/img/hashcut-logo.png' %}" alt="Hashcut" />
- <span>Le Mashup<br />Cliquable</span>
- </a></h1>
+ {% include 'partial/bpi_mashup_popin_user.html' %}
+ {% include 'partial/bpi_hashcut_logo.html' %}
<div class="title-header">
<h2><a href="{% url mashup_edit branding=branding %}">Créer un hashcut !</a></h2>
</div>
<div class="profil-wrap">
-
- <a href="#user" class="my-profil open-popin">Mon profil</a>
+ <ul class="space-top-2">
+ <li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
+ </ul>
</div>
</div><!-- header -->
</div><!-- wrap-header -->
--- /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 %}
+ <h1><a title="Hashcut - Le Mashup cliquable" class="clearfix" href="#">
+ <img src="{% static 'hashcut/bpi/img/hashcut-logo.png' %}" alt="Hashcut" />
+ <span>Le Mashup<br />Cliquable</span>
+ </a></h1>
\ No newline at end of file
--- /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 @@
+ <!-- popin user -->
+
+ <div class="popin user info" id="user">
+ <div class="pointer"></div>
+ <div class="popin-content">
+ <h2>Mashup75</h2>
+ <h3>mash@cinecast.fr</h3>
+ <a href="#" class="nb-hashcut">12 Hashcuts</a>
+ <p>
+ <a href="#" class="change-account button">Changer de compte</a>
+ </p>
+ </div>
+ </div><!-- popin user info-->
+
+ <div class="popin user signup" id="user">
+ <div class="pointer"></div>
+ <div class="popin-content">
+ <h2>Créer un compte :</h2>
+ <form action="#" class="signup-form">
+ <p>
+ <label for="signup-pseudo">Pseudonyme : </label>
+ <input type="text" id="signup-pseudo" name="" />
+ </p>
+ <p >
+ <label for="signup-email">Email : </label>
+ <input type="text" id="signup-email" name="" />
+ </p>
+ <p >
+ <label for="signup-password">Mot de passe : </label>
+ <input type="password" id="signup-password" name="" />
+ </p>
+ <p>
+ <label for="signup-password">Confirmer le mot de passe : </label>
+ <input type="password" id="signup-password" name="" />
+ </p>
+ <p>
+ <input class="button" type="submit" value="Créer le compte">
+ </p>
+ </form>
+
+ </div>
+ </div><!-- popin user signup-->
+
+ <div class="popin user login" id="user">
+ <div class="pointer"></div>
+ <div class="popin-content">
+ <h2>Connexion :</h2>
+ <form action="#" class="login-form">
+ <p>
+ <label for="signup-pseudo">E-mail : </label>
+ <input type="text" id="signup-pseudo" name="" />
+ </p>
+ <p >
+ <label for="signup-email">Mot de passe : </label>
+ <input type="password" id="signup-email" name="" />
+ </p>
+ <p>
+ <input class="button" type="submit" value="Se connecter">
+ </p>
+ <p>
+ <a class="button signup-button" href="#">Créer un compte</a>
+ </p>
+ </form>
+
+ </div>
+ </div><!-- popin user login-->
+
+ <!-- /popin user -->
\ No newline at end of file
--- 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<branding>.*)/edit/$', MashupEdit.as_view(), name="mashup_edit"),
+ url(r'^(?P<branding>.*)/hashcut/(?P<ldt_id>.*)/$', MashupHashcut.as_view(), name="mashup_hashcut"),
url(r'^(?P<branding>.*)/$', MashupHome.as_view(), name="mashup_home"),
url(r'^$', MashupHome.as_view()),
)
--- 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)
+