Changeset 27055

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

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/debug_scripts.js (modified) (8 diffs)
• js/visual-xml-editor.js (modified) (6 diffs)
• style/core.css (modified) (1 diff)

main/trunk/greenstone3/web/interfaces/default/js/debug_scripts.js

@@ -225 +225 @@
         _styleFunctions.push(function(){_saveButton.button({icons:{primary:"ui-icon-disk"}, disabled:true})});
         
-        _swapEditorButton = $("<button>Switch to XML Editor</button>");
+        _swapEditorButton = $("<button>Switch to XML editor</button>");
         _swapEditorButton.button().click(function()
         {
@@ -247 +247 @@
                     _editor.setValue(xmlText);
                     _editor.clearSelection();
+                    var UndoManager = require("ace/undomanager").UndoManager;
+                    _editor.getSession().setUndoManager(new UndoManager());
                     _textEditor.show();
-                    _swapEditorButton.button("option", "label", "Switch to Visual Editor");
+                    _swapEditorButton.button("option", "label", "Switch to visual editor");
                     _isVisualEditor = false;
+                    _xmlStatusBar.show();
                 }
                 else
@@ -260 +263 @@
                     _vEditor.selectRootElement();
                     _vEditor.getMainDiv().show();
-                    _swapEditorButton.button("option", "label", "Switch to XML Editor");
+                    _swapEditorButton.button("option", "label", "Switch to XML editor");
                     _isVisualEditor = true;
+                    _xmlStatusBar.hide();
                 }
             }
@@ -284 +288 @@
         _xmlStatusBar.css("padding", "5px");
         _xmlStatusBar.addClass("ui-corner-all");
+        _styleFunctions.push(function(){_xmlStatusBar.hide();});
         
         //Check the XML for errors every 2 seconds
@@ -315 +320 @@
                     _saveButton.button("option", "disabled", false);
                 }
-                if(_swapEditorButton.button("option", "label") == "Switch to Visual Editor")
+                if(_swapEditorButton.button("option", "label") == "Switch to visual editor")
                 {
                     _swapEditorButton.button("option", "disabled", false);
@@ -446 +451 @@
 
                 _closeEditorButton.button("option", "disabled", false);
+                if(_closeEditorButton.button("option", "label") == "Open editor")
+                {
+                    _closeEditorButton.button("option", "label", "Close editor");
+                    _editingDiv.show();
+                }
             })
             .error(function()
@@ -582 +592 @@
     }
     
+    var fixTitle = function()
+    {
+        $("title").text($("title").text().replace(/<[^>]*>/g, ""));
+    }
+    
     var resizeContainers = function()
     {
@@ -613 +628 @@
 
         addMouseEventsToDebugElements(debugElems);
+        fixTitle();
     }
     

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();
             

main/trunk/greenstone3/web/interfaces/default/style/core.css

@@ -951 +951 @@
 
 .veElement{
-    border:1px dashed black;
+    border:1px solid black;
     float:left;
     margin:5px -1px;