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

Timestamp:

2013-04-23T16:56:08+12:00 (11 years ago)

Author:

sjm84

Message:

Allow visiting called templates as well as other improvements

File:

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

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

@@ -1146 +1146 @@
         {
             return _id;
+        }
+        
+        var visitCalledTemplate = function()
+        {
+            var url = gs.xsltParams.library_name + "?a=g&rt=r&s=ResolveCallTemplate&s1.interfaceName=" + gs.xsltParams.interface_name + "&s1.siteName=" + gs.xsltParams.site_name + "&s1.collectionName=" + gs.cgiParams.c + "&s1.fileName=" + _fileName + "&s1.templateName=" + _xmlNode.getAttribute("name");
+            $.ajax(url)
+            .success(function(response)
+            {
+                var startIndex = response.indexOf("<requestedTemplate>") + ("<requestedTemplate>").length;
+                var endIndex = response.indexOf("</requestedTemplate>");
+                
+                if(endIndex != -1)
+                {
+                    var templateFileName = response.substring(startIndex, endIndex);
+                    var file = _greenbug.fileNameToLocationAndName(templateFileName);
+                    
+                    var fileTemplateName = file.filename.replace(/\\/g, "/") + " (" + file.location + ")";
+                    $("#veFileSelector").find("option").filter(function(){return $(this).text() == fileTemplateName}).prop("selected", true);
+                    _greenbug.populateTemplateSelectorFromFile(file.filename, file.location);
+                    _greenbug.changeCurrentTemplate(file.location, file.filename, "template", "xsl", _xmlNode.getAttribute("name"), null);
+                }
+                else
+                {
+                    _greenbug.changeCurrentTemplate("interface", "gslib.xsl", "template", "xsl", _xmlNode.getAttribute("name"), null);
+                }
+            });
         }
 
@@ -1249 +1275 @@
                     
                     visitTemplateOption.button();
-                    visitTemplateOption.click(function()
-                    {
-                        var url = gs.xsltParams.library_name + "?a=g&rt=r&s=ResolveCallTemplate&s1.interfaceName=" + gs.xsltParams.interface_name + "&s1.siteName=" + gs.xsltParams.site_name + "&s1.collectionName=" + gs.cgiParams.c + "&s1.fileName=" + _fileName + "&s1.templateName=" + _xmlNode.getAttribute("name");
-                        $.ajax(url)
-                        .success(function(response)
-                        {
-                            var startIndex = response.indexOf("<requestedTemplate>") + ("<requestedTemplate>").length;
-                            var endIndex = response.indexOf("</requestedTemplate>");
-                            
-                            if(endIndex != -1)
-                            {
-                                var templateFileName = response.substring(startIndex, endIndex);
-                                var file = _greenbug.fileNameToLocationAndName(templateFileName);
-                                _greenbug.changeCurrentTemplate(file.location, file.filename, "template", "xsl", _xmlNode.getAttribute("name"), null);
-                            }
-                            else
-                            {
-                                _greenbug.changeCurrentTemplate("interface", "gslib.xsl", "template", "xsl", _xmlNode.getAttribute("name"), null);
-                            }
-                        });
-                    });
+                    visitTemplateOption.click(visitCalledTemplate);
                 }
             }
@@ -1286 +1292 @@
             {
                 event.stopPropagation();
-                _div.css("border", "1px solid orange");
+                if(!_selectedElement || _id != _selectedElement.data("parentVEElement").getID())
+                {
+                    _div.css("border", "1px solid orange");
+                }
+
                 var titleString = " ";
                 if(_xmlNode.nodeType == 1)
@@ -1307 +1317 @@
             _div.mouseout(function(event)
             {
-                _div.css("border", "1px solid black");
+                if(!_selectedElement || _id != _selectedElement.data("parentVEElement").getID())
+                {
+                    _div.css("border", "1px solid black");
+                }
                 event.stopPropagation();
             });
             _div.click(function(event)
             {
+                event.stopPropagation();
                 if(_selectedElement)
                 {
                     _selectedElement.css("border", _selectedElement.prevBorder);
+                    if(_selectedElement.children("a").length)
+                    {
+                        _selectedElement.children("a").replaceWith(_selectedElement.children("a").children(".veTitleElement"));
+                    }
                 }
                 _selectedElement = _div;
@@ -1322 +1340 @@
                 _div.data("parentVEElement").focus();
                 _div.data("parentVEElement").populateInformationDiv();
-
-                event.stopPropagation();
+                
+                if(_xmlNode.tagName == "xsl:call-template" && _xmlNode.getAttribute("name").length > 0)
+                {
+                    var link = $("<a>");
+                    link.attr("href", "javascript:;");
+                    link.click(visitCalledTemplate);
+                    link.append(_div.children(".veTitleElement"));
+                    _div.append(link);
+                }
             });
         }