# HG changeset patch
# User rougeronj
# Date 1417426493 -3600
# Node ID 58bc48201d0ed2043aa2e85326a033064743e618
# Parent  ea3173079318ece6b610ebef94e37819ef37974f# Parent  498fb7ca23b99772f8960b52df6357b427061a9c
Merge with 498fb7ca23b99772f8960b52df6357b427061a9c

diff -r 498fb7ca23b9 -r 58bc48201d0e .pydevproject
--- a/.pydevproject	Fri Nov 28 17:00:05 2014 +0100
+++ b/.pydevproject	Mon Dec 01 10:34:53 2014 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?eclipse-pydev version="1.0"?><pydev_project>
-<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">python_hdalab</pydev_property>
+<pydev_property name="org.python.pydev.PYTHON_PROJECT_INTERPRETER">Default</pydev_property>
 <pydev_property name="org.python.pydev.PYTHON_PROJECT_VERSION">python 2.7</pydev_property>
 <pydev_pathproperty name="org.python.pydev.PROJECT_SOURCE_PATH">
 <path>/${PROJECT_DIR_NAME}/src</path>
diff -r 498fb7ca23b9 -r 58bc48201d0e src/hdalab/static/hdalab/css/head.css
--- a/src/hdalab/static/hdalab/css/head.css	Fri Nov 28 17:00:05 2014 +0100
+++ b/src/hdalab/static/hdalab/css/head.css	Mon Dec 01 10:34:53 2014 +0100
@@ -78,16 +78,18 @@
 }
 #subhead{
 	margin:30px auto;
-	width: 960px;
+	width: 810px;
 	font-family: "FranklinGothic",Arial,Helvetica,sans-serif;
     font-weight: 300;
     text-transform: uppercase;
+    position: relative;
+    
 }
 #subhead h3 {
 	font-weight: normal;
-	color: inherit;
-    font-size: 1.46rem;
-    padding: 0 8px;
+	color: #2d2b25;
+	font-size: 13px;
+    font-size: 1.3rem;
 }
 #subhead h3:before {
     content: "/";
@@ -98,5 +100,5 @@
 .bg-wrap {
 	background-color: rgba(0, 0, 0, 0.15);
 	border-radius: 2px;
-    padding: 12px 10px;
+    padding: 10px 10px;
 }
diff -r 498fb7ca23b9 -r 58bc48201d0e src/hdalab/static/hdalab/css/index.css
--- a/src/hdalab/static/hdalab/css/index.css	Fri Nov 28 17:00:05 2014 +0100
+++ b/src/hdalab/static/hdalab/css/index.css	Mon Dec 01 10:34:53 2014 +0100
@@ -28,17 +28,18 @@
 .bloc-appli-left,
 .bloc-appli-middle,
 .bloc-appli-right {
-    width: 270px;
+	cursor:pointer;
+    width:240px;
     float: left;
 }
 .bloc-appli-left,
 .bloc-appli-middle{
-	padding-right:70px;
+	padding-right:45px;
 }
 
 .overlay-bloc {
     padding: 5px 10px;
-    background: rgba(224, 224, 224, 0.93);
+    background: rgba(238, 238, 235, 0.93);
     display: none;
 }
 p.goto {
@@ -47,21 +48,18 @@
 }
 
 #bloc-facettes {
-    background: url(../img/facettes-thumb.jpg) no-repeat;
-    background-size: 258px 260px;
-    height:258px;
+    background: url("../img/facettes.png") no-repeat scroll  20px 10px / 170px 170px rgba(0, 0, 0, 0);
+    height:200px;
 }
 
 #bloc-categories {
-    background: url(../img/categories-thumb.jpg) no-repeat;
-    background-size: 258px 260px;
-    height:258px;
+    background: url("../img/categories.png") no-repeat scroll  20px 10px / 170px 170px rgba(0, 0, 0, 0);
+    height:200px;
 }
 
 #bloc-thesaurus {
-    background: url(../img/thesaurus-thumb.jpg) no-repeat;
-    background-size: 258px 260px;
-    height:258px;
+    background: url("../img/thesaurus.png") no-repeat scroll  20px 10px / 170px 170px rgba(0, 0, 0, 0);
+    height:200px;
 }
 
 .mini-table {
@@ -75,7 +73,12 @@
 	font-size: 14px;
 	font-size: 1.4pm;
 }
-.liste-applis h3 {
+.bloc h3 {
     font-size: 15px;
     margin-bottom: 7px;
 }
+.bloc{
+	  padding: 6px 8px 2px;
+    background-color: rgba(255, 255, 255, 0.9);
+    border-radius: 5px;
+}
diff -r 498fb7ca23b9 -r 58bc48201d0e src/hdalab/static/hdalab/img/categories.png
Binary file src/hdalab/static/hdalab/img/categories.png has changed
diff -r 498fb7ca23b9 -r 58bc48201d0e src/hdalab/static/hdalab/img/facettes.png
Binary file src/hdalab/static/hdalab/img/facettes.png has changed
diff -r 498fb7ca23b9 -r 58bc48201d0e src/hdalab/static/hdalab/img/thesaurus.png
Binary file src/hdalab/static/hdalab/img/thesaurus.png has changed
diff -r 498fb7ca23b9 -r 58bc48201d0e src/hdalab/templates/index.html
--- a/src/hdalab/templates/index.html	Fri Nov 28 17:00:05 2014 +0100
+++ b/src/hdalab/templates/index.html	Mon Dec 01 10:34:53 2014 +0100
@@ -13,9 +13,10 @@
         <script type="text/javascript">
             $(function() {
                 $(".bloc").mouseenter(function() {
+                	console.log("katapla!");
                     var _this = this;
                     $(".overlay-bloc").each(function() {
-                        if (this.parentNode == _this) {
+                        if (this.parentNode.parentNode == _this) {
                             $(this).slideDown();
                         } else {
                             $(this).slideUp();
@@ -37,9 +38,9 @@
 {% block home_actif %}actif{% endblock %}
 
 {% block subhead %}
-<div class="liste-applis">
-	<div class="bloc-appli-left">
-		<div class="bg-wrap bloc">
+<div class="bloc-appli-left">
+	<div class="bg-wrap">
+		<div class="bloc">
 		    <h3>Recherche par <strong>facettes</strong></h3>
 		    <div id="bloc-facettes">
 		        <div class="overlay-bloc">
@@ -49,10 +50,12 @@
 		        </div>
 		    </div>
 	    </div>
-	</div>
-	
-	<div class="bloc-appli-middle">
-		<div class="bg-wrap bloc">
+    </div>
+</div>
+
+<div class="bloc-appli-middle">
+	<div class="bg-wrap">
+		<div class="bloc">
 		    <h3><strong>Catégories</strong> de Wikipedia</h3>
 		    <div id="bloc-categories">
 		        <div class="overlay-bloc">
@@ -62,10 +65,12 @@
 		        </div>
 		    </div>
 	    </div>
-	</div>
-	
-	<div class="bloc-appli-right">
-		<div class="bg-wrap bloc">
+    </div>
+</div>
+
+<div class="bloc-appli-right">
+	<div class="bg-wrap">
+		<div class="bloc">
 		    <h3>Navigation par <strong>thésaurus</strong></h3>
 		    <div id="bloc-thesaurus">
 		        <div class="overlay-bloc">
@@ -77,11 +82,11 @@
 		            <p class="goto"><a href="{% url 'thesaurus' %}">&raquo;</a></p>
 		        </div>
 		    </div>
-		</div>
+	    </div>
 	</div>
-	
-	<div style="clear: both;"> </div>
 </div>
+
+<div style="clear: both;"> </div>
 {% endblock %}