Pokazywanie przypisów w odpowiednim miejscu i ustalenie dla nich minimalnych rozmiarów.

diff --git a/platforma/static/css/html.css b/platforma/static/css/html.css
index d64cd6e..3807577 100755 (executable)
--- a/platforma/static/css/html.css
+++ b/platforma/static/css/html.css
@@ -439,6 +439,7 @@
     padding: 1px;
 
     z-index: 2000;
     padding: 1px;
 
     z-index: 2000;

+    position: absolute;

 }
 
 .html-editarea textarea
 }
 
 .html-editarea textarea


@@ -453,6 +454,7 @@
 
     z-index: 0;
     font-size: 10pt;
 
     z-index: 0;
     font-size: 10pt;

+    position: relative;

 /*    background-color: ivory;*/
 }
 
 /*    background-color: ivory;*/
 }
 

diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index 1a281c4..ef4e799 100644 (file)
--- a/platforma/static/js/main.js
+++ b/platforma/static/js/main.js
@@ -317,10 +317,6 @@ function html(element) {
             xtype == 'motyw' || xtype == 'begin' || xtype == 'end') {
             return false;
         }
             xtype == 'motyw' || xtype == 'begin' || xtype == 'end') {
             return false;
         }

-
-        // this is hopefully redundant
-        //if(! node.is('*.utwor *') )
-        //    return false;

         
         // don't allow themes inside annotations
         if( node.is('*[x-annotation-box] *') )
         
         // don't allow themes inside annotations
         if( node.is('*[x-annotation-box] *') )


@@ -360,7 +356,7 @@ function html(element) {
         range.insertNode(tag[0]);
 
         xml2html({
         range.insertNode(tag[0]);
 
         xml2html({

-            xml: '<pr><slowo_obce>'+text+'</slowo_obce></pr>',
+            xml: '<pr><slowo_obce>'+text+'</slowo_obce> --- </pr>',

             success: function(text) {
                 tag.replaceWith(text);
             },
             success: function(text) {
                 tag.replaceWith(text);
             },


@@ -466,6 +462,11 @@ function html(element) {
         var w = $box.outerWidth();
         var h = $box.innerHeight();
     
         var w = $box.outerWidth();
         var h = $box.innerHeight();
     

+        if ($origin.is(".annotation-inline-box")) {
+            w = Math.max(w, 400);
+            h = Math.max(h, 60);
+        }
+        

         console.log('width:', w, 'height:', h);
 
         // start edition on this node
         console.log('width:', w, 'height:', h);
 
         // start edition on this node


@@ -476,9 +477,9 @@ function html(element) {
             top: y,
             width: w
             // right: 0
             top: y,
             width: w
             // right: 0

-        }).appendTo($box[0].offsetParent || element).show();
+        }).appendTo($box[0].offsetParent || $box.parent()).show();

         
         

-        console.log($overlay, $box[0].offsetParent || element);
+        console.log($overlay, $box[0].offsetParent || $box.parent());

         
         var serializer = new XMLSerializer();
     
         
         var serializer = new XMLSerializer();