Changeset 27055 for main/trunk/greenstone3/web/interfaces/default/js/visual-xml-editor.js

Timestamp:

2013-03-12T13:24:34+13:00 (11 years ago)

Author:

sjm84

Message:

Various fixes and improvements. Also trialling a different look for elements in the visual editor

File:

• main/trunk/greenstone3/web/interfaces/default/js/visual-xml-editor.js (modified) (6 diffs)

main/trunk/greenstone3/web/interfaces/default/js/visual-xml-editor.js

@@ -289 +289 @@
 
                 var ns = (key == "html") ? "" : (key + ":");
-
                 var newElem = _xml.createElement(ns + elemName);
                 var veElement = new VEElement(newElem);
+                veElement.setShortName(true);
                 var veDiv = veElement.getDiv();
                 veDiv.css("float", "none");
@@ -868 +868 @@
                     {
                         var cloneElem = new VEElement(_xmlNode.cloneNode(true));
+                        cloneElem.setShortName(true);
                         var cloneDiv = cloneElem.getDiv();
                         cloneDiv.css("float", "none");
@@ -958 +959 @@
                 {
                     var transactionType = (_div.data("toolbar")) ? "addElem" : "remMvElem";
+                    
+                    if(_div.data("toolbar"))
+                    {
+                        _div.data("parentVEElement").setShortName(false);
+                    }
+                    
                     _div.data("dragging", false);
                     _div.data("toolbar", false);
 
-                    _div.css("border", "1px dashed black");
+                    _div.css("border", "1px solid black");
                     _div.css("background", _div.data("prevBackground"));
                     
@@ -1187 +1194 @@
             _div.mouseout(function(event)
             {
-                _div.css("border", "1px dashed black");
+                _div.css("border", "1px solid black");
                 event.stopPropagation();
             });
@@ -1247 +1254 @@
             _div.data("parentVEElement").evenlyDistributeChildren();
         }
+        
+        this.setShortName = function(short)
+        {
+            if(short && _xmlNode.nodeType == 1 && _xmlNode.tagName.indexOf(":") != -1)
+            {
+                _div.children(".veTitleElement").text(_xmlNode.tagName.substring(_xmlNode.tagName.indexOf(":") + 1));
+            }
+            else if(!short)
+            {
+                _div.children(".veTitleElement").text(_xmlNode.tagName);
+            }
+        }
 
         this.setWidth = function(width)
@@ -1257 +1276 @@
         {
             _div.addClass("veElement");
+            _div.addClass("ui-corner-all");
             makeDraggable();