# HG changeset patch
# User cavaliet
# Date 1354102724 -3600
# Node ID 38e5c73b4c845ba34870c7b65c4403478e53593d
# Parent  60a1e58b0a08fadfd5d1400603083c5419216142
update templates and css

diff -r 60a1e58b0a08 -r 38e5c73b4c84 src/hashcut/static/hashcut/bpi/css/common.css
--- a/src/hashcut/static/hashcut/bpi/css/common.css	Wed Nov 28 12:19:21 2012 +0100
+++ b/src/hashcut/static/hashcut/bpi/css/common.css	Wed Nov 28 12:38: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 60a1e58b0a08 -r 38e5c73b4c84 src/hashcut/static/hashcut/bpi/css/home.css
--- a/src/hashcut/static/hashcut/bpi/css/home.css	Wed Nov 28 12:19:21 2012 +0100
+++ b/src/hashcut/static/hashcut/bpi/css/home.css	Wed Nov 28 12:38: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 60a1e58b0a08 -r 38e5c73b4c84 src/hashcut/static/hashcut/iri/css/common.css
--- a/src/hashcut/static/hashcut/iri/css/common.css	Wed Nov 28 12:19:21 2012 +0100
+++ b/src/hashcut/static/hashcut/iri/css/common.css	Wed Nov 28 12:38: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 60a1e58b0a08 -r 38e5c73b4c84 src/hashcut/static/hashcut/iri/css/home.css
--- a/src/hashcut/static/hashcut/iri/css/home.css	Wed Nov 28 12:19:21 2012 +0100
+++ b/src/hashcut/static/hashcut/iri/css/home.css	Wed Nov 28 12:38: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,14 +22,12 @@
 	margin-right: 0;
 }
 
-
-
 .last .video-item:nth-child(4n+4){
 	margin-right: 0;
 }
 .last .video-item{
-    height: 130px;
 	width: 140px;
+	height: 130px;
 	float: left;
 	margin: 0 20px 12px 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 60a1e58b0a08 -r 38e5c73b4c84 src/hashcut/templates/bpi_mashup_edit.html
--- a/src/hashcut/templates/bpi_mashup_edit.html	Wed Nov 28 12:19:21 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_edit.html	Wed Nov 28 12:38:44 2012 +0100
@@ -17,7 +17,7 @@
     <!-- popin user -->
     
         <div class="popin user info" id="user">
-            <img class="pointer" src="{% static 'hashcut/bpi/img/popin-triangle.png' %}" alt="" />
+            <div class="pointer"></div>
             <div class="popin-content">
                 <h2>Mashup75</h2>
                 <h3>mash@cinecast.fr</h3>
@@ -29,7 +29,7 @@
         </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="pointer"></div>
             <div class="popin-content">
                 <h2>Créer un compte :</h2>
                 <form action="#" class="signup-form">
@@ -58,7 +58,7 @@
         </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="pointer"></div>
             <div class="popin-content">
                 <h2>Connexion :</h2>
                 <form action="#" class="login-form">
@@ -85,7 +85,7 @@
     
     <!-- 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>
@@ -112,9 +112,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="#" 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 +193,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 +264,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 +325,9 @@
 {% 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/jquery.min.js' %}"></script>
+<script type="text/javascript" src="{% static 'hashcut/lib/jquery-ui.min.js' %}"></script-->
 <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>
@@ -338,12 +341,18 @@
         hashcut_page: "hashcut.html?project="
     };
     $(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>
diff -r 60a1e58b0a08 -r 38e5c73b4c84 src/hashcut/templates/bpi_mashup_home.html
--- a/src/hashcut/templates/bpi_mashup_home.html	Wed Nov 28 12:19:21 2012 +0100
+++ b/src/hashcut/templates/bpi_mashup_home.html	Wed Nov 28 12:38: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>
@@ -113,8 +114,9 @@
             <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 -->