# HG changeset patch
# User veltr
# Date 1354286166 -3600
# Node ID 0c699d2767f839e3e5b7ccc5fc5f17c7c5ede47b
# Parent fa742e491ce130a3e466c798e7147e97b6be2dcc
Some corrections
diff -r fa742e491ce1 -r 0c699d2767f8 integration/css/common.css
--- 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;
diff -r fa742e491ce1 -r 0c699d2767f8 integration/css/edition.css
--- 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;
}
diff -r fa742e491ce1 -r 0c699d2767f8 integration/css/players.css
--- 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;
}
diff -r fa742e491ce1 -r 0c699d2767f8 integration/home.html
--- 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 @@
@@ -127,35 +127,35 @@
diff -r fa742e491ce1 -r 0c699d2767f8 integration/js/compile.bat
--- 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!
diff -r fa742e491ce1 -r 0c699d2767f8 integration/js/compile.sh
--- 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
diff -r fa742e491ce1 -r 0c699d2767f8 integration/profil.html
--- 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 @@

-
Mon Hashcut | 02:24
+

-
Mon Hashcut | 02:24
+

-
Mon Hashcut | 02:24
+

-
Mon Hashcut | 02:24
+

-
Mon Hashcut | 02:24
+

-
Mon Hashcut | 02:24
+
diff -r fa742e491ce1 -r 0c699d2767f8 src/hashcut/templates/bpi_mashup_edit.html
--- 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 @@
diff -r fa742e491ce1 -r 0c699d2767f8 src/hashcut/templates/bpi_mashup_hashcut.html
--- 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 @@
diff -r fa742e491ce1 -r 0c699d2767f8 src/hashcut/templates/bpi_mashup_home.html
--- 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 @@
@@ -80,20 +80,14 @@
{% for m in mashups %}
{% endfor %}
-
+
diff -r fa742e491ce1 -r 0c699d2767f8 src/hashcut/templates/bpi_mashup_profile.html
--- 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 %}
{% endblock %}
@@ -16,7 +16,7 @@
@@ -33,7 +33,7 @@
{% for m in mashups %}
{% endfor %}
diff -r fa742e491ce1 -r 0c699d2767f8 src/hashcut/templates/iri_mashup_content.html
--- 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 @@
diff -r fa742e491ce1 -r 0c699d2767f8 src/hashcut/templates/iri_mashup_edit.html
--- 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 @@
diff -r fa742e491ce1 -r 0c699d2767f8 src/hashcut/templates/iri_mashup_hashcut.html
--- 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 @@
diff -r fa742e491ce1 -r 0c699d2767f8 src/hashcut/templates/iri_mashup_home.html
--- 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 @@
-
Hashcut BPI » {% block title %}Accueil{% endblock %}
+
Hashcut » {% block title %}Accueil{% endblock %}
{% block css_declaration %}
{% endblock %}
@@ -64,13 +64,13 @@
@@ -80,20 +80,14 @@
{% for m in mashups %}
{% endfor %}
-
+
diff -r fa742e491ce1 -r 0c699d2767f8 src/hashcut/templates/iri_mashup_profile.html
--- 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 @@