Changeset 27129 for main

Timestamp:

2013-03-26T16:53:38+13:00 (11 years ago)

Author:

sjm84

Message:

Moving the file selector and changing/moving the template selector

Location:

main/trunk/greenstone3/web/interfaces/default

Files:

• js/debug_scripts.js (modified) (14 diffs)
• style/core.css (modified) (2 diffs)

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

@@ -323 +323 @@
     }
     
+    var createFileAndTemplateSelectors = function(buttonDiv)
+    {
+        _templateSelector = $("<div>", {"id":"veTemplateSelector", "class":"ui-state-default ui-corner-all"});
+        _templateSelector.append($("<span>Templates: <span>"));
+        var templateSelectBox = $("<select>").append("<option>-- No templates --</option>");
+        templateSelectBox.change(function()
+        {
+            var selected = templateSelectBox.find(":selected");
+            var changeFunction = selected.data("changeFunction");
+            if(changeFunction)
+            {
+                changeFunction();
+            }
+        });
+        _templateSelector.append(templateSelectBox);
+        _fileSelector = $("<div>", {"id":"veFileSelector", "class":"ui-state-default ui-corner-all"});
+        buttonDiv.append(_fileSelector);
+        buttonDiv.append(_templateSelector);
+    }
+    
     var createDebugDiv = function()
     {
@@ -346 +366 @@
         toolBarDiv.append(buttonDiv);
         createButtonDiv(buttonDiv);
+        createFileAndTemplateSelectors(buttonDiv);
         createXMLStatusBar(buttonDiv);
-        
-        _navArea = $("<div>", {"id":"veNavArea"});
-        _templateSelector = $("<div>", {"id":"veTemplateSelector"});
-        _fileSelector = $("<div>", {"id":"veFileSelector", "class":"ui-state-default ui-corner-all"});
-        _navArea.append(_fileSelector);
-        _navArea.append(_templateSelector);
-        _navArea.append("<div>", {style:"clear:both;"});
         
         //Populate the file selector
@@ -381 +395 @@
             {
                 var selectedItem = selectBox.find(":selected");
+                
+                if(!selectedItem.data("fileItem"))
+                {
+                    return;
+                }
                 
                 var getURL = gs.xsltParams.library_name + "?a=g&rt=r&s=GetTemplateListFromFile&s1.fileName=" + selectedItem.data("fileItem").path + "&s1.locationName=" + selectedItem.data("fileItem").location + "&s1.interfaceName=" + gs.xsltParams.interface_name + "&s1.siteName=" + gs.xsltParams.site_name + "&s1.collectionName=" + gs.cgiParams.c;
@@ -392 +411 @@
                     
                     clearAll();
+                    
+                    _templateSelector.children("select").empty();
+                    if(templateList.length == 0)
+                    {
+                        _templateSelector.children("select").append("<option>-- No templates --</option>");
+                    }
+                    else
+                    {
+                        _templateSelector.children("select").append("<option>-- Select a template --</option>");
+                    }
                     
                     for(var i = 0; i < templateList.length; i++)
@@ -411 +440 @@
                         }
                         
-                        var infoContainer = $("<div>", {"class":"gbTemplateContainer ui-state-default ui-corner-all"});
+                        var infoContainer = $("<option>");
                         
                         _elements.push(infoContainer);
@@ -436 +465 @@
                         }
                         
-                        _templateSelector.prepend(infoContainer);
+                        _templateSelector.children("select").append(infoContainer);
                         
                         //resizeContainers();
@@ -560 +589 @@
     var addMouseEventsToInfoContainer = function(infoContainer, fileName, location, nodename, namespace, name, match)
     {
-        infoContainer.click(function()
+        infoContainer.data("changeFunction", function()
         {
             if(_selectedTemplate)
@@ -579 +608 @@
             _greenbug.changeCurrentTemplate(location, fileName, nodename, namespace, name, match);
         });
+        /*
         infoContainer.mouseover(function()
         {
@@ -589 +619 @@
             $(this).removeClass("ui-state-active");
         });
+        */
     }
 
@@ -670 +701 @@
                     }
 
-                    var infoContainer = $("<div>", {"class":"gbTemplateContainer ui-state-default ui-corner-all"});
+                    var infoContainer = $("<option>");
 
                     _elements.push(infoContainer);
@@ -696 +727 @@
                     }
 
-                    _templateSelector.prepend(infoContainer);
+                    _templateSelector.children("select").append(infoContainer);
 
                     //resizeContainers();
@@ -714 +745 @@
             {
                 clearAll();
+                _templateSelector.children("select").empty();
+                _templateSelector.children("select").append("<option>-- Select a template --</option>");
             }
         });
@@ -723 +756 @@
     }
     
+    /*
     var resizeContainers = function()
     {
@@ -737 +771 @@
         }
     }
+    */
     
     this.init = function()

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

@@ -918 +918 @@
 }
 
-#veNavArea{
-    width:100%;
-}
-
 #veTemplateSelector{
-    width:75%;
-    float:right;
+    float:left;
+    padding:0.5em;
+    margin:0 0.5em 0 0;
 }
 
@@ -930 +927 @@
     float:left;
     padding:0.5em;
+    margin:0 0.5em 0 0 ;
 }