# HG changeset patch
# User cavaliet
# Date 1385058220 -3600
# Node ID c0cd36df74a0cf310bd1dc19137e76c4bc8eb959
# Parent  0b189e9c7b6808e697176ce27f3f415126eaca46
bugs 0018150 and 0018159

diff -r 0b189e9c7b68 -r c0cd36df74a0 src/jocondelab/static/jocondelab/css/front-notice.css
--- a/src/jocondelab/static/jocondelab/css/front-notice.css	Thu Nov 21 18:55:22 2013 +0100
+++ b/src/jocondelab/static/jocondelab/css/front-notice.css	Thu Nov 21 19:23:40 2013 +0100
@@ -11,11 +11,11 @@
 }
 
 .describe-mode .notice-images {
-    float: none; margin: 15px 0; text-align: center; width: 100%;
+    float: left; margin: 15px 0; text-align: center; width: 67%;
 }
 
 .describe-mode .notice-images li {
-    margin: 0; display: block; max-width: 100%; box-shadow: none; background: transparent;
+    margin: 0; display: block; width: 100%; box-shadow: none; background: transparent;
 }
 
 .describe-mode .notice-images li:nth-child(n+2) {
@@ -37,6 +37,9 @@
 .notice-colright-wrapper {
     float: right; width: 67%; margin-top: 10px;
 }
+.describe-mode .notice-colright-wrapper {
+    float: right; width: 33%; margin-top: 10px;
+} 
 
 .notice-colright {
     margin-left: 20px;
diff -r 0b189e9c7b68 -r c0cd36df74a0 src/jocondelab/static/jocondelab/js/front-timeline.js
--- a/src/jocondelab/static/jocondelab/js/front-timeline.js	Thu Nov 21 18:55:22 2013 +0100
+++ b/src/jocondelab/static/jocondelab/js/front-timeline.js	Thu Nov 21 19:23:40 2013 +0100
@@ -224,6 +224,7 @@
         ctx.textAlign = 'center';
         ctx.font = 'bold 14px Arial,Helvetica';
         ctx.fillStyle = "#000000";
+        var lastX = -40;
         for (var y = wLineDist * Math.ceil(fromYear/wLineDist); y <= toYear; y += wLineDist ) {
             var x = yrToX(y),
                 isPrimary = !((y/wLineDist) % 2);
@@ -232,9 +233,11 @@
             ctx.moveTo(x, cHeight*3/14);
             ctx.lineTo(x, cHeight - cHeight/14);
             ctx.stroke();
-            if (isPrimary && (y!=startYear)) {
+            // 40 is a bit arbitrary but avoids overlap
+            if (isPrimary && (y!=startYear) && (x>(lastX+40))) {
                 ctx.fillText(y || 1, x, cHeight - 4);
                 ctx.fillText(y || 1, x, cHeight*4/21);
+                lastX = x;
             }
         }
         /* Now displaying the different terms that we will show on the timeline */
diff -r 0b189e9c7b68 -r c0cd36df74a0 src/jocondelab/templates/jocondelab/front_describe.html
--- a/src/jocondelab/templates/jocondelab/front_describe.html	Thu Nov 21 18:55:22 2013 +0100
+++ b/src/jocondelab/templates/jocondelab/front_describe.html	Thu Nov 21 19:23:40 2013 +0100
@@ -19,7 +19,9 @@
     </form>
     {% endblock %}
     {% block images %}{{block.super}}{% endblock %}
+    <div class="notice-colright-wrapper">
     {% block datasheet %}{{block.super}}{% endblock %}
     {% block datasheet_title %}{% endblock %}
+    </div>
 </div>
 {% endblock %}