From 1133074d683709532c7af9532ef3aa6b9a3be4c3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Aleksander=20=C5=81ukasz?=
 <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Tue, 8 Jul 2014 15:49:28 +0200
Subject: [PATCH] Image editor fix: make sure toolbar content breaks properly
 for long motif and object lists

---
 apps/wiki_img/templates/wiki_img/tabs/motifs_editor.html | 6 ++++--
 redakcja/static/css/gallery.css                          | 8 ++++++++
 redakcja/static/css/master.css                           | 2 +-
 redakcja/static/js/wiki_img/view_editor_motifs.js        | 2 +-
 redakcja/static/js/wiki_img/view_editor_objects.js       | 2 +-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/apps/wiki_img/templates/wiki_img/tabs/motifs_editor.html b/apps/wiki_img/templates/wiki_img/tabs/motifs_editor.html
index c064505d..72588885 100644
--- a/apps/wiki_img/templates/wiki_img/tabs/motifs_editor.html
+++ b/apps/wiki_img/templates/wiki_img/tabs/motifs_editor.html
@@ -11,7 +11,9 @@
         </div>
     </div>
 
-    <div class='scrolled'>
-        <img src="{{ document.image.url }}" class='area-selectable' alt="Tagged image" />
+    <div style="position:relative; height: 100%;">
+        <div class='scrolled'>
+            <img src="{{ document.image.url }}" class='area-selectable' alt="Tagged image" />
+        </div>
     </div>
 </div>
diff --git a/redakcja/static/css/gallery.css b/redakcja/static/css/gallery.css
index fc0ed859..08e9318e 100644
--- a/redakcja/static/css/gallery.css
+++ b/redakcja/static/css/gallery.css
@@ -125,3 +125,11 @@
 .gallery-image img[src=''] {
 	background-color: red;
 }
+
+#motifs-editor .toolbar {
+    height: auto;
+}
+
+#objects-editor .toolbar {
+    height: auto;
+}
diff --git a/redakcja/static/css/master.css b/redakcja/static/css/master.css
index a87d5a6f..03945987 100644
--- a/redakcja/static/css/master.css
+++ b/redakcja/static/css/master.css
@@ -399,7 +399,7 @@ img.tabclose {
 
 .scrolled {
     position: absolute;
-    top: 29px;
+    top: 0;
     left: 0;
     right: 0;
     bottom: 0;
diff --git a/redakcja/static/js/wiki_img/view_editor_motifs.js b/redakcja/static/js/wiki_img/view_editor_motifs.js
index 11cbef08..22331c5a 100644
--- a/redakcja/static/js/wiki_img/view_editor_motifs.js
+++ b/redakcja/static/js/wiki_img/view_editor_motifs.js
@@ -77,7 +77,7 @@
         if (x1 !== null)
             $e.data('coords', [x1, y1, x2, y2]);
         this.$objects_list.append($e);
-        this.$objects_list.append('<span class="delete">(x)</span>');
+        this.$objects_list.append('<span class="delete">(x) </span>');
     }
 
 
diff --git a/redakcja/static/js/wiki_img/view_editor_objects.js b/redakcja/static/js/wiki_img/view_editor_objects.js
index 5cf014ff..bd0af094 100644
--- a/redakcja/static/js/wiki_img/view_editor_objects.js
+++ b/redakcja/static/js/wiki_img/view_editor_objects.js
@@ -68,7 +68,7 @@
         if (x1 !== null)
             $e.data('coords', [x1, y1, x2, y2]);
         this.$objects_list.append($e);
-        this.$objects_list.append('<span class="delete">(x)</span>');
+        this.$objects_list.append('<span class="delete">(x) </span>');
     }
 
 
-- 
2.20.1