--- a/integration/css/common.css Fri Nov 30 14:21:52 2012 +0100
+++ b/integration/css/common.css Fri Nov 30 15:36:06 2012 +0100
@@ -209,17 +209,18 @@
}
/* popin */
.popin{
- padding-top: 12px;
+ margin-top: 12px;
position: absolute;
top: 0;
z-index: 10;
+ display: none;
}
.pointer{
position: absolute;
width: 20px;
height: 13px;
background: url(../img/popin-triangle.png);
- top: 0;
+ top: -12px;
}
.popin-content{
padding: 8px;
@@ -242,11 +243,6 @@
height: 20px;
}
/* popin - user */
-
-.popin {
- display: none;
-}
-
.user.popin{
top: 55px;
right: 0;
@@ -381,27 +377,31 @@
float: left;
margin-right: 20px;
}
-
.video-item h3{
font-size: 12px;
}
-.video-item h3 strong{
- font-weight: 600;
-}
-.video-item h3 span{
- color: #de2500;
-}
.video-item .screenshot{
display: inline-block;
margin-bottom: 8px;
+ background: #ffffff;
}
-.video-item h3 a{
- border-bottom: 1px solid #bababa;
- display: inline-block;
- line-height: 12px;
+.video-item .screenshot:hover {
+ opacity: .8; filter:alpha(opacity=80);
+}
+.video-item a.author{
+ color: #7628DF; text-decoration: underline;
+}
+.video-item a.author:hover{
+ text-decoration: none;
}
-.video-item h3 a:hover{
- border-bottom: none;
+.video-item a.title{
+ color: #30036D; font-weight: 600; text-decoration: none;
+}
+.video-item a.title:hover{
+ text-decoration: underline;
+}
+.video-item .duration {
+ color: #C81000;
}
.pagination{
text-align: center;
--- a/integration/css/edition.css Fri Nov 30 14:21:52 2012 +0100
+++ b/integration/css/edition.css Fri Nov 30 15:36:06 2012 +0100
@@ -183,7 +183,6 @@
}
.media-segment-popin {
- padding-top: 12px; overflow: hidden;
top: 2px; width: 300px; margin-left: -151px;
display: none;
}
@@ -212,7 +211,6 @@
}
.media-found-popin {
- padding-top: 12px; overflow: hidden;
top: 2px; width: 170px; display: none;
margin-left: -86px;
}
--- a/integration/css/players.css Fri Nov 30 14:21:52 2012 +0100
+++ b/integration/css/players.css Fri Nov 30 15:36:06 2012 +0100
@@ -93,7 +93,6 @@
}
.media-segment-popin {
- padding-top: 12px; overflow: hidden;
top: 2px; width: 230px; margin-left: -116px;
display: none;
}
--- a/integration/home.html Fri Nov 30 14:21:52 2012 +0100
+++ b/integration/home.html Fri Nov 30 15:36:06 2012 +0100
@@ -115,11 +115,11 @@
<div class="hashcut-video-wrap news">
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="#">Mon Hashcut</a> par <a class="author" href="#">Hashcutter</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="#">Mon Hashcut</a> par <a class="author" href="#">Hashcutter</a> | <span class="duration">02:24</span> </h3>
</div>
</div>
@@ -127,35 +127,35 @@
<div class="hashcut-video-wrap last">
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="#">Mon Hashcut</a> par <a class="author" href="#">Hashcutter</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="#">Mon Hashcut</a> par <a class="author" href="#">Hashcutter</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="#">Mon Hashcut</a> par <a class="author" href="#">Hashcutter</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="#">Mon Hashcut</a> par <a class="author" href="#">Hashcutter</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="#">Mon Hashcut</a> par <a class="author" href="#">Hashcutter</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="#">Mon Hashcut</a> par <a class="author" href="#">Hashcutter</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="#">Mon Hashcut</a> par <a class="author" href="#">Hashcutter</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-last.jpg" alt="" /></a>
- <h3><strong>Mon Hashcut</strong> par <a href="#">Hashcutter</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="#">Mon Hashcut</a> par <a class="author" href="#">Hashcutter</a> | <span class="duration">02:24</span> </h3>
</div>
</div>
--- a/integration/js/compile.bat Fri Nov 30 14:21:52 2012 +0100
+++ b/integration/js/compile.bat Fri Nov 30 15:36:06 2012 +0100
@@ -8,4 +8,8 @@
copy hashcut.js ..\..\src\hashcut\static\hashcut\js
+copy ..\css\*.css ..\..\src\hashcut\static\hashcut\bpi\css
+
+copy ..\css\*.css ..\..\src\hashcut\static\hashcut\iri\css
+
echo Hashcut.js compiled successfully!
--- a/integration/js/compile.sh Fri Nov 30 14:21:52 2012 +0100
+++ b/integration/js/compile.sh Fri Nov 30 15:36:06 2012 +0100
@@ -10,3 +10,7 @@
done
cp hashcut.js ../../src/hashcut/static/hashcut/js
+
+cp ../css/*.css ../../src/hashcut/static/hashcut/bpi/css
+
+cp ../css/*.css ../../src/hashcut/static/hashcut/iri/css
--- a/integration/profil.html Fri Nov 30 14:21:52 2012 +0100
+++ b/integration/profil.html Fri Nov 30 15:36:06 2012 +0100
@@ -115,27 +115,27 @@
<div class="hashcut-video-wrap profil">
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ <h3><a href="#" class="author">Mon Hashcut</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ <h3><a href="#" class="author">Mon Hashcut</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ <h3><a href="#" class="author">Mon Hashcut</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ <h3><a href="#" class="author">Mon Hashcut</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ <h3><a href="#" class="author">Mon Hashcut</a> | <span class="duration">02:24</span> </h3>
</div>
<div class="video-item">
<a href="#" class="screenshot"><img src="img/visuel-home-news.jpg" alt=""/></a>
- <h3><strong>Mon Hashcut</strong> | <span>02:24</span> </h3>
+ <h3><a href="#" class="author">Mon Hashcut</a> | <span class="duration">02:24</span> </h3>
</div>
</div>
<div class="pagination">
--- a/src/hashcut/static/hashcut/bpi/css/common.css Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/static/hashcut/bpi/css/common.css Fri Nov 30 15:36:06 2012 +0100
@@ -209,17 +209,18 @@
}
/* popin */
.popin{
- padding-top: 12px;
+ margin-top: 12px;
position: absolute;
top: 0;
z-index: 10;
+ display: none;
}
.pointer{
position: absolute;
width: 20px;
height: 13px;
background: url(../img/popin-triangle.png);
- top: 0;
+ top: -12px;
}
.popin-content{
padding: 8px;
@@ -242,11 +243,6 @@
height: 20px;
}
/* popin - user */
-
-.popin {
- display: none;
-}
-
.user.popin{
top: 55px;
right: 0;
@@ -381,27 +377,31 @@
float: left;
margin-right: 20px;
}
-
.video-item h3{
font-size: 12px;
}
-.video-item h3 strong{
- font-weight: 600;
-}
-.video-item h3 span{
- color: #de2500;
-}
.video-item .screenshot{
display: inline-block;
margin-bottom: 8px;
+ background: #ffffff;
}
-.video-item h3 a{
- border-bottom: 1px solid #bababa;
- display: inline-block;
- line-height: 12px;
+.video-item .screenshot:hover {
+ opacity: .8; filter:alpha(opacity=80);
+}
+.video-item a.author{
+ color: #7628DF; text-decoration: underline;
+}
+.video-item a.author:hover{
+ text-decoration: none;
}
-.video-item h3 a:hover{
- border-bottom: none;
+.video-item a.title{
+ color: #30036D; font-weight: 600; text-decoration: none;
+}
+.video-item a.title:hover{
+ text-decoration: underline;
+}
+.video-item .duration {
+ color: #C81000;
}
.pagination{
text-align: center;
--- a/src/hashcut/static/hashcut/bpi/css/edition.css Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/static/hashcut/bpi/css/edition.css Fri Nov 30 15:36:06 2012 +0100
@@ -183,7 +183,6 @@
}
.media-segment-popin {
- padding-top: 12px; overflow: hidden;
top: 2px; width: 300px; margin-left: -151px;
display: none;
}
@@ -212,7 +211,6 @@
}
.media-found-popin {
- padding-top: 12px; overflow: hidden;
top: 2px; width: 170px; display: none;
margin-left: -86px;
}
--- a/src/hashcut/static/hashcut/bpi/css/home.css Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/static/hashcut/bpi/css/home.css Fri Nov 30 15:36:06 2012 +0100
@@ -27,7 +27,6 @@
}
.last .video-item{
width: 140px;
- height: 130px;
float: left;
margin: 0 20px 12px 0;
}
--- a/src/hashcut/static/hashcut/bpi/css/players.css Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/static/hashcut/bpi/css/players.css Fri Nov 30 15:36:06 2012 +0100
@@ -93,7 +93,6 @@
}
.media-segment-popin {
- padding-top: 12px; overflow: hidden;
top: 2px; width: 230px; margin-left: -116px;
display: none;
}
--- a/src/hashcut/static/hashcut/iri/css/common.css Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/static/hashcut/iri/css/common.css Fri Nov 30 15:36:06 2012 +0100
@@ -93,7 +93,7 @@
}
.wrap-header-top{
padding-top: 5px;
- background-color: #2C80AF;
+ background-color: #370078;
height: 53px;
margin-bottom: 1px;
}
@@ -131,7 +131,7 @@
}
.wrap-header{
- background-color: #7CD0FF;
+ background-color: #e2dbfd;
}
.header{
position: relative;
@@ -209,17 +209,18 @@
}
/* popin */
.popin{
- padding-top: 12px;
+ margin-top: 12px;
position: absolute;
top: 0;
z-index: 10;
+ display: none;
}
.pointer{
position: absolute;
width: 20px;
height: 13px;
background: url(../img/popin-triangle.png);
- top: 0;
+ top: -12px;
}
.popin-content{
padding: 8px;
@@ -242,11 +243,6 @@
height: 20px;
}
/* popin - user */
-
-.popin {
- display: none;
-}
-
.user.popin{
top: 55px;
right: 0;
@@ -284,7 +280,7 @@
}
.user.info h2 {
- color: #2C80AF;
+ color: #7628df;
font-size: 18px;
font-weight: 600;margin-bottom: 2px;
}
@@ -381,34 +377,38 @@
float: left;
margin-right: 20px;
}
-
.video-item h3{
font-size: 12px;
}
-.video-item h3 strong{
- font-weight: 600;
-}
-.video-item h3 span{
- color: #de2500;
-}
.video-item .screenshot{
display: inline-block;
margin-bottom: 8px;
+ background: #ffffff;
}
-.video-item h3 a{
- border-bottom: 1px solid #bababa;
- display: inline-block;
- line-height: 12px;
+.video-item .screenshot:hover {
+ opacity: .8; filter:alpha(opacity=80);
+}
+.video-item a.author{
+ color: #7628DF; text-decoration: underline;
+}
+.video-item a.author:hover{
+ text-decoration: none;
}
-.video-item h3 a:hover{
- border-bottom: none;
+.video-item a.title{
+ color: #30036D; font-weight: 600; text-decoration: none;
+}
+.video-item a.title:hover{
+ text-decoration: underline;
+}
+.video-item .duration {
+ color: #C81000;
}
.pagination{
text-align: center;
}
.pagination a{
font-size: 14px;
- color: #2C80AF;
+ color: #7628df;
text-decoration: underline;
}
.pagination a:hover{
@@ -512,7 +512,7 @@
font-size: 11px;
}
.item-video .duration{
- color: #2C80AF;
+ color: #7628df;
font-size: 12px;
font-weight: 600;
}
@@ -602,7 +602,7 @@
font-weight: bold;
}
.annotation-time {
- color: #2C80AF;
+ color: #7628DF;
}
.mashup-description table{
font-size: 12px;
@@ -984,5 +984,5 @@
}
.media-segment-popin span{
- color: #2C80AF;
+ color: #7628df;
}
--- a/src/hashcut/static/hashcut/iri/css/edition.css Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/static/hashcut/iri/css/edition.css Fri Nov 30 15:36:06 2012 +0100
@@ -183,7 +183,6 @@
}
.media-segment-popin {
- padding-top: 12px; overflow: hidden;
top: 2px; width: 300px; margin-left: -151px;
display: none;
}
@@ -212,7 +211,6 @@
}
.media-found-popin {
- padding-top: 12px; overflow: hidden;
top: 2px; width: 170px; display: none;
margin-left: -86px;
}
--- a/src/hashcut/static/hashcut/iri/css/home.css Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/static/hashcut/iri/css/home.css Fri Nov 30 15:36:06 2012 +0100
@@ -27,7 +27,6 @@
}
.last .video-item{
width: 140px;
- height: 130px;
float: left;
margin: 0 20px 12px 0;
}
@@ -43,7 +42,7 @@
font-weight: bold;
}
.definition p a{
- color: #2C80AF;
+ color: #7628df;
text-decoration: underline;
}
.definition p a:hover{
--- a/src/hashcut/static/hashcut/iri/css/players.css Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/static/hashcut/iri/css/players.css Fri Nov 30 15:36:06 2012 +0100
@@ -93,7 +93,6 @@
}
.media-segment-popin {
- padding-top: 12px; overflow: hidden;
top: 2px; width: 230px; margin-left: -116px;
display: none;
}
--- a/src/hashcut/templates/bpi_mashup_content.html Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_content.html Fri Nov 30 15:36:06 2012 +0100
@@ -31,7 +31,7 @@
</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_home branding=branding %}" class="all-hashcut">Accueil</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>
--- a/src/hashcut/templates/bpi_mashup_edit.html Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_edit.html Fri Nov 30 15:36:06 2012 +0100
@@ -41,7 +41,7 @@
</div>
<div class="profil-wrap">
<ul class="space-top">
- <li><a href="{% url mashup_home branding=branding %}" class="all-hashcut">Tous les Hashcuts</a></li>
+ <li><a href="{% url mashup_home branding=branding %}" class="all-hashcut">Accueil</a></li>
<li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
</ul>
</div>
--- a/src/hashcut/templates/bpi_mashup_hashcut.html Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_hashcut.html Fri Nov 30 15:36:06 2012 +0100
@@ -31,7 +31,7 @@
</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_home branding=branding %}" class="all-hashcut">Accueil</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>
--- a/src/hashcut/templates/bpi_mashup_home.html Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_home.html Fri Nov 30 15:36:06 2012 +0100
@@ -64,13 +64,13 @@
<div class="video-item">
{% if m1 %}
<a href="{% url mashup_hashcut branding=branding ldt_id=m1.project.ldt_id %}" class="screenshot">{% thumbnail m1.project.image "302x202" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt=""/>{% empty %} {% endthumbnail %}</a>
- <h3><strong>{{ m1.project.title }}</strong> par <a href="{% url mashup_profile branding=branding username=m1.creator %}">{{ m1.creator }}</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="{% url mashup_hashcut branding=branding ldt_id=m2.project.ldt_id %}">{{ m1.project.title }}</a> par <a class="author" href="{% url mashup_profile branding=branding username=m1.creator %}">{{ m1.creator }}</a> | <span class="duration">02:24</span> </h3>
{% endif %}
</div>
<div class="video-item">
{% if m2 %}
<a href="{% url mashup_hashcut branding=branding ldt_id=m2.project.ldt_id %}" class="screenshot">{% thumbnail m2.project.image "302x202" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt=""/>{% empty %} {% endthumbnail %}</a>
- <h3><strong>{{ m2.project.title }}</strong> par <a href="{% url mashup_profile branding=branding username=m2.creator %}">{{ m2.creator }}</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="{% url mashup_hashcut branding=branding ldt_id=m2.project.ldt_id %}">{{ m2.project.title }}</a> par <a class="author" href="{% url mashup_profile branding=branding username=m2.creator %}">{{ m2.creator }}</a> | <span class="duration">02:24</span> </h3>
{% endif %}
</div>
</div>
@@ -80,20 +80,14 @@
{% for m in mashups %}
<div class="video-item">
<a href="{% url mashup_hashcut branding=branding ldt_id=m.project.ldt_id %}" class="screenshot">{% thumbnail m.project.image "142x95" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt=""/>{% empty %} {% endthumbnail %}</a>
- <h3><strong>{% if m.project.title|length > 30 %}{{m.project.title|slice:":30"}}...{% else %}{{m.project.title}}{% endif %}</strong> par <a href="{% url mashup_profile branding=branding username=m.creator %}">{{ m.creator }}</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="{% url mashup_hashcut branding=branding ldt_id=m2.project.ldt_id %}">{% if m.project.title|length > 30 %}{{m.project.title|slice:":30"}}...{% else %}{{m.project.title}}{% endif %}</a> par <a class="author" href="{% url mashup_profile branding=branding username=m.creator %}">{{ m.creator }}</a> | <span class="duration">02:24</span> </h3>
</div>
{% endfor %}
</div>
- <!--div class="pagination">
- <a href="#" class="active">1</a>
- <a href="#">2</a>
- <a href="#">3</a>
- <a href="#">4</a>
- <a href="#">5</a>
- <a href="#">6</a>
- <a href="#">Suivant</a>
- </div-->
+ <div class="pagination">
+ <a href="#">Tous les Hashcuts</a>
+ </div>
</div><!-- left-content -->
<div class="right-content">
--- a/src/hashcut/templates/bpi_mashup_profile.html Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_profile.html Fri Nov 30 15:36:06 2012 +0100
@@ -3,7 +3,7 @@
{% load i18n %}
{% load analytics %}
{% load thumbnail %}
- {% block title %}Hashcut Profile - BPI{% endblock %}
+ {% block title %}Profil de '{{username}}'{% endblock %}
{% block css_page %}
<link rel="stylesheet" href="{% static 'hashcut/bpi/css/profil.css' %}" />
{% endblock %}
@@ -16,7 +16,7 @@
<div class="title-header"></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_home branding=branding %}" class="all-hashcut">Accueil</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>
@@ -33,7 +33,7 @@
{% for m in mashups %}
<div class="video-item">
<a href="{% url mashup_hashcut branding=branding ldt_id=m.project.ldt_id %}" class="screenshot">{% thumbnail m.project.image "302x202" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt=""/>{% empty %} {% endthumbnail %}</a>
- <h3><strong>{% if m.project.title|length > 30 %}{{m.project.title|slice:":30"}}...{% else %}{{m.project.title}}{% endif %}</strong> par {{ m.creator }} | <span>02:24</span> </h3>
+ <h3><a class="title" href="{% url mashup_hashcut branding=branding ldt_id=m.project.ldt_id %}">{% if m.project.title|length > 30 %}{{m.project.title|slice:":30"}}...{% else %}{{m.project.title}}{% endif %}</a> par {{ m.creator }} | <span class="duration">02:24</span> </h3>
</div>
{% endfor %}
</div>
--- a/src/hashcut/templates/iri_mashup_content.html Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/templates/iri_mashup_content.html Fri Nov 30 15:36:06 2012 +0100
@@ -31,7 +31,7 @@
</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_home branding=branding %}" class="all-hashcut">Accueil</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>
--- a/src/hashcut/templates/iri_mashup_edit.html Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/templates/iri_mashup_edit.html Fri Nov 30 15:36:06 2012 +0100
@@ -41,7 +41,7 @@
</div>
<div class="profil-wrap">
<ul class="space-top">
- <li><a href="{% url mashup_home branding=branding %}" class="all-hashcut">Tous les Hashcuts</a></li>
+ <li><a href="{% url mashup_home branding=branding %}" class="all-hashcut">Accueil</a></li>
<li><a href="#user" class="my-profil open-popin">Mon profil</a></li>
</ul>
</div>
--- a/src/hashcut/templates/iri_mashup_hashcut.html Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/templates/iri_mashup_hashcut.html Fri Nov 30 15:36:06 2012 +0100
@@ -31,7 +31,7 @@
</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_home branding=branding %}" class="all-hashcut">Accueil</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>
--- a/src/hashcut/templates/iri_mashup_home.html Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/templates/iri_mashup_home.html Fri Nov 30 15:36:06 2012 +0100
@@ -11,7 +11,7 @@
<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, Thibaut Cavalié" />
- <title>Hashcut BPI » {% block title %}Accueil{% endblock %}</title>
+ <title>Hashcut » {% block title %}Accueil{% endblock %}</title>
{% block css_declaration %}
{% endblock %}
@@ -64,13 +64,13 @@
<div class="video-item">
{% if m1 %}
<a href="{% url mashup_hashcut branding=branding ldt_id=m1.project.ldt_id %}" class="screenshot">{% thumbnail m1.project.image "302x202" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt=""/>{% empty %} {% endthumbnail %}</a>
- <h3><strong>{{ m1.project.title }}</strong> par <a href="{% url mashup_profile branding=branding username=m1.creator %}">{{ m1.creator }}</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="{% url mashup_hashcut branding=branding ldt_id=m2.project.ldt_id %}">{{ m1.project.title }}</a> par <a class="author" href="{% url mashup_profile branding=branding username=m1.creator %}">{{ m1.creator }}</a> | <span class="duration">02:24</span> </h3>
{% endif %}
</div>
<div class="video-item">
{% if m2 %}
<a href="{% url mashup_hashcut branding=branding ldt_id=m2.project.ldt_id %}" class="screenshot">{% thumbnail m2.project.image "302x202" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt=""/>{% empty %} {% endthumbnail %}</a>
- <h3><strong>{{ m2.project.title }}</strong> par <a href="{% url mashup_profile branding=branding username=m2.creator %}">{{ m2.creator }}</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="{% url mashup_hashcut branding=branding ldt_id=m2.project.ldt_id %}">{{ m2.project.title }}</a> par <a class="author" href="{% url mashup_profile branding=branding username=m2.creator %}">{{ m2.creator }}</a> | <span class="duration">02:24</span> </h3>
{% endif %}
</div>
</div>
@@ -80,20 +80,14 @@
{% for m in mashups %}
<div class="video-item">
<a href="{% url mashup_hashcut branding=branding ldt_id=m.project.ldt_id %}" class="screenshot">{% thumbnail m.project.image "142x95" crop="center" format="PNG" as im %}<img src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" alt=""/>{% empty %} {% endthumbnail %}</a>
- <h3><strong>{% if m.project.title|length > 30 %}{{m.project.title|slice:":30"}}...{% else %}{{m.project.title}}{% endif %}</strong> par <a href="{% url mashup_profile branding=branding username=m.creator %}">{{ m.creator }}</a> | <span>02:24</span> </h3>
+ <h3><a class="title" href="{% url mashup_hashcut branding=branding ldt_id=m2.project.ldt_id %}">{% if m.project.title|length > 30 %}{{m.project.title|slice:":30"}}...{% else %}{{m.project.title}}{% endif %}</a> par <a class="author" href="{% url mashup_profile branding=branding username=m.creator %}">{{ m.creator }}</a> | <span class="duration">02:24</span> </h3>
</div>
{% endfor %}
</div>
- <!--div class="pagination">
- <a href="#" class="active">1</a>
- <a href="#">2</a>
- <a href="#">3</a>
- <a href="#">4</a>
- <a href="#">5</a>
- <a href="#">6</a>
- <a href="#">Suivant</a>
- </div-->
+ <div class="pagination">
+ <a href="#">Tous les Hashcuts</a>
+ </div>
</div><!-- left-content -->
<div class="right-content">
--- a/src/hashcut/templates/iri_mashup_profile.html Fri Nov 30 14:21:52 2012 +0100
+++ b/src/hashcut/templates/iri_mashup_profile.html Fri Nov 30 15:36:06 2012 +0100
@@ -16,7 +16,7 @@
<div class="title-header"></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_home branding=branding %}" class="all-hashcut">Accueil</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>