# HG changeset patch
# User rougeronj
# Date 1418207852 -3600
# Node ID 2ace68d1429b946484b4df3a62815ec1372687b0
# Parent  b9fa11411e139686fd7354b9513094e38fd52e29
correction of facette research interface

diff -r b9fa11411e13 -r 2ace68d1429b src/hdalab/static/hdalab/css/facettes.css
--- a/src/hdalab/static/hdalab/css/facettes.css	Wed Dec 10 11:36:24 2014 +0100
+++ b/src/hdalab/static/hdalab/css/facettes.css	Wed Dec 10 11:37:32 2014 +0100
@@ -14,7 +14,7 @@
     float: left;
     width: 473px;
     border: 1px solid #b0b0b0;
-	background: linear-gradient(to bottom, rgba(153,153,153,1) 0px,rgba(255,255,255,1) 100px);
+	background: linear-gradient(to bottom, rgba(148,151,150,1) 0px,rgba(255,255,255,1) 100px);
     cursor: pointer;
     cursor: hand;
     border-top-left-radius: 4px;
@@ -40,7 +40,7 @@
     border: 1px solid #b0b0b0;
     padding: 8px 4px;
     border-top-style: none;
-    background: linear-gradient(to bottom, rgba(153, 153, 153, 0.5) 0px, rgba(255, 255, 255, 0) 100px) repeat scroll 0 0 rgba(0, 0, 0, 0); 
+    background: linear-gradient(to bottom, rgba(148,151,150, 0.5) 0px, rgba(255, 255, 255, 0) 100px) repeat scroll 0 0 rgba(0, 0, 0, 0); 
     border-bottom-left-radius: 4px;
     border-bottom-right-radius: 4px
 }
@@ -228,7 +228,7 @@
 }
 
 #filters li.filperiod {
-    color: #ffffff; background: #e07000;
+    color: #ffffff; background: rgb(146, 132, 36);
 }
 
 span.spyr {
@@ -252,7 +252,7 @@
 }
 
 .leaflet-container {
-    background: linear-gradient(to bottom, rgba(153,153,153,1) 0%,rgba(244,244,244,1) 50%,rgba(153,153,153,1) 100%);
+    background: linear-gradient(to bottom, rgba(187,224,234,1) 0%,rgba(255, 255, 255,0.90) 50%,rgba(187,224,234,1) 100%);
 }
 
 #tagcloud {
@@ -298,6 +298,12 @@
 .disc-label {
     float: left; font-size: 13px; width: 100px; text-align: right; margin-right: 5px; line-height: 13px;
 }
+.disc-label a{
+	color: #467a87;
+}
+.disc-label a:hover{
+	color: #000000;
+}
 
 .disc-bar {
     float: left; height: 14px; margin: 2px 0; cursor: pointer; cursor: hand;
@@ -338,8 +344,15 @@
 .content-item p {
     font-size: 12px; margin: 3px 0;
 }
+.mind-map-icon,
+.mind-map-icon-white{
+	width: 16px; height: 16px; display: inline-block; text-indent:-9999px;
+}
 .mind-map-icon{
-	width: 16px; height: 16px; background: url(../img/mind_map_icon.png) no-repeat; display: inline-block; text-indent:-9999px;
+	 background: url(../img/mind_map_icon.png) no-repeat;
+}
+.mind-map-icon-white{
+	 background: url(../img/mind_map_icon_white.png) no-repeat;
 }
 
 .content-annotation ul {
@@ -450,7 +463,15 @@
 /* COMPLETION */
 
 #tagsearch {
-    width: 100%; font-size: 16px; font-weight: bold; border-style: none; border-bottom: 1px solid #000;
+	background:url("../img/search-icon.png") no-repeat scroll right 5px center #fff;
+    width: 96%;
+    margin-left:2%;
+    font-size: 16px;
+    font-weight: bold;
+    border-style: none;
+    border-bottom: 1px solid #000;
+    color:rgb(200,200,200);
+    border-radius:2px;
 }
 
 #tagsearch.waiting {
diff -r b9fa11411e13 -r 2ace68d1429b src/hdalab/static/hdalab/img/mind_map_icon_white.png
Binary file src/hdalab/static/hdalab/img/mind_map_icon_white.png has changed
diff -r b9fa11411e13 -r 2ace68d1429b src/hdalab/static/hdalab/img/search-icon.png
Binary file src/hdalab/static/hdalab/img/search-icon.png has changed
diff -r b9fa11411e13 -r 2ace68d1429b src/hdalab/static/hdalab/js/gomina.js
--- a/src/hdalab/static/hdalab/js/gomina.js	Wed Dec 10 11:36:24 2014 +0100
+++ b/src/hdalab/static/hdalab/js/gomina.js	Wed Dec 10 11:37:32 2014 +0100
@@ -20,9 +20,9 @@
     heatGamma: 2,
     displayedDates: [ -5000, 0, 500, 1000, 1200, 1400, 1600, 1700, 1750, 1800, 1850, 1900, 1950, 2010 ],
     mappingLibrary: 'leaflet',
-    gradientStart: [ 255, 255, 240 ],
-    gradientEnd: [ 255, 160, 30 ],
-    zeroColor: [ 230, 230, 235 ],
+    gradientStart: [ 252, 246, 210 ],
+    gradientEnd: [ 146, 132, 36 ],
+    zeroColor: [ 220, 220 ,220 ],
     languageCode: 'fr'
 }
 
@@ -310,7 +310,7 @@
                             + '>'
                             + _t.translated_label
                             + '</a>'
-                            + '&nbsp;<a class="mind-map-icon" href="' + gomNs.urls.renkan + '?label=' + _t.label + '" target="_blank">placeholder</a></h3>'
+                            + '&nbsp;<a class="mind-map-icon-white" href="' + gomNs.urls.renkan + '?label=' + _t.label + '" target="_blank">placeholder</a></h3>'
                             + '</li>';
                     }).join('')
                     /*+ '</ul><h4>'+gettext("Annotations")+'</h4><div class="content-annotation" contentid="'
diff -r b9fa11411e13 -r 2ace68d1429b src/hdalab/templates/facettes.html
--- a/src/hdalab/templates/facettes.html	Wed Dec 10 11:36:24 2014 +0100
+++ b/src/hdalab/templates/facettes.html	Wed Dec 10 11:37:32 2014 +0100
@@ -95,6 +95,19 @@
                 </div>
                 <div class="corpsbloc" id="map"></div>
             </div>
+            <div class="bloc" id="bloc_taginfo">
+                <div class="barrebloc">
+                    <h2>{% trans "Rechercher un mot-cle" %}</h2>
+                </div>
+                <div class="corpsbloc" id="taginfo">
+                    <form id="tagform">
+                        <input id="tagsearch" placeholder="{% trans 'Entrez un mot-cle' %}"/>
+                    </form>
+                    <div class="wpinfo">
+                        
+                    </div>
+                </div>
+            </div>
             <div class="bloc" id="bloc_tagcloud">
                 <div class="barrebloc">
                     <h2>{% trans "Nuage de mots-cles" %}</h2>
@@ -102,19 +115,6 @@
                 <div class="corpsbloc" id="tagcloud">
                 </div>
             </div>
-            <div class="bloc" id="bloc_taginfo">
-                <div class="barrebloc">
-                    <h2>{% trans "Rechercher un tag" %}</h2>
-                </div>
-                <div class="corpsbloc" id="taginfo">
-                    <form id="tagform">
-                        <input id="tagsearch" placeholder="{% trans "Rechercher un tag" %}" />
-                    </form>
-                    <div class="wpinfo">
-                        
-                    </div>
-                </div>
-            </div>
             <div class="bloc" id="bloc_translationinfo">
             {% trans "translation_info" %}
             </div>