Index: trunk/themes/default2007/platform/inc/nlsmenuext_xml.js
===================================================================
diff -u -N -r8576 -r8587
--- trunk/themes/default2007/platform/inc/nlsmenuext_xml.js	(.../nlsmenuext_xml.js)	(revision 8576)
+++ trunk/themes/default2007/platform/inc/nlsmenuext_xml.js	(.../nlsmenuext_xml.js)	(revision 8587)
@@ -18,10 +18,10 @@
   mgr.defaultEffect=$aonevl(rt.getAttribute("defaulteffect"), null);
   mgr.icPath=$aonvl(rt.getAttribute("icpath"), "");
   mgr.memorizeSel=$aonevl(rt.getAttribute("memorizesel"), false);
-
+  
   var dm=rt.getElementsByTagName("menubar")[0];
   NlsMenuUtil.createMenu(dm, mgr);
-
+  
   var mns=rt.getElementsByTagName("menus")[0];
   if(mns){
     for (var i=0;i<mns.childNodes.length;i++){
@@ -38,7 +38,7 @@
 NlsMenuUtil.createMenu=function(dm, mgr, pc) {
   var id=dm.getAttribute("id"), mn=nlsMenu[id];
   if(mn) {
-    if(pc!==true) {
+    if(pc!==true) { 
       mn.items=new Object(); mn.srItems=[];
       mn.useEffect(mgr.defaultEffect);
     }
@@ -55,21 +55,25 @@
       case "submenuic": if(v && v!="") mn.subMenuIc=eval(v); break;
       case "icpath":mn.icPath=v;
       case "itemspc":mn.itemSpc=v;
+      case "droponclick":if(mn.isMenubar) {mn.dropOnClick=(v=="true");}
     };
   }
-
-  var its=dm.getElementsByTagName("items")[0].childNodes, ic="";
+  
+  var its=dm.getElementsByTagName("items")[0].childNodes, ic="", itm;
   for(var i=0;i<its.length;i++) {
     a=its[i]; if(a.nodeType!=1) continue;
     if(a.nodeName=="separator") {mn.addSeparator(); continue;}
     ic=a.getAttribute("ico");
-    mn.addItem(a.getAttribute("id"),
-      a.childNodes[0].nodeValue,
-      $aonvl(a.getAttribute("url"),null),
+    itm=mn.addItem(a.getAttribute("id"), 
+      a.childNodes[0].nodeValue, 
+      $aonvl(a.getAttribute("url"),null), 
       (!ic || ic==""?null:eval(ic)),
       (!a.getAttribute("enb")?null:a.getAttribute("enb")=="true"),
       null, $aonvl(a.getAttribute("title"),null)
     );
+    itm.stlprf=$aonvl(a.getAttribute("stlprf"), "");
+    itm.target=a.getAttribute("target");
+    if(itm.target=="") itm.target=null;
     if(a.getAttribute("subid")) {
       mn.addSubmenu(a.getAttribute("id"),
         a.getAttribute("subid"),
@@ -79,9 +83,9 @@
         (!a.getAttribute("subposadj")?null:eval(a.getAttribute("subposadj"))),
         (!a.getAttribute("subdir")?null:eval(a.getAttribute("subdir")))
       );
-
+      
       if(a.getAttribute("suburl")) {
-        mn.setSubmenuUrl(a.getAttribute("id"), NlsMenuUtil.formatRequest(a.getAttribute('suburl')));
+        mn.setSubmenuUrl(a.getAttribute("id"), a.getAttribute("suburl"));
       }
     }
   }
@@ -100,14 +104,10 @@
   return NlsMenuUtil.createFromXML(xmlDom);
 };
 
-NlsMenuUtil.formatRequest = function ($url) {
-	return $url += ($url.indexOf('?') ? '&' : '?') + 'ajax=yes';
-}
-
 /*mCnt: menu container/placeholder*/
 NlsMenuUtil.loadFromXMLFile=function(fName, mCnt) {
   var req=NlsMenuUtil.createXMLRequest();
-  req.open("get", NlsMenuUtil.formatRequest(fName), true);
+  req.open("get", fName, true);
   req.onreadystatechange=function() {
     if(req.readyState==4) {
       if(req.status==200 || req.status==304) {
@@ -160,12 +160,14 @@
       try {
         oXml=new ActiveXObject(arrObj[i]);
         return oXml;
-      } catch (e) { }
+      } catch (e) { }     
     }
   }
 };
 
 /*AJAX Menu*/
+NlsMnMgr.loadingText="Loading menu, please wait...";
+
 NLSMENU.addAJAXSubmenu=function(key, subId, url, crsFrame, subFrame, subPos, subPosAdj, subDir) {
   var it=this.addSubmenu(key, subId, crsFrame, subFrame, subPos, subPosAdj, subDir);
   this.setSubmenuUrl(key, url);
@@ -174,7 +176,7 @@
 NLSMENU.setSubmenuUrl=function(key, url) {
   var it=this.items[this.mId+"_"+key];
   it.rt.subUrl=url;
-  it.rt.loaded=0;
+  it.rt.loaded=0;  
 };
 
 NlsMenuUtil.$createMenuDom=function(s) {
@@ -191,7 +193,7 @@
     if(req.readyState==4) {
       if(req.status==200 || req.status==304) {
         var de=req.responseXML.documentElement;
-
+        
         if(!de||de.childNodes.length==0) { //if no submenu
         } else {
           de=de.childNodes; var sub=null, main=null; subs=new Object(), smenu="";
@@ -202,17 +204,17 @@
           }
           for (var x in subs) { smenu+=subs[x].renderMenu(); }
           if(smenu) {NlsMenuUtil.$createMenuDom(smenu);}
-          if(main) {
-            main.prIt=it.intKey; main.reload(true);
-            if(main.rt.active)NlsMenu.$showMenu(mn, it);
+          if(main) { 
+            main.prIt=it.intKey; main.reload(true); 
+            if(main.rt.active)NlsMenu.$showMenu(mn, it); 
             it.rt.loaded=2;
           }
-        }
+        }        
       }
     }
   };
   var smn=mgr.createMenu(it.subMenuId); smn.effect=null;
-//  smn.addItem("ajaxload", "Loading menu, please wait...");
+  smn.addItem("ajaxload", mgr.loadingText);
   NlsMenuUtil.$createMenuDom(smn.renderMenu());
   NlsMenu.$showMenu(mn, it);
   it.rt.loaded=1; //loading