Fix interface layout (panel and detail localisation)

Conflicts:
	.gitignore

3 files changed, 20 insertions, 8 deletions

diff --git a/.gitignore b/.gitignore
index fd7f99a..de21e07 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,12 +3,16 @@
 *.bak
 *.mo
 *.ignore
+.idea
 Makefile
 example_project/settings.py
 example_project/static/icons/*
 example_project/static/upload/*
 example_project/media/*
 example_project/local_settings.py
+media
+media/*
+local_settings.py
 chimere_env/
 docs/en/build/
 docs/fr/build/
diff --git a/chimere/static/chimere/css/styles.css b/chimere/static/chimere/css/styles.css
index 230f9e1..6d9787d 100644
--- a/chimere/static/chimere/css/styles.css
+++ b/chimere/static/chimere/css/styles.css
@@ -358,11 +358,11 @@ ul#action-2 {
 }
 
 #detail .detail_content{
-    overflow:auto;
-    height:80%;
-    bottom: 0;
     position: absolute;
+    bottom: 0;
+    top: 80px;
     width: 380px;
+    overflow:auto;
 }
 
 #news_content img,
@@ -1561,23 +1561,23 @@ label.labelSpan.olButton{
 }
 
 #detail {
-    position:static;
     border:0 transparent;
+    right: 0;
+    bottom: 0;
 }
 
 #detail div {
     margin:auto;
 }
 
-#detail #detail-wrapper{
+#detail-wrapper{
     padding: 4px 8px;
-    padding-top:50px;
     position:absolute;
     z-index:101;
     left:auto;
+    top: 0;
     right:0;
     bottom:0;
-    top:0;
     width:400px;
     border:0 transparent;
     border-right:1px solid #E7E7E7;
diff --git a/chimere_example_project/chimere_example_static/chimere/js/interface.js b/chimere_example_project/chimere_example_static/chimere/js/interface.js
index e1a22bf..87e9f4f 100644
--- a/chimere_example_project/chimere_example_static/chimere/js/interface.js
+++ b/chimere_example_project/chimere_example_static/chimere/js/interface.js
@@ -1,5 +1,4 @@
 $(function(){
-
     if (has_search){
         $('a[href=#categories]').click(function(){
             show_panel(display_categories);
@@ -27,8 +26,17 @@ $(function(){
         $(".buttonset label").removeAttr("aria-pressed");
         $(this).attr("aria-pressed", 'true');
     });
+    $(window).resize(relocate_panel);
+    relocate_panel();
 });
 
+function relocate_panel(){
+    var _nav = $('.navbar-collapse');
+    var _top = _nav.position().top + _nav.outerHeight(true);
+    $("#panel").css('top', _top);
+    $("#detail").css('top', _top);
+}
+
 function display_categories(){
     $('a[href=#categories]').parent().parent().children().removeClass('active');
     $('a[href=#categories]').parent().addClass('active');