From: Łukasz Rekucki <lrekucki@gmail.com>
Date: Tue, 9 Mar 2010 20:11:19 +0000 (+0100)
Subject: Merge branch 'master' of git@stigma:platforma
X-Git-Url: https://git.mdrn.pl/redakcja.git/commitdiff_plain/afdb8fd05511c5280e8ee251389cb893786eb810?hp=85b88321baaf99ad7133cbd195018d7ed1cab165

Merge branch 'master' of git@stigma:platforma
---

diff --git a/platforma/manage.py b/platforma/manage.py
old mode 100644
new mode 100755
diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index a92dfe4a..8b55af96 100644
--- a/platforma/static/js/main.js
+++ b/platforma/static/js/main.js
@@ -659,6 +659,13 @@ function html(element) {
         if (!editable.hasClass('active')) {
             editable.addClass('active').append(button);
         }
+        if (editable.is('.annotation-inline-box')) {
+            $('*[x-annotation-box]', editable)
+                .css({width: 300, position: 'absolute', left: event.clientX - editable.offset().left + 5, top: event.clientY - editable.offset().top + 5})
+                .show();
+        } else {
+            $('*[x-annotation-box]').hide();
+        }
     });
 
     $('.motyw').live('click', function() {