Merge branch 'master' of git@stigma:platforma

diff --git a/platforma/manage.py b/platforma/manage.py
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index a92dfe4..8b55af9 100644 (file)
--- 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() {